chore(many): Upgrade nx

_dev/pm2/start.sh

@@ -8,11 +8,16 @@ cd "$DIR/../.."
 _dev/pm2/create-docker-net.sh fxa
 pm2 start _dev/pm2/infrastructure.config.js
 
-echo "waiting for containers to start"
+# Check that mysql is up
+echo "Waiting for mysql"
+_scripts/check-mysql.sh
+echo "Waiting for DB patches"
+_scripts/check-db-patcher.sh
 
+# Check that goaws simulator is up
+echo "Waiting for goaws"
 _scripts/check-url.sh localhost:4100/health
-_scripts/check-url.sh localhost:9299/api/config
-_scripts/check-mysql.sh
 
-echo "waiting for DB patches"
-_scripts/check-db-patcher.sh
+# Check firestore is up
+echo "Waiting for firestore"
+_scripts/check-url.sh localhost:9299/api/config

apps/payments/api/jest.config.ts

@@ -1,4 +1,4 @@
-export default {
+module.exports = {
   displayName: 'apiapi',
   preset: '../../../jest.preset.js',
   testEnvironment: 'node',

apps/payments/next/jest.config.ts

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* eslint-disable */
-import { Config } from 'jest';
+const { Config } = require('jest');
 
 const config: Config = {
   displayName: 'payments-next',
@@ -25,4 +25,4 @@ const config: Config = {
   ],
 };
 
-export default config;
+module.exports = config;

apps/payments/next/project.json

@@ -3,9 +3,14 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/payments/next",
   "projectType": "application",
+  "tags": ["app", "payments", "type:sp3"],
   "targets": {
     "build": {
-      "dependsOn": ["l10n-bundle", "glean-generate", "payments-metrics:glean-generate-frontend"]
+      "dependsOn": [
+        "l10n-bundle",
+        "glean-generate",
+        "payments-metrics:glean-generate-frontend"
+      ]
     },
     "dev": {
       "options": {
@@ -39,7 +44,11 @@
     },
     "start": {
       "command": "pm2 start apps/payments/next/pm2.config.js && yarn check:url localhost:3035/__heartbeat__",
-      "dependsOn": ["l10n-bundle", "glean-generate", "payments-metrics:glean-generate-frontend"]
+      "dependsOn": [
+        "l10n-bundle",
+        "glean-generate",
+        "payments-metrics:glean-generate-frontend"
+      ]
     },
     "stop": {
       "command": "pm2 stop apps/payments/next/pm2.config.js"
@@ -56,9 +65,7 @@
       "command": "yarn grunt --gruntfile='apps/payments/next/Gruntfile.js' merge-ftl",
       "dependsOn": ["l10n-prime"],
       "inputs": ["{projectRoot}/gruntfile.js", "{projectRoot}/app/**/en.ftl"],
-      "outputs": [
-        "{projectRoot}/public/locales/en/payments-next.ftl"
-      ]
+      "outputs": ["{projectRoot}/public/locales/en/payments-next.ftl"]
     },
     "l10n-prime": {
       "command": "./_scripts/l10n/prime.sh apps/payments/next"
@@ -74,9 +81,7 @@
         "{projectRoot}/public/locales/**/payments-next.ftl",
         "{projectRoot}/public/locales/**/react.ftl"
       ],
-      "outputs": [
-        "{projectRoot}/public/locales/**/main.ftl"
-      ]
+      "outputs": ["{projectRoot}/public/locales/**/main.ftl"]
     },
     "watchers": {
       "command": "yarn grunt --gruntfile='apps/payments/next/Gruntfile.js' watchers"
@@ -99,6 +104,5 @@
         "{workspaceRoot}/libs/shared/metrics/glean/src/registry/subplat-backend-metrics.yaml"
       ]
     }
-  },
-  "tags": ["app", "payments", "type:sp3"]
+  }
 }

jest.config.ts

@@ -1,5 +1,5 @@
-import { getJestProjectsAsync } from '@nx/jest';
+const { getJestProjectsAsync } = require('@nx/jest');
 
-export default async () => ({
+module.exports = async () => ({
   projects: await getJestProjectsAsync(),
 });

libs/accounts/email-renderer/jest.config.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-export default {
+module.exports = {
   displayName: 'accounts-email-renderer',
   preset: '../../../jest.preset.js',
   testEnvironment: 'node',

libs/accounts/email-renderer/src/storybook-email.tsx

@@ -129,7 +129,7 @@ async function renderUsingMJML({
   });
 }
 
-const Template: StoryFn<StorybookEmailArgs> = (args, context) =>
+const Template: StoryFn<StorybookEmailArgs> = (args:any, context:{globals:{ acceptLanguage:string, direction: "ltr" | "rtl"}}) =>
   storybookEmail({
     ...args,
     acceptLanguage: context.globals['acceptLanguage'],

libs/accounts/email-renderer/tsconfig.lib.json

@@ -6,5 +6,5 @@
     "types": ["node"]
   },
   "include": ["src/**/*.ts"],
-  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"],
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
 }

libs/accounts/email-sender/jest.config.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-export default {
+module.exports = {
   displayName: 'accounts-email-sender',
   preset: '../../../jest.preset.js',
   testEnvironment: 'node',

libs/accounts/email-sender/project.json

@@ -28,15 +28,15 @@
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "libs/accounts/email-sender/jest.config.ts",
-        "testPathPattern": ["^(?!.*\\.in\\.spec\\.ts$).*$"]
+        "testPathPatterns": ["^(?!.*\\.in\\.spec\\.ts$).*$"]
       }
     },
     "test-integration": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "libs/accounts/email-sender/jest.config.ts",
-        "testPathPattern": ["\\.in\\.spec\\.ts$"]
+        "testPathPatterns": ["\\.in\\.spec\\.ts$"]
       }
     }
   }

libs/accounts/errors/jest.config.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-export default {
+module.exports = {
   displayName: 'accounts-errors',
   preset: '../../../jest.preset.js',
   testEnvironment: 'node',

libs/accounts/errors/project.json

@@ -33,15 +33,15 @@
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "libs/accounts/errors/jest.config.ts",
-        "testPathPattern": ["^(?!.*\\.in\\.spec\\.ts$).*$"]
+        "testPathPatterns": ["^(?!.*\\.in\\.spec\\.ts$).*$"]
       }
     },
     "test-integration": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "libs/accounts/errors/jest.config.ts",
-        "testPathPattern": ["\\.in\\.spec\\.ts$"]
+        "testPathPatterns": ["\\.in\\.spec\\.ts$"]
       }
     }
   }

libs/accounts/oauth/jest.config.ts

@@ -1,4 +1,4 @@
-export default {
+module.exports = {
   displayName: 'oauth',
   preset: '../../../jest.preset.js',
   testEnvironment: 'node',

libs/accounts/passkey/jest.config.ts

@@ -1,4 +1,4 @@
-import { Config } from 'jest';
+const { Config } = require('jest');
 
 /* eslint-disable */
 const config: Config = {
@@ -30,4 +30,4 @@ const config: Config = {
     : {}),
 };
 
-export default config;
+module.exports = config;

libs/accounts/passkey/project.json

@@ -27,15 +27,15 @@
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "libs/accounts/passkey/jest.config.ts",
-        "testPathPattern": ["^(?!.*\\.in\\.spec\\.ts$).*$"]
+        "testPathPatterns": ["^(?!.*\\.in\\.spec\\.ts$).*$"]
       }
     },
     "test-integration": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "libs/accounts/passkey/jest.config.ts",
-        "testPathPattern": ["\\.in\\.spec\\.ts$"]
+        "testPathPatterns": ["\\.in\\.spec\\.ts$"]
       }
     }
   }

libs/accounts/rate-limit/jest.config.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-export default {
+module.exports = {
   displayName: 'accounts-rate-limit',
   preset: '../../../jest.preset.js',
   testEnvironment: 'node',

libs/accounts/rate-limit/project.json

@@ -28,15 +28,15 @@
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "libs/accounts/rate-limit/jest.config.ts",
-        "testPathPattern": ["^(?!.*\\.in\\.spec\\.ts$).*$"]
+        "testPathPatterns": ["^(?!.*\\.in\\.spec\\.ts$).*$"]
       }
     },
     "test-integration": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "libs/accounts/rate-limit/jest.config.ts",
-        "testPathPattern": ["\\.in\\.spec\\.ts$"]
+        "testPathPatterns": ["\\.in\\.spec\\.ts$"]
       }
     }
   }

libs/accounts/rate-limit/src/lib/rate-limit.in.spec.ts

@@ -59,8 +59,8 @@ describe('rate-limit', () => {
       expect(check2?.reason).toEqual('too-many-attempts');
       expect(check2?.retryAfter).toEqual(1000);
 
-      expect(mockIncrement).toBeCalledTimes(1);
-      expect(mockIncrement).toBeCalledWith('rate_limit.block', [
+      expect(mockIncrement).toHaveBeenCalledTimes(1);
+      expect(mockIncrement).toHaveBeenCalledWith('rate_limit.block', [
         `on:${blockOn}`,
         'action:testBlock',
       ]);
@@ -91,8 +91,8 @@ describe('rate-limit', () => {
       expect(check1).toBeNull();
       expect(check2).toBeNull();
 
-      expect(mockIncrement).toBeCalledTimes(1);
-      expect(mockIncrement).toBeCalledWith('rate_limit.report', [
+      expect(mockIncrement).toHaveBeenCalledTimes(1);
+      expect(mockIncrement).toHaveBeenCalledWith('rate_limit.report', [
         `on:${blockOn}`,
         'action:testReport',
       ]);
@@ -268,19 +268,19 @@ describe('rate-limit', () => {
     expect(checkReportOnly2).toBeNull();
     expect(checkReportOnly3).toBeNull();
 
-    expect(statsd.increment).toBeCalledTimes(5);
+    expect(statsd.increment).toHaveBeenCalledTimes(5);
     // For unblock calls
-    expect(statsd.increment).toBeCalledWith('rate_limit.unblock', [
+    expect(statsd.increment).toHaveBeenCalledWith('rate_limit.unblock', [
       'on:ip',
       'action:testBlock',
     ]);
     // For two blocked calls
-    expect(statsd.increment).toBeCalledWith('rate_limit.block', [
+    expect(statsd.increment).toHaveBeenCalledWith('rate_limit.block', [
       'on:ip',
       'action:testBlock',
     ]);
     // For two report only calls
-    expect(statsd.increment).toBeCalledWith('rate_limit.report', [
+    expect(statsd.increment).toHaveBeenCalledWith('rate_limit.report', [
       'on:ip',
       'action:testReport',
     ]);
@@ -317,8 +317,8 @@ describe('rate-limit', () => {
     expect(check2?.reason).toEqual('too-many-attempts');
     expect(check2?.retryAfter).toEqual(1000);
 
-    expect(mockIncrement).toBeCalledTimes(1);
-    expect(mockIncrement).toBeCalledWith('rate_limit.block', [
+    expect(mockIncrement).toHaveBeenCalledTimes(1);
+    expect(mockIncrement).toHaveBeenCalledWith('rate_limit.block', [
       'on:ip',
       'action:testBlock',
     ]);
@@ -377,8 +377,8 @@ describe('rate-limit', () => {
     expect(check4).not.toBeNull();
     expect(check5).toBeNull();
 
-    expect(statsd.increment).toBeCalledTimes(1);
-    expect(statsd.increment).toBeCalledWith('rate_limit.ban', [
+    expect(statsd.increment).toHaveBeenCalledTimes(1);
+    expect(statsd.increment).toHaveBeenCalledWith('rate_limit.ban', [
       'on:ip',
       'action:testBan',
     ]);

libs/accounts/rate-limit/src/lib/rate-limit.spec.ts

@@ -150,7 +150,7 @@ describe('rate-limit', () => {
     expect(rateLimit.skip('test', { email: 'foo@firefox.com' })).toBeTruthy();
     expect(rateLimit.skip('test', { email: 'bar@firefox.com ' })).toBeFalsy();
     expect(rateLimit.skip('test', {})).toBeFalsy();
-    expect(statsd.increment).toBeCalledWith('rate_limit.ignore.email');
+    expect(statsd.increment).toHaveBeenCalledWith('rate_limit.ignore.email');
   });
 
   it('can ignore certain ips', () => {
@@ -166,7 +166,7 @@ describe('rate-limit', () => {
     expect(rateLimit.skip('test', { ip: '127.0.0.1' })).toBeTruthy();
     expect(rateLimit.skip('test', { ip: '0.0.0.0' })).toBeFalsy();
     expect(rateLimit.skip('test', {})).toBeFalsy();
-    expect(statsd.increment).toBeCalledWith('rate_limit.ignore.ip');
+    expect(statsd.increment).toHaveBeenCalledWith('rate_limit.ignore.ip');
   });
 
   it('can ignore certain uids', () => {
@@ -182,7 +182,7 @@ describe('rate-limit', () => {
     expect(rateLimit.skip('test', { uid: '000-000-000' })).toBeTruthy();
     expect(rateLimit.skip('test', { uid: '000-000-001' })).toBeFalsy();
     expect(rateLimit.skip('test', {})).toBeFalsy();
-    expect(statsd.increment).toBeCalledWith('rate_limit.ignore.uid');
+    expect(statsd.increment).toHaveBeenCalledWith('rate_limit.ignore.uid');
   });
 
   describe('rate limit search', () => {
@@ -599,31 +599,25 @@ describe('rate-limit', () => {
         test     : ip                 :  1           :   1 second            : 1s             : block
         test     : ip                 :  1           :   1 second            : 1s             : block
       `)
-      ).toThrowError(/Invalid configuration! Duplicates detected:/);
+      ).toThrow(/Invalid configuration! Duplicates detected:/);
     });
 
     it('throws on malformed rule', () => {
-      expect(() => parseConfigRules('foo!23:ip:1:1s:1s:block')).toThrowError();
-      expect(() => parseConfigRules('foo:bar:1:1s:1s:block')).toThrowError();
-      expect(() => parseConfigRules('foo:bar:-2:1s:1s:block')).toThrowError();
-      expect(() =>
-        parseConfigRules('foo:bar:1:1sdfds:1s:block')
-      ).toThrowError();
-      expect(() =>
-        parseConfigRules('foo:bar:1:1s:1dsfds:block')
-      ).toThrowError();
-      expect(() =>
-        parseConfigRules('foo:bar:1:1s:-1h:block:ban')
-      ).toThrowError();
-      expect(() => parseConfigRules('foo:bar:1:1s:-1h:block')).toThrowError();
-      expect(() => parseConfigRules(':bar:1:1s:-1h:block')).toThrowError();
-      expect(() => parseConfigRules('foo::1:1s:-1h:block')).toThrowError();
-      expect(() => parseConfigRules('foo:bar::1s:-1h:block')).toThrowError();
-      expect(() => parseConfigRules('foo:bar:1::-1h:block')).toThrowError();
-      expect(() => parseConfigRules('foo:bar:1:1s::block')).toThrowError();
-      expect(() => parseConfigRules('foo:bar:1')).toThrowError();
-      expect(() => parseConfigRules('foo!23:ip:1:1s:1s:')).toThrowError();
-      expect(() => parseConfigRules('foo!23:ip:1:1s:1s:foo')).toThrowError();
+      expect(() => parseConfigRules('foo!23:ip:1:1s:1s:block')).toThrow();
+      expect(() => parseConfigRules('foo:bar:1:1s:1s:block')).toThrow();
+      expect(() => parseConfigRules('foo:bar:-2:1s:1s:block')).toThrow();
+      expect(() => parseConfigRules('foo:bar:1:1sdfds:1s:block')).toThrow();
+      expect(() => parseConfigRules('foo:bar:1:1s:1dsfds:block')).toThrow();
+      expect(() => parseConfigRules('foo:bar:1:1s:-1h:block:ban')).toThrow();
+      expect(() => parseConfigRules('foo:bar:1:1s:-1h:block')).toThrow();
+      expect(() => parseConfigRules(':bar:1:1s:-1h:block')).toThrow();
+      expect(() => parseConfigRules('foo::1:1s:-1h:block')).toThrow();
+      expect(() => parseConfigRules('foo:bar::1s:-1h:block')).toThrow();
+      expect(() => parseConfigRules('foo:bar:1::-1h:block')).toThrow();
+      expect(() => parseConfigRules('foo:bar:1:1s::block')).toThrow();
+      expect(() => parseConfigRules('foo:bar:1')).toThrow();
+      expect(() => parseConfigRules('foo!23:ip:1:1s:1s:')).toThrow();
+      expect(() => parseConfigRules('foo!23:ip:1:1s:1s:foo')).toThrow();
     });
   });
 

libs/accounts/recovery-phone/jest.config.ts

@@ -1,4 +1,4 @@
-import { Config } from 'jest';
+const { Config } = require('jest');
 
 /* eslint-disable */
 const config: Config = {
@@ -22,4 +22,4 @@ const config: Config = {
   ],
 };
 
-export default config;
+module.exports = config;