@nx/cypress 18.3.0-beta.1 → 18.3.0-beta.2

package/package.json

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

package/src/generators/configuration/configuration.js

@@ -22,6 +22,7 @@ async function configurationGeneratorInternal(tree, options) {
     const opts = normalizeOptions(tree, options);
     opts.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     const tasks = [];
+    const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
     if (!(0, cypress_version_1.installedCypressVersion)()) {
         tasks.push(await (0, js_1.initGenerator)(tree, { ...options, skipFormat: true }));
         tasks.push(await (0, init_1.default)(tree, {
@@ -30,9 +31,8 @@ async function configurationGeneratorInternal(tree, options) {
         }));
     }
     else if (opts.addPlugin) {
-        (0, init_1.addPlugin)(tree);
+        await (0, init_1.addPlugin)(tree, projectGraph, false);
     }
-    const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
         ? p === '@nx/cypress/plugin'

package/src/generators/init/init.d.ts

@@ -1,6 +1,6 @@
-import { GeneratorCallback, Tree } from '@nx/devkit';
+import { GeneratorCallback, ProjectGraph, Tree } from '@nx/devkit';
 import { Schema } from './schema';
-export declare function addPlugin(tree: Tree): void;
+export declare function addPlugin(tree: Tree, graph: ProjectGraph, updatePackageScripts: boolean): Promise<void>;
 export declare function cypressInitGenerator(tree: Tree, options: Schema): Promise<GeneratorCallback>;
 export declare function cypressInitGeneratorInternal(tree: Tree, options: Schema): Promise<GeneratorCallback>;
 export default cypressInitGenerator;

package/src/generators/init/init.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cypressInitGeneratorInternal = exports.cypressInitGenerator = exports.addPlugin = void 0;
 const devkit_1 = require("@nx/devkit");
-const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
+const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 function setupE2ETargetDefaults(tree) {
@@ -30,26 +30,17 @@ function updateDependencies(tree, options) {
     }, undefined, options.keepExistingVersions));
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-function addPlugin(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    nxJson.plugins ??= [];
-    for (const plugin of nxJson.plugins) {
-        if (typeof plugin === 'string'
-            ? plugin === '@nx/cypress/plugin'
-            : plugin.plugin === '@nx/cypress/plugin') {
-            return;
-        }
-    }
-    nxJson.plugins.push({
-        plugin: '@nx/cypress/plugin',
-        options: {
-            targetName: 'e2e',
-            componentTestingTargetName: 'component-test',
-            ciTargetName: 'e2e-ci',
-            openTargetName: 'open-cypress',
-        },
-    });
-    (0, devkit_1.updateNxJson)(tree, nxJson);
+function addPlugin(tree, graph, updatePackageScripts) {
+    return (0, add_plugin_1.addPlugin)(tree, graph, '@nx/cypress/plugin', plugin_1.createNodes, {
+        targetName: ['e2e', 'cypress:e2e', 'cypress-e2e'],
+        openTargetName: ['open-cypress', 'cypress-open'],
+        componentTestingTargetName: [
+            'component-test',
+            'cypress:component-test',
+            'cypress-component-test',
+        ],
+        ciTargetName: ['e2e-ci', 'cypress:e2e-ci', 'cypress-e2e-ci'],
+    }, updatePackageScripts);
 }
 exports.addPlugin = addPlugin;
 function updateProductionFileset(tree) {
@@ -76,7 +67,7 @@ async function cypressInitGeneratorInternal(tree, options) {
         process.env.NX_ADD_PLUGINS !== 'false' &&
             nxJson.useInferencePlugins !== false;
     if (options.addPlugin) {
-        addPlugin(tree);
+        await addPlugin(tree, await (0, devkit_1.createProjectGraphAsync)(), options.updatePackageScripts);
     }
     else {
         setupE2ETargetDefaults(tree);
@@ -85,11 +76,6 @@ async function cypressInitGeneratorInternal(tree, options) {
     if (!options.skipPackageJson) {
         installTask = updateDependencies(tree, options);
     }
-    if (options.updatePackageScripts) {
-        global.NX_CYPRESS_INIT_GENERATOR_RUNNING = true;
-        await (0, update_package_scripts_1.updatePackageScripts)(tree, plugin_1.createNodes);
-        global.NX_CYPRESS_INIT_GENERATOR_RUNNING = false;
-    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }