@nx/next 19.6.2 → 19.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "19.6.2",
+  "version": "19.6.4",
   "private": false,
   "description": "The Next.js plugin for Nx contains executors and generators for managing Next.js applications and libraries within an Nx workspace. It provides:\n\n\n- Scaffolding for creating, building, serving, linting, and testing Next.js applications.\n\n- Integration with building, serving, and exporting a Next.js application.\n\n- Integration with React libraries within the workspace. \n\nWhen using Next.js in Nx, you get the out-of-the-box support for TypeScript, Playwright, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
   "repository": {
@@ -35,7 +35,7 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "19.6.2",
+    "@nx/devkit": "19.6.4",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
@@ -46,14 +46,14 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "19.6.2",
-    "@nx/eslint": "19.6.2",
-    "@nx/react": "19.6.2",
-    "@nx/web": "19.6.2",
-    "@nx/webpack": "19.6.2",
-    "@nx/workspace": "19.6.2",
+    "@nx/js": "19.6.4",
+    "@nx/eslint": "19.6.4",
+    "@nx/react": "19.6.4",
+    "@nx/web": "19.6.4",
+    "@nx/webpack": "19.6.4",
+    "@nx/workspace": "19.6.4",
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nrwl/next": "19.6.2"
+    "@nrwl/next": "19.6.4"
   },
   "publishConfig": {
     "access": "public"

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

@@ -7,11 +7,13 @@ const versions_1 = require("../../../utils/versions");
 const web_1 = require("@nx/web");
 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");
+const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
 async function addE2e(host, options) {
     const nxJson = (0, devkit_1.readNxJson)(host);
     const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
         ? p === '@nx/next/plugin'
         : p.plugin === '@nx/next/plugin');
+    const e2eWebServerInfo = await getNextE2EWebServerInfo(host, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'next.config.js'), options.addPlugin);
     if (options.e2eTestRunner === 'cypress') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
         if (!hasPlugin) {
@@ -35,17 +37,16 @@ async function addE2e(host, options) {
             project: options.e2eProjectName,
             directory: 'src',
             skipFormat: true,
-            devServerTarget: `${options.projectName}:${options.e2eWebServerTarget}`,
-            baseUrl: options.e2eWebServerAddress,
+            devServerTarget: e2eWebServerInfo.e2eDevServerTarget,
+            baseUrl: e2eWebServerInfo.e2eWebServerAddress,
             jsx: true,
             webServerCommands: hasPlugin
                 ? {
-                    default: `nx run ${options.projectName}:${options.e2eWebServerTarget}`,
+                    default: e2eWebServerInfo.e2eWebServerCommand,
                 }
                 : undefined,
-            ciWebServerCommand: hasPlugin
-                ? `nx run ${options.projectName}:serve-static`
-                : undefined,
+            ciWebServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
+            ciBaseUrl: e2eWebServerInfo.e2eCiBaseUrl,
         });
         if (options.addPlugin ||
             (0, devkit_1.readNxJson)(host).plugins?.find((p) => typeof p === 'string'
@@ -80,8 +81,8 @@ async function addE2e(host, options) {
             js: false,
             linter: options.linter,
             setParserOptionsProject: options.setParserOptionsProject,
-            webServerAddress: `http://127.0.0.1:${options.e2ePort}`,
-            webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx ${options.e2eWebServerTarget} ${options.projectName}`,
+            webServerAddress: e2eWebServerInfo.e2eCiBaseUrl,
+            webServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
             addPlugin: options.addPlugin,
         });
         if (options.addPlugin ||
@@ -101,3 +102,24 @@ async function addE2e(host, options) {
     }
     return () => { };
 }
+async function getNextE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    let e2ePort = isPluginBeingAdded ? 3000 : 4200;
+    const defaultServeTarget = isPluginBeingAdded ? 'dev' : 'serve';
+    if (nxJson.targetDefaults?.[defaultServeTarget] &&
+        nxJson.targetDefaults?.[defaultServeTarget].options?.port) {
+        e2ePort = nxJson.targetDefaults?.[defaultServeTarget].options?.port;
+    }
+    return (0, e2e_web_server_info_utils_1.getE2EWebServerInfo)(tree, projectName, {
+        plugin: '@nx/next/plugin',
+        serveTargetName: 'devTargetName',
+        serveStaticTargetName: 'serveStaticTargetName',
+        configFilePath,
+    }, {
+        defaultServeTargetName: defaultServeTarget,
+        defaultServeStaticTargetName: 'serve-static',
+        defaultE2EWebServerAddress: `http://127.0.0.1:${e2ePort}`,
+        defaultE2ECiBaseUrl: `http://localhost:${e2ePort}`,
+        defaultE2EPort: e2ePort,
+    }, isPluginBeingAdded);
+}

package/src/generators/application/lib/normalize-options.d.ts

@@ -6,9 +6,6 @@ export interface NormalizedSchema extends Schema {
     outputPath: string;
     e2eProjectName: string;
     e2eProjectRoot: string;
-    e2eWebServerAddress: string;
-    e2eWebServerTarget: string;
-    e2ePort: number;
     parsedTags: string[];
     fileName: string;
     styledModule: null | string;

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

@@ -20,30 +20,8 @@ async function normalizeOptions(host, options) {
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPlugin;
-    let e2eWebServerTarget = options.addPlugin ? 'start' : 'serve';
-    if (options.addPlugin) {
-        if (nxJson.plugins) {
-            for (const plugin of nxJson.plugins) {
-                if (typeof plugin === 'object' &&
-                    plugin.plugin === '@nx/next/plugin' &&
-                    plugin.options.startTargetName) {
-                    e2eWebServerTarget = plugin.options
-                        .startTargetName;
-                }
-            }
-        }
-    }
-    let e2ePort = options.addPlugin ? 3000 : 4200;
-    if (nxJson.targetDefaults?.[e2eWebServerTarget] &&
-        (nxJson.targetDefaults?.[e2eWebServerTarget].options?.port ||
-            nxJson.targetDefaults?.[e2eWebServerTarget].options?.env?.PORT)) {
-        e2ePort =
-            nxJson.targetDefaults?.[e2eWebServerTarget].options?.port ||
-                nxJson.targetDefaults?.[e2eWebServerTarget].options?.env?.PORT;
-    }
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
-    const e2eWebServerAddress = `http://localhost:${e2ePort}`;
     const name = (0, devkit_1.names)(options.name).fileName;
     const outputPath = (0, devkit_1.joinPathFragments)('dist', appProjectRoot, ...(options.rootProject ? [name] : []));
     const parsedTags = options.tags
@@ -63,9 +41,6 @@ async function normalizeOptions(host, options) {
         appProjectRoot,
         e2eProjectName,
         e2eProjectRoot,
-        e2eWebServerAddress,
-        e2eWebServerTarget,
-        e2ePort,
         e2eTestRunner: options.e2eTestRunner || 'playwright',
         fileName,
         linter: options.linter || eslint_1.Linter.EsLint,