@nx/cypress 17.0.4 → 17.0.6

package/src/generators/component-configuration/component-configuration.d.ts

@@ -1,6 +1,5 @@
-import { ProjectConfiguration, Tree, GeneratorCallback } from '@nx/devkit';
+import { ProjectConfiguration, Tree } from '@nx/devkit';
 import { CypressComponentConfigurationSchema } from './schema';
-export declare function componentConfigurationGenerator(tree: Tree, options: CypressComponentConfigurationSchema): Promise<GeneratorCallback>;
-export declare function componentConfigurationGeneratorInternal(tree: Tree, options: CypressComponentConfigurationSchema): Promise<GeneratorCallback>;
+export declare function componentConfigurationGenerator(tree: Tree, options: CypressComponentConfigurationSchema): Promise<() => void>;
 export declare function updateTsConfigForComponentTesting(tree: Tree, projectConfig: ProjectConfiguration): void;
 export default componentConfigurationGenerator;

package/src/generators/component-configuration/component-configuration.js

@@ -1,55 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateTsConfigForComponentTesting = exports.componentConfigurationGeneratorInternal = exports.componentConfigurationGenerator = void 0;
+exports.updateTsConfigForComponentTesting = exports.componentConfigurationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const cypress_version_1 = require("../../utils/cypress-version");
 const versions_1 = require("../../utils/versions");
 const base_setup_1 = require("../base-setup/base-setup");
-const init_1 = require("../init/init");
-function componentConfigurationGenerator(tree, options) {
-    return componentConfigurationGeneratorInternal(tree, {
-        addPlugin: false,
-        ...options,
-    });
-}
-exports.componentConfigurationGenerator = componentConfigurationGenerator;
-async function componentConfigurationGeneratorInternal(tree, options) {
-    const tasks = [];
-    const opts = normalizeOptions(tree, options);
-    tasks.push(await (0, init_1.default)(tree, {
-        ...opts,
-        skipFormat: true,
-    }));
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
-        ? p === '@nx/cypress/plugin'
-        : p.plugin === '@nx/cypress/plugin');
+async function componentConfigurationGenerator(tree, options) {
+    const opts = normalizeOptions(options);
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, opts.project);
-    tasks.push(updateDeps(tree, opts));
+    const installDepsTask = updateDeps(tree, opts);
     addProjectFiles(tree, projectConfig, opts);
-    if (!hasPlugin || opts.addExplicitTargets) {
-        addTargetToProject(tree, projectConfig, opts);
-    }
-    updateNxJsonConfiguration(tree, hasPlugin);
+    addTargetToProject(tree, projectConfig, opts);
+    updateNxJsonConfiguration(tree);
     updateTsConfigForComponentTesting(tree, projectConfig);
     if (!opts.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return (0, devkit_1.runTasksInSerial)(...tasks);
+    return () => {
+        installDepsTask();
+    };
 }
-exports.componentConfigurationGeneratorInternal = componentConfigurationGeneratorInternal;
-function normalizeOptions(tree, options) {
+exports.componentConfigurationGenerator = componentConfigurationGenerator;
+function normalizeOptions(options) {
     const cyVersion = (0, cypress_version_1.installedCypressVersion)();
     if (cyVersion && cyVersion < 10) {
         throw new Error('Cypress version of 10 or higher is required to use component testing. See the migration guide to upgrade. https://nx.dev/cypress/v11-migration-guide');
     }
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
-        nxJson.useInferencePlugins !== false;
     return {
-        addPlugin,
         ...options,
-        framework: options.framework ?? null,
         directory: options.directory ?? 'cypress',
     };
 }
@@ -89,26 +67,25 @@ function addTargetToProject(tree, projectConfig, opts) {
     };
     (0, devkit_1.updateProjectConfiguration)(tree, opts.project, projectConfig);
 }
-function updateNxJsonConfiguration(tree, hasPlugin) {
+function updateNxJsonConfiguration(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
-    const productionFileSet = nxJson.namedInputs?.production;
-    if (productionFileSet) {
-        nxJson.namedInputs.production = Array.from(new Set([
-            ...productionFileSet,
-            '!{projectRoot}/cypress/**/*',
-            '!{projectRoot}/**/*.cy.[jt]s?(x)',
-            '!{projectRoot}/cypress.config.[jt]s',
-        ]));
+    const cacheableOperations = nxJson.tasksRunnerOptions?.default?.options?.cacheableOperations;
+    if (cacheableOperations && !cacheableOperations.includes('component-test')) {
+        cacheableOperations.push('component-test');
     }
-    if (!hasPlugin) {
-        const cacheableOperations = nxJson.tasksRunnerOptions?.default?.options?.cacheableOperations;
-        if (cacheableOperations &&
-            !cacheableOperations.includes('component-test')) {
-            cacheableOperations.push('component-test');
+    nxJson.targetDefaults ??= {};
+    nxJson.targetDefaults['component-test'] ??= {};
+    nxJson.targetDefaults['component-test'].cache ??= true;
+    if (nxJson.namedInputs) {
+        const productionFileSet = nxJson.namedInputs?.production;
+        if (productionFileSet) {
+            nxJson.namedInputs.production = Array.from(new Set([
+                ...productionFileSet,
+                '!{projectRoot}/cypress/**/*',
+                '!{projectRoot}/**/*.cy.[jt]s?(x)',
+                '!{projectRoot}/cypress.config.[jt]s',
+            ]));
         }
-        nxJson.targetDefaults ??= {};
-        nxJson.targetDefaults['component-test'] ??= {};
-        nxJson.targetDefaults['component-test'].cache ??= true;
         nxJson.targetDefaults['component-test'] ??= {};
         nxJson.targetDefaults['component-test'].inputs ??= [
             'default',

package/src/generators/component-configuration/files/__directory__/support/component-index.html

@@ -5,10 +5,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title><%= project %> Components App</title>
-  <% if(framework === 'next') { %>
-  <!-- Used by Next.js to inject CSS. -->
-  <div id="__next_css__DO_NOT_USE__"></div>
-  <% } %>
+
 </head>
 <body>
   <div data-cy-root></div>

package/src/generators/component-configuration/schema.d.ts

@@ -4,11 +4,4 @@ export interface CypressComponentConfigurationSchema {
   directory?: string;
   bundler?: 'webpack' | 'vite';
   jsx?: boolean;
-  addPlugin?: boolean;
-
-  /**
-   * @internal
-   */
-  addExplicitTargets?: boolean;
-  framework?: 'next';
 }

package/src/generators/component-configuration/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "NxCypressComponentConfiguration",
   "cli": "nx",
   "title": "Set up Cypress component testing for a project",

package/src/generators/configuration/configuration.d.ts

@@ -14,10 +14,6 @@ export interface CypressE2EConfigSchema {
     port?: number | 'cypress-auto';
     jsx?: boolean;
     rootProject?: boolean;
-    webServerCommands?: Record<string, string>;
-    ciWebServerCommand?: string;
-    addPlugin?: boolean;
 }
 export declare function configurationGenerator(tree: Tree, options: CypressE2EConfigSchema): Promise<GeneratorCallback>;
-export declare function configurationGeneratorInternal(tree: Tree, options: CypressE2EConfigSchema): Promise<GeneratorCallback>;
 export default configurationGenerator;

package/src/generators/configuration/configuration.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configurationGeneratorInternal = exports.configurationGenerator = void 0;
+exports.configurationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const eslint_1 = require("@nx/eslint");
@@ -11,59 +11,28 @@ const cypress_version_1 = require("../../utils/cypress-version");
 const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
 const base_setup_1 = require("../base-setup/base-setup");
-function configurationGenerator(tree, options) {
-    return configurationGeneratorInternal(tree, {
-        addPlugin: false,
-        ...options,
-    });
-}
-exports.configurationGenerator = configurationGenerator;
-async function configurationGeneratorInternal(tree, options) {
+async function configurationGenerator(tree, options) {
     const opts = normalizeOptions(tree, options);
-    opts.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     const tasks = [];
     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, {
-            ...opts,
-            skipFormat: true,
-        }));
+        tasks.push(await (0, init_1.default)(tree, opts));
     }
-    else if (opts.addPlugin) {
-        (0, init_1.addPlugin)(tree);
-    }
-    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'
-        : p.plugin === '@nx/cypress/plugin');
-    await addFiles(tree, opts, projectGraph, hasPlugin);
-    if (!hasPlugin) {
-        addTarget(tree, opts);
+    if (opts.bundler === 'vite') {
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { vite: versions_1.viteVersion }));
     }
+    await addFiles(tree, opts);
+    addTarget(tree, opts);
     const linterTask = await (0, add_linter_1.addLinterToCyProject)(tree, {
         ...opts,
         cypressDir: opts.directory,
     });
     tasks.push(linterTask);
-    if (!opts.skipPackageJson) {
-        tasks.push(ensureDependencies(tree, opts));
-    }
     if (!opts.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.configurationGeneratorInternal = configurationGeneratorInternal;
-function ensureDependencies(tree, options) {
-    const devDependencies = {
-        '@types/node': versions_1.typesNodeVersion,
-    };
-    if (options.bundler === 'vite') {
-        devDependencies['vite'] = versions_1.viteVersion;
-    }
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies);
-}
+exports.configurationGenerator = configurationGenerator;
 function normalizeOptions(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     if (projectConfig?.targets?.e2e) {
@@ -72,29 +41,21 @@ Rename or remove the existing e2e target.`);
     }
     if (!options.baseUrl &&
         !options.devServerTarget &&
-        !projectConfig?.targets?.serve) {
+        !projectConfig.targets.serve) {
         throw new Error(`The project ${options.project} does not have a 'serve' target.
 In this case you need to provide a devServerTarget,'<projectName>:<targetName>[:<configName>]', or a baseUrl option`);
     }
     options.directory ??= 'src';
-    const devServerTarget = options.devServerTarget ??
-        (projectConfig?.targets?.serve ? `${options.project}:serve` : undefined);
-    if (!options.baseUrl && !devServerTarget) {
-        throw new Error('Either baseUrl or devServerTarget must be provided');
-    }
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    options.addPlugin ??=
-        process.env.NX_ADD_PLUGINS !== 'false' &&
-            nxJson.useInferencePlugins !== false;
     return {
         ...options,
         bundler: options.bundler ?? 'webpack',
         rootProject: options.rootProject ?? projectConfig.root === '.',
         linter: options.linter ?? eslint_1.Linter.EsLint,
-        devServerTarget,
+        devServerTarget: options.devServerTarget ??
+            (projectConfig.targets.serve ? `${options.project}:serve` : undefined),
     };
 }
-async function addFiles(tree, options, projectGraph, hasPlugin) {
+async function addFiles(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const cyVersion = (0, cypress_version_1.installedCypressVersion)();
     const filesToUse = cyVersion && cyVersion < 10 ? 'v9' : 'v10';
@@ -121,37 +82,12 @@ async function addFiles(tree, options, projectGraph, hasPlugin) {
             project: options.project,
             directory: options.directory,
             jsx: options.jsx,
-            js: options.js,
         });
-        const cyFile = (0, devkit_1.joinPathFragments)(projectConfig.root, options.js ? 'cypress.config.js' : 'cypress.config.ts');
-        let webServerCommands;
-        let ciWebServerCommand;
-        if (hasPlugin && options.webServerCommands && options.ciWebServerCommand) {
-            webServerCommands = options.webServerCommands;
-            ciWebServerCommand = options.ciWebServerCommand;
-        }
-        else if (hasPlugin && options.devServerTarget) {
-            webServerCommands = {};
-            webServerCommands.default = 'nx run ' + options.devServerTarget;
-            const parsedTarget = (0, devkit_1.parseTargetString)(options.devServerTarget, projectGraph);
-            const devServerProjectConfig = (0, devkit_1.readProjectConfiguration)(tree, parsedTarget.project);
-            // Add production e2e target if serve target is found
-            if (parsedTarget.configuration !== 'production' &&
-                devServerProjectConfig?.targets?.[parsedTarget.target]
-                    ?.configurations?.['production']) {
-                webServerCommands.production = `nx run ${parsedTarget.project}:${parsedTarget.target}:production`;
-            }
-            // Add ci/static e2e target if serve target is found
-            if (devServerProjectConfig?.targets?.['serve-static']) {
-                ciWebServerCommand = `nx run ${parsedTarget.project}:serve-static`;
-            }
-        }
+        const cyFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
         const updatedCyConfig = await (0, config_1.addDefaultE2EConfig)(tree.read(cyFile, 'utf-8'), {
-            cypressDir: options.directory,
-            bundler: options.bundler === 'vite' ? 'vite' : undefined,
-            webServerCommands,
-            ciWebServerCommand: ciWebServerCommand,
-        }, options.baseUrl);
+            directory: options.directory,
+            bundler: options.bundler,
+        });
         tree.write(cyFile, updatedCyConfig);
     }
     if (cyVersion &&
@@ -175,17 +111,20 @@ async function addFiles(tree, options, projectGraph, hasPlugin) {
 function addTarget(tree, opts) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, opts.project);
     const cyVersion = (0, cypress_version_1.installedCypressVersion)();
-    projectConfig.targets ??= {};
     projectConfig.targets.e2e = {
         executor: '@nx/cypress:cypress',
         options: {
-            cypressConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, cyVersion && cyVersion < 10
-                ? 'cypress.json'
-                : `cypress.config.${opts.js ? 'js' : 'ts'}`),
+            cypressConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, cyVersion && cyVersion < 10 ? 'cypress.json' : 'cypress.config.ts'),
             testingType: 'e2e',
         },
     };
-    if (opts.devServerTarget) {
+    if (opts.baseUrl) {
+        projectConfig.targets.e2e.options = {
+            ...projectConfig.targets.e2e.options,
+            baseUrl: opts.baseUrl,
+        };
+    }
+    else if (opts.devServerTarget) {
         const parsedTarget = (0, devkit_1.parseTargetString)(opts.devServerTarget);
         projectConfig.targets.e2e.options = {
             ...projectConfig.targets.e2e.options,
@@ -209,11 +148,8 @@ function addTarget(tree, opts) {
             };
         }
     }
-    else if (opts.baseUrl) {
-        projectConfig.targets.e2e.options = {
-            ...projectConfig.targets.e2e.options,
-            baseUrl: opts.baseUrl,
-        };
+    else {
+        throw new Error('Either baseUrl or devServerTarget must be provided');
     }
     (0, devkit_1.updateProjectConfiguration)(tree, opts.project, projectConfig);
 }

package/src/generators/configuration/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "NxCypressE2EConfigGenerator",
   "cli": "nx",
   "title": "Add a Cypress Configuration.",

package/src/generators/cypress-project/cypress-project.js

@@ -12,7 +12,6 @@ const add_linter_1 = require("../../utils/add-linter");
 const cypress_version_1 = require("../../utils/cypress-version");
 const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
-const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 function createFiles(tree, options) {
     // if not installed or >v10 use v10 folder
     // else use v9 folder
@@ -120,7 +119,6 @@ function addProject(tree, options) {
 async function cypressProjectGenerator(host, schema) {
     return await cypressProjectGeneratorInternal(host, {
         projectNameAndRootFormat: 'derived',
-        addPlugin: false,
         ...schema,
     });
 }
@@ -135,11 +133,11 @@ async function cypressProjectGeneratorInternal(host, schema) {
     // if there is an installed cypress version, then we don't call
     // init since we want to keep the existing version that is installed
     if (!cypressVersion) {
-        tasks.push(await (0, js_1.initGenerator)(host, { ...options, skipFormat: true }));
-        tasks.push(await (0, init_1.cypressInitGenerator)(host, {
-            ...options,
-            skipFormat: true,
-            addPlugin: options.addPlugin,
+        tasks.push(await (0, init_1.cypressInitGenerator)(host, options));
+    }
+    if (schema.bundler === 'vite') {
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {}, {
+            vite: versions_1.viteVersion,
         }));
     }
     createFiles(host, options);
@@ -152,29 +150,12 @@ async function cypressProjectGeneratorInternal(host, schema) {
         overwriteExisting: true,
     });
     tasks.push(installTask);
-    if (!options.skipPackageJson) {
-        tasks.push(ensureDependencies(host, options));
-    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.cypressProjectGeneratorInternal = cypressProjectGeneratorInternal;
-function ensureDependencies(tree, options) {
-    const devDependencies = {
-        '@types/node': versions_1.typesNodeVersion,
-    };
-    if (options.bundler === 'vite') {
-        devDependencies['vite'] = versions_1.viteVersion;
-    }
-    return (0, devkit_1.runTasksInSerial)(...[
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies),
-        () => {
-            (0, log_show_project_command_1.logShowProjectCommand)(options.projectName);
-        },
-    ]);
-}
 async function normalizeOptions(host, options) {
     let maybeRootProject;
     let isRootProject = false;
@@ -201,7 +182,6 @@ async function normalizeOptions(host, options) {
     });
     options.linter = options.linter || eslint_1.Linter.EsLint;
     options.bundler = options.bundler || 'webpack';
-    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     return {
         ...options,
         // other generators depend on the rootProject flag down stream

package/src/generators/cypress-project/schema.d.ts

@@ -13,5 +13,4 @@ export interface Schema {
   setParserOptionsProject?: boolean;
   skipPackageJson?: boolean;
   bundler?: 'webpack' | 'vite' | 'none';
-  addPlugin?: boolean;
 }

package/src/generators/cypress-project/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "NxCypressProjectGeneratorSchema",
   "cli": "nx",
   "title": "Create Cypress Configuration for the workspace",

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

@@ -1,6 +1,4 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
-export declare function addPlugin(tree: Tree): 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

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cypressInitGeneratorInternal = exports.cypressInitGenerator = exports.addPlugin = void 0;
+exports.cypressInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
-const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
+const js_1 = require("@nx/js");
 function setupE2ETargetDefaults(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     if (!nxJson.namedInputs) {
@@ -14,86 +13,31 @@ function setupE2ETargetDefaults(tree) {
     nxJson.targetDefaults ??= {};
     const productionFileSet = !!nxJson.namedInputs?.production;
     nxJson.targetDefaults.e2e ??= {};
-    nxJson.targetDefaults.e2e.cache ??= true;
     nxJson.targetDefaults.e2e.inputs ??= [
         'default',
         productionFileSet ? '^production' : '^default',
     ];
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
-function updateDependencies(tree, options) {
-    const tasks = [];
-    tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/cypress'], []));
-    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+function updateDependencies(tree) {
+    (0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/cypress'], []);
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
         ['@nx/cypress']: versions_1.nxVersion,
         cypress: versions_1.cypressVersion,
-    }, 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',
-        },
+        '@types/node': versions_1.typesNodeVersion,
     });
-    (0, devkit_1.updateNxJson)(tree, nxJson);
-}
-exports.addPlugin = addPlugin;
-function updateProductionFileset(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    const productionFileset = nxJson.namedInputs?.production;
-    if (productionFileset) {
-        nxJson.namedInputs.production = Array.from(new Set([
-            ...productionFileset,
-            '!{projectRoot}/cypress/**/*',
-            '!{projectRoot}/**/*.cy.[jt]s?(x)',
-            '!{projectRoot}/cypress.config.[jt]s',
-        ]));
-    }
-    (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 async function cypressInitGenerator(tree, options) {
-    return cypressInitGeneratorInternal(tree, { addPlugin: false, ...options });
-}
-exports.cypressInitGenerator = cypressInitGenerator;
-async function cypressInitGeneratorInternal(tree, options) {
-    updateProductionFileset(tree);
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    options.addPlugin ??=
-        process.env.NX_ADD_PLUGINS !== 'false' &&
-            nxJson.useInferencePlugins !== false;
-    if (options.addPlugin) {
-        addPlugin(tree);
-    }
-    else {
-        setupE2ETargetDefaults(tree);
-    }
-    let installTask = () => { };
+    setupE2ETargetDefaults(tree);
+    const tasks = [];
+    tasks.push(await (0, js_1.initGenerator)(tree, {
+        ...options,
+        skipFormat: true,
+    }));
     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);
+        tasks.push(updateDependencies(tree));
     }
-    return installTask;
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.cypressInitGeneratorInternal = cypressInitGeneratorInternal;
+exports.cypressInitGenerator = cypressInitGenerator;
 exports.default = cypressInitGenerator;

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

@@ -1,7 +1,5 @@
 export interface Schema {
-  skipFormat?: boolean;
   skipPackageJson?: boolean;
-  keepExistingVersions?: boolean;
-  updatePackageScripts?: boolean;
-  addPlugin?: boolean;
+
+  skipFormat?: boolean;
 }

package/src/generators/init/schema.json

@@ -1,34 +1,16 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "NxCypressInit",
   "cli": "nx",
   "title": "Add Cypress Configuration to the workspace",
   "description": "Add Cypress Configuration to the workspace.",
   "type": "object",
   "properties": {
-    "skipFormat": {
-      "description": "Skip formatting files.",
-      "type": "boolean",
-      "default": false,
-      "x-priority": "internal"
-    },
     "skipPackageJson": {
       "type": "boolean",
       "default": false,
       "description": "Do not add dependencies to `package.json`.",
       "x-priority": "internal"
-    },
-    "keepExistingVersions": {
-      "type": "boolean",
-      "x-priority": "internal",
-      "description": "Keep existing dependencies versions",
-      "default": false
-    },
-    "updatePackageScripts": {
-      "type": "boolean",
-      "x-priority": "internal",
-      "description": "Update `package.json` scripts with inferred targets",
-      "default": false
     }
   }
 }

package/src/generators/migrate-to-cypress-11/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "NxCypressMigrateTo11",
   "cli": "nx",
   "title": "Migrate e2e project to Cypress 11",

package/src/utils/add-linter.d.ts

@@ -17,6 +17,5 @@ export interface CyLinterOptions {
      * This is useful when adding linting to a brand new project vs an existing one
      **/
     overwriteExisting?: boolean;
-    addPlugin?: boolean;
 }
 export declare function addLinterToCyProject(tree: Tree, options: CyLinterOptions): Promise<() => void>;