@nx/cypress 19.2.0-beta.3 → 19.2.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "19.2.0-beta.3",
+  "version": "19.2.0-beta.5",
   "private": false,
   "description": "The Nx Plugin for Cypress contains executors and generators allowing your workspace to use the powerful Cypress integration testing capabilities.",
   "repository": {
@@ -36,13 +36,13 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "19.2.0-beta.3",
-    "@nx/eslint": "19.2.0-beta.3",
-    "@nx/js": "19.2.0-beta.3",
+    "@nx/devkit": "19.2.0-beta.5",
+    "@nx/eslint": "19.2.0-beta.5",
+    "@nx/js": "19.2.0-beta.5",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "detect-port": "^1.5.1",
     "tslib": "^2.3.0",
-    "@nrwl/cypress": "19.2.0-beta.3"
+    "@nrwl/cypress": "19.2.0-beta.5"
   },
   "peerDependencies": {
     "cypress": ">= 3 < 14"

package/plugin.d.ts

@@ -1 +1 @@
-export { createNodes, createDependencies } from './src/plugins/plugin';
+export { createNodesV2, createNodes } 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.createNodes = exports.createNodesV2 = void 0;
 var plugin_1 = require("./src/plugins/plugin");
+Object.defineProperty(exports, "createNodesV2", { enumerable: true, get: function () { return plugin_1.createNodesV2; } });
 Object.defineProperty(exports, "createNodes", { enumerable: true, get: function () { return plugin_1.createNodes; } });
-Object.defineProperty(exports, "createDependencies", { enumerable: true, get: function () { return plugin_1.createDependencies; } });

package/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -13,11 +13,11 @@ async function convertToInferred(tree, options) {
     const migratedProjectsModern = await (0, executor_to_plugin_migrator_1.migrateExecutorToPlugin)(tree, projectGraph, '@nx/cypress:cypress', '@nx/cypress/plugin', (targetName) => ({
         targetName,
         ciTargetName: 'e2e-ci',
-    }), postTargetTransformer, plugin_1.createNodes, options.project);
+    }), postTargetTransformer, plugin_1.createNodesV2, options.project);
     const migratedProjectsLegacy = await (0, executor_to_plugin_migrator_1.migrateExecutorToPlugin)(tree, projectGraph, '@nrwl/cypress:cypress', '@nx/cypress/plugin', (targetName) => ({
         targetName,
         ciTargetName: 'e2e-ci',
-    }), postTargetTransformer, plugin_1.createNodes, options.project);
+    }), postTargetTransformer, plugin_1.createNodesV2, options.project);
     const migratedProjects = migratedProjectsModern.size + migratedProjectsLegacy.size;
     if (migratedProjects === 0) {
         throw new Error('Could not find any targets to migrate.');

package/src/generators/init/init.js

@@ -31,7 +31,7 @@ function updateDependencies(tree, options) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 function addPlugin(tree, graph, updatePackageScripts) {
-    return (0, add_plugin_1.addPlugin)(tree, graph, '@nx/cypress/plugin', plugin_1.createNodes, {
+    return (0, add_plugin_1.addPlugin)(tree, graph, '@nx/cypress/plugin', plugin_1.createNodesV2, {
         targetName: ['e2e', 'cypress:e2e', 'cypress-e2e'],
         openTargetName: ['open-cypress', 'cypress-open'],
         componentTestingTargetName: [

package/src/plugins/plugin.d.ts

@@ -1,9 +1,13 @@
-import { CreateDependencies, CreateNodes } from '@nx/devkit';
+import { CreateNodes, CreateNodesV2 } from '@nx/devkit';
 export interface CypressPluginOptions {
     ciTargetName?: string;
     targetName?: string;
     openTargetName?: string;
     componentTestingTargetName?: string;
 }
-export declare const createDependencies: CreateDependencies;
+export declare const createNodesV2: CreateNodesV2<CypressPluginOptions>;
+/**
+ * @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<CypressPluginOptions>;

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 js_1 = require("@nx/js");
@@ -11,51 +11,64 @@ const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculat
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const constants_1 = require("../utils/constants");
 const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
-const cachePath = (0, path_1.join)(cache_directory_1.projectGraphCacheDirectory, 'cypress.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 oldCache = readTargetsCache();
-    (0, devkit_1.writeJsonFile)(cachePath, {
-        ...oldCache,
-        targetsCache,
-    });
+function writeTargetsToCache(cachePath, results) {
+    (0, devkit_1.writeJsonFile)(cachePath, results);
 }
-const createDependencies = () => {
-    writeTargetsToCache();
-    return [];
-};
-exports.createDependencies = createDependencies;
-exports.createNodes = [
-    '**/cypress.config.{js,ts,mjs,cjs}',
-    async (configFilePath, options, context) => {
-        options = normalizeOptions(options);
-        const projectRoot = (0, path_1.dirname)(configFilePath);
-        // 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 cypressConfigGlob = '**/cypress.config.{js,ts,mjs,cjs}';
+exports.createNodesV2 = [
+    cypressConfigGlob,
+    async (configFiles, options, context) => {
+        const optionsHash = (0, devkit_internals_1.hashObject)(options);
+        const cachePath = (0, path_1.join)(cache_directory_1.projectGraphCacheDirectory, `cypress-${optionsHash}.hash`);
+        const targetsCache = readTargetsCache(cachePath);
+        try {
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache), configFiles, options, context);
+        }
+        finally {
+            writeTargetsToCache(cachePath, targetsCache);
         }
-        const hash = (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [
-            (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot)),
-        ]);
-        targetsCache[hash] ??= await buildCypressTargets(configFilePath, projectRoot, options, context);
-        const { targets, metadata } = targetsCache[hash];
-        const project = {
-            projectType: 'application',
-            targets,
-            metadata,
-        };
-        return {
-            projects: {
-                [projectRoot]: 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 = [
+    cypressConfigGlob,
+    (configFile, 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.');
+        return createNodesInternal(configFile, options, context, {});
+    },
+];
+async function createNodesInternal(configFilePath, options, context, targetsCache) {
+    options = normalizeOptions(options);
+    const projectRoot = (0, path_1.dirname)(configFilePath);
+    // 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 hash = (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [
+        (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot)),
+    ]);
+    targetsCache[hash] ??= await buildCypressTargets(configFilePath, projectRoot, options, context);
+    const { targets, metadata } = targetsCache[hash];
+    const project = {
+        projectType: 'application',
+        targets,
+        metadata,
+    };
+    return {
+        projects: {
+            [projectRoot]: project,
+        },
+    };
+}
 function getOutputs(projectRoot, cypressConfig, testingType) {
     function getOutput(path) {
         if (path.startsWith('..')) {