@nx/react 19.6.0-canary.20240731-341f295 → 19.6.0-canary.20240803-bd7a2c9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "19.6.0-canary.20240731-341f295",
+  "version": "19.6.0-canary.20240803-bd7a2c9",
   "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": "19.6.0-canary.20240731-341f295",
-    "@nx/js": "19.6.0-canary.20240731-341f295",
-    "@nx/eslint": "19.6.0-canary.20240731-341f295",
-    "@nx/web": "19.6.0-canary.20240731-341f295",
-    "@nrwl/react": "19.6.0-canary.20240731-341f295"
+    "@nx/devkit": "19.6.0-canary.20240803-bd7a2c9",
+    "@nx/js": "19.6.0-canary.20240803-bd7a2c9",
+    "@nx/eslint": "19.6.0-canary.20240803-bd7a2c9",
+    "@nx/web": "19.6.0-canary.20240803-bd7a2c9",
+    "@nrwl/react": "19.6.0-canary.20240803-bd7a2c9"
   },
   "publishConfig": {
     "access": "public"

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

@@ -7,17 +7,17 @@ const versions_1 = require("../../../utils/versions");
 const has_webpack_plugin_1 = require("../../../utils/has-webpack-plugin");
 const has_vite_plugin_1 = require("../../../utils/has-vite-plugin");
 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));
+    if (!hasNxBuildPlugin) {
+        await (0, web_1.webStaticServeGenerator)(tree, {
+            buildTarget: `${options.projectName}:build`,
+            targetName: 'serve-static',
+            spa: true,
+        });
+    }
     switch (options.e2eTestRunner) {
         case 'cypress': {
-            const hasNxBuildPlugin = (options.bundler === 'webpack' && (0, has_webpack_plugin_1.hasWebpackPlugin)(tree)) ||
-                (options.bundler === 'vite' && (0, has_vite_plugin_1.hasVitePlugin)(tree));
-            if (!hasNxBuildPlugin) {
-                await (0, web_1.webStaticServeGenerator)(tree, {
-                    buildTarget: `${options.projectName}:build`,
-                    targetName: 'serve-static',
-                    spa: true,
-                });
-            }
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
             (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
                 projectType: 'application',
@@ -45,8 +45,9 @@ async function addE2e(tree, options) {
                     }
                     : undefined,
                 ciWebServerCommand: hasNxBuildPlugin
-                    ? `nx run ${options.projectName}:serve-static`
+                    ? `nx run ${options.projectName}:${options.e2eCiWebServerTarget}`
                     : undefined,
+                ciBaseUrl: options.bundler === 'vite' ? options.e2eCiBaseUrl : undefined,
             });
         }
         case 'playwright': {
@@ -66,8 +67,8 @@ async function addE2e(tree, options) {
                 js: false,
                 linter: options.linter,
                 setParserOptionsProject: options.setParserOptionsProject,
-                webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx ${options.e2eWebServerTarget} ${options.name}`,
-                webServerAddress: options.e2eWebServerAddress,
+                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,28 +32,35 @@ 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' &&
-                    plugin.options.serveTargetName) {
-                    e2eWebServerTarget = plugin.options
-                        .serveTargetName;
+                    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' &&
-                    plugin.options.serveTargetName) {
-                    e2eWebServerTarget = plugin.options
-                        .serveTargetName;
+                    plugin.plugin === '@nx/webpack/plugin') {
+                    e2eCiWebServerTarget =
+                        plugin.options?.serveStaticTargetName ??
+                            e2eCiWebServerTarget;
+                    e2eWebServerTarget =
+                        plugin.options?.serveTargetName ??
+                            e2eWebServerTarget;
                 }
             }
         }
     }
-    let e2ePort = options.devServerPort ?? 4200;
     if (nxJson.targetDefaults?.[e2eWebServerTarget] &&
         nxJson.targetDefaults?.[e2eWebServerTarget].options?.port) {
         e2ePort = nxJson.targetDefaults?.[e2eWebServerTarget].options?.port;
@@ -61,6 +68,9 @@ async function normalizeOptions(host, options, callingGenerator = '@nx/react:app
     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())
         : [];
@@ -78,6 +88,8 @@ async function normalizeOptions(host, options, callingGenerator = '@nx/react:app
         e2eProjectRoot,
         e2eWebServerAddress,
         e2eWebServerTarget,
+        e2eCiWebServerTarget,
+        e2eCiBaseUrl,
         e2ePort,
         parsedTags,
         fileName,

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

@@ -38,6 +38,8 @@ export interface NormalizedSchema<T extends Schema = Schema> extends T {
   e2eProjectRoot: string;
   e2eWebServerAddress: string;
   e2eWebServerTarget: string;
+  e2eCiWebServerTarget: string;
+  e2eCiBaseUrl: string;
   e2ePort: number;
   parsedTags: string[];
   fileName: string;