From 82040d5c85a40154f536e3f3dbcd89084094741f Mon Sep 17 00:00:00 2001 From: Sean Morley <98704938+seanmorley15@users.noreply.github.com> Date: Tue, 3 Dec 2024 13:23:17 -0500 Subject: [PATCH 01/10] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9ff2821..1330858 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ ### _"Never forget an adventure with AdventureLog - Your ultimate travel companion!"_ [!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/seanmorley15) +
+AdventureLog - The ultimate travel companion for the modern-day explorer | Product Hunt - **[Documentation](https://adventurelog.app)** - **[Demo](https://demo.adventurelog.app)** From 0616fe19f3ea45b848f2c58b5fdd436c9175b134 Mon Sep 17 00:00:00 2001 From: Sean Morley Date: Tue, 3 Dec 2024 14:02:01 -0500 Subject: [PATCH 02/10] Remove printing in backend --- backend/server/adventures/views.py | 1 - backend/server/worldtravel/views.py | 1 - 2 files changed, 2 deletions(-) diff --git a/backend/server/adventures/views.py b/backend/server/adventures/views.py index 348c142..a0307dd 100644 --- a/backend/server/adventures/views.py +++ b/backend/server/adventures/views.py @@ -1145,7 +1145,6 @@ def extractIsoCode(self, data): region = Region.objects.filter(id=iso_code).first() visited_region = VisitedRegion.objects.filter(region=region).first() is_visited = False - print(iso_code) country_code = iso_code[:2] if region: diff --git a/backend/server/worldtravel/views.py b/backend/server/worldtravel/views.py index 8e38261..5a92e39 100644 --- a/backend/server/worldtravel/views.py +++ b/backend/server/worldtravel/views.py @@ -59,7 +59,6 @@ def region_check_all_adventures(self, request): for adventure in adventures: if adventure.latitude is not None and adventure.longitude is not None: try: - print(f"Adventure {adventure.id}: lat={adventure.latitude}, lon={adventure.longitude}") point = Point(float(adventure.longitude), float(adventure.latitude), srid=4326) region = Region.objects.filter(geometry__contains=point).first() if region: From f0603f7dbdb3c005d294993b52b6aa694ed430a6 Mon Sep 17 00:00:00 2001 From: Sean Morley <98704938+seanmorley15@users.noreply.github.com> Date: Tue, 3 Dec 2024 15:44:38 -0500 Subject: [PATCH 03/10] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 1330858..9ff2821 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,6 @@ ### _"Never forget an adventure with AdventureLog - Your ultimate travel companion!"_ [!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/seanmorley15) -
-AdventureLog - The ultimate travel companion for the modern-day explorer | Product Hunt - **[Documentation](https://adventurelog.app)** - **[Demo](https://demo.adventurelog.app)** From ca66b8583857b35b627b49744b4cae6e097bdff1 Mon Sep 17 00:00:00 2001 From: Sean Morley Date: Wed, 4 Dec 2024 12:43:26 -0500 Subject: [PATCH 04/10] Add Admin Panel guide to documentation --- documentation/.vitepress/config.mts | 4 ++++ documentation/docs/guides/admin_panel.md | 11 +++++++++++ 2 files changed, 15 insertions(+) create mode 100644 documentation/docs/guides/admin_panel.md diff --git a/documentation/.vitepress/config.mts b/documentation/.vitepress/config.mts index 5e315f8..3f1c502 100644 --- a/documentation/.vitepress/config.mts +++ b/documentation/.vitepress/config.mts @@ -113,6 +113,10 @@ export default defineConfig({ text: "Guides", collapsed: false, items: [ + { + text: "Admin Panel", + link: "/docs/guides/admin_panel", + }, { text: "v0.7.1 Migration Guide", link: "/docs/guides/v0-7-1_migration", diff --git a/documentation/docs/guides/admin_panel.md b/documentation/docs/guides/admin_panel.md new file mode 100644 index 0000000..bd13d66 --- /dev/null +++ b/documentation/docs/guides/admin_panel.md @@ -0,0 +1,11 @@ +# AdventureLog Admin Panel + +The AdventureLog Admin Panel, powered by Django, is a web-based interface that allows administrators to manage objects in the AdventureLog database. The Admin Panel is accessible at the `/admin` endpoint of the AdventureLog server. Example: `https://al-server.yourdomain.com/admin`. + +Features of the Admin Panel include: + +- **User Management**: Administrators can view and manage user accounts, including creating new users, updating user information, and deleting users. +- **Adventure Management**: Administrators can view and manage adventures, including creating new adventures, updating adventure information, and deleting adventures. +- **Security**: The Admin Panel enforces access control to ensure that only authorized administrators can access and manage the database. This means that only users with the `is_staff` flag set to `True` can access the Admin Panel. + +Note: the `CSRF_TRUSTED_ORIGINS` setting in your `docker-compose.yml` file must include the domain of the server. For example, if your server is hosted at `https://al-server.yourdomain.com`, you should add `al-server.yourdomain.com` to the `CSRF_TRUSTED_ORIGINS` setting. From 56a4292f4fcca2e7ad8b41b42abebe2f2af93df0 Mon Sep 17 00:00:00 2001 From: MaximUltimatum Date: Sat, 7 Dec 2024 14:26:18 -0500 Subject: [PATCH 05/10] Adding kustomize documentation --- documentation/docs/install/kustomize.md | 56 +++++++ .../docs/install/kustomize_example.md | 155 ++++++++++++++++++ 2 files changed, 211 insertions(+) create mode 100644 documentation/docs/install/kustomize.md create mode 100644 documentation/docs/install/kustomize_example.md diff --git a/documentation/docs/install/kustomize.md b/documentation/docs/install/kustomize.md new file mode 100644 index 0000000..3f972be --- /dev/null +++ b/documentation/docs/install/kustomize.md @@ -0,0 +1,56 @@ +# Kustomize (k8s) + +_AdventureLog can be run inside a kubernetes cluster using [kustomize](https://kustomize.io/)._ + +## Prerequisites + +A working kubernetes cluster. AdventureLog has been tested on k8s, but any Kustomize-capable flavor should be easy to use. + +## Cluster Routing +Because the AdventureLog backend must be reachable by **both** the web browser and the AdventureLog frontend, k8s-internal routing mechanisms traditional for standing up other similar applications **cannot** be used. + +In order to host AdventureLog in your cluster, you must therefor configure an internally and externally resolvable ingress that routes to your AdventureLog backend container. + +Once you have made said ingress, set `PUBLIC_SERVER_URL` and `PUBLIC_URL` env variables below to the url of that ingress. + +## Tailscale and Headscale +Many k8s homelabs choose to use [Tailscale](https://tailscale.com/) or similar projects to remove the need for open ports in your home firewall. + +The [Tailscale k8s Operator](https://tailscale.com/kb/1185/kubernetes/) will set up an externally resolvable service/ingress for your AdventureLog instance +but it will fail to resolve internally. + +You must [expose tailnet IPs to your cluster](https://tailscale.com/kb/1438/kubernetes-operator-cluster-egress#expose-a-tailnet-https-service-to-your-cluster-workloads) so the AdventureLog pods can resolve them. + +## Getting Started + +Take a look at the [example config](kustomize_example.md) and modify it for your usecase. + +## Environment Variables + +Look at the [environment variable summary](docker.md#configuration) in the docker install section to see available and required configuration options. + +### Frontend Container (web) + +| Name | Required | Description | Default Value | +| ------------------- | --------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------- | +| `PUBLIC_SERVER_URL` | Yes | What the frontend SSR server uses to connect to the backend. | http://server:8000 | +| `ORIGIN` | Sometimes | Not needed if using HTTPS. If not, set it to the domain of what you will acess the app from. | http://localhost:8015 | +| `BODY_SIZE_LIMIT` | Yes | Used to set the maximum upload size to the server. Should be changed to prevent someone from uploading too much! Custom values must be set in **kiliobytes**. | Infinity | + +### Backend Container (server) + +| Name | Required | Description | Default Value | +| ----------------------- | -------- | --------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------- | +| `PGHOST` | Yes | Databse host. | db | +| `PGDATABASE` | Yes | Database. | database | +| `PGUSER` | Yes | Database user. | adventure | +| `PGPASSWORD` | Yes | Database password. | changeme123 | +| `DJANGO_ADMIN_USERNAME` | Yes | Default username. | admin | +| `DJANGO_ADMIN_PASSWORD` | Yes | Default password, change after inital login. | admin | +| `DJANGO_ADMIN_EMAIL` | Yes | Default user's email. | admin@example.com | +| `PUBLIC_URL` | Yes | This needs to match the outward port of the server and be accessible from where the app is used. It is used for the creation of image urls. | 'http://localhost:8016' | +| `CSRF_TRUSTED_ORIGINS` | Yes | Need to be changed to the orgins where you use your backend server and frontend. These values are comma seperated. | http://localhost:8016 | +| `FRONTEND_URL` | Yes | This is the publically accessible url to the **frontend** container. This link should be accessable for all users. Used for email generation. | 'http://localhost:8015' | + + +Enjoy AdventureLog! 🎉 diff --git a/documentation/docs/install/kustomize_example.md b/documentation/docs/install/kustomize_example.md new file mode 100644 index 0000000..9396c32 --- /dev/null +++ b/documentation/docs/install/kustomize_example.md @@ -0,0 +1,155 @@ +```yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: example-name + labels: + app: adventure +spec: + replicas: 1 + selector: + matchLabels: + app: adventure + template: + metadata: + name: adventure + labels: + app: adventure + spec: + volumes: + - name: adventure-journal + persistentVolumeClaim: + claimName: adventure-journal-pvc + - name: adventure-journal-db + persistentVolumeClaim: + claimName: adventure-journal-db-pvc + containers: + - name: adventure-frontend + image: ghcr.io/seanmorley15/adventurelog-frontend:latest + imagePullPolicy: IfNotPresent + ports: + - containerPort: 3000 + env: + - name: PUBLIC_SERVER_URL + value: "http://internally-and-externally.reachable.io:80" + - name: ORIGIN + value: "http://url-typed-into-browser.io:80" + - name: BODY_SIZE_LIMIT + value: "Infinity" + + - name: adventure-db + image: postgis/postgis:15-3.3 + imagePullPolicy: IfNotPresent + ports: + - containerPort: 5432 + volumeMounts: + - name: adventure-journal-db + mountPath: /var/lib/postgresql/data + env: + - name: POSTGRES_DB + value: database + - name: PGDATA + value: /var/lib/postgresql/data/pgdata/subdir + - name: POSTGRES_USER + value: adventure + - name: POSTGRES_PASSWORD + valueFrom: + secretKeyRef: + name: adventurelog-secret + key: adventure-postgres-password + + - name: adventure-backend + image: ghcr.io/seanmorley15/adventurelog-backend:latest + imagePullPolicy: IfNotPresent + ports: + - containerPort: 80 + - containerPort: 8000 + volumeMounts: + - name: adventure-journal + mountPath: /code/media + env: + - name: PGHOST + value: "adventure-db-svc" + - name: PGDATABASE + value: "database" + - name: PGUSER + value: "adventure" + - name: PGPASSWORD + valueFrom: + secretKeyRef: + name: adventurelog-secret + key: adventure-postgres-password + - name: SECRET_KEY + valueFrom: + secretKeyRef: + name: adventurelog-secret + key: adventure-postgres-password + - name: PUBLIC_URL + value: "http://internally-and-externally.reachable.io:80" # Match the outward port, used for the creation of image urls + - name: FRONTEND_URL + value: "http://url-typed-into-browser.io:80" + - name: CSRF_TRUSTED_ORIGINS + value: "http://url-typed-into-browser.io:80, http://internally-and-externally.reachable.io:80" + - name: DJANGO_ADMIN_USERNAME + value: "admin" + - name: DJANGO_ADMIN_PASSWORD + value: "admin" + - name: DJANGO_ADMIN_EMAIL + value: "admin@example.com" + - name: DEBUG + value: "True" + restartPolicy: Always +--- +apiVersion: v1 +kind: Service +metadata: + name: adventure-db-svc +spec: + selector: + app: adventure + ports: + - name: db + protocol: TCP + port: 5432 + targetPort: 5432 +--- +apiVersion: v1 +kind: Service +metadata: + name: server +spec: + selector: + app: adventure + ports: + - name: http + protocol: TCP + port: 80 + targetPort: 80 + - name: base + protocol: TCP + port: 8000 + targetPort: 8000 +--- +# If you aren't automatically provisioning PVCs (i.e. with Longhorn, you'll need to also create the PV's) +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: adventure-journal-pvc +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 10Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: adventure-journal-db-pvc +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 10Gi +``` \ No newline at end of file From 91a51515dd01b7fde09302dbc97c5c5eec82a853 Mon Sep 17 00:00:00 2001 From: MaximUltimatum Date: Sat, 7 Dec 2024 14:31:13 -0500 Subject: [PATCH 06/10] Removing extraneous env variable info that is externally linked --- documentation/docs/install/kustomize.md | 26 +------------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/documentation/docs/install/kustomize.md b/documentation/docs/install/kustomize.md index 3f972be..6575325 100644 --- a/documentation/docs/install/kustomize.md +++ b/documentation/docs/install/kustomize.md @@ -16,7 +16,7 @@ Once you have made said ingress, set `PUBLIC_SERVER_URL` and `PUBLIC_URL` env va ## Tailscale and Headscale Many k8s homelabs choose to use [Tailscale](https://tailscale.com/) or similar projects to remove the need for open ports in your home firewall. -The [Tailscale k8s Operator](https://tailscale.com/kb/1185/kubernetes/) will set up an externally resolvable service/ingress for your AdventureLog instance +The [Tailscale k8s Operator](https://tailscale.com/kb/1185/kubernetes/) will set up an externally resolvable service/ingress for your AdventureLog instance, but it will fail to resolve internally. You must [expose tailnet IPs to your cluster](https://tailscale.com/kb/1438/kubernetes-operator-cluster-egress#expose-a-tailnet-https-service-to-your-cluster-workloads) so the AdventureLog pods can resolve them. @@ -29,28 +29,4 @@ Take a look at the [example config](kustomize_example.md) and modify it for your Look at the [environment variable summary](docker.md#configuration) in the docker install section to see available and required configuration options. -### Frontend Container (web) - -| Name | Required | Description | Default Value | -| ------------------- | --------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------- | -| `PUBLIC_SERVER_URL` | Yes | What the frontend SSR server uses to connect to the backend. | http://server:8000 | -| `ORIGIN` | Sometimes | Not needed if using HTTPS. If not, set it to the domain of what you will acess the app from. | http://localhost:8015 | -| `BODY_SIZE_LIMIT` | Yes | Used to set the maximum upload size to the server. Should be changed to prevent someone from uploading too much! Custom values must be set in **kiliobytes**. | Infinity | - -### Backend Container (server) - -| Name | Required | Description | Default Value | -| ----------------------- | -------- | --------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------- | -| `PGHOST` | Yes | Databse host. | db | -| `PGDATABASE` | Yes | Database. | database | -| `PGUSER` | Yes | Database user. | adventure | -| `PGPASSWORD` | Yes | Database password. | changeme123 | -| `DJANGO_ADMIN_USERNAME` | Yes | Default username. | admin | -| `DJANGO_ADMIN_PASSWORD` | Yes | Default password, change after inital login. | admin | -| `DJANGO_ADMIN_EMAIL` | Yes | Default user's email. | admin@example.com | -| `PUBLIC_URL` | Yes | This needs to match the outward port of the server and be accessible from where the app is used. It is used for the creation of image urls. | 'http://localhost:8016' | -| `CSRF_TRUSTED_ORIGINS` | Yes | Need to be changed to the orgins where you use your backend server and frontend. These values are comma seperated. | http://localhost:8016 | -| `FRONTEND_URL` | Yes | This is the publically accessible url to the **frontend** container. This link should be accessable for all users. Used for email generation. | 'http://localhost:8015' | - - Enjoy AdventureLog! 🎉 From 914028ea2fadbec2e031e04176c080360e2dcfe3 Mon Sep 17 00:00:00 2001 From: Sean Morley Date: Sat, 7 Dec 2024 16:25:31 -0500 Subject: [PATCH 07/10] Update Kubernetes and Kustomize documentation --- documentation/.vitepress/config.mts | 4 ++++ documentation/docs/install/kustomize.md | 6 ++++-- .../install/kustomize_example.md => kustomization.yml | 10 ++++------ 3 files changed, 12 insertions(+), 8 deletions(-) rename documentation/docs/install/kustomize_example.md => kustomization.yml (97%) diff --git a/documentation/.vitepress/config.mts b/documentation/.vitepress/config.mts index 5e315f8..243cec9 100644 --- a/documentation/.vitepress/config.mts +++ b/documentation/.vitepress/config.mts @@ -65,6 +65,10 @@ export default defineConfig({ { text: "Docker 🐋", link: "/docs/install/docker" }, { text: "Proxmox LXC 🐧", link: "/docs/install/proxmox_lxc" }, { text: "Synology NAS ☁️", link: "/docs/install/synology_nas" }, + { + text: "Kubernetes and Kustomize 🌐", + link: "/docs/install/kustomize", + }, { text: "With A Reverse Proxy", diff --git a/documentation/docs/install/kustomize.md b/documentation/docs/install/kustomize.md index 6575325..5e9d074 100644 --- a/documentation/docs/install/kustomize.md +++ b/documentation/docs/install/kustomize.md @@ -1,4 +1,4 @@ -# Kustomize (k8s) +# Kubernetes and Kustomize (k8s) _AdventureLog can be run inside a kubernetes cluster using [kustomize](https://kustomize.io/)._ @@ -7,6 +7,7 @@ _AdventureLog can be run inside a kubernetes cluster using [kustomize](https://k A working kubernetes cluster. AdventureLog has been tested on k8s, but any Kustomize-capable flavor should be easy to use. ## Cluster Routing + Because the AdventureLog backend must be reachable by **both** the web browser and the AdventureLog frontend, k8s-internal routing mechanisms traditional for standing up other similar applications **cannot** be used. In order to host AdventureLog in your cluster, you must therefor configure an internally and externally resolvable ingress that routes to your AdventureLog backend container. @@ -14,6 +15,7 @@ In order to host AdventureLog in your cluster, you must therefor configure an in Once you have made said ingress, set `PUBLIC_SERVER_URL` and `PUBLIC_URL` env variables below to the url of that ingress. ## Tailscale and Headscale + Many k8s homelabs choose to use [Tailscale](https://tailscale.com/) or similar projects to remove the need for open ports in your home firewall. The [Tailscale k8s Operator](https://tailscale.com/kb/1185/kubernetes/) will set up an externally resolvable service/ingress for your AdventureLog instance, @@ -23,7 +25,7 @@ You must [expose tailnet IPs to your cluster](https://tailscale.com/kb/1438/kube ## Getting Started -Take a look at the [example config](kustomize_example.md) and modify it for your usecase. +Take a look at the [example config](https://github.com/seanmorley15/AdventureLog/blob/main/kustomization.yml) and modify it for your usecase. ## Environment Variables diff --git a/documentation/docs/install/kustomize_example.md b/kustomization.yml similarity index 97% rename from documentation/docs/install/kustomize_example.md rename to kustomization.yml index 9396c32..da7c6e7 100644 --- a/documentation/docs/install/kustomize_example.md +++ b/kustomization.yml @@ -1,4 +1,3 @@ -```yaml apiVersion: apps/v1 kind: Deployment metadata: @@ -36,7 +35,7 @@ spec: value: "http://url-typed-into-browser.io:80" - name: BODY_SIZE_LIMIT value: "Infinity" - + - name: adventure-db image: postgis/postgis:15-3.3 imagePullPolicy: IfNotPresent @@ -53,7 +52,7 @@ spec: - name: POSTGRES_USER value: adventure - name: POSTGRES_PASSWORD - valueFrom: + valueFrom: secretKeyRef: name: adventurelog-secret key: adventure-postgres-password @@ -75,7 +74,7 @@ spec: - name: PGUSER value: "adventure" - name: PGPASSWORD - valueFrom: + valueFrom: secretKeyRef: name: adventurelog-secret key: adventure-postgres-password @@ -125,7 +124,7 @@ spec: protocol: TCP port: 80 targetPort: 80 - - name: base + - name: base protocol: TCP port: 8000 targetPort: 8000 @@ -152,4 +151,3 @@ spec: resources: requests: storage: 10Gi -``` \ No newline at end of file From 2f321517a6a24e4c4a32644c9b16099127cf619b Mon Sep 17 00:00:00 2001 From: Sean Morley <98704938+seanmorley15@users.noreply.github.com> Date: Sat, 7 Dec 2024 17:45:26 -0500 Subject: [PATCH 08/10] Update getting_started.md --- documentation/docs/install/getting_started.md | 1 + 1 file changed, 1 insertion(+) diff --git a/documentation/docs/install/getting_started.md b/documentation/docs/install/getting_started.md index 67d655f..d8dd5f8 100644 --- a/documentation/docs/install/getting_started.md +++ b/documentation/docs/install/getting_started.md @@ -5,6 +5,7 @@ AdventureLog can be installed in a variety of ways. The following are the most c - [Docker](docker.md) 🐳 - [Proxmox LXC](proxmox_lxc.md) 🐧 - [Synology NAS](synology_nas.md) ☁️ +- [Kubernetes and Kustomize](kustomize.md) 🌐 ### Other Options From f7742ca37db59372faa64b10c487742c0dec8dd3 Mon Sep 17 00:00:00 2001 From: Sean Morley Date: Sat, 7 Dec 2024 20:10:24 -0500 Subject: [PATCH 09/10] Filter visited regions by user ID in ReverseGeocodeViewSet --- backend/server/adventures/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/server/adventures/views.py b/backend/server/adventures/views.py index a0307dd..9ad79c3 100644 --- a/backend/server/adventures/views.py +++ b/backend/server/adventures/views.py @@ -1143,7 +1143,7 @@ def extractIsoCode(self, data): if not iso_code: return {"error": "No region found"} region = Region.objects.filter(id=iso_code).first() - visited_region = VisitedRegion.objects.filter(region=region).first() + visited_region = VisitedRegion.objects.filter(region=region, user_id=self.request.user).first() is_visited = False country_code = iso_code[:2] From febbdfa252c4c50e9be664fbcf61c95813b86458 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 15 Dec 2024 17:15:18 +0000 Subject: [PATCH 10/10] Bump the npm_and_yarn group across 2 directories with 2 updates Bumps the npm_and_yarn group with 1 update in the /documentation directory: [nanoid](https://github.com/ai/nanoid). Bumps the npm_and_yarn group with 2 updates in the /frontend directory: [nanoid](https://github.com/ai/nanoid) and [cross-spawn](https://github.com/moxystudio/node-cross-spawn). Updates `nanoid` from 3.3.7 to 3.3.8 - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.3.7...3.3.8) Updates `nanoid` from 3.3.7 to 3.3.8 - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.3.7...3.3.8) Updates `cross-spawn` from 7.0.3 to 7.0.6 - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md) - [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: nanoid dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: cross-spawn dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] --- documentation/pnpm-lock.yaml | 8 ++++---- frontend/pnpm-lock.yaml | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/documentation/pnpm-lock.yaml b/documentation/pnpm-lock.yaml index 0371b16..109ad48 100644 --- a/documentation/pnpm-lock.yaml +++ b/documentation/pnpm-lock.yaml @@ -612,8 +612,8 @@ packages: mitt@3.0.1: resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==} - nanoid@3.3.7: - resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} + nanoid@3.3.8: + resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true @@ -1352,7 +1352,7 @@ snapshots: mitt@3.0.1: {} - nanoid@3.3.7: {} + nanoid@3.3.8: {} oniguruma-to-es@0.4.1: dependencies: @@ -1366,7 +1366,7 @@ snapshots: postcss@8.4.49: dependencies: - nanoid: 3.3.7 + nanoid: 3.3.8 picocolors: 1.1.1 source-map-js: 1.2.1 diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 702ef84..e7ca501 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -899,8 +899,8 @@ packages: resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==} engines: {node: '>= 0.6'} - cross-spawn@7.0.3: - resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} + cross-spawn@7.0.6: + resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} engines: {node: '>= 8'} css-selector-tokenizer@0.8.0: @@ -1432,8 +1432,8 @@ packages: mz@2.7.0: resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} - nanoid@3.3.7: - resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} + nanoid@3.3.8: + resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true @@ -2358,7 +2358,7 @@ snapshots: '@jsdevtools/ez-spawn@3.0.4': dependencies: call-me-maybe: 1.0.2 - cross-spawn: 7.0.3 + cross-spawn: 7.0.6 string-argv: 0.3.2 type-detect: 4.0.8 @@ -2819,7 +2819,7 @@ snapshots: cookie@0.6.0: {} - cross-spawn@7.0.3: + cross-spawn@7.0.6: dependencies: path-key: 3.1.1 shebang-command: 2.0.0 @@ -3000,7 +3000,7 @@ snapshots: execa@5.1.1: dependencies: - cross-spawn: 7.0.3 + cross-spawn: 7.0.6 get-stream: 6.0.1 human-signals: 2.1.0 is-stream: 2.0.1 @@ -3057,7 +3057,7 @@ snapshots: foreground-child@3.2.1: dependencies: - cross-spawn: 7.0.3 + cross-spawn: 7.0.6 signal-exit: 4.1.0 fraction.js@4.3.7: {} @@ -3394,7 +3394,7 @@ snapshots: object-assign: 4.1.1 thenify-all: 1.6.0 - nanoid@3.3.7: {} + nanoid@3.3.8: {} next-tick@1.1.0: {} @@ -3548,13 +3548,13 @@ snapshots: postcss@8.4.38: dependencies: - nanoid: 3.3.7 + nanoid: 3.3.8 picocolors: 1.0.1 source-map-js: 1.2.0 postcss@8.4.47: dependencies: - nanoid: 3.3.7 + nanoid: 3.3.8 picocolors: 1.1.0 source-map-js: 1.2.1