Merge remote-tracking branch 'origin/main' into g/front-end-custom-do…

…mains

# By Jessica McInchak (11) and Dafydd Llŷr Pearson (10)
# Via GitHub
* origin/main: (21 commits)
  chore: Upgrade Editor dependencies (Part 1) (#1047)
  chore: upgrade metabase (#1050)
  fix: Drop sslPolicy for HTTP (#1051)
  chore(infra): Update HTTP/HTTPS listener SSL policy (#1049)
  chore: Enable Save and Return by default (#1048)
  fix: add single line address as separate CSV row (#1046)
  feat: Enable emailReplyToID (#1044)
  fix: Display ContentPage on Save and Return path (#1045)
  chore: upgrade scripts/seed-database dependencies (#1043)
  chore: upgrade e2e test dependencies (#1042)
  fix: adjust HASURA_GRAPHQL_CORS_DOMAIN in pulumi (#1041)
  fix: preserve breadcrumb order when reconciling changed content (#1034)
  fix: restrict a user from drawing a site boundary and uploading a location plan (#1040)
  feat: Apply basic rate limiting to API (#1038)
  fix: use HASURA_GRAPHQL_CORS_DOMAIN env variable to whitelist domains (#1039)
  fix: Downgrade passport back to 0.5.3 (#1037)
  chore: Update Hasura (#1035)
  build: Upgrade API dependencies (#1033)
  chore: remove Uniform feature flag (#1027)
  fix: Review page shows all DrawBoundary data (map and/or plan) and file gets correct BOPS tag (#1030)
  ...

# Conflicts:
#	editor.planx.uk/package.json
#	editor.planx.uk/pnpm-lock.yaml

.env

@@ -7,7 +7,10 @@ API_URL_EXT=http://localhost:${API_PORT}
 HASURA_GRAPHQL_ADMIN_SECRET=TODO
 HASURA_GRAPHQL_PORT=7000
 HASURA_GRAPHQL_URL=http://localhost:${HASURA_GRAPHQL_PORT}/v1/graphql
+HASURA_GRAPHQL_CORS_DOMAIN="http://localhost:${API_PORT}, http://localhost:3000, http://api:${API_PORT}, http://localhost:${HASURA_GRAPHQL_PORT}/v1/graphql, https://*.planx.uk, https://*.planx.dev, https://*.planx.pizza, https://*.gov.uk"
+
 HASURA_PLANX_API_URL=http://api:${API_PORT}
+HASURA_PLANX_API_KEY=REPLACE
 
 METABASE_PORT=5000
 
@@ -52,5 +55,3 @@ GOVUK_NOTIFY_SAVE_RETURN_EMAIL_TEMPLATE_ID=428c4dfd-a70b-44d6-9f81-b4f833d80405
 GOVUK_NOTIFY_RESUME_EMAIL_TEMPLATE_ID=c7202e07-08cf-468e-a6a4-ac528d60d2f7
 GOVUK_NOTIFY_REMINDER_EMAIL_TEMPLATE_ID=43be4c11-a406-4381-b2be-056a1127455d
 GOVUK_NOTIFY_EXPIRY_EMAIL_TEMPLATE_ID=9619f89d-5d33-4cb0-a365-42c431ea9db3
-
-HASURA_PLANX_API_KEY=REPLACE

.github/workflows/pull-request-main.yml

@@ -49,7 +49,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: pnpm/[email protected]
         with:
-          version: ${{ env.PNPM_VERSION }}
+          version: 7.5.2
       - uses: actions/setup-node@v2
         with:
           node-version: ${{ env.NODE_VERSION }}

api.planx.uk/Dockerfile

@@ -2,7 +2,7 @@
 FROM node:16.13.1-alpine as base
 
 WORKDIR /api
-RUN npm install -g pnpm@6.24.1
+RUN npm install -g pnpm@7.5.2
 COPY pnpm-lock.yaml .
 EXPOSE 4000
 

api.planx.uk/README.md

@@ -4,7 +4,7 @@ This currently handles the login process for PlanX. Most of the functionality of
 
 ## Running locally
 
-Install [pnpm](https://pnpm.io) if you don't have it `npm install -g pnpm@6.24.1`
+Install [pnpm](https://pnpm.io) if you don't have it `npm install -g pnpm@7.5.2`
 
 Then install the project's dependencies
 

api.planx.uk/package.json

@@ -3,30 +3,31 @@
   "license": "MPL-2.0",
   "private": true,
   "dependencies": {
-    "@airbrake/node": "^2.1.5",
+    "@airbrake/node": "^2.1.7",
     "adm-zip": "^0.5.9",
-    "aws-sdk": "^2.727.1",
+    "aws-sdk": "^2.1180.0",
     "axios": "^0.27.2",
-    "body-parser": "^1.19.0",
-    "cookie-parser": "^1.4.5",
+    "body-parser": "^1.20.0",
+    "cookie-parser": "^1.4.6",
     "cookie-session": "^1.4.0",
     "cors": "^2.8.5",
-    "csv-stringify": "^5.6.2",
-    "date-fns": "^2.28.0",
-    "express": "^4.17.1",
-    "express-jwt": "^6.0.0",
-    "express-pino-logger": "^6.0.0",
+    "csv-stringify": "^6.2.0",
+    "date-fns": "^2.29.1",
+    "express": "^4.18.1",
+    "express-jwt": "^7.7.5",
+    "express-pino-logger": "^7.0.0",
+    "express-rate-limit": "^6.5.1",
     "form-data": "^4.0.0",
     "graphql": "^16.5.0",
-    "graphql-request": "^4.2.0",
-    "http-proxy-middleware": "^1.3.1",
-    "isomorphic-fetch": "^2.2.1",
+    "graphql-request": "^4.3.0",
+    "http-proxy-middleware": "^2.0.6",
+    "isomorphic-fetch": "^3.0.0",
     "jsondiffpatch": "^0.4.1",
     "jsonwebtoken": "^8.5.1",
-    "mime": "^2.4.6",
-    "nanoid": "^3.1.12",
+    "mime": "^3.0.0",
+    "nanoid": "^3.3.4",
     "notifications-node-client": "^5.1.1",
-    "passport": "^0.4.1",
+    "passport": "^0.5.3",
     "passport-google-oauth20": "^2.0.0",
     "pino-noir": "^2.2.1",
     "string-to-stream": "^3.0.1"
@@ -38,15 +39,31 @@
     "test:watch": "jest --watch"
   },
   "devDependencies": {
-    "dotenv": "^8.2.0",
-    "esbuild": "^0.12.22",
+    "dotenv": "^16.0.1",
+    "esbuild": "^0.14.49",
     "esbuild-jest": "^0.5.0",
     "graphql-query-test-mock": "^0.12.1",
-    "jest": "^26.6.3",
+    "jest": "^28.1.3",
     "json-stringify-pretty-compact": "^3.0.0",
-    "nock": "^13.0.11",
-    "node-dev": "^5.0.0",
-    "prettier": "2.x",
-    "supertest": "^6.1.3"
+    "nock": "^13.2.9",
+    "node-dev": "^7.4.3",
+    "prettier": "~2.7.1",
+    "supertest": "^6.2.4"
+  },
+  "pnpm": {
+    "peerDependencyRules": {
+      "allowedVersions": {
+        "nock": "13"
+      }
+    },
+    "overrides": {
+      "passport-oauth2@<1.6.1": ">=1.6.1",
+      "tmpl@<1.0.5": ">=1.0.5",
+      "ansi-regex@>=5.0.0 <5.0.1": ">=5.0.1"
+    }
+  },
+  "engines": {
+    "node": "^16",
+    "pnpm": "^7"
   }
 }