zephyr-rsbuild-plugin 0.1.1 → 0.1.2

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export { withZephyr } from './rsbuild-plugin/with-zephyr';
 export { onDeploymentDone, resolveIndexHtml } from 'zephyr-rspack-plugin';
+export type { ZephyrBuildHooks, DeploymentInfo } from 'zephyr-agent';

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zephyr-rsbuild-plugin",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Rsbuild plugin for Zephyr",
   "repository": {
     "type": "git",

package/dist/rsbuild-plugin/with-zephyr.d.ts

@@ -1,5 +1,7 @@
 import type { RsbuildPlugin } from '@rsbuild/core';
+import { type ZephyrBuildHooks } from 'zephyr-rspack-plugin';
 export interface ZephyrRsbuildPluginOptions {
     wait_for_index_html?: boolean;
+    hooks?: ZephyrBuildHooks;
 }
 export declare function withZephyr(options?: ZephyrRsbuildPluginOptions): RsbuildPlugin;

package/dist/rsbuild-plugin/with-zephyr.js

@@ -6,8 +6,24 @@ function withZephyr(options) {
     return {
         name: 'zephyr-rsbuild-plugin',
         setup(api) {
-            api.modifyRspackConfig(async (config) => {
-                return await (0, zephyr_rspack_plugin_1.withZephyr)(options)(config);
+            // Per Rspack team: @module-federation/rsbuild-plugin adds MF plugins in onBeforeCreateCompiler,
+            // which runs AFTER modifyRspackConfig. So we must process the configs in onBeforeCreateCompiler
+            // where the MF plugins are already present.
+            // Using order: 'post' ensures we run after the MF plugin has set up the config.
+            api.onBeforeCreateCompiler({
+                order: 'post',
+                handler: async ({ bundlerConfigs }) => {
+                    // Process each bundler config (one per environment)
+                    for (const config of bundlerConfigs) {
+                        // Apply Zephyr's rspack transformation
+                        // The real MF plugin is already present in the config and rspackWithZephyr will extract from it
+                        const result = await (0, zephyr_rspack_plugin_1.withZephyr)(options)(config);
+                        // Merge result back (rspackWithZephyr may return a new config or void)
+                        if (result) {
+                            Object.assign(config, result);
+                        }
+                    }
+                },
             });
         },
     };

package/dist/rsbuild-plugin/with-zephyr.js.map

@@ -1 +1 @@
-{"version":3,"file":"with-zephyr.js","sourceRoot":"","sources":["../../src/rsbuild-plugin/with-zephyr.ts"],"names":[],"mappings":";;AAOA,gCASC;AAfD,+DAAsE;AAMtE,SAAgB,UAAU,CAAC,OAAoC;IAC7D,OAAO;QACL,IAAI,EAAE,uBAAuB;QAC7B,KAAK,CAAC,GAAG;YACP,GAAG,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBACtC,OAAO,MAAM,IAAA,iCAAgB,EAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;YACjD,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"with-zephyr.js","sourceRoot":"","sources":["../../src/rsbuild-plugin/with-zephyr.ts"],"names":[],"mappings":";;AAWA,gCA0BC;AApCD,+DAG8B;AAO9B,SAAgB,UAAU,CAAC,OAAoC;IAC7D,OAAO;QACL,IAAI,EAAE,uBAAuB;QAC7B,KAAK,CAAC,GAAG;YACP,gGAAgG;YAChG,gGAAgG;YAChG,4CAA4C;YAC5C,gFAAgF;YAChF,GAAG,CAAC,sBAAsB,CAAC;gBACzB,KAAK,EAAE,MAAM;gBACb,OAAO,EAAE,KAAK,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE;oBACpC,oDAAoD;oBACpD,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;wBACpC,uCAAuC;wBACvC,gGAAgG;wBAChG,MAAM,MAAM,GAAG,MAAM,IAAA,iCAAgB,EAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;wBAEvD,uEAAuE;wBACvE,IAAI,MAAM,EAAE,CAAC;4BACX,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;wBAChC,CAAC;oBACH,CAAC;gBACH,CAAC;aACF,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zephyr-rsbuild-plugin",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Rsbuild plugin for Zephyr",
   "repository": {
     "type": "git",
@@ -17,7 +17,7 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "@rsbuild/core": "^1.3.22",
-    "zephyr-rspack-plugin": "0.1.1"
+    "zephyr-rspack-plugin": "0.1.2"
   },
   "devDependencies": {
     "@types/jest": "29.5.14",