@nx/react 19.7.0-beta.3 → 19.7.0-beta.5

package/src/rules/update-module-federation-project.js

@@ -6,25 +6,57 @@ const versions_1 = require("../utils/versions");
 const maybe_js_1 = require("../utils/maybe-js");
 function updateModuleFederationProject(host, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
-    projectConfig.targets.build.options = {
-        ...projectConfig.targets.build.options,
-        main: (0, maybe_js_1.maybeJs)(options, `${options.appProjectRoot}/src/main.ts`),
-        webpackConfig: `${options.appProjectRoot}/webpack.config.${options.typescriptConfiguration && !options.js ? 'ts' : 'js'}`,
-    };
-    projectConfig.targets.build.configurations.production = {
-        ...projectConfig.targets.build.configurations.production,
-        webpackConfig: `${options.appProjectRoot}/webpack.config.prod.${options.typescriptConfiguration && !options.js ? 'ts' : 'js'}`,
-    };
+    if (options.bundler === 'rspack') {
+        projectConfig.targets.build.executor = '@nx/rspack:rspack';
+        projectConfig.targets.build.options = {
+            ...projectConfig.targets.build.options,
+            main: (0, maybe_js_1.maybeJs)({ js: options.js, useJsx: true }, `${options.appProjectRoot}/src/main.ts`),
+            rspackConfig: `${options.appProjectRoot}/rspack.config.${options.typescriptConfiguration && !options.js ? 'ts' : 'js'}`,
+            target: 'web',
+        };
+        projectConfig.targets.build.configurations.production = {
+            ...projectConfig.targets.build.configurations.production,
+            rspackConfig: `${options.appProjectRoot}/rspack.config.prod.${options.typescriptConfiguration && !options.js ? 'ts' : 'js'}`,
+        };
+    }
+    else {
+        projectConfig.targets.build.options = {
+            ...projectConfig.targets.build.options,
+            main: (0, maybe_js_1.maybeJs)(options, `${options.appProjectRoot}/src/main.ts`),
+            webpackConfig: `${options.appProjectRoot}/webpack.config.${options.typescriptConfiguration && !options.js ? 'ts' : 'js'}`,
+        };
+        projectConfig.targets.build.configurations.production = {
+            ...projectConfig.targets.build.configurations.production,
+            webpackConfig: `${options.appProjectRoot}/webpack.config.prod.${options.typescriptConfiguration && !options.js ? 'ts' : 'js'}`,
+        };
+    }
     // If host should be configured to use dynamic federation
     if (options.dynamic) {
-        const pathToProdWebpackConfig = (0, devkit_1.joinPathFragments)(projectConfig.root, `webpack.prod.config.${options.typescriptConfiguration && !options.js ? 'ts' : 'js'}`);
-        if (host.exists(pathToProdWebpackConfig)) {
-            host.delete(pathToProdWebpackConfig);
+        if (options.bundler === 'rspack') {
+            const pathToProdRspackConfig = (0, devkit_1.joinPathFragments)(projectConfig.root, `rspack.prod.config.${options.typescriptConfiguration && !options.js ? 'ts' : 'js'}`);
+            if (host.exists(pathToProdRspackConfig)) {
+                host.delete(pathToProdRspackConfig);
+            }
+            delete projectConfig.targets.build.configurations.production
+                ?.rspackConfig;
         }
-        delete projectConfig.targets.build.configurations.production?.webpackConfig;
+        else {
+            const pathToProdWebpackConfig = (0, devkit_1.joinPathFragments)(projectConfig.root, `webpack.prod.config.${options.typescriptConfiguration && !options.js ? 'ts' : 'js'}`);
+            if (host.exists(pathToProdWebpackConfig)) {
+                host.delete(pathToProdWebpackConfig);
+            }
+            delete projectConfig.targets.build.configurations.production
+                ?.webpackConfig;
+        }
+    }
+    if (options.bundler === 'rspack') {
+        projectConfig.targets.serve.executor =
+            '@nx/rspack:module-federation-dev-server';
+    }
+    else {
+        projectConfig.targets.serve.executor =
+            '@nx/react:module-federation-dev-server';
     }
-    projectConfig.targets.serve.executor =
-        '@nx/react:module-federation-dev-server';
     projectConfig.targets.serve.options.port = options.devServerPort;
     // `serve-static` for remotes that don't need to be in development mode
     projectConfig.targets['serve-static'] = {

package/src/utils/add-mf-env-to-inputs.js

@@ -22,6 +22,7 @@ function addMfEnvToTargetDefaultInputs(tree) {
     }
     if (!mfEnvVarExists) {
         nxJson.targetDefaults[webpackExecutor].inputs.push({ env: mfEnvVar });
-        (0, devkit_1.updateNxJson)(tree, nxJson);
     }
+    nxJson.targetDefaults[webpackExecutor].cache = true;
+    (0, devkit_1.updateNxJson)(tree, nxJson);
 }

package/src/utils/maybe-js.d.ts

@@ -1,3 +1,4 @@
 export declare function maybeJs(options: {
     js?: boolean;
+    useJsx?: boolean;
 }, path: string): string;

package/src/utils/maybe-js.js

@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.maybeJs = maybeJs;
 function maybeJs(options, path) {
     return options.js && (path.endsWith('.ts') || path.endsWith('.tsx'))
-        ? path.replace(/\.tsx?$/, '.js')
+        ? path.replace(/\.tsx?$/, options.useJsx ? '.jsx' : '.js')
         : path;
 }

package/src/utils/versions.d.ts

@@ -37,8 +37,8 @@ export declare const typesExpressVersion = "4.17.17";
 export declare const isbotVersion = "^3.6.5";
 export declare const corsVersion = "~2.8.5";
 export declare const typesCorsVersion = "~2.8.12";
-export declare const moduleFederationNodeVersion = "~2.4.0";
-export declare const moduleFederationEnhancedVersion = "~0.2.3";
+export declare const moduleFederationNodeVersion = "~2.5.0";
+export declare const moduleFederationEnhancedVersion = "~0.6.0";
 export declare const lessVersion = "3.12.2";
 export declare const sassVersion = "^1.55.0";
 export declare const rollupPluginUrlVersion = "^8.0.2";

package/src/utils/versions.js

@@ -43,8 +43,8 @@ exports.typesExpressVersion = '4.17.17';
 exports.isbotVersion = '^3.6.5';
 exports.corsVersion = '~2.8.5';
 exports.typesCorsVersion = '~2.8.12';
-exports.moduleFederationNodeVersion = '~2.4.0';
-exports.moduleFederationEnhancedVersion = '~0.2.3';
+exports.moduleFederationNodeVersion = '~2.5.0';
+exports.moduleFederationEnhancedVersion = '~0.6.0';
 // style preprocessors
 exports.lessVersion = '3.12.2';
 exports.sassVersion = '^1.55.0';