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

package/CHANGELOG.md

@@ -1,16 +1,26 @@
 # @module-federation/bridge-react
 
-## 0.0.0-next-20241108091829
+## 0.0.0-next-20241112032845
+
+### Patch Changes
+
+- @module-federation/sdk@0.0.0-next-20241112032845
+- @module-federation/bridge-shared@0.0.0-next-20241112032845
+
+## 0.7.2
+
+### Patch Changes
+
+- @module-federation/sdk@0.7.2
+- @module-federation/bridge-shared@0.7.2
+
+## 0.7.1
 
 ### Patch Changes
 
-- 3082116: feat: feat: support lifecycyle hooks in module-deferation bridge
-- Updated dependencies [8712967]
 - Updated dependencies [6db4c5f]
-- Updated dependencies [3082116]
-  - @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
+  - @module-federation/sdk@0.7.1
+  - @module-federation/bridge-shared@0.7.1
 
 ## 0.7.0
 

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

@@ -329,27 +329,8 @@ 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/{context-Dh6IUBWT.js → context-BcyT-d0V.js}

@@ -328,29 +328,10 @@ 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,
-  getModuleName as a,
-  atLeastReact18 as b,
-  getRootDomDefaultClassName as g,
+  atLeastReact18 as a,
   pathJoin as p
 };

package/dist/index.cjs.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const React = require("react");
-const context = require("./context-DmzxwI_7.cjs");
+const context = require("./context-BBLu8BlQ.cjs");
 const ReactRouterDOM = require("react-router-dom");
-const runtime = require("@module-federation/runtime");
 const ReactDOM = require("react-dom");
 function _interopNamespaceDefault(e2) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
@@ -123,8 +122,6 @@ function e() {
   window.dispatchEvent(t);
 }
 const RemoteAppWrapper = React.forwardRef(function(props, ref) {
-  const host = runtime.getInstance();
-  context.LoggerInstance.log(`RemoteAppWrapper host >>>`, host);
   const RemoteApp2 = () => {
     context.LoggerInstance.log(`RemoteAppWrapper RemoteApp props >>>`, { props });
     const {
@@ -142,10 +139,9 @@ const RemoteAppWrapper = React.forwardRef(function(props, ref) {
     const providerInfoRef = React.useRef(null);
     React.useEffect(() => {
       const renderTimeout = setTimeout(() => {
-        var _a, _b, _c, _d, _e, _f;
         const providerReturn = providerInfo();
         providerInfoRef.current = providerReturn;
-        let renderProps = {
+        const renderProps = {
           moduleName,
           dom: rootRef.current,
           basename,
@@ -158,55 +154,34 @@ const RemoteAppWrapper = React.forwardRef(function(props, ref) {
           `createRemoteComponent LazyComponent render >>>`,
           renderProps
         );
-        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, _g, _h;
+          var _a, _b;
           if ((_a = providerInfoRef.current) == null ? void 0 : _a.destroy) {
             context.LoggerInstance.log(
               `createRemoteComponent LazyComponent destroy >>>`,
               { moduleName, basename, dom: renderDom.current }
             );
-            (_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,
+            (_b = providerInfoRef.current) == null ? void 0 : _b.destroy({
               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 = `${context.getRootDomDefaultClassName(moduleName)} ${props == null ? void 0 : props.className}`;
     return /* @__PURE__ */ React.createElement(
       "div",
       {
-        className: rootComponentClassName,
+        className: props == null ? void 0 : props.className,
         style: props == null ? void 0 : props.style,
         ref: rootRef
       }
     );
   };
-  RemoteApp2["__APP_VERSION__"] = "0.7.0";
+  RemoteApp2["__APP_VERSION__"] = "0.7.2";
   return /* @__PURE__ */ React.createElement(RemoteApp2, null);
 });
 function withRouterData(WrappedComponent) {
@@ -356,7 +331,7 @@ if (process.env.NODE_ENV === "production") {
   };
 }
 function createBridgeComponent(bridgeInfo) {
-  return (params) => {
+  return () => {
     const rootMap = /* @__PURE__ */ new Map();
     const RawComponent = (info) => {
       const { appInfo, propsInfo, ...restProps } = info;
@@ -372,7 +347,6 @@ function createBridgeComponent(bridgeInfo) {
     };
     return {
       async render(info) {
-        var _a, _b, _c, _d;
         context.LoggerInstance.log(`createBridgeComponent render Info`, info);
         const {
           moduleName,
@@ -382,12 +356,6 @@ function createBridgeComponent(bridgeInfo) {
           fallback,
           ...propsInfo
         } = info;
-        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(
@@ -398,7 +366,7 @@ function createBridgeComponent(bridgeInfo) {
                 basename,
                 memoryRoute
               },
-              propsInfo: { ...propsInfo, ...beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps }
+              propsInfo
             }
           ))
         );
@@ -416,24 +384,11 @@ 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) || ((_d = params == null ? void 0 : params.hooks) == null ? void 0 : _d.afterBridgeRender);
-        afterBridgeRender && afterBridgeRender(info);
       },
       async destroy(info) {
-        var _a, _b, _c, _d, _e, _f;
         context.LoggerInstance.log(`createBridgeComponent destroy Info`, {
           dom: info.dom
         });
-        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();
@@ -441,7 +396,6 @@ function createBridgeComponent(bridgeInfo) {
         } else {
           ReactDOM.unmountComponentAtNode(info.dom);
         }
-        (_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

@@ -5,18 +5,11 @@ import { ErrorInfo } from 'react';
 import { PropsWithChildren } from 'react';
 import * as React_2 from 'react';
 
-declare type BridgeHooks = {
-    beforeBridgeRender?: (params: RenderFnParams) => void | Record<string, any>;
-    afterBridgeRender?: (params: RenderFnParams) => void | Record<string, any>;
-    beforeBridgeDestroy?: (params: DestroyParams) => void | Record<string, any>;
-    afterBridgeDestroy?: (params: DestroyParams) => void | Record<string, any>;
-};
-
-export declare function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>): (params?: {
-    hooks?: BridgeHooks;
-}) => {
-    render(info: RenderParams): Promise<void>;
-    destroy(info: DestroyParams): Promise<void>;
+export declare function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>): () => {
+    render(info: RenderFnParams & any): Promise<void>;
+    destroy(info: {
+        dom: HTMLElement;
+    }): Promise<void>;
     rawComponent: React_2.ComponentType<T>;
     __BRIDGE_FN__: (_args: T) => void;
 };
@@ -28,11 +21,6 @@ export declare function createRemoteComponent<T, E extends keyof T>(info: {
     export?: E;
 }): 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;
-};
-
 declare type ErrorBoundaryPropsWithComponent = ErrorBoundarySharedProps & {
     fallback?: never;
     FallbackComponent: ComponentType<FallbackProps>;
@@ -60,7 +48,6 @@ declare type FallbackProps = {
 declare type ProviderFnParams<T> = {
     rootComponent: React_2.ComponentType<T>;
     render?: (App: React_2.ReactElement, id?: HTMLElement | string) => RootType | Promise<RootType>;
-    hooks?: BridgeHooks;
 };
 
 export declare interface ProviderParams {
@@ -77,8 +64,6 @@ export declare interface RenderFnParams extends ProviderParams {
     dom: HTMLElement;
 }
 
-declare type RenderParams = RenderFnParams & any;
-
 declare type RootType = HTMLElement | default_3.Root;
 
 export { }

package/dist/index.es.js

@@ -1,8 +1,7 @@
 import * as React from "react";
 import React__default, { createContext, Component, createElement, isValidElement, forwardRef, useRef, useEffect, useContext, useState } from "react";
-import { L as LoggerInstance, g as getRootDomDefaultClassName, p as pathJoin, a as getModuleName, b as atLeastReact18, R as RouterContext } from "./context-Dh6IUBWT.js";
+import { L as LoggerInstance, p as pathJoin, a as atLeastReact18, R as RouterContext } from "./context-BcyT-d0V.js";
 import * as ReactRouterDOM from "react-router-dom";
-import { getInstance } from "@module-federation/runtime";
 import ReactDOM from "react-dom";
 const ErrorBoundaryContext = createContext(null);
 const initialState = {
@@ -104,8 +103,6 @@ function e() {
   window.dispatchEvent(t);
 }
 const RemoteAppWrapper = forwardRef(function(props, ref) {
-  const host = getInstance();
-  LoggerInstance.log(`RemoteAppWrapper host >>>`, host);
   const RemoteApp2 = () => {
     LoggerInstance.log(`RemoteAppWrapper RemoteApp props >>>`, { props });
     const {
@@ -123,10 +120,9 @@ const RemoteAppWrapper = forwardRef(function(props, ref) {
     const providerInfoRef = useRef(null);
     useEffect(() => {
       const renderTimeout = setTimeout(() => {
-        var _a, _b, _c, _d, _e, _f;
         const providerReturn = providerInfo();
         providerInfoRef.current = providerReturn;
-        let renderProps = {
+        const renderProps = {
           moduleName,
           dom: rootRef.current,
           basename,
@@ -139,55 +135,34 @@ const RemoteAppWrapper = forwardRef(function(props, ref) {
           `createRemoteComponent LazyComponent render >>>`,
           renderProps
         );
-        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, _g, _h;
+          var _a, _b;
           if ((_a = providerInfoRef.current) == null ? void 0 : _a.destroy) {
             LoggerInstance.log(
               `createRemoteComponent LazyComponent destroy >>>`,
               { moduleName, basename, dom: renderDom.current }
             );
-            (_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,
+            (_b = providerInfoRef.current) == null ? void 0 : _b.destroy({
               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}`;
     return /* @__PURE__ */ React__default.createElement(
       "div",
       {
-        className: rootComponentClassName,
+        className: props == null ? void 0 : props.className,
         style: props == null ? void 0 : props.style,
         ref: rootRef
       }
     );
   };
-  RemoteApp2["__APP_VERSION__"] = "0.7.0";
+  RemoteApp2["__APP_VERSION__"] = "0.7.2";
   return /* @__PURE__ */ React__default.createElement(RemoteApp2, null);
 });
 function withRouterData(WrappedComponent) {
@@ -337,7 +312,7 @@ if (process.env.NODE_ENV === "production") {
   };
 }
 function createBridgeComponent(bridgeInfo) {
-  return (params) => {
+  return () => {
     const rootMap = /* @__PURE__ */ new Map();
     const RawComponent = (info) => {
       const { appInfo, propsInfo, ...restProps } = info;
@@ -353,7 +328,6 @@ function createBridgeComponent(bridgeInfo) {
     };
     return {
       async render(info) {
-        var _a, _b, _c, _d;
         LoggerInstance.log(`createBridgeComponent render Info`, info);
         const {
           moduleName,
@@ -363,12 +337,6 @@ function createBridgeComponent(bridgeInfo) {
           fallback,
           ...propsInfo
         } = info;
-        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(
@@ -379,7 +347,7 @@ function createBridgeComponent(bridgeInfo) {
                 basename,
                 memoryRoute
               },
-              propsInfo: { ...propsInfo, ...beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps }
+              propsInfo
             }
           ))
         );
@@ -397,24 +365,11 @@ 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) || ((_d = params == null ? void 0 : params.hooks) == null ? void 0 : _d.afterBridgeRender);
-        afterBridgeRender && afterBridgeRender(info);
       },
       async destroy(info) {
-        var _a, _b, _c, _d, _e, _f;
         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);
-        (_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();
@@ -422,7 +377,6 @@ function createBridgeComponent(bridgeInfo) {
         } else {
           ReactDOM.unmountComponentAtNode(info.dom);
         }
-        (_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-DmzxwI_7.cjs");
+const context = require("./context-BBLu8BlQ.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-Dh6IUBWT.js";
+import { R as RouterContext, L as LoggerInstance } from "./context-BcyT-d0V.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-DmzxwI_7.cjs");
+const context = require("./context-BBLu8BlQ.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-Dh6IUBWT.js";
+import { R as RouterContext, L as LoggerInstance } from "./context-BcyT-d0V.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-DmzxwI_7.cjs");
+const context = require("./context-BBLu8BlQ.cjs");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {
@@ -65,7 +65,7 @@ function WrapperRouterProvider(props) {
     return /* @__PURE__ */ React.createElement(RouterProvider, { router: MemeoryRouterInstance });
   } else {
     const BrowserRouterInstance = createBrowserRouter(routers, {
-      basename: routerContextProps.basename || (router == null ? void 0 : router.basename),
+      basename: routerContextProps.basename,
       future: router.future,
       window: router.window
     });

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-Dh6IUBWT.js";
+import { R as RouterContext, L as LoggerInstance } from "./context-BcyT-d0V.js";
 function WrapperRouter(props) {
   const { basename, ...propsRes } = props;
   const routerContextProps = useContext(RouterContext) || {};
@@ -47,7 +47,7 @@ function WrapperRouterProvider(props) {
     return /* @__PURE__ */ React__default.createElement(RouterProvider, { router: MemeoryRouterInstance });
   } else {
     const BrowserRouterInstance = createBrowserRouter(routers, {
-      basename: routerContextProps.basename || (router == null ? void 0 : router.basename),
+      basename: routerContextProps.basename,
       future: router.future,
       window: router.window
     });

package/package.json

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

package/src/create.tsx

@@ -1,11 +1,11 @@
 import React, { forwardRef } from 'react';
+import type { ProviderParams } from '@module-federation/bridge-shared';
+import { LoggerInstance } from './utils';
 import {
   ErrorBoundary,
   ErrorBoundaryPropsWithComponent,
 } from 'react-error-boundary';
-import { LoggerInstance } from './utils';
 import RemoteApp from './remote';
-import type { ProviderParams } from '@module-federation/bridge-shared';
 
 export interface RenderFnParams extends ProviderParams {
   dom?: any;

package/src/provider.tsx

@@ -2,38 +2,25 @@ import { useLayoutEffect, useRef, useState } from 'react';
 import * as React from 'react';
 import ReactDOM from 'react-dom';
 import ReactDOMClient from 'react-dom/client';
+import { RouterContext } from './context';
 import type {
   ProviderParams,
   RenderFnParams,
 } from '@module-federation/bridge-shared';
+import { LoggerInstance, atLeastReact18 } from './utils';
 import { ErrorBoundary } from 'react-error-boundary';
-import { RouterContext } from './context';
-import { LoggerInstance, atLeastReact18, getModuleName } from './utils';
 
-type RenderParams = RenderFnParams & any;
-type DestroyParams = {
-  moduleName: string;
-  dom: HTMLElement;
-};
 type RootType = HTMLElement | ReactDOMClient.Root;
-
-type BridgeHooks = {
-  beforeBridgeRender?: (params: RenderFnParams) => void | Record<string, any>;
-  afterBridgeRender?: (params: RenderFnParams) => void | Record<string, any>;
-  beforeBridgeDestroy?: (params: DestroyParams) => void | Record<string, any>;
-  afterBridgeDestroy?: (params: DestroyParams) => void | Record<string, any>;
-};
-
 type ProviderFnParams<T> = {
   rootComponent: React.ComponentType<T>;
   render?: (
     App: React.ReactElement,
     id?: HTMLElement | string,
   ) => RootType | Promise<RootType>;
-  hooks?: BridgeHooks;
 };
+
 export function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>) {
-  return (params?: { hooks?: BridgeHooks }) => {
+  return () => {
     const rootMap = new Map<any, RootType>();
     const RawComponent = (info: { propsInfo: T; appInfo: ProviderParams }) => {
       const { appInfo, propsInfo, ...restProps } = info;
@@ -50,7 +37,7 @@ export function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>) {
     };
 
     return {
-      async render(info: RenderParams) {
+      async render(info: RenderFnParams & any) {
         LoggerInstance.log(`createBridgeComponent render Info`, info);
         const {
           moduleName,
@@ -60,16 +47,6 @@ export function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>) {
           fallback,
           ...propsInfo
         } = info;
-
-        const moduleNameWithoutExpose = getModuleName(moduleName);
-        const instance = __FEDERATION__.__INSTANCES__.find(
-          (v) => v.name === moduleNameWithoutExpose,
-        );
-        LoggerInstance.log(`createBridgeComponent remote instance`, instance);
-
-        const beforeBridgeRenderRes =
-          instance?.bridgeHook?.lifecycle?.beforeBridgeRender?.emit(info) || {};
-
         const rootComponentWithErrorBoundary = (
           // set ErrorBoundary for RawComponent rendering error, usually caused by user app rendering error
           <ErrorBoundary FallbackComponent={fallback}>
@@ -79,13 +56,11 @@ export function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>) {
                 basename,
                 memoryRoute,
               }}
-              propsInfo={
-                { ...propsInfo, ...beforeBridgeRenderRes?.extraProps } as T
-              }
+              propsInfo={propsInfo}
             />
           </ErrorBoundary>
         );
-        // call render function
+
         if (atLeastReact18(React)) {
           if (bridgeInfo?.render) {
             // in case bridgeInfo?.render is an async function, resolve this to promise
@@ -102,29 +77,11 @@ export function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>) {
           const renderFn = bridgeInfo?.render || ReactDOM.render;
           renderFn?.(rootComponentWithErrorBoundary, info.dom);
         }
-
-        const afterBridgeRender =
-          (bridgeInfo?.hooks && bridgeInfo?.hooks.afterBridgeDestroy) ||
-          params?.hooks?.afterBridgeRender;
-        afterBridgeRender && afterBridgeRender(info);
       },
-
-      async destroy(info: DestroyParams) {
+      async destroy(info: { dom: HTMLElement }) {
         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);
-
-        instance?.bridgeHook?.lifecycle?.beforeBridgeDestroy?.emit(info);
-        // call destroy function
         if (atLeastReact18(React)) {
           const root = rootMap.get(info.dom);
           (root as ReactDOMClient.Root)?.unmount();
@@ -132,8 +89,6 @@ export function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>) {
         } else {
           ReactDOM.unmountComponentAtNode(info.dom);
         }
-
-        instance?.bridgeHook?.lifecycle?.afterBridgeDestroy?.emit(info);
       },
       rawComponent: bridgeInfo.rootComponent,
       __BRIDGE_FN__: (_args: T) => {},

package/src/remote/index.tsx

@@ -7,10 +7,9 @@ import React, {
 } from 'react';
 import * as ReactRouterDOM from 'react-router-dom';
 import type { ProviderParams } from '@module-federation/bridge-shared';
+import { LoggerInstance, pathJoin } from '../utils';
 import { dispatchPopstateEnv } from '@module-federation/bridge-shared';
 import { ErrorBoundaryPropsWithComponent } from 'react-error-boundary';
-import { LoggerInstance, pathJoin, getRootDomDefaultClassName } from '../utils';
-import { getInstance } from '@module-federation/runtime';
 
 declare const __APP_VERSION__: string;
 export interface RenderFnParams extends ProviderParams {
@@ -40,8 +39,6 @@ const RemoteAppWrapper = forwardRef(function (
   props: RemoteAppParams & RenderFnParams,
   ref,
 ) {
-  const host = getInstance();
-  LoggerInstance.log(`RemoteAppWrapper host >>>`, host);
   const RemoteApp = () => {
     LoggerInstance.log(`RemoteAppWrapper RemoteApp props >>>`, { props });
     const {
@@ -68,7 +65,7 @@ const RemoteAppWrapper = forwardRef(function (
         const providerReturn = providerInfo();
         providerInfoRef.current = providerReturn;
 
-        let renderProps = {
+        const renderProps = {
           moduleName,
           dom: rootRef.current,
           basename,
@@ -81,14 +78,7 @@ const RemoteAppWrapper = forwardRef(function (
           `createRemoteComponent LazyComponent render >>>`,
           renderProps,
         );
-
-        // 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 () => {
@@ -99,37 +89,17 @@ const RemoteAppWrapper = forwardRef(function (
               `createRemoteComponent LazyComponent destroy >>>`,
               { moduleName, basename, dom: renderDom.current },
             );
-            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,
             });
           }
         });
       };
     }, []);
 
-    // bridge-remote-root
-    const rootComponentClassName = `${getRootDomDefaultClassName(moduleName)} ${props?.className}`;
     return (
       <div
-        className={rootComponentClassName}
+        className={props?.className}
         style={props?.style}
         ref={rootRef}
       ></div>

package/src/router-v5.tsx

@@ -2,6 +2,7 @@ import React, { useContext } from 'react';
 // The upper alias react-router-dom$ into this file avoids the loop
 // @ts-ignore
 import * as ReactRouterDom from 'react-router-dom/index.js';
+
 import { RouterContext } from './context';
 import { LoggerInstance } from './utils';
 

package/src/router.tsx

@@ -59,7 +59,7 @@ function WrapperRouterProvider(
     return <RouterProvider router={MemeoryRouterInstance} />;
   } else {
     const BrowserRouterInstance = createBrowserRouter(routers, {
-      basename: routerContextProps.basename || router?.basename,
+      basename: routerContextProps.basename,
       future: router.future,
       window: router.window,
     });

package/src/utils.ts

@@ -41,24 +41,3 @@ 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}`;
-};