@nx/jest 19.6.0-beta.1 → 19.6.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/jest",
-  "version": "19.6.0-beta.1",
+  "version": "19.6.0-beta.2",
   "private": false,
   "description": "The Nx Plugin for Jest contains executors and generators allowing your workspace to use the powerful Jest testing capabilities.",
   "repository": {
@@ -37,8 +37,8 @@
   "dependencies": {
     "@jest/reporters": "^29.4.1",
     "@jest/test-result": "^29.4.1",
-    "@nx/devkit": "19.6.0-beta.1",
-    "@nx/js": "19.6.0-beta.1",
+    "@nx/devkit": "19.6.0-beta.2",
+    "@nx/js": "19.6.0-beta.2",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "chalk": "^4.1.0",
     "identity-obj-proxy": "3.0.0",
@@ -47,9 +47,10 @@
     "jest-util": "^29.4.1",
     "minimatch": "9.0.3",
     "resolve.exports": "1.1.0",
+    "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "@nrwl/jest": "19.6.0-beta.1"
+    "@nrwl/jest": "19.6.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

package/src/plugins/plugin.js

@@ -2,18 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodes = exports.createNodesV2 = void 0;
 const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
-const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
-const fs_1 = require("fs");
-const jest_config_1 = require("jest-config");
-const jest_resolve_1 = require("jest-resolve");
-const cache_directory_1 = require("nx/src/utils/cache-directory");
 const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
-const package_json_1 = require("nx/src/plugins/package-json");
-const globs_1 = require("nx/src/utils/globs");
+const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
+const fs_1 = require("fs");
 const minimatch_1 = require("minimatch");
 const devkit_internals_1 = require("nx/src/devkit-internals");
+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 pmc = (0, devkit_1.getPackageManagerCommand)();
 function readTargetsCache(cachePath) {
     return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
@@ -91,7 +90,8 @@ async function buildJestTargets(configFilePath, projectRoot, options, context) {
         (0, config_utils_1.clearRequireCache)();
     }
     const rawConfig = await (0, config_utils_1.loadConfigFile)(absConfigFilePath);
-    const config = await (0, jest_config_1.readConfig)({
+    const { readConfig } = requireJestUtil('jest-config', projectRoot, context.workspaceRoot);
+    const config = await readConfig({
         _: [],
         $0: undefined,
     }, rawConfig, undefined, (0, path_1.dirname)(absConfigFilePath));
@@ -121,14 +121,18 @@ async function buildJestTargets(configFilePath, projectRoot, options, context) {
     let metadata;
     if (options?.ciTargetName) {
         // nx-ignore-next-line
-        const { default: Runtime } = requireJestUtil('jest-runtime', projectRoot, context);
+        const { default: Runtime } = requireJestUtil('jest-runtime', projectRoot, context.workspaceRoot);
         const jestContext = await Runtime.createContext(config.projectConfig, {
             maxWorkers: 1,
             watchman: false,
         });
-        const jest = require(resolveJestPath(projectRoot, context));
+        const jest = require(resolveJestPath(projectRoot, context.workspaceRoot));
         const source = new jest.SearchSource(jestContext);
-        const specs = await source.getTestPaths(config.globalConfig);
+        const jestVersion = (0, version_utils_1.getInstalledJestMajorVersion)();
+        const specs = jestVersion >= 30
+            ? // @ts-expect-error Jest 30+ expects the project config as the second argument
+                await source.getTestPaths(config.globalConfig, config.projectConfig)
+            : await source.getTestPaths(config.globalConfig);
         const testPaths = new Set(specs.tests.map(({ path }) => path));
         if (testPaths.size > 0) {
             const groupName = 'E2E (CI)';
@@ -217,12 +221,14 @@ function resolvePresetInput(presetValue, projectRoot, workspaceRoot) {
     if (!presetValue) {
         return null;
     }
-    let presetPath = (0, jest_config_1.replaceRootDirInPath)(projectRoot, presetValue);
+    const { replaceRootDirInPath } = requireJestUtil('jest-config', projectRoot, workspaceRoot);
+    let presetPath = replaceRootDirInPath(projectRoot, presetValue);
     const isNpmPackage = !presetValue.startsWith('.') && !(0, path_1.isAbsolute)(presetPath);
     presetPath = presetPath.startsWith('.')
         ? presetPath
         : (0, path_1.join)(presetPath, 'jest-preset');
-    const presetModule = jest_resolve_1.default.findNodeModule(presetPath, {
+    const { default: jestResolve } = requireJestUtil('jest-resolve', projectRoot, workspaceRoot);
+    const presetModule = jestResolve.findNodeModule(presetPath, {
         basedir: projectRoot,
         extensions: ['.json', '.js', '.cjs', '.mjs'],
     });
@@ -264,19 +270,19 @@ function normalizeOptions(options) {
     return options;
 }
 let resolvedJestPaths;
-function resolveJestPath(projectRoot, context) {
+function resolveJestPath(projectRoot, workspaceRoot) {
     resolvedJestPaths ??= {};
     if (resolvedJestPaths[projectRoot]) {
         return resolvedJestPaths[projectRoot];
     }
     return require.resolve('jest', {
-        paths: [projectRoot, context.workspaceRoot, __dirname],
+        paths: [projectRoot, workspaceRoot, __dirname],
     });
 }
 /**
  * Resolves a jest util package version that `jest` is using.
  */
-function requireJestUtil(packageName, projectRoot, context) {
-    const jestPath = resolveJestPath(projectRoot, context);
+function requireJestUtil(packageName, projectRoot, workspaceRoot) {
+    const jestPath = resolveJestPath(projectRoot, workspaceRoot);
     return require(require.resolve(packageName, { paths: [(0, path_1.dirname)(jestPath)] }));
 }

package/src/utils/version-utils.d.ts

@@ -0,0 +1,2 @@
+export declare function getInstalledJestVersion(): string | null;
+export declare function getInstalledJestMajorVersion(): number | null;

package/src/utils/version-utils.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getInstalledJestVersion = getInstalledJestVersion;
+exports.getInstalledJestMajorVersion = getInstalledJestMajorVersion;
+const semver_1 = require("semver");
+function getInstalledJestVersion() {
+    try {
+        return require('jest/package.json').version;
+    }
+    catch {
+        return null;
+    }
+}
+function getInstalledJestMajorVersion() {
+    const installedVersion = getInstalledJestVersion();
+    return installedVersion ? (0, semver_1.major)(installedVersion) : null;
+}