From 6ed76a6cafdbb91e9fbeb0ed4a160fe55c6afd03 Mon Sep 17 00:00:00 2001 From: Ben Bangert <100193+bbangert@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:29:13 -0700 Subject: [PATCH] chore: update node to 18.18.2 Because: * We want to use the latest security release of Node. This commit: * Updates Node.js to 18.18.2 --- .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 4a1f488b6c..87ec8842b1 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.17.1 +18.18.2 diff --git a/_dev/docker/ci-lockfile-generator/Dockerfile b/_dev/docker/ci-lockfile-generator/Dockerfile index 6fd35f0e3c..6c04f12868 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.17 +FROM cimg/node:18.18 COPY . . RUN sudo yarn cache clear --all diff --git a/_dev/docker/ci/Dockerfile b/_dev/docker/ci/Dockerfile index 0e0390b537..0fe0a02cae 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.17 as test-runner +FROM cimg/node:18.18 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.17-browsers as functional-test-runner +FROM cimg/node:18.18-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 615fcedcea..04a6958922 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.17-bullseye-slim AS fxa-base +FROM node:18.18.2-bullseye-slim AS fxa-base RUN set -x \ && addgroup --gid 10001 app \ && adduser --disabled-password \ diff --git a/package.json b/package.json index 67e2c26ffd..5a5f0513c2 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "uuid": "^9.0.0" }, "engines": { - "node": "^18.17.1" + "node": "^18.18.2" }, "husky": { "hooks": { @@ -140,7 +140,7 @@ "@testing-library/react": "^14.0.0", "@types/jest": "^29.5.1", "@types/mysql": "^2", - "@types/node": "^18.17.1", + "@types/node": "^18.18.2", "@types/passport": "^1.0.6", "@types/react": "^18", "@types/react-dom": "^18", @@ -189,7 +189,7 @@ "@grpc/grpc-js": "~1.6.0", "@nestjs/cli/typescript": "^4.5.2", "@svgr/webpack": "^8.0.1", - "@types/node": "^18.17.1", + "@types/node": "^18.18.2", "@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 09b9460a82..fdb92edbab 100644 --- a/packages/fxa-admin-server/package.json +++ b/packages/fxa-admin-server/package.json @@ -66,7 +66,7 @@ "devDependencies": { "@types/chance": "^1.1.2", "@types/convict": "^6.1.1", - "@types/node": "^18.17.1", + "@types/node": "^18.18.2", "@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 752ea589ab..574ed0b837 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.17.1", + "@types/node": "^18.18.2", "@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 6834dc7828..b8134f5853 100644 --- a/packages/fxa-auth-server/package.json +++ b/packages/fxa-auth-server/package.json @@ -170,7 +170,7 @@ "@types/memcached": "^2.2.6", "@types/mocha": "^8.2.2", "@types/nock": "^11.1.0", - "@types/node": "^18.17.1", + "@types/node": "^18.18.2", "@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 23c9e1ec21..c6a4ad317e 100644 --- a/packages/fxa-event-broker/package.json +++ b/packages/fxa-event-broker/package.json @@ -69,7 +69,7 @@ "@types/convict": "^5.2.2", "@types/express": "^4.17.12", "@types/jest": "^26.0.23", - "@types/node": "^18.17.1", + "@types/node": "^18.18.2", "@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 48e2540c5b..db3bc2a885 100644 --- a/packages/fxa-graphql-api/package.json +++ b/packages/fxa-graphql-api/package.json @@ -84,7 +84,7 @@ "@types/graphql-upload": "^8.0.5", "@types/ioredis": "^4.26.4", "@types/jest": "^29.2.5", - "@types/node": "^18.17.1", + "@types/node": "^18.18.2", "@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 f25b060637..29a85528c0 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.17.1", + "@types/node": "^18.18.2", "@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 612f99d76e..92cc1d0fce 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.17.1", + "@types/node": "^18.18.2", "@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 a2513702bb..174edb8094 100644 --- a/packages/fxa-settings/package.json +++ b/packages/fxa-settings/package.json @@ -219,7 +219,7 @@ "@types/file-saver": "^2.0.5", "@types/jest": "^26.0.23", "@types/lodash.groupby": "^4", - "@types/node": "^18.17.1", + "@types/node": "^18.18.2", "@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 8bf9813d85..8d0006fd35 100644 --- a/packages/fxa-shared/package.json +++ b/packages/fxa-shared/package.json @@ -259,7 +259,7 @@ "@types/lodash.pick": "^4", "@types/mocha": "^8.2.2", "@types/mysql": "^2", - "@types/node": "^18.17.1", + "@types/node": "^18.18.2", "@types/proxyquire": "^1.3.28", "@types/sinon": "10.0.1", "@types/superagent": "^4.1.11", diff --git a/yarn.lock b/yarn.lock index 15ed46411c..df1d86bcb6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19435,10 +19435,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^18.17.1": - version: 18.17.12 - resolution: "@types/node@npm:18.17.12" - checksum: 79f8bcca3067a3c529f30e172df8d14f25ab9e4cd6a05ed897a924ab1dec774e8ea172ef5c4a67ffec433d423a0c81778f17db22606d574bc83871b60aab298e +"@types/node@npm:^18.18.2": + version: 18.18.5 + resolution: "@types/node@npm:18.18.5" + checksum: fc8c9b2bf226270cf9085a7dac76ce09dd7c3519ec9b687ee2b50385954ab3709c45ca82d002d1536e24286803cd194d7ab7008acebdcd6681b8b19d4277fa5c languageName: node linkType: hard @@ -33911,7 +33911,7 @@ fsevents@~2.1.1: "@sentry/node": ^7.66.0 "@types/chance": ^1.1.2 "@types/convict": ^6.1.1 - "@types/node": ^18.17.1 + "@types/node": ^18.18.2 "@types/pem-jwk": ^2 "@types/supertest": ^2.0.11 "@types/yargs": ^17.0.0 @@ -33959,7 +33959,7 @@ fsevents@~2.1.1: "@types/assert": ^1.5.4 "@types/fast-text-encoding": ^1 "@types/mocha": ^8 - "@types/node": ^18.17.1 + "@types/node": ^18.18.2 "@types/node-fetch": ^2.5.7 "@types/prettier": ^2 abab: ^2.0.6 @@ -34025,7 +34025,7 @@ fsevents@~2.1.1: "@types/mjml": ^4.7.0 "@types/mocha": ^8.2.2 "@types/nock": ^11.1.0 - "@types/node": ^18.17.1 + "@types/node": ^18.18.2 "@types/node-zendesk": ^2.0.2 "@types/nodemailer": ^6.4.2 "@types/request": 2.48.5 @@ -34396,7 +34396,7 @@ fsevents@~2.1.1: "@types/convict": ^5.2.2 "@types/express": ^4.17.12 "@types/jest": ^26.0.23 - "@types/node": ^18.17.1 + "@types/node": ^18.18.2 "@types/passport": ^1.0.6 "@types/passport-jwt": ^3.0.5 "@types/rimraf": 3.0.0 @@ -34484,7 +34484,7 @@ fsevents@~2.1.1: "@types/graphql-upload": ^8.0.5 "@types/ioredis": ^4.26.4 "@types/jest": ^29.2.5 - "@types/node": ^18.17.1 + "@types/node": ^18.18.2 "@types/passport": ^1.0.6 "@types/passport-http-bearer": ^1.0.36 "@types/superagent": 4.1.11 @@ -34601,7 +34601,7 @@ fsevents@~2.1.1: "@types/jest": ^26.0.23 "@types/jsdom": ^16.2.11 "@types/nock": ^11.1.0 - "@types/node": ^18.17.1 + "@types/node": ^18.18.2 "@types/postcss-import": ^12 "@types/react-redux": ^7.1.18 "@types/react-stripe-elements": ^6.0.6 @@ -34751,7 +34751,7 @@ fsevents@~2.1.1: "@types/classnames": ^2.3.1 "@types/file-loader": ^5.0.0 "@types/jest": ^26.0.23 - "@types/node": ^18.17.1 + "@types/node": ^18.18.2 "@types/postcss-import": ^14 "@types/prettier": 2.3.0 "@types/react-helmet": ^6.1.6 @@ -34829,7 +34829,7 @@ fsevents@~2.1.1: "@types/jest": ^26.0.23 "@types/lodash.groupby": ^4 "@types/material-ui": ^0.21.8 - "@types/node": ^18.17.1 + "@types/node": ^18.18.2 "@types/prop-types": ^15 "@types/reach__router": ^1.3.11 "@types/react-router": ^5.1.19 @@ -34970,7 +34970,7 @@ fsevents@~2.1.1: "@types/lodash.pick": ^4 "@types/mocha": ^8.2.2 "@types/mysql": ^2 - "@types/node": ^18.17.1 + "@types/node": ^18.18.2 "@types/proxyquire": ^1.3.28 "@types/sinon": 10.0.1 "@types/superagent": ^4.1.11 @@ -35079,7 +35079,7 @@ fsevents@~2.1.1: "@testing-library/react": ^14.0.0 "@types/jest": ^29.5.1 "@types/mysql": ^2 - "@types/node": ^18.17.1 + "@types/node": ^18.18.2 "@types/passport": ^1.0.6 "@types/react": ^18 "@types/react-dom": ^18