@nx/cypress 23.2.0-beta.1 → 23.2.0-beta.10

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

@@ -1,16 +1,20 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
-import { Linter, LinterType } from '@nx/eslint';
+import { LinterType } from '@nx/js';
 export interface CypressE2EConfigSchema {
     project: string;
     baseUrl?: string;
     directory?: string;
     js?: boolean;
     skipFormat?: boolean;
+    enableTypedLinting?: boolean;
+    /**
+     * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
+     */
     setParserOptionsProject?: boolean;
     skipPackageJson?: boolean;
     bundler?: 'webpack' | 'vite' | 'none';
     devServerTarget?: string;
-    linter?: Linter | LinterType;
+    linter?: LinterType;
     port?: number | 'cypress-auto';
     jsx?: boolean;
     rootProject?: boolean;

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

@@ -144,23 +144,23 @@ In this case you need to provide a devServerTarget,'<projectName>:<targetName>[:
     };
 }
 async function promptForMissingServeData(projectName) {
-    const { devServerTarget, port } = await (0, internal_1.promptWhenInteractive)([
-        {
-            type: 'input',
-            name: 'devServerTarget',
-            message: 'What is the name of the target used to serve the application locally?',
-            initial: `${projectName}:serve`,
-        },
-        {
-            type: 'numeral',
-            name: 'port',
-            message: 'What port will the application be served on?',
-            initial: 3000,
-        },
-    ], {
-        devServerTarget: `${projectName}:serve`,
-        port: 3000,
+    if (!(0, internal_1.isInteractive)()) {
+        return {
+            devServerTarget: `${projectName}:serve`,
+            baseUrl: 'http://localhost:3000',
+        };
+    }
+    const devServerTarget = await (0, internal_1.textPrompt)({
+        message: 'What is the name of the target used to serve the application locally?',
+        initialValue: `${projectName}:serve`,
     });
+    const port = Number(await (0, internal_1.textPrompt)({
+        message: 'What port will the application be served on?',
+        initialValue: '3000',
+        validate: (value) => value !== '' && !Number.isNaN(Number(value))
+            ? undefined
+            : 'Please enter a number',
+    }));
     return {
         devServerTarget,
         baseUrl: `http://localhost:${port}`,

package/dist/src/generators/configuration/schema.json

@@ -44,9 +44,9 @@
       "default": "cypress"
     },
     "linter": {
-      "description": "The tool to use for running lint checks.",
+      "description": "The tool to use for running lint checks. Defaults to the linter the workspace already uses.",
       "type": "string",
-      "enum": ["none", "eslint"],
+      "enum": ["none", "eslint", "oxlint"],
       "x-priority": "important"
     },
     "js": {
@@ -60,11 +60,17 @@
       "default": false,
       "x-priority": "internal"
     },
-    "setParserOptionsProject": {
+    "enableTypedLinting": {
       "type": "boolean",
-      "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
+      "description": "Whether to enable typed linting. For flat configs, this configures the recommended `parserOptions.projectService` and `tsconfigRootDir`. For legacy `.eslintrc` configs, this configures `parserOptions.project`. We do not enable this by default for lint performance reasons.",
       "default": false
     },
+    "setParserOptionsProject": {
+      "type": "boolean",
+      "description": "Deprecated alias for `enableTypedLinting`.",
+      "default": false,
+      "x-deprecated": "Use `enableTypedLinting` instead. This option will be removed in Nx v24."
+    },
     "skipPackageJson": {
       "type": "boolean",
       "default": false,

package/dist/src/plugins/plugin.js

@@ -5,10 +5,6 @@ const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const fs_1 = require("fs");
-const devkit_internals_1 = require("nx/src/devkit-internals");
-const cache_directory_1 = require("nx/src/utils/cache-directory");
-const plugin_cache_utils_1 = require("nx/src/utils/plugin-cache-utils");
-const workspace_context_1 = require("nx/src/utils/workspace-context");
 const path_1 = require("path");
 const constants_1 = require("../utils/constants");
 const cypressConfigGlob = '**/cypress.config.{js,ts,mjs,cjs}';
@@ -25,9 +21,9 @@ const defaultPatterns = {
 exports.createNodes = [
     cypressConfigGlob,
     async (configFiles, options, context) => {
-        const optionsHash = (0, devkit_internals_1.hashObject)(options);
-        const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `cypress-${optionsHash}.hash`);
-        const pluginCache = new plugin_cache_utils_1.PluginCache(cachePath);
+        const optionsHash = (0, internal_1.hashObject)(options);
+        const cachePath = (0, path_1.join)(internal_1.workspaceDataDirectory, `cypress-${optionsHash}.hash`);
+        const pluginCache = new internal_1.PluginCache(cachePath);
         const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
         const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
         const lockFileName = (0, js_1.getLockFileName)(packageManager);
@@ -490,7 +486,7 @@ async function getSpecFilesAndPatternsForTestType(cypressConfig, testType, works
     const excludeSpecPatterns = Array.isArray(excludeSpecPattern)
         ? excludeSpecPattern.map((p) => (0, path_1.join)(projectRoot, p))
         : [(0, path_1.join)(projectRoot, excludeSpecPattern)];
-    const specFiles = await (0, workspace_context_1.globWithWorkspaceContext)(workspaceRoot, specPatterns, excludeSpecPatterns);
+    const specFiles = await (0, internal_1.globWithWorkspaceContext)(workspaceRoot, specPatterns, excludeSpecPatterns);
     return { specFiles, specPatterns, excludeSpecPatterns };
 }
 async function filterCypressConfigs(configFiles, context) {

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

@@ -1,8 +1,12 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
-import { Linter, LinterType } from '@nx/eslint';
+import { type LinterType } from '@nx/js';
 export interface CyLinterOptions {
     project: string;
-    linter: Linter | LinterType;
+    linter: LinterType;
+    enableTypedLinting?: boolean;
+    /**
+     * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
+     */
     setParserOptionsProject?: boolean;
     skipPackageJson?: boolean;
     rootProject?: boolean;

package/dist/src/utils/add-linter.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinterToCyProject = addLinterToCyProject;
 const devkit_1 = require("@nx/devkit");
-const eslint_1 = require("@nx/eslint");
 const internal_1 = require("@nx/eslint/internal");
 const versions_1 = require("./versions");
+const internal_2 = require("@nx/js/internal");
 async function addLinterToCyProject(tree, options) {
     if (options.linter === 'none') {
         return () => { };
@@ -12,19 +12,24 @@ async function addLinterToCyProject(tree, options) {
     const tasks = [];
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const eslintFile = (0, internal_1.findEslintFile)(tree, projectConfig.root);
-    if (!eslintFile) {
-        tasks.push(await (0, eslint_1.lintProjectGenerator)(tree, {
+    const enableTypedLinting = (0, internal_1.isTypedLintingEnabled)(options);
+    // Register whichever linter was asked for. An existing ESLint config means
+    // the project is already registered, so skip straight to the Cypress-specific
+    // shaping below.
+    if (options.linter !== 'eslint' || !eslintFile) {
+        tasks.push(await (0, internal_2.addLintingToProject)(tree, {
             project: options.project,
             linter: options.linter,
-            skipFormat: true,
             tsConfigPaths: [(0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json')],
-            setParserOptionsProject: options.setParserOptionsProject,
+            enableTypedLinting,
             skipPackageJson: options.skipPackageJson,
             rootProject: options.rootProject,
             addPlugin: options.addPlugin,
         }));
     }
-    if (!options.linter || options.linter !== 'eslint') {
+    // Everything below configures ESLint — predefined configs, `extends`, ignore
+    // entries — which have no equivalent in other linters.
+    if (options.linter !== 'eslint') {
         return (0, devkit_1.runTasksInSerial)(...tasks);
     }
     options.overwriteExisting = options.overwriteExisting || !eslintFile;
@@ -35,7 +40,8 @@ async function addLinterToCyProject(tree, options) {
     if ((0, internal_1.isEslintConfigSupported)(tree, projectConfig.root) ||
         (0, internal_1.isEslintConfigSupported)(tree)) {
         const overrides = [];
-        if ((0, internal_1.useFlatConfig)(tree)) {
+        const isFlatConfig = (0, internal_1.useFlatConfig)(tree);
+        if (isFlatConfig) {
             (0, internal_1.addPredefinedConfigToFlatLintConfig)(tree, projectConfig.root, 'recommended', {
                 moduleName: 'cypress',
                 moduleImportPath: 'eslint-plugin-cypress/flat',
@@ -67,39 +73,44 @@ async function addLinterToCyProject(tree, options) {
                 'no-undef': 'off',
             },
         };
+        // For flat configs typed linting is handled by `lintProjectGenerator` via
+        // `parserOptions.projectService`, so we don't emit `parserOptions.project`
+        // here. Legacy `.eslintrc` configs are JSON, which can't express the
+        // `__dirname` that `tsconfigRootDir` needs, so they keep `project`.
+        const legacyParserOptions = !isFlatConfig && enableTypedLinting
+            ? { project: `${projectConfig.root}/tsconfig.*?.json` }
+            : undefined;
         if (options.overwriteExisting) {
             overrides.unshift({
-                files: (0, internal_1.useFlatConfig)(tree)
+                files: isFlatConfig
                     ? // For flat configs we don't need to specify the files
                         undefined
                     : ['*.ts', '*.tsx', '*.js', '*.jsx'],
-                parserOptions: !options.setParserOptionsProject
-                    ? undefined
-                    : {
-                        project: `${projectConfig.root}/tsconfig.*?.json`,
-                    },
+                parserOptions: legacyParserOptions,
                 rules: {},
             });
             (0, internal_1.replaceOverridesInLintConfig)(tree, projectConfig.root, overrides);
         }
         else {
             overrides.unshift({
-                files: (0, internal_1.useFlatConfig)(tree)
+                files: isFlatConfig
                     ? // For flat configs we don't need to specify the files
                         undefined
                     : [
                         '*.cy.{ts,js,tsx,jsx}',
                         `${options.cypressDir}/**/*.{ts,js,tsx,jsx}`,
                     ],
-                parserOptions: !options.setParserOptionsProject
-                    ? undefined
-                    : {
-                        project: `${projectConfig.root}/tsconfig.*?.json`,
-                    },
+                parserOptions: legacyParserOptions,
                 rules: {},
             });
             overrides.forEach((override) => (0, internal_1.addOverrideToLintConfig)(tree, projectConfig.root, override));
         }
+        // `lintProjectGenerator` only sets up the projectService block when it
+        // creates the config, and `replaceOverridesInLintConfig` strips it. For a
+        // flat config, re-add it here when typed linting is enabled.
+        if (isFlatConfig && enableTypedLinting) {
+            (0, internal_1.addTypedLintingToFlatConfig)(tree, projectConfig.root);
+        }
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }

package/dist/src/utils/config.js

@@ -131,7 +131,10 @@ ${jitComment}
 }`;
         });
     }
-    if (presetImportPath) {
+    // Re-running the generator must not prepend a second declaration - Cypress
+    // loads TS configs through esbuild, which rejects duplicate bindings.
+    const isPresetAlreadyDeclared = tsquery.query(updatedConfigContents, ':matches(ImportSpecifier, BindingElement) Identifier[name="nxComponentTestingPreset"]').length > 0;
+    if (presetImportPath && !isPresetAlreadyDeclared) {
         // Use the path verbatim - callers pass the public exported subpath. Don't
         // append `.js`: @nx/react and @nx/angular's package exports only declare
         // the bare `./plugins/component-testing` subpath, so a `.js` suffix

package/dist/src/utils/ct-helpers.js

@@ -8,9 +8,7 @@ exports.createExecutorContext = createExecutorContext;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const fs_1 = require("fs");
-const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
-const project_graph_1 = require("nx/src/project-graph/project-graph");
-const configuration_1 = require("nx/src/config/configuration");
+const internal_1 = require("@nx/devkit/internal");
 exports.CY_FILE_MATCHER = new RegExp(/\.cy\.[tj]sx?$/);
 /**
  * return a path to a temp css file
@@ -55,8 +53,8 @@ function getProjectConfigByPath(graph, configPath) {
     const normalizedPathFromWorkspaceRoot = (0, devkit_1.normalizePath)((0, fs_1.lstatSync)(configPath).isFile()
         ? configFileFromWorkspaceRoot.replace((0, path_1.extname)(configPath), '')
         : configFileFromWorkspaceRoot);
-    const projectRootMappings = (0, find_project_for_path_1.createProjectRootMappings)(graph.nodes);
-    const componentTestingProjectName = (0, find_project_for_path_1.findProjectForPath)(normalizedPathFromWorkspaceRoot, projectRootMappings);
+    const projectRootMappings = (0, internal_1.createProjectRootMappings)(graph.nodes);
+    const componentTestingProjectName = (0, internal_1.findProjectForPath)(normalizedPathFromWorkspaceRoot, projectRootMappings);
     if (!componentTestingProjectName ||
         !graph.nodes[componentTestingProjectName]?.data) {
         throw new Error((0, devkit_1.stripIndents) `Unable to find the project configuration that includes ${normalizedPathFromWorkspaceRoot}. 
@@ -69,8 +67,8 @@ function getProjectConfigByPath(graph, configPath) {
     return graph.nodes[componentTestingProjectName].data;
 }
 function createExecutorContext(graph, targets, projectName, targetName, configurationName) {
-    const projectsConfigurations = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(graph);
-    const nxJsonConfiguration = (0, configuration_1.readNxJson)();
+    const projectsConfigurations = (0, devkit_1.readProjectsConfigurationFromProjectGraph)(graph);
+    const nxJsonConfiguration = (0, internal_1.readNxJsonFromDisk)();
     return {
         cwd: process.cwd(),
         projectGraph: graph,

package/dist/src/utils/find-target-options.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findBuildConfig = findBuildConfig;
 const devkit_1 = require("@nx/devkit");
-const configuration_1 = require("nx/src/config/configuration");
-const project_graph_1 = require("nx/src/project-graph/project-graph");
+const internal_1 = require("@nx/devkit/internal");
 async function findBuildConfig(tree, options) {
     try {
         // attempt to use the provided target
@@ -118,8 +117,8 @@ function findTargetOptionsInProject(tree, graph, projectName, options) {
     }
 }
 function createExecutorContext(graph, targets, projectName, targetName, configurationName) {
-    const nxJsonConfiguration = (0, configuration_1.readNxJson)();
-    const projectsConfigurations = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(graph);
+    const nxJsonConfiguration = (0, internal_1.readNxJsonFromDisk)();
+    const projectsConfigurations = (0, devkit_1.readProjectsConfigurationFromProjectGraph)(graph);
     return {
         cwd: process.cwd(),
         projectGraph: graph,

package/dist/src/utils/start-dev-server.js

@@ -5,9 +5,9 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const detect_port_1 = tslib_1.__importDefault(require("detect-port"));
-const executor_utils_1 = require("nx/src/command-line/run/executor-utils");
 const fs_1 = require("fs");
 const os_1 = require("os");
+const internal_1 = require("@nx/devkit/internal");
 const PORT_LOCK_DIR = (0, path_1.join)((0, os_1.tmpdir)(), 'nx-cypress-port-locks');
 async function* startDevServer(opts, context) {
     // no dev server, return the provisioned base url
@@ -136,8 +136,8 @@ ${e.message || e}`);
         // so we double check the schema if readTargetOptions didn't return a value for the property
         const projectConfig = context.projectsConfigurations?.projects?.[target.project];
         const targetConfig = projectConfig.targets[target.target];
-        const [collection, executor] = (0, executor_utils_1.parseExecutor)(targetConfig.executor);
-        const { schema } = (0, executor_utils_1.getExecutorInformation)(collection, executor, context.root, context.projectsConfigurations.projects);
+        const [collection, executor] = (0, internal_1.parseExecutor)(targetConfig.executor);
+        const { schema } = (0, internal_1.getExecutorInformation)(collection, executor, context.root, context.projectsConfigurations.projects);
         // NOTE: schema won't have a default since readTargetOptions would have
         // already set that and this check wouldn't need to be made
         targetHasOpt = Object.keys(schema.properties).includes(property);

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

@@ -4,7 +4,7 @@ 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.17.0";
+export declare const cypressVersion = "^15.20.1";
 export declare const cypressWebpackVersion = "^5.4.1";
 export declare const viteVersion = "^6.0.0";
 export declare const htmlWebpackPluginVersion = "^5.5.0";

package/dist/src/utils/versions.js

@@ -13,7 +13,7 @@ exports.minSupportedCypressVersion = '13.0.0';
 exports.eslintPluginCypressVersion = '^3.5.0';
 exports.typesNodeVersion = '^22.0.0';
 exports.cypressViteDevServerVersion = '^7.3.1';
-exports.cypressVersion = '^15.17.0';
+exports.cypressVersion = '^15.20.1';
 exports.cypressWebpackVersion = '^5.4.1';
 exports.viteVersion = '^6.0.0';
 exports.htmlWebpackPluginVersion = '^5.5.0';

package/migrations.json

@@ -148,6 +148,18 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "23.2.0-cypress-15.20.1": {
+      "version": "23.2.0-beta.6",
+      "requires": {
+        "cypress": ">=15.0.0 <15.20.1"
+      },
+      "packages": {
+        "cypress": {
+          "version": "^15.20.1",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

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