Node 22 upgrade

.circleci/config.yml

@@ -52,7 +52,7 @@ executors:
   tiny-executor:
     resource_class: small
     docker:
-      - image: cimg/node:20.11.1
+      - image: cimg/node:22.14.0
     environment:
       HUSKY_SKIP_INSTALL: 1
 
@@ -64,7 +64,7 @@ executors:
         default: medium+
       image:
         type: string
-        default: cimg/node:20.11.1
+        default: cimg/node:22.14.0
     resource_class: << parameters.resource_class >>
     docker:
       - image: << parameters.image >>
@@ -82,7 +82,7 @@ executors:
   # step, and the saving the initial a workspace state.
   build-executor:
     docker:
-      - image: mozilla/fxa-circleci:ci-builder-v4
+      - image: mozilla/fxa-circleci:ci-builder-v5
     environment:
       NODE_ENV: development
       FIRESTORE_EMULATOR_HOST: localhost:9090
@@ -98,7 +98,7 @@ executors:
         default: medium
     resource_class: << parameters.resource_class >>
     docker:
-      - image: mozilla/fxa-circleci:ci-test-runner-v4
+      - image: mozilla/fxa-circleci:ci-test-runner-v5
     environment:
       NODE_ENV: development
       FIRESTORE_EMULATOR_HOST: localhost:9090
@@ -114,7 +114,7 @@ executors:
         default: large
     resource_class: << parameters.resource_class >>
     docker:
-      - image: mozilla/fxa-circleci:ci-test-runner-v4
+      - image: mozilla/fxa-circleci:ci-test-runner-v5
       - image: cimg/mysql:8.0
         command: --default-authentication-plugin=mysql_native_password
       - image: jdlk7/firestore-emulator
@@ -137,7 +137,7 @@ executors:
         default: xlarge
     resource_class: << parameters.resource_class >>
     docker:
-      - image: mozilla/fxa-circleci:ci-functional-test-runner-v4
+      - image: mozilla/fxa-circleci:ci-functional-test-runner-v5
       - image: redis
       - image: pafortin/goaws
       - image: cimg/mysql:8.0
@@ -183,7 +183,7 @@ executors:
         default: xlarge
     resource_class: << parameters.resource_class >>
     docker:
-      - image: mozilla/fxa-circleci:ci-functional-test-runner-v4
+      - image: mozilla/fxa-circleci:ci-functional-test-runner-v5
     environment:
       NODE_ENV: development
       CUSTOMS_SERVER_URL: none
@@ -459,7 +459,7 @@ commands:
             docker build . \
                 -f ./project/_dev/docker/ci/Dockerfile \
                 --target << parameters.target >> \
-                -t mozilla/fxa-circleci:ci-<< parameters.target >>-v4
+                -t mozilla/fxa-circleci:ci-<< parameters.target >>-v5
 
   create-fxa-ci-images:
     # Build CI images. Images are built on top of each other. Each is optimized for a specific task.
@@ -488,10 +488,10 @@ commands:
           name: Push CI Images and Extract Yarn Cache
           command: |
             docker login -u $DOCKER_USER_fxa_circleci -p $DOCKER_PASS_fxa_circleci
-            .circleci/docker-copy-cache.sh mozilla/fxa-circleci:ci-builder-v4
-            docker push mozilla/fxa-circleci:ci-test-runner-v4
-            docker push mozilla/fxa-circleci:ci-functional-test-runner-v4
-            docker push mozilla/fxa-circleci:ci-builder-v4
+            .circleci/docker-copy-cache.sh mozilla/fxa-circleci:ci-builder-v5
+            docker push mozilla/fxa-circleci:ci-test-runner-v5
+            docker push mozilla/fxa-circleci:ci-functional-test-runner-v5
+            docker push mozilla/fxa-circleci:ci-builder-v5
             wait
 
 jobs:
@@ -908,7 +908,7 @@ workflows:
           name: Deploy CI Images
           executor:
             name: docker-build-executor
-            image: cimg/node:20.11.1-browsers
+            image: cimg/node:22.14.0-browsers
           filters:
             branches:
               only:
@@ -1158,7 +1158,7 @@ workflows:
           name: Deploy CI Images (nightly)
           executor:
             name: docker-build-executor
-            image: cimg/node:20.11.1-browsers
+            image: cimg/node:22.14.0-browsers
           # Note, setting force-deploy as true will result in rebuilding the images regardless
           # of whether or not there are package modifications.
           force-deploy: true

.nvmrc

@@ -1 +1 @@
-20.11.1
+22.14

_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:20.11
+FROM cimg/node:22.14
 
 COPY . .
 RUN sudo yarn cache clear --all

_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:20.11 AS test-runner
+FROM cimg/node:22.14 AS test-runner
 RUN sudo apt-get update && sudo apt-get install -y \
     python3-venv
 WORKDIR /home/circleci
@@ -29,15 +29,15 @@ RUN yarn install --immutable;
 # Acts as an intermediate stage for adding the firefox install. Note,
 # that a yarn install must happen first to ensure the correct version
 # of firefox is installed. Also note that the functional-test-runner
-# must based on cimg/node:20.11-browsers, which is why this stage
+# must based on cimg/node:22.14-browsers, which is why this stage
 # is necessary.
 FROM builder AS playwright-install
 RUN npx playwright install --with-deps firefox chromium webkit;
 
 
 # Runs functional tests in our CI. Needs minimal install. Assumes
 # workspace will be restored into the project folder.
-FROM cimg/node:20.11-browsers AS functional-test-runner
+FROM cimg/node:22.14-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

_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:20.11.1-bullseye-slim AS fxa-base
+FROM node:22.14.0-bullseye-slim AS fxa-base
 RUN set -x \
     && addgroup --gid 10001 app \
     && adduser --disabled-password \

package.json

@@ -136,7 +136,7 @@
     "winston": "^3.17.0"
   },
   "engines": {
-    "node": "^20.11.1"
+    "node": "^22.14.0"
   },
   "husky": {
     "hooks": {

packages/fxa-auth-server/lib/oauth/keys.ts

@@ -46,7 +46,7 @@ if (currentPrivJWK) {
   assert.strictEqual(
     PRIVATE_KEY_SCHEMA.validate(currentPrivJWK).error,
     undefined,
-    'openid.key must be a valid private key'
+    new Error('openid.key must be a valid private key')
   );
   PRIVATE_JWKS_MAP.set(currentPrivJWK.kid, currentPrivJWK);
 } else if (!config.get('oauthServer.openid.unsafelyAllowMissingActiveKey')) {
@@ -62,7 +62,7 @@ if (newPrivJWK) {
   assert.strictEqual(
     PRIVATE_KEY_SCHEMA.validate(newPrivJWK).error,
     undefined,
-    'openid.newKey must be a valid private key'
+    new Error('openid.newKey must be a valid private key')
   );
   assert.notEqual(
     currentPrivJWK.kid,
@@ -79,7 +79,7 @@ if (oldPubJWK) {
   assert.strictEqual(
     PUBLIC_KEY_SCHEMA.validate(oldPubJWK).error,
     undefined,
-    'openid.oldKey must be a valid public key'
+    new Error('openid.oldKey must be a valid public key')
   );
   assert.notEqual(
     currentPrivJWK?.kid,

packages/fxa-auth-server/test/local/email-cloud-tasks.js

@@ -29,7 +29,7 @@ const { EmailCloudTaskManager } = proxyquire('../../lib/email-cloud-tasks', {
     },
   },
 });
-import { EmailTypes } from '@fxa/shared/cloud-tasks';
+const { EmailTypes } = require('@fxa/shared/cloud-tasks');
 
 describe('EmailCloudTaskManager', () => {
   const mockConfig = {

packages/fxa-auth-server/test/local/routes/cloud-scheduler.js

@@ -4,8 +4,8 @@
 
 const sinon = require('sinon');
 const assert = { ...sinon.assert, ...require('chai').assert };
-import { ReasonForDeletion } from '@fxa/shared/cloud-tasks';
-import proxyquire from 'proxyquire';
+const { ReasonForDeletion } = require('@fxa/shared/cloud-tasks');
+const proxyquire = require('proxyquire');
 
 describe('CloudSchedulerHandler', function () {
   this.timeout(10000);

packages/fxa-auth-server/test/local/routes/recovery-phone.js

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import { AccountEventsManager } from '../../../lib/account-events';
+const { AccountEventsManager } = require('../../../lib/account-events');
 
 const chai = require('chai');
 const chaiAsPromised = require('chai-as-promised');
@@ -12,13 +12,13 @@ const sinon = require('sinon');
 const assert = { ...sinon.assert, ...chai.assert };
 const mocks = require('../../mocks');
 const { recoveryPhoneRoutes } = require('../../../lib/routes/recovery-phone');
-import {
+const {
   RecoveryNumberNotSupportedError,
   SmsSendRateLimitExceededError,
   RecoveryPhoneService,
   RecoveryNumberRemoveMissingBackupCodes,
   RecoveryPhoneRegistrationLimitReached,
-} from '@fxa/accounts/recovery-phone';
+} = require('@fxa/accounts/recovery-phone');
 
 const { getRoute } = require('../../routes_helpers');
 const { mockRequest } = require('../../mocks');

packages/fxa-auth-server/test/local/routes/subscriptions/mozilla.js

@@ -1,9 +1,9 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { MozillaSubscriptionTypes } from 'fxa-shared/subscriptions/types';
+const { MozillaSubscriptionTypes } = require('fxa-shared/subscriptions/types');
 
-import { ERRNO } from '../../../../lib/error';
+const { ERRNO } = require('../../../../lib/error');
 
 ('use strict');
 

packages/fxa-auth-server/test/local/routes/subscriptions/paypal-notifications.js

@@ -32,8 +32,8 @@ const { PayPalNotificationHandler } = proxyquire(
 const { PayPalHelper } = require('../../../../lib/payments/paypal/helper');
 const { CapabilityService } = require('../../../../lib/payments/capability');
 
-import { RefundType } from '@fxa/payments/paypal';
-import { SUBSCRIPTIONS_RESOURCE } from '../../../../lib/payments/stripe';
+const { RefundType } = require('@fxa/payments/paypal');
+const { SUBSCRIPTIONS_RESOURCE } = require('../../../../lib/payments/stripe');
 
 const ACCOUNT_LOCALE = 'en-US';
 const TEST_EMAIL = 'test@email.com';

packages/fxa-auth-server/test/scripts/db-helpers/index.js

@@ -2,15 +2,15 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const {
+import {
   Device,
   Email,
   Account,
   SessionToken,
   SignInCodes,
-} = require('fxa-shared/db/models/auth');
-const { uuidTransformer } = require('fxa-shared/db/transformers');
-const crypto = require('crypto');
+} from 'fxa-shared/db/models/auth';
+import { uuidTransformer } from 'fxa-shared/db/transformers';
+import * as crypto from 'crypto';
 
 export const toZeroBuff = (size) =>
   Buffer.from(Array(size).fill(0), 'hex').toString('hex');

packages/fxa-content-server/server/lib/beta-settings.js

@@ -166,7 +166,7 @@ function modifyProxyRes(proxyRes, req, res) {
       // automatically, and these two headers are incompatible. If this is not
       // set any fetch request will fail with:
       //  - Parse Error: Content-Length can't be present with Transfer-Encoding
-      res.set('Transfer-Encoding', '');
+      res.removeHeader('Transfer-Encoding');
       res.send(body);
     }