Merge pull request #18476 from mozilla/update-ci-image

revert(node): Revert to node 20.11.1 (WIP)

Author: vpomerleau

.nvmrc

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

_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:22.14
+FROM cimg/node:20.11
 
 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:22.14 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
@@ -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:22.14-browsers, which is why this stage
+# must based on cimg/node:20.11-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:22.14-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

_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:22.14.0-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 \

package.json

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

packages/functional-tests/package.json

@@ -13,7 +13,7 @@
     "lint": "eslint ."
   },
   "devDependencies": {
-    "@playwright/test": "^1.43.1",
+    "@playwright/test": "1.44.1",
     "@types/eslint": "^8",
     "@types/pdf-parse": "^1.1.4",
     "@types/upng-js": "^2",

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

@@ -29,7 +29,7 @@ const { EmailCloudTaskManager } = proxyquire('../../lib/email-cloud-tasks', {
     },
   },
 });
-const { EmailTypes } = require('@fxa/shared/cloud-tasks');
+import { EmailTypes } from '@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 };
-const { ReasonForDeletion } = require('@fxa/shared/cloud-tasks');
-const proxyquire = require('proxyquire');
+import { ReasonForDeletion } from '@fxa/shared/cloud-tasks';
+import proxyquire from '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/. */
 
-const { AccountEventsManager } = require('../../../lib/account-events');
+import { AccountEventsManager } from '../../../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');
-const {
+import {
   RecoveryNumberNotSupportedError,
   SmsSendRateLimitExceededError,
   RecoveryPhoneService,
   RecoveryNumberRemoveMissingBackupCodes,
-  RecoveryPhoneRegistrationLimitReached
-} = require('@fxa/accounts/recovery-phone');
+  RecoveryPhoneRegistrationLimitReached,
+} from '@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/. */
-const { MozillaSubscriptionTypes } = require('fxa-shared/subscriptions/types');
+import { MozillaSubscriptionTypes } from 'fxa-shared/subscriptions/types';
 
-const { ERRNO } = require('../../../../lib/error');
+import { ERRNO } from '../../../../lib/error';
 
 ('use strict');