@nx/cypress 19.7.3 → 19.8.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "19.7.3",
+  "version": "19.8.0-beta.0",
   "private": false,
   "description": "The Nx Plugin for Cypress contains executors and generators allowing your workspace to use the powerful Cypress integration testing capabilities.",
   "repository": {
@@ -36,13 +36,13 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "19.7.3",
-    "@nx/eslint": "19.7.3",
-    "@nx/js": "19.7.3",
+    "@nx/devkit": "19.8.0-beta.0",
+    "@nx/eslint": "19.8.0-beta.0",
+    "@nx/js": "19.8.0-beta.0",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "detect-port": "^1.5.1",
     "tslib": "^2.3.0",
-    "@nrwl/cypress": "19.7.3"
+    "@nrwl/cypress": "19.8.0-beta.0"
   },
   "peerDependencies": {
     "cypress": ">= 3 < 14"

package/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -24,7 +24,7 @@ async function convertToInferred(tree, options) {
         },
     ], options.project);
     if (migratedProjects.size === 0) {
-        throw new Error('Could not find any targets to migrate.');
+        throw new executor_to_plugin_migrator_1.NoTargetsToMigrateError();
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

package/src/utils/add-linter.js

@@ -7,6 +7,7 @@ const cypress_version_1 = require("./cypress-version");
 const versions_1 = require("./versions");
 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");
+const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
 async function addLinterToCyProject(tree, options) {
     if (options.linter === eslint_1.Linter.None) {
         return () => { };
@@ -36,12 +37,22 @@ async function addLinterToCyProject(tree, options) {
     if ((0, eslint_file_1.isEslintConfigSupported)(tree, projectConfig.root) ||
         (0, eslint_file_1.isEslintConfigSupported)(tree)) {
         const overrides = [];
-        if (options.rootProject) {
-            (0, eslint_file_1.addPluginsToLintConfig)(tree, projectConfig.root, '@nx');
-            overrides.push(global_eslint_config_1.typeScriptOverride);
-            overrides.push(global_eslint_config_1.javaScriptOverride);
+        if ((0, flat_config_1.useFlatConfig)(tree)) {
+            (0, eslint_file_1.addPredefinedConfigToFlatLintConfig)(tree, projectConfig.root, 'recommended', 'cypress', 'eslint-plugin-cypress/flat', false, false);
+            (0, eslint_file_1.addOverrideToLintConfig)(tree, projectConfig.root, {
+                files: ['*.ts', '*.js'],
+                rules: {},
+            });
+        }
+        else {
+            if (options.rootProject) {
+                (0, eslint_file_1.addPluginsToLintConfig)(tree, projectConfig.root, '@nx');
+                overrides.push(global_eslint_config_1.typeScriptOverride);
+                overrides.push(global_eslint_config_1.javaScriptOverride);
+            }
+            const addExtendsTask = (0, eslint_file_1.addExtendsToLintConfig)(tree, projectConfig.root, 'plugin:cypress/recommended');
+            tasks.push(addExtendsTask);
         }
-        (0, eslint_file_1.addExtendsToLintConfig)(tree, projectConfig.root, 'plugin:cypress/recommended');
         const cyVersion = (0, cypress_version_1.installedCypressVersion)();
         /**
          * We need this override because we enabled allowJS in the tsconfig to allow for JS based Cypress tests.
@@ -57,7 +68,10 @@ async function addLinterToCyProject(tree, options) {
         const addCy6Override = cyVersion && cyVersion < 7;
         if (options.overwriteExisting) {
             overrides.unshift({
-                files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
+                files: (0, flat_config_1.useFlatConfig)(tree)
+                    ? // For flat configs we don't need to specify the files
+                        undefined
+                    : ['*.ts', '*.tsx', '*.js', '*.jsx'],
                 parserOptions: !options.setParserOptionsProject
                     ? undefined
                     : {
@@ -72,10 +86,13 @@ async function addLinterToCyProject(tree, options) {
         }
         else {
             overrides.unshift({
-                files: [
-                    '*.cy.{ts,js,tsx,jsx}',
-                    `${options.cypressDir}/**/*.{ts,js,tsx,jsx}`,
-                ],
+                files: (0, flat_config_1.useFlatConfig)(tree)
+                    ? // 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
                     : {

package/src/utils/versions.d.ts

@@ -1,5 +1,5 @@
 export declare const nxVersion: any;
-export declare const eslintPluginCypressVersion = "^2.13.4";
+export declare const eslintPluginCypressVersion = "^3.5.0";
 export declare const typesNodeVersion = "18.16.9";
 export declare const cypressViteDevServerVersion = "^2.2.1";
 export declare const cypressVersion = "^13.13.0";

package/src/utils/versions.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.htmlWebpackPluginVersion = exports.viteVersion = exports.cypressWebpackVersion = exports.cypressVersion = exports.cypressViteDevServerVersion = exports.typesNodeVersion = exports.eslintPluginCypressVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.eslintPluginCypressVersion = '^2.13.4';
+exports.eslintPluginCypressVersion = '^3.5.0';
 exports.typesNodeVersion = '18.16.9';
 exports.cypressViteDevServerVersion = '^2.2.1';
 exports.cypressVersion = '^13.13.0';