@nx/react 20.1.0-canary.20241017-c902036 → 20.1.0-canary.20241019-19e765f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "20.1.0-canary.20241017-c902036",
+  "version": "20.1.0-canary.20241019-19e765f",
   "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,10 +39,10 @@
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
     "@module-federation/enhanced": "0.6.9",
-    "@nx/devkit": "20.1.0-canary.20241017-c902036",
-    "@nx/js": "20.1.0-canary.20241017-c902036",
-    "@nx/eslint": "20.1.0-canary.20241017-c902036",
-    "@nx/web": "20.1.0-canary.20241017-c902036",
+    "@nx/devkit": "20.1.0-canary.20241019-19e765f",
+    "@nx/js": "20.1.0-canary.20241019-19e765f",
+    "@nx/eslint": "20.1.0-canary.20241019-19e765f",
+    "@nx/web": "20.1.0-canary.20241019-19e765f",
     "express": "^4.19.2",
     "http-proxy-middleware": "^3.0.0"
   },

package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js

@@ -130,8 +130,8 @@ async function* moduleFederationDevServer(options, context) {
     options.staticRemotesPort ??= remotes.staticRemotePort;
     // Set NX_MF_DEV_REMOTES for the Nx Runtime Library Control Plugin
     process.env.NX_MF_DEV_REMOTES = JSON.stringify([
-        ...(remotes.devRemotes.map((r) => typeof r === 'string' ? r : r.remoteName) ?? []),
-        p.name,
+        ...(remotes.devRemotes.map((r) => typeof r === 'string' ? r : r.remoteName) ?? []).map((r) => r.replace(/-/g, '_')),
+        p.name.replace(/-/g, '_'),
     ]);
     const staticRemotesConfig = (0, parse_static_remotes_config_1.parseStaticRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
     const mappedLocationsOfStaticRemotes = await (0, build_static_remotes_1.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options);

package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js

@@ -164,8 +164,8 @@ async function* moduleFederationSsrDevServer(ssrDevServerOptions, context) {
     }, pathToManifestFile);
     options.staticRemotesPort ??= remotes.staticRemotePort;
     process.env.NX_MF_DEV_REMOTES = JSON.stringify([
-        ...(remotes.devRemotes.map((r) => typeof r === 'string' ? r : r.remoteName) ?? []),
-        projectConfig.name,
+        ...(remotes.devRemotes.map((r) => typeof r === 'string' ? r : r.remoteName) ?? []).map((r) => r.replace(/-/g, '_')),
+        projectConfig.name.replace(/-/g, '_'),
     ]);
     const staticRemotesConfig = (0, parse_static_remotes_config_1.parseStaticSsrRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
     const mappedLocationsOfStaticRemotes = await buildSsrStaticRemotes(staticRemotesConfig, nxBin, context, options);

package/src/generators/application/application.js

@@ -28,6 +28,7 @@ const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-projec
 const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
 const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const add_project_root_to_rspack_plugin_excludes_1 = require("./lib/add-project-root-to-rspack-plugin-excludes");
 async function addLinting(host, options) {
     const tasks = [];
     if (options.linter === eslint_1.Linter.EsLint) {
@@ -176,6 +177,7 @@ async function applicationGeneratorInternal(host, schema) {
             framework: 'react',
         });
         tasks.push(rspackTask);
+        (0, add_project_root_to_rspack_plugin_excludes_1.addProjectRootToRspackPluginExcludesIfExists)(host, options.appProjectRoot);
     }
     if (options.bundler !== 'vite' && options.unitTestRunner === 'vitest') {
         const { createOrEditViteConfig, vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);

package/src/generators/application/files/base-rspack/src/main.tsx__tmpl__

@@ -3,6 +3,7 @@ import * as ReactDOM from 'react-dom/client';
 <% if (routing) { %>import { BrowserRouter } from 'react-router-dom';<% } %>
 
 import App from './app/<%= fileName %>';
+import './styles.<%= style %>'
 
 const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement);
 root.render(

package/src/generators/application/lib/add-project-root-to-rspack-plugin-excludes.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export declare function addProjectRootToRspackPluginExcludesIfExists(tree: Tree, projectRoot: string): void;

package/src/generators/application/lib/add-project-root-to-rspack-plugin-excludes.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addProjectRootToRspackPluginExcludesIfExists = addProjectRootToRspackPluginExcludesIfExists;
+const devkit_1 = require("@nx/devkit");
+const devkit_2 = require("@nx/devkit");
+function addProjectRootToRspackPluginExcludesIfExists(tree, projectRoot) {
+    const excludeProjectGlob = (0, devkit_1.joinPathFragments)(projectRoot, '/**');
+    const nxJson = (0, devkit_2.readNxJson)(tree);
+    if (!nxJson.plugins?.length) {
+        return;
+    }
+    for (let i = 0; i < nxJson.plugins.length; i++) {
+        let plugin = nxJson.plugins[i];
+        const isRspackPlugin = typeof plugin === 'string'
+            ? plugin === '@nx/rspack/plugin'
+            : plugin.plugin === '@nx/rspack/plugin';
+        if (isRspackPlugin) {
+            if (typeof plugin === 'string') {
+                plugin = {
+                    plugin: plugin,
+                    exclude: [excludeProjectGlob],
+                };
+            }
+            else {
+                plugin.exclude = [...(plugin.exclude ?? []), excludeProjectGlob];
+            }
+            nxJson.plugins[i] = plugin;
+        }
+    }
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+}