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.
This commit is contained in:
Ben Bangert 2024-03-12 18:18:36 -07:00
Родитель 0f1da4adbc
Коммит a022106a34
Не найден ключ, соответствующий данной подписи
15 изменённых файлов: 31 добавлений и 31 удалений

2
.nvmrc
Просмотреть файл

@ -1 +1 @@
18.18.2 20.11.1

Просмотреть файл

@ -5,7 +5,7 @@
# By running a yarn install inside the same base container that we use in our CI, we can # 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. # ensure the same checksums are created correctly.
# #
FROM cimg/node:18.18 FROM cimg/node:20.11
COPY . . COPY . .
RUN sudo yarn cache clear --all RUN sudo yarn cache clear --all

Просмотреть файл

@ -4,7 +4,7 @@
# Runs tests and common CI operations. Needs minimal install. Assumes # Runs tests and common CI operations. Needs minimal install. Assumes
# workspace will be restored into the project folder. # 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 \ RUN sudo apt-get update && sudo apt-get install -y \
python3-venv python3-venv
WORKDIR /home/circleci WORKDIR /home/circleci
@ -38,7 +38,7 @@ RUN npx playwright install firefox;
# Runs functional tests in our CI. Needs minimal install. Assumes # Runs functional tests in our CI. Needs minimal install. Assumes
# workspace will be restored into the project folder. # 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 WORKDIR /home/circleci
COPY --chown=circleci:circleci --from=playwright-install /home/circleci/.cache/ms-playwright .cache/ms-playwright/ COPY --chown=circleci:circleci --from=playwright-install /home/circleci/.cache/ms-playwright .cache/ms-playwright/
COPY --chown=circleci:circleci project project COPY --chown=circleci:circleci project project

Просмотреть файл

@ -1,7 +1,7 @@
# Multi stage docker build for fxa-mono repo. Note that stages should be cached due to docker layer caching being # Multi stage docker build for fxa-mono repo. Note that stages should be cached due to docker layer caching being
# turned on in CI. # 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 \ RUN set -x \
&& addgroup --gid 10001 app \ && addgroup --gid 10001 app \
&& adduser --disabled-password \ && adduser --disabled-password \

Просмотреть файл

@ -113,7 +113,7 @@
"winston": "^3.11.0" "winston": "^3.11.0"
}, },
"engines": { "engines": {
"node": "^18.18.2" "node": "^20.11.1"
}, },
"husky": { "husky": {
"hooks": { "hooks": {
@ -174,7 +174,7 @@
"@types/babel__core": "^7", "@types/babel__core": "^7",
"@types/jest": "^29.5.1", "@types/jest": "^29.5.1",
"@types/mysql": "^2", "@types/mysql": "^2",
"@types/node": "^18.18.2", "@types/node": "^20.11.1",
"@types/passport": "^1.0.6", "@types/passport": "^1.0.6",
"@types/passport-http-bearer": "^1.0.36", "@types/passport-http-bearer": "^1.0.36",
"@types/passport-jwt": "^4", "@types/passport-jwt": "^4",
@ -230,7 +230,7 @@
"@graphql-typed-document-node/core": "3.2.0", "@graphql-typed-document-node/core": "3.2.0",
"@nestjs/cli/typescript": "^4.5.2", "@nestjs/cli/typescript": "^4.5.2",
"@svgr/webpack": "^8.0.1", "@svgr/webpack": "^8.0.1",
"@types/node": "^18.18.2", "@types/node": "^20.11.1",
"@types/react": "^18", "@types/react": "^18",
"browserid-crypto": "https://github.com/mozilla-fxa/browserid-crypto.git#5979544d13eeb15a02d0b9a6a7a08a698d54d37d", "browserid-crypto": "https://github.com/mozilla-fxa/browserid-crypto.git#5979544d13eeb15a02d0b9a6a7a08a698d54d37d",
"css-minimizer-webpack-plugin": ">=4 <5", "css-minimizer-webpack-plugin": ">=4 <5",

Просмотреть файл

@ -60,7 +60,7 @@
"@nestjs/cli": "^9.4.0", "@nestjs/cli": "^9.4.0",
"@types/chance": "^1.1.2", "@types/chance": "^1.1.2",
"@types/convict": "^6.1.1", "@types/convict": "^6.1.1",
"@types/node": "^18.18.2", "@types/node": "^20.11.1",
"@types/pem-jwk": "^2", "@types/pem-jwk": "^2",
"@types/supertest": "^2.0.11", "@types/supertest": "^2.0.11",
"@types/yargs": "^17.0.0", "@types/yargs": "^17.0.0",

Просмотреть файл

@ -55,7 +55,7 @@
"@types/assert": "^1.5.4", "@types/assert": "^1.5.4",
"@types/fast-text-encoding": "^1", "@types/fast-text-encoding": "^1",
"@types/mocha": "^8", "@types/mocha": "^8",
"@types/node": "^18.18.2", "@types/node": "^20.11.1",
"@types/node-fetch": "^2.5.7", "@types/node-fetch": "^2.5.7",
"@types/prettier": "^2", "@types/prettier": "^2",
"asmcrypto.js": "^0.22.0", "asmcrypto.js": "^0.22.0",

Просмотреть файл

@ -165,7 +165,7 @@
"@types/memcached": "^2.2.6", "@types/memcached": "^2.2.6",
"@types/mocha": "^8.2.2", "@types/mocha": "^8.2.2",
"@types/nock": "^11.1.0", "@types/nock": "^11.1.0",
"@types/node": "^18.18.2", "@types/node": "^20.11.1",
"@types/node-zendesk": "^2.0.2", "@types/node-zendesk": "^2.0.2",
"@types/nodemailer": "^6.4.2", "@types/nodemailer": "^6.4.2",
"@types/request": "2.48.5", "@types/request": "2.48.5",

Просмотреть файл

@ -59,7 +59,7 @@
"@types/convict": "^5.2.2", "@types/convict": "^5.2.2",
"@types/express": "^4.17.12", "@types/express": "^4.17.12",
"@types/jest": "^26.0.23", "@types/jest": "^26.0.23",
"@types/node": "^18.18.2", "@types/node": "^20.11.1",
"@types/passport": "^1.0.6", "@types/passport": "^1.0.6",
"@types/passport-jwt": "^3.0.5", "@types/passport-jwt": "^3.0.5",
"@types/rimraf": "3.0.0", "@types/rimraf": "3.0.0",

Просмотреть файл

@ -72,7 +72,7 @@
"@types/graphql": "^14.5.0", "@types/graphql": "^14.5.0",
"@types/ioredis": "^4.26.4", "@types/ioredis": "^4.26.4",
"@types/jest": "^29.2.5", "@types/jest": "^29.2.5",
"@types/node": "^18.18.2", "@types/node": "^20.11.1",
"@types/passport": "^1.0.6", "@types/passport": "^1.0.6",
"@types/passport-http-bearer": "^1.0.36", "@types/passport-http-bearer": "^1.0.36",
"@types/superagent": "4.1.11", "@types/superagent": "4.1.11",

Просмотреть файл

@ -76,7 +76,7 @@
"@types/jest": "^26.0.23", "@types/jest": "^26.0.23",
"@types/jsdom": "^16.2.11", "@types/jsdom": "^16.2.11",
"@types/nock": "^11.1.0", "@types/nock": "^11.1.0",
"@types/node": "^18.18.2", "@types/node": "^20.11.1",
"@types/postcss-import": "^12", "@types/postcss-import": "^12",
"@types/react-redux": "^7.1.18", "@types/react-redux": "^7.1.18",
"@types/react-stripe-elements": "^6.0.6", "@types/react-stripe-elements": "^6.0.6",

Просмотреть файл

@ -66,7 +66,7 @@
"@types/classnames": "^2.3.1", "@types/classnames": "^2.3.1",
"@types/file-loader": "^5.0.0", "@types/file-loader": "^5.0.0",
"@types/jest": "^26.0.23", "@types/jest": "^26.0.23",
"@types/node": "^18.18.2", "@types/node": "^20.11.1",
"@types/postcss-import": "^14", "@types/postcss-import": "^14",
"@types/prettier": "2.3.0", "@types/prettier": "2.3.0",
"@types/react-helmet": "^6.1.6", "@types/react-helmet": "^6.1.6",

Просмотреть файл

@ -214,7 +214,7 @@
"@types/file-saver": "^2.0.5", "@types/file-saver": "^2.0.5",
"@types/jest": "^26.0.23", "@types/jest": "^26.0.23",
"@types/lodash.groupby": "^4", "@types/lodash.groupby": "^4",
"@types/node": "^18.18.2", "@types/node": "^20.11.1",
"@types/prop-types": "^15", "@types/prop-types": "^15",
"@types/reach__router": "^1.3.11", "@types/reach__router": "^1.3.11",
"@types/react-router": "^5.1.19", "@types/react-router": "^5.1.19",

Просмотреть файл

@ -266,7 +266,7 @@
"@types/lodash.pick": "^4", "@types/lodash.pick": "^4",
"@types/mocha": "^8.2.2", "@types/mocha": "^8.2.2",
"@types/mysql": "^2", "@types/mysql": "^2",
"@types/node": "^18.18.2", "@types/node": "^20.11.1",
"@types/proxyquire": "^1.3.28", "@types/proxyquire": "^1.3.28",
"@types/sinon": "10.0.1", "@types/sinon": "10.0.1",
"@types/superagent": "^4.1.11", "@types/superagent": "^4.1.11",

Просмотреть файл

@ -22643,12 +22643,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/node@npm:^18.18.2": "@types/node@npm:^20.11.1":
version: 18.18.9 version: 20.11.26
resolution: "@types/node@npm:18.18.9" resolution: "@types/node@npm:20.11.26"
dependencies: dependencies:
undici-types: ~5.26.4 undici-types: ~5.26.4
checksum: 629ce20357586144031cb43d601617eef45e59460dea6b1e123f708e6885664f44d54f65e5b72b2614af5b8613f3652ced832649c0b991accbc6a85139befa51 checksum: 2cd5a373d2880b7f07ae65d4d23660cdcabddb12772ce631b6caad2f9283350b8a17c802590f67f0ccec5a9c7d43ae0ecd9637c5ad870b8f793328af8c61eae5
languageName: node languageName: node
linkType: hard linkType: hard
@ -37712,7 +37712,7 @@ fsevents@~2.1.1:
"@nestjs/cli": ^9.4.0 "@nestjs/cli": ^9.4.0
"@types/chance": ^1.1.2 "@types/chance": ^1.1.2
"@types/convict": ^6.1.1 "@types/convict": ^6.1.1
"@types/node": ^18.18.2 "@types/node": ^20.11.1
"@types/pem-jwk": ^2 "@types/pem-jwk": ^2
"@types/supertest": ^2.0.11 "@types/supertest": ^2.0.11
"@types/yargs": ^17.0.0 "@types/yargs": ^17.0.0
@ -37755,7 +37755,7 @@ fsevents@~2.1.1:
"@types/assert": ^1.5.4 "@types/assert": ^1.5.4
"@types/fast-text-encoding": ^1 "@types/fast-text-encoding": ^1
"@types/mocha": ^8 "@types/mocha": ^8
"@types/node": ^18.18.2 "@types/node": ^20.11.1
"@types/node-fetch": ^2.5.7 "@types/node-fetch": ^2.5.7
"@types/prettier": ^2 "@types/prettier": ^2
abab: ^2.0.6 abab: ^2.0.6
@ -37815,7 +37815,7 @@ fsevents@~2.1.1:
"@types/mjml": ^4.7.0 "@types/mjml": ^4.7.0
"@types/mocha": ^8.2.2 "@types/mocha": ^8.2.2
"@types/nock": ^11.1.0 "@types/nock": ^11.1.0
"@types/node": ^18.18.2 "@types/node": ^20.11.1
"@types/node-zendesk": ^2.0.2 "@types/node-zendesk": ^2.0.2
"@types/nodemailer": ^6.4.2 "@types/nodemailer": ^6.4.2
"@types/request": 2.48.5 "@types/request": 2.48.5
@ -38181,7 +38181,7 @@ fsevents@~2.1.1:
"@types/convict": ^5.2.2 "@types/convict": ^5.2.2
"@types/express": ^4.17.12 "@types/express": ^4.17.12
"@types/jest": ^26.0.23 "@types/jest": ^26.0.23
"@types/node": ^18.18.2 "@types/node": ^20.11.1
"@types/passport": ^1.0.6 "@types/passport": ^1.0.6
"@types/passport-jwt": ^3.0.5 "@types/passport-jwt": ^3.0.5
"@types/rimraf": 3.0.0 "@types/rimraf": 3.0.0
@ -38261,7 +38261,7 @@ fsevents@~2.1.1:
"@types/graphql": ^14.5.0 "@types/graphql": ^14.5.0
"@types/ioredis": ^4.26.4 "@types/ioredis": ^4.26.4
"@types/jest": ^29.2.5 "@types/jest": ^29.2.5
"@types/node": ^18.18.2 "@types/node": ^20.11.1
"@types/passport": ^1.0.6 "@types/passport": ^1.0.6
"@types/passport-http-bearer": ^1.0.36 "@types/passport-http-bearer": ^1.0.36
"@types/superagent": 4.1.11 "@types/superagent": 4.1.11
@ -38364,7 +38364,7 @@ fsevents@~2.1.1:
"@types/jest": ^26.0.23 "@types/jest": ^26.0.23
"@types/jsdom": ^16.2.11 "@types/jsdom": ^16.2.11
"@types/nock": ^11.1.0 "@types/nock": ^11.1.0
"@types/node": ^18.18.2 "@types/node": ^20.11.1
"@types/postcss-import": ^12 "@types/postcss-import": ^12
"@types/react-redux": ^7.1.18 "@types/react-redux": ^7.1.18
"@types/react-stripe-elements": ^6.0.6 "@types/react-stripe-elements": ^6.0.6
@ -38512,7 +38512,7 @@ fsevents@~2.1.1:
"@types/classnames": ^2.3.1 "@types/classnames": ^2.3.1
"@types/file-loader": ^5.0.0 "@types/file-loader": ^5.0.0
"@types/jest": ^26.0.23 "@types/jest": ^26.0.23
"@types/node": ^18.18.2 "@types/node": ^20.11.1
"@types/postcss-import": ^14 "@types/postcss-import": ^14
"@types/prettier": 2.3.0 "@types/prettier": 2.3.0
"@types/react-helmet": ^6.1.6 "@types/react-helmet": ^6.1.6
@ -38589,7 +38589,7 @@ fsevents@~2.1.1:
"@types/jest": ^26.0.23 "@types/jest": ^26.0.23
"@types/lodash.groupby": ^4 "@types/lodash.groupby": ^4
"@types/material-ui": ^0.21.8 "@types/material-ui": ^0.21.8
"@types/node": ^18.18.2 "@types/node": ^20.11.1
"@types/prop-types": ^15 "@types/prop-types": ^15
"@types/reach__router": ^1.3.11 "@types/reach__router": ^1.3.11
"@types/react-router": ^5.1.19 "@types/react-router": ^5.1.19
@ -38707,7 +38707,7 @@ fsevents@~2.1.1:
"@types/lodash.pick": ^4 "@types/lodash.pick": ^4
"@types/mocha": ^8.2.2 "@types/mocha": ^8.2.2
"@types/mysql": ^2 "@types/mysql": ^2
"@types/node": ^18.18.2 "@types/node": ^20.11.1
"@types/proxyquire": ^1.3.28 "@types/proxyquire": ^1.3.28
"@types/sinon": 10.0.1 "@types/sinon": 10.0.1
"@types/superagent": ^4.1.11 "@types/superagent": ^4.1.11
@ -38840,7 +38840,7 @@ fsevents@~2.1.1:
"@types/babel__core": ^7 "@types/babel__core": ^7
"@types/jest": ^29.5.1 "@types/jest": ^29.5.1
"@types/mysql": ^2 "@types/mysql": ^2
"@types/node": ^18.18.2 "@types/node": ^20.11.1
"@types/passport": ^1.0.6 "@types/passport": ^1.0.6
"@types/passport-http-bearer": ^1.0.36 "@types/passport-http-bearer": ^1.0.36
"@types/passport-jwt": ^4 "@types/passport-jwt": ^4