@nx/web 18.2.2 → 18.3.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/web",
-  "version": "18.2.2",
+  "version": "18.3.0-beta.0",
   "private": false,
   "description": "The Nx Plugin for Web Components contains generators for managing Web Component applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Cypress, and Storybook.\n\n- Scaffolding for creating buildable libraries that can be published to npm.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -34,9 +34,9 @@
     "detect-port": "^1.5.1",
     "http-server": "^14.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "18.2.2",
-    "@nx/js": "18.2.2",
-    "@nrwl/web": "18.2.2"
+    "@nx/devkit": "18.3.0-beta.0",
+    "@nx/js": "18.3.0-beta.0",
+    "@nrwl/web": "18.3.0-beta.0"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -241,8 +241,8 @@ async function applicationGeneratorInternal(host, schema) {
         const cypressTask = await configurationGenerator(host, {
             ...options,
             project: options.e2eProjectName,
-            devServerTarget: `${options.projectName}:serve`,
-            baseUrl: 'http://localhost:4200',
+            devServerTarget: `${options.projectName}:${options.e2eWebServerTarget}`,
+            baseUrl: options.e2eWebServerAddress,
             directory: 'src',
             skipFormat: true,
         });
@@ -265,8 +265,8 @@ async function applicationGeneratorInternal(host, schema) {
             js: false,
             linter: options.linter,
             setParserOptionsProject: options.setParserOptionsProject,
-            webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.name}`,
-            webServerAddress: 'http://localhost:4200',
+            webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx ${options.e2eWebServerTarget} ${options.name}`,
+            webServerAddress: options.e2eWebServerAddress,
             addPlugin: options.addPlugin,
         });
         tasks.push(playwrightTask);
@@ -324,8 +324,35 @@ async function normalizeOptions(host, options) {
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPluginDefault;
+    let e2eWebServerTarget = 'serve';
+    if (options.addPlugin) {
+        if (nxJson.plugins) {
+            for (const plugin of nxJson.plugins) {
+                if (options.bundler === 'vite' &&
+                    typeof plugin === 'object' &&
+                    plugin.plugin === '@nx/vite/plugin' &&
+                    plugin.options.serveTargetName) {
+                    e2eWebServerTarget = plugin.options
+                        .serveTargetName;
+                }
+                else if (options.bundler === 'webpack' &&
+                    typeof plugin === 'object' &&
+                    plugin.plugin === '@nx/webpack/plugin' &&
+                    plugin.options.serveTargetName) {
+                    e2eWebServerTarget = plugin.options
+                        .serveTargetName;
+                }
+            }
+        }
+    }
+    let e2ePort = 4200;
+    if (nxJson.targetDefaults?.[e2eWebServerTarget] &&
+        nxJson.targetDefaults?.[e2eWebServerTarget].options?.port) {
+        e2ePort = nxJson.targetDefaults?.[e2eWebServerTarget].options?.port;
+    }
     const e2eProjectName = `${appProjectName}-e2e`;
     const e2eProjectRoot = `${appProjectRoot}-e2e`;
+    const e2eWebServerAddress = `http://localhost:${e2ePort}`;
     const npmScope = (0, get_npm_scope_1.getNpmScope)(host);
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
@@ -347,6 +374,9 @@ async function normalizeOptions(host, options) {
         appProjectRoot,
         e2eProjectRoot,
         e2eProjectName,
+        e2eWebServerAddress,
+        e2eWebServerTarget,
+        e2ePort,
         parsedTags,
     };
 }