@nx/cypress 23.2.0-beta.5 → 23.2.0-beta.7

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

@@ -1,5 +1,5 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
-import { Linter, LinterType } from '@nx/eslint';
+import { LinterType } from '@nx/js';
 export interface CypressE2EConfigSchema {
     project: string;
     baseUrl?: string;
@@ -14,7 +14,7 @@ export interface CypressE2EConfigSchema {
     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/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": {

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

@@ -1,8 +1,8 @@
 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.

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 () => { };
@@ -13,11 +13,13 @@ async function addLinterToCyProject(tree, options) {
     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, {
+    // 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')],
             enableTypedLinting,
             skipPackageJson: options.skipPackageJson,
@@ -25,7 +27,9 @@ async function addLinterToCyProject(tree, options) {
             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;

package/package.json

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