@nx/cypress 17.2.0-beta.5 → 17.2.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "17.2.0-beta.5",
+  "version": "17.2.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": {
@@ -34,15 +34,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "17.2.0-beta.5",
-    "@nx/eslint": "17.2.0-beta.5",
-    "@nx/js": "17.2.0-beta.5",
+    "@nx/devkit": "17.2.0-beta.8",
+    "@nx/eslint": "17.2.0-beta.8",
+    "@nx/js": "17.2.0-beta.8",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "detect-port": "^1.5.1",
-    "string-argv": "^0.3.2",
     "semver": "7.5.3",
     "tslib": "^2.3.0",
-    "@nrwl/cypress": "17.2.0-beta.5"
+    "@nrwl/cypress": "17.2.0-beta.8"
   },
   "peerDependencies": {
     "cypress": ">= 3 < 14"

package/plugins/cypress-preset.js

@@ -62,6 +62,7 @@ function nxE2EPreset(pathToConfig, options) {
         specPattern: `${basePath}/**/*.cy.{js,jsx,ts,tsx}`,
         fixturesFolder: `${basePath}/fixtures`,
         env: {
+            webServerCommand: options?.webServerCommands?.default,
             webServerCommands: options?.webServerCommands,
             ciWebServerCommand: options?.ciWebServerCommand,
         },
@@ -78,7 +79,7 @@ function nxE2EPreset(pathToConfig, options) {
             }
             if (config.baseUrl && webServerCommand) {
                 if (await isServerUp(config.baseUrl)) {
-                    if (options.webServerConfig.reuseExistingServer === undefined
+                    if (options?.webServerConfig?.reuseExistingServer === undefined
                         ? true
                         : options.webServerConfig.reuseExistingServer) {
                         console.log(`Reusing the server already running on ${config.baseUrl}`);

package/src/generators/configuration/configuration.js

@@ -148,13 +148,7 @@ function addTarget(tree, opts) {
             testingType: 'e2e',
         },
     };
-    if (opts.baseUrl) {
-        projectConfig.targets.e2e.options = {
-            ...projectConfig.targets.e2e.options,
-            baseUrl: opts.baseUrl,
-        };
-    }
-    else if (opts.devServerTarget) {
+    if (opts.devServerTarget) {
         const parsedTarget = (0, devkit_1.parseTargetString)(opts.devServerTarget);
         projectConfig.targets.e2e.options = {
             ...projectConfig.targets.e2e.options,
@@ -178,6 +172,12 @@ function addTarget(tree, opts) {
             };
         }
     }
+    else if (opts.baseUrl) {
+        projectConfig.targets.e2e.options = {
+            ...projectConfig.targets.e2e.options,
+            baseUrl: opts.baseUrl,
+        };
+    }
     (0, devkit_1.updateProjectConfiguration)(tree, opts.project, projectConfig);
 }
 exports.default = configurationGenerator;

package/src/plugins/plugin.js

@@ -120,8 +120,6 @@ function buildCypressTargets(configFilePath, projectRoot, options, context) {
             targets[options.targetName].outputs = getOutputs(projectRoot, cypressConfig, 'e2e');
         }
         if (webServerCommands?.default) {
-            cypressConfig.e2e ??= {};
-            cypressConfig.e2e.webServerCommand ??= webServerCommands?.default;
             delete webServerCommands.default;
         }
         if (Object.keys(webServerCommands ?? {}).length > 0) {

package/src/utils/add-linter.js

@@ -20,9 +20,6 @@ async function addLinterToCyProject(tree, options) {
             linter: options.linter,
             skipFormat: true,
             tsConfigPaths: [(0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json')],
-            eslintFilePatterns: [
-                `${projectConfig.root}/**/*.${options.js ? 'js' : '{js,ts}'}`,
-            ],
             setParserOptionsProject: options.setParserOptionsProject,
             skipPackageJson: options.skipPackageJson,
             rootProject: options.rootProject,