@nx/nuxt 18.2.2 → 18.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nuxt",
-  "version": "18.2.2",
+  "version": "18.2.3",
   "private": false,
   "description": "The Nuxt plugin for Nx contains executors and generators for managing Nuxt applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Vitest, Cypress, and Storybook.\n\n- Generators for applications, libraries, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -30,11 +30,11 @@
   "dependencies": {
     "tslib": "^2.3.0",
     "@nuxt/kit": "^3.10.0",
-    "@nx/devkit": "18.2.2",
-    "@nx/js": "18.2.2",
-    "@nx/eslint": "18.2.2",
-    "@nx/vue": "18.2.2",
-    "@nx/vite": "18.2.2"
+    "@nx/devkit": "18.2.3",
+    "@nx/js": "18.2.3",
+    "@nx/eslint": "18.2.3",
+    "@nx/vue": "18.2.3",
+    "@nx/vite": "18.2.3"
   },
   "peerDependencies": {},
   "publishConfig": {

package/src/generators/application/lib/add-e2e.js

@@ -20,12 +20,12 @@ async function addE2e(host, options) {
             directory: 'src',
             bundler: 'vite',
             skipFormat: true,
-            devServerTarget: `${options.projectName}:serve`,
+            devServerTarget: `${options.projectName}:${options.e2eWebServerTarget}`,
             webServerCommands: {
-                default: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.projectName}`,
+                default: `${(0, devkit_1.getPackageManagerCommand)().exec} nx ${options.e2eWebServerTarget} ${options.projectName}`,
             },
             ciWebServerCommand: `nx run ${options.projectName}:serve-static`,
-            baseUrl: 'http://localhost:4200',
+            baseUrl: options.e2eWebServerAddress,
             jsx: true,
             addPlugin: true,
         });
@@ -46,8 +46,8 @@ async function addE2e(host, options) {
             js: false,
             linter: options.linter,
             setParserOptionsProject: options.setParserOptionsProject,
-            webServerAddress: 'http://localhost:4200',
-            webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.projectName}`,
+            webServerAddress: options.e2eWebServerAddress,
+            webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx ${options.e2eWebServerTarget} ${options.projectName}`,
             addPlugin: true,
         });
     }

package/src/generators/application/lib/normalize-options.js

@@ -22,8 +22,26 @@ async function normalizeOptions(host, options, callingGenerator = '@nx/nuxt:appl
     });
     options.rootProject = appProjectRoot === '.';
     options.projectNameAndRootFormat = projectNameAndRootFormat;
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    let e2eWebServerTarget = 'serve';
+    if (nxJson.plugins) {
+        for (const plugin of nxJson.plugins) {
+            if (typeof plugin === 'object' &&
+                plugin.plugin === '@nx/nuxt/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 = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
+    const e2eWebServerAddress = `http://localhost:${e2ePort}`;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
@@ -34,6 +52,9 @@ async function normalizeOptions(host, options, callingGenerator = '@nx/nuxt:appl
         appProjectRoot,
         e2eProjectName,
         e2eProjectRoot,
+        e2eWebServerAddress,
+        e2eWebServerTarget,
+        e2ePort,
         parsedTags,
         style: options.style ?? 'none',
     };

package/src/generators/application/schema.d.ts

@@ -22,5 +22,8 @@ export interface NormalizedSchema extends Schema {
   appProjectRoot: string;
   e2eProjectName: string;
   e2eProjectRoot: string;
+  e2eWebServerAddress: string;
+  e2eWebServerTarget: string;
+  e2ePort: number;
   parsedTags: string[];
 }