@nx/cypress 24.0.0-beta.2 → 24.0.0-beta.4

package/dist/internal.d.ts

@@ -2,4 +2,4 @@ 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';
+export type { CypressExecutorOptions } from './src/executors/cypress/schema';

package/dist/plugins/cypress-preset.js

@@ -130,6 +130,19 @@ function nxE2EPreset(pathToConfig, options) {
             if (options?.bundler === 'vite') {
                 on('file:preprocessor', (0, preprocessor_vite_1.default)(options?.viteConfigOverrides));
             }
+            // Set by Nx when the web server task already reported it is ready
+            const readyUrl = process.env.NX_READY_URL;
+            if (readyUrl && isBaseUrlOverridden(config, options)) {
+                console.log(`Testing against ${config.baseUrl} from --config or CYPRESS_BASE_URL, not the server Nx started on ${readyUrl}`);
+                await waitForServer(config.baseUrl, options?.webServerConfig, (ms) => `${config.baseUrl} did not respond within ${ms}ms. This can be configured in cypress.config.ts.`);
+                return;
+            }
+            if (readyUrl) {
+                config.baseUrl = (0, devkit_1.getReadyUrl)(config.baseUrl);
+                console.log(`Testing against the server Nx started on ${config.baseUrl}`);
+                // Cypress only applies config changes returned from setupNodeEvents.
+                return config;
+            }
             if (!options?.webServerCommands) {
                 return;
             }
@@ -158,23 +171,54 @@ function nxE2EPreset(pathToConfig, options) {
     };
     return baseConfig;
 }
-function waitForServer(url, webServerConfig) {
+// Cypress keeps the config file's values in rawJson, without --config, and
+// reports CYPRESS_BASE_URL as from 'env'. A config file that reads
+// CYPRESS_BASE_URL has it in rawJson too. Inferred CI targets pass ciBaseUrl.
+function isBaseUrlOverridden(config, options) {
+    if (!config.baseUrl) {
+        return false;
+    }
+    if (config.resolved?.baseUrl?.from === 'env') {
+        return true;
+    }
+    const isInferredCiTarget = !!options?.ciWebServerCommand &&
+        config.env?.webServerCommand === options.ciWebServerCommand;
+    return (!isSameUrl(config.baseUrl, config.rawJson?.e2e?.baseUrl) &&
+        !(isInferredCiTarget && isSameUrl(config.baseUrl, options.ciBaseUrl)));
+}
+function isSameUrl(url, other) {
+    if (typeof other !== 'string') {
+        return false;
+    }
+    try {
+        return new URL(url).href === new URL(other).href;
+    }
+    catch {
+        return url === other;
+    }
+}
+function waitForServer(url, webServerConfig, timeoutMessage = (ms) => `Web server failed to start in ${ms}ms. This can be configured in cypress.config.ts.`) {
     return new Promise((resolve, reject) => {
         let pollTimeout;
         const { protocol } = new URL(url);
+        let settled = false;
         const timeoutDuration = webServerConfig?.timeout ?? 60 * 1000;
         const timeout = setTimeout(() => {
+            settled = true;
             clearTimeout(pollTimeout);
-            reject(new Error(`Web server failed to start in ${timeoutDuration}ms. This can be configured in cypress.config.ts.`));
+            reject(new Error(timeoutMessage(timeoutDuration)));
         }, timeoutDuration);
         const makeRequest = protocol === 'https:' ? https_1.request : http_1.request;
         function pollForServer() {
             const request = makeRequest(url, () => {
+                settled = true;
                 clearTimeout(timeout);
                 resolve();
             });
             request.on('error', () => {
-                pollTimeout = setTimeout(pollForServer, 100);
+                if (!settled) {
+                    pollTimeout = setTimeout(pollForServer, 100);
+                }
             });
             // Don't forget to end the request
             request.end();

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

@@ -1,4 +1,3 @@
-import { ExecutorContext } from '@nx/devkit';
 export type Json = {
     [k: string]: any;
 };
@@ -7,10 +6,6 @@ export interface CypressExecutorOptions extends Json {
     watch?: boolean;
     devServerTarget?: string;
     headed?: boolean;
-    /**
-     * @deprecated Cypress runs headless by default. Use the --watch flag to
-     * control head/headless behavior instead. It will be removed in Nx v23.
-     **/
     headless?: boolean;
     exit?: boolean;
     key?: string;
@@ -33,6 +28,3 @@ export interface CypressExecutorOptions extends Json {
     runnerUi?: boolean;
     autoCancelAfterFailures?: boolean | number;
 }
-export default function cypressExecutor(options: CypressExecutorOptions, context: ExecutorContext): Promise<{
-    success: any;
-}>;

package/dist/src/executors/cypress/schema.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -8,21 +8,17 @@ const devkit_1 = require("@nx/devkit");
 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"));
+const init_1 = tslib_1.__importStar(require("../init/init"));
 function componentConfigurationGenerator(tree, options) {
-    return componentConfigurationGeneratorInternal(tree, {
-        addPlugin: false,
-        ...options,
-    });
+    return componentConfigurationGeneratorInternal(tree, options);
 }
 async function componentConfigurationGeneratorInternal(tree, options) {
     (0, assert_supported_cypress_version_1.assertSupportedCypressVersion)(tree);
     (0, internal_2.assertNotUsingTsSolutionSetup)(tree, 'cypress', 'component-configuration');
     const tasks = [];
-    const opts = normalizeOptions(tree, options);
+    const opts = normalizeOptions(options);
     if (opts.bundler === 'vite') {
         (0, versions_1.assertViteSupportsInstalledCypress)(tree);
     }
@@ -38,29 +34,18 @@ async function componentConfigurationGeneratorInternal(tree, options) {
             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');
+    await (0, init_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), false);
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, opts.project);
     addProjectFiles(tree, projectConfig, opts);
-    if (!hasPlugin || opts.addExplicitTargets) {
-        (0, deprecation_1.warnCypressExecutorGenerating)();
-        addTargetToProject(tree, projectConfig, opts);
-    }
-    updateNxJsonConfiguration(tree, hasPlugin);
+    updateNxJsonConfiguration(tree);
     updateTsConfigForComponentTesting(tree, projectConfig);
     if (!opts.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-function normalizeOptions(tree, options) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
-        nxJson.useInferencePlugins !== false;
+function normalizeOptions(options) {
     return {
-        addPlugin,
         ...options,
         framework: options.framework ?? null,
         directory: options.directory ?? 'cypress',
@@ -107,17 +92,7 @@ function addProjectFiles(tree, projectConfig, opts) {
         ext: '',
     });
 }
-function addTargetToProject(tree, projectConfig, opts) {
-    projectConfig.targets['component-test'] = {
-        executor: '@nx/cypress:cypress',
-        options: {
-            cypressConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts'),
-            testingType: 'component',
-        },
-    };
-    (0, devkit_1.updateProjectConfiguration)(tree, opts.project, projectConfig);
-}
-function updateNxJsonConfiguration(tree, hasPlugin) {
+function updateNxJsonConfiguration(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const productionFileSet = nxJson.namedInputs?.production;
     if (productionFileSet) {
@@ -128,31 +103,6 @@ function updateNxJsonConfiguration(tree, hasPlugin) {
             '!{projectRoot}/cypress.config.[jt]s',
         ]));
     }
-    if (!hasPlugin) {
-        const cacheableOperations = nxJson.tasksRunnerOptions?.default?.options?.cacheableOperations;
-        if (cacheableOperations &&
-            !cacheableOperations.includes('component-test')) {
-            cacheableOperations.push('component-test');
-        }
-        // 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);
 }
 function updateTsConfigForComponentTesting(tree, projectConfig) {

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

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

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

@@ -21,7 +21,6 @@ export interface CypressE2EConfigSchema {
     webServerCommands?: Record<string, string>;
     ciWebServerCommand?: string;
     ciBaseUrl?: string;
-    addPlugin?: boolean;
 }
 export declare function configurationGenerator(tree: Tree, options: CypressE2EConfigSchema): Promise<GeneratorCallback>;
 export declare function configurationGeneratorInternal(tree: Tree, options: CypressE2EConfigSchema): Promise<GeneratorCallback>;

package/dist/src/generators/configuration/configuration.js

@@ -11,15 +11,11 @@ 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"));
 function configurationGenerator(tree, options) {
-    return configurationGeneratorInternal(tree, {
-        addPlugin: false,
-        ...options,
-    });
+    return configurationGeneratorInternal(tree, options);
 }
 async function configurationGeneratorInternal(tree, options) {
     (0, assert_supported_cypress_version_1.assertSupportedCypressVersion)(tree);
@@ -33,18 +29,10 @@ async function configurationGeneratorInternal(tree, options) {
             skipFormat: true,
         }));
     }
-    else if (opts.addPlugin) {
+    else {
         await (0, init_1.addPlugin)(tree, projectGraph, false);
     }
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
-        ? p === '@nx/cypress/plugin'
-        : p.plugin === '@nx/cypress/plugin');
-    await addFiles(tree, opts, projectGraph, hasPlugin);
-    if (!hasPlugin) {
-        (0, deprecation_1.warnCypressExecutorGenerating)();
-        addTarget(tree, opts, projectGraph);
-    }
+    await addFiles(tree, opts, projectGraph);
     const projectTsConfigPath = (0, devkit_1.joinPathFragments)(opts.projectRoot, 'tsconfig.json');
     if (tree.exists(projectTsConfigPath)) {
         (0, devkit_1.updateJson)(tree, projectTsConfigPath, (json) => {
@@ -130,10 +118,6 @@ In this case you need to provide a devServerTarget,'<projectName>:<targetName>[:
     if (!options.baseUrl && !devServerTarget) {
         throw new Error('Either baseUrl or devServerTarget must be provided');
     }
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    options.addPlugin ??=
-        process.env.NX_ADD_PLUGINS !== 'false' &&
-            nxJson.useInferencePlugins !== false;
     return {
         ...options,
         bundler: options.bundler ?? 'webpack',
@@ -166,7 +150,7 @@ async function promptForMissingServeData(projectName) {
         baseUrl: `http://localhost:${port}`,
     };
 }
-async function addFiles(tree, options, projectGraph, hasPlugin) {
+async function addFiles(tree, options, projectGraph) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const hasTsConfig = tree.exists((0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json'));
     const offsetFromProjectRoot = options.directory
@@ -194,12 +178,12 @@ async function addFiles(tree, options, projectGraph, hasPlugin) {
     let webServerCommands;
     let ciWebServerCommand;
     let ciBaseUrl;
-    if (hasPlugin && options.webServerCommands && options.ciWebServerCommand) {
+    if (options.webServerCommands && options.ciWebServerCommand) {
         webServerCommands = options.webServerCommands;
         ciWebServerCommand = options.ciWebServerCommand;
         ciBaseUrl = options.ciBaseUrl;
     }
-    else if (hasPlugin && options.devServerTarget) {
+    else if (options.devServerTarget) {
         webServerCommands = {};
         webServerCommands.default = 'nx run ' + options.devServerTarget;
         const parsedTarget = (0, devkit_1.parseTargetString)(options.devServerTarget, projectGraph);
@@ -214,6 +198,13 @@ async function addFiles(tree, options, projectGraph, hasPlugin) {
             ciWebServerCommand = `nx run ${parsedTarget.project}:serve-static`;
         }
     }
+    if (typeof options.port === 'number') {
+        for (const name of Object.keys(webServerCommands ?? {})) {
+            webServerCommands[name] += ` --port=${options.port}`;
+        }
+        if (ciWebServerCommand)
+            ciWebServerCommand += ` --port=${options.port}`;
+    }
     const e2ePresetOptions = {
         cypressDir: options.directory,
         bundler: options.bundler === 'vite' ? 'vite' : undefined,
@@ -242,48 +233,6 @@ async function addFiles(tree, options, projectGraph, hasPlugin) {
         (0, devkit_1.toJS)(tree);
     }
 }
-function addTarget(tree, opts, projectGraph) {
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, opts.project);
-    projectConfig.targets ??= {};
-    projectConfig.targets.e2e = {
-        executor: '@nx/cypress:cypress',
-        options: {
-            cypressConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, `cypress.config.${opts.js ? 'js' : 'ts'}`),
-            testingType: 'e2e',
-        },
-    };
-    if (opts.devServerTarget) {
-        const parsedTarget = (0, devkit_1.parseTargetString)(opts.devServerTarget, projectGraph);
-        projectConfig.targets.e2e.options = {
-            ...projectConfig.targets.e2e.options,
-            devServerTarget: opts.devServerTarget,
-            port: opts.port,
-        };
-        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']) {
-            projectConfig.targets.e2e.configurations ??= {};
-            projectConfig.targets.e2e.configurations['production'] = {
-                devServerTarget: `${parsedTarget.project}:${parsedTarget.target}:production`,
-            };
-        }
-        // Add ci/static e2e target if serve target is found
-        if (devServerProjectConfig.targets?.['serve-static']) {
-            projectConfig.targets.e2e.configurations ??= {};
-            projectConfig.targets.e2e.configurations.ci = {
-                devServerTarget: `${parsedTarget.project}:serve-static`,
-            };
-        }
-    }
-    else if (opts.baseUrl) {
-        projectConfig.targets.e2e.options = {
-            ...projectConfig.targets.e2e.options,
-            baseUrl: opts.baseUrl,
-        };
-    }
-    (0, devkit_1.updateProjectConfiguration)(tree, opts.project, projectConfig);
-}
 function createPackageJson(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const packageJsonPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'package.json');

package/dist/src/generators/init/init.js

@@ -8,40 +8,6 @@ const devkit_1 = require("@nx/devkit");
 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);
-    if (!nxJson.namedInputs) {
-        return;
-    }
-    // E2e targets depend on all their project's sources + production sources of dependencies
-    const productionFileSet = !!nxJson.namedInputs?.production;
-    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;
-    const value = td['e2e'];
-    if (value === undefined)
-        return undefined;
-    if (Array.isArray(value)) {
-        const found = value.find((e) => e.filter === undefined);
-        if (!found)
-            return undefined;
-        const { filter: _f, ...rest } = found;
-        return rest;
-    }
-    return value;
-}
 function updateDependencies(tree, options) {
     const tasks = [];
     tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/cypress'], []));
@@ -86,21 +52,12 @@ function updateProductionFileset(tree) {
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 async function cypressInitGenerator(tree, options) {
-    return cypressInitGeneratorInternal(tree, { addPlugin: false, ...options });
+    return cypressInitGeneratorInternal(tree, 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 ??=
-        process.env.NX_ADD_PLUGINS !== 'false' &&
-            nxJson.useInferencePlugins !== false;
-    if (options.addPlugin) {
-        await addPlugin(tree, await (0, devkit_1.createProjectGraphAsync)(), options.updatePackageScripts);
-    }
-    else {
-        setupE2ETargetDefaults(tree);
-    }
+    await addPlugin(tree, await (0, devkit_1.createProjectGraphAsync)(), options.updatePackageScripts);
     let installTask = () => { };
     if (!options.skipPackageJson) {
         installTask = updateDependencies(tree, options);

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

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

package/dist/src/migrations/update-23-3-0/adapt-query-command-overwrites.md

@@ -8,7 +8,7 @@ Cypress 16 turned `cy.getCookie()`, `cy.getCookies()`, `cy.getAllCookies()`, `cy
 
 Confirm both conditions before changing anything. If either fails, make no changes and stop.
 
-1. `<files_changed>` or `<advisory_context>` lists at least one file with a renamed `Cypress.Commands.overwriteQuery()` call. Search the workspace for `Cypress.Commands.overwriteQuery(` if the wrapper sections are absent.
+1. `impl.changes` or `impl.agentContext` in the step's `nx_migrate_prompt` block lists at least one file with a renamed `Cypress.Commands.overwriteQuery()` call. Search the workspace for `Cypress.Commands.overwriteQuery(` if those fields are absent.
 2. The workspace is on Cypress 16 or later (`cypress` in `package.json`).
 
 ## Step 1: Verify the pre-pass

package/dist/src/migrations/update-23-3-0/ai-instructions-for-cypress-16.md

@@ -9,7 +9,7 @@ Migrate the workspace's Cypress projects from Cypress 15 to 16. Cypress 16 remov
 1. Confirm `cypress` in `package.json` resolves to 16 or later. If it does not, make no changes and stop.
 2. Confirm Node is 22, 24, or 26+ (`node -v`). Cypress 16 declares `engines` `^22.0.0 || ^24.0.0 || >=26.0.0` and refuses to install on Node 20 or 25.
 3. List the Cypress projects: every project with a `cypress.config.{ts,js,mjs,cjs}` file. Search their spec and support files for the strings in the steps below.
-4. Review `<advisory_context>` from the deterministic migrations: each entry (a non-literal `experimentalFastVisibility`, a removed `execTimeout`, a removed `experimentalSourceRewriting: true`, an unresolved spread, a renamed `overwriteQuery` callback) is pending work for the matching step.
+4. When the step's `nx_migrate_prompt` block has `impl.agentContext`, review the deterministic migrations' entries in it: each entry (a non-literal `experimentalFastVisibility`, a removed `execTimeout`, a removed `experimentalSourceRewriting: true`, an unresolved spread, a renamed `overwriteQuery` callback) is pending work for the matching step.
 
 ## Step 1: Replace `Cypress.env()`
 
@@ -139,7 +139,7 @@ it('renders on mobile', { viewportWidth: 375 }, () => {
 
 `cy.getCookie()`, `cy.getCookies()`, `cy.getAllCookies()`, `cy.getAllLocalStorage()` and `cy.getAllSessionStorage()` are queries: they retry assertions chained with `.should()` and follow `defaultCommandTimeout` (4000ms) instead of `responseTimeout` (30000ms). A `.then()` callback still runs once and does not retry. Change nothing unless a test fails; then move the assertion from `.then()` onto `.should()` so it retries, or pass `{ timeout }` when a cookie read needs longer than 4 seconds.
 
-The deterministic migration renamed `Cypress.Commands.overwrite()` to `overwriteQuery()` for those five names; `<advisory_context>` lists each renamed call. Do not re-apply the rename. Adapt each renamed callback to the query contract: `overwriteQuery` calls the callback with the command as `this`, the original query function as the first argument, and then the arguments the test passed, and the callback must return a function that takes the subject. Cypress calls that returned function, possibly many times while retrying, to compute the result. It must not return a chainable, call `cy.*` commands or use `.then()`. The original query reads `this` as well, so every callback must be a `function` expression that calls `originalFn.call(this, ...)`. An arrow callback, or a plain `originalFn(...)` call, fails to typecheck (TS2684, `QueryFnWithOriginalFn` declares `this: Command`) and throws at runtime. Convert arrow callbacks even when they only forward their arguments:
+The deterministic migration renamed `Cypress.Commands.overwrite()` to `overwriteQuery()` for those five names; `impl.agentContext` lists each renamed call when present, and otherwise search the workspace for `Cypress.Commands.overwriteQuery(`. Do not re-apply the rename. Adapt each renamed callback to the query contract: `overwriteQuery` calls the callback with the command as `this`, the original query function as the first argument, and then the arguments the test passed, and the callback must return a function that takes the subject. Cypress calls that returned function, possibly many times while retrying, to compute the result. It must not return a chainable, call `cy.*` commands or use `.then()`. The original query reads `this` as well, so every callback must be a `function` expression that calls `originalFn.call(this, ...)`. An arrow callback, or a plain `originalFn(...)` call, fails to typecheck (TS2684, `QueryFnWithOriginalFn` declares `this: Command`) and throws at runtime. Convert arrow callbacks even when they only forward their arguments:
 
 **Before:**
 

package/dist/src/migrations/update-23-3-0/upgrade-to-cypress-16.js

@@ -29,8 +29,9 @@ const NX_WEBPACK_CT_PRESETS = [
     '@nx/react/plugins/component-testing',
 ];
 // Re-collects the Cypress 16 migrations: below their version, above every
-// 23.2.x. `--from` is exclusive.
-const REPLAN_COMMAND = `npx nx migrate @nx/cypress@${versions_1.nxVersion} --from=@nx/cypress@23.3.0-beta.0`;
+// 23.2.x. `--from` is exclusive. `--include=all` overrides nx.json and the
+// prompt: `required` skips the upgrade and `optional` rejects `--from`.
+const REPLAN_COMMAND = `npx nx migrate @nx/cypress@${versions_1.nxVersion} --from=@nx/cypress@23.3.0-beta.0 --include=all`;
 const RERUN_COMMAND = `${REPLAN_COMMAND} && npx nx migrate --run-migration=@nx/cypress:upgrade-to-cypress-16`;
 let ts;
 async function upgradeToCypress16(tree) {

package/dist/src/migrations/update-24-0-0/disable-wait-for-server-ready.d.ts

@@ -0,0 +1,4 @@
+import { type Tree } from '@nx/devkit';
+export default function update(tree: Tree): Promise<{
+    skipAgentic: boolean;
+}>;

package/dist/src/migrations/update-24-0-0/disable-wait-for-server-ready.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const devkit_1 = require("@nx/devkit");
+const pluginName = '@nx/cypress/plugin';
+async function update(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson?.plugins) {
+        return { skipAgentic: true };
+    }
+    let changed = false;
+    nxJson.plugins = nxJson.plugins.map((plugin) => {
+        if (typeof plugin === 'string') {
+            if (plugin !== pluginName) {
+                return plugin;
+            }
+            changed = true;
+            return { plugin, options: { waitForServerReady: false } };
+        }
+        if (plugin.plugin !== pluginName) {
+            return plugin;
+        }
+        const options = (plugin.options ?? {});
+        if (options.waitForServerReady !== undefined) {
+            return plugin;
+        }
+        changed = true;
+        return { ...plugin, options: { ...options, waitForServerReady: false } };
+    });
+    if (!changed) {
+        return { skipAgentic: true };
+    }
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+    await (0, devkit_1.formatFiles)(tree);
+}

package/dist/src/migrations/update-24-0-0/disable-wait-for-server-ready.md

@@ -0,0 +1,33 @@
+#### Keep the Cypress e2e tasks from waiting for the dev server to be ready
+
+The `@nx/cypress/plugin` option `waitForServerReady` now defaults to `true`.
+With it on, the inferred e2e tasks wait for the dev server task's `readyWhen` check, and `nxE2EPreset` tests against the address the server reported instead of `baseUrl`.
+
+This migration sets `waitForServerReady` to `false` on every `@nx/cypress/plugin` entry in `nx.json`, so existing workspaces keep the old behavior.
+It expands a string entry into an object entry, keeps `include`, `exclude`, and other options, and leaves an entry alone when it already sets `waitForServerReady`.
+To opt in later, set the option to `true`.
+
+#### Sample code changes
+
+##### Before
+
+```json title="nx.json"
+{
+  "plugins": ["@nx/cypress/plugin"]
+}
+```
+
+##### After
+
+```json title="nx.json"
+{
+  "plugins": [
+    {
+      "plugin": "@nx/cypress/plugin",
+      "options": {
+        "waitForServerReady": false
+      }
+    }
+  ]
+}
+```

package/dist/src/migrations/update-24-0-0/finish-inferred-conversion.md

@@ -0,0 +1,12 @@
+# Replace removed @nx/cypress executors with inferred tasks
+
+Nx 24 removed `@nx/cypress:cypress` (including old `@nrwl` aliases).
+
+Before changing anything, check for leftover work: a project target, a package.json target or a `targetDefaults` entry still uses a removed executor, or the advisory context reports a conversion error. If none applies, make no changes and stop. Treat each advisory-context item as pending work.
+
+1. Inspect all affected projects and workspace defaults. Repair config-loading errors first. Do not restore executor registrations or install older Nx packages.
+2. Preserve Cypress config, browser choice, testing type, CI options and dev-server orchestration. Ensure webServerCommands/target dependencies start the intended app.
+3. Register `@nx/cypress/plugin` with options/includes that preserve custom target names and mixed inferred/explicit projects. Replace remaining removed-executor targets, including those in package.json and filtered targetDefaults. Transfer their behavior before removing obsolete defaults. Preserve configurations, dependencies, cache inputs/outputs and environment behavior. Do not silently delete unsupported options or unrelated targets. Migrate old @nrwl aliases too.
+4. Run project graph creation with the daemon and graph cache disabled (`NX_DAEMON=false NX_CACHE_PROJECT_GRAPH=false`), using the workspace package manager. Inspect resolved project targets and verify each migrated entrypoint exists and is inferred (a thin alias to an inferred target is acceptable). Resolve graph errors before completing this migration, even if task validation was skipped. Configs must load for subsequent migrations.
+5. By default run relevant real builds/tests with task cache disabled, including alternate configurations. Honor an existing preference to skip expensive task validation; otherwise offer that option when validation is slow. Skipping expensive tasks never skips conversion or the graph check. Report each skipped task as unverified. Never weaken assertions or change application behavior to make checks pass.
+6. Report converted projects, graph validation, task results and any skipped checks. Unconverted targets or a broken graph mean the migration is incomplete. Investigate task failures and distinguish missing environment prerequisites from conversion regressions; do not claim a working workspace with unresolved regressions.

package/dist/src/migrations/update-24-0-0/remove-deprecated-executors.d.ts

@@ -0,0 +1,6 @@
+import type { Tree } from '@nx/devkit';
+export default function update(tree: Tree): Promise<{
+    nextSteps?: string[];
+    agentContext?: string[];
+    skipAgentic?: boolean;
+}>;

package/dist/src/migrations/update-24-0-0/remove-deprecated-executors.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const internal_1 = require("@nx/devkit/internal");
+function update(tree) {
+    return (0, internal_1.migrateRemovedExecutors)(tree, ['@nx/cypress:cypress', '@nrwl/cypress:cypress'], async (tree, options) => {
+        const { convertToInferred } = require('../../generators/convert-to-inferred/convert-to-inferred');
+        return convertToInferred(tree, options);
+    });
+}