@nx/cypress 18.0.0-beta.0 → 18.0.0-beta.2

package/generators.json

@@ -3,7 +3,7 @@
   "version": "0.1",
   "generators": {
     "init": {
-      "factory": "./src/generators/init/init#cypressInitGenerator",
+      "factory": "./src/generators/init/init#cypressInitGeneratorInternal",
       "schema": "./src/generators/init/schema.json",
       "description": "Initialize the `@nrwl/cypress` plugin.",
       "aliases": ["ng-add"],
@@ -17,13 +17,13 @@
     },
     "configuration": {
       "aliases": ["cypress-e2e-configuration", "e2e", "e2e-config"],
-      "factory": "./src/generators/configuration/configuration",
+      "factory": "./src/generators/configuration/configuration#configurationGeneratorInternal",
       "schema": "./src/generators/configuration/schema.json",
       "description": "Add a Cypress E2E Configuration to an existing project."
     },
     "component-configuration": {
       "aliases": ["cypress-component-configuration"],
-      "factory": "./src/generators/component-configuration/component-configuration",
+      "factory": "./src/generators/component-configuration/component-configuration#componentConfigurationGeneratorInternal",
       "schema": "./src/generators/component-configuration/schema.json",
       "description": "Set up Cypress Component Test for a project",
       "hidden": true

package/index.d.ts

@@ -2,10 +2,10 @@ import { configurationGenerator } from './src/generators/configuration/configura
 import { componentConfigurationGenerator } from './src/generators/component-configuration/component-configuration';
 import { cypressProjectGenerator as _cypressProjectGenerator } from './src/generators/cypress-project/cypress-project';
 export { configurationGenerator, componentConfigurationGenerator };
-/** @deprecated Use `configurationGenerator` instead. It will be removed in Nx 18. */
+/** @deprecated Use `configurationGenerator` instead. It will be removed in Nx 19. */
 export declare const cypressComponentConfiguration: typeof componentConfigurationGenerator;
 export { configurationGenerator as cypressE2EConfigurationGenerator };
-/** @deprecated Add a new project and call `configurationGenerator` instead. It will be removed in Nx 18. */
+/** @deprecated Add a new project and call `configurationGenerator` instead. It will be removed in Nx 19. */
 export declare const cypressProjectGenerator: typeof _cypressProjectGenerator;
 export { cypressInitGenerator } from './src/generators/init/init';
 export { migrateCypressProject } from './src/generators/migrate-to-cypress-11/migrate-to-cypress-11';

package/index.js

@@ -8,11 +8,11 @@ const component_configuration_1 = require("./src/generators/component-configurat
 Object.defineProperty(exports, "componentConfigurationGenerator", { enumerable: true, get: function () { return component_configuration_1.componentConfigurationGenerator; } });
 const cypress_project_1 = require("./src/generators/cypress-project/cypress-project");
 // Maintain backwards compatibility with the old names in case community plugins used them.
-// TODO(v18): Remove old name
-/** @deprecated Use `configurationGenerator` instead. It will be removed in Nx 18. */
+// TODO(v19): Remove old name
+/** @deprecated Use `configurationGenerator` instead. It will be removed in Nx 19. */
 exports.cypressComponentConfiguration = component_configuration_1.componentConfigurationGenerator;
-// TODO(v18): Remove project generator
-/** @deprecated Add a new project and call `configurationGenerator` instead. It will be removed in Nx 18. */
+// TODO(v19): Remove project generator
+/** @deprecated Add a new project and call `configurationGenerator` instead. It will be removed in Nx 19. */
 exports.cypressProjectGenerator = cypress_project_1.cypressProjectGenerator;
 var init_1 = require("./src/generators/init/init");
 Object.defineProperty(exports, "cypressInitGenerator", { enumerable: true, get: function () { return init_1.cypressInitGenerator; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "18.0.0-beta.0",
+  "version": "18.0.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.0.0-beta.0",
-    "@nx/eslint": "18.0.0-beta.0",
-    "@nx/js": "18.0.0-beta.0",
+    "@nx/devkit": "18.0.0-beta.2",
+    "@nx/eslint": "18.0.0-beta.2",
+    "@nx/js": "18.0.0-beta.2",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "detect-port": "^1.5.1",
-    "semver": "7.5.3",
+    "semver": "^7.5.3",
     "tslib": "^2.3.0",
-    "@nrwl/cypress": "18.0.0-beta.0"
+    "@nrwl/cypress": "18.0.0-beta.2"
   },
   "peerDependencies": {
     "cypress": ">= 3 < 14"

package/plugins/cypress-preset.d.ts

@@ -10,6 +10,7 @@ export interface NxComponentTestingOptions {
      * @example 'component-test'
      */
     ctTargetName?: string;
+    buildTarget?: string;
     bundler?: 'vite' | 'webpack';
     compiler?: 'swc' | 'babel';
 }

package/plugins/cypress-preset.js

@@ -61,7 +61,7 @@ function nxE2EPreset(pathToConfig, options) {
     }*/ = {
         ...nxBaseCypressPreset(pathToConfig),
         fileServerFolder: '.',
-        supportFile: `${basePath}/support/e2e.ts`,
+        supportFile: `${basePath}/support/e2e.{js,ts}`,
         specPattern: `${basePath}/**/*.cy.{js,jsx,ts,tsx}`,
         fixturesFolder: `${basePath}/fixtures`,
         [symbols_1.NX_PLUGIN_OPTIONS]: {

package/src/generators/base-setup/base-setup.d.ts

@@ -6,6 +6,7 @@ export interface CypressBaseSetupSchema {
      * default is `cypress`
      * */
     directory?: string;
+    js?: boolean;
     jsx?: boolean;
 }
 export declare function addBaseCypressSetup(tree: Tree, options: CypressBaseSetupSchema): void;

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<import("@nx/devkit").GeneratorCallback>;
+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,18 +1,31 @@
 "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 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(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);
     if (!hasPlugin) {
         addTargetToProject(tree, projectConfig, opts);
@@ -22,15 +35,16 @@ async function componentConfigurationGenerator(tree, options) {
     if (!opts.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return installDepsTask;
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.componentConfigurationGenerator = componentConfigurationGenerator;
+exports.componentConfigurationGeneratorInternal = componentConfigurationGeneratorInternal;
 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');
     }
     return {
+        addPlugin: process.env.NX_ADD_PLUGINS !== 'false',
         ...options,
         directory: options.directory ?? 'cypress',
     };

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

@@ -4,4 +4,5 @@ export interface CypressComponentConfigurationSchema {
   directory?: string;
   bundler?: 'webpack' | 'vite';
   jsx?: boolean;
+  addPlugin?: boolean;
 }

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

@@ -16,6 +16,8 @@ export interface CypressE2EConfigSchema {
     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,12 +11,20 @@ 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);
     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,
+            skipFormat: true,
+            addPlugin: options.addPlugin,
+        }));
     }
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
     const nxJson = (0, devkit_1.readNxJson)(tree);
@@ -40,7 +48,7 @@ async function configurationGenerator(tree, options) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.configurationGenerator = configurationGenerator;
+exports.configurationGeneratorInternal = configurationGeneratorInternal;
 function ensureDependencies(tree, options) {
     const devDependencies = {
         '@types/node': versions_1.typesNodeVersion,
@@ -70,6 +78,7 @@ In this case you need to provide a devServerTarget,'<projectName>:<targetName>[:
     }
     return {
         ...options,
+        addPlugin: options.addPlugin ?? process.env.NX_ADD_PLUGINS !== 'false',
         bundler: options.bundler ?? 'webpack',
         rootProject: options.rootProject ?? projectConfig.root === '.',
         linter: options.linter ?? eslint_1.Linter.EsLint,
@@ -103,8 +112,9 @@ 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, '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) {
@@ -158,7 +168,9 @@ function addTarget(tree, opts) {
     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',
         },
     };

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,
     });
 }
@@ -134,7 +136,11 @@ async function cypressProjectGeneratorInternal(host, schema) {
     // 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 }));
+        tasks.push(await (0, init_1.cypressInitGenerator)(host, {
+            ...options,
+            skipFormat: true,
+            addPlugin: options.addPlugin,
+        }));
     }
     createFiles(host, options);
     addProject(host, options);
@@ -162,7 +168,12 @@ function ensureDependencies(tree, options) {
     if (options.bundler === 'vite') {
         devDependencies['vite'] = versions_1.viteVersion;
     }
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies);
+    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;

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,5 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 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,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cypressInitGenerator = void 0;
+exports.cypressInitGeneratorInternal = 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");
@@ -63,8 +63,13 @@ function updateProductionFileset(tree) {
     (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);
-    if (process.env.NX_PCV3 === 'true') {
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    if (options.addPlugin) {
         addPlugin(tree);
     }
     else {
@@ -75,12 +80,14 @@ async function cypressInitGenerator(tree, options) {
         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);
     }
     return installTask;
 }
-exports.cypressInitGenerator = cypressInitGenerator;
+exports.cypressInitGeneratorInternal = cypressInitGeneratorInternal;
 exports.default = cypressInitGenerator;

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

@@ -3,4 +3,5 @@ export interface Schema {
   skipPackageJson?: boolean;
   keepExistingVersions?: boolean;
   updatePackageScripts?: boolean;
+  addPlugin?: boolean;
 }

package/src/generators/init/schema.json

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

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

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

package/src/plugins/plugin.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodes = exports.createDependencies = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const internal_1 = require("@nx/js/src/internal");
 const js_1 = require("@nx/js");
 const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const fs_1 = require("fs");
@@ -11,6 +10,7 @@ const workspace_context_1 = require("nx/src/utils/workspace-context");
 const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const symbols_1 = require("../utils/symbols");
+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 = (0, fs_1.existsSync)(cachePath) ? readTargetsCache() : {};
 const calculatedTargets = {};
@@ -27,7 +27,7 @@ const createDependencies = () => {
 exports.createDependencies = createDependencies;
 exports.createNodes = [
     '**/cypress.config.{js,ts,mjs,cjs}',
-    (configFilePath, options, context) => {
+    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.
@@ -41,7 +41,7 @@ exports.createNodes = [
         ]);
         const targets = targetsCache[hash]
             ? targetsCache[hash]
-            : buildCypressTargets(configFilePath, projectRoot, options, context);
+            : await buildCypressTargets(configFilePath, projectRoot, options, context);
         calculatedTargets[hash] = targets;
         return {
             projects: {
@@ -92,8 +92,8 @@ function getOutputs(projectRoot, cypressConfig, testingType) {
     }
     return outputs;
 }
-function buildCypressTargets(configFilePath, projectRoot, options, context) {
-    const cypressConfig = getCypressConfig(configFilePath, context);
+async function buildCypressTargets(configFilePath, projectRoot, options, context) {
+    const cypressConfig = await (0, config_utils_1.loadConfigFile)((0, path_1.join)(context.workspaceRoot, configFilePath));
     const pluginPresetOptions = {
         ...cypressConfig.e2e?.[symbols_1.NX_PLUGIN_OPTIONS],
         ...cypressConfig.env,
@@ -167,7 +167,7 @@ function buildCypressTargets(configFilePath, projectRoot, options, context) {
     if ('component' in cypressConfig) {
         // This will not override the e2e target if it is the same
         targets[options.componentTestingTargetName] ??= {
-            command: `cypress open --component`,
+            command: `cypress run --component`,
             options: { cwd: projectRoot },
             cache: true,
             inputs: getInputs(namedInputs),
@@ -176,29 +176,6 @@ function buildCypressTargets(configFilePath, projectRoot, options, context) {
     }
     return targets;
 }
-function getCypressConfig(configFilePath, context) {
-    const resolvedPath = (0, path_1.join)(context.workspaceRoot, configFilePath);
-    let module;
-    if ((0, path_1.extname)(configFilePath) === '.ts') {
-        const tsConfigPath = (0, js_1.getRootTsConfigPath)();
-        if (tsConfigPath) {
-            const unregisterTsProject = (0, internal_1.registerTsProject)(tsConfigPath);
-            try {
-                module = load(resolvedPath);
-            }
-            finally {
-                unregisterTsProject();
-            }
-        }
-        else {
-            module = load(resolvedPath);
-        }
-    }
-    else {
-        module = load(resolvedPath);
-    }
-    return module.default ?? module;
-}
 function normalizeOptions(options) {
     options ??= {};
     options.targetName ??= 'e2e';
@@ -216,23 +193,3 @@ function getInputs(namedInputs) {
         },
     ];
 }
-/**
- * Load the module after ensuring that the require cache is cleared.
- */
-const packageInstallationDirectories = ['node_modules', '.yarn'];
-function load(path) {
-    // Clear cache if the path is in the cache
-    if (require.cache[path]) {
-        for (const k of Object.keys(require.cache)) {
-            // We don't want to clear the require cache of installed packages.
-            // Clearing them can cause some issues when running Nx without the daemon
-            // and may cause issues for other packages that use the module state
-            // in some to store cached information.
-            if (!packageInstallationDirectories.some((dir) => k.includes(dir))) {
-                delete require.cache[k];
-            }
-        }
-    }
-    // Then require
-    return require(path);
-}

package/src/utils/config.d.ts

@@ -1,16 +1,17 @@
-import { NxCypressE2EPresetOptions } from '../../plugins/cypress-preset';
+import { type Tree } from '@nx/devkit';
+import type { NxComponentTestingOptions, NxCypressE2EPresetOptions } from '../../plugins/cypress-preset';
+export declare const CYPRESS_CONFIG_FILE_NAME_PATTERN = "cypress.config.{js,ts,mjs,cjs}";
 export declare function addDefaultE2EConfig(cyConfigContents: string, options: NxCypressE2EPresetOptions, baseUrl: string): Promise<string>;
 /**
  * Adds the nxComponentTestingPreset to the cypress config file
  * Make sure after calling this the correct import statement is addeda
  * to bring in the nxComponentTestingPreset function
  **/
-export declare function addDefaultCTConfig(cyConfigContents: string, options?: {
-    bundler?: string;
-}): Promise<string>;
+export declare function addDefaultCTConfig(cyConfigContents: string, options?: NxComponentTestingOptions): Promise<string>;
 /**
  * Adds the mount command for Cypress
  * Make sure after calling this the correct import statement is added
  * to bring in the correct mount from cypress.
  **/
 export declare function addMountDefinition(cmpCommandFileContents: string): Promise<string>;
+export declare function getProjectCypressConfigPath(tree: Tree, projectRoot: string): string;

package/src/utils/config.js

@@ -1,12 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addMountDefinition = exports.addDefaultCTConfig = exports.addDefaultE2EConfig = void 0;
-const TS_QUERY_EXPORT_CONFIG_PREFIX = ':matches(ExportAssignment, BinaryExpression:has(Identifier[name="module"]):has(Identifier[name="exports"]))';
+exports.getProjectCypressConfigPath = exports.addMountDefinition = exports.addDefaultCTConfig = exports.addDefaultE2EConfig = exports.CYPRESS_CONFIG_FILE_NAME_PATTERN = void 0;
+const devkit_1 = require("@nx/devkit");
+exports.CYPRESS_CONFIG_FILE_NAME_PATTERN = 'cypress.config.{js,ts,mjs,cjs}';
+const TS_QUERY_COMMON_JS_EXPORT_SELECTOR = 'BinaryExpression:has(Identifier[name="module"]):has(Identifier[name="exports"])';
+const TS_QUERY_EXPORT_CONFIG_PREFIX = `:matches(ExportAssignment, ${TS_QUERY_COMMON_JS_EXPORT_SELECTOR}) `;
 async function addDefaultE2EConfig(cyConfigContents, options, baseUrl) {
     if (!cyConfigContents) {
         throw new Error('The passed in cypress config file is empty!');
     }
     const { tsquery } = await Promise.resolve().then(() => require('@phenomnomnominal/tsquery'));
+    const isCommonJS = tsquery.query(cyConfigContents, TS_QUERY_COMMON_JS_EXPORT_SELECTOR).length >
+        0;
     const testingTypeConfig = tsquery.query(cyConfigContents, `${TS_QUERY_EXPORT_CONFIG_PREFIX} PropertyAssignment:has(Identifier[name="e2e"])`);
     let updatedConfigContents = cyConfigContents;
     if (testingTypeConfig.length === 0) {
@@ -23,7 +28,11 @@ async function addDefaultE2EConfig(cyConfigContents, options, baseUrl) {
   e2e: { ...${configValue}${baseUrlContents} }
 }`;
         });
-        return `import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
+        return isCommonJS
+            ? `const { nxE2EPreset } = require('@nx/cypress/plugins/cypress-preset');
+    
+    ${updatedConfigContents}`
+            : `import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
     
     ${updatedConfigContents}`;
     }
@@ -43,9 +52,16 @@ async function addDefaultCTConfig(cyConfigContents, options = {}) {
     const testingTypeConfig = tsquery.query(cyConfigContents, `${TS_QUERY_EXPORT_CONFIG_PREFIX} PropertyAssignment:has(Identifier[name="component"])`);
     let updatedConfigContents = cyConfigContents;
     if (testingTypeConfig.length === 0) {
-        const configValue = options?.bundler === 'vite'
-            ? "nxComponentTestingPreset(__filename, { bundler: 'vite' })"
-            : 'nxComponentTestingPreset(__filename)';
+        let configValue = 'nxComponentTestingPreset(__filename)';
+        if (options) {
+            if (options.bundler !== 'vite') {
+                // vite is the default bundler, so we don't need to set it
+                delete options.bundler;
+            }
+            if (Object.keys(options).length) {
+                configValue = `nxComponentTestingPreset(__filename, ${JSON.stringify(options)})`;
+            }
+        }
         updatedConfigContents = tsquery.replace(cyConfigContents, `${TS_QUERY_EXPORT_CONFIG_PREFIX} ObjectLiteralExpression:first-child`, (node) => {
             if (node.properties.length > 0) {
                 return `{
@@ -87,3 +103,13 @@ async function addMountDefinition(cmpCommandFileContents) {
     return `${updatedInterface}\n${mountCommand}`;
 }
 exports.addMountDefinition = addMountDefinition;
+function getProjectCypressConfigPath(tree, projectRoot) {
+    const cypressConfigPaths = (0, devkit_1.glob)(tree, [
+        `${projectRoot}/${exports.CYPRESS_CONFIG_FILE_NAME_PATTERN}`,
+    ]);
+    if (cypressConfigPaths.length === 0) {
+        throw new Error(`Could not find a cypress config file in ${projectRoot}.`);
+    }
+    return cypressConfigPaths[0];
+}
+exports.getProjectCypressConfigPath = getProjectCypressConfigPath;