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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/jest",
-  "version": "22.1.0-beta.1",
+  "version": "22.1.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": "^30.0.2",
     "@jest/test-result": "^30.0.2",
-    "@nx/devkit": "22.1.0-beta.1",
-    "@nx/js": "22.1.0-beta.1",
+    "@nx/devkit": "22.1.0-beta.2",
+    "@nx/js": "22.1.0-beta.2",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "identity-obj-proxy": "3.0.0",
     "jest-config": "^30.0.2",
@@ -47,12 +47,12 @@
     "minimatch": "9.0.3",
     "picocolors": "^1.1.0",
     "resolve.exports": "2.0.3",
-    "semver": "^7.5.3",
+    "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "nx": "22.1.0-beta.1"
+    "nx": "22.1.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/jest/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,aAAa,EASd,MAAM,YAAY,CAAC;AAsBpB,MAAM,WAAW,iBAAiB;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAmBD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,iBAAiB,CAiFxD,CAAC;AAEF,eAAO,MAAM,aAAa,kCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/jest/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,aAAa,EASd,MAAM,YAAY,CAAC;AA6BpB,MAAM,WAAW,iBAAiB;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAmBD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,iBAAiB,CAiFxD,CAAC;AAEF,eAAO,MAAM,aAAa,kCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -5,21 +5,21 @@ const devkit_1 = require("@nx/devkit");
 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 get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
-const fs_1 = require("fs");
 const minimatch_1 = require("minimatch");
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
 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 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");
+const plugins_1 = require("nx/src/utils/plugins");
+const workspace_context_1 = require("nx/src/utils/workspace-context");
 const semver_1 = require("semver");
 const versions_1 = require("../utils/versions");
 const pmc = (0, devkit_1.getPackageManagerCommand)();
 function readTargetsCache(cachePath) {
-    return process.env.NX_CACHE_PROJECT_GRAPH !== 'false' && (0, fs_1.existsSync)(cachePath)
+    return process.env.NX_CACHE_PROJECT_GRAPH !== 'false' && (0, node_fs_1.existsSync)(cachePath)
         ? (0, devkit_1.readJsonFile)(cachePath)
         : {};
 }
@@ -31,14 +31,14 @@ exports.createNodes = [
     jestConfigGlob,
     async (configFiles, options, context) => {
         const optionsHash = (0, devkit_internals_1.hashObject)(options);
-        const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `jest-${optionsHash}.hash`);
+        const cachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `jest-${optionsHash}.hash`);
         const targetsCache = readTargetsCache(cachePath);
         // Cache jest preset(s) to avoid penalties of module load times. Most of jest configs will use the same preset.
         const presetCache = {};
         const isInPackageManagerWorkspaces = buildPackageJsonWorkspacesMatcher(context.workspaceRoot);
         options = normalizeOptions(options);
         const { roots: projectRoots, configFiles: validConfigFiles } = configFiles.reduce((acc, configFile) => {
-            const potentialRoot = (0, path_1.dirname)(configFile);
+            const potentialRoot = (0, node_path_1.dirname)(configFile);
             if (checkIfConfigFileShouldBeProject(configFile, potentialRoot, isInPackageManagerWorkspaces, context)) {
                 acc.roots.push(potentialRoot);
                 acc.configFiles.push(configFile);
@@ -81,7 +81,7 @@ function buildPackageJsonWorkspacesMatcher(workspaceRoot) {
 }
 function checkIfConfigFileShouldBeProject(configFilePath, projectRoot, isInPackageManagerWorkspaces, context) {
     // Do not create a project if package.json and project.json isn't there.
-    const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
+    const siblingFiles = (0, node_fs_1.readdirSync)((0, node_path_1.join)(context.workspaceRoot, projectRoot));
     if (!siblingFiles.includes('package.json') &&
         !siblingFiles.includes('project.json')) {
         return false;
@@ -94,7 +94,7 @@ function checkIfConfigFileShouldBeProject(configFilePath, projectRoot, isInPacka
             return false;
         }
     }
-    const jestConfigContent = (0, fs_1.readFileSync)((0, path_1.resolve)(context.workspaceRoot, configFilePath), 'utf-8');
+    const jestConfigContent = (0, node_fs_1.readFileSync)((0, node_path_1.resolve)(context.workspaceRoot, configFilePath), 'utf-8');
     if (jestConfigContent.includes('getJestProjectsAsync()')) {
         // The `getJestProjectsAsync` function uses the project graph, which leads to a
         // circular dependency. We can skip this since it's no intended to be used for
@@ -104,7 +104,7 @@ function checkIfConfigFileShouldBeProject(configFilePath, projectRoot, isInPacka
     return true;
 }
 async function buildJestTargets(configFilePath, projectRoot, options, context, presetCache) {
-    const absConfigFilePath = (0, path_1.resolve)(context.workspaceRoot, configFilePath);
+    const absConfigFilePath = (0, node_path_1.resolve)(context.workspaceRoot, configFilePath);
     if (require.cache[absConfigFilePath])
         (0, config_utils_1.clearRequireCache)();
     const rawConfig = await (0, config_utils_1.loadConfigFile)(absConfigFilePath, 
@@ -161,10 +161,10 @@ async function buildJestTargets(configFilePath, projectRoot, options, context, p
     const cache = (target.cache = true);
     const inputs = (target.inputs = getInputs(namedInputs, rawConfig.preset, projectRoot, context.workspaceRoot, disableJestRuntime));
     let metadata;
-    const groupName = options?.ciGroupName ?? deductGroupNameFromTarget(options?.ciTargetName);
+    const groupName = options?.ciGroupName ?? (0, plugins_1.deriveGroupNameFromTarget)(options?.ciTargetName);
     if (disableJestRuntime) {
         const outputs = (target.outputs = getOutputs(projectRoot, rawConfig.coverageDirectory
-            ? (0, path_1.join)(context.workspaceRoot, projectRoot, rawConfig.coverageDirectory)
+            ? (0, node_path_1.join)(context.workspaceRoot, projectRoot, rawConfig.coverageDirectory)
             : undefined, undefined, context));
         if (options?.ciTargetName) {
             const { specs, testMatch } = await getTestPaths(projectRoot, rawConfig, absConfigFilePath, context, presetCache);
@@ -177,7 +177,7 @@ async function buildJestTargets(configFilePath, projectRoot, options, context, p
             };
             const specIgnoreRegexes = rawConfig.testPathIgnorePatterns?.map((p) => new RegExp(replaceRootDirInPath(projectRoot, p)));
             for (const testPath of specs) {
-                const relativePath = (0, devkit_1.normalizePath)((0, path_1.relative)((0, path_1.join)(context.workspaceRoot, projectRoot), testPath));
+                const relativePath = (0, devkit_1.normalizePath)((0, node_path_1.relative)((0, node_path_1.join)(context.workspaceRoot, projectRoot), testPath));
                 if (relativePath.includes('../')) {
                     throw new Error('@nx/jest/plugin attempted to run tests outside of the project root. This is not supported and should not happen. Please open an issue at https://github.com/nrwl/nx/issues/new/choose with the following information:\n\n' +
                         `\n\n${JSON.stringify({
@@ -249,7 +249,7 @@ async function buildJestTargets(configFilePath, projectRoot, options, context, p
             config = await readConfig({
                 _: [],
                 $0: undefined,
-            }, rawConfig, undefined, (0, path_1.dirname)(absConfigFilePath));
+            }, rawConfig, undefined, (0, node_path_1.dirname)(absConfigFilePath));
         }
         catch (e) {
             console.error(e);
@@ -301,7 +301,7 @@ async function buildJestTargets(configFilePath, projectRoot, options, context, p
                 };
                 targetGroup.push(options.ciTargetName);
                 for (const testPath of testPaths) {
-                    const relativePath = (0, devkit_1.normalizePath)((0, path_1.relative)((0, path_1.join)(context.workspaceRoot, projectRoot), testPath));
+                    const relativePath = (0, devkit_1.normalizePath)((0, node_path_1.relative)((0, node_path_1.join)(context.workspaceRoot, projectRoot), testPath));
                     if (relativePath.includes('../')) {
                         throw new Error('@nx/jest/plugin attempted to run tests outside of the project root. This is not supported and should not happen. Please open an issue at https://github.com/nrwl/nx/issues/new/choose with the following information:\n\n' +
                             `\n\n${JSON.stringify({
@@ -368,17 +368,17 @@ function resolvePresetInputWithoutJestResolver(presetValue, projectRoot, workspa
     if (!presetValue)
         return null;
     const presetPath = replaceRootDirInPath(projectRoot, presetValue);
-    const isNpmPackage = !presetValue.startsWith('.') && !(0, path_1.isAbsolute)(presetPath);
+    const isNpmPackage = !presetValue.startsWith('.') && !(0, node_path_1.isAbsolute)(presetPath);
     if (isNpmPackage) {
         return { externalDependencies: [presetValue] };
     }
     if (presetPath.startsWith('..')) {
-        const relativePath = (0, path_1.relative)(workspaceRoot, (0, path_1.join)(projectRoot, presetPath));
-        return (0, path_1.join)('{workspaceRoot}', relativePath);
+        const relativePath = (0, node_path_1.relative)(workspaceRoot, (0, node_path_1.join)(projectRoot, presetPath));
+        return (0, node_path_1.join)('{workspaceRoot}', relativePath);
     }
     else {
-        const relativePath = (0, path_1.relative)(projectRoot, presetPath);
-        return (0, path_1.join)('{projectRoot}', relativePath);
+        const relativePath = (0, node_path_1.relative)(projectRoot, presetPath);
+        return (0, node_path_1.join)('{projectRoot}', relativePath);
     }
 }
 // preset resolution adapted from:
@@ -387,12 +387,12 @@ function resolvePresetInputWithJestResolver(presetValue, projectRoot, workspaceR
     if (!presetValue)
         return null;
     let presetPath = replaceRootDirInPath(projectRoot, presetValue);
-    const isNpmPackage = !presetValue.startsWith('.') && !(0, path_1.isAbsolute)(presetPath);
+    const isNpmPackage = !presetValue.startsWith('.') && !(0, node_path_1.isAbsolute)(presetPath);
     presetPath = presetPath.startsWith('.')
         ? presetPath
-        : (0, path_1.join)(presetPath, 'jest-preset');
+        : (0, node_path_1.join)(presetPath, 'jest-preset');
     const { default: jestResolve } = requireJestUtil('jest-resolve', projectRoot, workspaceRoot);
-    const absoluteProjectRoot = (0, path_1.join)(workspaceRoot, projectRoot);
+    const absoluteProjectRoot = (0, node_path_1.join)(workspaceRoot, projectRoot);
     const presetModule = jestResolve.findNodeModule(presetPath, {
         basedir: absoluteProjectRoot,
         extensions: ['.json', '.js', '.cjs', '.mjs'],
@@ -403,26 +403,26 @@ function resolvePresetInputWithJestResolver(presetValue, projectRoot, workspaceR
     if (isNpmPackage) {
         return { externalDependencies: [presetValue] };
     }
-    const relativePath = (0, path_1.relative)(absoluteProjectRoot, presetModule);
+    const relativePath = (0, node_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);
+        ? (0, node_path_1.join)('{workspaceRoot}', (0, node_path_1.join)(projectRoot, relativePath))
+        : (0, node_path_1.join)('{projectRoot}', relativePath);
 }
 // Adapted from here https://github.com/jestjs/jest/blob/c13bca3/packages/jest-config/src/utils.ts#L57-L69
 function replaceRootDirInPath(rootDir, filePath) {
     if (!filePath.startsWith('<rootDir>')) {
         return filePath;
     }
-    return (0, path_1.resolve)(rootDir, (0, node_path_1.normalize)(`./${filePath.slice('<rootDir>'.length)}`));
+    return (0, node_path_1.resolve)(rootDir, (0, node_path_1.normalize)(`./${filePath.slice('<rootDir>'.length)}`));
 }
 function getOutputs(projectRoot, coverageDirectory, outputFile, context) {
     function getOutput(path) {
-        const relativePath = (0, path_1.relative)((0, path_1.join)(context.workspaceRoot, projectRoot), path);
+        const relativePath = (0, node_path_1.relative)((0, node_path_1.join)(context.workspaceRoot, projectRoot), path);
         if (relativePath.startsWith('..')) {
-            return (0, path_1.join)('{workspaceRoot}', (0, path_1.join)(projectRoot, relativePath));
+            return (0, node_path_1.join)('{workspaceRoot}', (0, node_path_1.join)(projectRoot, relativePath));
         }
         else {
-            return (0, path_1.join)('{projectRoot}', relativePath);
+            return (0, node_path_1.join)('{projectRoot}', relativePath);
         }
     }
     const outputs = [];
@@ -459,11 +459,11 @@ function requireJestUtil(packageName, projectRoot, workspaceRoot) {
     if (!resolvedJestCorePaths[jestPath]) {
         // nx-ignore-next-line
         resolvedJestCorePaths[jestPath] = require.resolve('@jest/core', {
-            paths: [(0, path_1.dirname)(jestPath)],
+            paths: [(0, node_path_1.dirname)(jestPath)],
         });
     }
     return require(require.resolve(packageName, {
-        paths: [(0, path_1.dirname)(resolvedJestCorePaths[jestPath])],
+        paths: [(0, node_path_1.dirname)(resolvedJestCorePaths[jestPath])],
     }));
 }
 async function getTestPaths(projectRoot, rawConfig, absConfigFilePath, context, presetCache) {
@@ -472,7 +472,7 @@ async function getTestPaths(projectRoot, rawConfig, absConfigFilePath, context,
         // Default copied from https://github.com/jestjs/jest/blob/d1a2ed7/packages/jest-config/src/Defaults.ts#L84
         '**/__tests__/**/*.?([mc])[jt]s?(x)',
         '**/?(*.)+(spec|test).?([mc])[jt]s?(x)',
-    ]).map((pattern) => (0, path_1.join)(projectRoot, pattern)), []);
+    ]).map((pattern) => (0, node_path_1.join)(projectRoot, pattern)), []);
     const testRegex = await getJestOption(rawConfig, absConfigFilePath, 'testRegex', presetCache);
     if (testRegex) {
         const testRegexes = Array.isArray(rawConfig.testRegex)
@@ -486,8 +486,8 @@ async function getJestOption(rawConfig, absConfigFilePath, optionName, presetCac
     if (rawConfig[optionName])
         return rawConfig[optionName];
     if (rawConfig.preset) {
-        const dir = (0, path_1.dirname)(absConfigFilePath);
-        const presetPath = (0, path_1.resolve)(dir, rawConfig.preset);
+        const dir = (0, node_path_1.dirname)(absConfigFilePath);
+        const presetPath = (0, node_path_1.resolve)(dir, rawConfig.preset);
         try {
             let preset = presetCache[presetPath];
             if (!preset) {
@@ -506,24 +506,3 @@ async function getJestOption(rawConfig, absConfigFilePath, optionName, presetCac
     }
     return undefined;
 }
-/**
- * Helper that tries to deduct the name of the CI group, based on the related target name.
- *
- * This will work well, when the CI target name follows the documented naming convention or similar (for e.g `test-ci`, `e2e-ci`, `ny-e2e-ci`, etc).
- *
- * For example, `test-ci` => `TEST (CI)`,  `e2e-ci` => `E2E (CI)`,  `my-e2e-ci` => `MY E2E (CI)`
- *
- *
- * @param ciTargetName name of the CI target
- * @returns the deducted group name or `${ciTargetName.toUpperCase()} (CI)` if cannot be deducted automatically
- */
-function deductGroupNameFromTarget(ciTargetName) {
-    if (!ciTargetName) {
-        return null;
-    }
-    const parts = ciTargetName.split('-').map((v) => v.toUpperCase());
-    if (parts.length > 1) {
-        return `${parts.slice(0, -1).join(' ')} (${parts[parts.length - 1]})`;
-    }
-    return `${parts[0]} (CI)`; // default group name when there is a single segment
-}