@nx/cypress 16.8.0-beta.1 → 16.8.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "16.8.0-beta.1",
+  "version": "16.8.0-beta.2",
   "private": false,
   "description": "The Nx Plugin for Cypress contains executors and generators allowing your workspace to use the powerful Cypress integration testing capabilities.",
   "repository": {
@@ -34,13 +34,12 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/cypress": "16.8.0-beta.1",
-    "@nx/devkit": "16.8.0-beta.1",
-    "@nx/js": "16.8.0-beta.1",
-    "@nx/linter": "16.8.0-beta.1",
+    "@nrwl/cypress": "16.8.0-beta.2",
+    "@nx/devkit": "16.8.0-beta.2",
+    "@nx/js": "16.8.0-beta.2",
+    "@nx/linter": "16.8.0-beta.2",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "detect-port": "^1.5.1",
-    "dotenv": "~16.3.1",
     "semver": "7.5.3",
     "tslib": "^2.3.0"
   },
@@ -56,5 +55,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "231a998e004c13e559c171ba6c164a9127886153"
+  "gitHead": "9bcc04742f9e1516d8c1ddbfb1907770c347876f"
 }

package/src/executors/cypress/cypress.impl.d.ts

@@ -1,5 +1,4 @@
 import { ExecutorContext } from '@nx/devkit';
-import 'dotenv/config';
 export type Json = {
     [k: string]: any;
 };

package/src/executors/cypress/cypress.impl.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_utils_1 = require("nx/src/command-line/run/executor-utils");
-require("dotenv/config");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const ct_helpers_1 = require("../../utils/ct-helpers");

package/src/utils/add-linter.js

@@ -4,9 +4,10 @@ exports.addLinterToCyProject = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const linter_1 = require("@nx/linter");
-const global_eslint_config_1 = require("@nx/linter/src/generators/init/global-eslint-config");
 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");
 function addLinterToCyProject(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (options.linter === linter_1.Linter.None) {
@@ -14,7 +15,8 @@ function addLinterToCyProject(tree, options) {
         }
         const tasks = [];
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-        if (!tree.exists((0, devkit_1.joinPathFragments)(projectConfig.root, '.eslintrc.json'))) {
+        const eslintFile = (0, eslint_file_1.findEslintFile)(tree, projectConfig.root);
+        if (!eslintFile) {
             tasks.push(yield (0, linter_1.lintProjectGenerator)(tree, {
                 project: options.project,
                 linter: options.linter,
@@ -34,55 +36,60 @@ function addLinterToCyProject(tree, options) {
         tasks.push(!options.skipPackageJson
             ? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { 'eslint-plugin-cypress': versions_1.eslintPluginCypressVersion })
             : () => { });
-        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectConfig.root, '.eslintrc.json'), (json) => {
-            var _a;
+        if ((0, eslint_file_1.isEslintConfigSupported)(tree)) {
+            const overrides = [];
             if (options.rootProject) {
-                json.plugins = ['@nx'];
-                json.extends = ['plugin:cypress/recommended'];
-            }
-            else {
-                json.extends = ['plugin:cypress/recommended', ...json.extends];
+                (0, eslint_file_1.addPluginsToLintConfig)(tree, projectConfig.root, '@nx');
+                overrides.push(global_eslint_config_1.javaScriptOverride);
             }
-            (_a = json.overrides) !== null && _a !== void 0 ? _a : (json.overrides = []);
-            const globals = options.rootProject ? [global_eslint_config_1.globalJavaScriptOverrides] : [];
-            const override = {
-                files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
-                parserOptions: !options.setParserOptionsProject
-                    ? undefined
-                    : {
-                        project: `${projectConfig.root}/tsconfig.*?.json`,
-                    },
-                rules: {},
+            (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.
+             * That however leads to issues with the CommonJS Cypress plugin file.
+             */
+            const cy6Override = {
+                files: [`${options.cypressDir}/plugins/index.js`],
+                rules: {
+                    '@typescript-eslint/no-var-requires': 'off',
+                    'no-undef': 'off',
+                },
             };
-            const cyFiles = [
-                Object.assign(Object.assign({}, override), { files: [
-                        '*.cy.{ts,js,tsx,jsx}',
-                        `${options.cypressDir}/**/*.{ts,js,tsx,jsx}`,
-                    ] }),
-            ];
+            const addCy6Override = cyVersion && cyVersion < 7;
             if (options.overwriteExisting) {
-                json.overrides = [...globals, override];
+                overrides.push({
+                    files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
+                    parserOptions: !options.setParserOptionsProject
+                        ? undefined
+                        : {
+                            project: `${projectConfig.root}/tsconfig.*?.json`,
+                        },
+                    rules: {},
+                });
+                if (addCy6Override) {
+                    overrides.push(cy6Override);
+                }
+                (0, eslint_file_1.replaceOverridesInLintConfig)(tree, projectConfig.root, overrides);
             }
             else {
-                json.overrides.push(...globals);
-                json.overrides.push(...cyFiles);
-            }
-            const cyVersion = (0, cypress_version_1.installedCypressVersion)();
-            if (cyVersion && cyVersion < 7) {
-                /**
-                 * We need this override because we enabled allowJS in the tsconfig to allow for JS based Cypress tests.
-                 * That however leads to issues with the CommonJS Cypress plugin file.
-                 */
-                json.overrides.push({
-                    files: [`${options.cypressDir}/plugins/index.js`],
-                    rules: {
-                        '@typescript-eslint/no-var-requires': 'off',
-                        'no-undef': 'off',
-                    },
+                overrides.unshift({
+                    files: [
+                        '*.cy.{ts,js,tsx,jsx}',
+                        `${options.cypressDir}/**/*.{ts,js,tsx,jsx}`,
+                    ],
+                    parserOptions: !options.setParserOptionsProject
+                        ? undefined
+                        : {
+                            project: `${projectConfig.root}/tsconfig.*?.json`,
+                        },
+                    rules: {},
                 });
+                if (addCy6Override) {
+                    overrides.push(cy6Override);
+                }
+                overrides.forEach((override) => (0, eslint_file_1.addOverrideToLintConfig)(tree, projectConfig.root, override));
             }
-            return json;
-        });
+        }
         return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }