feat(mf): fall back to original-serve to infer port for rsbuild

Author: manfredsteyer

libs/mf/src/rspack/with-federation.ts

@@ -17,7 +17,7 @@ export type FederationOptions = Omit<
 };
 
 export function withFederation(config: FederationConfig) {
-  // 
+  //
   // This provides partial application for better DX,
   // as it allows to split the config into a file with
   // rsbuild and an other one with federation settings

libs/mf/src/schematics/init-rspack/schematic.ts

@@ -79,7 +79,7 @@ export function init(options: MfSchematicSchema): Rule {
       generteManifest(tree, manifestPath, remoteMap);
     }
 
-    updateProjectConfig(projectConfig);
+    updateProjectConfig(projectConfig, parseInt(options.port));
 
     updateTsConfig(tree, tsConfigName);
 
@@ -338,7 +338,7 @@ function updateLocalTsConfig(projectRoot: string, tree) {
   }
 }
 
-function updateProjectConfig(projectConfig: ProjectConfig) {
+function updateProjectConfig(projectConfig: ProjectConfig, port: number) {
   if (projectConfig?.architect?.build) {
     projectConfig.architect['original-build'] = projectConfig.architect.build;
     delete projectConfig.architect.build;
@@ -347,6 +347,12 @@ function updateProjectConfig(projectConfig: ProjectConfig) {
   if (projectConfig?.architect?.serve) {
     projectConfig.architect['original-serve'] = projectConfig.architect.serve;
     delete projectConfig.architect.serve;
+
+    const target = projectConfig.architect['original-serve'];
+    target.options = {
+      ...target.options,
+      port: port || 4200
+    };
   }
 }
 
@@ -388,10 +394,12 @@ function generateRemoteMap(workspace: WorkspaceConfig, projectName: string) {
     if (
       p !== projectName &&
       projectType === 'application' &&
-      project?.architect?.serve &&
-      project?.architect?.build
+      (project?.architect?.serve ||  project?.architect?.['original-serve']) &&
+      (project?.architect?.build || project?.architect?.['original-build'])
     ) {
-      const pPort = project.architect.serve.options?.port ?? 4200;
+      const pPort = project.architect.serve?.options?.port 
+        ?? project.architect['original-serve']?.options?.port
+        ?? 4200;
       result[strings.camelize(p)] = `http://localhost:${pPort}/remoteEntry.js`;
     }
   }

libs/mf/src/schematics/init/schema.d.ts

@@ -3,5 +3,5 @@ export interface InitSchema {
   port: string | number;
   nxBuilders: boolean | undefined;
   type: 'host' | 'dynamic-host' | 'remote' | 'legacy';
-  stack: 'webpack' | 'rsbuild' | 'native';
+  stack: 'module-federation-webpack' | 'module-federation-rsbuild' | 'native-federation-esbuild';
 }

libs/mf/src/schematics/init/schema.json

@@ -33,22 +33,22 @@
     },
     "stack": {
       "type": "string",
-      "enum": ["webpack", "rsbuild", "native"],
+      "enum": ["module-federation-webpack", "module-federation-rsbuild", "native-federation-esbuild"],
       "x-aliases": ["s"],
       "x-prompt": {
         "message": "Which stack do you want to use?",
         "type": "list",
         "items": [
           {
-            "value": "webpack",
+            "value": "module-federation-webpack",
             "label": "Module Federation with webpack (classic)"
           },
           {
-            "value": "rsbuild",
+            "value": "module-federation-rsbuild",
             "label": "Module Federation with rsbuild (experimental nextgen)"
           },
           {
-            "value": "native",
+            "value": "native-federation-esbuild",
             "label": "Native Federation with esbuild (bundler-agnostic)"
           }
         ]

libs/mf/src/schematics/init/schematic.ts

@@ -16,13 +16,13 @@ export function init(options: InitSchema): Rule {
     const { stack, ...delegationOptions } = options;
 
     switch (stack) {
-      case 'webpack':
+      case 'module-federation-webpack':
         return chain([schematic('init-webpack', delegationOptions)]);
 
-      case 'rsbuild':
+      case 'module-federation-rsbuild':
         return chain([schematic('init-rspack', delegationOptions)]);
 
-      case 'native':
+      case 'native-federation-esbuild':
         initNativeFederation(context, delegationOptions);
     }
     return noop();