Merge pull request #18946 from mozilla/FXA-10981

julianpoy · web-flow · commit f4f86548d9ac · 2025-06-03T16:36:33.000-07:00
chore: update nx to 21
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -652,7 +652,7 @@ jobs:
       workflow:
         type: string
     executor: default-executor
-    resource_class: medium+
+    resource_class: large
     steps:
       - git-checkout
       - restore-workspace
@@ -716,7 +716,7 @@ jobs:
       - run:
           name: Run API Integration Tests
           command: |
-            npx nx << parameters.nx_run >> << parameters.parallel >> << parameters.target >> << parameters.projects >>
+            NODE_OPTIONS="--max-old-space-size=7168" npx nx << parameters.nx_run >> << parameters.parallel >> << parameters.target >> << parameters.projects >>
           environment:
             NODE_ENV: test
           no_output_timeout: 20m
@@ -785,6 +785,7 @@ jobs:
           command: ./packages/functional-tests/scripts/start-services.sh
           environment:
             NODE_ENV: test
+          no_output_timeout: 20m
       - run-playwright-tests:
           project: local
       - store-artifacts
diff --git a/apps/payments/next/project.json b/apps/payments/next/project.json
@@ -26,7 +26,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/payments/next/**/*.{ts,tsx,js,jsx}"]
diff --git a/jest.config.ts b/jest.config.ts
@@ -1,5 +1,5 @@
-import { getJestProjects } from '@nx/jest';
+import { getJestProjectsAsync } from '@nx/jest';
 
-export default {
-  projects: getJestProjects(),
-};
+export default async () => ({
+  projects: await getJestProjectsAsync(),
+});
diff --git a/libs/google/project.json b/libs/google/project.json
@@ -19,7 +19,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/google/**/*.ts", "libs/google/package.json"]
diff --git a/libs/payments/capability/project.json b/libs/payments/capability/project.json
@@ -34,7 +34,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/payments/capability/**/*.ts"]
diff --git a/libs/payments/cart/project.json b/libs/payments/cart/project.json
@@ -33,7 +33,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/payments/cart/**/*.ts"]
diff --git a/libs/payments/content-server/project.json b/libs/payments/content-server/project.json
@@ -33,7 +33,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/payments/content-server/**/*.ts"]
diff --git a/libs/payments/currency/project.json b/libs/payments/currency/project.json
@@ -34,7 +34,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/payments/currency/**/*.ts"]
diff --git a/libs/payments/customer/project.json b/libs/payments/customer/project.json
@@ -34,7 +34,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
diff --git a/libs/payments/eligibility/project.json b/libs/payments/eligibility/project.json
@@ -34,7 +34,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
diff --git a/libs/payments/iap/project.json b/libs/payments/iap/project.json
@@ -40,7 +40,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
diff --git a/libs/payments/legacy/project.json b/libs/payments/legacy/project.json
@@ -34,7 +34,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
diff --git a/libs/payments/paypal/project.json b/libs/payments/paypal/project.json
@@ -33,7 +33,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/payments/paypal/**/*.ts"]
diff --git a/libs/payments/stripe/project.json b/libs/payments/stripe/project.json
@@ -34,7 +34,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
diff --git a/libs/payments/ui/project.json b/libs/payments/ui/project.json
@@ -6,7 +6,7 @@
   "tags": [],
   "targets": {
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/payments/ui/**/*.{ts,tsx,js,jsx}"]
diff --git a/libs/shared/account/account/project.json b/libs/shared/account/account/project.json
@@ -34,7 +34,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/shared/account/account/**/*.ts"]
diff --git a/libs/shared/assets/project.json b/libs/shared/assets/project.json
@@ -15,7 +15,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/shared/assets/**/*.ts"]
diff --git a/libs/shared/cloud-tasks/project.json b/libs/shared/cloud-tasks/project.json
@@ -34,7 +34,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
diff --git a/libs/shared/cms/project.json b/libs/shared/cms/project.json
@@ -40,7 +40,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
diff --git a/libs/shared/db/firestore/project.json b/libs/shared/db/firestore/project.json
@@ -34,7 +34,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/shared/db/firestore/**/*.ts"]
diff --git a/libs/shared/db/mysql/account/project.json b/libs/shared/db/mysql/account/project.json
@@ -34,7 +34,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/shared/db/mysql/account/**/*.ts"]
diff --git a/libs/shared/db/mysql/core/project.json b/libs/shared/db/mysql/core/project.json
@@ -34,7 +34,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/shared/db/mysql/core/**/*.ts"]
diff --git a/libs/shared/db/type-cacheable/project.json b/libs/shared/db/type-cacheable/project.json
@@ -34,7 +34,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/shared/db/type-cacheable/**/*.ts"]
diff --git a/libs/shared/error/project.json b/libs/shared/error/project.json
@@ -34,7 +34,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/shared/error/**/*.ts"]
diff --git a/libs/shared/l10n/project.json b/libs/shared/l10n/project.json
@@ -35,7 +35,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
diff --git a/libs/shared/log/project.json b/libs/shared/log/project.json
@@ -34,7 +34,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/shared/log/**/*.ts"]
diff --git a/libs/shared/metrics/statsd/project.json b/libs/shared/metrics/statsd/project.json
@@ -34,7 +34,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/shared/metrics/statsd/**/*.ts"]
diff --git a/libs/shared/mozlog/project.json b/libs/shared/mozlog/project.json
@@ -34,7 +34,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
diff --git a/libs/shared/notifier/project.json b/libs/shared/notifier/project.json
@@ -34,7 +34,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
diff --git a/libs/shared/sentry/project.json b/libs/shared/sentry/project.json
@@ -42,7 +42,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
diff --git a/nx.json b/nx.json
@@ -224,5 +224,8 @@
         "serveStaticTargetName": "serve-static"
       }
     }
-  ]
+  ],
+  "tui": {
+    "enabled": false
+  }
 }
diff --git a/package.json b/package.json
@@ -63,7 +63,7 @@
     "@nestjs/platform-express": "^10.4.18",
     "@nestjs/schedule": "^4.0.1",
     "@next/bundle-analyzer": "^15.1.6",
-    "@nx/next": "19.5.3",
+    "@nx/next": "21.1.2",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/auto-instrumentations-node": "^0.58.0",
     "@opentelemetry/sdk-trace-base": "^2.0.0",
@@ -109,7 +109,7 @@
     "mysql2": "^3.14.0",
     "nest-typed-config": "^2.9.2",
     "nest-winston": "^1.10.0",
-    "next": "^14.2.21",
+    "next": "14.2.29",
     "next-auth": "5.0.0-beta.22",
     "node-fetch": "^2.6.7",
     "node-hkdf": "^0.0.2",
@@ -173,14 +173,14 @@
     "@nestjs/cli": "^11.0.1",
     "@nestjs/schematics": "^11.0.1",
     "@nestjs/testing": "^10.3.4",
-    "@nx/esbuild": "19.5.3",
-    "@nx/eslint-plugin": "19.5.3",
-    "@nx/jest": "19.5.3",
-    "@nx/js": "19.5.3",
-    "@nx/node": "19.5.3",
-    "@nx/react": "19.5.3",
-    "@nx/storybook": "19.5.3",
-    "@nx/workspace": "19.5.3",
+    "@nx/esbuild": "21.1.2",
+    "@nx/eslint-plugin": "21.1.2",
+    "@nx/jest": "21.1.2",
+    "@nx/js": "21.1.2",
+    "@nx/node": "21.1.2",
+    "@nx/react": "21.1.2",
+    "@nx/storybook": "21.1.2",
+    "@nx/workspace": "21.1.2",
     "@opentelemetry/semantic-conventions": "^1.32.0",
     "@storybook/addon-essentials": "7.6.15",
     "@storybook/addon-styling": "1.3.7",
@@ -197,7 +197,7 @@
     "@types/babel__core": "^7",
     "@types/babel__preset-env": "^7",
     "@types/bn.js": "^5",
-    "@types/jest": "29.5.1",
+    "@types/jest": "29.5.14",
     "@types/jsdom": "^21",
     "@types/module-alias": "^2",
     "@types/mysql": "^2",
@@ -215,17 +215,21 @@
     "@typescript-eslint/eslint-plugin": "^5.59.1",
     "@typescript-eslint/parser": "^7.1.1",
     "autoprefixer": "^10.4.14",
-    "babel-jest": "^29.7.0",
+    "babel-eslint": "^10.1.0",
+    "babel-jest": "29.7.0",
     "esbuild": "^0.17.15",
     "esbuild-register": "^3.5.0",
-    "eslint": "^7.32.0",
+    "eslint": "^8.57.1",
     "eslint-config-next": "14.2.3",
+    "eslint-config-prettier": "^10.1.5",
+    "eslint-plugin-flowtype": "^8.0.3",
     "eslint-plugin-fxa": "workspace:*",
     "eslint-plugin-import": "2.30.0",
     "eslint-plugin-jest": "^27.6.0",
     "eslint-plugin-jsx-a11y": "6.10.0",
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "5.0.0",
+    "eslint-plugin-testing-library": "^7.3.0",
     "grunt": "^1.6.1",
     "grunt-cli": "^1.4.3",
     "grunt-concurrent": "^3.0.0",
@@ -234,13 +238,13 @@
     "grunt-contrib-watch": "^1.1.0",
     "grunt-http": "^2.3.3",
     "husky": "^9.1.7",
-    "jest": "^29.5.0",
-    "jest-environment-jsdom": "^29.5.0",
+    "jest": "29.7.0",
+    "jest-environment-jsdom": "29.7.0",
     "jest-environment-node": "^29.7.0",
     "json": "^11.0.0",
     "mocha-junit-reporter": "^2.2.0",
     "mocha-multi": "^1.1.7",
-    "nx": "19.5.3",
+    "nx": "21.1.2",
     "nx-cloud": "19.1.0",
     "persistgraphql": "^0.3.11",
     "postcss": "8.5.0",
diff --git a/packages/functional-tests/scripts/start-services.sh b/packages/functional-tests/scripts/start-services.sh
diff --git a/packages/fxa-admin-panel/.eslintrc.json b/packages/fxa-admin-panel/.eslintrc.json
diff --git a/packages/fxa-admin-panel/package.json b/packages/fxa-admin-panel/package.json
diff --git a/packages/fxa-auth-server/package.json b/packages/fxa-auth-server/package.json
diff --git a/packages/fxa-payments-server/.eslintrc.json b/packages/fxa-payments-server/.eslintrc.json
diff --git a/packages/fxa-payments-server/package.json b/packages/fxa-payments-server/package.json
diff --git a/packages/fxa-react/package.json b/packages/fxa-react/package.json
diff --git a/packages/fxa-settings/.eslintrc.json b/packages/fxa-settings/.eslintrc.json
diff --git a/packages/fxa-settings/package.json b/packages/fxa-settings/package.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`}`
`27`	`27`	`},`
`28`	`28`	`"lint": {`
`29`		`- "executor": "@nx/linter:eslint",`
	`29`	`+ "executor": "@nx/eslint:lint",`
`30`	`30`	`"outputs": ["{options.outputFile}"],`
`31`	`31`	`"options": {`
`32`	`32`	`"lintFilePatterns": ["apps/payments/next/*/.{ts,tsx,js,jsx}"]`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`}`
`20`	`20`	`},`
`21`	`21`	`"lint": {`
`22`		`- "executor": "@nx/linter:eslint",`
	`22`	`+ "executor": "@nx/eslint:lint",`
`23`	`23`	`"outputs": ["{options.outputFile}"],`
`24`	`24`	`"options": {`
`25`	`25`	`"lintFilePatterns": ["libs/google/*/.ts", "libs/google/package.json"]`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`}`
`35`	`35`	`},`
`36`	`36`	`"lint": {`
`37`		`- "executor": "@nx/linter:eslint",`
	`37`	`+ "executor": "@nx/eslint:lint",`
`38`	`38`	`"outputs": ["{options.outputFile}"],`
`39`	`39`	`"options": {`
`40`	`40`	`"lintFilePatterns": ["libs/payments/capability/*/.ts"]`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`}`
`34`	`34`	`},`
`35`	`35`	`"lint": {`
`36`		`- "executor": "@nx/linter:eslint",`
	`36`	`+ "executor": "@nx/eslint:lint",`
`37`	`37`	`"outputs": ["{options.outputFile}"],`
`38`	`38`	`"options": {`
`39`	`39`	`"lintFilePatterns": ["libs/payments/cart/*/.ts"]`