From a6bd8d87eae3770b4ef855b80319c9588427a952 Mon Sep 17 00:00:00 2001 From: Derek Roberts Date: Mon, 28 Aug 2023 16:59:10 -0700 Subject: [PATCH 1/3] Node 18 -> 20 --- .github/workflows/unit-tests.yml | 2 +- docker-compose.yml | 2 +- frontend/Dockerfile | 2 +- frontend/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 923b0a11..ec9eebd9 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -42,7 +42,7 @@ jobs: npm ci npm run test:cov dir: frontend - node_version: "18" + node_version: "20" sonar_args: > -Dsonar.exclusions=**/coverage/**,**/node_modules/**,**/*spec.ts -Dsonar.organization=bcgov-sonarcloud diff --git a/docker-compose.yml b/docker-compose.yml index 776b7c95..b846c2c4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: REACT_APP_USER_POOLS_ID: ca-central-1_t2HSZBHurS REACT_APP_USER_POOLS_WEB_CLIENT_ID: 37798cpec8d4u1a2njt02nonp7 REACT_APP_AWS_DOMAIN: prod-fam-user-pool-domain.auth.ca-central-1.amazoncognito.com - image: node:18-bullseye + image: node:20-bullseye ports: ["3000:3000"] volumes: ["./frontend:/app", "/app/node_modules"] restart: always diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 4f7d1554..bbcb3acb 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18-slim AS build +FROM node:20-slim AS build # Build static files WORKDIR /app diff --git a/frontend/package.json b/frontend/package.json index 1e96055d..cd2e758e 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -10,7 +10,7 @@ "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.0.0", "@types/jest": "^29.5.4", - "@types/node": "^18.0.0", + "@types/node": "^20.0.0", "@types/react": "^18.2.0", "@types/react-dom": "^18.2.1", "aws-amplify": "^5.3.10", From 688aebe57f2a210b9ca3e10192194ee5fdf02e83 Mon Sep 17 00:00:00 2001 From: Derek Roberts Date: Mon, 28 Aug 2023 17:06:46 -0700 Subject: [PATCH 2/3] package-lock.json --- frontend/package-lock.json | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index a367410e..e272b93f 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -15,7 +15,7 @@ "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.0.0", "@types/jest": "^29.5.4", - "@types/node": "^18.0.0", + "@types/node": "^20.0.0", "@types/react": "^18.2.0", "@types/react-dom": "^18.2.1", "aws-amplify": "^5.3.10", @@ -11113,9 +11113,9 @@ "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==" }, "node_modules/@types/node": { - "version": "18.17.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.12.tgz", - "integrity": "sha512-d6xjC9fJ/nSnfDeU0AMDsaJyb1iHsqCSOdi84w4u+SlN/UgQdY5tRhpMzaFYsI4mnpvgTivEaQd0yOUhAtOnEQ==" + "version": "20.5.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.7.tgz", + "integrity": "sha512-dP7f3LdZIysZnmvP3ANJYTSwg+wLLl8p7RqniVlV7j+oXSXAbt9h0WIBFmJy5inWZoX9wZN6eXx+YXd9Rh3RBA==" }, "node_modules/@types/node-fetch": { "version": "2.6.4", @@ -16391,6 +16391,7 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, +<<<<<<< HEAD "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -16404,6 +16405,8 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, +======= +>>>>>>> 66af3f8 (package-lock.json) "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", From 737e3acb7d04d2005a31e5fce2527fef6e57fe30 Mon Sep 17 00:00:00 2001 From: Derek Roberts Date: Tue, 29 Aug 2023 10:03:53 -0700 Subject: [PATCH 3/3] package-lock.json again --- frontend/package-lock.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index e272b93f..ab82bd4c 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -16391,7 +16391,6 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, -<<<<<<< HEAD "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -16405,8 +16404,6 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, -======= ->>>>>>> 66af3f8 (package-lock.json) "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",