@nx/react 21.0.0-beta.4 → 21.0.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "21.0.0-beta.4",
+  "version": "21.0.0-beta.6",
   "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": {
@@ -38,11 +38,11 @@
     "minimatch": "9.0.3",
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "21.0.0-beta.4",
-    "@nx/js": "21.0.0-beta.4",
-    "@nx/eslint": "21.0.0-beta.4",
-    "@nx/web": "21.0.0-beta.4",
-    "@nx/module-federation": "21.0.0-beta.4",
+    "@nx/devkit": "21.0.0-beta.6",
+    "@nx/js": "21.0.0-beta.6",
+    "@nx/eslint": "21.0.0-beta.6",
+    "@nx/web": "21.0.0-beta.6",
+    "@nx/module-federation": "21.0.0-beta.6",
     "express": "^4.21.2",
     "http-proxy-middleware": "^3.0.3",
     "semver": "^7.6.3"

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

@@ -8,8 +8,6 @@ const has_webpack_plugin_1 = require("../../../utils/has-webpack-plugin");
 const has_vite_plugin_1 = require("../../../utils/has-vite-plugin");
 const has_rspack_plugin_1 = require("../../../utils/has-rspack-plugin");
 const has_rsbuild_plugin_1 = require("../../../utils/has-rsbuild-plugin");
-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(tree, options) {
     const hasNxBuildPlugin = (options.bundler === 'webpack' && (0, has_webpack_plugin_1.hasWebpackPlugin)(tree)) ||
         (options.bundler === 'rspack' && (0, has_rspack_plugin_1.hasRspackPlugin)(tree)) ||
@@ -90,35 +88,13 @@ async function addE2e(tree, options) {
                 baseUrl: e2eWebServerInfo.e2eWebServerAddress,
                 jsx: true,
                 rootProject: options.rootProject,
-                webServerCommands: hasNxBuildPlugin
-                    ? {
-                        default: e2eWebServerInfo.e2eWebServerCommand,
-                        production: e2eWebServerInfo.e2eCiWebServerCommand,
-                    }
-                    : undefined,
-                ciWebServerCommand: hasNxBuildPlugin
-                    ? e2eWebServerInfo.e2eCiWebServerCommand
-                    : undefined,
+                webServerCommands: {
+                    default: e2eWebServerInfo.e2eWebServerCommand,
+                    production: e2eWebServerInfo.e2eCiWebServerCommand,
+                },
+                ciWebServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
                 ciBaseUrl: e2eWebServerInfo.e2eCiBaseUrl,
             });
-            if (options.addPlugin ||
-                (0, devkit_1.readNxJson)(tree).plugins?.find((p) => typeof p === 'string'
-                    ? p === '@nx/cypress/plugin'
-                    : p.plugin === '@nx/cypress/plugin')) {
-                let buildTarget = '^build';
-                if (hasNxBuildPlugin) {
-                    const configFile = options.bundler === 'webpack'
-                        ? 'webpack.config.js'
-                        : options.bundler === 'vite'
-                            ? `vite.config.${options.js ? 'js' : 'ts'}`
-                            : 'webpack.config.js';
-                    const matchingPlugin = await (0, find_plugin_for_config_file_1.findPluginForConfigFile)(tree, `@nx/${options.bundler}/plugin`, (0, devkit_1.joinPathFragments)(options.appProjectRoot, configFile));
-                    if (matchingPlugin && typeof matchingPlugin !== 'string') {
-                        buildTarget = `^${matchingPlugin.options?.buildTargetName ?? 'build'}`;
-                    }
-                }
-                await (0, target_defaults_utils_1.addE2eCiTargetDefaults)(tree, '@nx/cypress/plugin', buildTarget, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, `cypress.config.${options.js ? 'js' : 'ts'}`));
-            }
             return e2eTask;
         }
         case 'playwright': {
@@ -159,24 +135,6 @@ async function addE2e(tree, options) {
                 rootProject: options.rootProject,
                 addPlugin: options.addPlugin,
             });
-            if (options.addPlugin ||
-                (0, devkit_1.readNxJson)(tree).plugins?.find((p) => typeof p === 'string'
-                    ? p === '@nx/playwright/plugin'
-                    : p.plugin === '@nx/playwright/plugin')) {
-                let buildTarget = '^build';
-                if (hasNxBuildPlugin) {
-                    const configFile = options.bundler === 'webpack'
-                        ? 'webpack.config.js'
-                        : options.bundler === 'vite'
-                            ? `vite.config.${options.js ? 'js' : 'ts'}`
-                            : 'webpack.config.js';
-                    const matchingPlugin = await (0, find_plugin_for_config_file_1.findPluginForConfigFile)(tree, `@nx/${options.bundler}/plugin`, (0, devkit_1.joinPathFragments)(options.appProjectRoot, configFile));
-                    if (matchingPlugin && typeof matchingPlugin !== 'string') {
-                        buildTarget = `^${matchingPlugin.options?.buildTargetName ?? 'build'}`;
-                    }
-                }
-                await (0, target_defaults_utils_1.addE2eCiTargetDefaults)(tree, '@nx/playwright/plugin', buildTarget, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, `playwright.config.ts`));
-            }
             return e2eTask;
         }
         case 'none':

package/src/generators/library/schema.json

@@ -7,12 +7,12 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g lib mylib --directory=myapp",
-      "description": "Generate `libs/myapp/mylib`"
+      "command": "nx g @nx/react:lib libs/mylib",
+      "description": "Generate a library under `libs/mylib`"
     },
     {
-      "command": "nx g lib mylib --appProject=myapp",
-      "description": "Generate a library with routes and add them to `myapp`"
+      "command": "nx g @nx/react:lib mylib --appProject=myapp",
+      "description": "Generate a library under mylib with routes and add them to `myapp`"
     }
   ],
   "properties": {

package/src/plugins/router-plugin.js

@@ -135,6 +135,7 @@ async function getBuildPaths(reactRouterConfig, isLibMode) {
 }
 async function devTarget(projectRoot, isUsingTsSolutionSetup) {
     const devTarget = {
+        continuous: true,
         command: 'react-router dev',
         options: { cwd: projectRoot },
     };
@@ -148,6 +149,7 @@ async function startTarget(projectRoot, serverBuildPath, buildTargetName, isUsin
         ? `${serverBuildPath}/index.js`
         : serverBuildPath;
     const startTarget = {
+        continuous: true,
         dependsOn: [buildTargetName],
         command: `react-router-serve ${serverPath}`,
         options: { cwd: projectRoot },