@nx/cypress 22.1.0-beta.5 → 22.1.0-beta.7

package/migrations.json

@@ -40,6 +40,30 @@
       "version": "21.0.0-beta.10",
       "description": "Removes the `tsConfig` and `copyFiles` options from the `@nx/cypress:cypress` executor.",
       "implementation": "./src/migrations/update-21-0-0/remove-tsconfig-and-copy-files-options-from-cypress-executor"
+    },
+    "rename-cy-exec-code-property": {
+      "version": "22.1.0-beta.6",
+      "requires": {
+        "cypress": ">=15.0.0"
+      },
+      "description": "Renames `cy.exec().its('code')` usages to the new `exitCode` property introduced in Cypress v15.",
+      "implementation": "./src/migrations/update-22-1-0/rename-cy-exec-code-property"
+    },
+    "update-selector-playground-api": {
+      "version": "22.1.0-beta.6",
+      "requires": {
+        "cypress": ">=15.0.0"
+      },
+      "description": "Updates the deprecated `Cypress.SelectorPlayground` API to `Cypress.ElementSelector` and removes the unsupported `onElement` option.",
+      "implementation": "./src/migrations/update-22-1-0/update-selector-playground-api"
+    },
+    "update-angular-component-testing-support": {
+      "version": "22.1.0-beta.6",
+      "requires": {
+        "cypress": ">=15.0.0"
+      },
+      "description": "For Angular component testing projects below v18, switches to the fallback `@cypress/angular` harness required by Cypress v15.",
+      "implementation": "./src/migrations/update-22-1-0/update-angular-component-testing-support"
     }
   },
   "packageJsonUpdates": {
@@ -63,6 +87,27 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "22.1.0": {
+      "version": "22.1.0-beta.6",
+      "x-prompt": "Do you want to update the Cypress version to v15?",
+      "requires": {
+        "cypress": ">=14.0.0 <15.0.0"
+      },
+      "packages": {
+        "cypress": {
+          "version": "^15.6.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@cypress/vite-dev-server": {
+          "version": "^7.0.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@cypress/webpack-dev-server": {
+          "version": "^5.1.4",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

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

package/src/executors/cypress/cypress.impl.d.ts

@@ -9,7 +9,7 @@ export interface CypressExecutorOptions extends Json {
     headed?: boolean;
     /**
      * @deprecated Cypress runs headless by default. Use the --watch flag to
-     * control head/headless behavior instead. It will be removed in Nx v22.
+     * control head/headless behavior instead. It will be removed in Nx v23.
      **/
     headless?: boolean;
     exit?: boolean;

package/src/executors/cypress/cypress.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cypress.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/executors/cypress/cypress.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAwB,MAAM,YAAY,CAAC;AASnE,MAAM,MAAM,IAAI,GAAG;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAAC;AAExC,MAAM,WAAW,sBAAuB,SAAQ,IAAI;IAClD,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;QAGI;IACJ,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,GAAG,KAAK,CAAC;IAClC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC;IAC/B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,uBAAuB,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAC5C;AAOD,wBAA8B,eAAe,CAC3C,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,eAAe;;GA+BzB"}
+{"version":3,"file":"cypress.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/executors/cypress/cypress.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAU,MAAM,YAAY,CAAC;AAQrD,MAAM,MAAM,IAAI,GAAG;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAAC;AAExC,MAAM,WAAW,sBAAuB,SAAQ,IAAI;IAClD,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;QAGI;IACJ,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,GAAG,KAAK,CAAC;IAClC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC;IAC/B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,uBAAuB,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAC5C;AAOD,wBAA8B,eAAe,CAC3C,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,eAAe;;GA0BzB"}

package/src/executors/cypress/cypress.impl.js

@@ -5,12 +5,10 @@ const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const ct_helpers_1 = require("../../utils/ct-helpers");
-const versions_1 = require("../../utils/versions");
 const start_dev_server_1 = require("../../utils/start-dev-server");
 const Cypress = require('cypress'); // @NOTE: Importing via ES6 messes the whole test dependencies.
 async function cypressExecutor(options, context) {
-    const installedCypressMajorVersion = (0, versions_1.getInstalledCypressMajorVersion)();
-    options = normalizeOptions(options, context, installedCypressMajorVersion);
+    options = normalizeOptions(options, context);
     // this is used by cypress component testing presets to build the executor contexts with the correct configuration options.
     process.env.NX_CYPRESS_TARGET_CONFIGURATION = context.configurationName;
     let success;
@@ -20,7 +18,7 @@ async function cypressExecutor(options, context) {
             success = await runCypress(devServerValues.baseUrl, {
                 ...options,
                 portLockFilePath: devServerValues.portLockFilePath,
-            }, installedCypressMajorVersion);
+            });
             if (!options.watch) {
                 generatorInstance.return();
                 break;
@@ -35,70 +33,23 @@ async function cypressExecutor(options, context) {
     }
     return { success };
 }
-function normalizeOptions(options, context, installedCypressMajorVersion) {
+function normalizeOptions(options, context) {
     options.env = options.env || {};
+    options.testingType ??= 'e2e';
     if (options.testingType === 'component') {
         const project = context?.projectGraph?.nodes?.[context.projectName];
         if (project?.data?.root) {
             options.ctTailwindPath = (0, ct_helpers_1.getTempTailwindPath)(context);
         }
     }
-    checkSupportedBrowser(options, installedCypressMajorVersion);
-    warnDeprecatedHeadless(options, installedCypressMajorVersion);
-    warnDeprecatedCypressVersion(installedCypressMajorVersion);
     return options;
 }
-function checkSupportedBrowser({ browser }, installedCypressMajorVersion) {
-    // Browser was not passed in as an option, cypress will use whatever default it has set and we dont need to check it
-    if (!browser) {
-        return;
-    }
-    if (installedCypressMajorVersion >= 4 && browser == 'canary') {
-        devkit_1.logger.warn((0, devkit_1.stripIndents) `
-  Warning:
-  You are using a browser that is not supported by cypress v4+.
-
-  Read here for more info:
-  https://docs.cypress.io/guides/references/migration-guide.html#Launching-Chrome-Canary-with-browser
-  `);
-        return;
-    }
-    const supportedV3Browsers = ['electron', 'chrome', 'canary', 'chromium'];
-    if (installedCypressMajorVersion <= 3 &&
-        !supportedV3Browsers.includes(browser)) {
-        devkit_1.logger.warn((0, devkit_1.stripIndents) `
-    Warning:
-    You are using a browser that is not supported by cypress v3.
-    `);
-        return;
-    }
-}
-function warnDeprecatedHeadless({ headless }, installedCypressMajorVersion) {
-    if (installedCypressMajorVersion < 8 || headless === undefined) {
-        return;
-    }
-    if (headless) {
-        const deprecatedMsg = (0, devkit_1.stripIndents) `
-    NOTE:
-    You can now remove the use of the '--headless' flag during 'cypress run' as this is the default for all browsers.`;
-        devkit_1.logger.warn(deprecatedMsg);
-    }
-}
-function warnDeprecatedCypressVersion(installedCypressMajorVersion) {
-    if (installedCypressMajorVersion < 10) {
-        devkit_1.logger.warn((0, devkit_1.stripIndents) `
-NOTE:
-Support for Cypress versions < 10 is deprecated. Please upgrade to at least Cypress version 10.
-A generator to migrate from v8 to v10 is provided. See https://nx.dev/cypress/v10-migration-guide
-`);
-    }
-}
 /**
  * @whatItDoes Initialize the Cypress test runner with the provided project configuration.
  * By default, Cypress will run tests from the CLI without the GUI and provide directly the results in the console output.
  * If `watch` is `true`: Open Cypress in the interactive GUI to interact directly with the application.
  */
-async function runCypress(baseUrl, opts, installedCypressMajorVersion) {
+async function runCypress(baseUrl, opts) {
     // Cypress expects the folder where a cypress config is present
     const projectFolderPath = (0, path_1.dirname)(opts.cypressConfig);
     const options = {
@@ -134,15 +85,10 @@ async function runCypress(baseUrl, opts, installedCypressMajorVersion) {
     options.ciBuildId = opts.ciBuildId?.toString();
     options.group = opts.group;
     // renamed in cy 10
-    if (installedCypressMajorVersion >= 10) {
-        options.config ??= {};
-        options.config[opts.testingType] = {
-            excludeSpecPattern: opts.ignoreTestFiles,
-        };
-    }
-    else {
-        options.ignoreTestFiles = opts.ignoreTestFiles;
-    }
+    options.config ??= {};
+    options.config[opts.testingType] = {
+        excludeSpecPattern: opts.ignoreTestFiles,
+    };
     if (opts.reporter) {
         options.reporter = opts.reporter;
     }

package/src/executors/cypress/schema.json

@@ -44,7 +44,7 @@
       "type": "boolean",
       "description": "Hide the browser instead of running headed.",
       "default": false,
-      "x-deprecated": "Cypress runs headless by default. Use the --watch flag to control head/headless behavior instead. It will be removed in Nx v22."
+      "x-deprecated": "Cypress runs headless by default. Use the --watch flag to control head/headless behavior instead. It will be removed in Nx v23."
     },
     "exit": {
       "type": "boolean",

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

@@ -1 +1 @@
-{"version":3,"file":"component-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/component-configuration/component-configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAGjB,oBAAoB,EAKpB,IAAI,EAIL,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,mCAAmC,EAAE,MAAM,UAAU,CAAC;AAI/D,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mCAAmC,8BAM7C;AAED,wBAAsB,uCAAuC,CAC3D,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mCAAmC,8BAwC7C;AAyHD,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,oBAAoB,QAsDpC;AAOD,eAAe,+BAA+B,CAAC"}
+{"version":3,"file":"component-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/component-configuration/component-configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAGjB,oBAAoB,EAKpB,IAAI,EAIL,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,mCAAmC,EAAE,MAAM,UAAU,CAAC;AAI/D,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mCAAmC,8BAM7C;AAED,wBAAsB,uCAAuC,CAC3D,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mCAAmC,8BAwC7C;AAkHD,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,oBAAoB,QAsDpC;AAOD,eAAe,+BAA+B,CAAC"}

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

@@ -42,10 +42,6 @@ async function componentConfigurationGeneratorInternal(tree, options) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 function normalizeOptions(tree, options) {
-    const cyVersion = (0, versions_1.getInstalledCypressMajorVersion)(tree);
-    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;

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

@@ -1 +1 @@
-{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,iBAAiB,EAWjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAsBhD,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;IACtC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC;IAC/B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAID,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,sBAAsB,8BAMhC;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,sBAAsB,8BA+FhC;AA4UD,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,iBAAiB,EAWjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAsBhD,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;IACtC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC;IAC/B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAID,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,sBAAsB,8BAMhC;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,sBAAsB,8BA+FhC;AA+SD,eAAe,sBAAsB,CAAC"}

package/src/generators/configuration/configuration.js

@@ -164,8 +164,6 @@ async function promptForMissingServeData(projectName) {
 }
 async function addFiles(tree, options, projectGraph, hasPlugin) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const cyVersion = (0, versions_1.getInstalledCypressMajorVersion)(tree);
-    const filesToUse = cyVersion && cyVersion < 10 ? 'v9' : 'v10';
     const hasTsConfig = tree.exists((0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json'));
     const offsetFromProjectRoot = options.directory
         .split('/')
@@ -183,76 +181,56 @@ async function addFiles(tree, options, projectGraph, hasPlugin) {
             : (0, js_1.getRelativePathToRootTsConfig)(tree, projectConfig.root),
         tmpl: '',
     };
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files', filesToUse), projectConfig.root, fileOpts);
-    if (filesToUse === 'v10') {
-        (0, base_setup_1.addBaseCypressSetup)(tree, {
-            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;
-        let ciBaseUrl;
-        if (hasPlugin && options.webServerCommands && options.ciWebServerCommand) {
-            webServerCommands = options.webServerCommands;
-            ciWebServerCommand = options.ciWebServerCommand;
-            ciBaseUrl = options.ciBaseUrl;
-        }
-        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'), {
-            cypressDir: options.directory,
-            bundler: options.bundler === 'vite' ? 'vite' : undefined,
-            webServerCommands,
-            ciWebServerCommand: ciWebServerCommand,
-            ciBaseUrl,
-        }, options.baseUrl);
-        tree.write(cyFile, updatedCyConfig);
-    }
-    if (cyVersion &&
-        cyVersion < 7 &&
-        tree.exists((0, devkit_1.joinPathFragments)(projectConfig.root, 'src', 'plugins', 'index.js'))) {
-        (0, devkit_1.updateJson)(tree, (0, path_1.join)(projectConfig.root, 'cypress.json'), (json) => {
-            json.pluginsFile = './src/plugins/index';
-            return json;
-        });
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), projectConfig.root, fileOpts);
+    (0, base_setup_1.addBaseCypressSetup)(tree, {
+        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;
+    let ciBaseUrl;
+    if (hasPlugin && options.webServerCommands && options.ciWebServerCommand) {
+        webServerCommands = options.webServerCommands;
+        ciWebServerCommand = options.ciWebServerCommand;
+        ciBaseUrl = options.ciBaseUrl;
     }
-    else if (cyVersion < 10) {
-        const pluginPath = (0, path_1.join)(projectConfig.root, 'src/plugins/index.js');
-        if (tree.exists(pluginPath)) {
-            tree.delete(pluginPath);
+    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'), {
+        cypressDir: options.directory,
+        bundler: options.bundler === 'vite' ? 'vite' : undefined,
+        webServerCommands,
+        ciWebServerCommand: ciWebServerCommand,
+        ciBaseUrl,
+    }, options.baseUrl);
+    tree.write(cyFile, updatedCyConfig);
     if (options.js) {
         (0, devkit_1.toJS)(tree);
     }
 }
 function addTarget(tree, opts, projectGraph) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, opts.project);
-    const cyVersion = (0, versions_1.getInstalledCypressMajorVersion)(tree);
     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, `cypress.config.${opts.js ? 'js' : 'ts'}`),
             testingType: 'e2e',
         },
     };

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

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EACjB,YAAY,EAIZ,IAAI,EAEL,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA2ClC,wBAAgB,SAAS,CACvB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,YAAY,EACnB,oBAAoB,EAAE,OAAO,iBAmB9B;AAmBD,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,8BAErE;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,8BA8BhB;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EACjB,YAAY,EAIZ,IAAI,EAEL,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA+ClC,wBAAgB,SAAS,CACvB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,YAAY,EACnB,oBAAoB,EAAE,OAAO,iBAmB9B;AAmBD,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,8BAErE;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,8BA8BhB;AAED,eAAe,oBAAoB,CAAC"}

package/src/generators/init/init.js

@@ -26,10 +26,13 @@ function setupE2ETargetDefaults(tree) {
 function updateDependencies(tree, options) {
     const tasks = [];
     tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/cypress'], []));
-    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+    const devDependencies = {
         ['@nx/cypress']: versions_1.nxVersion,
-        cypress: versions_1.cypressVersion,
-    }, undefined, options.keepExistingVersions));
+    };
+    if (!(0, versions_1.getInstalledCypressVersion)(tree)) {
+        devDependencies.cypress = versions_1.cypressVersion;
+    }
+    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, options.keepExistingVersions));
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 function addPlugin(tree, graph, updatePackageScripts) {

package/src/migrations/update-22-1-0/rename-cy-exec-code-property.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export default function renameCyExecCodeProperty(tree: Tree): Promise<void>;
+//# sourceMappingURL=rename-cy-exec-code-property.d.ts.map

package/src/migrations/update-22-1-0/rename-cy-exec-code-property.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rename-cy-exec-code-property.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-22-1-0/rename-cy-exec-code-property.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAQ1E,wBAA8B,wBAAwB,CAAC,IAAI,EAAE,IAAI,iBAiBhE"}

package/src/migrations/update-22-1-0/rename-cy-exec-code-property.js

@@ -0,0 +1,97 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = renameCyExecCodeProperty;
+const devkit_1 = require("@nx/devkit");
+const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const migrations_1 = require("../../utils/migrations");
+let ts;
+async function renameCyExecCodeProperty(tree) {
+    for await (const { projectConfig } of (0, migrations_1.cypressProjectConfigs)(tree)) {
+        (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.root, (filePath) => {
+            if (!isJsTsFile(filePath) || !tree.exists(filePath)) {
+                return;
+            }
+            const originalContent = tree.read(filePath, 'utf-8');
+            const updatedContent = updateCyExecItsCalls(originalContent);
+            if (updatedContent !== originalContent) {
+                tree.write(filePath, updatedContent);
+            }
+        });
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+function updateCyExecItsCalls(fileContent) {
+    // quick check to avoid parsing the file if it doesn't contain the string
+    if (!fileContent.includes("its('code')") &&
+        !fileContent.includes('its("code")') &&
+        !fileContent.includes('its(`code`)')) {
+        return fileContent;
+    }
+    ts ??= (0, ensure_typescript_1.ensureTypescript)();
+    const sourceFile = tsquery_1.tsquery.ast(fileContent);
+    const updates = [];
+    const callExpressions = tsquery_1.tsquery.query(sourceFile, 'CallExpression:has(PropertyAccessExpression > Identifier[name="its"])');
+    for (const callExpression of callExpressions) {
+        if (!shouldUpdateCallExpression(callExpression)) {
+            continue;
+        }
+        const firstArg = callExpression.arguments[0];
+        const literalText = firstArg.getText(sourceFile);
+        const quote = literalText[0];
+        const replacementText = `${quote}exitCode${quote}`;
+        updates.push({
+            start: firstArg.getStart(sourceFile),
+            end: firstArg.getEnd(),
+            text: replacementText,
+        });
+    }
+    if (!updates.length) {
+        return fileContent;
+    }
+    let updatedContent = fileContent;
+    for (const update of updates.sort((a, b) => b.start - a.start)) {
+        updatedContent =
+            updatedContent.slice(0, update.start) +
+                update.text +
+                updatedContent.slice(update.end);
+    }
+    return updatedContent;
+}
+function shouldUpdateCallExpression(node) {
+    if (!node.arguments.length) {
+        return false;
+    }
+    ts ??= (0, ensure_typescript_1.ensureTypescript)();
+    const firstArg = node.arguments[0];
+    if (!(ts.isStringLiteral(firstArg) ||
+        ts.isNoSubstitutionTemplateLiteral(firstArg)) ||
+        firstArg.text !== 'code') {
+        return false;
+    }
+    if (!ts.isPropertyAccessExpression(node.expression)) {
+        return false;
+    }
+    if (node.expression.name.getText() !== 'its') {
+        return false;
+    }
+    return isDerivedFromCyExec(node.expression.expression);
+}
+function isDerivedFromCyExec(expression) {
+    ts ??= (0, ensure_typescript_1.ensureTypescript)();
+    if (ts.isCallExpression(expression)) {
+        return isDerivedFromCyExec(expression.expression);
+    }
+    if (ts.isPropertyAccessExpression(expression)) {
+        if (expression.name.getText() === 'exec' &&
+            ts.isIdentifier(expression.expression) &&
+            expression.expression.text === 'cy') {
+            return true;
+        }
+        return isDerivedFromCyExec(expression.expression);
+    }
+    return false;
+}
+function isJsTsFile(filePath) {
+    return /\.[cm]?[jt]sx?$/.test(filePath);
+}

package/src/migrations/update-22-1-0/update-angular-component-testing-support.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export default function updateAngularComponentTestingSupport(tree: Tree): Promise<void>;
+//# sourceMappingURL=update-angular-component-testing-support.d.ts.map

package/src/migrations/update-22-1-0/update-angular-component-testing-support.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-angular-component-testing-support.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-22-1-0/update-angular-component-testing-support.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAiBpB,wBAA8B,oCAAoC,CAAC,IAAI,EAAE,IAAI,iBAuC5E"}

package/src/migrations/update-22-1-0/update-angular-component-testing-support.js

@@ -0,0 +1,123 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = updateAngularComponentTestingSupport;
+const devkit_1 = require("@nx/devkit");
+const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const semver_1 = require("semver");
+const config_1 = require("../../utils/config");
+const migrations_1 = require("../../utils/migrations");
+const DEPRECATED_MAX_ANGULAR_VERSION = '18.0.0';
+const CYPRESS_ANGULAR_FALLBACK_VERSION = '^3.0.0';
+let printer;
+let ts;
+async function updateAngularComponentTestingSupport(tree) {
+    const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
+    let wereProjectsMigrated = false;
+    for await (const { projectConfig, projectName, cypressConfigPath, } of (0, migrations_1.cypressProjectConfigs)(tree)) {
+        if (!tree.exists(cypressConfigPath)) {
+            continue;
+        }
+        const migrationInfo = await getMigrationInfo(tree, cypressConfigPath, projectName, projectGraph);
+        if (!migrationInfo) {
+            continue;
+        }
+        migrateProject(tree, projectConfig);
+        wereProjectsMigrated = true;
+    }
+    if (wereProjectsMigrated) {
+        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            '@cypress/angular': CYPRESS_ANGULAR_FALLBACK_VERSION,
+        });
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+async function getMigrationInfo(tree, cypressConfigPath, projectName, projectGraph) {
+    ts ??= (0, ensure_typescript_1.ensureTypescript)();
+    const cypressConfig = tree.read(cypressConfigPath, 'utf-8');
+    const config = (0, config_1.resolveCypressConfigObject)(cypressConfig);
+    if (!config) {
+        return false;
+    }
+    const component = (0, migrations_1.getObjectProperty)(config, 'component');
+    if (!component) {
+        return false;
+    }
+    const framework = resolveFramework(cypressConfig, config, projectName, projectGraph);
+    if (framework !== 'angular') {
+        return false;
+    }
+    const angularVersion = resolveAngularVersion(projectName, projectGraph);
+    if (!angularVersion || !(0, semver_1.valid)(angularVersion)) {
+        return false;
+    }
+    return (0, semver_1.lt)(angularVersion, DEPRECATED_MAX_ANGULAR_VERSION);
+}
+function migrateProject(tree, projectConfig) {
+    ts ??= (0, ensure_typescript_1.ensureTypescript)();
+    printer ??= ts.createPrinter();
+    (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.root, (filePath) => {
+        if (!isJsTsFile(filePath) || !tree.exists(filePath)) {
+            return;
+        }
+        const originalContent = tree.read(filePath, 'utf-8');
+        const sourceFile = tsquery_1.tsquery.ast(originalContent);
+        const updatedContent = tsquery_1.tsquery.replace(originalContent, 'ImportDeclaration', (node) => {
+            if (!ts.isStringLiteral(node.moduleSpecifier) ||
+                node.moduleSpecifier.text !== 'cypress/angular') {
+                return node.getText();
+            }
+            const updatedImport = ts.factory.updateImportDeclaration(node, node.modifiers, node.importClause, ts.factory.createStringLiteral('@cypress/angular'), node.attributes);
+            return printer.printNode(ts.EmitHint.Unspecified, updatedImport, sourceFile);
+        });
+        if (updatedContent !== originalContent) {
+            tree.write(filePath, updatedContent);
+        }
+    });
+}
+function resolveFramework(cypressConfig, config, projectName, projectGraph) {
+    ts ??= (0, ensure_typescript_1.ensureTypescript)();
+    const frameworkProperty = tsquery_1.tsquery.query(config, 'PropertyAssignment:has(Identifier[name=component]) PropertyAssignment:has(Identifier[name=devServer]) PropertyAssignment:has(Identifier[name=framework])')[0];
+    if (frameworkProperty) {
+        return ts.isStringLiteral(frameworkProperty.initializer)
+            ? frameworkProperty.initializer.text
+            : null;
+    }
+    const sourceFile = tsquery_1.tsquery.ast(cypressConfig);
+    const nxPresetModuleSpecifiers = [
+        '@nx/angular/plugins/component-testing',
+        '@nx/react/plugins/component-testing',
+        '@nx/next/plugins/component-testing',
+        '@nx/remix/plugins/component-testing',
+    ];
+    const imports = tsquery_1.tsquery.query(sourceFile, 'ImportDeclaration');
+    const nxPresetImport = imports.find((decl) => {
+        const moduleSpec = decl.moduleSpecifier.getText().replace(/['"`]/g, '');
+        return nxPresetModuleSpecifiers.includes(moduleSpec);
+    });
+    if (nxPresetImport) {
+        const moduleSpecifier = nxPresetImport.moduleSpecifier
+            .getText()
+            .replace(/['"`]/g, '');
+        const plugin = moduleSpecifier.split('/').at(1);
+        return plugin === 'angular' ? 'angular' : 'react';
+    }
+    if (projectGraph.dependencies[projectName]?.some((dependency) => dependency.target.startsWith('npm:@angular/core'))) {
+        return 'angular';
+    }
+    if (projectGraph.dependencies[projectName]?.some((dependency) => dependency.target.startsWith('npm:react') ||
+        dependency.target.startsWith('npm:next'))) {
+        return 'react';
+    }
+    return null;
+}
+function resolveAngularVersion(projectName, projectGraph) {
+    const angularDep = projectGraph.dependencies[projectName]?.find((dependency) => dependency.target.startsWith('npm:@angular/core'));
+    if (!angularDep) {
+        return null;
+    }
+    return projectGraph.externalNodes?.[angularDep.target]?.data?.version ?? null;
+}
+function isJsTsFile(filePath) {
+    return /\.[cm]?[jt]sx?$/.test(filePath);
+}

package/src/migrations/update-22-1-0/update-selector-playground-api.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export default function updateSelectorPlaygroundApi(tree: Tree): Promise<void>;
+//# sourceMappingURL=update-selector-playground-api.d.ts.map

package/src/migrations/update-22-1-0/update-selector-playground-api.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-selector-playground-api.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-22-1-0/update-selector-playground-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAS1E,wBAA8B,2BAA2B,CAAC,IAAI,EAAE,IAAI,iBAiBnE"}

package/src/migrations/update-22-1-0/update-selector-playground-api.js

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = updateSelectorPlaygroundApi;
+const devkit_1 = require("@nx/devkit");
+const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const migrations_1 = require("../../utils/migrations");
+let printer;
+let ts;
+async function updateSelectorPlaygroundApi(tree) {
+    for await (const { projectConfig } of (0, migrations_1.cypressProjectConfigs)(tree)) {
+        (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.root, (filePath) => {
+            if (!isJsTsFile(filePath) || !tree.exists(filePath)) {
+                return;
+            }
+            const originalContent = tree.read(filePath, 'utf-8');
+            const updatedContent = migrateSelectorPlaygroundApi(originalContent);
+            if (updatedContent !== originalContent) {
+                tree.write(filePath, updatedContent);
+            }
+        });
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+function migrateSelectorPlaygroundApi(fileContent) {
+    let updated = fileContent;
+    if (updated.includes('Cypress.SelectorPlayground')) {
+        updated = updated.replace(/Cypress\.SelectorPlayground/g, 'Cypress.ElementSelector');
+    }
+    if (!updated.includes('Cypress.ElementSelector') &&
+        !updated.includes('Cypress.SelectorPlayground')) {
+        return updated;
+    }
+    ts ??= (0, ensure_typescript_1.ensureTypescript)();
+    printer ??= ts.createPrinter();
+    const sourceFile = tsquery_1.tsquery.ast(updated);
+    let hasChanges = false;
+    const result = tsquery_1.tsquery.replace(updated, 'CallExpression:has(Identifier[name="defaults"])', (node) => {
+        if (!ts.isPropertyAccessExpression(node.expression)) {
+            return node.getText();
+        }
+        if (node.expression.name.getText() !== 'defaults') {
+            return node.getText();
+        }
+        const selectorExpr = node.expression.expression;
+        if (!ts.isPropertyAccessExpression(selectorExpr)) {
+            return node.getText();
+        }
+        if (!ts.isIdentifier(selectorExpr.expression)) {
+            return node.getText();
+        }
+        if (selectorExpr.expression.text !== 'Cypress') {
+            return node.getText();
+        }
+        const selectorName = selectorExpr.name.getText();
+        if (selectorName !== 'ElementSelector' &&
+            selectorName !== 'SelectorPlayground') {
+            return node.getText();
+        }
+        if (!node.arguments.length) {
+            return node.getText();
+        }
+        const [firstArg, ...restArgs] = node.arguments;
+        if (!ts.isObjectLiteralExpression(firstArg)) {
+            return node.getText();
+        }
+        const filteredProperties = firstArg.properties.filter((prop) => {
+            if (ts.isPropertyAssignment(prop) ||
+                ts.isShorthandPropertyAssignment(prop) ||
+                ts.isMethodDeclaration(prop) ||
+                ts.isGetAccessorDeclaration(prop) ||
+                ts.isSetAccessorDeclaration(prop)) {
+                return !isOnElementProperty(prop.name);
+            }
+            return true;
+        });
+        if (filteredProperties.length === firstArg.properties.length) {
+            return node.getText();
+        }
+        hasChanges = true;
+        const updatedObjectLiteral = ts.factory.updateObjectLiteralExpression(firstArg, filteredProperties);
+        const updatedCall = ts.factory.updateCallExpression(node, node.expression, node.typeArguments, [updatedObjectLiteral, ...restArgs]);
+        return printer.printNode(ts.EmitHint.Unspecified, updatedCall, sourceFile);
+    });
+    return hasChanges ? result : updated;
+}
+function isOnElementProperty(name) {
+    ts ??= (0, ensure_typescript_1.ensureTypescript)();
+    if (ts.isIdentifier(name)) {
+        return name.text === 'onElement';
+    }
+    if (ts.isStringLiteralLike(name)) {
+        return name.text === 'onElement';
+    }
+    return false;
+}
+function isJsTsFile(filePath) {
+    return /\.[cm]?[jt]sx?$/.test(filePath);
+}

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

@@ -1 +1 @@
-{"version":3,"file":"add-linter.d.ts","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/add-linter.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EACL,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAwB,MAAM,YAAY,CAAC;AAiBtE,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb;;;QAGI;IACJ,UAAU,EAAE,MAAM,CAAC;IACnB;;;QAGI;IACJ,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,eAAe,uBAoIzB"}
+{"version":3,"file":"add-linter.d.ts","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/add-linter.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EACL,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAwB,MAAM,YAAY,CAAC;AAiBtE,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb;;;QAGI;IACJ,UAAU,EAAE,MAAM,CAAC;IACnB;;;QAGI;IACJ,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,eAAe,uBA4HzB"}

package/src/utils/add-linter.js

@@ -53,7 +53,6 @@ async function addLinterToCyProject(tree, options) {
             const addExtendsTask = (0, eslint_file_1.addExtendsToLintConfig)(tree, projectConfig.root, 'plugin:cypress/recommended');
             tasks.push(addExtendsTask);
         }
-        const cyVersion = (0, versions_1.getInstalledCypressMajorVersion)(tree);
         /**
          * We need this override because we enabled allowJS in the tsconfig to allow for JS based Cypress tests.
          * That however leads to issues with the CommonJS Cypress plugin file.
@@ -65,7 +64,6 @@ async function addLinterToCyProject(tree, options) {
                 'no-undef': 'off',
             },
         };
-        const addCy6Override = cyVersion && cyVersion < 7;
         if (options.overwriteExisting) {
             overrides.unshift({
                 files: (0, flat_config_1.useFlatConfig)(tree)
@@ -79,9 +77,6 @@ async function addLinterToCyProject(tree, options) {
                     },
                 rules: {},
             });
-            if (addCy6Override) {
-                overrides.push(cy6Override);
-            }
             (0, eslint_file_1.replaceOverridesInLintConfig)(tree, projectConfig.root, overrides);
         }
         else {
@@ -100,9 +95,6 @@ async function addLinterToCyProject(tree, options) {
                     },
                 rules: {},
             });
-            if (addCy6Override) {
-                overrides.push(cy6Override);
-            }
             overrides.forEach((override) => (0, eslint_file_1.addOverrideToLintConfig)(tree, projectConfig.root, override));
         }
     }

package/src/utils/cypress-version.d.ts

@@ -1,12 +1,12 @@
 /**
  * @deprecated use the `getInstalledCypressMajorVersion` exported from
- * `@nx/cypress/src/utils/versions` instead. It will be removed in v22.
+ * `@nx/cypress/src/utils/versions` instead. It will be removed in v23.
  */
 export declare function installedCypressVersion(): number;
 /**
  * will not throw if cypress is not installed
  * @deprecated use the `assertMinimumCypressVersion` exported from
- * `@nx/cypress/src/utils/versions` instead. It will be removed in v22.
+ * `@nx/cypress/src/utils/versions` instead. It will be removed in v23.
  */
 export declare function assertMinimumCypressVersion(minVersion: number): void;
 //# sourceMappingURL=cypress-version.d.ts.map

package/src/utils/cypress-version.js

@@ -6,7 +6,7 @@ let cypressPackageJson;
 let loadedCypress = false;
 /**
  * @deprecated use the `getInstalledCypressMajorVersion` exported from
- * `@nx/cypress/src/utils/versions` instead. It will be removed in v22.
+ * `@nx/cypress/src/utils/versions` instead. It will be removed in v23.
  */
 function installedCypressVersion() {
     if (!loadedCypress) {
@@ -28,7 +28,7 @@ function installedCypressVersion() {
 /**
  * will not throw if cypress is not installed
  * @deprecated use the `assertMinimumCypressVersion` exported from
- * `@nx/cypress/src/utils/versions` instead. It will be removed in v22.
+ * `@nx/cypress/src/utils/versions` instead. It will be removed in v23.
  */
 function assertMinimumCypressVersion(minVersion) {
     const version = installedCypressVersion();

package/src/utils/versions.d.ts

@@ -2,21 +2,13 @@ import { type Tree } from '@nx/devkit';
 export declare const nxVersion: any;
 export declare const eslintPluginCypressVersion = "^3.5.0";
 export declare const typesNodeVersion = "20.19.9";
-export declare const cypressViteDevServerVersion = "^6.0.3";
-export declare const cypressVersion = "^14.2.1";
-export declare const cypressWebpackVersion = "^4.0.2";
+export declare const cypressViteDevServerVersion = "^7.0.1";
+export declare const cypressVersion = "^15.6.0";
+export declare const cypressWebpackVersion = "^5.1.4";
 export declare const viteVersion = "^6.0.0";
 export declare const htmlWebpackPluginVersion = "^5.5.0";
-export declare function versions(tree: Tree): Omit<typeof import("./versions"), "versions" | "getInstalledCypressVersion" | "getInstalledCypressMajorVersion" | "assertMinimumCypressVersion"> | {
-    nxVersion: any;
-    eslintPluginCypressVersion: string;
-    typesNodeVersion: string;
-    cypressViteDevServerVersion: string;
-    cypressVersion: string;
-    cypressWebpackVersion: string;
-    viteVersion: string;
-    htmlWebpackPluginVersion: string;
-};
+export type CypressVersions = Record<keyof Omit<typeof import('./versions'), 'nxVersion' | 'versions' | 'getInstalledCypressVersion' | 'getInstalledCypressMajorVersion' | 'assertMinimumCypressVersion'>, string>;
+export declare function versions(tree: Tree): CypressVersions;
 export declare function getInstalledCypressVersion(tree?: Tree): string | null;
 export declare function getInstalledCypressMajorVersion(tree?: Tree): number | null;
 export declare function assertMinimumCypressVersion(minVersion: number, tree?: Tree): void;

package/src/utils/versions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/versions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAI5E,eAAO,MAAM,SAAS,KAAwC,CAAC;AAC/D,eAAO,MAAM,0BAA0B,WAAW,CAAC;AACnD,eAAO,MAAM,gBAAgB,YAAY,CAAC;AAC1C,eAAO,MAAM,2BAA2B,WAAW,CAAC;AACpD,eAAO,MAAM,cAAc,YAAY,CAAC;AACxC,eAAO,MAAM,qBAAqB,WAAW,CAAC;AAC9C,eAAO,MAAM,WAAW,WAAW,CAAC;AACpC,eAAO,MAAM,wBAAwB,WAAW,CAAC;AAmBjD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,IAAI;;;;;;;;;EA2BlC;AAED,wBAAgB,0BAA0B,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAcrE;AAED,wBAAgB,+BAA+B,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAI1E;AAED,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,MAAM,EAClB,IAAI,CAAC,EAAE,IAAI,GACV,IAAI,CAON"}
+{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/versions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAI5E,eAAO,MAAM,SAAS,KAAwC,CAAC;AAC/D,eAAO,MAAM,0BAA0B,WAAW,CAAC;AACnD,eAAO,MAAM,gBAAgB,YAAY,CAAC;AAC1C,eAAO,MAAM,2BAA2B,WAAW,CAAC;AACpD,eAAO,MAAM,cAAc,YAAY,CAAC;AACxC,eAAO,MAAM,qBAAqB,WAAW,CAAC;AAC9C,eAAO,MAAM,WAAW,WAAW,CAAC;AACpC,eAAO,MAAM,wBAAwB,WAAW,CAAC;AAEjD,MAAM,MAAM,eAAe,GAAG,MAAM,CAClC,MAAM,IAAI,CACR,cAAc,YAAY,CAAC,EACzB,WAAW,GACX,UAAU,GACV,4BAA4B,GAC5B,iCAAiC,GACjC,6BAA6B,CAChC,EACD,MAAM,CACP,CAAC;AAkCF,wBAAgB,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,eAAe,CAmBpD;AAED,wBAAgB,0BAA0B,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAcrE;AAED,wBAAgB,+BAA+B,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAI1E;AAED,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,MAAM,EAClB,IAAI,CAAC,EAAE,IAAI,GACV,IAAI,CAON"}

package/src/utils/versions.js

@@ -10,13 +10,12 @@ const semver_1 = require("semver");
 exports.nxVersion = require('../../package.json').version;
 exports.eslintPluginCypressVersion = '^3.5.0';
 exports.typesNodeVersion = '20.19.9';
-exports.cypressViteDevServerVersion = '^6.0.3';
-exports.cypressVersion = '^14.2.1';
-exports.cypressWebpackVersion = '^4.0.2';
+exports.cypressViteDevServerVersion = '^7.0.1';
+exports.cypressVersion = '^15.6.0';
+exports.cypressWebpackVersion = '^5.1.4';
 exports.viteVersion = '^6.0.0';
 exports.htmlWebpackPluginVersion = '^5.5.0';
 const latestVersions = {
-    nxVersion: exports.nxVersion,
     eslintPluginCypressVersion: exports.eslintPluginCypressVersion,
     typesNodeVersion: exports.typesNodeVersion,
     cypressViteDevServerVersion: exports.cypressViteDevServerVersion,
@@ -25,20 +24,8 @@ const latestVersions = {
     viteVersion: exports.viteVersion,
     htmlWebpackPluginVersion: exports.htmlWebpackPluginVersion,
 };
-function versions(tree) {
-    const installedCypressVersion = getInstalledCypressVersion(tree);
-    if (!installedCypressVersion) {
-        return latestVersions;
-    }
-    const cypressMajorVersion = (0, semver_1.major)(installedCypressVersion);
-    if (cypressMajorVersion === 14) {
-        return latestVersions;
-    }
-    if (cypressMajorVersion > 14) {
-        throw new Error(`You're currently using an unsupported Cypress version: ${installedCypressVersion}. Supported versions are v13 and v14.`);
-    }
-    return {
-        nxVersion: exports.nxVersion,
+const versionMap = {
+    13: {
         eslintPluginCypressVersion: '^3.5.0',
         typesNodeVersion: '20.19.9',
         cypressViteDevServerVersion: '^2.2.1',
@@ -46,7 +33,33 @@ function versions(tree) {
         cypressWebpackVersion: '^3.8.0',
         viteVersion: '~5.0.0',
         htmlWebpackPluginVersion: '^5.5.0',
-    };
+    },
+    14: {
+        eslintPluginCypressVersion: '^3.5.0',
+        typesNodeVersion: '20.19.9',
+        cypressViteDevServerVersion: '^6.0.3',
+        cypressVersion: '^14.2.1',
+        cypressWebpackVersion: '^4.0.2',
+        viteVersion: '^6.0.0',
+        htmlWebpackPluginVersion: '^5.5.0',
+    },
+};
+function versions(tree) {
+    const installedCypressVersion = getInstalledCypressVersion(tree);
+    if (!installedCypressVersion) {
+        return latestVersions;
+    }
+    const cypressMajorVersion = (0, semver_1.major)(installedCypressVersion);
+    switch (cypressMajorVersion) {
+        case 15:
+            return latestVersions;
+        case 14:
+            return versionMap[14];
+        case 13:
+            return versionMap[13];
+        default:
+            throw new Error(`You're currently using an unsupported Cypress version: ${installedCypressVersion}. Supported versions are v13, v14, and v15.`);
+    }
 }
 function getInstalledCypressVersion(tree) {
     try {

package/src/generators/configuration/files/v9/__directory__/fixtures/example.json__tmpl__

@@ -1,4 +0,0 @@
-{
-  "name": "Using fixtures to represent data",
-  "email": "hello@cypress.io"
-}

package/src/generators/configuration/files/v9/__directory__/integration/app.spec.ts__tmpl__

@@ -1,13 +0,0 @@
-import { getGreeting } from '../support/app.po';
-
-describe('<%= project %>', () => {
-  beforeEach(() => cy.visit('/'));
-
-  it('should display welcome message', () => {
-    // Custom command example, see `../support/commands.ts` file
-    cy.login('my-email@something.com', 'myPassword');
-
-    // Function helper example, see `../support/app.po.ts` file
-    getGreeting().contains(/Welcome/);
-  });
-});

package/src/generators/configuration/files/v9/__directory__/plugins/index.js__tmpl__

@@ -1,22 +0,0 @@
-// ***********************************************************
-// This example plugins/index.js can be used to load plugins
-//
-// You can change the location of this file or turn off loading
-// the plugins file with the 'pluginsFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/plugins-guide
-// ***********************************************************
-
-// This function is called when a project is opened or re-opened (e.g. due to
-// the project's config changing)
-
-const { preprocessTypescript } = require('@nx/cypress/plugins/preprocessor');
-
-module.exports = (on, config) => {
-  // `on` is used to hook into various events Cypress emits
-  // `config` is the resolved Cypress config
-
-  // Preprocess Typescript file using Nx helper
-  on('file:preprocessor', preprocessTypescript(config));
-};

package/src/generators/configuration/files/v9/__directory__/support/app.po.ts__tmpl__

@@ -1 +0,0 @@
-export const getGreeting = () => cy.get('h1');

package/src/generators/configuration/files/v9/__directory__/support/commands.ts__tmpl__

@@ -1,33 +0,0 @@
-// ***********************************************
-// This example commands.js 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
-// ***********************************************
-<% if (linter === 'eslint') { %>
-// eslint-disable-next-line @typescript-eslint/no-namespace<% } %>
-declare namespace Cypress {<% if (linter === 'eslint') { %>
-  // 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/configuration/files/v9/__directory__/support/index.ts__tmpl__

@@ -1,17 +0,0 @@
-// ***********************************************************
-// This example support/index.ts is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import commands.ts using ES2015 syntax:
-import './commands';

package/src/generators/configuration/files/v9/__directory__/tsconfig.json

@@ -1,10 +0,0 @@
-{
-  "extends": "<%= tsConfigPath %>",
-  "compilerOptions": {
-    "sourceMap": false,
-    "outDir": "<%= offsetFromRoot %>dist/out-tsc",
-    "allowJs": true,
-    "types": ["cypress", "node"]
-  },
-  "include": ["src/**/*.ts", "src/**/*.js"]
-}

package/src/generators/configuration/files/v9/cypress.json

@@ -1,12 +0,0 @@
-{
-  "fileServerFolder": ".",
-  "fixturesFolder": "./<%= dir %>/fixtures",
-  "integrationFolder": "./<%= dir %>/integration",
-  "modifyObstructiveCode": false,
-  "supportFile": "./<%= dir %>/support/index.<%= ext %>",
-  "pluginsFile": false,
-  "video": true,
-  "videosFolder": "<%= offsetFromRoot %>dist/cypress/<%= projectRoot %>/videos",
-  "screenshotsFolder": "<%= offsetFromRoot %>dist/cypress/<%= projectRoot %>/screenshots",
-  "chromeWebSecurity": false
-}