@nx/react 0.0.0-pr-29114-4447aa0 → 0.0.0-pr-29156-41ae81c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "0.0.0-pr-29114-4447aa0",
+  "version": "0.0.0-pr-29156-41ae81c",
   "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": "0.0.0-pr-29114-4447aa0",
-    "@nx/js": "0.0.0-pr-29114-4447aa0",
-    "@nx/eslint": "0.0.0-pr-29114-4447aa0",
-    "@nx/web": "0.0.0-pr-29114-4447aa0",
-    "@nx/module-federation": "0.0.0-pr-29114-4447aa0",
+    "@nx/devkit": "0.0.0-pr-29156-41ae81c",
+    "@nx/js": "0.0.0-pr-29156-41ae81c",
+    "@nx/eslint": "0.0.0-pr-29156-41ae81c",
+    "@nx/web": "0.0.0-pr-29156-41ae81c",
+    "@nx/module-federation": "0.0.0-pr-29156-41ae81c",
     "express": "^4.19.2",
     "http-proxy-middleware": "^3.0.3"
   },

package/src/generators/application/application.js

@@ -27,6 +27,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) {
@@ -170,6 +171,9 @@ async function applicationGeneratorInternal(host, schema) {
             plugins: ['react()'],
         }, false);
     }
+    else if (options.bundler === 'rspack') {
+        (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);
         const vitestTask = await vitestGenerator(host, {

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

@@ -6,12 +6,10 @@ const web_1 = require("@nx/web");
 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");
-const has_rspack_plugin_1 = require("../../../utils/has-rspack-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)) ||
         (options.bundler === 'vite' && (0, has_vite_plugin_1.hasVitePlugin)(tree));
     let e2eWebServerInfo = {
         e2eWebServerAddress: `http://localhost:${options.devServerPort ?? 4200}`,

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);
+}

package/src/generators/host/files/rspack-module-federation/rspack.config.js__tmpl__

@@ -1,5 +1,5 @@
 const { composePlugins, withNx, withReact } = require('@nx/rspack');
-const { withModuleFederation } = require('@nx/module-federation/rspack');
+const { withModuleFederation } = require('@nx/rspack/module-federation');
 
 const baseConfig = require('./module-federation.config');
 

package/src/generators/host/files/rspack-module-federation/rspack.config.prod.js__tmpl__

@@ -1,5 +1,5 @@
 const { composePlugins, withNx, withReact } = require('@nx/rspack');
-const { withModuleFederation } = require('@nx/module-federation/rspack');
+const { withModuleFederation } = require('@nx/rspack/module-federation');
 
 const baseConfig = require('./module-federation.config');
 

package/src/generators/host/files/rspack-module-federation-ssr/rspack.server.config.js__tmpl__

@@ -1,5 +1,5 @@
 const {composePlugins, withNx, withReact} = require('@nx/rspack');
-const {withModuleFederationForSSR} = require('@nx/module-federation/rspack');
+const {withModuleFederationForSSR} = require('@nx/rspack/module-federation');
 
 const baseConfig = require('./module-federation.config');
 

package/src/generators/host/files/rspack-module-federation-ssr-ts/rspack.server.config.ts__tmpl__

@@ -1,5 +1,5 @@
 import {composePlugins, withNx, withReact} from '@nx/rspack';
-import {withModuleFederationForSSR} from '@nx/module-federation/rspack';
+import {withModuleFederationForSSR} from '@nx/rspack/module-federation';
 
 import baseConfig from './module-federation.config';
 

package/src/generators/host/files/rspack-module-federation-ts/rspack.config.prod.ts__tmpl__

@@ -1,5 +1,5 @@
 import { composePlugins, withNx, withReact } from '@nx/rspack';
-import { withModuleFederation } from '@nx/module-federation/rspack';
+import { withModuleFederation } from '@nx/rspack/module-federation';
 import { ModuleFederationConfig } from '@nx/module-federation';
 
 import baseConfig from './module-federation.config';

package/src/generators/host/files/rspack-module-federation-ts/rspack.config.ts__tmpl__

@@ -1,5 +1,5 @@
 import {composePlugins, withNx, withReact} from '@nx/rspack';
-import { withModuleFederation } from '@nx/module-federation/rspack';
+import { withModuleFederation } from '@nx/rspack/module-federation';
 import { ModuleFederationConfig } from '@nx/module-federation';
 
 import baseConfig from './module-federation.config';

package/src/generators/remote/files/rspack-module-federation/rspack.config.js__tmpl__

@@ -1,5 +1,5 @@
 const { composePlugins, withNx, withReact } = require('@nx/rspack');
-const { withModuleFederation } = require('@nx/module-federation/rspack');
+const { withModuleFederation } = require('@nx/rspack/module-federation');
 
 const baseConfig = require('./module-federation.config');
 

package/src/generators/remote/files/rspack-module-federation-ssr/rspack.server.config.js__tmpl__

@@ -1,5 +1,5 @@
 const {composePlugins, withNx, withReact} = require('@nx/rspack');
-const {withModuleFederationForSSR} = require('@nx/module-federation/rspack');
+const {withModuleFederationForSSR} = require('@nx/rspack/module-federation');
 
 const baseConfig = require("./module-federation.server.config");
 

package/src/generators/remote/files/rspack-module-federation-ssr-ts/rspack.server.config.ts__tmpl__

@@ -1,5 +1,5 @@
 import {composePlugins, withNx, withReact} from '@nx/rspack';
-import {withModuleFederationForSSR} from '@nx/module-federation/rspack';
+import {withModuleFederationForSSR} from '@nx/rspack/module-federation';
 
 import baseConfig from "./module-federation.server.config";
 

package/src/generators/remote/files/rspack-module-federation-ts/rspack.config.ts__tmpl__

@@ -1,5 +1,5 @@
 import {composePlugins, withNx, withReact} from '@nx/rspack';
-import {withModuleFederation} from '@nx/module-federation/rspack';
+import {withModuleFederation} from '@nx/rspack/module-federation';
 
 import baseConfig from './module-federation.config';
 

package/src/migrations/update-20-2-0/migrate-mf-imports-to-new-package.js

@@ -14,9 +14,6 @@ async function migrateMfImportsToNewPackage(tree) {
     const rootsToCheck = new Set();
     const graph = await (0, devkit_1.createProjectGraphAsync)();
     for (const [project, dependencies] of Object.entries(graph.dependencies)) {
-        if (!graph.nodes[project]) {
-            continue;
-        }
         const usesNxWebpackOrRspack = dependencies.some((dep) => dep.target === 'npm:@nx/webpack' || dep.target === 'npm:@nx/rspack');
         if (usesNxWebpackOrRspack) {
             const root = graph.nodes[project].data.root;

package/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.js

@@ -4,7 +4,7 @@ exports.default = migrateWithMfImport;
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
-const NX_RSPACK_MODULE_FEDERATION_IMPORT_SELECTOR = 'ImportDeclaration > StringLiteral[value=@nx/react/module-federation], VariableStatement CallExpression:has(Identifier[name=require]) > StringLiteral[value=@nx/react/module-federation]';
+const NX_ANGULAR_MODULE_FEDERATION_IMPORT_SELECTOR = 'ImportDeclaration > StringLiteral[value=@nx/react/module-federation], VariableStatement CallExpression:has(Identifier[name=require]) > StringLiteral[value=@nx/react/module-federation]';
 const NEW_IMPORT_PATH = `'@nx/module-federation/webpack'`;
 async function migrateWithMfImport(tree) {
     const projects = new Set();
@@ -22,7 +22,7 @@ async function migrateWithMfImport(tree) {
                 return;
             }
             const ast = tsquery_1.tsquery.ast(contents);
-            const importNodes = (0, tsquery_1.tsquery)(ast, NX_RSPACK_MODULE_FEDERATION_IMPORT_SELECTOR);
+            const importNodes = (0, tsquery_1.tsquery)(ast, NX_ANGULAR_MODULE_FEDERATION_IMPORT_SELECTOR);
             if (importNodes.length === 0) {
                 return;
             }

package/src/utils/build-static.remotes.d.ts

@@ -1,4 +1,4 @@
-import { StaticRemotesConfig } from '@nx/module-federation/src/utils';
+import type { StaticRemotesConfig } from '@nx/webpack/src/utils/module-federation/parse-static-remotes-config';
 import { ExecutorContext } from '@nx/devkit';
 import { ModuleFederationDevServerOptions } from '../executors/module-federation-dev-server/schema';
 export declare function buildStaticRemotes(staticRemotesConfig: StaticRemotesConfig, nxBin: any, context: ExecutorContext, options: ModuleFederationDevServerOptions): Promise<Record<string, string>>;