@nx/cypress 23.0.0-pr.35413.460eeef → 23.0.0-rc.0

package/{index.d.ts → dist/index.d.ts}

@@ -2,4 +2,3 @@ export { configurationGenerator } from './src/generators/configuration/configura
 export { componentConfigurationGenerator } from './src/generators/component-configuration/component-configuration';
 export { cypressInitGenerator } from './src/generators/init/init';
 export { migrateCypressProject } from './src/generators/migrate-to-cypress-11/migrate-to-cypress-11';
-//# sourceMappingURL=index.d.ts.map

package/dist/internal.d.ts

@@ -0,0 +1,5 @@
+export * from './src/utils/versions';
+export * from './src/utils/ct-helpers';
+export * from './src/utils/find-target-options';
+export * from './src/utils/config';
+export type { CypressExecutorOptions } from './src/executors/cypress/cypress.impl';

package/dist/internal.js

@@ -0,0 +1,12 @@
+"use strict";
+// Semi-private surface for first-party Nx packages.
+//
+// External plugins should NOT import from here — this entry is curated for
+// internal consumers and may change without semver protection. Mirrors
+// `@nx/devkit/internal`.
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./src/utils/versions"), exports);
+tslib_1.__exportStar(require("./src/utils/ct-helpers"), exports);
+tslib_1.__exportStar(require("./src/utils/find-target-options"), exports);
+tslib_1.__exportStar(require("./src/utils/config"), exports);

package/{plugin.d.ts → dist/plugin.d.ts}

@@ -1,2 +1 @@
 export { createNodesV2, createNodes } from './src/plugins/plugin';
-//# sourceMappingURL=plugin.d.ts.map

package/{plugins → dist/plugins}/cypress-preset.d.ts

@@ -78,4 +78,3 @@ export type NxCypressE2EPresetOptions = {
     viteConfigOverrides?: InlineConfig;
 };
 export {};
-//# sourceMappingURL=cypress-preset.d.ts.map

package/{plugins → dist/plugins}/cypress-preset.js

@@ -4,12 +4,13 @@ exports.nxBaseCypressPreset = nxBaseCypressPreset;
 exports.nxE2EPreset = nxE2EPreset;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const http_1 = require("http");
 const https_1 = require("https");
 const path_1 = require("path");
+const url_1 = require("url");
 const preprocessor_vite_1 = tslib_1.__importDefault(require("../src/plugins/preprocessor-vite"));
 const constants_1 = require("../src/utils/constants");
 const treeKill = require('tree-kill');
@@ -17,14 +18,23 @@ function nxBaseCypressPreset(pathToConfig, options) {
     // used to set babel settings for react CT.
     process.env.NX_CYPRESS_COMPONENT_TEST =
         options?.testingType === 'component' ? 'true' : 'false';
+    // ESM-shape configs pass `import.meta.url` (a `file://...` URL string) so
+    // the same expression works under both Node's native TS strip (ESM,
+    // import.meta.url defined) and Cypress's bundled tsx CJS loader, which
+    // exposes `import.meta.url` but not `import.meta.dirname`. CJS-shape
+    // configs still pass `__filename` directly. Normalize either form to a
+    // filesystem path before stat-checking.
+    const resolvedPath = pathToConfig?.startsWith('file://')
+        ? (0, url_1.fileURLToPath)(pathToConfig)
+        : pathToConfig;
     // prevent from placing path outside the root of the workspace
     // if they pass in a file or directory
-    const normalizedPath = (0, fs_1.lstatSync)(pathToConfig).isDirectory()
-        ? pathToConfig
-        : (0, path_1.dirname)(pathToConfig);
+    const normalizedPath = (0, fs_1.lstatSync)(resolvedPath).isDirectory()
+        ? resolvedPath
+        : (0, path_1.dirname)(resolvedPath);
     const projectPath = (0, path_1.relative)(devkit_1.workspaceRoot, normalizedPath);
     const offset = (0, path_1.relative)(normalizedPath, devkit_1.workspaceRoot);
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+    const isTsSolutionSetup = (0, internal_1.isUsingTsSolutionSetup)();
     const videosFolder = isTsSolutionSetup
         ? (0, path_1.join)('test-output', 'cypress', 'videos')
         : (0, path_1.join)(offset, 'dist', 'cypress', projectPath, 'videos');

package/{src → dist/src}/executors/cypress/cypress.impl.d.ts

@@ -36,4 +36,3 @@ export interface CypressExecutorOptions extends Json {
 export default function cypressExecutor(options: CypressExecutorOptions, context: ExecutorContext): Promise<{
     success: any;
 }>;
-//# sourceMappingURL=cypress.impl.d.ts.map

package/{src → dist/src}/executors/cypress/cypress.impl.js

@@ -5,9 +5,11 @@ 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 deprecation_1 = require("../../utils/deprecation");
 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) {
+    (0, deprecation_1.warnCypressExecutorDeprecation)();
     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;

package/{src → dist/src}/executors/cypress/schema.json

@@ -5,6 +5,7 @@
   "type": "object",
   "outputCapture": "pipe",
   "cli": "nx",
+  "x-deprecated": "The `@nx/cypress:cypress` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/cypress:convert-to-inferred` to migrate to the `@nx/cypress/plugin` inferred plugin. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.",
   "presets": [
     {
       "name": "Starting Dev Server",

package/{src → dist/src}/generators/base-setup/base-setup.d.ts

@@ -10,4 +10,3 @@ export interface CypressBaseSetupSchema {
     jsx?: boolean;
 }
 export declare function addBaseCypressSetup(tree: Tree, options: CypressBaseSetupSchema): void;
-//# sourceMappingURL=base-setup.d.ts.map

package/{src → dist/src}/generators/base-setup/base-setup.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addBaseCypressSetup = addBaseCypressSetup;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 function addBaseCypressSetup(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
@@ -12,7 +12,7 @@ function addBaseCypressSetup(tree, options) {
         return;
     }
     const opts = normalizeOptions(tree, projectConfig, options);
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const isUsingTsSolutionConfig = (0, internal_1.isUsingTsSolutionSetup)(tree);
     const templateVars = {
         ...opts,
         jsx: !!opts.jsx,
@@ -35,16 +35,12 @@ function addBaseCypressSetup(tree, options) {
     (0, devkit_1.generateFiles)(tree, isUsingTsSolutionConfig
         ? (0, path_1.join)(__dirname, 'files/tsconfig/ts-solution')
         : (0, path_1.join)(__dirname, 'files/tsconfig/non-ts-solution'), projectConfig.root, templateVars);
+    const isEsm = (0, internal_1.isEsmProject)(tree, projectConfig.root);
     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);
-        }
+        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, isEsm ? 'files/config-js-esm' : 'files/config-js-cjs'), projectConfig.root, templateVars);
     }
     else {
-        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files/config-ts'), projectConfig.root, templateVars);
+        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, isEsm ? 'files/config-ts-esm' : 'files/config-ts-cjs'), projectConfig.root, templateVars);
     }
     if (opts.hasTsConfig) {
         (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json'), (json) => {
@@ -80,16 +76,6 @@ 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';
-}
 function isEslintInstalled(tree) {
     const { dependencies, devDependencies } = (0, devkit_1.readJson)(tree, 'package.json');
     return !!(dependencies?.eslint || devDependencies?.eslint);

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

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

package/dist/src/generators/base-setup/files/config-ts-esm/__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
+// ***********************************************
+<% 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 → dist/src}/generators/component-configuration/component-configuration.d.ts

@@ -4,4 +4,3 @@ export declare function componentConfigurationGenerator(tree: Tree, options: Cyp
 export declare function componentConfigurationGeneratorInternal(tree: Tree, options: CypressComponentConfigurationSchema): Promise<GeneratorCallback>;
 export declare function updateTsConfigForComponentTesting(tree: Tree, projectConfig: ProjectConfiguration): void;
 export default componentConfigurationGenerator;
-//# sourceMappingURL=component-configuration.d.ts.map

package/{src → dist/src}/generators/component-configuration/component-configuration.js

@@ -5,8 +5,10 @@ exports.componentConfigurationGeneratorInternal = componentConfigurationGenerato
 exports.updateTsConfigForComponentTesting = updateTsConfigForComponentTesting;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const semver_1 = require("semver");
+const internal_1 = require("@nx/devkit/internal");
+const internal_2 = require("@nx/js/internal");
+const assert_supported_cypress_version_1 = require("../../utils/assert-supported-cypress-version");
+const deprecation_1 = require("../../utils/deprecation");
 const versions_1 = require("../../utils/versions");
 const base_setup_1 = require("../base-setup/base-setup");
 const init_1 = tslib_1.__importDefault(require("../init/init"));
@@ -17,18 +19,8 @@ function componentConfigurationGenerator(tree, options) {
     });
 }
 async function componentConfigurationGeneratorInternal(tree, options) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'cypress', 'component-configuration');
-    // Cypress CT does not support Vite 8 yet (@cypress/vite-dev-server
-    // peer dep is ^5.0.0 || ^6.0.0 || ^7.0.0).
-    const viteVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'vite');
-    if (viteVersion) {
-        const viteMajor = (0, semver_1.major)((0, semver_1.coerce)(viteVersion));
-        if (viteMajor >= 8) {
-            throw new Error(`Cypress component testing does not yet support Vite ${viteMajor}. ` +
-                `Downgrade to Vite 7 or earlier to use Cypress component testing. ` +
-                `See: https://github.com/cypress-io/cypress/issues/33078`);
-        }
-    }
+    (0, assert_supported_cypress_version_1.assertSupportedCypressVersion)(tree);
+    (0, internal_2.assertNotUsingTsSolutionSetup)(tree, 'cypress', 'component-configuration');
     const tasks = [];
     const opts = normalizeOptions(tree, options);
     if (!(0, versions_1.getInstalledCypressMajorVersion)(tree)) {
@@ -47,6 +39,7 @@ async function componentConfigurationGeneratorInternal(tree, options) {
     }
     addProjectFiles(tree, projectConfig, opts);
     if (!hasPlugin || opts.addExplicitTargets) {
+        (0, deprecation_1.warnCypressExecutorGenerating)();
         addTargetToProject(tree, projectConfig, opts);
     }
     updateNxJsonConfiguration(tree, hasPlugin);
@@ -123,14 +116,24 @@ function updateNxJsonConfiguration(tree, hasPlugin) {
             !cacheableOperations.includes('component-test')) {
             cacheableOperations.push('component-test');
         }
-        nxJson.targetDefaults ??= {};
-        nxJson.targetDefaults['component-test'] ??= {};
-        nxJson.targetDefaults['component-test'].cache ??= true;
-        nxJson.targetDefaults['component-test'] ??= {};
-        nxJson.targetDefaults['component-test'].inputs ??= [
-            'default',
-            productionFileSet ? '^production' : '^default',
-        ];
+        // Either a `target: 'component-test'` default or a default keyed on
+        // the executor we're scaffolding will apply to the new target — pick
+        // the more specific (target-keyed) when both are present.
+        const existingForTarget = (0, internal_1.findTargetDefault)(nxJson.targetDefaults, {
+            target: 'component-test',
+        });
+        const existingForExecutor = (0, internal_1.findTargetDefault)(nxJson.targetDefaults, {
+            executor: '@nx/cypress:cypress',
+        });
+        const existing = existingForTarget ?? existingForExecutor;
+        (0, internal_1.upsertTargetDefault)(tree, nxJson, {
+            target: 'component-test',
+            cache: existing?.cache ?? true,
+            inputs: existing?.inputs ?? [
+                'default',
+                productionFileSet ? '^production' : '^default',
+            ],
+        });
     }
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }

package/{src → dist/src}/generators/configuration/configuration.d.ts

@@ -22,4 +22,3 @@ export interface CypressE2EConfigSchema {
 export declare function configurationGenerator(tree: Tree, options: CypressE2EConfigSchema): Promise<GeneratorCallback>;
 export declare function configurationGeneratorInternal(tree: Tree, options: CypressE2EConfigSchema): Promise<GeneratorCallback>;
 export default configurationGenerator;
-//# sourceMappingURL=configuration.d.ts.map

package/{src → dist/src}/generators/configuration/configuration.js

@@ -3,16 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.configurationGenerator = configurationGenerator;
 exports.configurationGeneratorInternal = configurationGeneratorInternal;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-const prompt_1 = require("@nx/devkit/src/generators/prompt");
 const js_1 = require("@nx/js");
-const generator_prompts_1 = require("@nx/js/src/utils/generator-prompts");
-const package_manager_workspaces_1 = require("@nx/js/src/utils/package-manager-workspaces");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const path_1 = require("path");
 const add_linter_1 = require("../../utils/add-linter");
+const assert_supported_cypress_version_1 = require("../../utils/assert-supported-cypress-version");
 const config_1 = require("../../utils/config");
+const deprecation_1 = require("../../utils/deprecation");
 const versions_1 = require("../../utils/versions");
 const base_setup_1 = require("../base-setup/base-setup");
 const init_1 = tslib_1.__importStar(require("../init/init"));
@@ -23,6 +22,7 @@ function configurationGenerator(tree, options) {
     });
 }
 async function configurationGeneratorInternal(tree, options) {
+    (0, assert_supported_cypress_version_1.assertSupportedCypressVersion)(tree);
     const opts = await normalizeOptions(tree, options);
     const tasks = [];
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
@@ -42,6 +42,7 @@ async function configurationGeneratorInternal(tree, options) {
         : p.plugin === '@nx/cypress/plugin');
     await addFiles(tree, opts, projectGraph, hasPlugin);
     if (!hasPlugin) {
+        (0, deprecation_1.warnCypressExecutorGenerating)();
         addTarget(tree, opts, projectGraph);
     }
     const projectTsConfigPath = (0, devkit_1.joinPathFragments)(opts.projectRoot, 'tsconfig.json');
@@ -59,7 +60,7 @@ async function configurationGeneratorInternal(tree, options) {
         });
     }
     const { root: projectRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)(tree);
     if (isTsSolutionSetup) {
         createPackageJson(tree, opts);
         ignoreTestOutput(tree);
@@ -84,9 +85,9 @@ async function configurationGeneratorInternal(tree, options) {
         await (0, devkit_1.formatFiles)(tree);
     }
     if (isTsSolutionSetup) {
-        const projectPackageManagerWorkspaceState = (0, package_manager_workspaces_1.getProjectPackageManagerWorkspaceState)(tree, projectRoot);
+        const projectPackageManagerWorkspaceState = (0, internal_2.getProjectPackageManagerWorkspaceState)(tree, projectRoot);
         if (projectPackageManagerWorkspaceState !== 'included') {
-            tasks.push((0, package_manager_workspaces_1.getProjectPackageManagerWorkspaceStateWarningTask)(projectPackageManagerWorkspaceState, tree.root));
+            tasks.push((0, internal_2.getProjectPackageManagerWorkspaceStateWarningTask)(projectPackageManagerWorkspaceState, tree.root));
         }
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
@@ -102,7 +103,7 @@ function ensureDependencies(tree, options) {
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, true);
 }
 async function normalizeOptions(tree, options) {
-    const linter = await (0, generator_prompts_1.normalizeLinterOption)(tree, options.linter);
+    const linter = await (0, internal_2.normalizeLinterOption)(tree, options.linter);
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     if (projectConfig?.targets?.e2e) {
         throw new Error(`Project ${options.project} already has an e2e target.
@@ -141,7 +142,7 @@ In this case you need to provide a devServerTarget,'<projectName>:<targetName>[:
     };
 }
 async function promptForMissingServeData(projectName) {
-    const { devServerTarget, port } = await (0, prompt_1.promptWhenInteractive)([
+    const { devServerTarget, port } = await (0, internal_1.promptWhenInteractive)([
         {
             type: 'input',
             name: 'devServerTarget',
@@ -273,7 +274,7 @@ function createPackageJson(tree, options) {
     if (tree.exists(packageJsonPath)) {
         return;
     }
-    const importPath = (0, project_name_and_root_utils_1.resolveImportPath)(tree, projectConfig.name, projectConfig.root);
+    const importPath = (0, internal_1.resolveImportPath)(tree, projectConfig.name, projectConfig.root);
     const packageJson = {
         name: importPath,
         version: '0.0.1',

package/{src → dist/src}/generators/convert-to-inferred/convert-to-inferred.d.ts

@@ -6,4 +6,3 @@ interface Schema {
 }
 export declare function convertToInferred(tree: Tree, options: Schema): Promise<void>;
 export default convertToInferred;
-//# sourceMappingURL=convert-to-inferred.d.ts.map

package/{src → dist/src}/generators/convert-to-inferred/convert-to-inferred.js

@@ -1,17 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToInferred = convertToInferred;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const executor_to_plugin_migrator_1 = require("@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator");
-const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
 const plugin_1 = require("../../plugins/plugin");
+const assert_supported_cypress_version_1 = require("../../utils/assert-supported-cypress-version");
 const add_dev_server_target_to_config_1 = require("./lib/add-dev-server-target-to-config");
 const add_exclude_spec_pattern_1 = require("./lib/add-exclude-spec-pattern");
 const target_options_map_1 = require("./lib/target-options-map");
 const upsert_baseUrl_1 = require("./lib/upsert-baseUrl");
 async function convertToInferred(tree, options) {
+    (0, assert_supported_cypress_version_1.assertSupportedCypressVersion)(tree);
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
-    const migratedProjects = await (0, executor_to_plugin_migrator_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/cypress/plugin', plugin_1.createNodesV2, {
+    const migratedProjects = await (0, internal_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/cypress/plugin', plugin_1.createNodesV2, {
         targetName: 'cypress',
         ciTargetName: 'e2e-ci',
         componentTestingTargetName: 'component-test',
@@ -24,7 +25,7 @@ async function convertToInferred(tree, options) {
         },
     ], options.project);
     if (migratedProjects.size === 0) {
-        throw new executor_to_plugin_migrator_1.NoTargetsToMigrateError();
+        throw new internal_1.NoTargetsToMigrateError();
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
@@ -54,7 +55,7 @@ function postTargetTransformer(target, tree, projectDetails, inferredTargetConfi
         }
     }
     if (target.outputs) {
-        (0, plugin_migration_utils_1.processTargetOutputs)(target, [], inferredTargetConfiguration, {
+        (0, internal_1.processTargetOutputs)(target, [], inferredTargetConfiguration, {
             projectName: projectDetails.projectName,
             projectRoot: projectDetails.root,
         });
@@ -65,7 +66,7 @@ function handlePropertiesInOptions(tree, options, projectRoot, target) {
     let configFilePath;
     if ('cypressConfig' in options) {
         configFilePath = options.cypressConfig;
-        options['config-file'] = (0, plugin_migration_utils_1.toProjectRelativePath)(configFilePath, projectRoot);
+        options['config-file'] = (0, internal_1.toProjectRelativePath)(configFilePath, projectRoot);
         delete options.cypressConfig;
     }
     if ('copyFiles' in options) {

package/{src → dist/src}/generators/convert-to-inferred/lib/add-dev-server-target-to-config.d.ts

@@ -10,4 +10,3 @@ import type { Tree } from '@nx/devkit';
  *  b. Replace the existing webServerCommands with the value passed in
  */
 export declare function addDevServerTargetToConfig(tree: Tree, configFilePath: string, webServerCommands: Record<string, string>, ciDevServerTarget?: string): void;
-//# sourceMappingURL=add-dev-server-target-to-config.d.ts.map

package/{src → dist/src}/generators/convert-to-inferred/lib/add-exclude-spec-pattern.d.ts

@@ -1,3 +1,2 @@
 import type { Tree } from '@nx/devkit';
 export declare function addExcludeSpecPattern(tree: Tree, configFilePath: string, excludeSpecPattern: string | string[]): void;
-//# sourceMappingURL=add-exclude-spec-pattern.d.ts.map

package/{src → dist/src}/generators/convert-to-inferred/lib/target-options-map.d.ts

@@ -16,4 +16,3 @@ export declare const targetOptionsToCliMap: {
     quiet: string;
     runnerUi: string;
 };
-//# sourceMappingURL=target-options-map.d.ts.map

package/{src → dist/src}/generators/convert-to-inferred/lib/upsert-baseUrl.d.ts

@@ -1,3 +1,2 @@
 import type { Tree } from '@nx/devkit';
 export declare function upsertBaseUrl(tree: Tree, configFilePath: string, baseUrlValueInProject: string): void;
-//# sourceMappingURL=upsert-baseUrl.d.ts.map

package/{src → dist/src}/generators/init/init.d.ts

@@ -4,4 +4,3 @@ export declare function addPlugin(tree: Tree, graph: ProjectGraph, updatePackage
 export declare function cypressInitGenerator(tree: Tree, options: Schema): Promise<GeneratorCallback>;
 export declare function cypressInitGeneratorInternal(tree: Tree, options: Schema): Promise<GeneratorCallback>;
 export default cypressInitGenerator;
-//# sourceMappingURL=init.d.ts.map

package/{src → dist/src}/generators/init/init.js

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addPlugin = addPlugin;
 exports.cypressInitGenerator = cypressInitGenerator;
 exports.cypressInitGeneratorInternal = cypressInitGeneratorInternal;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const plugin_1 = require("../../plugins/plugin");
+const assert_supported_cypress_version_1 = require("../../utils/assert-supported-cypress-version");
 const versions_1 = require("../../utils/versions");
 function setupE2ETargetDefaults(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
@@ -13,15 +14,26 @@ function setupE2ETargetDefaults(tree) {
         return;
     }
     // E2e targets depend on all their project's sources + production sources of dependencies
-    nxJson.targetDefaults ??= {};
     const productionFileSet = !!nxJson.namedInputs?.production;
-    nxJson.targetDefaults.e2e ??= {};
-    nxJson.targetDefaults.e2e.cache ??= true;
-    nxJson.targetDefaults.e2e.inputs ??= [
-        'default',
-        productionFileSet ? '^production' : '^default',
-    ];
-    (0, devkit_1.updateNxJson)(tree, nxJson);
+    const existing = findExistingE2eDefault(nxJson.targetDefaults);
+    const patch = {};
+    if (existing?.cache === undefined)
+        patch.cache = true;
+    if (existing?.inputs === undefined) {
+        patch.inputs = ['default', productionFileSet ? '^production' : '^default'];
+    }
+    if (Object.keys(patch).length > 0) {
+        (0, internal_1.upsertTargetDefault)(tree, nxJson, { target: 'e2e', ...patch });
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
+}
+function findExistingE2eDefault(td) {
+    if (!td)
+        return undefined;
+    if (Array.isArray(td)) {
+        return td.find((e) => e.target === 'e2e' && e.projects === undefined && e.plugin === undefined);
+    }
+    return td['e2e'];
 }
 function updateDependencies(tree, options) {
     const tasks = [];
@@ -32,11 +44,11 @@ function updateDependencies(tree, options) {
     if (!(0, versions_1.getInstalledCypressVersion)(tree)) {
         devDependencies.cypress = versions_1.cypressVersion;
     }
-    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, options.keepExistingVersions));
+    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, options.keepExistingVersions ?? true));
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 function addPlugin(tree, graph, updatePackageScripts) {
-    return (0, add_plugin_1.addPlugin)(tree, graph, '@nx/cypress/plugin', plugin_1.createNodesV2, {
+    return (0, internal_1.addPlugin)(tree, graph, '@nx/cypress/plugin', plugin_1.createNodesV2, {
         targetName: ['e2e', 'cypress:e2e', 'cypress-e2e'],
         openTargetName: ['open-cypress', 'cypress-open'],
         componentTestingTargetName: [
@@ -64,6 +76,7 @@ async function cypressInitGenerator(tree, options) {
     return cypressInitGeneratorInternal(tree, { addPlugin: false, ...options });
 }
 async function cypressInitGeneratorInternal(tree, options) {
+    (0, assert_supported_cypress_version_1.assertSupportedCypressVersion)(tree);
     updateProductionFileset(tree);
     const nxJson = (0, devkit_1.readNxJson)(tree);
     options.addPlugin ??=

package/{src → dist/src}/generators/init/schema.json

@@ -22,7 +22,7 @@
       "type": "boolean",
       "x-priority": "internal",
       "description": "Keep existing dependencies versions",
-      "default": false
+      "default": true
     },
     "updatePackageScripts": {
       "type": "boolean",

package/{src → dist/src}/generators/migrate-to-cypress-11/conversion.util.d.ts

@@ -37,4 +37,3 @@ export declare function updatePluginFile(tree: Tree, projectConfig: ProjectConfi
     };
     cypressConfigJson: Record<string, any>;
 };
-//# sourceMappingURL=conversion.util.d.ts.map

package/{src → dist/src}/generators/migrate-to-cypress-11/conversion.util.js

@@ -9,8 +9,7 @@ exports.writeNewConfig = writeNewConfig;
 exports.addConfigToTsConfig = addConfigToTsConfig;
 exports.updatePluginFile = updatePluginFile;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 let tsModule;
 let tsquery;
@@ -51,7 +50,7 @@ function createNewCypressConfig(tree, projectConfig, cypressConfigPathJson) {
     const { modifyObstructiveCode = null, // no longer needed in configs
     integrationFolder = 'src/e2e', // provide the new defaults if the value isn't present
     supportFile = 'src/support/e2e.ts', ...restOfConfig } = cypressConfigJson;
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(projectConfig, tree);
     const newIntegrationFolder = tree.exists((0, devkit_1.joinPathFragments)(sourceRoot, 'integration'))
         ? 'src/e2e'
         : integrationFolder;
@@ -99,7 +98,7 @@ function createSupportFileImport(oldSupportFilePath, newSupportFilePath, project
 }
 function updateProjectPaths(tree, projectConfig, { cypressConfigTs, cypressConfigJson, }) {
     const { integrationFolder, supportFile } = cypressConfigTs['e2e'];
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(projectConfig, tree);
     const oldIntegrationFolder = (0, devkit_1.joinPathFragments)(projectConfig.root, cypressConfigJson.integrationFolder);
     const newIntegrationFolder = (0, devkit_1.joinPathFragments)(projectConfig.root, integrationFolder);
     let newSupportFile;
@@ -165,10 +164,10 @@ function updateProjectPaths(tree, projectConfig, { cypressConfigTs, cypressConfi
 }
 function updateImports(tree, filePath, oldImportPath, newImportPath) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     if (!tsquery) {
-        (0, ensure_typescript_1.ensureTypescript)();
+        (0, internal_1.ensureTypescript)();
         tsquery = require('@phenomnomnominal/tsquery').tsquery;
     }
     const { isCallExpression, isExportDeclaration, isImportDeclaration } = tsModule;

package/{src → dist/src}/generators/migrate-to-cypress-11/migrate-to-cypress-11.d.ts

@@ -1,4 +1,3 @@
 import { Tree } from '@nx/devkit';
 export declare function migrateCypressProject(tree: Tree): Promise<() => void>;
 export default migrateCypressProject;
-//# sourceMappingURL=migrate-to-cypress-11.d.ts.map

package/{src → dist/src}/generators/migrate-to-cypress-11/migrate-to-cypress-11.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrateCypressProject = migrateCypressProject;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const versions_1 = require("../../utils/versions");
 const conversion_util_1 = require("./conversion.util");
 function migrateCypressExecutorOptions(tree, projectName, target, configuration, previousCypressConfigs) {
@@ -66,10 +66,10 @@ async function migrateCypressProject(tree) {
     // if we don't have the already migrated configs
     // it prevents us from being able to rename files for those projects
     const previousCypressConfigs = new Map();
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/cypress:cypress', (currentValue, projectName, target, configuration) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/cypress:cypress', (currentValue, projectName, target, configuration) => {
         migrateCypressExecutorOptions(tree, projectName, target, configuration, previousCypressConfigs);
     });
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/cypress:cypress', (currentValue, projectName, target, configuration) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nrwl/cypress:cypress', (currentValue, projectName, target, configuration) => {
         migrateCypressExecutorOptions(tree, projectName, target, configuration, previousCypressConfigs);
     });
     (0, devkit_1.updateJson)(tree, 'package.json', (json) => {

package/{src/migrations/update-20-8-0/set-inject-document-domain.d.ts → dist/src/migrations/update-21-0-0/remove-tsconfig-and-copy-files-options-from-cypress-executor.d.ts}

@@ -1,3 +1,2 @@
 import { type Tree } from '@nx/devkit';
 export default function (tree: Tree): Promise<void>;
-//# sourceMappingURL=set-inject-document-domain.d.ts.map