@nx/react 0.0.0-pr-27504-f64ce1f → 0.0.0-pr-27652-a15068b

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "0.0.0-pr-27504-f64ce1f",
+  "version": "0.0.0-pr-27652-a15068b",
   "private": false,
   "description": "The React plugin for Nx contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Vitest, Playwright, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -39,11 +39,11 @@
     "minimatch": "9.0.3",
     "tslib": "^2.3.0",
     "@module-federation/enhanced": "~0.2.3",
-    "@nx/devkit": "0.0.0-pr-27504-f64ce1f",
-    "@nx/js": "0.0.0-pr-27504-f64ce1f",
-    "@nx/eslint": "0.0.0-pr-27504-f64ce1f",
-    "@nx/web": "0.0.0-pr-27504-f64ce1f",
-    "@nrwl/react": "0.0.0-pr-27504-f64ce1f"
+    "@nx/devkit": "0.0.0-pr-27652-a15068b",
+    "@nx/js": "0.0.0-pr-27652-a15068b",
+    "@nx/eslint": "0.0.0-pr-27652-a15068b",
+    "@nx/web": "0.0.0-pr-27652-a15068b",
+    "@nrwl/react": "0.0.0-pr-27652-a15068b"
   },
   "publishConfig": {
     "access": "public"

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

@@ -11,21 +11,6 @@ const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaul
 async function addE2e(tree, options) {
     const hasNxBuildPlugin = (options.bundler === 'webpack' && (0, has_webpack_plugin_1.hasWebpackPlugin)(tree)) ||
         (options.bundler === 'vite' && (0, has_vite_plugin_1.hasVitePlugin)(tree));
-    let e2eWebServerInfo = {
-        e2eWebServerAddress: `http://localhost:${options.devServerPort ?? 4200}`,
-        e2eWebServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx run ${options.projectName}:serve`,
-        e2eCiWebServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx run ${options.projectName}:serve-static`,
-        e2eCiBaseUrl: `http://localhost:4200`,
-        e2eDevServerTarget: `${options.projectName}:serve`,
-    };
-    if (options.bundler === 'webpack') {
-        const { getWebpackE2EWebServerInfo } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_1.nxVersion);
-        e2eWebServerInfo = await getWebpackE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `webpack.config.${options.js ? 'js' : 'ts'}`), options.addPlugin, options.devServerPort ?? 4200);
-    }
-    else if (options.bundler === 'vite') {
-        const { getViteE2EWebServerInfo } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
-        e2eWebServerInfo = await getViteE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `vite.config.${options.js ? 'js' : 'ts'}`), options.addPlugin, options.devServerPort ?? 4200);
-    }
     if (!hasNxBuildPlugin) {
         await (0, web_1.webStaticServeGenerator)(tree, {
             buildTarget: `${options.projectName}:build`,
@@ -51,20 +36,20 @@ async function addE2e(tree, options) {
                 // the name and root are already normalized, instruct the generator to use them as is
                 bundler: options.bundler === 'rspack' ? 'webpack' : options.bundler,
                 skipFormat: true,
-                devServerTarget: e2eWebServerInfo.e2eDevServerTarget,
-                baseUrl: e2eWebServerInfo.e2eWebServerAddress,
+                devServerTarget: `${options.projectName}:${options.e2eWebServerTarget}`,
+                baseUrl: options.e2eWebServerAddress,
                 jsx: true,
                 rootProject: options.rootProject,
                 webServerCommands: hasNxBuildPlugin
                     ? {
-                        default: e2eWebServerInfo.e2eWebServerCommand,
-                        production: e2eWebServerInfo.e2eCiWebServerCommand,
+                        default: `nx run ${options.projectName}:${options.e2eWebServerTarget}`,
+                        production: `nx run ${options.projectName}:preview`,
                     }
                     : undefined,
                 ciWebServerCommand: hasNxBuildPlugin
-                    ? e2eWebServerInfo.e2eCiWebServerCommand
+                    ? `nx run ${options.projectName}:${options.e2eCiWebServerTarget}`
                     : undefined,
-                ciBaseUrl: e2eWebServerInfo.e2eCiBaseUrl,
+                ciBaseUrl: options.bundler === 'vite' ? options.e2eCiBaseUrl : undefined,
             });
             if (options.addPlugin ||
                 (0, devkit_1.readNxJson)(tree).plugins?.find((p) => typeof p === 'string'
@@ -103,8 +88,8 @@ async function addE2e(tree, options) {
                 js: false,
                 linter: options.linter,
                 setParserOptionsProject: options.setParserOptionsProject,
-                webServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
-                webServerAddress: e2eWebServerInfo.e2eCiBaseUrl,
+                webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx run ${options.projectName}:${options.e2eCiWebServerTarget}`,
+                webServerAddress: options.e2eCiBaseUrl,
                 rootProject: options.rootProject,
                 addPlugin: options.addPlugin,
             });

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

@@ -32,8 +32,45 @@ async function normalizeOptions(host, options, callingGenerator = '@nx/react:app
     options.addPlugin ??= addPlugin;
     options.rootProject = appProjectRoot === '.';
     options.projectNameAndRootFormat = projectNameAndRootFormat;
+    let e2ePort = options.devServerPort ?? 4200;
+    let e2eWebServerTarget = 'serve';
+    let e2eCiWebServerTarget = options.bundler === 'vite' ? 'preview' : 'serve-static';
+    if (options.addPlugin) {
+        if (nxJson.plugins) {
+            for (const plugin of nxJson.plugins) {
+                if (options.bundler === 'vite' &&
+                    typeof plugin === 'object' &&
+                    plugin.plugin === '@nx/vite/plugin') {
+                    e2eCiWebServerTarget =
+                        plugin.options?.previewTargetName ??
+                            e2eCiWebServerTarget;
+                    e2eWebServerTarget =
+                        plugin.options?.serveTargetName ??
+                            e2eWebServerTarget;
+                }
+                else if (options.bundler === 'webpack' &&
+                    typeof plugin === 'object' &&
+                    plugin.plugin === '@nx/webpack/plugin') {
+                    e2eCiWebServerTarget =
+                        plugin.options?.serveStaticTargetName ??
+                            e2eCiWebServerTarget;
+                    e2eWebServerTarget =
+                        plugin.options?.serveTargetName ??
+                            e2eWebServerTarget;
+                }
+            }
+        }
+    }
+    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 e2eCiBaseUrl = options.bundler === 'vite'
+        ? 'http://localhost:4300'
+        : `http://localhost:${e2ePort}`;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
@@ -49,6 +86,11 @@ async function normalizeOptions(host, options, callingGenerator = '@nx/react:app
         appProjectRoot,
         e2eProjectName,
         e2eProjectRoot,
+        e2eWebServerAddress,
+        e2eWebServerTarget,
+        e2eCiWebServerTarget,
+        e2eCiBaseUrl,
+        e2ePort,
         parsedTags,
         fileName,
         styledModule,

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

@@ -37,6 +37,11 @@ export interface NormalizedSchema<T extends Schema = Schema> extends T {
   appProjectRoot: string;
   e2eProjectName: string;
   e2eProjectRoot: string;
+  e2eWebServerAddress: string;
+  e2eWebServerTarget: string;
+  e2eCiWebServerTarget: string;
+  e2eCiBaseUrl: string;
+  e2ePort: number;
   parsedTags: string[];
   fileName: string;
   styledModule: null | SupportedStyles;