@nx/jest 18.2.4 → 18.3.0-beta.1

package/package.json

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

package/src/plugins/plugin.d.ts

@@ -1,6 +1,7 @@
 import { CreateDependencies, CreateNodes } from '@nx/devkit';
 export interface JestPluginOptions {
     targetName?: string;
+    ciTargetName?: string;
 }
 export declare const createDependencies: CreateDependencies;
 export declare const createNodes: CreateNodes<JestPluginOptions>;

package/src/plugins/plugin.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodes = exports.createDependencies = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const project_configuration_utils_1 = require("nx/src/project-graph/utils/project-configuration-utils");
 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");
@@ -54,14 +53,15 @@ exports.createNodes = [
         }
         options = normalizeOptions(options);
         const hash = (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context);
-        const targets = targetsCache[hash] ??
+        const { targets, metadata } = targetsCache[hash] ??
             (await buildJestTargets(configFilePath, projectRoot, options, context));
-        calculatedTargets[hash] = targets;
+        calculatedTargets[hash] = { targets, metadata };
         return {
             projects: {
                 [projectRoot]: {
                     root: projectRoot,
-                    targets: targets,
+                    targets,
+                    metadata,
                 },
             },
         };
@@ -72,7 +72,6 @@ async function buildJestTargets(configFilePath, projectRoot, options, context) {
         _: [],
         $0: undefined,
     }, (0, path_1.resolve)(context.workspaceRoot, configFilePath));
-    const targetDefaults = (0, project_configuration_utils_1.readTargetDefaultsForTarget)(options.targetName, context.nxJsonConfiguration.targetDefaults, 'nx:run-commands');
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {};
     const target = (targets[options.targetName] = {
@@ -80,17 +79,74 @@ async function buildJestTargets(configFilePath, projectRoot, options, context) {
         options: {
             cwd: projectRoot,
         },
+        metadata: {
+            technologies: ['jest'],
+            description: 'Run Jest Tests',
+        },
     });
-    if (!targetDefaults?.cache) {
-        target.cache = true;
-    }
-    if (!targetDefaults?.inputs) {
-        target.inputs = getInputs(namedInputs);
-    }
-    if (!targetDefaults?.outputs) {
-        target.outputs = getOutputs(projectRoot, config, context);
+    const cache = (target.cache = true);
+    const inputs = (target.inputs = getInputs(namedInputs));
+    const outputs = (target.outputs = getOutputs(projectRoot, config, context));
+    let metadata;
+    if (options?.ciTargetName) {
+        // Resolve the version of `jest-runtime` that `jest` is using.
+        const jestPath = require.resolve('jest');
+        const jest = require(jestPath);
+        // nx-ignore-next-line
+        const { default: Runtime } = require(require.resolve('jest-runtime', {
+            paths: [(0, path_1.dirname)(jestPath)],
+            // nx-ignore-next-line
+        }));
+        const context = await Runtime.createContext(config.projectConfig, {
+            maxWorkers: 1,
+            watchman: false,
+        });
+        const source = new jest.SearchSource(context);
+        const specs = await source.getTestPaths(config.globalConfig);
+        const testPaths = new Set(specs.tests.map(({ path }) => path));
+        if (testPaths.size > 0) {
+            const groupName = 'E2E (CI)';
+            const targetGroup = [];
+            metadata = {
+                targetGroups: {
+                    [groupName]: targetGroup,
+                },
+            };
+            const dependsOn = [];
+            targets[options.ciTargetName] = {
+                executor: 'nx:noop',
+                cache: true,
+                inputs,
+                outputs,
+                dependsOn,
+                metadata: {
+                    technologies: ['jest'],
+                    description: 'Run Jest Tests in CI',
+                },
+            };
+            targetGroup.push(options.ciTargetName);
+            for (const testPath of testPaths) {
+                const relativePath = (0, path_1.normalize)((0, path_1.relative)(projectRoot, testPath));
+                const targetName = `${options.ciTargetName}--${relativePath}`;
+                dependsOn.push(targetName);
+                targets[targetName] = {
+                    command: `jest ${relativePath}`,
+                    cache,
+                    inputs,
+                    outputs,
+                    options: {
+                        cwd: projectRoot,
+                    },
+                    metadata: {
+                        technologies: ['jest'],
+                        description: `Run Jest Tests in ${relativePath}`,
+                    },
+                };
+                targetGroup.push(targetName);
+            }
+        }
     }
-    return targets;
+    return { targets, metadata };
 }
 function getInputs(namedInputs) {
     return [