From a022106a3426b5150580c5fcf536e5744aa8f520 Mon Sep 17 00:00:00 2001 From: Ben Bangert <100193+bbangert@users.noreply.github.com> Date: Tue, 12 Mar 2024 18:18:36 -0700 Subject: [PATCH] chore: update node to LTS 20 Because: * We want to use the latest LTS version of node. This commit: * Updates the .nvmrc/Dockerfile and package.json files to use node 20. --- .nvmrc | 2 +- _dev/docker/ci-lockfile-generator/Dockerfile | 2 +- _dev/docker/ci/Dockerfile | 4 +-- _dev/docker/mono/Dockerfile | 2 +- package.json | 6 ++--- packages/fxa-admin-server/package.json | 2 +- packages/fxa-auth-client/package.json | 2 +- packages/fxa-auth-server/package.json | 2 +- packages/fxa-event-broker/package.json | 2 +- packages/fxa-graphql-api/package.json | 2 +- packages/fxa-payments-server/package.json | 2 +- packages/fxa-react/package.json | 2 +- packages/fxa-settings/package.json | 2 +- packages/fxa-shared/package.json | 2 +- yarn.lock | 28 ++++++++++---------- 15 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.nvmrc b/.nvmrc index 87ec8842b1..2dbbe00e67 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.18.2 +20.11.1 diff --git a/_dev/docker/ci-lockfile-generator/Dockerfile b/_dev/docker/ci-lockfile-generator/Dockerfile index 6c04f12868..1599237f6c 100644 --- a/_dev/docker/ci-lockfile-generator/Dockerfile +++ b/_dev/docker/ci-lockfile-generator/Dockerfile @@ -5,7 +5,7 @@ # By running a yarn install inside the same base container that we use in our CI, we can # ensure the same checksums are created correctly. # -FROM cimg/node:18.18 +FROM cimg/node:20.11 COPY . . RUN sudo yarn cache clear --all diff --git a/_dev/docker/ci/Dockerfile b/_dev/docker/ci/Dockerfile index 0fe0a02cae..5d82ba7e83 100644 --- a/_dev/docker/ci/Dockerfile +++ b/_dev/docker/ci/Dockerfile @@ -4,7 +4,7 @@ # Runs tests and common CI operations. Needs minimal install. Assumes # workspace will be restored into the project folder. -FROM cimg/node:18.18 as test-runner +FROM cimg/node:20.11 as test-runner RUN sudo apt-get update && sudo apt-get install -y \ python3-venv WORKDIR /home/circleci @@ -38,7 +38,7 @@ RUN npx playwright install firefox; # Runs functional tests in our CI. Needs minimal install. Assumes # workspace will be restored into the project folder. -FROM cimg/node:18.18-browsers as functional-test-runner +FROM cimg/node:20.11-browsers as functional-test-runner WORKDIR /home/circleci COPY --chown=circleci:circleci --from=playwright-install /home/circleci/.cache/ms-playwright .cache/ms-playwright/ COPY --chown=circleci:circleci project project diff --git a/_dev/docker/mono/Dockerfile b/_dev/docker/mono/Dockerfile index 04a6958922..39a93a77d3 100644 --- a/_dev/docker/mono/Dockerfile +++ b/_dev/docker/mono/Dockerfile @@ -1,7 +1,7 @@ # Multi stage docker build for fxa-mono repo. Note that stages should be cached due to docker layer caching being # turned on in CI. -FROM node:18.18.2-bullseye-slim AS fxa-base +FROM node:20.11.1-bullseye-slim AS fxa-base RUN set -x \ && addgroup --gid 10001 app \ && adduser --disabled-password \ diff --git a/package.json b/package.json index 077240f1ed..7d12683145 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "winston": "^3.11.0" }, "engines": { - "node": "^18.18.2" + "node": "^20.11.1" }, "husky": { "hooks": { @@ -174,7 +174,7 @@ "@types/babel__core": "^7", "@types/jest": "^29.5.1", "@types/mysql": "^2", - "@types/node": "^18.18.2", + "@types/node": "^20.11.1", "@types/passport": "^1.0.6", "@types/passport-http-bearer": "^1.0.36", "@types/passport-jwt": "^4", @@ -230,7 +230,7 @@ "@graphql-typed-document-node/core": "3.2.0", "@nestjs/cli/typescript": "^4.5.2", "@svgr/webpack": "^8.0.1", - "@types/node": "^18.18.2", + "@types/node": "^20.11.1", "@types/react": "^18", "browserid-crypto": "https://github.com/mozilla-fxa/browserid-crypto.git#5979544d13eeb15a02d0b9a6a7a08a698d54d37d", "css-minimizer-webpack-plugin": ">=4 <5", diff --git a/packages/fxa-admin-server/package.json b/packages/fxa-admin-server/package.json index 6524951d10..18bb88e0f8 100644 --- a/packages/fxa-admin-server/package.json +++ b/packages/fxa-admin-server/package.json @@ -60,7 +60,7 @@ "@nestjs/cli": "^9.4.0", "@types/chance": "^1.1.2", "@types/convict": "^6.1.1", - "@types/node": "^18.18.2", + "@types/node": "^20.11.1", "@types/pem-jwk": "^2", "@types/supertest": "^2.0.11", "@types/yargs": "^17.0.0", diff --git a/packages/fxa-auth-client/package.json b/packages/fxa-auth-client/package.json index e3f6c81a3f..ea8d97c74a 100644 --- a/packages/fxa-auth-client/package.json +++ b/packages/fxa-auth-client/package.json @@ -55,7 +55,7 @@ "@types/assert": "^1.5.4", "@types/fast-text-encoding": "^1", "@types/mocha": "^8", - "@types/node": "^18.18.2", + "@types/node": "^20.11.1", "@types/node-fetch": "^2.5.7", "@types/prettier": "^2", "asmcrypto.js": "^0.22.0", diff --git a/packages/fxa-auth-server/package.json b/packages/fxa-auth-server/package.json index c83a876ce7..d723d6a9ad 100644 --- a/packages/fxa-auth-server/package.json +++ b/packages/fxa-auth-server/package.json @@ -165,7 +165,7 @@ "@types/memcached": "^2.2.6", "@types/mocha": "^8.2.2", "@types/nock": "^11.1.0", - "@types/node": "^18.18.2", + "@types/node": "^20.11.1", "@types/node-zendesk": "^2.0.2", "@types/nodemailer": "^6.4.2", "@types/request": "2.48.5", diff --git a/packages/fxa-event-broker/package.json b/packages/fxa-event-broker/package.json index 03d6ef854d..93e1a46e03 100644 --- a/packages/fxa-event-broker/package.json +++ b/packages/fxa-event-broker/package.json @@ -59,7 +59,7 @@ "@types/convict": "^5.2.2", "@types/express": "^4.17.12", "@types/jest": "^26.0.23", - "@types/node": "^18.18.2", + "@types/node": "^20.11.1", "@types/passport": "^1.0.6", "@types/passport-jwt": "^3.0.5", "@types/rimraf": "3.0.0", diff --git a/packages/fxa-graphql-api/package.json b/packages/fxa-graphql-api/package.json index d6b2da2bbb..be0b841510 100644 --- a/packages/fxa-graphql-api/package.json +++ b/packages/fxa-graphql-api/package.json @@ -72,7 +72,7 @@ "@types/graphql": "^14.5.0", "@types/ioredis": "^4.26.4", "@types/jest": "^29.2.5", - "@types/node": "^18.18.2", + "@types/node": "^20.11.1", "@types/passport": "^1.0.6", "@types/passport-http-bearer": "^1.0.36", "@types/superagent": "4.1.11", diff --git a/packages/fxa-payments-server/package.json b/packages/fxa-payments-server/package.json index 272b62ee05..45d867b92e 100644 --- a/packages/fxa-payments-server/package.json +++ b/packages/fxa-payments-server/package.json @@ -76,7 +76,7 @@ "@types/jest": "^26.0.23", "@types/jsdom": "^16.2.11", "@types/nock": "^11.1.0", - "@types/node": "^18.18.2", + "@types/node": "^20.11.1", "@types/postcss-import": "^12", "@types/react-redux": "^7.1.18", "@types/react-stripe-elements": "^6.0.6", diff --git a/packages/fxa-react/package.json b/packages/fxa-react/package.json index 94f1e00cc4..5f88de177e 100644 --- a/packages/fxa-react/package.json +++ b/packages/fxa-react/package.json @@ -66,7 +66,7 @@ "@types/classnames": "^2.3.1", "@types/file-loader": "^5.0.0", "@types/jest": "^26.0.23", - "@types/node": "^18.18.2", + "@types/node": "^20.11.1", "@types/postcss-import": "^14", "@types/prettier": "2.3.0", "@types/react-helmet": "^6.1.6", diff --git a/packages/fxa-settings/package.json b/packages/fxa-settings/package.json index da80a61d8c..62bf54e225 100644 --- a/packages/fxa-settings/package.json +++ b/packages/fxa-settings/package.json @@ -214,7 +214,7 @@ "@types/file-saver": "^2.0.5", "@types/jest": "^26.0.23", "@types/lodash.groupby": "^4", - "@types/node": "^18.18.2", + "@types/node": "^20.11.1", "@types/prop-types": "^15", "@types/reach__router": "^1.3.11", "@types/react-router": "^5.1.19", diff --git a/packages/fxa-shared/package.json b/packages/fxa-shared/package.json index 86386a0d46..e41f577a62 100644 --- a/packages/fxa-shared/package.json +++ b/packages/fxa-shared/package.json @@ -266,7 +266,7 @@ "@types/lodash.pick": "^4", "@types/mocha": "^8.2.2", "@types/mysql": "^2", - "@types/node": "^18.18.2", + "@types/node": "^20.11.1", "@types/proxyquire": "^1.3.28", "@types/sinon": "10.0.1", "@types/superagent": "^4.1.11", diff --git a/yarn.lock b/yarn.lock index aeff6579a2..05728e651d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22643,12 +22643,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^18.18.2": - version: 18.18.9 - resolution: "@types/node@npm:18.18.9" +"@types/node@npm:^20.11.1": + version: 20.11.26 + resolution: "@types/node@npm:20.11.26" dependencies: undici-types: ~5.26.4 - checksum: 629ce20357586144031cb43d601617eef45e59460dea6b1e123f708e6885664f44d54f65e5b72b2614af5b8613f3652ced832649c0b991accbc6a85139befa51 + checksum: 2cd5a373d2880b7f07ae65d4d23660cdcabddb12772ce631b6caad2f9283350b8a17c802590f67f0ccec5a9c7d43ae0ecd9637c5ad870b8f793328af8c61eae5 languageName: node linkType: hard @@ -37712,7 +37712,7 @@ fsevents@~2.1.1: "@nestjs/cli": ^9.4.0 "@types/chance": ^1.1.2 "@types/convict": ^6.1.1 - "@types/node": ^18.18.2 + "@types/node": ^20.11.1 "@types/pem-jwk": ^2 "@types/supertest": ^2.0.11 "@types/yargs": ^17.0.0 @@ -37755,7 +37755,7 @@ fsevents@~2.1.1: "@types/assert": ^1.5.4 "@types/fast-text-encoding": ^1 "@types/mocha": ^8 - "@types/node": ^18.18.2 + "@types/node": ^20.11.1 "@types/node-fetch": ^2.5.7 "@types/prettier": ^2 abab: ^2.0.6 @@ -37815,7 +37815,7 @@ fsevents@~2.1.1: "@types/mjml": ^4.7.0 "@types/mocha": ^8.2.2 "@types/nock": ^11.1.0 - "@types/node": ^18.18.2 + "@types/node": ^20.11.1 "@types/node-zendesk": ^2.0.2 "@types/nodemailer": ^6.4.2 "@types/request": 2.48.5 @@ -38181,7 +38181,7 @@ fsevents@~2.1.1: "@types/convict": ^5.2.2 "@types/express": ^4.17.12 "@types/jest": ^26.0.23 - "@types/node": ^18.18.2 + "@types/node": ^20.11.1 "@types/passport": ^1.0.6 "@types/passport-jwt": ^3.0.5 "@types/rimraf": 3.0.0 @@ -38261,7 +38261,7 @@ fsevents@~2.1.1: "@types/graphql": ^14.5.0 "@types/ioredis": ^4.26.4 "@types/jest": ^29.2.5 - "@types/node": ^18.18.2 + "@types/node": ^20.11.1 "@types/passport": ^1.0.6 "@types/passport-http-bearer": ^1.0.36 "@types/superagent": 4.1.11 @@ -38364,7 +38364,7 @@ fsevents@~2.1.1: "@types/jest": ^26.0.23 "@types/jsdom": ^16.2.11 "@types/nock": ^11.1.0 - "@types/node": ^18.18.2 + "@types/node": ^20.11.1 "@types/postcss-import": ^12 "@types/react-redux": ^7.1.18 "@types/react-stripe-elements": ^6.0.6 @@ -38512,7 +38512,7 @@ fsevents@~2.1.1: "@types/classnames": ^2.3.1 "@types/file-loader": ^5.0.0 "@types/jest": ^26.0.23 - "@types/node": ^18.18.2 + "@types/node": ^20.11.1 "@types/postcss-import": ^14 "@types/prettier": 2.3.0 "@types/react-helmet": ^6.1.6 @@ -38589,7 +38589,7 @@ fsevents@~2.1.1: "@types/jest": ^26.0.23 "@types/lodash.groupby": ^4 "@types/material-ui": ^0.21.8 - "@types/node": ^18.18.2 + "@types/node": ^20.11.1 "@types/prop-types": ^15 "@types/reach__router": ^1.3.11 "@types/react-router": ^5.1.19 @@ -38707,7 +38707,7 @@ fsevents@~2.1.1: "@types/lodash.pick": ^4 "@types/mocha": ^8.2.2 "@types/mysql": ^2 - "@types/node": ^18.18.2 + "@types/node": ^20.11.1 "@types/proxyquire": ^1.3.28 "@types/sinon": 10.0.1 "@types/superagent": ^4.1.11 @@ -38840,7 +38840,7 @@ fsevents@~2.1.1: "@types/babel__core": ^7 "@types/jest": ^29.5.1 "@types/mysql": ^2 - "@types/node": ^18.18.2 + "@types/node": ^20.11.1 "@types/passport": ^1.0.6 "@types/passport-http-bearer": ^1.0.36 "@types/passport-jwt": ^4