@nx/cypress 17.0.3 → 17.0.5

package/src/generators/base-setup/base-setup.js

@@ -6,11 +6,12 @@ const js_1 = require("@nx/js");
 const path_1 = require("path");
 function addBaseCypressSetup(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    if (tree.exists((0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts'))) {
+    if (tree.exists((0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts')) ||
+        tree.exists((0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.js'))) {
         return;
     }
     const opts = normalizeOptions(tree, projectConfig, options);
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), projectConfig.root, {
+    const templateVars = {
         ...opts,
         jsx: !!opts.jsx,
         offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root),
@@ -19,7 +20,19 @@ function addBaseCypressSetup(tree, options) {
             ? `${opts.offsetFromProjectRoot}tsconfig.json`
             : (0, js_1.getRelativePathToRootTsConfig)(tree, projectConfig.root),
         ext: '',
-    });
+    };
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files/common'), projectConfig.root, templateVars);
+    if (options.js) {
+        if (isEsmProject(tree, projectConfig.root)) {
+            (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files/config-js-esm'), projectConfig.root, templateVars);
+        }
+        else {
+            (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files/config-js-cjs'), projectConfig.root, templateVars);
+        }
+    }
+    else {
+        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files/config-ts'), projectConfig.root, templateVars);
+    }
     if (opts.hasTsConfig) {
         (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json'), (json) => {
             // tsconfig doesn't have references so it shouldn't add them
@@ -55,3 +68,13 @@ function normalizeOptions(tree, projectConfig, options) {
         hasTsConfig,
     };
 }
+function isEsmProject(tree, projectRoot) {
+    let packageJson;
+    if (tree.exists((0, devkit_1.joinPathFragments)(projectRoot, 'package.json'))) {
+        packageJson = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(projectRoot, 'package.json'));
+    }
+    else {
+        packageJson = (0, devkit_1.readJson)(tree, 'package.json');
+    }
+    return packageJson.type === 'module';
+}

package/src/generators/base-setup/files/config-js-cjs/__directory__/support/commands.js__ext__

@@ -0,0 +1,35 @@
+/// <reference types="cypress" />
+
+// ***********************************************
+// This example commands.ts shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+
+// eslint-disable-next-line @typescript-eslint/no-namespace
+declare namespace Cypress { 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  interface Chainable<Subject> {
+    login(email: string, password: string): void;
+  }
+}
+
+// -- This is a parent command --
+Cypress.Commands.add('login', (email, password) => {
+  console.log('Custom command example: Login', email, password);
+});
+//
+// -- This is a child command --
+// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

package/src/generators/base-setup/files/config-js-cjs/cypress.config.js__ext__

@@ -0,0 +1,3 @@
+const { defineConfig } = require('cypress');
+
+module.exports = defineConfig({});

package/src/generators/base-setup/files/config-js-esm/__directory__/support/commands.js__ext__

@@ -0,0 +1,35 @@
+/// <reference types="cypress" />
+
+// ***********************************************
+// This example commands.ts shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+
+// eslint-disable-next-line @typescript-eslint/no-namespace
+declare namespace Cypress { 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  interface Chainable<Subject> {
+    login(email: string, password: string): void;
+  }
+}
+
+// -- This is a parent command --
+Cypress.Commands.add('login', (email, password) => {
+  console.log('Custom command example: Login', email, password);
+});
+//
+// -- This is a child command --
+// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

package/src/generators/base-setup/files/config-ts/__directory__/support/commands.ts__ext__

@@ -0,0 +1,35 @@
+/// <reference types="cypress" />
+
+// ***********************************************
+// This example commands.ts shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+
+// eslint-disable-next-line @typescript-eslint/no-namespace
+declare namespace Cypress { 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  interface Chainable<Subject> {
+    login(email: string, password: string): void;
+  }
+}
+
+// -- This is a parent command --
+Cypress.Commands.add('login', (email, password) => {
+  console.log('Custom command example: Login', email, password);
+});
+//
+// -- This is a child command --
+// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

package/src/generators/base-setup/files/config-ts/cypress.config.ts__ext__

@@ -0,0 +1,3 @@
+import { defineConfig } from 'cypress';
+
+export default defineConfig({});

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

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

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

@@ -1,33 +1,55 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateTsConfigForComponentTesting = exports.componentConfigurationGenerator = void 0;
+exports.updateTsConfigForComponentTesting = exports.componentConfigurationGeneratorInternal = 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");
-async function componentConfigurationGenerator(tree, options) {
-    const opts = normalizeOptions(options);
+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');
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, opts.project);
-    const installDepsTask = updateDeps(tree, opts);
+    tasks.push(updateDeps(tree, opts));
     addProjectFiles(tree, projectConfig, opts);
-    addTargetToProject(tree, projectConfig, opts);
-    updateNxJsonConfiguration(tree);
+    if (!hasPlugin || opts.addExplicitTargets) {
+        addTargetToProject(tree, projectConfig, opts);
+    }
+    updateNxJsonConfiguration(tree, hasPlugin);
     updateTsConfigForComponentTesting(tree, projectConfig);
     if (!opts.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return () => {
-        installDepsTask();
-    };
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.componentConfigurationGenerator = componentConfigurationGenerator;
-function normalizeOptions(options) {
+exports.componentConfigurationGeneratorInternal = componentConfigurationGeneratorInternal;
+function normalizeOptions(tree, 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',
     };
 }
@@ -67,25 +89,26 @@ function addTargetToProject(tree, projectConfig, opts) {
     };
     (0, devkit_1.updateProjectConfiguration)(tree, opts.project, projectConfig);
 }
-function updateNxJsonConfiguration(tree) {
+function updateNxJsonConfiguration(tree, hasPlugin) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
-    const cacheableOperations = nxJson.tasksRunnerOptions?.default?.options?.cacheableOperations;
-    if (cacheableOperations && !cacheableOperations.includes('component-test')) {
-        cacheableOperations.push('component-test');
+    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;
-    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',
-            ]));
+    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;
         nxJson.targetDefaults['component-test'] ??= {};
         nxJson.targetDefaults['component-test'].inputs ??= [
             'default',

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

@@ -5,7 +5,10 @@
   <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,4 +4,11 @@ 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": "http://json-schema.org/schema",
+  "$schema": "https://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,6 +14,10 @@ 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.configurationGenerator = void 0;
+exports.configurationGeneratorInternal = exports.configurationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const eslint_1 = require("@nx/eslint");
@@ -11,28 +11,59 @@ 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");
-async function configurationGenerator(tree, options) {
+function configurationGenerator(tree, options) {
+    return configurationGeneratorInternal(tree, {
+        addPlugin: false,
+        ...options,
+    });
+}
+exports.configurationGenerator = configurationGenerator;
+async function configurationGeneratorInternal(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, init_1.default)(tree, opts));
+        tasks.push(await (0, js_1.initGenerator)(tree, { ...options, skipFormat: true }));
+        tasks.push(await (0, init_1.default)(tree, {
+            ...opts,
+            skipFormat: true,
+        }));
     }
-    if (opts.bundler === 'vite') {
-        tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { vite: versions_1.viteVersion }));
+    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);
     }
-    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.configurationGenerator = configurationGenerator;
+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);
+}
 function normalizeOptions(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     if (projectConfig?.targets?.e2e) {
@@ -41,21 +72,29 @@ 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: options.devServerTarget ??
-            (projectConfig.targets.serve ? `${options.project}:serve` : undefined),
+        devServerTarget,
     };
 }
-async function addFiles(tree, options) {
+async function addFiles(tree, options, projectGraph, hasPlugin) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const cyVersion = (0, cypress_version_1.installedCypressVersion)();
     const filesToUse = cyVersion && cyVersion < 10 ? 'v9' : 'v10';
@@ -82,12 +121,37 @@ async function addFiles(tree, options) {
             project: options.project,
             directory: options.directory,
             jsx: options.jsx,
+            js: options.js,
         });
-        const cyFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
+        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 updatedCyConfig = await (0, config_1.addDefaultE2EConfig)(tree.read(cyFile, 'utf-8'), {
-            directory: options.directory,
-            bundler: options.bundler,
-        });
+            cypressDir: options.directory,
+            bundler: options.bundler === 'vite' ? 'vite' : undefined,
+            webServerCommands,
+            ciWebServerCommand: ciWebServerCommand,
+        }, options.baseUrl);
         tree.write(cyFile, updatedCyConfig);
     }
     if (cyVersion &&
@@ -111,20 +175,17 @@ async function addFiles(tree, options) {
 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.ts'),
+            cypressConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, cyVersion && cyVersion < 10
+                ? 'cypress.json'
+                : `cypress.config.${opts.js ? 'js' : 'ts'}`),
             testingType: 'e2e',
         },
     };
-    if (opts.baseUrl) {
-        projectConfig.targets.e2e.options = {
-            ...projectConfig.targets.e2e.options,
-            baseUrl: opts.baseUrl,
-        };
-    }
-    else if (opts.devServerTarget) {
+    if (opts.devServerTarget) {
         const parsedTarget = (0, devkit_1.parseTargetString)(opts.devServerTarget);
         projectConfig.targets.e2e.options = {
             ...projectConfig.targets.e2e.options,
@@ -148,8 +209,11 @@ function addTarget(tree, opts) {
             };
         }
     }
-    else {
-        throw new Error('Either baseUrl or devServerTarget must be provided');
+    else if (opts.baseUrl) {
+        projectConfig.targets.e2e.options = {
+            ...projectConfig.targets.e2e.options,
+            baseUrl: opts.baseUrl,
+        };
     }
     (0, devkit_1.updateProjectConfiguration)(tree, opts.project, projectConfig);
 }

package/src/generators/configuration/schema.json

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

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

@@ -12,6 +12,7 @@ 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
@@ -119,6 +120,7 @@ function addProject(tree, options) {
 async function cypressProjectGenerator(host, schema) {
     return await cypressProjectGeneratorInternal(host, {
         projectNameAndRootFormat: 'derived',
+        addPlugin: false,
         ...schema,
     });
 }
@@ -133,11 +135,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, init_1.cypressInitGenerator)(host, options));
-    }
-    if (schema.bundler === 'vite') {
-        tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {}, {
-            vite: versions_1.viteVersion,
+        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,
         }));
     }
     createFiles(host, options);
@@ -150,12 +152,29 @@ 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;
@@ -182,6 +201,7 @@ 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,4 +13,5 @@ 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": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxCypressProjectGeneratorSchema",
   "cli": "nx",
   "title": "Create Cypress Configuration for the workspace",

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

@@ -1,4 +1,6 @@
 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;