@nx/cypress 17.2.0-beta.4 → 17.2.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "17.2.0-beta.4",
+  "version": "17.2.0-beta.6",
   "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,15 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "17.2.0-beta.4",
-    "@nx/eslint": "17.2.0-beta.4",
-    "@nx/js": "17.2.0-beta.4",
+    "@nx/devkit": "17.2.0-beta.6",
+    "@nx/eslint": "17.2.0-beta.6",
+    "@nx/js": "17.2.0-beta.6",
     "@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.4"
+    "@nrwl/cypress": "17.2.0-beta.6"
   },
   "peerDependencies": {
     "cypress": ">= 3 < 14"

package/plugins/cypress-preset.js

@@ -72,13 +72,13 @@ function nxE2EPreset(pathToConfig, options) {
             if (!config.env.webServerCommands) {
                 return;
             }
-            const webServerCommand = config.env.webServerCommand ?? config.env.webServerCommands.default;
+            const webServerCommand = config.env.webServerCommand;
             if (!webServerCommand) {
                 return;
             }
             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

@@ -97,7 +97,7 @@ async function addFiles(tree, options, projectGraph, hasPlugin) {
         const cyFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
         let webServerCommands;
         let ciDevServerTarget;
-        if (hasPlugin && !options.baseUrl && options.devServerTarget) {
+        if (hasPlugin && options.devServerTarget) {
             webServerCommands = {};
             webServerCommands.default = 'nx run ' + options.devServerTarget;
             const parsedTarget = (0, devkit_1.parseTargetString)(options.devServerTarget, projectGraph);

package/src/plugins/plugin.js

@@ -36,7 +36,9 @@ exports.createNodes = [
             !siblingFiles.includes('project.json')) {
             return {};
         }
-        const hash = (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context);
+        const hash = (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [
+            (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot)),
+        ]);
         const targets = targetsCache[hash]
             ? targetsCache[hash]
             : buildCypressTargets(configFilePath, projectRoot, options, context);
@@ -96,7 +98,7 @@ function buildCypressTargets(configFilePath, projectRoot, options, context) {
         ...cypressConfig.env,
         ...cypressConfig.e2e?.env,
     };
-    const devServerTargets = cypressEnv?.devServerTargets;
+    const webServerCommands = cypressEnv?.webServerCommands;
     const relativeConfigPath = (0, path_1.relative)(projectRoot, configFilePath);
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {};
@@ -117,14 +119,16 @@ function buildCypressTargets(configFilePath, projectRoot, options, context) {
         if (e2eTargetDefaults?.outputs === undefined) {
             targets[options.targetName].outputs = getOutputs(projectRoot, cypressConfig, 'e2e');
         }
-        if (devServerTargets?.default) {
-            delete devServerTargets.default;
+        if (webServerCommands?.default) {
+            cypressConfig.e2e ??= {};
+            cypressConfig.e2e.webServerCommand ??= webServerCommands?.default;
+            delete webServerCommands.default;
         }
-        if (Object.keys(devServerTargets ?? {}).length > 0) {
+        if (Object.keys(webServerCommands ?? {}).length > 0) {
             targets[options.targetName].configurations ??= {};
-            for (const [configuration, devServerTarget] of Object.entries(devServerTargets ?? {})) {
+            for (const [configuration, webServerCommand] of Object.entries(webServerCommands ?? {})) {
                 targets[options.targetName].configurations[configuration] = {
-                    command: `cypress run --config-file ${relativeConfigPath} --e2e --env.webServerCommand "nx run ${devServerTarget}"`,
+                    command: `cypress run --config-file ${relativeConfigPath} --e2e --env webServerCommand="${webServerCommand}"`,
                 };
             }
         }
@@ -150,7 +154,7 @@ function buildCypressTargets(configFilePath, projectRoot, options, context) {
                     outputs,
                     inputs,
                     cache: true,
-                    command: `cypress run --config-file ${relativeConfigPath} --e2e --env=${JSON.stringify({ webServerCommand: ciWebServerCommand })} --spec ${relativeSpecFilePath}`,
+                    command: `cypress run --config-file ${relativeConfigPath} --e2e --env webServerCommand="${ciWebServerCommand}" --spec ${relativeSpecFilePath}`,
                     options: {
                         cwd: projectRoot,
                     },