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

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

@@ -6,6 +6,10 @@ export interface CypressE2EConfigSchema {
     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';

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

@@ -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/utils/add-linter.d.ts

@@ -3,6 +3,10 @@ import { Linter, LinterType } from '@nx/eslint';
 export interface CyLinterOptions {
     project: string;
     linter: 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

@@ -12,13 +12,14 @@ 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);
+    const enableTypedLinting = (0, internal_1.isTypedLintingEnabled)(options);
     if (!eslintFile) {
         tasks.push(await (0, eslint_1.lintProjectGenerator)(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,
@@ -35,7 +36,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 +69,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "23.2.0-beta.2",
+  "version": "23.2.0-beta.4",
   "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.2",
-    "@nx/eslint": "23.2.0-beta.2",
-    "@nx/js": "23.2.0-beta.2"
+    "@nx/devkit": "23.2.0-beta.4",
+    "@nx/eslint": "23.2.0-beta.4",
+    "@nx/js": "23.2.0-beta.4"
   },
   "devDependencies": {
-    "nx": "23.2.0-beta.2"
+    "nx": "23.2.0-beta.4"
   },
   "peerDependencies": {
     "cypress": ">= 13 < 16"