@nx/react 0.0.0-pr-29464-73fdcbb → 0.0.0-pr-30565-cfe2164

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

@@ -1,40 +1,17 @@
-import { NxAppRspackPlugin } from '@nx/rspack/app-plugin';
-import { NxReactRspackPlugin } from '@nx/rspack/react-plugin';
-import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/rspack';
-import { join } from 'path';
+import {composePlugins, withNx, withReact} from '@nx/rspack';
+import { withModuleFederation } from '@nx/module-federation/rspack';
+import { ModuleFederationConfig } from '@nx/module-federation';
 
-import config from './module-federation.config';
+import baseConfig from './module-federation.config';
 
-export default {
-  output: {
-    path: join(__dirname, '<%= rspackPluginOptions.outputPath %>'),
-    publicPath: 'auto'
-  },
-  devServer: {
-    port: <%= devServerPort %>,
-    historyApiFallback: {
-      index: '/index.html',
-      disableDotRule: true,
-      htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
-    },
-  },
-  plugins: [
-    new NxAppRspackPlugin({
-      tsConfig: '<%= rspackPluginOptions.tsConfig %>',
-      main: '<%= rspackPluginOptions.main %>',
-      index: '<%= rspackPluginOptions.index %>',
-      baseHref: '<%= rspackPluginOptions.baseHref %>',
-      assets: <%- JSON.stringify(rspackPluginOptions.assets) %>,
-      styles: <%- JSON.stringify(rspackPluginOptions.styles) %>,
-      outputHashing: process.env['NODE_ENV'] === 'production' ? 'all' : 'none',
-      optimization: process.env['NODE_ENV'] === 'production',
-    }),
-    new NxReactRspackPlugin({
-      // Uncomment this line if you don't want to use SVGR
-      // See: https://react-svgr.com/
-      // svgr: false
-    }),
-    new NxModuleFederationPlugin({ config }, { dts: false }),
-    new NxModuleFederationDevServerPlugin({ config }),
-  ],
+const config: ModuleFederationConfig = {
+  ...baseConfig,
 };
+
+// Nx plugins for rspack to build config object from Nx options and context.
+/**
+ * DTS Plugin is disabled in Nx Workspaces as Nx already provides Typing support for Module Federation
+ * The DTS Plugin can be enabled by setting dts: true
+ * Learn more about the DTS Plugin here: https://module-federation.io/configure/dts.html
+ */
+export default composePlugins(withNx(), withReact(), withModuleFederation(config, { dts: false }));

package/src/generators/host/host.js

@@ -16,14 +16,11 @@ const js_1 = require("@nx/js");
 const versions_1 = require("../../utils/versions");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const update_module_federation_tsconfig_1 = require("./lib/update-module-federation-tsconfig");
-const normalize_host_name_1 = require("./lib/normalize-host-name");
 async function hostGenerator(host, schema) {
     const tasks = [];
-    const name = await (0, normalize_host_name_1.normalizeHostName)(host, schema.directory, schema.name);
     const options = {
         ...(await (0, normalize_options_1.normalizeOptions)(host, {
             ...schema,
-            name,
             useProjectJson: true,
         })),
         js: schema.js ?? false,
@@ -31,8 +28,8 @@ async function hostGenerator(host, schema) {
             ? false
             : schema.typescriptConfiguration ?? true,
         dynamic: schema.dynamic ?? false,
-        // TODO(colum): remove when Webpack MF works with Crystal
-        addPlugin: !schema.bundler || schema.bundler === 'rspack' ? true : false,
+        // TODO(colum): remove when MF works with Crystal
+        addPlugin: false,
         bundler: schema.bundler ?? 'rspack',
     };
     // Check to see if remotes are provided and also check if --dynamic is provided
@@ -84,22 +81,25 @@ async function hostGenerator(host, schema) {
         }
     }
     (0, add_module_federation_files_1.addModuleFederationFiles)(host, options, remotesWithPorts);
-    (0, update_module_federation_project_1.updateModuleFederationProject)(host, options, true);
+    (0, update_module_federation_project_1.updateModuleFederationProject)(host, options);
     (0, update_module_federation_e2e_project_1.updateModuleFederationE2eProject)(host, options);
     (0, update_module_federation_tsconfig_1.updateModuleFederationTsconfig)(host, options);
     if (options.ssr) {
-        if (options.bundler !== 'rspack') {
-            const setupSsrTask = await (0, setup_ssr_1.default)(host, {
-                project: options.projectName,
-                serverPort: options.devServerPort,
-                skipFormat: true,
-            });
-            tasks.push(setupSsrTask);
-        }
+        const setupSsrTask = await (0, setup_ssr_1.default)(host, {
+            project: options.projectName,
+            serverPort: options.devServerPort,
+            skipFormat: true,
+        });
+        tasks.push(setupSsrTask);
         const setupSsrForHostTask = await (0, setup_ssr_for_host_1.setupSsrForHost)(host, options, options.projectName, remotesWithPorts);
         tasks.push(setupSsrForHostTask);
         const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
-        if (options.bundler !== 'rspack') {
+        if (options.bundler === 'rspack') {
+            projectConfig.targets.server.executor = '@nx/rspack:rspack';
+            projectConfig.targets.server.options.rspackConfig = (0, devkit_1.joinPathFragments)(projectConfig.root, `rspack.server.config.${options.typescriptConfiguration ? 'ts' : 'js'}`);
+            delete projectConfig.targets.server.options.webpackConfig;
+        }
+        else {
             projectConfig.targets.server.options.webpackConfig = (0, devkit_1.joinPathFragments)(projectConfig.root, `webpack.server.config.${options.typescriptConfiguration ? 'ts' : 'js'}`);
         }
         (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfig);

package/src/generators/host/lib/add-module-federation-files.js

@@ -3,35 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addModuleFederationFiles = addModuleFederationFiles;
 const devkit_1 = require("@nx/devkit");
 const maybe_js_1 = require("../../../utils/maybe-js");
-const create_application_files_1 = require("../../application/lib/create-application-files");
 function addModuleFederationFiles(host, options, defaultRemoteManifest) {
-    const templateVariables = options.bundler === 'rspack'
-        ? {
-            ...(0, create_application_files_1.getDefaultTemplateVariables)(host, options),
-            rspackPluginOptions: {
-                ...(0, create_application_files_1.createNxRspackPluginOptions)(options, (0, devkit_1.offsetFromRoot)(options.appProjectRoot), false),
-                mainServer: `./server.ts`,
-            },
-            static: !options?.dynamic,
-            remotes: defaultRemoteManifest.map(({ name, port }) => {
-                return {
-                    ...(0, devkit_1.names)(name),
-                    port,
-                };
-            }),
-        }
-        : {
-            ...(0, devkit_1.names)(options.projectName),
-            ...options,
-            static: !options?.dynamic,
-            tmpl: '',
-            remotes: defaultRemoteManifest.map(({ name, port }) => {
-                return {
-                    ...(0, devkit_1.names)(name),
-                    port,
-                };
-            }),
-        };
+    const templateVariables = {
+        ...(0, devkit_1.names)(options.projectName),
+        ...options,
+        static: !options?.dynamic,
+        tmpl: '',
+        remotes: defaultRemoteManifest.map(({ name, port }) => {
+            return {
+                ...(0, devkit_1.names)(name),
+                port,
+            };
+        }),
+    };
     const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     const pathToMFManifest = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'assets/module-federation.manifest.json');
     // Module federation requires bootstrap code to be dynamically imported.

package/src/generators/host/lib/setup-ssr-for-host.d.ts

@@ -1,6 +1,6 @@
-import { GeneratorCallback, Tree } from '@nx/devkit';
-import type { NormalizedSchema } from '../schema';
-export declare function setupSsrForHost(tree: Tree, options: NormalizedSchema, appName: string, defaultRemoteManifest: {
+import type { GeneratorCallback, Tree } from '@nx/devkit';
+import type { Schema } from '../schema';
+export declare function setupSsrForHost(tree: Tree, options: Schema, appName: string, defaultRemoteManifest: {
     name: string;
     port: number;
 }[]): Promise<GeneratorCallback>;

package/src/generators/host/lib/setup-ssr-for-host.js

@@ -2,59 +2,35 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSsrForHost = setupSsrForHost;
 const devkit_1 = require("@nx/devkit");
-const devkit_2 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
-const create_application_files_1 = require("../../application/lib/create-application-files");
 async function setupSsrForHost(tree, options, appName, defaultRemoteManifest) {
     const tasks = [];
-    let project = (0, devkit_2.readProjectConfiguration)(tree, appName);
-    if (options.bundler !== 'rspack') {
-        project.targets.serve.executor =
-            '@nx/react:module-federation-ssr-dev-server';
-        (0, devkit_2.updateProjectConfiguration)(tree, appName, project);
-    }
+    let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
+    project.targets.serve.executor =
+        options.bundler === 'rspack'
+            ? '@nx/rspack:module-federation-ssr-dev-server'
+            : '@nx/react:module-federation-ssr-dev-server';
+    (0, devkit_1.updateProjectConfiguration)(tree, appName, project);
     const pathToModuleFederationSsrFiles = options.typescriptConfiguration
         ? `${options.bundler === 'rspack' ? 'rspack-' : 'webpack-'}module-federation-ssr-ts`
         : `${options.bundler === 'rspack' ? 'rspack-' : 'webpack-'}module-federation-ssr`;
-    const templateVariables = options.bundler === 'rspack'
-        ? {
-            ...(0, create_application_files_1.getDefaultTemplateVariables)(tree, options),
-            rspackPluginOptions: {
-                ...(0, create_application_files_1.createNxRspackPluginOptions)(options, (0, devkit_1.offsetFromRoot)(options.appProjectRoot), false),
-                mainServer: `./server.ts`,
-            },
-            port: Number(options?.devServerPort) || 4200,
-            appName,
-            static: !options?.dynamic,
-            remotes: defaultRemoteManifest.map(({ name, port }) => {
-                return {
-                    ...(0, devkit_2.names)(name),
-                    port,
-                };
-            }),
-        }
-        : {
-            ...options,
-            static: !options?.dynamic,
-            port: Number(options?.devServerPort) || 4200,
-            appName,
-            tmpl: '',
-            browserBuildOutputPath: project.targets.build?.options?.outputPath,
-            remotes: defaultRemoteManifest.map(({ name, port }) => {
-                return {
-                    ...(0, devkit_2.names)(name),
-                    port,
-                };
-            }),
-        };
-    (0, devkit_2.generateFiles)(tree, (0, devkit_2.joinPathFragments)(__dirname, `../files/${pathToModuleFederationSsrFiles}`), project.root, templateVariables);
-    const installTask = (0, devkit_2.addDependenciesToPackageJson)(tree, {
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, `../files/${pathToModuleFederationSsrFiles}`), project.root, {
+        ...options,
+        static: !options?.dynamic,
+        port: Number(options?.devServerPort) || 4200,
+        remotes: defaultRemoteManifest.map(({ name, port }) => {
+            return {
+                ...(0, devkit_1.names)(name),
+                port,
+            };
+        }),
+        appName,
+        tmpl: '',
+        browserBuildOutputPath: project.targets.build.options.outputPath,
+    });
+    const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
         '@module-federation/node': versions_1.moduleFederationNodeVersion,
-        cors: versions_1.corsVersion,
-        isbot: versions_1.isbotVersion,
-        express: versions_1.expressVersion,
-        '@types/express': versions_1.typesExpressVersion,
     }, {});
     tasks.push(installTask);
-    return (0, devkit_2.runTasksInSerial)(...tasks);
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }

package/src/generators/library/library.js

@@ -190,7 +190,7 @@ async function libraryGeneratorInternal(host, schema) {
         });
         tasks.push(componentTask);
     }
-    if (options.publishable) {
+    if (options.publishable || options.buildable) {
         const projectConfiguration = (0, devkit_1.readProjectConfiguration)(host, options.name);
         if (options.isUsingTsSolutionConfig) {
             await (0, add_release_config_1.addReleaseConfigForTsSolution)(host, options.name, projectConfiguration);

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

@@ -1,43 +1,16 @@
-const { NxAppRspackPlugin } = require('@nx/rspack/app-plugin');
-const { NxReactRspackPlugin } = require('@nx/rspack/react-plugin');
-const { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } = require('@nx/module-federation/rspack');
-const { join } = require('path');
+const { composePlugins, withNx, withReact } = require('@nx/rspack');
+const { withModuleFederation } = require('@nx/module-federation/rspack');
 
-const config = require('./module-federation.config');
+const baseConfig = require('./module-federation.config');
 
-module.exports = {
-  output: {
-    path: join(__dirname, '<%= rspackPluginOptions.outputPath %>'),
-    publicPath: 'auto'
-  },
-  devServer: {
-    port: <%= devServerPort %>,
-    headers: {
-      "Access-Control-Allow-Origin": "*"
-    },
-    historyApiFallback: {
-      index: '/index.html',
-      disableDotRule: true,
-      htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
-    },
-  },
-  plugins: [
-    new NxAppRspackPlugin({
-      tsConfig: '<%= rspackPluginOptions.tsConfig %>',
-      main: '<%= rspackPluginOptions.main %>',
-      index: '<%= rspackPluginOptions.index %>',
-      baseHref: '<%= rspackPluginOptions.baseHref %>',
-      assets: <%- JSON.stringify(rspackPluginOptions.assets) %>,
-      styles: <%- JSON.stringify(rspackPluginOptions.styles) %>,
-      outputHashing: process.env['NODE_ENV'] === 'production' ? 'all' : 'none',
-      optimization: process.env['NODE_ENV'] === 'production',
-    }),
-    new NxReactRspackPlugin({
-      // Uncomment this line if you don't want to use SVGR
-      // See: https://react-svgr.com/
-      // svgr: false
-    }),
-    new NxModuleFederationPlugin({ config }, { dts: false }),
-    new NxModuleFederationDevServerPlugin({ config }),
-  ],
+const config = {
+  ...baseConfig,
 };
+
+// Nx plugins for rspack to build config object from Nx options and context.
+/**
+ * DTS Plugin is disabled in Nx Workspaces as Nx already provides Typing support Module Federation
+ * The DTS Plugin can be enabled by setting dts: true
+ * Learn more about the DTS Plugin here: https://module-federation.io/configure/dts.html
+ */
+module.exports = composePlugins(withNx(), withReact(), withModuleFederation(config, { dts: false }));

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

@@ -6,10 +6,4 @@ module.exports = {
   exposes: {
     './Module': './src/remote-entry.<%= js ? 'js' : 'ts' %>',
   },
-  shared: (libraryName, libraryConfig) => {
-      return {
-        ...libraryConfig,
-        eager: true
-      }
-    },
 };

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

@@ -0,0 +1,16 @@
+const {composePlugins, withNx, withReact} = require('@nx/rspack');
+const {withModuleFederationForSSR} = require('@nx/module-federation/rspack');
+
+const baseConfig = require("./module-federation.server.config");
+
+const defaultConfig = {
+  ...baseConfig,
+};
+
+// Nx plugins for rspack to build config object from Nx options and context.
+/**
+ * DTS Plugin is disabled in Nx Workspaces as Nx already provides Typing support Module Federation
+ * The DTS Plugin can be enabled by setting dts: true
+ * Learn more about the DTS Plugin here: https://module-federation.io/configure/dts.html
+ */
+module.exports = composePlugins(withNx(), withReact({ssr: true}), withModuleFederationForSSR(defaultConfig, { dts: false }));

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

@@ -7,8 +7,8 @@ import { handleRequest } from './src/main.server';
 const port = process.env['PORT'] || <%= port %>;
 const app = express();
 
-const browserDist = path.join(process.cwd(), '<%= rspackPluginOptions.outputPath %>', 'browser');
-const serverDist = path.join(process.cwd(), '<%= rspackPluginOptions.outputPath %>', 'server');
+const browserDist = path.join(process.cwd(), '<%= browserBuildOutputPath %>');
+const serverDist = path.join(process.cwd(), '<%= serverBuildOutputPath %>');
 const indexPath = path.join(browserDist, 'index.html');
 
 app.use(cors());

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

@@ -5,12 +5,6 @@ const config: ModuleFederationConfig = {
   exposes: {
       './Module': './src/remote-entry.<%= js ? 'js' : 'ts' %>',
   },
-  shared: (libraryName, libraryConfig) => {
-      return {
-        ...libraryConfig,
-        eager: true
-      }
-    },
 };
 
 /**

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

@@ -0,0 +1,16 @@
+import {composePlugins, withNx, withReact} from '@nx/rspack';
+import {withModuleFederationForSSR} from '@nx/module-federation/rspack';
+
+import baseConfig from "./module-federation.server.config";
+
+const defaultConfig = {
+  ...baseConfig,
+};
+
+// Nx plugins for rspack to build config object from Nx options and context.
+/**
+ * DTS Plugin is disabled in Nx Workspaces as Nx already provides Typing support Module Federation
+ * The DTS Plugin can be enabled by setting dts: true
+ * Learn more about the DTS Plugin here: https://module-federation.io/configure/dts.html
+ */
+export default composePlugins(withNx(), withReact({ssr: true}), withModuleFederationForSSR(defaultConfig, { dts: false }));

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

@@ -7,8 +7,8 @@ import { handleRequest } from './src/main.server';
 const port = process.env['PORT'] || <%= port %>;
 const app = express();
 
-const browserDist = path.join(process.cwd(), '<%= rspackPluginOptions.outputPath %>', 'browser');
-const serverDist = path.join(process.cwd(), '<%= rspackPluginOptions.outputPath %>', 'server');
+const browserDist = path.join(process.cwd(), '<%= browserBuildOutputPath %>');
+const serverDist = path.join(process.cwd(), '<%= serverBuildOutputPath %>');
 const indexPath = path.join(browserDist, 'index.html');
 
 app.use(cors());

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

@@ -1,43 +1,16 @@
-import { NxAppRspackPlugin } from '@nx/rspack/app-plugin';
-import { NxReactRspackPlugin } from '@nx/rspack/react-plugin';
-import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/rspack';
-import { join } from 'path';
+import {composePlugins, withNx, withReact} from '@nx/rspack';
+import {withModuleFederation} from '@nx/module-federation/rspack';
 
-import config from './module-federation.config';
+import baseConfig from './module-federation.config';
 
-export default {
-  output: {
-    path: join(__dirname, '<%= rspackPluginOptions.outputPath %>'),
-    publicPath: 'auto'
-  },
-  devServer: {
-    port: <%= devServerPort %>,
-    headers: {
-      "Access-Control-Allow-Origin": "*"
-    },
-    historyApiFallback: {
-      index: '/index.html',
-      disableDotRule: true,
-      htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
-    },
-  },
-  plugins: [
-    new NxAppRspackPlugin({
-      tsConfig: '<%= rspackPluginOptions.tsConfig %>',
-      main: '<%= rspackPluginOptions.main %>',
-      index: '<%= rspackPluginOptions.index %>',
-      baseHref: '<%= rspackPluginOptions.baseHref %>',
-      assets: <%- JSON.stringify(rspackPluginOptions.assets) %>,
-      styles: <%- JSON.stringify(rspackPluginOptions.styles) %>,
-      outputHashing: process.env['NODE_ENV'] === 'production' ? 'all' : 'none',
-      optimization: process.env['NODE_ENV'] === 'production',
-    }),
-    new NxReactRspackPlugin({
-      // Uncomment this line if you don't want to use SVGR
-      // See: https://react-svgr.com/
-      // svgr: false
-    }),
-    new NxModuleFederationPlugin({ config }, { dts: false }),
-    new NxModuleFederationDevServerPlugin({ config }),
-  ],
+const config = {
+  ...baseConfig,
 };
+
+// Nx plugins for rspack to build config object from Nx options and context.
+/**
+ * DTS Plugin is disabled in Nx Workspaces as Nx already provides Typing support Module Federation
+ * The DTS Plugin can be enabled by setting dts: true
+ * Learn more about the DTS Plugin here: https://module-federation.io/configure/dts.html
+ */
+export default composePlugins(withNx(), withReact(), withModuleFederation(config, { dts: false }));

package/src/generators/remote/lib/setup-ssr-for-remote.d.ts

@@ -1,4 +1,4 @@
-import { GeneratorCallback, Tree } from '@nx/devkit';
+import type { GeneratorCallback, Tree } from '@nx/devkit';
 import { NormalizedSchema } from '../../application/schema';
 import type { Schema } from '../schema';
 export declare function setupSsrForRemote(tree: Tree, options: NormalizedSchema<Schema>, appName: string): Promise<GeneratorCallback>;

package/src/generators/remote/lib/setup-ssr-for-remote.js

@@ -2,61 +2,39 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSsrForRemote = setupSsrForRemote;
 const devkit_1 = require("@nx/devkit");
-const devkit_2 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
-const create_application_files_1 = require("../../application/lib/create-application-files");
 async function setupSsrForRemote(tree, options, appName) {
     const tasks = [];
-    const project = (0, devkit_2.readProjectConfiguration)(tree, appName);
+    const project = (0, devkit_1.readProjectConfiguration)(tree, appName);
     const pathToModuleFederationSsrFiles = options.typescriptConfiguration
         ? `${options.bundler === 'rspack' ? 'rspack-' : 'webpack-'}module-federation-ssr-ts`
         : `${options.bundler === 'rspack' ? 'rspack-' : 'webpack-'}module-federation-ssr`;
-    const templateVariables = options.bundler === 'rspack'
-        ? {
-            ...(0, create_application_files_1.getDefaultTemplateVariables)(tree, options),
-            rspackPluginOptions: {
-                ...(0, create_application_files_1.createNxRspackPluginOptions)(options, (0, devkit_1.offsetFromRoot)(options.appProjectRoot), false),
-                mainServer: `./server.ts`,
-            },
-            port: Number(options?.devServerPort) || 4200,
-            appName,
-        }
-        : {
-            ...options,
-            port: Number(options?.devServerPort) || 4200,
-            appName,
-            tmpl: '',
-            browserBuildOutputPath: project.targets.build?.options?.outputPath,
-            serverBuildOutputPath: project.targets.server?.options?.outputPath,
-        };
-    (0, devkit_2.generateFiles)(tree, (0, devkit_2.joinPathFragments)(__dirname, `../files/${pathToModuleFederationSsrFiles}`), project.root, templateVariables);
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, `../files/${pathToModuleFederationSsrFiles}`), project.root, {
+        ...options,
+        port: Number(options?.devServerPort) || 4200,
+        appName,
+        tmpl: '',
+        browserBuildOutputPath: project.targets.build.options.outputPath,
+        serverBuildOutputPath: project.targets.server.options.outputPath,
+    });
     // For hosts to use when running remotes in static mode.
-    const originalOutputPath = project.targets.build?.options?.outputPath ??
-        options.isUsingTsSolutionConfig
-        ? 'dist'
-        : (0, devkit_2.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.appProjectRoot), 'dist', options.appProjectRoot != '.'
-            ? options.appProjectRoot
-            : options.projectName);
+    const originalOutputPath = project.targets.build?.options?.outputPath;
     const serverOptions = project.targets.server?.options;
     const serverOutputPath = serverOptions?.outputPath ??
-        (0, devkit_2.joinPathFragments)(originalOutputPath, 'server');
+        (0, devkit_1.joinPathFragments)(originalOutputPath, 'server');
     const serverOutputName = serverOptions?.outputFileName ?? 'main.js';
     project.targets['serve-static'] = {
         dependsOn: ['build', 'server'],
         executor: 'nx:run-commands',
         defaultConfiguration: 'development',
         options: {
-            command: `PORT=${options.devServerPort ?? 4200} node ${(0, devkit_2.joinPathFragments)(serverOutputPath, serverOutputName)}`,
+            command: `PORT=${options.devServerPort ?? 4200} node ${(0, devkit_1.joinPathFragments)(serverOutputPath, serverOutputName)}`,
         },
     };
-    (0, devkit_2.updateProjectConfiguration)(tree, appName, project);
-    const installTask = (0, devkit_2.addDependenciesToPackageJson)(tree, {
+    (0, devkit_1.updateProjectConfiguration)(tree, appName, project);
+    const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
         '@module-federation/node': versions_1.moduleFederationNodeVersion,
-        cors: versions_1.corsVersion,
-        isbot: versions_1.isbotVersion,
-        express: versions_1.expressVersion,
-        '@types/express': versions_1.typesExpressVersion,
     }, {});
     tasks.push(installTask);
-    return (0, devkit_2.runTasksInSerial)(...tasks);
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }

package/src/generators/remote/remote.js

@@ -17,21 +17,12 @@ const maybe_js_1 = require("../../utils/maybe-js");
 const js_1 = require("@nx/js");
 const versions_1 = require("../../utils/versions");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-const create_application_files_1 = require("../application/lib/create-application-files");
 function addModuleFederationFiles(host, options) {
-    const templateVariables = options.bundler === 'rspack'
-        ? {
-            ...(0, create_application_files_1.getDefaultTemplateVariables)(host, options),
-            rspackPluginOptions: {
-                ...(0, create_application_files_1.createNxRspackPluginOptions)(options, (0, devkit_1.offsetFromRoot)(options.appProjectRoot), false),
-                mainServer: `./server.ts`,
-            },
-        }
-        : {
-            ...(0, devkit_1.names)(options.projectName),
-            ...options,
-            tmpl: '',
-        };
+    const templateVariables = {
+        ...(0, devkit_1.names)(options.projectName),
+        ...options,
+        tmpl: '',
+    };
     (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, `./files/${options.js
         ? options.bundler === 'rspack'
             ? 'rspack-common'
@@ -67,8 +58,8 @@ async function remoteGenerator(host, schema) {
             ? false
             : schema.typescriptConfiguration ?? true,
         dynamic: schema.dynamic ?? false,
-        // TODO(colum): remove when Webpack MF works with Crystal
-        addPlugin: !schema.bundler || schema.bundler === 'rspack' ? true : false,
+        // TODO(colum): remove when MF works with Crystal
+        addPlugin: false,
         bundler: schema.bundler ?? 'rspack',
     };
     if (options.dynamic) {
@@ -106,22 +97,25 @@ async function remoteGenerator(host, schema) {
     (0, update_module_federation_project_1.updateModuleFederationProject)(host, options);
     (0, setup_tspath_for_remote_1.setupTspathForRemote)(host, options);
     if (options.ssr) {
-        if (options.bundler !== 'rspack') {
-            const setupSsrTask = await (0, setup_ssr_1.default)(host, {
-                project: options.projectName,
-                serverPort: options.devServerPort,
-                skipFormat: true,
-                bundler: options.bundler,
-            });
-            tasks.push(setupSsrTask);
-        }
+        const setupSsrTask = await (0, setup_ssr_1.default)(host, {
+            project: options.projectName,
+            serverPort: options.devServerPort,
+            skipFormat: true,
+            bundler: options.bundler,
+        });
+        tasks.push(setupSsrTask);
         const setupSsrForRemoteTask = await (0, setup_ssr_for_remote_1.setupSsrForRemote)(host, options, options.projectName);
         tasks.push(setupSsrForRemoteTask);
         const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
-        if (options.bundler !== 'rspack') {
+        if (options.bundler === 'rspack') {
+            projectConfig.targets.server.executor = '@nx/rspack:rspack';
+            projectConfig.targets.server.options.rspackConfig = (0, devkit_1.joinPathFragments)(projectConfig.root, `rspack.server.config.${options.typescriptConfiguration ? 'ts' : 'js'}`);
+            delete projectConfig.targets.server.options.webpackConfig;
+        }
+        else {
             projectConfig.targets.server.options.webpackConfig = (0, devkit_1.joinPathFragments)(projectConfig.root, `webpack.server.config.${options.typescriptConfiguration ? 'ts' : 'js'}`);
-            (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfig);
         }
+        (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfig);
     }
     if (!options.setParserOptionsProject) {
         host.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.lint.json'));

package/src/rules/update-module-federation-project.d.ts

@@ -7,5 +7,4 @@ export declare function updateModuleFederationProject(host: Tree, options: {
     typescriptConfiguration?: boolean;
     dynamic?: boolean;
     bundler?: 'rspack' | 'webpack';
-    ssr?: boolean;
-}, isHost?: boolean): void;
+}): void;