[PM-2328] Fix jest deprecations (#5483)

apps/browser/jest.config.js

@@ -2,8 +2,9 @@ const { pathsToModuleNameMapper } = require("ts-jest");
 
 const { compilerOptions } = require("./tsconfig");
 
-const sharedConfig = require("../../libs/shared/jest.config.base");
+const sharedConfig = require("../../libs/shared/jest.config.angular");
 
+/** @type {import('jest').Config} */
 module.exports = {
   ...sharedConfig,
   preset: "jest-preset-angular",

apps/cli/jest.config.js

@@ -1,8 +1,10 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
-const { compilerOptions } = require("./tsconfig.json");
 
-const sharedConfig = require("../../libs/shared/jest.config.base");
+const { compilerOptions } = require("./tsconfig");
 
+const sharedConfig = require("../../libs/shared/jest.config.ts");
+
+/** @type {import('jest').Config} */
 module.exports = {
   ...sharedConfig,
   preset: "ts-jest",

apps/desktop/jest.config.js

@@ -2,8 +2,9 @@ const { pathsToModuleNameMapper } = require("ts-jest");
 
 const { compilerOptions } = require("./tsconfig");
 
-const sharedConfig = require("../../libs/shared/jest.config.base");
+const sharedConfig = require("../../libs/shared/jest.config.angular");
 
+/** @type {import('jest').Config} */
 module.exports = {
   ...sharedConfig,
   preset: "jest-preset-angular",

apps/web/jest.config.js

@@ -2,8 +2,9 @@ const { pathsToModuleNameMapper } = require("ts-jest");
 
 const { compilerOptions } = require("./tsconfig");
 
-const sharedConfig = require("../../libs/shared/jest.config.base");
+const sharedConfig = require("../../libs/shared/jest.config.angular");
 
+/** @type {import('jest').Config} */
 module.exports = {
   ...sharedConfig,
   preset: "jest-preset-angular",
@@ -11,5 +12,4 @@ module.exports = {
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
     prefix: "<rootDir>/",
   }),
-  modulePathIgnorePatterns: ["jslib"],
 };

bitwarden_license/bit-web/jest.config.js

@@ -2,8 +2,9 @@ const { pathsToModuleNameMapper } = require("ts-jest");
 
 const { compilerOptions } = require("./tsconfig");
 
-const sharedConfig = require("../../libs/shared/jest.config.base");
+const sharedConfig = require("../../libs/shared/jest.config.angular");
 
+/** @type {import('jest').Config} */
 module.exports = {
   ...sharedConfig,
   preset: "jest-preset-angular",
@@ -11,5 +12,4 @@ module.exports = {
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
     prefix: "<rootDir>/",
   }),
-  modulePathIgnorePatterns: ["jslib"],
 };

jest.config.js

@@ -2,12 +2,14 @@ const { pathsToModuleNameMapper } = require("ts-jest");
 
 const { compilerOptions } = require("./tsconfig");
 
+/** @type {import('jest').Config} */
 module.exports = {
   reporters: ["default", "jest-junit"],
 
   collectCoverage: true,
   coverageReporters: ["html", "lcov"],
   coverageDirectory: "coverage",
+
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
     prefix: "<rootDir>/",
   }),
@@ -30,13 +32,4 @@ module.exports = {
   // https://github.com/facebook/jest/issues/9430#issuecomment-1149882002
   // Also anecdotally improves performance when run locally
   maxWorkers: 3,
-  globals: {
-    "ts-jest": {
-      // Further workaround for memory leak, recommended here:
-      // https://github.com/kulshekhar/ts-jest/issues/1967#issuecomment-697494014
-      // Makes tests run faster and reduces size/rate of leak, but loses typechecking on test code
-      // See https://bitwarden.atlassian.net/browse/EC-497 for more info
-      isolatedModules: true,
-    },
-  },
 };

libs/angular/jest.config.js

@@ -2,8 +2,9 @@ const { pathsToModuleNameMapper } = require("ts-jest");
 
 const { compilerOptions } = require("../shared/tsconfig.libs");
 
-const sharedConfig = require("../../libs/shared/jest.config.base");
+const sharedConfig = require("../../libs/shared/jest.config.angular");
 
+/** @type {import('jest').Config} */
 module.exports = {
   ...sharedConfig,
   displayName: "libs/angular tests",

libs/common/jest.config.js

@@ -2,8 +2,9 @@ const { pathsToModuleNameMapper } = require("ts-jest");
 
 const { compilerOptions } = require("../shared/tsconfig.libs");
 
-const sharedConfig = require("../shared/jest.config.base");
+const sharedConfig = require("../shared/jest.config.ts");
 
+/** @type {import('jest').Config} */
 module.exports = {
   ...sharedConfig,
   displayName: "libs/common tests",

libs/components/jest.config.js

@@ -2,8 +2,9 @@ const { pathsToModuleNameMapper } = require("ts-jest");
 
 const { compilerOptions } = require("./tsconfig");
 
-const sharedConfig = require("../../libs/shared/jest.config.base");
+const sharedConfig = require("../../libs/shared/jest.config.angular");
 
+/** @type {import('jest').Config} */
 module.exports = {
   ...sharedConfig,
   displayName: "libs/components tests",

libs/exporter/jest.config.js

@@ -2,8 +2,9 @@ const { pathsToModuleNameMapper } = require("ts-jest");
 
 const { compilerOptions } = require("../shared/tsconfig.libs");
 
-const sharedConfig = require("../shared/jest.config.base");
+const sharedConfig = require("../shared/jest.config.ts");
 
+/** @type {import('jest').Config} */
 module.exports = {
   ...sharedConfig,
   preset: "ts-jest",

libs/importer/jest.config.js

@@ -2,8 +2,9 @@ const { pathsToModuleNameMapper } = require("ts-jest");
 
 const { compilerOptions } = require("../shared/tsconfig.libs");
 
-const sharedConfig = require("../shared/jest.config.base");
+const sharedConfig = require("../shared/jest.config.ts");
 
+/** @type {import('jest').Config} */
 module.exports = {
   ...sharedConfig,
   preset: "ts-jest",

libs/node/jest.config.js

@@ -2,8 +2,9 @@ const { pathsToModuleNameMapper } = require("ts-jest");
 
 const { compilerOptions } = require("../shared/tsconfig.libs");
 
-const sharedConfig = require("../shared/jest.config.base");
+const sharedConfig = require("../shared/jest.config.ts");
 
+/** @type {import('jest').Config} */
 module.exports = {
   ...sharedConfig,
   preset: "ts-jest",

libs/shared/jest.config.angular.js

@@ -0,0 +1,32 @@
+/* eslint-env node */
+/* eslint-disable @typescript-eslint/no-var-requires */
+const { defaultTransformerOptions } = require("jest-preset-angular/presets");
+
+/** @type {import('jest').Config} */
+module.exports = {
+  testMatch: ["**/+(*.)+(spec).+(ts)"],
+
+  // Workaround for a memory leak that crashes tests in CI:
+  // https://github.com/facebook/jest/issues/9430#issuecomment-1149882002
+  // Also anecdotally improves performance when run locally
+  maxWorkers: 3,
+
+  transform: {
+    "^.+\\.(ts|js|mjs|svg)$": [
+      "jest-preset-angular",
+      {
+        ...defaultTransformerOptions,
+        // Jest does not use tsconfig.spec.json by default
+        tsconfig: "<rootDir>/tsconfig.spec.json",
+        // Further workaround for memory leak, recommended here:
+        // https://github.com/kulshekhar/ts-jest/issues/1967#issuecomment-697494014
+        // Makes tests run faster and reduces size/rate of leak, but loses typechecking on test code
+        // See https://bitwarden.atlassian.net/browse/EC-497 for more info
+        isolatedModules: true,
+        astTransformers: {
+          before: ["<rootDir>/../../libs/shared/es2020-transformer.ts"],
+        },
+      },
+    ],
+  },
+};

libs/shared/jest.config.base.js

@@ -1,27 +0,0 @@
-/* eslint-env node */
-module.exports = {
-  testMatch: ["**/+(*.)+(spec).+(ts)"],
-  collectCoverage: true,
-  coverageReporters: ["html", "lcov"],
-  coverageDirectory: "coverage",
-
-  // Workaround for a memory leak that crashes tests in CI:
-  // https://github.com/facebook/jest/issues/9430#issuecomment-1149882002
-  // Also anecdotally improves performance when run locally
-  maxWorkers: 3,
-
-  globals: {
-    "ts-jest": {
-      // Jest does not use tsconfig.spec.json by default
-      tsconfig: "<rootDir>/tsconfig.spec.json",
-      // Further workaround for memory leak, recommended here:
-      // https://github.com/kulshekhar/ts-jest/issues/1967#issuecomment-697494014
-      // Makes tests run faster and reduces size/rate of leak, but loses typechecking on test code
-      // See https://bitwarden.atlassian.net/browse/EC-497 for more info
-      isolatedModules: true,
-      astTransformers: {
-        before: ["<rootDir>/../../libs/shared/es2020-transformer.ts"],
-      },
-    },
-  },
-};

libs/shared/jest.config.ts.js

@@ -0,0 +1,29 @@
+/* eslint-env node */
+
+/** @type {import('jest').Config} */
+module.exports = {
+  testMatch: ["**/+(*.)+(spec).+(ts)"],
+
+  // Workaround for a memory leak that crashes tests in CI:
+  // https://github.com/facebook/jest/issues/9430#issuecomment-1149882002
+  // Also anecdotally improves performance when run locally
+  maxWorkers: 3,
+
+  transform: {
+    "^.+\\.tsx?$": [
+      "ts-jest",
+      {
+        // Jest does not use tsconfig.spec.json by default
+        tsconfig: "<rootDir>/tsconfig.spec.json",
+        // Further workaround for memory leak, recommended here:
+        // https://github.com/kulshekhar/ts-jest/issues/1967#issuecomment-697494014
+        // Makes tests run faster and reduces size/rate of leak, but loses typechecking on test code
+        // See https://bitwarden.atlassian.net/browse/EC-497 for more info
+        isolatedModules: true,
+        astTransformers: {
+          before: ["<rootDir>/../../libs/shared/es2020-transformer.ts"],
+        },
+      },
+    ],
+  },
+};