@module-federation/bridge-react 0.0.0-next-20241107071851 → 0.0.0-next-20241108091829

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @module-federation/bridge-react
 
-## 0.0.0-next-20241107071851
+## 0.0.0-next-20241108091829
 
 ### Patch Changes
 
@@ -8,9 +8,9 @@
 - Updated dependencies [8712967]
 - Updated dependencies [6db4c5f]
 - Updated dependencies [3082116]
-  - @module-federation/runtime@0.0.0-next-20241107071851
-  - @module-federation/sdk@0.0.0-next-20241107071851
-  - @module-federation/bridge-shared@0.0.0-next-20241107071851
+  - @module-federation/runtime@0.0.0-next-20241108091829
+  - @module-federation/sdk@0.0.0-next-20241108091829
+  - @module-federation/bridge-shared@0.0.0-next-20241108091829
 
 ## 0.7.0
 

package/dist/{context-BcyT-d0V.js → context-Dh6IUBWT.js}

@@ -328,10 +328,29 @@ function pathJoin(...args) {
   }, "");
   return res || "/";
 }
+const getModuleName = (id) => {
+  if (!id) {
+    return id;
+  }
+  const idArray = id.split("/");
+  if (idArray.length < 2) {
+    return id;
+  }
+  return idArray[0] + "/" + idArray[1];
+};
+const getRootDomDefaultClassName = (moduleName) => {
+  if (!moduleName) {
+    return "";
+  }
+  const name = getModuleName(moduleName).replace(/\@/, "").replace(/\//, "-");
+  return `bridge-root-component-${name}`;
+};
 const RouterContext = React__default.createContext(null);
 export {
   LoggerInstance as L,
   RouterContext as R,
-  atLeastReact18 as a,
+  getModuleName as a,
+  atLeastReact18 as b,
+  getRootDomDefaultClassName as g,
   pathJoin as p
 };

package/dist/{context-BBLu8BlQ.cjs → context-DmzxwI_7.cjs}

@@ -329,8 +329,27 @@ function pathJoin(...args) {
   }, "");
   return res || "/";
 }
+const getModuleName = (id) => {
+  if (!id) {
+    return id;
+  }
+  const idArray = id.split("/");
+  if (idArray.length < 2) {
+    return id;
+  }
+  return idArray[0] + "/" + idArray[1];
+};
+const getRootDomDefaultClassName = (moduleName) => {
+  if (!moduleName) {
+    return "";
+  }
+  const name = getModuleName(moduleName).replace(/\@/, "").replace(/\//, "-");
+  return `bridge-root-component-${name}`;
+};
 const RouterContext = React.createContext(null);
 exports.LoggerInstance = LoggerInstance;
 exports.RouterContext = RouterContext;
 exports.atLeastReact18 = atLeastReact18;
+exports.getModuleName = getModuleName;
+exports.getRootDomDefaultClassName = getRootDomDefaultClassName;
 exports.pathJoin = pathJoin;

package/dist/index.cjs.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const React = require("react");
-const context = require("./context-BBLu8BlQ.cjs");
+const context = require("./context-DmzxwI_7.cjs");
 const ReactRouterDOM = require("react-router-dom");
 const runtime = require("@module-federation/runtime");
 const ReactDOM = require("react-dom");
@@ -122,20 +122,6 @@ function e() {
   const t = new PopStateEvent("popstate", { state: window.history.state });
   window.dispatchEvent(t);
 }
-const getModuleName = (id) => {
-  const idArray = id.split("/");
-  if (idArray.length < 2) {
-    return id;
-  }
-  return idArray[0] + "/" + idArray[1];
-};
-const getRootDomDefaultClassName = (moduleName) => {
-  if (!moduleName) {
-    return "";
-  }
-  const name = getModuleName(moduleName).replace(/\@/, "").replace(/\//, "-");
-  return `bridge-root-component-${name}`;
-};
 const RemoteAppWrapper = React.forwardRef(function(props, ref) {
   const host = runtime.getInstance();
   context.LoggerInstance.log(`RemoteAppWrapper host >>>`, host);
@@ -156,7 +142,7 @@ const RemoteAppWrapper = React.forwardRef(function(props, ref) {
     const providerInfoRef = React.useRef(null);
     React.useEffect(() => {
       const renderTimeout = setTimeout(() => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         const providerReturn = providerInfo();
         providerInfoRef.current = providerReturn;
         let renderProps = {
@@ -172,45 +158,45 @@ const RemoteAppWrapper = React.forwardRef(function(props, ref) {
           `createRemoteComponent LazyComponent render >>>`,
           renderProps
         );
-        if ((host == null ? void 0 : host.bridgeHook) && ((_b = (_a = host == null ? void 0 : host.bridgeHook) == null ? void 0 : _a.lifecycle) == null ? void 0 : _b.beforeBridgeRender)) {
-          const beforeBridgeRenderRes = (_d = (_c = host == null ? void 0 : host.bridgeHook) == null ? void 0 : _c.lifecycle) == null ? void 0 : _d.beforeBridgeRender.emit({
-            ...renderProps
-          });
-          const extraProps = beforeBridgeRenderRes && typeof beforeBridgeRenderRes === "object" && (beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps) ? beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps : {};
-          renderProps = {
-            ...renderProps,
-            ...extraProps
-          };
-        }
+        const beforeBridgeRenderRes = ((_c = (_b = (_a = host == null ? void 0 : host.bridgeHook) == null ? void 0 : _a.lifecycle) == null ? void 0 : _b.beforeBridgeRender) == null ? void 0 : _c.emit(renderProps)) || {};
+        renderProps = { ...renderProps, ...beforeBridgeRenderRes.extraProps };
         providerReturn.render(renderProps);
+        (_f = (_e = (_d = host == null ? void 0 : host.bridgeHook) == null ? void 0 : _d.lifecycle) == null ? void 0 : _e.afterBridgeRender) == null ? void 0 : _f.emit(renderProps);
       });
       return () => {
         clearTimeout(renderTimeout);
         setTimeout(() => {
-          var _a, _b, _c, _d, _e, _f;
+          var _a, _b, _c, _d, _e, _f, _g, _h;
           if ((_a = providerInfoRef.current) == null ? void 0 : _a.destroy) {
             context.LoggerInstance.log(
               `createRemoteComponent LazyComponent destroy >>>`,
               { moduleName, basename, dom: renderDom.current }
             );
-            if ((host == null ? void 0 : host.bridgeHook) && ((_c = (_b = host == null ? void 0 : host.bridgeHook) == null ? void 0 : _b.lifecycle) == null ? void 0 : _c.afterBridgeDestroy)) {
-              (_e = (_d = host == null ? void 0 : host.bridgeHook) == null ? void 0 : _d.lifecycle) == null ? void 0 : _e.afterBridgeDestroy.emit({
-                moduleName,
-                dom: renderDom.current,
-                basename,
-                memoryRoute,
-                fallback,
-                ...resProps
-              });
-            }
-            (_f = providerInfoRef.current) == null ? void 0 : _f.destroy({
+            (_d = (_c = (_b = host == null ? void 0 : host.bridgeHook) == null ? void 0 : _b.lifecycle) == null ? void 0 : _c.beforeBridgeDestroy) == null ? void 0 : _d.emit({
+              moduleName,
+              dom: renderDom.current,
+              basename,
+              memoryRoute,
+              fallback,
+              ...resProps
+            });
+            (_e = providerInfoRef.current) == null ? void 0 : _e.destroy({
+              moduleName,
               dom: renderDom.current
             });
+            (_h = (_g = (_f = host == null ? void 0 : host.bridgeHook) == null ? void 0 : _f.lifecycle) == null ? void 0 : _g.afterBridgeDestroy) == null ? void 0 : _h.emit({
+              moduleName,
+              dom: renderDom.current,
+              basename,
+              memoryRoute,
+              fallback,
+              ...resProps
+            });
           }
         });
       };
     }, []);
-    const rootComponentClassName = `${getRootDomDefaultClassName(moduleName)} ${props == null ? void 0 : props.className}`;
+    const rootComponentClassName = `${context.getRootDomDefaultClassName(moduleName)} ${props == null ? void 0 : props.className}`;
     return /* @__PURE__ */ React.createElement(
       "div",
       {
@@ -386,7 +372,7 @@ function createBridgeComponent(bridgeInfo) {
     };
     return {
       async render(info) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         context.LoggerInstance.log(`createBridgeComponent render Info`, info);
         const {
           moduleName,
@@ -396,9 +382,12 @@ function createBridgeComponent(bridgeInfo) {
           fallback,
           ...propsInfo
         } = 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 extraProps = beforeBridgeRenderRes && typeof beforeBridgeRenderRes === "object" && (beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps) ? beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps : {};
+        const moduleNameWithoutExpose = context.getModuleName(moduleName);
+        const instance = __FEDERATION__.__INSTANCES__.find(
+          (v) => v.name === moduleNameWithoutExpose
+        );
+        context.LoggerInstance.log(`createBridgeComponent remote instance`, instance);
+        const beforeBridgeRenderRes = ((_c = (_b = (_a = instance == null ? void 0 : instance.bridgeHook) == null ? void 0 : _a.lifecycle) == null ? void 0 : _b.beforeBridgeRender) == null ? void 0 : _c.emit(info)) || {};
         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(
@@ -409,7 +398,7 @@ function createBridgeComponent(bridgeInfo) {
                 basename,
                 memoryRoute
               },
-              propsInfo: { ...propsInfo, ...extraProps }
+              propsInfo: { ...propsInfo, ...beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps }
             }
           ))
         );
@@ -427,16 +416,24 @@ function createBridgeComponent(bridgeInfo) {
           const renderFn = (bridgeInfo == null ? void 0 : bridgeInfo.render) || ReactDOM.render;
           renderFn == null ? void 0 : renderFn(rootComponentWithErrorBoundary, info.dom);
         }
-        const afterBridgeRender = (bridgeInfo == null ? void 0 : bridgeInfo.hooks) && (bridgeInfo == null ? void 0 : bridgeInfo.hooks.afterBridgeDestroy) || ((_b = params == null ? void 0 : params.hooks) == null ? void 0 : _b.afterBridgeRender);
+        const afterBridgeRender = (bridgeInfo == null ? void 0 : bridgeInfo.hooks) && (bridgeInfo == null ? void 0 : bridgeInfo.hooks.afterBridgeDestroy) || ((_d = params == null ? void 0 : params.hooks) == null ? void 0 : _d.afterBridgeRender);
         afterBridgeRender && afterBridgeRender(info);
       },
       async destroy(info) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f;
         context.LoggerInstance.log(`createBridgeComponent destroy Info`, {
           dom: info.dom
         });
-        const beforeBridgeDestroy = (bridgeInfo == null ? void 0 : bridgeInfo.hooks) && (bridgeInfo == null ? void 0 : bridgeInfo.hooks.beforeBridgeDestroy) || ((_a = params == null ? void 0 : params.hooks) == null ? void 0 : _a.beforeBridgeDestroy);
-        beforeBridgeDestroy && beforeBridgeDestroy(info);
+        const moduleNameWithoutExpose = context.getModuleName(info.moduleName);
+        context.LoggerInstance.log(
+          `createBridgeComponent remote module without expose name >>>`,
+          moduleNameWithoutExpose
+        );
+        const instance = __FEDERATION__.__INSTANCES__.find(
+          (v) => v.name === moduleNameWithoutExpose
+        );
+        context.LoggerInstance.log(`createBridgeComponent remote instance`, instance);
+        (_c = (_b = (_a = instance == null ? void 0 : instance.bridgeHook) == null ? void 0 : _a.lifecycle) == null ? void 0 : _b.beforeBridgeDestroy) == null ? void 0 : _c.emit(info);
         if (context.atLeastReact18(React__namespace)) {
           const root = rootMap.get(info.dom);
           root == null ? void 0 : root.unmount();
@@ -444,8 +441,7 @@ function createBridgeComponent(bridgeInfo) {
         } else {
           ReactDOM.unmountComponentAtNode(info.dom);
         }
-        const afterBridgeDestroy = (bridgeInfo == null ? void 0 : bridgeInfo.hooks) && (bridgeInfo == null ? void 0 : bridgeInfo.hooks.afterBridgeDestroy) || ((_b = params == null ? void 0 : params.hooks) == null ? void 0 : _b.afterBridgeDestroy);
-        afterBridgeDestroy && afterBridgeDestroy(info);
+        (_f = (_e = (_d = instance == null ? void 0 : instance.bridgeHook) == null ? void 0 : _d.lifecycle) == null ? void 0 : _e.afterBridgeDestroy) == null ? void 0 : _f.emit(info);
       },
       rawComponent: bridgeInfo.rootComponent,
       __BRIDGE_FN__: (_args) => {

package/dist/index.d.ts

@@ -29,6 +29,7 @@ export declare function createRemoteComponent<T, E extends keyof T>(info: {
 }): default_2.ForwardRefExoticComponent<default_2.PropsWithoutRef<ProviderParams & ("__BRIDGE_FN__" extends keyof (T[E] extends (...args: any) => any ? ReturnType<T[E]> : never) ? (T[E] extends (...args: any) => any ? ReturnType<T[E]> : never)["__BRIDGE_FN__"] extends (...args: any) => any ? Parameters<(T[E] extends (...args: any) => any ? ReturnType<T[E]> : never)["__BRIDGE_FN__"]>[0] : {} : {})> & default_2.RefAttributes<HTMLDivElement>>;
 
 declare type DestroyParams = {
+    moduleName: string;
     dom: HTMLElement;
 };
 

package/dist/index.es.js

@@ -1,6 +1,6 @@
 import * as React from "react";
 import React__default, { createContext, Component, createElement, isValidElement, forwardRef, useRef, useEffect, useContext, useState } from "react";
-import { L as LoggerInstance, p as pathJoin, a as atLeastReact18, R as RouterContext } from "./context-BcyT-d0V.js";
+import { L as LoggerInstance, g as getRootDomDefaultClassName, p as pathJoin, a as getModuleName, b as atLeastReact18, R as RouterContext } from "./context-Dh6IUBWT.js";
 import * as ReactRouterDOM from "react-router-dom";
 import { getInstance } from "@module-federation/runtime";
 import ReactDOM from "react-dom";
@@ -103,20 +103,6 @@ function e() {
   const t = new PopStateEvent("popstate", { state: window.history.state });
   window.dispatchEvent(t);
 }
-const getModuleName = (id) => {
-  const idArray = id.split("/");
-  if (idArray.length < 2) {
-    return id;
-  }
-  return idArray[0] + "/" + idArray[1];
-};
-const getRootDomDefaultClassName = (moduleName) => {
-  if (!moduleName) {
-    return "";
-  }
-  const name = getModuleName(moduleName).replace(/\@/, "").replace(/\//, "-");
-  return `bridge-root-component-${name}`;
-};
 const RemoteAppWrapper = forwardRef(function(props, ref) {
   const host = getInstance();
   LoggerInstance.log(`RemoteAppWrapper host >>>`, host);
@@ -137,7 +123,7 @@ const RemoteAppWrapper = forwardRef(function(props, ref) {
     const providerInfoRef = useRef(null);
     useEffect(() => {
       const renderTimeout = setTimeout(() => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         const providerReturn = providerInfo();
         providerInfoRef.current = providerReturn;
         let renderProps = {
@@ -153,40 +139,40 @@ const RemoteAppWrapper = forwardRef(function(props, ref) {
           `createRemoteComponent LazyComponent render >>>`,
           renderProps
         );
-        if ((host == null ? void 0 : host.bridgeHook) && ((_b = (_a = host == null ? void 0 : host.bridgeHook) == null ? void 0 : _a.lifecycle) == null ? void 0 : _b.beforeBridgeRender)) {
-          const beforeBridgeRenderRes = (_d = (_c = host == null ? void 0 : host.bridgeHook) == null ? void 0 : _c.lifecycle) == null ? void 0 : _d.beforeBridgeRender.emit({
-            ...renderProps
-          });
-          const extraProps = beforeBridgeRenderRes && typeof beforeBridgeRenderRes === "object" && (beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps) ? beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps : {};
-          renderProps = {
-            ...renderProps,
-            ...extraProps
-          };
-        }
+        const beforeBridgeRenderRes = ((_c = (_b = (_a = host == null ? void 0 : host.bridgeHook) == null ? void 0 : _a.lifecycle) == null ? void 0 : _b.beforeBridgeRender) == null ? void 0 : _c.emit(renderProps)) || {};
+        renderProps = { ...renderProps, ...beforeBridgeRenderRes.extraProps };
         providerReturn.render(renderProps);
+        (_f = (_e = (_d = host == null ? void 0 : host.bridgeHook) == null ? void 0 : _d.lifecycle) == null ? void 0 : _e.afterBridgeRender) == null ? void 0 : _f.emit(renderProps);
       });
       return () => {
         clearTimeout(renderTimeout);
         setTimeout(() => {
-          var _a, _b, _c, _d, _e, _f;
+          var _a, _b, _c, _d, _e, _f, _g, _h;
           if ((_a = providerInfoRef.current) == null ? void 0 : _a.destroy) {
             LoggerInstance.log(
               `createRemoteComponent LazyComponent destroy >>>`,
               { moduleName, basename, dom: renderDom.current }
             );
-            if ((host == null ? void 0 : host.bridgeHook) && ((_c = (_b = host == null ? void 0 : host.bridgeHook) == null ? void 0 : _b.lifecycle) == null ? void 0 : _c.afterBridgeDestroy)) {
-              (_e = (_d = host == null ? void 0 : host.bridgeHook) == null ? void 0 : _d.lifecycle) == null ? void 0 : _e.afterBridgeDestroy.emit({
-                moduleName,
-                dom: renderDom.current,
-                basename,
-                memoryRoute,
-                fallback,
-                ...resProps
-              });
-            }
-            (_f = providerInfoRef.current) == null ? void 0 : _f.destroy({
+            (_d = (_c = (_b = host == null ? void 0 : host.bridgeHook) == null ? void 0 : _b.lifecycle) == null ? void 0 : _c.beforeBridgeDestroy) == null ? void 0 : _d.emit({
+              moduleName,
+              dom: renderDom.current,
+              basename,
+              memoryRoute,
+              fallback,
+              ...resProps
+            });
+            (_e = providerInfoRef.current) == null ? void 0 : _e.destroy({
+              moduleName,
               dom: renderDom.current
             });
+            (_h = (_g = (_f = host == null ? void 0 : host.bridgeHook) == null ? void 0 : _f.lifecycle) == null ? void 0 : _g.afterBridgeDestroy) == null ? void 0 : _h.emit({
+              moduleName,
+              dom: renderDom.current,
+              basename,
+              memoryRoute,
+              fallback,
+              ...resProps
+            });
           }
         });
       };
@@ -367,7 +353,7 @@ function createBridgeComponent(bridgeInfo) {
     };
     return {
       async render(info) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         LoggerInstance.log(`createBridgeComponent render Info`, info);
         const {
           moduleName,
@@ -377,9 +363,12 @@ function createBridgeComponent(bridgeInfo) {
           fallback,
           ...propsInfo
         } = 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 extraProps = beforeBridgeRenderRes && typeof beforeBridgeRenderRes === "object" && (beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps) ? beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps : {};
+        const moduleNameWithoutExpose = getModuleName(moduleName);
+        const instance = __FEDERATION__.__INSTANCES__.find(
+          (v) => v.name === moduleNameWithoutExpose
+        );
+        LoggerInstance.log(`createBridgeComponent remote instance`, instance);
+        const beforeBridgeRenderRes = ((_c = (_b = (_a = instance == null ? void 0 : instance.bridgeHook) == null ? void 0 : _a.lifecycle) == null ? void 0 : _b.beforeBridgeRender) == null ? void 0 : _c.emit(info)) || {};
         const rootComponentWithErrorBoundary = (
           // set ErrorBoundary for RawComponent rendering error, usually caused by user app rendering error
           /* @__PURE__ */ React.createElement(ErrorBoundary, { FallbackComponent: fallback }, /* @__PURE__ */ React.createElement(
@@ -390,7 +379,7 @@ function createBridgeComponent(bridgeInfo) {
                 basename,
                 memoryRoute
               },
-              propsInfo: { ...propsInfo, ...extraProps }
+              propsInfo: { ...propsInfo, ...beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps }
             }
           ))
         );
@@ -408,16 +397,24 @@ function createBridgeComponent(bridgeInfo) {
           const renderFn = (bridgeInfo == null ? void 0 : bridgeInfo.render) || ReactDOM.render;
           renderFn == null ? void 0 : renderFn(rootComponentWithErrorBoundary, info.dom);
         }
-        const afterBridgeRender = (bridgeInfo == null ? void 0 : bridgeInfo.hooks) && (bridgeInfo == null ? void 0 : bridgeInfo.hooks.afterBridgeDestroy) || ((_b = params == null ? void 0 : params.hooks) == null ? void 0 : _b.afterBridgeRender);
+        const afterBridgeRender = (bridgeInfo == null ? void 0 : bridgeInfo.hooks) && (bridgeInfo == null ? void 0 : bridgeInfo.hooks.afterBridgeDestroy) || ((_d = params == null ? void 0 : params.hooks) == null ? void 0 : _d.afterBridgeRender);
         afterBridgeRender && afterBridgeRender(info);
       },
       async destroy(info) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f;
         LoggerInstance.log(`createBridgeComponent destroy Info`, {
           dom: info.dom
         });
-        const beforeBridgeDestroy = (bridgeInfo == null ? void 0 : bridgeInfo.hooks) && (bridgeInfo == null ? void 0 : bridgeInfo.hooks.beforeBridgeDestroy) || ((_a = params == null ? void 0 : params.hooks) == null ? void 0 : _a.beforeBridgeDestroy);
-        beforeBridgeDestroy && beforeBridgeDestroy(info);
+        const moduleNameWithoutExpose = getModuleName(info.moduleName);
+        LoggerInstance.log(
+          `createBridgeComponent remote module without expose name >>>`,
+          moduleNameWithoutExpose
+        );
+        const instance = __FEDERATION__.__INSTANCES__.find(
+          (v) => v.name === moduleNameWithoutExpose
+        );
+        LoggerInstance.log(`createBridgeComponent remote instance`, instance);
+        (_c = (_b = (_a = instance == null ? void 0 : instance.bridgeHook) == null ? void 0 : _a.lifecycle) == null ? void 0 : _b.beforeBridgeDestroy) == null ? void 0 : _c.emit(info);
         if (atLeastReact18(React)) {
           const root = rootMap.get(info.dom);
           root == null ? void 0 : root.unmount();
@@ -425,8 +422,7 @@ function createBridgeComponent(bridgeInfo) {
         } else {
           ReactDOM.unmountComponentAtNode(info.dom);
         }
-        const afterBridgeDestroy = (bridgeInfo == null ? void 0 : bridgeInfo.hooks) && (bridgeInfo == null ? void 0 : bridgeInfo.hooks.afterBridgeDestroy) || ((_b = params == null ? void 0 : params.hooks) == null ? void 0 : _b.afterBridgeDestroy);
-        afterBridgeDestroy && afterBridgeDestroy(info);
+        (_f = (_e = (_d = instance == null ? void 0 : instance.bridgeHook) == null ? void 0 : _d.lifecycle) == null ? void 0 : _e.afterBridgeDestroy) == null ? void 0 : _f.emit(info);
       },
       rawComponent: bridgeInfo.rootComponent,
       __BRIDGE_FN__: (_args) => {

package/dist/router-v5.cjs.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const React = require("react");
 const ReactRouterDom$1 = require("react-router-dom/index.js");
-const context = require("./context-BBLu8BlQ.cjs");
+const context = require("./context-DmzxwI_7.cjs");
 const ReactRouterDom = require("react-router-dom/index.js");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dist/router-v5.es.js

@@ -1,6 +1,6 @@
 import React__default, { useContext } from "react";
 import * as ReactRouterDom$1 from "react-router-dom/index.js";
-import { R as RouterContext, L as LoggerInstance } from "./context-BcyT-d0V.js";
+import { R as RouterContext, L as LoggerInstance } from "./context-Dh6IUBWT.js";
 export * from "react-router-dom/index.js";
 function WraperRouter(props) {
   const { basename, ...propsRes } = props;

package/dist/router-v6.cjs.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const React = require("react");
 const ReactRouterDom = require("react-router-dom/dist/index.js");
-const context = require("./context-BBLu8BlQ.cjs");
+const context = require("./context-DmzxwI_7.cjs");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {

package/dist/router-v6.es.js

@@ -1,7 +1,7 @@
 import React__default, { useContext } from "react";
 import * as ReactRouterDom from "react-router-dom/dist/index.js";
 export * from "react-router-dom/dist/index.js";
-import { R as RouterContext, L as LoggerInstance } from "./context-BcyT-d0V.js";
+import { R as RouterContext, L as LoggerInstance } from "./context-Dh6IUBWT.js";
 function WraperRouter(props) {
   const { basename, ...propsRes } = props;
   const routerContextProps = useContext(RouterContext) || {};

package/dist/router.cjs.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const React = require("react");
 const ReactRouterDom = require("react-router-dom/");
-const context = require("./context-BBLu8BlQ.cjs");
+const context = require("./context-DmzxwI_7.cjs");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {

package/dist/router.es.js

@@ -1,7 +1,7 @@
 import React__default, { useContext } from "react";
 import * as ReactRouterDom from "react-router-dom/";
 export * from "react-router-dom/";
-import { R as RouterContext, L as LoggerInstance } from "./context-BcyT-d0V.js";
+import { R as RouterContext, L as LoggerInstance } from "./context-Dh6IUBWT.js";
 function WrapperRouter(props) {
   const { basename, ...propsRes } = props;
   const routerContextProps = useContext(RouterContext) || {};

package/package.json

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

package/src/provider.tsx

@@ -8,10 +8,11 @@ import type {
 } from '@module-federation/bridge-shared';
 import { ErrorBoundary } from 'react-error-boundary';
 import { RouterContext } from './context';
-import { LoggerInstance, atLeastReact18 } from './utils';
+import { LoggerInstance, atLeastReact18, getModuleName } from './utils';
 
 type RenderParams = RenderFnParams & any;
 type DestroyParams = {
+  moduleName: string;
   dom: HTMLElement;
 };
 type RootType = HTMLElement | ReactDOMClient.Root;
@@ -60,19 +61,14 @@ export function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>) {
           ...propsInfo
         } = info;
 
-        const beforeBridgeRender =
-          (bridgeInfo?.hooks && bridgeInfo?.hooks.beforeBridgeRender) ||
-          params?.hooks?.beforeBridgeRender;
+        const moduleNameWithoutExpose = getModuleName(moduleName);
+        const instance = __FEDERATION__.__INSTANCES__.find(
+          (v) => v.name === moduleNameWithoutExpose,
+        );
+        LoggerInstance.log(`createBridgeComponent remote instance`, instance);
 
-        // you can return a props object through beforeBridgeRender to pass additional props parameters
         const beforeBridgeRenderRes =
-          beforeBridgeRender && beforeBridgeRender(info);
-        const extraProps =
-          beforeBridgeRenderRes &&
-          typeof beforeBridgeRenderRes === 'object' &&
-          beforeBridgeRenderRes?.extraProps
-            ? beforeBridgeRenderRes?.extraProps
-            : {};
+          instance?.bridgeHook?.lifecycle?.beforeBridgeRender?.emit(info) || {};
 
         const rootComponentWithErrorBoundary = (
           // set ErrorBoundary for RawComponent rendering error, usually caused by user app rendering error
@@ -83,7 +79,9 @@ export function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>) {
                 basename,
                 memoryRoute,
               }}
-              propsInfo={{ ...propsInfo, ...extraProps } as T}
+              propsInfo={
+                { ...propsInfo, ...beforeBridgeRenderRes?.extraProps } as T
+              }
             />
           </ErrorBoundary>
         );
@@ -115,12 +113,17 @@ export function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>) {
         LoggerInstance.log(`createBridgeComponent destroy Info`, {
           dom: info.dom,
         });
+        const moduleNameWithoutExpose = getModuleName(info.moduleName);
+        LoggerInstance.log(
+          `createBridgeComponent remote module without expose name >>>`,
+          moduleNameWithoutExpose,
+        );
+        const instance = __FEDERATION__.__INSTANCES__.find(
+          (v) => v.name === moduleNameWithoutExpose,
+        );
+        LoggerInstance.log(`createBridgeComponent remote instance`, instance);
 
-        const beforeBridgeDestroy =
-          (bridgeInfo?.hooks && bridgeInfo?.hooks.beforeBridgeDestroy) ||
-          params?.hooks?.beforeBridgeDestroy;
-        beforeBridgeDestroy && beforeBridgeDestroy(info);
-
+        instance?.bridgeHook?.lifecycle?.beforeBridgeDestroy?.emit(info);
         // call destroy function
         if (atLeastReact18(React)) {
           const root = rootMap.get(info.dom);
@@ -130,10 +133,7 @@ export function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>) {
           ReactDOM.unmountComponentAtNode(info.dom);
         }
 
-        const afterBridgeDestroy =
-          (bridgeInfo?.hooks && bridgeInfo?.hooks.afterBridgeDestroy) ||
-          params?.hooks?.afterBridgeDestroy;
-        afterBridgeDestroy && afterBridgeDestroy(info);
+        instance?.bridgeHook?.lifecycle?.afterBridgeDestroy?.emit(info);
       },
       rawComponent: bridgeInfo.rootComponent,
       __BRIDGE_FN__: (_args: T) => {},

package/src/remote/index.tsx

@@ -9,27 +9,9 @@ import * as ReactRouterDOM from 'react-router-dom';
 import type { ProviderParams } from '@module-federation/bridge-shared';
 import { dispatchPopstateEnv } from '@module-federation/bridge-shared';
 import { ErrorBoundaryPropsWithComponent } from 'react-error-boundary';
-import { LoggerInstance, pathJoin } from '../utils';
+import { LoggerInstance, pathJoin, getRootDomDefaultClassName } from '../utils';
 import { getInstance } from '@module-federation/runtime';
 
-export const getModuleName = (id: string) => {
-  // separate module name without detailed module path
-  // @vmok-e2e/edenx-demo-app2/button -> @vmok-e2e/edenx-demo-app2
-  const idArray = id.split('/');
-  if (idArray.length < 2) {
-    return id;
-  }
-  return idArray[0] + '/' + idArray[1];
-};
-
-export const getRootDomDefaultClassName = (moduleName: string) => {
-  if (!moduleName) {
-    return '';
-  }
-  const name = getModuleName(moduleName).replace(/\@/, '').replace(/\//, '-');
-  return `bridge-root-component-${name}`;
-};
-
 declare const __APP_VERSION__: string;
 export interface RenderFnParams extends ProviderParams {
   dom?: any;
@@ -100,27 +82,13 @@ const RemoteAppWrapper = forwardRef(function (
           renderProps,
         );
 
-        if (
-          host?.bridgeHook &&
-          host?.bridgeHook?.lifecycle?.beforeBridgeRender
-        ) {
-          const beforeBridgeRenderRes =
-            host?.bridgeHook?.lifecycle?.beforeBridgeRender.emit({
-              ...renderProps,
-            });
-          const extraProps =
-            beforeBridgeRenderRes &&
-            typeof beforeBridgeRenderRes === 'object' &&
-            beforeBridgeRenderRes?.extraProps
-              ? beforeBridgeRenderRes?.extraProps
-              : {};
-
-          renderProps = {
-            ...renderProps,
-            ...extraProps,
-          } as any;
-        }
+        // TODO: 寻找当前 remote 实例上的 hostName, 找到 host instance
+        const beforeBridgeRenderRes =
+          host?.bridgeHook?.lifecycle?.beforeBridgeRender?.emit(renderProps) ||
+          {};
+        renderProps = { ...renderProps, ...beforeBridgeRenderRes.extraProps };
         providerReturn.render(renderProps);
+        host?.bridgeHook?.lifecycle?.afterBridgeRender?.emit(renderProps);
       });
 
       return () => {
@@ -131,21 +99,26 @@ const RemoteAppWrapper = forwardRef(function (
               `createRemoteComponent LazyComponent destroy >>>`,
               { moduleName, basename, dom: renderDom.current },
             );
-            if (
-              host?.bridgeHook &&
-              host?.bridgeHook?.lifecycle?.afterBridgeDestroy
-            ) {
-              host?.bridgeHook?.lifecycle?.afterBridgeDestroy.emit({
-                moduleName,
-                dom: renderDom.current,
-                basename,
-                memoryRoute,
-                fallback,
-                ...resProps,
-              });
-            }
+            host?.bridgeHook?.lifecycle?.beforeBridgeDestroy?.emit({
+              moduleName,
+              dom: renderDom.current,
+              basename,
+              memoryRoute,
+              fallback,
+              ...resProps,
+            });
             providerInfoRef.current?.destroy({
+              moduleName,
+              dom: renderDom.current,
+            });
+
+            host?.bridgeHook?.lifecycle?.afterBridgeDestroy?.emit({
+              moduleName,
               dom: renderDom.current,
+              basename,
+              memoryRoute,
+              fallback,
+              ...resProps,
             });
           }
         });

package/src/utils.ts

@@ -41,3 +41,24 @@ export function pathJoin(...args: string[]) {
   }, '');
   return res || '/';
 }
+
+export const getModuleName = (id: string) => {
+  if (!id) {
+    return id;
+  }
+  // separate module name without detailed module path
+  // @vmok-e2e/edenx-demo-app2/button -> @vmok-e2e/edenx-demo-app2
+  const idArray = id.split('/');
+  if (idArray.length < 2) {
+    return id;
+  }
+  return idArray[0] + '/' + idArray[1];
+};
+
+export const getRootDomDefaultClassName = (moduleName: string) => {
+  if (!moduleName) {
+    return '';
+  }
+  const name = getModuleName(moduleName).replace(/\@/, '').replace(/\//, '-');
+  return `bridge-root-component-${name}`;
+};