@nx/cypress 19.6.0-beta.4 → 19.6.0-beta.5

package/migrations.json

@@ -32,15 +32,9 @@
     },
     "update-19-6-0-update-ci-webserver-for-vite": {
       "cli": "nx",
-      "version": "19.6.0-beta.0",
-      "description": "Update ciWebServerCommand to use previewTargetName if Vite is detected for the application.",
-      "implementation": "./src/migrations/update-19-6-0/update-ci-webserver-for-vite"
-    },
-    "update-19-6-0-add-e2e-ci-target-defaults": {
-      "cli": "nx",
-      "version": "19.6.0-beta.0",
-      "description": "Add inferred ciTargetNames to targetDefaults with dependsOn to ensure dependent application builds are scheduled before atomized tasks.",
-      "implementation": "./src/migrations/update-19-6-0/add-e2e-ci-target-defaults"
+      "version": "19.6.0-beta.4",
+      "description": "Update ciWebServerCommand to use static serve for the application.",
+      "implementation": "./src/migrations/update-19-6-0/update-ci-webserver-for-static-serve"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "19.6.0-beta.4",
+  "version": "19.6.0-beta.5",
   "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.6.0-beta.4",
-    "@nx/eslint": "19.6.0-beta.4",
-    "@nx/js": "19.6.0-beta.4",
+    "@nx/devkit": "19.6.0-beta.5",
+    "@nx/eslint": "19.6.0-beta.5",
+    "@nx/js": "19.6.0-beta.5",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "detect-port": "^1.5.1",
     "tslib": "^2.3.0",
-    "@nrwl/cypress": "19.6.0-beta.4"
+    "@nrwl/cypress": "19.6.0-beta.5"
   },
   "peerDependencies": {
     "cypress": ">= 3 < 14"

package/src/migrations/update-19-6-0/{update-ci-webserver-for-vite.js → update-ci-webserver-for-static-serve.js}

@@ -4,6 +4,7 @@ exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
+const add_e2e_ci_target_defaults_1 = require("./add-e2e-ci-target-defaults");
 async function default_1(tree) {
     const pluginName = '@nx/cypress/plugin';
     const graph = await (0, devkit_1.createProjectGraphAsync)();
@@ -49,23 +50,43 @@ async function default_1(tree) {
                 (0, devkit_1.joinPathFragments)(graph.nodes[project].data.root, 'vite.config.ts'),
                 (0, devkit_1.joinPathFragments)(graph.nodes[project].data.root, 'vite.config.js'),
             ].find((p) => tree.exists(p));
-            if (!pathToViteConfig) {
+            const pathToWebpackConfig = [
+                (0, devkit_1.joinPathFragments)(graph.nodes[project].data.root, 'webpack.config.ts'),
+                (0, devkit_1.joinPathFragments)(graph.nodes[project].data.root, 'webpack.config.js'),
+            ].find((p) => tree.exists(p));
+            if (!pathToViteConfig && !pathToWebpackConfig) {
                 continue;
             }
-            const viteConfigContents = tree.read(pathToViteConfig, 'utf-8');
-            if (!viteConfigContents.includes('preview:')) {
-                continue;
+            if (pathToWebpackConfig) {
+                const matchingWebpackPlugin = await findPluginForConfigFile(tree, '@nx/webpack/plugin', pathToWebpackConfig);
+                const serveStaticTargetName = matchingWebpackPlugin
+                    ? typeof matchingWebpackPlugin === 'string'
+                        ? 'serve-static'
+                        : matchingWebpackPlugin.options?.serveStaticTargetName ??
+                            'serve-static'
+                    : 'serve-static';
+                const newCommand = ciWebServerCommand.replace(/nx.*[^"']/, `nx run ${project}:${serveStaticTargetName}`);
+                tree.write(configFile, `${configFileContents.slice(0, nodes[0].getStart())}${newCommand}${configFileContents.slice(nodes[0].getEnd())}`);
             }
-            const matchingVitePlugin = await findPluginForConfigFile(tree, '@nx/vite/plugin', pathToViteConfig);
-            const previewTargetName = matchingVitePlugin
-                ? typeof matchingVitePlugin === 'string'
-                    ? 'preview'
-                    : matchingVitePlugin.options?.previewTargetName ?? 'preview'
-                : 'preview';
-            tree.write(configFile, `${configFileContents.slice(0, nodes[0].getStart())}'nx run ${project}:${previewTargetName}',
+            else if (pathToViteConfig) {
+                const viteConfigContents = tree.read(pathToViteConfig, 'utf-8');
+                if (!viteConfigContents.includes('preview:')) {
+                    continue;
+                }
+                const matchingVitePlugin = await findPluginForConfigFile(tree, '@nx/vite/plugin', pathToViteConfig);
+                const previewTargetName = matchingVitePlugin
+                    ? typeof matchingVitePlugin === 'string'
+                        ? 'preview'
+                        : matchingVitePlugin.options?.previewTargetName ??
+                            'preview'
+                    : 'preview';
+                const newCommand = ciWebServerCommand.replace(/nx.*[^"']/, `nx run ${project}:${previewTargetName}`);
+                tree.write(configFile, `${configFileContents.slice(0, nodes[0].getStart())}${newCommand},
       ciBaseUrl: "http://localhost:4300"${configFileContents.slice(nodes[0].getEnd())}`);
+            }
         }
     }
+    await (0, add_e2e_ci_target_defaults_1.default)(tree);
     await (0, devkit_1.formatFiles)(tree);
 }
 async function findPluginForConfigFile(tree, pluginName, pathToConfigFile) {