@nx/jest 19.2.0-beta.4 → 19.2.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/jest",
-  "version": "19.2.0-beta.4",
+  "version": "19.2.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": {
@@ -37,8 +37,8 @@
   "dependencies": {
     "@jest/reporters": "^29.4.1",
     "@jest/test-result": "^29.4.1",
-    "@nx/devkit": "19.2.0-beta.4",
-    "@nx/js": "19.2.0-beta.4",
+    "@nx/devkit": "19.2.0-beta.6",
+    "@nx/js": "19.2.0-beta.6",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "chalk": "^4.1.0",
     "identity-obj-proxy": "3.0.0",
@@ -49,7 +49,7 @@
     "resolve.exports": "1.1.0",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "@nrwl/jest": "19.2.0-beta.4"
+    "@nrwl/jest": "19.2.0-beta.6"
   },
   "publishConfig": {
     "access": "public"

package/plugin.d.ts

@@ -1 +1 @@
-export { createNodes, createDependencies, JestPluginOptions, } from './src/plugins/plugin';
+export { createNodes, createNodesV2, JestPluginOptions, } from './src/plugins/plugin';

package/plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDependencies = exports.createNodes = void 0;
+exports.createNodesV2 = exports.createNodes = void 0;
 var plugin_1 = require("./src/plugins/plugin");
 Object.defineProperty(exports, "createNodes", { enumerable: true, get: function () { return plugin_1.createNodes; } });
-Object.defineProperty(exports, "createDependencies", { enumerable: true, get: function () { return plugin_1.createDependencies; } });
+Object.defineProperty(exports, "createNodesV2", { enumerable: true, get: function () { return plugin_1.createNodesV2; } });

package/src/generators/init/init.js

@@ -68,7 +68,7 @@ async function jestInitGeneratorInternal(tree, options) {
     if (!tree.exists(`jest.preset.${presetExt}`)) {
         updateProductionFileSet(tree);
         if (options.addPlugin) {
-            await (0, add_plugin_1.addPluginV1)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/jest/plugin', plugin_1.createNodes, {
+            await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/jest/plugin', plugin_1.createNodesV2, {
                 targetName: ['test', 'jest:test', 'jest-test'],
             }, options.updatePackageScripts);
         }

package/src/plugins/plugin.d.ts

@@ -1,7 +1,11 @@
-import { CreateDependencies, CreateNodes } from '@nx/devkit';
+import { CreateNodes, CreateNodesV2 } from '@nx/devkit';
 export interface JestPluginOptions {
     targetName?: string;
     ciTargetName?: string;
 }
-export declare const createDependencies: CreateDependencies;
+export declare const createNodesV2: CreateNodesV2<JestPluginOptions>;
+/**
+ * @deprecated This is replaced with {@link createNodesV2}. Update your plugin to export its own `createNodesV2` function that wraps this one instead.
+ * This function will change to the v2 function in Nx 20.
+ */
 export declare const createNodes: CreateNodes<JestPluginOptions>;

package/src/plugins/plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodes = exports.createDependencies = void 0;
+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");
@@ -12,64 +12,77 @@ const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
 const package_json_workspaces_1 = require("nx/src/plugins/package-json-workspaces");
 const globs_1 = require("nx/src/utils/globs");
 const minimatch_1 = require("minimatch");
-const cachePath = (0, path_1.join)(cache_directory_1.projectGraphCacheDirectory, 'jest.hash');
-const targetsCache = readTargetsCache();
-function readTargetsCache() {
+const devkit_internals_1 = require("nx/src/devkit-internals");
+function readTargetsCache(cachePath) {
     return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
 }
-function writeTargetsToCache() {
-    const cache = readTargetsCache();
-    (0, devkit_1.writeJsonFile)(cachePath, {
-        ...cache,
-        ...targetsCache,
-    });
+function writeTargetsToCache(cachePath, results) {
+    (0, devkit_1.writeJsonFile)(cachePath, results);
 }
-const createDependencies = () => {
-    writeTargetsToCache();
-    return [];
-};
-exports.createDependencies = createDependencies;
-exports.createNodes = [
-    '**/jest.config.{cjs,mjs,js,cts,mts,ts}',
-    async (configFilePath, options, context) => {
-        const projectRoot = (0, path_1.dirname)(configFilePath);
-        const packageManagerWorkspacesGlob = (0, globs_1.combineGlobPatterns)((0, package_json_workspaces_1.getGlobPatternsFromPackageManagerWorkspaces)(context.workspaceRoot));
-        // 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') &&
-            !siblingFiles.includes('project.json')) {
-            return {};
+const jestConfigGlob = '**/jest.config.{cjs,mjs,js,cts,mts,ts}';
+exports.createNodesV2 = [
+    jestConfigGlob,
+    async (configFiles, options, context) => {
+        const optionsHash = (0, devkit_internals_1.hashObject)(options);
+        const cachePath = (0, path_1.join)(cache_directory_1.projectGraphCacheDirectory, `jest-${optionsHash}.hash`);
+        const targetsCache = readTargetsCache(cachePath);
+        try {
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache), configFiles, options, context);
         }
-        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);
-            if (!isPackageJsonProject) {
-                return {};
-            }
+        finally {
+            writeTargetsToCache(cachePath, targetsCache);
         }
-        const jestConfigContent = (0, fs_1.readFileSync)((0, 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
-            // an Nx project.
+    },
+];
+/**
+ * @deprecated This is replaced with {@link createNodesV2}. Update your plugin to export its own `createNodesV2` function that wraps this one instead.
+ * This function will change to the v2 function in Nx 20.
+ */
+exports.createNodes = [
+    jestConfigGlob,
+    (...args) => {
+        devkit_1.logger.warn('`createNodes` is deprecated. Update your plugin to utilize createNodesV2 instead. In Nx 20, this will change to the createNodesV2 API.');
+        return createNodesInternal(...args, {});
+    },
+];
+async function createNodesInternal(configFilePath, options, context, targetsCache) {
+    const projectRoot = (0, path_1.dirname)(configFilePath);
+    const packageManagerWorkspacesGlob = (0, globs_1.combineGlobPatterns)((0, package_json_workspaces_1.getGlobPatternsFromPackageManagerWorkspaces)(context.workspaceRoot));
+    // 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') &&
+        !siblingFiles.includes('project.json')) {
+        return {};
+    }
+    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);
+        if (!isPackageJsonProject) {
             return {};
         }
-        options = normalizeOptions(options);
-        const hash = (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context);
-        targetsCache[hash] ??= await buildJestTargets(configFilePath, projectRoot, options, context);
-        const { targets, metadata } = targetsCache[hash];
-        return {
-            projects: {
-                [projectRoot]: {
-                    root: projectRoot,
-                    targets,
-                    metadata,
-                },
+    }
+    const jestConfigContent = (0, fs_1.readFileSync)((0, 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
+        // an Nx project.
+        return {};
+    }
+    options = normalizeOptions(options);
+    const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context);
+    targetsCache[hash] ??= await buildJestTargets(configFilePath, projectRoot, options, context);
+    const { targets, metadata } = targetsCache[hash];
+    return {
+        projects: {
+            [projectRoot]: {
+                root: projectRoot,
+                targets,
+                metadata,
             },
-        };
-    },
-];
+        },
+    };
+}
 async function buildJestTargets(configFilePath, projectRoot, options, context) {
     const absConfigFilePath = (0, path_1.resolve)(context.workspaceRoot, configFilePath);
     if (require.cache[absConfigFilePath]) {