@nx/jest 21.3.0-beta.5 → 21.3.0-beta.6

package/migrations.json

@@ -16,6 +16,22 @@
       "version": "21.0.0-beta.10",
       "description": "Remove the previously deprecated and unused `tsConfig` option from the `@nx/jest:jest` executor.",
       "implementation": "./src/migrations/update-21-0-0/remove-tsconfig-option-from-jest-executor"
+    },
+    "rename-test-path-pattern": {
+      "version": "21.3.0-beta.3",
+      "requires": {
+        "jest": ">=30.0.0"
+      },
+      "description": "Rename the CLI option `testPathPattern` to `testPathPatterns`.",
+      "implementation": "./src/migrations/update-21-3-0/rename-test-path-pattern"
+    },
+    "replace-removed-matcher-aliases": {
+      "version": "21.3.0-beta.3",
+      "requires": {
+        "jest": ">=30.0.0"
+      },
+      "description": "Replace removed matcher aliases in Jest v30 with their corresponding matcher",
+      "implementation": "./src/migrations/update-21-3-0/replace-removed-matcher-aliases"
     }
   },
   "packageJsonUpdates": {
@@ -60,6 +76,44 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "21.3.0": {
+      "version": "21.3.0-beta.3",
+      "x-prompt": "Do you want to update the Jest version to v30?",
+      "packages": {
+        "jest": {
+          "version": "~30.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@types/jest": {
+          "version": "~30.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "expect": {
+          "version": "~30.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@jest/globals": {
+          "version": "~30.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "jest-jasmine2": {
+          "version": "~30.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "jest-environment-jsdom": {
+          "version": "~30.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "babel-jest": {
+          "version": "~30.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@swc/jest": {
+          "version": "~0.2.38",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/jest",
-  "version": "21.3.0-beta.5",
+  "version": "21.3.0-beta.6",
   "private": false,
   "description": "The Nx Plugin for Jest contains executors and generators allowing your workspace to use the powerful Jest testing capabilities.",
   "repository": {
@@ -35,15 +35,15 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@jest/reporters": "^29.4.1",
-    "@jest/test-result": "^29.4.1",
-    "@nx/devkit": "21.3.0-beta.5",
-    "@nx/js": "21.3.0-beta.5",
+    "@jest/reporters": "^30.0.2",
+    "@jest/test-result": "^30.0.2",
+    "@nx/devkit": "21.3.0-beta.6",
+    "@nx/js": "21.3.0-beta.6",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "identity-obj-proxy": "3.0.0",
-    "jest-config": "^29.4.1",
-    "jest-resolve": "^29.4.1",
-    "jest-util": "^29.4.1",
+    "jest-config": "^30.0.2",
+    "jest-resolve": "^30.0.2",
+    "jest-util": "^30.0.2",
     "minimatch": "9.0.3",
     "picocolors": "^1.1.0",
     "resolve.exports": "2.0.3",

package/plugins/resolver.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
 const resolve_exports_1 = require("resolve.exports");
+const jest_1 = require("jest");
 let compilerSetup;
 let ts;
+const jestMajorVersion = Number((0, jest_1.getVersion)().split('.')[0]);
 function getCompilerSetup(rootDir) {
     const tsConfigPath = ts.findConfigFile(rootDir, ts.sys.fileExists, 'tsconfig.spec.json') ||
         ts.findConfigFile(rootDir, ts.sys.fileExists, 'tsconfig.test.json') ||
@@ -27,10 +29,16 @@ module.exports = function (path, options) {
             // Try to use the defaultResolver with default options
             return options.defaultResolver(path, options);
         }
-        catch {
+        catch (e) {
+            if (jestMajorVersion >= 30) {
+                // The default resolver already handles what we had a workaround for in
+                // previous versions. Let the error bubble up.
+                throw e;
+            }
             // Try to use the defaultResolver with a packageFilter
             return options.defaultResolver(path, {
                 ...options,
+                // @ts-expect-error packageFilter and pathFilter where available in Jest 29
                 packageFilter: (pkg) => ({
                     ...pkg,
                     main: pkg.main || pkg.es2015 || pkg.module,

package/preset/jest-preset.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxPreset = void 0;
 exports.nxPreset = {
     // This is one of the patterns that jest finds by default https://jestjs.io/docs/configuration#testmatch-arraystring
-    testMatch: ['**/?(*.)+(spec|test).[jt]s?(x)'],
+    testMatch: ['**/?(*.)+(spec|test).?([mc])[jt]s?(x)'],
     resolver: '@nx/jest/plugins/resolver',
-    moduleFileExtensions: ['ts', 'js', 'mjs', 'html'],
+    moduleFileExtensions: ['ts', 'js', 'mts', 'mjs', 'cts', 'cjs', 'html'],
     coverageReporters: ['html'],
     transform: {
-        '^.+\\.(ts|js|html)$': [
+        '^.+\\.(ts|js|mts|mjs|cts|cjs|html)$': [
             'ts-jest',
             { tsconfig: '<rootDir>/tsconfig.spec.json' },
         ],

package/src/executors/jest/jest.impl.js

@@ -67,7 +67,7 @@ async function parseJestConfig(options, context, multiProjects = false) {
         silent: options.silent,
         testLocationInResults: options.testLocationInResults,
         testNamePattern: options.testNamePattern,
-        testPathPattern: options.testPathPattern,
+        testPathPatterns: options.testPathPatterns,
         testPathIgnorePatterns: options.testPathIgnorePatterns,
         testTimeout: options.testTimeout,
         colors: options.colors,

package/src/executors/jest/schema.d.ts

@@ -24,7 +24,7 @@ export interface JestExecutorOptions {
   silent?: boolean;
   testNamePattern?: string;
   testPathIgnorePatterns?: string[];
-  testPathPattern?: string[];
+  testPathPatterns?: string[];
   colors?: boolean;
   reporters?: string[];
   verbose?: boolean;

package/src/executors/jest/schema.json

@@ -123,7 +123,7 @@
       "type": "string"
     },
     "passWithNoTests": {
-      "description": "Will not fail if no tests are found (for example while using `--testPathPattern`.) (https://jestjs.io/docs/cli#--passwithnotests)",
+      "description": "Will not fail if no tests are found (for example while using `--testPathPatterns`.) (https://jestjs.io/docs/cli#--passwithnotests)",
       "type": "boolean"
     },
     "randomize": {
@@ -155,8 +155,8 @@
         "type": "string"
       }
     },
-    "testPathPattern": {
-      "description": "An array of regexp pattern strings that is matched against all tests paths before executing the test. (https://jestjs.io/docs/cli#--testpathpatternregex)",
+    "testPathPatterns": {
+      "description": "An array of regexp pattern strings that is matched against all tests paths before executing the test. (https://jestjs.io/docs/cli#--testpathpatternsregex)",
       "type": "array",
       "items": {
         "type": "string"

package/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -8,6 +8,7 @@ const jest_config_1 = require("jest-config");
 const node_path_1 = require("node:path");
 const plugin_1 = require("../../plugins/plugin");
 const config_file_1 = require("../../utils/config/config-file");
+const version_utils_1 = require("../../utils/version-utils");
 async function convertToInferred(tree, options) {
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
     const migratedProjects = await (0, executor_to_plugin_migrator_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/jest/plugin', plugin_1.createNodesV2, { targetName: 'test' }, [
@@ -87,14 +88,25 @@ async function updateOptions(targetOptions, projectRoot, workspaceRoot, jestConf
         testPathPatterns.push(toProjectRelativeRegexPath(targetOptions.testFile, projectRoot));
         delete targetOptions.testFile;
     }
+    let testPathPatternsOptionName;
     if ('testPathPattern' in targetOptions) {
+        testPathPatternsOptionName = 'testPathPattern';
         testPathPatterns.push(...targetOptions.testPathPattern.map((pattern) => toProjectRelativeRegexPath(pattern, projectRoot)));
     }
+    else if ('testPathPatterns' in targetOptions) {
+        testPathPatternsOptionName = 'testPathPatterns';
+        testPathPatterns.push(...targetOptions.testPathPatterns.map((pattern) => toProjectRelativeRegexPath(pattern, projectRoot)));
+    }
+    else {
+        const jestMajorVersion = (0, version_utils_1.getInstalledJestMajorVersion)();
+        testPathPatternsOptionName =
+            jestMajorVersion >= 30 ? 'testPathPatterns' : 'testPathPattern';
+    }
     if (testPathPatterns.length > 1) {
-        targetOptions.testPathPattern = `\"${testPathPatterns.join('|')}\"`;
+        targetOptions[testPathPatternsOptionName] = `\"${testPathPatterns.join('|')}\"`;
     }
     else if (testPathPatterns.length === 1) {
-        targetOptions.testPathPattern = testPathPatterns[0];
+        targetOptions[testPathPatternsOptionName] = testPathPatterns[0];
     }
     if ('testPathIgnorePatterns' in targetOptions) {
         if (targetOptions.testPathIgnorePatterns.length > 1) {

package/src/migrations/update-21-3-0/rename-test-path-pattern.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-21-3-0/rename-test-path-pattern.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+// migration for https://github.com/jestjs/jest/commit/41133b526d2c17bc9758f90d6026b25301cf0552
+async function default_1(tree) {
+    // update options from project configs
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/jest:jest', (_, project, target, configuration) => {
+        const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, project);
+        const config = configuration
+            ? projectConfiguration.targets[target].configurations[configuration]
+            : projectConfiguration.targets[target].options;
+        renameTestPathPattern(config);
+        (0, devkit_1.updateProjectConfiguration)(tree, project, projectConfiguration);
+    });
+    // update options from nx.json target defaults
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson.targetDefaults) {
+        return;
+    }
+    for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
+        if (targetOrExecutor !== '@nx/jest:jest' &&
+            targetConfig.executor !== '@nx/jest:jest') {
+            continue;
+        }
+        if (targetConfig.options) {
+            renameTestPathPattern(targetConfig.options);
+        }
+        Object.values(targetConfig.configurations ?? {}).forEach((config) => {
+            renameTestPathPattern(config);
+        });
+    }
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+    await (0, devkit_1.formatFiles)(tree);
+}
+function renameTestPathPattern(config) {
+    if (!config.testPathPattern) {
+        return;
+    }
+    config.testPathPatterns = config.testPathPattern;
+    delete config.testPathPattern;
+}

package/src/migrations/update-21-3-0/replace-removed-matcher-aliases.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-21-3-0/replace-removed-matcher-aliases.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const jest_1 = require("jest");
+const jest_config_1 = require("jest-config");
+const jest_runtime_1 = require("jest-runtime");
+const path_1 = require("path");
+const posix_1 = require("node:path/posix");
+const matcherAliasesMap = new Map([
+    ['toBeCalled', 'toHaveBeenCalled'],
+    ['toBeCalledTimes', 'toHaveBeenCalledTimes'],
+    ['toBeCalledWith', 'toHaveBeenCalledWith'],
+    ['lastCalledWith', 'toHaveBeenLastCalledWith'],
+    ['nthCalledWith', 'toHaveBeenNthCalledWith'],
+    ['toReturn', 'toHaveReturned'],
+    ['toReturnTimes', 'toHaveReturnedTimes'],
+    ['toReturnWith', 'toHaveReturnedWith'],
+    ['lastReturnedWith', 'toHaveLastReturnedWith'],
+    ['nthReturnedWith', 'toHaveNthReturnedWith'],
+    ['toThrowError', 'toThrow'],
+]);
+// migration for https://github.com/jestjs/jest/commit/eac241cf0bcb7a808e192e6fcf3afe67edbdbf8e
+async function default_1(tree) {
+    const testFilePaths = await getTestFilePaths(tree);
+    for (const testFilePath of testFilePaths) {
+        let testFileContent = tree.read(testFilePath, 'utf-8');
+        for (const [alias, matcher] of matcherAliasesMap) {
+            testFileContent = tsquery_1.tsquery.replace(testFileContent, `CallExpression PropertyAccessExpression:has(CallExpression Identifier[name=expect]) Identifier[name=${alias}]`, (_node) => matcher);
+        }
+        tree.write(testFilePath, testFileContent);
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+async function getTestFilePaths(tree) {
+    const jestConfigFiles = await (0, devkit_1.globAsync)(tree, [
+        '**/jest.config.{cjs,mjs,js,cts,mts,ts}',
+    ]);
+    if (!jestConfigFiles.length) {
+        return [];
+    }
+    const testFilePaths = new Set();
+    for (const jestConfigFile of jestConfigFiles) {
+        const jestConfigContent = tree.read(jestConfigFile, 'utf-8');
+        if (jestConfigContent.includes('getJestProjectsAsync()')) {
+            // skip the root jest config file which includes all projects
+            continue;
+        }
+        const config = await (0, jest_config_1.readConfig)({ _: [], $0: undefined }, (0, path_1.join)(tree.root, jestConfigFile));
+        const jestContext = await jest_runtime_1.default.createContext(config.projectConfig, {
+            maxWorkers: 1,
+            watchman: false,
+        });
+        const source = new jest_1.SearchSource(jestContext);
+        const specs = await source.getTestPaths(config.globalConfig, config.projectConfig);
+        for (const testPath of specs.tests) {
+            testFilePaths.add((0, posix_1.relative)(tree.root, testPath.path));
+        }
+    }
+    return Array.from(testFilePaths);
+}

package/src/plugins/plugin.js

@@ -12,7 +12,6 @@ const package_json_1 = require("nx/src/plugins/package-json");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const globs_1 = require("nx/src/utils/globs");
 const path_1 = require("path");
-const version_utils_1 = require("../utils/version-utils");
 const workspace_context_1 = require("nx/src/utils/workspace-context");
 const node_path_1 = require("node:path");
 const installation_directory_1 = require("nx/src/utils/installation-directory");
@@ -264,10 +263,7 @@ async function buildJestTargets(configFilePath, projectRoot, options, context, p
             });
             const jest = require(resolveJestPath(projectRoot, context.workspaceRoot));
             const source = new jest.SearchSource(jestContext);
-            const jestVersion = (0, version_utils_1.getInstalledJestMajorVersion)();
-            const specs = jestVersion >= 30
-                ? await source.getTestPaths(config.globalConfig, config.projectConfig)
-                : await source.getTestPaths(config.globalConfig);
+            const specs = await source.getTestPaths(config.globalConfig, config.projectConfig);
             const testPaths = new Set(specs.tests.map(({ path }) => path));
             if (testPaths.size > 0) {
                 const targetGroup = [];
@@ -381,8 +377,9 @@ function resolvePresetInputWithJestResolver(presetValue, projectRoot, workspaceR
         ? presetPath
         : (0, path_1.join)(presetPath, 'jest-preset');
     const { default: jestResolve } = requireJestUtil('jest-resolve', projectRoot, workspaceRoot);
+    const absoluteProjectRoot = (0, path_1.join)(workspaceRoot, projectRoot);
     const presetModule = jestResolve.findNodeModule(presetPath, {
-        basedir: projectRoot,
+        basedir: absoluteProjectRoot,
         extensions: ['.json', '.js', '.cjs', '.mjs'],
     });
     if (!presetModule) {
@@ -391,7 +388,7 @@ function resolvePresetInputWithJestResolver(presetValue, projectRoot, workspaceR
     if (isNpmPackage) {
         return { externalDependencies: [presetValue] };
     }
-    const relativePath = (0, path_1.relative)((0, path_1.join)(workspaceRoot, projectRoot), presetModule);
+    const relativePath = (0, path_1.relative)(absoluteProjectRoot, presetModule);
     return relativePath.startsWith('..')
         ? (0, path_1.join)('{workspaceRoot}', (0, path_1.join)(projectRoot, relativePath))
         : (0, path_1.join)('{projectRoot}', relativePath);

package/src/utils/version-utils.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInstalledJestVersion = getInstalledJestVersion;
 exports.getInstalledJestMajorVersion = getInstalledJestMajorVersion;
+const jest_1 = require("jest");
 const semver_1 = require("semver");
 function getInstalledJestVersion() {
     try {
-        return require('jest/package.json').version;
+        return (0, jest_1.getVersion)();
     }
     catch {
         return null;

package/src/utils/versions.d.ts

@@ -1,9 +1,9 @@
 export declare const nxVersion: any;
-export declare const jestVersion = "^29.7.0";
-export declare const babelJestVersion = "^29.7.0";
-export declare const jestTypesVersion = "^29.5.12";
-export declare const tsJestVersion = "^29.1.0";
+export declare const jestVersion = "^30.0.2";
+export declare const babelJestVersion = "^30.0.2";
+export declare const jestTypesVersion = "^30.0.0";
+export declare const tsJestVersion = "^29.4.0";
 export declare const tslibVersion = "^2.3.0";
-export declare const swcJestVersion = "~0.2.36";
+export declare const swcJestVersion = "~0.2.38";
 export declare const typesNodeVersion = "18.16.9";
 export declare const tsNodeVersion = "10.9.1";

package/src/utils/versions.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsNodeVersion = exports.typesNodeVersion = exports.swcJestVersion = exports.tslibVersion = exports.tsJestVersion = exports.jestTypesVersion = exports.babelJestVersion = exports.jestVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.jestVersion = '^29.7.0';
-exports.babelJestVersion = '^29.7.0';
-exports.jestTypesVersion = '^29.5.12';
-exports.tsJestVersion = '^29.1.0';
+exports.jestVersion = '^30.0.2';
+exports.babelJestVersion = '^30.0.2';
+exports.jestTypesVersion = '^30.0.0';
+exports.tsJestVersion = '^29.4.0';
 exports.tslibVersion = '^2.3.0';
-exports.swcJestVersion = '~0.2.36';
+exports.swcJestVersion = '~0.2.38';
 exports.typesNodeVersion = '18.16.9';
 exports.tsNodeVersion = '10.9.1';