@nx/cypress 17.0.0-beta.6 → 17.0.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "17.0.0-beta.6",
+  "version": "17.0.0-beta.8",
   "private": false,
   "description": "The Nx Plugin for Cypress contains executors and generators allowing your workspace to use the powerful Cypress integration testing capabilities.",
   "repository": {
@@ -38,10 +38,10 @@
     "detect-port": "^1.5.1",
     "semver": "7.5.3",
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.0.0-beta.6",
-    "@nx/js": "17.0.0-beta.6",
-    "@nx/linter": "17.0.0-beta.6",
-    "@nrwl/cypress": "17.0.0-beta.6"
+    "@nx/devkit": "17.0.0-beta.8",
+    "@nx/js": "17.0.0-beta.8",
+    "@nx/eslint": "17.0.0-beta.8",
+    "@nrwl/cypress": "17.0.0-beta.8"
   },
   "peerDependencies": {
     "cypress": ">= 3 < 14"

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

@@ -1,5 +1,5 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
 export interface CypressE2EConfigSchema {
     project: string;
     baseUrl?: string;

package/src/generators/configuration/configuration.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.configurationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const linter_1 = require("@nx/linter");
+const eslint_1 = require("@nx/eslint");
 const path_1 = require("path");
 const add_linter_1 = require("../../utils/add-linter");
 const config_1 = require("../../utils/config");
@@ -49,7 +49,7 @@ In this case you need to provide a devServerTarget,'<projectName>:<targetName>[:
         ...options,
         bundler: options.bundler ?? 'webpack',
         rootProject: projectConfig.root === '.',
-        linter: options.linter ?? linter_1.Linter.EsLint,
+        linter: options.linter ?? eslint_1.Linter.EsLint,
         devServerTarget: options.devServerTarget ??
             (projectConfig.targets.serve ? `${options.project}:serve` : undefined),
     };

package/src/generators/cypress-project/cypress-project.js

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const semver_1 = require("@nx/devkit/src/utils/semver");
 const js_1 = require("@nx/js");
-const linter_1 = require("@nx/linter");
+const eslint_1 = require("@nx/eslint");
 const path_1 = require("path");
 const semver_2 = require("semver");
 const add_linter_1 = require("../../utils/add-linter");
@@ -180,7 +180,7 @@ async function normalizeOptions(host, options) {
             : options.projectNameAndRootFormat,
         callingGenerator: '@nx/cypress:cypress-project',
     });
-    options.linter = options.linter || linter_1.Linter.EsLint;
+    options.linter = options.linter || eslint_1.Linter.EsLint;
     options.bundler = options.bundler || 'webpack';
     return {
         ...options,

package/src/generators/cypress-project/schema.d.ts

@@ -1,5 +1,5 @@
 import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-import type { Linter } from '@nx/linter';
+import type { Linter } from '@nx/eslint';
 
 export interface Schema {
   project?: string;

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

@@ -1,5 +1,5 @@
 import { Tree } from '@nx/devkit';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
 export interface CyLinterOptions {
     project: string;
     linter: Linter;

package/src/utils/add-linter.js

@@ -2,20 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinterToCyProject = void 0;
 const devkit_1 = require("@nx/devkit");
-const linter_1 = require("@nx/linter");
+const eslint_1 = require("@nx/eslint");
 const cypress_version_1 = require("./cypress-version");
 const versions_1 = require("./versions");
-const eslint_file_1 = require("@nx/linter/src/generators/utils/eslint-file");
-const global_eslint_config_1 = require("@nx/linter/src/generators/init/global-eslint-config");
+const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
+const global_eslint_config_1 = require("@nx/eslint/src/generators/init/global-eslint-config");
 async function addLinterToCyProject(tree, options) {
-    if (options.linter === linter_1.Linter.None) {
+    if (options.linter === eslint_1.Linter.None) {
         return () => { };
     }
     const tasks = [];
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const eslintFile = (0, eslint_file_1.findEslintFile)(tree, projectConfig.root);
     if (!eslintFile) {
-        tasks.push(await (0, linter_1.lintProjectGenerator)(tree, {
+        tasks.push(await (0, eslint_1.lintProjectGenerator)(tree, {
             project: options.project,
             linter: options.linter,
             skipFormat: true,
@@ -28,7 +28,7 @@ async function addLinterToCyProject(tree, options) {
             rootProject: options.rootProject,
         }));
     }
-    if (!options.linter || options.linter !== linter_1.Linter.EsLint) {
+    if (!options.linter || options.linter !== eslint_1.Linter.EsLint) {
         return (0, devkit_1.runTasksInSerial)(...tasks);
     }
     tasks.push(!options.skipPackageJson