@nx/jest 21.2.2 → 21.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/jest",
-  "version": "21.2.2",
+  "version": "21.2.4",
   "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": "21.2.2",
-    "@nx/js": "21.2.2",
+    "@nx/devkit": "21.2.4",
+    "@nx/js": "21.2.4",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "identity-obj-proxy": "3.0.0",
     "jest-config": "^29.4.1",

package/src/plugins/plugin.js

@@ -32,11 +32,11 @@ exports.createNodesV2 = [
         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 packageManagerWorkspacesGlob = (0, globs_1.combineGlobPatterns)((0, package_json_1.getGlobPatternsFromPackageManagerWorkspaces)(context.workspaceRoot));
+        const isInPackageManagerWorkspaces = buildPackageJsonWorkspacesMatcher(context.workspaceRoot);
         options = normalizeOptions(options);
         const { roots: projectRoots, configFiles: validConfigFiles } = configFiles.reduce((acc, configFile) => {
             const potentialRoot = (0, path_1.dirname)(configFile);
-            if (checkIfConfigFileShouldBeProject(configFile, potentialRoot, packageManagerWorkspacesGlob, context)) {
+            if (checkIfConfigFileShouldBeProject(configFile, potentialRoot, isInPackageManagerWorkspaces, context)) {
                 acc.roots.push(potentialRoot);
                 acc.configFiles.push(configFile);
             }
@@ -77,8 +77,8 @@ exports.createNodes = [
     async (configFilePath, options, context) => {
         devkit_1.logger.warn('`createNodes` is deprecated. Update your plugin to utilize createNodesV2 instead. In Nx 20, this will change to the createNodesV2 API.');
         const projectRoot = (0, path_1.dirname)(configFilePath);
-        const packageManagerWorkspacesGlob = (0, globs_1.combineGlobPatterns)((0, package_json_1.getGlobPatternsFromPackageManagerWorkspaces)(context.workspaceRoot));
-        if (!checkIfConfigFileShouldBeProject(configFilePath, projectRoot, packageManagerWorkspacesGlob, context)) {
+        const isInPackageManagerWorkspaces = buildPackageJsonWorkspacesMatcher(context.workspaceRoot);
+        if (!checkIfConfigFileShouldBeProject(configFilePath, projectRoot, isInPackageManagerWorkspaces, context)) {
             return {};
         }
         options = normalizeOptions(options);
@@ -94,7 +94,14 @@ exports.createNodes = [
         };
     },
 ];
-function checkIfConfigFileShouldBeProject(configFilePath, projectRoot, packageManagerWorkspacesGlob, context) {
+function buildPackageJsonWorkspacesMatcher(workspaceRoot) {
+    if (process.env.NX_INFER_ALL_PACKAGE_JSONS === 'true') {
+        return () => true;
+    }
+    const packageManagerWorkspacesGlob = (0, globs_1.combineGlobPatterns)((0, package_json_1.getGlobPatternsFromPackageManagerWorkspaces)(workspaceRoot));
+    return (path) => (0, minimatch_1.minimatch)(path, packageManagerWorkspacesGlob);
+}
+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));
     if (!siblingFiles.includes('package.json') &&
@@ -104,7 +111,7 @@ function checkIfConfigFileShouldBeProject(configFilePath, projectRoot, packageMa
     else if (!siblingFiles.includes('project.json') &&
         siblingFiles.includes('package.json')) {
         const path = (0, devkit_1.joinPathFragments)(projectRoot, 'package.json');
-        const isPackageJsonProject = (0, minimatch_1.minimatch)(path, packageManagerWorkspacesGlob);
+        const isPackageJsonProject = isInPackageManagerWorkspaces(path);
         if (!isPackageJsonProject) {
             return false;
         }
@@ -169,7 +176,7 @@ async function buildJestTargets(configFilePath, projectRoot, options, context, p
             ? (0, path_1.join)(context.workspaceRoot, projectRoot, rawConfig.coverageDirectory)
             : undefined, undefined, context));
         if (options?.ciTargetName) {
-            const testPaths = await getTestPaths(projectRoot, rawConfig, absConfigFilePath, context, presetCache);
+            const { specs, testMatch } = await getTestPaths(projectRoot, rawConfig, absConfigFilePath, context, presetCache);
             const targetGroup = [];
             const dependsOn = [];
             metadata = {
@@ -178,8 +185,18 @@ async function buildJestTargets(configFilePath, projectRoot, options, context, p
                 },
             };
             const specIgnoreRegexes = rawConfig.testPathIgnorePatterns?.map((p) => new RegExp(replaceRootDirInPath(projectRoot, p)));
-            for (const testPath of testPaths) {
+            for (const testPath of specs) {
                 const relativePath = (0, devkit_1.normalizePath)((0, path_1.relative)((0, 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({
+                            projectRoot,
+                            relativePath,
+                            specs,
+                            context,
+                            testMatch,
+                        }, null, 2)}`);
+                }
                 if (specIgnoreRegexes?.some((regex) => regex.test(relativePath))) {
                     continue;
                 }
@@ -293,6 +310,15 @@ 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));
+                    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({
+                                projectRoot,
+                                relativePath,
+                                testPaths,
+                                context,
+                            }, null, 2)}`);
+                    }
                     const targetName = `${options.ciTargetName}--${relativePath}`;
                     dependsOn.push(targetName);
                     targets[targetName] = {
@@ -461,7 +487,7 @@ async function getTestPaths(projectRoot, rawConfig, absConfigFilePath, context,
             : [new RegExp(rawConfig.testRegex)];
         paths = paths.filter((path) => testRegexes.some((r) => r.test(path)));
     }
-    return paths;
+    return { specs: paths, testMatch };
 }
 async function getJestOption(rawConfig, absConfigFilePath, optionName, presetCache) {
     if (rawConfig[optionName])