@module-federation/bridge-react 0.0.0-next-20241015060033 → 0.0.0-next-20241015065721

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @module-federation/bridge-react
 
-## 0.0.0-next-20241015060033
+## 0.0.0-next-20241015065721
 
 ### Patch Changes
 
@@ -8,8 +8,8 @@
 - Updated dependencies [9e32644]
 - Updated dependencies [9e32644]
 - Updated dependencies [3082116]
-  - @module-federation/runtime@0.0.0-next-20241015060033
-  - @module-federation/bridge-shared@0.0.0-next-20241015060033
+  - @module-federation/runtime@0.0.0-next-20241015065721
+  - @module-federation/bridge-shared@0.0.0-next-20241015065721
 
 ## 0.6.6
 

package/dist/index.cjs.js

@@ -1114,7 +1114,9 @@ function registerBridgeLifeCycle() {
   const host = runtime.getInstance();
   const pluginSystem = new pluginHelper2.PluginSystem({
     beforeBridgeRender: new pluginHelper2.SyncHook(),
-    beforeBridgeDestroy: new pluginHelper2.SyncHook()
+    afterBridgeRender: new pluginHelper2.SyncHook(),
+    beforeBridgeDestroy: new pluginHelper2.SyncHook(),
+    afterBridgeDestroy: new pluginHelper2.SyncHook()
   });
   if (host) {
     registerPlugins2(
@@ -1147,7 +1149,7 @@ const RemoteAppWrapper = React.forwardRef(function(props, ref) {
         var _a, _b;
         const providerReturn = providerInfo();
         providerInfoRef.current = providerReturn;
-        const renderProps = {
+        let renderProps = {
           moduleName,
           dom: rootRef.current,
           basename,
@@ -1161,9 +1163,14 @@ const RemoteAppWrapper = React.forwardRef(function(props, ref) {
           renderProps
         );
         if (bridgeHook && ((_a = bridgeHook == null ? void 0 : bridgeHook.lifecycle) == null ? void 0 : _a.beforeBridgeRender)) {
-          (_b = bridgeHook == null ? void 0 : bridgeHook.lifecycle) == null ? void 0 : _b.beforeBridgeRender.emit({
+          const beforeBridgeRenderRes = (_b = bridgeHook == null ? void 0 : bridgeHook.lifecycle) == null ? void 0 : _b.beforeBridgeRender.emit({
             ...renderProps
           });
+          const extraProps = beforeBridgeRenderRes && typeof beforeBridgeRenderRes === "object" && (beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps) ? beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps : {};
+          renderProps = {
+            ...renderProps,
+            ...extraProps
+          };
         }
         providerReturn.render(renderProps);
       });
@@ -1176,8 +1183,8 @@ const RemoteAppWrapper = React.forwardRef(function(props, ref) {
               `createRemoteComponent LazyComponent destroy >>>`,
               { moduleName, basename, dom: renderDom.current }
             );
-            if (bridgeHook && ((_b = bridgeHook == null ? void 0 : bridgeHook.lifecycle) == null ? void 0 : _b.beforeBridgeDestroy)) {
-              (_c = bridgeHook == null ? void 0 : bridgeHook.lifecycle) == null ? void 0 : _c.beforeBridgeDestroy.emit({
+            if (bridgeHook && ((_b = bridgeHook == null ? void 0 : bridgeHook.lifecycle) == null ? void 0 : _b.afterBridgeDestroy)) {
+              (_c = bridgeHook == null ? void 0 : bridgeHook.lifecycle) == null ? void 0 : _c.afterBridgeDestroy.emit({
                 moduleName,
                 dom: renderDom.current,
                 basename,
@@ -1380,7 +1387,7 @@ function createBridgeComponent(bridgeInfo) {
         } = info;
         const beforeBridgeRender = (bridgeInfo == null ? void 0 : bridgeInfo.hooks) && (bridgeInfo == null ? void 0 : bridgeInfo.hooks.beforeBridgeRender) || ((_a = params == null ? void 0 : params.hooks) == null ? void 0 : _a.beforeBridgeRender);
         const beforeBridgeRenderRes = beforeBridgeRender && beforeBridgeRender(info);
-        const componentProps = beforeBridgeRenderRes && typeof beforeBridgeRenderRes === "object" && (beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps) ? beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps : {};
+        const extraProps = beforeBridgeRenderRes && typeof beforeBridgeRenderRes === "object" && (beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps) ? beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps : {};
         const rootComponentWithErrorBoundary = (
           // set ErrorBoundary for RawComponent rendering error, usually caused by user app rendering error
           /* @__PURE__ */ React__namespace.createElement(ErrorBoundary, { FallbackComponent: fallback }, /* @__PURE__ */ React__namespace.createElement(
@@ -1391,7 +1398,7 @@ function createBridgeComponent(bridgeInfo) {
                 basename,
                 memoryRoute
               },
-              propsInfo: { propsInfo, ...componentProps }
+              propsInfo: { ...propsInfo, ...extraProps }
             }
           ))
         );

package/dist/index.es.js

@@ -1095,7 +1095,9 @@ function registerBridgeLifeCycle() {
   const host = getInstance();
   const pluginSystem = new pluginHelper2.PluginSystem({
     beforeBridgeRender: new pluginHelper2.SyncHook(),
-    beforeBridgeDestroy: new pluginHelper2.SyncHook()
+    afterBridgeRender: new pluginHelper2.SyncHook(),
+    beforeBridgeDestroy: new pluginHelper2.SyncHook(),
+    afterBridgeDestroy: new pluginHelper2.SyncHook()
   });
   if (host) {
     registerPlugins2(
@@ -1128,7 +1130,7 @@ const RemoteAppWrapper = forwardRef(function(props, ref) {
         var _a, _b;
         const providerReturn = providerInfo();
         providerInfoRef.current = providerReturn;
-        const renderProps = {
+        let renderProps = {
           moduleName,
           dom: rootRef.current,
           basename,
@@ -1142,9 +1144,14 @@ const RemoteAppWrapper = forwardRef(function(props, ref) {
           renderProps
         );
         if (bridgeHook && ((_a = bridgeHook == null ? void 0 : bridgeHook.lifecycle) == null ? void 0 : _a.beforeBridgeRender)) {
-          (_b = bridgeHook == null ? void 0 : bridgeHook.lifecycle) == null ? void 0 : _b.beforeBridgeRender.emit({
+          const beforeBridgeRenderRes = (_b = bridgeHook == null ? void 0 : bridgeHook.lifecycle) == null ? void 0 : _b.beforeBridgeRender.emit({
             ...renderProps
           });
+          const extraProps = beforeBridgeRenderRes && typeof beforeBridgeRenderRes === "object" && (beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps) ? beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps : {};
+          renderProps = {
+            ...renderProps,
+            ...extraProps
+          };
         }
         providerReturn.render(renderProps);
       });
@@ -1157,8 +1164,8 @@ const RemoteAppWrapper = forwardRef(function(props, ref) {
               `createRemoteComponent LazyComponent destroy >>>`,
               { moduleName, basename, dom: renderDom.current }
             );
-            if (bridgeHook && ((_b = bridgeHook == null ? void 0 : bridgeHook.lifecycle) == null ? void 0 : _b.beforeBridgeDestroy)) {
-              (_c = bridgeHook == null ? void 0 : bridgeHook.lifecycle) == null ? void 0 : _c.beforeBridgeDestroy.emit({
+            if (bridgeHook && ((_b = bridgeHook == null ? void 0 : bridgeHook.lifecycle) == null ? void 0 : _b.afterBridgeDestroy)) {
+              (_c = bridgeHook == null ? void 0 : bridgeHook.lifecycle) == null ? void 0 : _c.afterBridgeDestroy.emit({
                 moduleName,
                 dom: renderDom.current,
                 basename,
@@ -1361,7 +1368,7 @@ function createBridgeComponent(bridgeInfo) {
         } = info;
         const beforeBridgeRender = (bridgeInfo == null ? void 0 : bridgeInfo.hooks) && (bridgeInfo == null ? void 0 : bridgeInfo.hooks.beforeBridgeRender) || ((_a = params == null ? void 0 : params.hooks) == null ? void 0 : _a.beforeBridgeRender);
         const beforeBridgeRenderRes = beforeBridgeRender && beforeBridgeRender(info);
-        const componentProps = beforeBridgeRenderRes && typeof beforeBridgeRenderRes === "object" && (beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps) ? beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps : {};
+        const extraProps = beforeBridgeRenderRes && typeof beforeBridgeRenderRes === "object" && (beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps) ? beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps : {};
         const rootComponentWithErrorBoundary = (
           // set ErrorBoundary for RawComponent rendering error, usually caused by user app rendering error
           /* @__PURE__ */ React.createElement(ErrorBoundary, { FallbackComponent: fallback }, /* @__PURE__ */ React.createElement(
@@ -1372,7 +1379,7 @@ function createBridgeComponent(bridgeInfo) {
                 basename,
                 memoryRoute
               },
-              propsInfo: { propsInfo, ...componentProps }
+              propsInfo: { ...propsInfo, ...extraProps }
             }
           ))
         );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/bridge-react",
-  "version": "0.0.0-next-20241015060033",
+  "version": "0.0.0-next-20241015065721",
   "publishConfig": {
     "access": "public"
   },
@@ -35,13 +35,13 @@
   "dependencies": {
     "@loadable/component": "^5.16.4",
     "react-error-boundary": "^4.0.13",
-    "@module-federation/bridge-shared": "0.0.0-next-20241015060033"
+    "@module-federation/bridge-shared": "0.0.0-next-20241015065721"
   },
   "peerDependencies": {
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0",
     "react-router-dom": ">=4",
-    "@module-federation/runtime": "0.0.0-next-20241015060033"
+    "@module-federation/runtime": "0.0.0-next-20241015065721"
   },
   "devDependencies": {
     "@testing-library/react": "15.0.7",

package/src/lifecycle.ts

@@ -5,14 +5,13 @@ function registerBridgeLifeCycle() {
   const { registerPlugins, pluginHelper } = helper.global;
   const host = getInstance();
   const pluginSystem = new pluginHelper.PluginSystem({
-    beforeBridgeRender: new pluginHelper.SyncHook<
-      [Record<string, any>],
-      void
-    >(),
+    beforeBridgeRender: new pluginHelper.SyncHook<[Record<string, any>], any>(),
+    afterBridgeRender: new pluginHelper.SyncHook<[Record<string, any>], any>(),
     beforeBridgeDestroy: new pluginHelper.SyncHook<
       [Record<string, any>],
-      void
+      any
     >(),
+    afterBridgeDestroy: new pluginHelper.SyncHook<[Record<string, any>], any>(),
   });
 
   if (host) {

package/src/provider.tsx

@@ -67,7 +67,7 @@ export function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>) {
         // 可通过beforeBridgeRender返回一个props对象，用于传递额外的 props 参数
         const beforeBridgeRenderRes =
           beforeBridgeRender && beforeBridgeRender(info);
-        const componentProps =
+        const extraProps =
           beforeBridgeRenderRes &&
           typeof beforeBridgeRenderRes === 'object' &&
           beforeBridgeRenderRes?.extraProps
@@ -83,8 +83,7 @@ export function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>) {
                 basename,
                 memoryRoute,
               }}
-              // propsInfo={propsInfo}
-              propsInfo={{ propsInfo, ...componentProps } as T}
+              propsInfo={{ ...propsInfo, ...extraProps } as T}
             />
           </ErrorBoundary>
         );

package/src/remote/index.tsx

@@ -67,7 +67,7 @@ const RemoteAppWrapper = forwardRef(function (
         const providerReturn = providerInfo();
         providerInfoRef.current = providerReturn;
 
-        const renderProps = {
+        let renderProps = {
           moduleName,
           dom: rootRef.current,
           basename,
@@ -82,11 +82,22 @@ const RemoteAppWrapper = forwardRef(function (
         );
 
         if (bridgeHook && bridgeHook?.lifecycle?.beforeBridgeRender) {
-          bridgeHook?.lifecycle?.beforeBridgeRender.emit({
+          const beforeBridgeRenderRes =
+            bridgeHook?.lifecycle?.beforeBridgeRender.emit({
+              ...renderProps,
+            });
+          const extraProps =
+            beforeBridgeRenderRes &&
+            typeof beforeBridgeRenderRes === 'object' &&
+            beforeBridgeRenderRes?.extraProps
+              ? beforeBridgeRenderRes?.extraProps
+              : {};
+
+          renderProps = {
             ...renderProps,
-          });
+            ...extraProps,
+          } as any;
         }
-
         providerReturn.render(renderProps);
       });
 
@@ -98,8 +109,8 @@ const RemoteAppWrapper = forwardRef(function (
               `createRemoteComponent LazyComponent destroy >>>`,
               { moduleName, basename, dom: renderDom.current },
             );
-            if (bridgeHook && bridgeHook?.lifecycle?.beforeBridgeDestroy) {
-              bridgeHook?.lifecycle?.beforeBridgeDestroy.emit({
+            if (bridgeHook && bridgeHook?.lifecycle?.afterBridgeDestroy) {
+              bridgeHook?.lifecycle?.afterBridgeDestroy.emit({
                 moduleName,
                 dom: renderDom.current,
                 basename,