@nx/nuxt 19.6.2 → 19.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nuxt",
-  "version": "19.6.2",
+  "version": "19.6.4",
   "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, Playwright, 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": {
@@ -31,11 +31,11 @@
   "dependencies": {
     "tslib": "^2.3.0",
     "@nuxt/kit": "^3.10.0",
-    "@nx/devkit": "19.6.2",
-    "@nx/js": "19.6.2",
-    "@nx/eslint": "19.6.2",
-    "@nx/vue": "19.6.2",
-    "@nx/vite": "19.6.2",
+    "@nx/devkit": "19.6.4",
+    "@nx/js": "19.6.4",
+    "@nx/eslint": "19.6.4",
+    "@nx/vue": "19.6.4",
+    "@nx/vite": "19.6.4",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "peerDependencies": {},

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

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = addE2e;
 const devkit_1 = require("@nx/devkit");
+const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
 const versions_1 = require("../../../utils/versions");
 const find_plugin_for_config_file_1 = require("@nx/devkit/src/utils/find-plugin-for-config-file");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 async function addE2e(host, options) {
+    const e2eWebServerInfo = await getNuxtE2EWebServerInfo(host, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `nuxt.config.${options.js ? 'js' : 'ts'}`));
     if (options.e2eTestRunner === 'cypress') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
         (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
@@ -22,12 +24,13 @@ async function addE2e(host, options) {
             directory: 'src',
             bundler: 'vite',
             skipFormat: true,
-            devServerTarget: `${options.projectName}:${options.e2eWebServerTarget}`,
+            devServerTarget: e2eWebServerInfo.e2eDevServerTarget,
             webServerCommands: {
-                default: `${(0, devkit_1.getPackageManagerCommand)().exec} nx ${options.e2eWebServerTarget} ${options.projectName}`,
+                default: e2eWebServerInfo.e2eWebServerCommand,
             },
-            ciWebServerCommand: `nx run ${options.projectName}:serve-static`,
-            baseUrl: options.e2eWebServerAddress,
+            ciWebServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
+            baseUrl: e2eWebServerInfo.e2eWebServerAddress,
+            ciBaseUrl: e2eWebServerInfo.e2eCiBaseUrl,
             jsx: true,
             addPlugin: true,
         });
@@ -55,8 +58,8 @@ async function addE2e(host, options) {
             js: false,
             linter: options.linter,
             setParserOptionsProject: options.setParserOptionsProject,
-            webServerAddress: options.e2eWebServerAddress,
-            webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx ${options.e2eWebServerTarget} ${options.projectName}`,
+            webServerAddress: e2eWebServerInfo.e2eCiWebServerCommand,
+            webServerCommand: e2eWebServerInfo.e2eCiBaseUrl,
             addPlugin: true,
         });
         let buildTarget = '^build-static';
@@ -69,3 +72,23 @@ async function addE2e(host, options) {
     }
     return () => { };
 }
+async function getNuxtE2EWebServerInfo(tree, projectName, configFilePath) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    let e2ePort = 4200;
+    if (nxJson.targetDefaults?.['serve'] &&
+        nxJson.targetDefaults?.['serve'].options?.port) {
+        e2ePort = nxJson.targetDefaults?.['serve'].options?.port;
+    }
+    return (0, e2e_web_server_info_utils_1.getE2EWebServerInfo)(tree, projectName, {
+        plugin: '@nx/nuxt/plugin',
+        serveTargetName: 'serveTargetName',
+        serveStaticTargetName: 'serveStaticTargetName',
+        configFilePath,
+    }, {
+        defaultServeTargetName: 'serve',
+        defaultServeStaticTargetName: 'serve-static',
+        defaultE2EWebServerAddress: `http://localhost:${e2ePort}`,
+        defaultE2ECiBaseUrl: 'http://localhost:4200',
+        defaultE2EPort: e2ePort,
+    }, true);
+}

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

@@ -23,25 +23,8 @@ 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())
         : [];
@@ -52,9 +35,6 @@ 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

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