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

package/dist/src/utils/migrations.js

@@ -4,6 +4,8 @@ exports.cypressProjectConfigs = cypressProjectConfigs;
 exports.getObjectProperty = getObjectProperty;
 exports.removeObjectProperty = removeObjectProperty;
 exports.updateObjectProperty = updateObjectProperty;
+exports.parseSourceFile = parseSourceFile;
+exports.hasLocalValueBinding = hasLocalValueBinding;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
@@ -12,17 +14,19 @@ let ts;
 async function* cypressProjectConfigs(tree) {
     const projects = (0, devkit_1.getProjects)(tree);
     for (const [projectName, projectConfig] of projects) {
-        const targetWithExecutor = Object.values(projectConfig.targets ?? {}).find((target) => target.executor === '@nx/cypress:cypress');
-        if (targetWithExecutor) {
-            for (const [, options] of allTargetOptions(targetWithExecutor)) {
-                if (options.cypressConfig) {
-                    yield {
-                        projectName,
-                        projectConfig,
-                        cypressConfigPath: options.cypressConfig,
-                    };
+        const targetsWithExecutor = Object.values(projectConfig.targets ?? {}).filter((target) => target.executor === '@nx/cypress:cypress');
+        if (targetsWithExecutor.length > 0) {
+            const cypressConfigPaths = new Set();
+            for (const target of targetsWithExecutor) {
+                for (const [, options] of allTargetOptions(target)) {
+                    if (options.cypressConfig) {
+                        cypressConfigPaths.add(options.cypressConfig);
+                    }
                 }
             }
+            for (const cypressConfigPath of cypressConfigPaths) {
+                yield { projectName, projectConfig, cypressConfigPath };
+            }
         }
         else {
             // might be using the crystal plugin
@@ -69,3 +73,100 @@ function* allTargetOptions(target) {
         }
     }
 }
+// The extension picks the script kind, so `<T>x` in a .ts file and JSX in a
+// .tsx file both parse; tsquery's `ast()` parses everything as TSX.
+function parseSourceFile(filePath, content) {
+    ts ??= (0, internal_1.ensureTypescript)();
+    return ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, 
+    /* setParentNodes */ true);
+}
+/**
+ * Whether the file binds `name` as a runtime value anywhere: a variable,
+ * parameter, destructured element, function or class (declaration or named
+ * expression), enum, namespace holding a value, or a value import (`import x`,
+ * `import { x }`, `import * as x`, `import x =`).
+ * Type-only imports and ambient declarations (`declare ...`, including
+ * everything under `declare global`) do not count, so the usual
+ * `declare global { namespace Cypress { ... } }` augmentation never hides the
+ * `Cypress` global.
+ */
+function hasLocalValueBinding(sourceFile, name) {
+    ts ??= (0, internal_1.ensureTypescript)();
+    if (sourceFile.isDeclarationFile) {
+        return false;
+    }
+    const bindsName = (node) => {
+        if (ts.isVariableDeclaration(node) ||
+            ts.isParameter(node) ||
+            ts.isBindingElement(node) ||
+            ts.isFunctionDeclaration(node) ||
+            ts.isFunctionExpression(node) ||
+            ts.isClassDeclaration(node) ||
+            ts.isClassExpression(node) ||
+            ts.isEnumDeclaration(node)) {
+            return (!!node.name && ts.isIdentifier(node.name) && node.name.text === name);
+        }
+        if (ts.isModuleDeclaration(node)) {
+            return (ts.isIdentifier(node.name) &&
+                node.name.text === name &&
+                isInstantiatedNamespace(node));
+        }
+        if (ts.isImportClause(node)) {
+            return !node.isTypeOnly && node.name?.text === name;
+        }
+        if (ts.isImportSpecifier(node)) {
+            return (!node.isTypeOnly &&
+                !node.parent.parent.isTypeOnly &&
+                node.name.text === name);
+        }
+        if (ts.isNamespaceImport(node)) {
+            return !node.parent.isTypeOnly && node.name.text === name;
+        }
+        if (ts.isImportEqualsDeclaration(node)) {
+            return !node.isTypeOnly && node.name.text === name;
+        }
+        return false;
+    };
+    const visit = (node) => {
+        if (ts.canHaveModifiers(node) &&
+            ts
+                .getModifiers(node)
+                ?.some((modifier) => modifier.kind === ts.SyntaxKind.DeclareKeyword)) {
+            return false;
+        }
+        return bindsName(node) || (ts.forEachChild(node, visit) ?? false);
+    };
+    return visit(sourceFile);
+}
+// Mirrors TypeScript's getModuleInstanceState: a namespace emits a value
+// unless every statement is a type declaration, a non-exported import or
+// such a namespace. Anything else, an expression statement included, and
+// `export { x }` lists and const enums, count as a value.
+function isInstantiatedNamespace(node) {
+    const body = node.body;
+    if (!body) {
+        return false;
+    }
+    if (ts.isModuleDeclaration(body)) {
+        return isInstantiatedNamespace(body);
+    }
+    if (!ts.isModuleBlock(body)) {
+        return false;
+    }
+    return body.statements.some((statement) => {
+        if (ts.isInterfaceDeclaration(statement) ||
+            ts.isTypeAliasDeclaration(statement)) {
+            return false;
+        }
+        if (ts.isImportDeclaration(statement) ||
+            ts.isImportEqualsDeclaration(statement)) {
+            return !!ts
+                .getModifiers(statement)
+                ?.some((modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword);
+        }
+        if (ts.isModuleDeclaration(statement)) {
+            return isInstantiatedNamespace(statement);
+        }
+        return true;
+    });
+}

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

@@ -3,13 +3,15 @@ export declare const nxVersion: any;
 export declare const minSupportedCypressVersion = "13.0.0";
 export declare const eslintPluginCypressVersion = "^3.5.0";
 export declare const typesNodeVersion = "^22.0.0";
-export declare const cypressViteDevServerVersion = "^7.3.1";
-export declare const cypressVersion = "^15.20.1";
-export declare const cypressWebpackVersion = "^5.4.1";
-export declare const viteVersion = "^6.0.0";
+export declare const cypressViteDevServerVersion = "^8.0.0";
+export declare const cypressVersion = "^16.0.0";
+export declare const cypressWebpackVersion = "^6.0.0";
+export declare const viteVersion = "^8.0.0";
 export declare const htmlWebpackPluginVersion = "^5.5.0";
-export type CypressVersions = Record<keyof Omit<typeof import('./versions'), 'nxVersion' | 'minSupportedCypressVersion' | 'versions' | 'getInstalledCypressVersion' | 'getInstalledCypressMajorVersion' | 'assertMinimumCypressVersion'>, string>;
+export type CypressVersions = Record<keyof Omit<typeof import('./versions'), 'nxVersion' | 'minSupportedCypressVersion' | 'versions' | 'getInstalledCypressVersion' | 'getInstalledCypressMajorVersion' | 'assertMinimumCypressVersion' | 'assertViteSupportsInstalledCypress' | 'componentTestingVersions'>, string>;
 export declare function versions(tree: Tree): CypressVersions;
+export declare function componentTestingVersions(tree: Tree, bundler: 'vite' | 'webpack' | undefined): CypressVersions;
 export declare function getInstalledCypressVersion(tree?: Tree): string | null;
 export declare function getInstalledCypressMajorVersion(tree?: Tree): number | null;
+export declare function assertViteSupportsInstalledCypress(tree: Tree): void;
 export declare function assertMinimumCypressVersion(minVersion: number, tree?: Tree): void;

package/dist/src/utils/versions.js

@@ -2,9 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.htmlWebpackPluginVersion = exports.viteVersion = exports.cypressWebpackVersion = exports.cypressVersion = exports.cypressViteDevServerVersion = exports.typesNodeVersion = exports.eslintPluginCypressVersion = exports.minSupportedCypressVersion = exports.nxVersion = void 0;
 exports.versions = versions;
+exports.componentTestingVersions = componentTestingVersions;
 exports.getInstalledCypressVersion = getInstalledCypressVersion;
 exports.getInstalledCypressMajorVersion = getInstalledCypressMajorVersion;
+exports.assertViteSupportsInstalledCypress = assertViteSupportsInstalledCypress;
 exports.assertMinimumCypressVersion = assertMinimumCypressVersion;
+const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const path_1 = require("path");
 const semver_1 = require("semver");
@@ -12,10 +15,10 @@ exports.nxVersion = require((0, path_1.join)('@nx/cypress', 'package.json')).ver
 exports.minSupportedCypressVersion = '13.0.0';
 exports.eslintPluginCypressVersion = '^3.5.0';
 exports.typesNodeVersion = '^22.0.0';
-exports.cypressViteDevServerVersion = '^7.3.1';
-exports.cypressVersion = '^15.20.1';
-exports.cypressWebpackVersion = '^5.4.1';
-exports.viteVersion = '^6.0.0';
+exports.cypressViteDevServerVersion = '^8.0.0';
+exports.cypressVersion = '^16.0.0';
+exports.cypressWebpackVersion = '^6.0.0';
+exports.viteVersion = '^8.0.0';
 exports.htmlWebpackPluginVersion = '^5.5.0';
 const latestVersions = {
     eslintPluginCypressVersion: exports.eslintPluginCypressVersion,
@@ -45,7 +48,21 @@ const versionMap = {
         viteVersion: '^6.0.0',
         htmlWebpackPluginVersion: '^5.5.0',
     },
+    15: {
+        eslintPluginCypressVersion: '^3.5.0',
+        typesNodeVersion: '^22.0.0',
+        cypressViteDevServerVersion: '^7.3.1',
+        cypressVersion: '^15.20.1',
+        cypressWebpackVersion: '^5.4.1',
+        viteVersion: '^6.0.0',
+        htmlWebpackPluginVersion: '^5.5.0',
+    },
 };
+// Highest first, so a range reaching several majors resolves to the top one.
+const supportedMajors = [
+    (0, semver_1.major)((0, semver_1.coerce)(exports.cypressVersion)),
+    ...Object.keys(versionMap).map(Number),
+].sort((a, b) => b - a);
 function versions(tree) {
     const installedCypressVersion = getInstalledCypressVersion(tree);
     if (!installedCypressVersion) {
@@ -54,16 +71,52 @@ function versions(tree) {
     const cypressMajorVersion = (0, semver_1.major)(installedCypressVersion);
     return versionMap[cypressMajorVersion] ?? latestVersions;
 }
+// A fresh Vite component testing setup on an older Vite gets the last set
+// that runs on it; Cypress 16 only runs on Vite 8.
+function componentTestingVersions(tree, bundler) {
+    if (bundler === 'vite' &&
+        !getInstalledCypressVersion(tree) &&
+        getViteVersionBelowCypress16Floor(tree)) {
+        return versionMap[15];
+    }
+    return versions(tree);
+}
 function getInstalledCypressVersion(tree) {
     if (!tree) {
         return (0, internal_1.getInstalledPackageVersion)('cypress');
     }
-    return (0, internal_1.getDeclaredPackageVersion)(tree, 'cypress');
+    const resolved = (0, internal_1.getResolvedPackageVersion)(tree, 'cypress');
+    const declared = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'cypress');
+    if (!resolved ||
+        !declared ||
+        !(0, semver_1.validRange)(declared) ||
+        (0, internal_1.getSatisfyingInstalledPackageVersion)(tree, 'cypress', declared)) {
+        return resolved;
+    }
+    // No installed Cypress satisfies the range. A clean install of a satisfiable
+    // range lands on the highest version it admits, so follow the highest
+    // supported major it reaches; the version inside that major is unknown.
+    const floorMajor = (0, semver_1.major)(resolved);
+    const reachedMajor = supportedMajors.find((m) => m > floorMajor && (0, semver_1.intersects)(declared, `${m}.x`));
+    return reachedMajor ? `${reachedMajor}.0.0` : resolved;
 }
 function getInstalledCypressMajorVersion(tree) {
     const installedCypressVersion = getInstalledCypressVersion(tree);
     return installedCypressVersion ? (0, semver_1.major)(installedCypressVersion) : null;
 }
+function assertViteSupportsInstalledCypress(tree) {
+    const cypressMajor = getInstalledCypressMajorVersion(tree);
+    const viteVersion = getViteVersionBelowCypress16Floor(tree);
+    if (cypressMajor >= 16 && viteVersion) {
+        throw new Error(`Cypress ${cypressMajor} component testing requires Vite 8. Found Vite ${viteVersion}. Update Vite to 8 or use Cypress 15.`);
+    }
+}
+// Cypress 16 component testing rejects a Vite below 8. Its dev server
+// package peers `vite ^8.0.0`, which also excludes 8 prereleases.
+function getViteVersionBelowCypress16Floor(tree) {
+    const viteVersion = (0, internal_1.getResolvedPackageVersion)(tree, 'vite');
+    return viteVersion && (0, semver_1.lt)(viteVersion, '8.0.0') ? viteVersion : null;
+}
 function assertMinimumCypressVersion(minVersion, tree) {
     const version = getInstalledCypressMajorVersion(tree);
     if (version && version < minVersion) {

package/migrations.json

@@ -61,6 +61,43 @@
       "description": "Set `justInTimeCompile: false` in webpack component testing Cypress configs on Cypress 14+, where it defaults to true and can intermittently run 0 tests in CI.",
       "implementation": "./dist/src/migrations/update-23-1-0/disable-webpack-ct-just-in-time-compile",
       "documentation": "./dist/src/migrations/update-23-1-0/disable-webpack-ct-just-in-time-compile.md"
+    },
+    "update-cypress-16-config-options": {
+      "version": "23.3.0-beta.1",
+      "requires": {
+        "cypress": ">=16.0.0"
+      },
+      "description": "Renames `experimentalMemoryManagement` to `manageBrowserMemory`, replaces `experimentalFastVisibility` with `visibilityStrategy`, and removes `experimentalSourceRewriting`, `allowCypressEnv` and `execTimeout` from `cypress.config.{ts,js,mjs,cjs}`, matching the Cypress 16 config changes.",
+      "implementation": "./dist/src/migrations/update-23-3-0/update-cypress-16-config-options",
+      "documentation": "./dist/src/migrations/update-23-3-0/update-cypress-16-config-options.md"
+    },
+    "update-cypress-16-query-command-overwrites": {
+      "version": "23.3.0-beta.1",
+      "requires": {
+        "cypress": ">=16.0.0"
+      },
+      "description": "Renames `Cypress.Commands.overwrite()` to `Cypress.Commands.overwriteQuery()` for `getCookie`, `getCookies`, `getAllCookies`, `getAllLocalStorage` and `getAllSessionStorage`, which are queries in Cypress 16; an AI prompt then adapts the callbacks to the query contract.",
+      "implementation": "./dist/src/migrations/update-23-3-0/update-cypress-16-query-command-overwrites",
+      "prompt": "./dist/src/migrations/update-23-3-0/adapt-query-command-overwrites.md",
+      "documentation": "./dist/src/migrations/update-23-3-0/update-cypress-16-query-command-overwrites.md"
+    },
+    "update-angular-zoneless-mount-import": {
+      "version": "23.3.0-beta.1",
+      "requires": {
+        "cypress": ">=16.0.0"
+      },
+      "description": "Rewrites `cypress/angular-zoneless` and `@cypress/angular-zoneless` imports to `cypress/angular`, which is zoneless in Cypress 16 and the only Angular mount entry point it ships, and removes the deprecated `@cypress/angular-zoneless` package.",
+      "implementation": "./dist/src/migrations/update-23-3-0/update-angular-zoneless-mount-import",
+      "documentation": "./dist/src/migrations/update-23-3-0/update-angular-zoneless-mount-import.md"
+    },
+    "create-ai-instructions-for-cypress-16": {
+      "version": "23.3.0-beta.1",
+      "requires": {
+        "cypress": ">=16.0.0"
+      },
+      "description": "AI-assisted migration: replaces `Cypress.env()`, `cy.exec()`, `.end()`, `env` test-configuration overrides and runtime `Cypress.config()` writes removed in Cypress 16, whose replacements depend on where each value comes from, so it is driven by an AI prompt rather than a deterministic generator.",
+      "prompt": "./dist/src/migrations/update-23-3-0/ai-instructions-for-cypress-16.md",
+      "documentation": "./dist/src/migrations/update-23-3-0/upgrade-to-cypress-16.md"
     }
   },
   "packageJsonUpdates": {
@@ -160,6 +197,29 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "23.3.0-cypress-16": {
+      "version": "23.3.0-beta.1",
+      "requires": {
+        "cypress": ">=15.0.0 <16.0.0"
+      },
+      "incompatibleWith": {
+        "vite": "<8.0.0"
+      },
+      "packages": {
+        "cypress": {
+          "version": "^16.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@cypress/vite-dev-server": {
+          "version": "^8.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@cypress/webpack-dev-server": {
+          "version": "^6.0.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "23.3.0-beta.0",
+  "version": "23.3.0-beta.2",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -89,15 +89,15 @@
     "semver": "^7.6.3",
     "tree-kill": "^1.2.2",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.3.0-beta.0",
-    "@nx/eslint": "23.3.0-beta.0",
-    "@nx/js": "23.3.0-beta.0"
+    "@nx/devkit": "23.3.0-beta.2",
+    "@nx/eslint": "23.3.0-beta.2",
+    "@nx/js": "23.3.0-beta.2"
   },
   "devDependencies": {
-    "nx": "23.3.0-beta.0"
+    "nx": "23.3.0-beta.2"
   },
   "peerDependencies": {
-    "cypress": ">= 13 < 16"
+    "cypress": ">= 13 < 17"
   },
   "peerDependenciesMeta": {
     "cypress": {