Merge branch 'main' of github.com:theopensystemslab/planx-new into je…

…ss/override-constraints-no-map
theopensystemslab · Jun 3, 2024 · 9923999 · 9923999
2 parents d0bb72d + f706ff9
commit 9923999
Show file tree

Hide file tree

Showing 24 changed files with 1,148 additions and 893 deletions.
diff --git a/.github/workflows/pizza-teardown-manual.yml b/.github/workflows/pizza-teardown-manual.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Remove vultr resources
-        uses: theopensystemslab/vultr-action@v1.15
+        uses: theopensystemslab/vultr-action@v2.0
         with:
           action: destroy
           api_key: ${{ secrets.VULTR_API_KEY }}

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -79,7 +79,7 @@ jobs:
           fail: true
       - name: Setup .gitconfig
         run: mv .gitconfig ~/.gitconfig
-      - uses: pnpm/action-setup@v3.0.0
+      - uses: pnpm/action-setup@v4.0.0
         with:
           version: ${{ vars.PNPM_VERSION }}
       - uses: actions/setup-node@v4
@@ -122,7 +122,7 @@ jobs:
           fail: true
       - name: Setup .gitconfig
         run: mv .gitconfig ~/.gitconfig
-      - uses: pnpm/action-setup@v3.0.0
+      - uses: pnpm/action-setup@v4.0.0
         with:
           version: ${{ vars.PNPM_VERSION }}
       - uses: actions/setup-node@v4
@@ -158,7 +158,7 @@ jobs:
         with:
           files: ".env, .env.staging, api.planx.uk/.env.test, hasura.planx.uk/.env.test"
           fail: true
-      - uses: pnpm/action-setup@v3.0.0
+      - uses: pnpm/action-setup@v4.0.0
         with:
           version: ${{ vars.PNPM_VERSION }}
       - uses: actions/setup-node@v4
@@ -188,7 +188,7 @@ jobs:
         with:
           path: ./${{ env.EDITOR_DIRECTORY }}/build
           key: ${{ runner.os }}-${{ hashFiles('editor.planx.uk/**') }}
-      - uses: pnpm/action-setup@v3.0.0
+      - uses: pnpm/action-setup@v4.0.0
         if: steps.cache-react-build-assets.outputs.cache-hit != 'true'
         with:
           version: ${{ vars.PNPM_VERSION }}
@@ -243,7 +243,7 @@ jobs:
           aws-access-key-id: ${{ secrets.STAGING_AWS_ACCESS_KEY_ID }}
           aws-region: eu-west-2
           aws-secret-access-key: ${{ secrets.STAGING_AWS_SECRET_ACCESS_KEY }}
-      - uses: pnpm/action-setup@v3.0.0
+      - uses: pnpm/action-setup@v4.0.0
         with:
           version: ${{ vars.PNPM_VERSION }}
       - uses: actions/setup-node@v4
@@ -443,7 +443,7 @@ jobs:
       - name: Copy .env files from Staging S3 to the current working directory with AWS CLI
         run: ./scripts/pull-secrets.sh
       - name: Setup PNPM
-        uses: pnpm/action-setup@v3.0.0
+        uses: pnpm/action-setup@v4.0.0
         with:
           version: ${{ vars.PNPM_VERSION }}
       - name: Setup Node

diff --git a/.github/workflows/regression-tests.yml b/.github/workflows/regression-tests.yml
@@ -30,7 +30,7 @@ jobs:
           fail: true
       - name: Setup .gitconfig
         run: mv .gitconfig ~/.gitconfig
-      - uses: pnpm/action-setup@v3.0.0
+      - uses: pnpm/action-setup@v4.0.0
         with:
           version: ${{ vars.PNPM_VERSION }}
       - uses: actions/setup-node@v4
@@ -69,7 +69,7 @@ jobs:
         with:
           files: ".env, .env.staging, api.planx.uk/.env.test, hasura.planx.uk/.env.test"
           fail: true
-      - uses: pnpm/action-setup@v3.0.0
+      - uses: pnpm/action-setup@v4.0.0
         with:
           version: ${{ vars.PNPM_VERSION }}
       - uses: actions/setup-node@v4
@@ -105,7 +105,7 @@ jobs:
         with:
           files: ".env, .env.staging, api.planx.uk/.env.test, hasura.planx.uk/.env.test"
           fail: true
-      - uses: pnpm/action-setup@v3.0.0
+      - uses: pnpm/action-setup@v4.0.0
         with:
           version: ${{ vars.PNPM_VERSION }}
       - uses: actions/setup-node@v4
@@ -137,7 +137,7 @@ jobs:
       - name: Copy .env files from Staging S3 to the current working directory with AWS CLI
         run: ./scripts/pull-secrets.sh
       - name: Setup PNPM
-        uses: pnpm/action-setup@v3.0.0
+        uses: pnpm/action-setup@v4.0.0
         with:
           version: ${{ vars.PNPM_VERSION }}
       - name: Setup Node

diff --git a/api.planx.uk/package.json b/api.planx.uk/package.json
@@ -14,7 +14,7 @@
     "cookie-session": "^2.1.0",
     "copyfiles": "^2.4.1",
     "cors": "^2.8.5",
-    "csv-stringify": "^6.4.5",
+    "csv-stringify": "^6.5.0",
     "date-fns": "^3.3.1",
     "dompurify": "^3.1.2",
     "express": "^4.19.2",
@@ -37,7 +37,7 @@
     "mime": "^3.0.0",
     "multer": "^1.4.5-lts.1",
     "nanoid": "^3.3.7",
-    "notifications-node-client": "^8.0.0",
+    "notifications-node-client": "^8.1.0",
     "passport": "^0.5.3",
     "passport-google-oauth20": "^2.0.0",
     "pino-noir": "^2.2.1",
@@ -95,9 +95,9 @@
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "dotenv": "^16.4.5",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.21.4",
     "esbuild-jest": "^0.5.0",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-jest": "^27.9.0",
     "graphql-query-test-mock": "^0.12.1",