Merge pull request #18768 from mozilla/fix-nightly-ci-node-gyp

reinstall yarn.lock and fix or pin resulting dependency issues

- upgrade and migrate to husky v9

- add ip undefined fallback to gql-customs to maintain type String

- fix keys for settings pdf

- fix anonymous-default-export

- fix session-token.strategy test

- fix integration test sinon ESM Jest transform

- add "compression" resolution to fix "content encoding error" in Playwright test

- pin stripe, typescript, flat, babel, storybook, sentry, class-validator, and twilio

Author: toufali

.circleci/config.yml

@@ -315,7 +315,7 @@ commands:
     steps:
       - run:
           name: Pre building shared libraries
-          command: NODE_OPTIONS="--max-old-space-size=7168" npx nx run-many -t build --projects=tag:scope:shared:lib --parallel=2
+          command: NODE_OPTIONS="--max-old-space-size=7168" npx nx run-many -t build --projects=tag:scope:shared:lib --parallel=2 --verbose
           environment:
             NODE_ENV: test
       - run:

.husky/post-checkout

@@ -0,0 +1 @@
+_scripts/git-checkout-hook.sh

.husky/post-merge

@@ -0,0 +1 @@
+_scripts/git-merge-hook.sh

.husky/pre-commit

@@ -0,0 +1 @@
+lint-staged

package.json

@@ -25,7 +25,8 @@
     "legal:clone": "_scripts/clone-legal-docs.sh",
     "gql:allowlist": "nx run-many -t gql-extract && nx run-many -t gql-copy",
     "check:mysql": "_scripts/check-mysql.sh",
-    "check:url": "_scripts/check-url.sh"
+    "check:url": "_scripts/check-url.sh",
+    "prepare": "husky"
   },
   "homepage": "https://github.com/mozilla/fxa",
   "bugs": {
@@ -71,11 +72,11 @@
     "@paypal/react-paypal-js": "^8.7.0",
     "@radix-ui/react-form": "^0.1.0",
     "@radix-ui/react-tooltip": "^1.1.2",
-    "@sentry/browser": "^8.42.0",
-    "@sentry/nestjs": "^8.42.0",
-    "@sentry/nextjs": "^8.42.0",
-    "@sentry/node": "^8.42.0",
-    "@sentry/opentelemetry": "^8.42.0",
+    "@sentry/browser": "8.42.0",
+    "@sentry/nestjs": "8.42.0",
+    "@sentry/nextjs": "8.42.0",
+    "@sentry/node": "8.42.0",
+    "@sentry/opentelemetry": "8.42.0",
     "@stripe/react-stripe-js": "^2.7.1",
     "@stripe/stripe-js": "^4.9.0",
     "@swc/helpers": "0.5.11",
@@ -88,14 +89,13 @@
     "base64url": "^3.0.1",
     "bn.js": "^5.2.1",
     "class-transformer": "^0.5.1",
-    "class-validator": "^0.14.1",
+    "class-validator": "0.14.1",
     "clsx": "^2.1.1",
     "diffparser": "^2.0.1",
     "dotenv": "^16.4.5",
     "graphql": "^16.10.0",
     "graphql-request": "^6.1.0",
     "hot-shots": "^10.2.1",
-    "husky": "^4.2.5",
     "i18n-iso-countries": "^7.14.0",
     "jose": "^5.9.6",
     "jsdom": "^26.0.0",
@@ -128,24 +128,17 @@
     "semver": "^7.7.1",
     "set-value": "^4.1.0",
     "sms-segments-calculator": "^1.2.0",
-    "stripe": "^17.4.0",
+    "stripe": "17.4.0",
     "superagent": "^10.2.0",
     "tslib": "^2.8.1",
-    "twilio": "^5.3.5",
+    "twilio": "5.3.5",
     "typedi": "^0.8.0",
     "uuid": "^10.0.0",
     "winston": "^3.17.0"
   },
   "engines": {
     "node": "^22.14.0"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged",
-      "post-checkout": "_scripts/git-checkout-hook.sh",
-      "post-merge": "_scripts/git-merge-hook.sh"
-    }
-  },
   "lint-staged": {
     "packages/!(fxa-payments-server)/**/*.js": [
       "prettier --config _dev/.prettierrc --write",
@@ -168,8 +161,8 @@
     ]
   },
   "devDependencies": {
-    "@babel/core": "^7.26.0",
-    "@babel/preset-react": "^7.25.7",
+    "@babel/core": "7.25.7",
+    "@babel/preset-react": "7.25.7",
     "@graphql-codegen/cli": "5.0.0",
     "@graphql-codegen/client-preset": "^4.3.2",
     "@graphql-codegen/typescript": "^4.0.1",
@@ -186,21 +179,21 @@
     "@nx/storybook": "20.7.1",
     "@nx/workspace": "20.6.2",
     "@opentelemetry/semantic-conventions": "^1.30.0",
-    "@storybook/addon-essentials": "^7.6.15",
-    "@storybook/addon-styling": "^1.3.7",
-    "@storybook/core-common": "^7.4.5",
-    "@storybook/core-server": "^7.6.17",
-    "@storybook/html-webpack5": "^7.6.13",
-    "@storybook/nextjs": "^7.6.14",
-    "@storybook/react-webpack5": "^7.4.5",
+    "@storybook/addon-essentials": "7.6.15",
+    "@storybook/addon-styling": "1.3.7",
+    "@storybook/core-common": "7.4.5",
+    "@storybook/core-server": "7.6.17",
+    "@storybook/html-webpack5": "7.6.13",
+    "@storybook/nextjs": "7.6.14",
+    "@storybook/react-webpack5": "7.5.3",
     "@swc-node/register": "1.10.9",
     "@swc/cli": "0.6.0",
     "@swc/core": "1.11.11",
     "@swc/jest": "^0.2.36",
     "@testing-library/react": "15.0.6",
     "@types/babel__core": "^7",
     "@types/bn.js": "^5",
-    "@types/jest": "^29.5.1",
+    "@types/jest": "29.5.1",
     "@types/jsdom": "^21",
     "@types/module-alias": "^2",
     "@types/mysql": "^2",
@@ -236,6 +229,7 @@
     "grunt-contrib-copy": "^1.0.0",
     "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-environment-node": "^29.7.0",
@@ -257,27 +251,31 @@
     "ts-node": "^10.9.2",
     "tsc-alias": "^1.8.8",
     "tsconfig-paths-webpack-plugin": "^4.2.0",
-    "typescript": "^5.5.3"
+    "typescript": "5.5.3"
   },
   "workspaces": [
     "packages/*"
   ],
   "resolutions": {
-    "@babel/core": "^7.22.5",
-    "@babel/helper-module-imports": "^7.22.5",
-    "@babel/types": "^7.22.5",
+    "@babel/core": "7.25.7",
+    "@babel/helper-create-class-features-plugin": "7.25.7",
+    "@babel/helper-module-imports": "7.25.7",
+    "@babel/plugin-transform-function-name": "7.25.7",
+    "@babel/traverse": "7.25.7",
+    "@babel/types": "7.25.7",
     "@graphql-typed-document-node/core": "3.2.0",
     "@svgr/webpack": "^8.0.1",
     "@types/node": "^20.11.1",
-    "@types/react": "^18",
+    "@types/react": "18.2.14",
     "asn1.js": ">=5.4.1",
     "bn.js": "^5.2.1",
     "browserid-crypto": "https://github.com/mozilla-fxa/browserid-crypto.git#5979544d13eeb15a02d0b9a6a7a08a698d54d37d",
     "css-minimizer-webpack-plugin": ">=4 <5",
+    "compression": "1.7.4",
     "elliptic": ">=6.5.4",
     "eslint-plugin-import": "^2.25.2",
     "fbjs/isomorphic-fetch": "^3.0.0",
-    "flat": ">=5.0.2",
+    "flat": "5.0.2",
     "gobbledygook": "https://github.com/mozilla-fxa/gobbledygook.git#354042684056e57ca77f036989e907707a36cff2",
     "http-proxy": "^1.18.1",
     "minimist": "^1.2.6",
@@ -290,6 +288,7 @@
     "tap/typescript": "^4.5.2",
     "terser:>4.0.0 <5": ">=4.8.1",
     "terser:>5 <6": ">=5.14.2",
+    "typescript": "5.5.3",
     "underscore": ">=1.13.2"
   },
   "packageManager": "[email protected]",

packages/functional-tests/package.json

@@ -25,7 +25,7 @@
     "fxa-settings": "workspace:*",
     "jsqr": "^1.4.0",
     "pdf-parse": "^1.1.1",
-    "typescript": "^5.5.3",
+    "typescript": "5.5.3",
     "upng-js": "^2.1.0"
   },
   "nx": {

packages/fxa-admin-panel/package.json

@@ -53,7 +53,7 @@
     "serve-static": "^1.16.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.26.0",
+    "@babel/core": "7.25.7",
     "@rescripts/cli": "0.0.16",
     "@testing-library/jest-dom": "^5.16.5",
     "@types/chance": "^1.1.2",
@@ -84,7 +84,7 @@
     "supertest": "^7.0.0",
     "tailwindcss": "3.4.3",
     "tailwindcss-textshadow": "^2.1.3",
-    "typescript": "^5.5.3",
+    "typescript": "5.5.3",
     "webpack": "^5.97.0"
   },
   "nx": {

packages/fxa-admin-server/package.json

@@ -74,7 +74,7 @@
     "supertest": "^7.0.0",
     "tailwindcss": "3.4.3",
     "ts-jest": "^29.2.5",
-    "typescript": "^5.5.3",
+    "typescript": "5.5.3",
     "yargs": "^17.0.1"
   },
   "nx": {

packages/fxa-auth-client/package.json

@@ -63,7 +63,7 @@
     "fast-text-encoding": "^1.0.4",
     "mocha": "^10.4.0",
     "prettier": "^3.5.3",
-    "typescript": "^5.5.3",
+    "typescript": "5.5.3",
     "webcrypto-liner": "^1.4.0"
   },
   "mocha": {

packages/fxa-auth-server/package.json

@@ -98,7 +98,7 @@
     "ioredis": "^4.28.2",
     "joi": "^17.13.3",
     "jose": "^5.9.6",
-    "jsonwebtoken": "^9.0.0",
+    "jsonwebtoken": "^9.0.2",
     "jwks-rsa": "^3.1.0",
     "keyv": "5.2.1",
     "lodash": "^4.17.21",
@@ -123,15 +123,15 @@
     "web-push": "3.4.4"
   },
   "devDependencies": {
-    "@babel/core": "^7.26.0",
-    "@babel/preset-env": "^7.22.9",
-    "@babel/preset-react": "^7.25.7",
-    "@babel/preset-typescript": "^7.25.7",
-    "@storybook/addon-controls": "^7.4.6",
-    "@storybook/addon-docs": "^7.6.12",
-    "@storybook/addon-toolbars": "^7.0.23",
-    "@storybook/html": "^7.6.17",
-    "@storybook/html-webpack5": "^7.6.13",
+    "@babel/core": "7.25.7",
+    "@babel/preset-env": "7.25.7",
+    "@babel/preset-react": "7.25.7",
+    "@babel/preset-typescript": "7.25.7",
+    "@storybook/addon-controls": "7.4.6",
+    "@storybook/addon-docs": "7.6.12",
+    "@storybook/addon-toolbars": "7.0.23",
+    "@storybook/html": "7.6.17",
+    "@storybook/html-webpack5": "7.6.13",
     "@types/async-retry": "^1",
     "@types/babel__core": "7.20.5",
     "@types/babel__preset-env": "^7",
@@ -140,7 +140,7 @@
     "@types/dedent": "^0",
     "@types/hapi__hapi": "^20.0.10",
     "@types/ioredis": "^4.26.4",
-    "@types/jsonwebtoken": "^8.5.1",
+    "@types/jsonwebtoken": "8.5.1",
     "@types/jws": "^3.2.3",
     "@types/lodash": "^4",
     "@types/luxon": "^3",
@@ -197,7 +197,7 @@
     "through": "2.3.8",
     "tsc-alias": "^1.8.8",
     "type-fest": "^4.38.0",
-    "typescript": "^5.5.3",
+    "typescript": "5.5.3",
     "webpack": "^5.97.0",
     "webpack-watch-files-plugin": "^1.2.1",
     "ws": "^8.17.1"