@module-federation/bridge-react 0.0.0-next-20240822063818 → 0.0.0-next-20240822090000

package/CHANGELOG.md

@@ -1,18 +1,11 @@
 # @module-federation/bridge-react
 
-## 0.0.0-next-20240822063818
+## 0.0.0-next-20240822090000
 
 ### Patch Changes
 
-- @module-federation/bridge-shared@0.0.0-next-20240822063818
-
-## 0.5.0
-
-### Patch Changes
-
-- 49d6135: feat(@module-federation/bridge): enhance Bridge capabilities and fix some issues
-- Updated dependencies [49d6135]
-  - @module-federation/bridge-shared@0.5.0
+- 3082116: feat: support module isolated reported
+  - @module-federation/bridge-shared@0.0.0-next-20240822090000
 
 ## 0.4.0
 

package/__tests__/bridge.spec.tsx

@@ -45,8 +45,8 @@ describe('bridge', () => {
   });
 
   it('createRemoteComponent', async () => {
-    function Component({ props }: { props?: Record<string, any> }) {
-      return <div>life cycle render {props?.msg}</div>;
+    function Component(info: { msg: string }) {
+      return <div>life cycle render {info.msg}</div>;
     }
     const BridgeComponent = createBridgeComponent({
       rootComponent: Component,
@@ -61,45 +61,11 @@ describe('bridge', () => {
       loading: <div>loading</div>,
     });
 
-    const { container } = render(
-      <RemoteComponent props={{ msg: 'hello world' }} />,
-    );
-    expect(getHtml(container)).toMatch('loading');
-
-    await sleep(200);
-    expect(getHtml(container)).toMatch('life cycle render');
-    expect(getHtml(container)).toMatch('hello world');
-  });
-
-  it('createRemoteComponent and obtain ref property', async () => {
-    const ref = {
-      current: null,
-    };
-
-    function Component({ props }: { props?: Record<string, any> }) {
-      return <div>life cycle render {props?.msg}</div>;
-    }
-    const BridgeComponent = createBridgeComponent({
-      rootComponent: Component,
-    });
-    const RemoteComponent = createRemoteComponent({
-      loader: async () => {
-        return {
-          default: BridgeComponent,
-        };
-      },
-      fallback: () => <div></div>,
-      loading: <div>loading</div>,
-    });
-
-    const { container } = render(
-      <RemoteComponent ref={ref} props={{ msg: 'hello world' }} />,
-    );
+    const { container } = render(<RemoteComponent msg={'hello world'} />);
     expect(getHtml(container)).toMatch('loading');
 
     await sleep(200);
     expect(getHtml(container)).toMatch('life cycle render');
     expect(getHtml(container)).toMatch('hello world');
-    expect(ref.current).not.toBeNull();
   });
 });

package/dist/index.cjs.js

@@ -117,71 +117,55 @@ function hasArrayChanged() {
   let b = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : [];
   return a.length !== b.length || a.some((item, index) => !Object.is(item, b[index]));
 }
-const RemoteAppWrapper = React.forwardRef(function(props, ref) {
-  const RemoteApp2 = () => {
-    context.LoggerInstance.log(`RemoteAppWrapper RemoteApp props >>>`, { props });
-    const {
-      moduleName,
-      memoryRoute,
-      basename,
-      providerInfo,
-      className,
-      style,
-      fallback,
-      ...resProps
-    } = props;
-    const rootRef = ref && "current" in ref ? ref : React.useRef(null);
-    const renderDom = React.useRef(null);
-    const providerInfoRef = React.useRef(null);
-    React.useEffect(() => {
-      const renderTimeout = setTimeout(() => {
-        const providerReturn = providerInfo();
-        providerInfoRef.current = providerReturn;
-        const renderProps = {
-          moduleName,
-          dom: rootRef.current,
-          basename,
-          memoryRoute,
-          fallback,
-          ...resProps
-        };
-        renderDom.current = rootRef.current;
-        context.LoggerInstance.log(
-          `createRemoteComponent LazyComponent render >>>`,
-          renderProps
-        );
-        providerReturn.render(renderProps);
-      });
-      return () => {
-        clearTimeout(renderTimeout);
-        setTimeout(() => {
-          var _a, _b;
-          if ((_a = providerInfoRef.current) == null ? void 0 : _a.destroy) {
-            context.LoggerInstance.log(
-              `createRemoteComponent LazyComponent destroy >>>`,
-              { moduleName, basename, dom: renderDom.current }
-            );
-            (_b = providerInfoRef.current) == null ? void 0 : _b.destroy({
-              dom: renderDom.current
-            });
-          }
-        });
+const RemoteApp = ({
+  name,
+  memoryRoute,
+  basename,
+  providerInfo,
+  ...resProps
+}) => {
+  const rootRef = React.useRef(null);
+  const renderDom = React.useRef(null);
+  const providerInfoRef = React.useRef(null);
+  React.useEffect(() => {
+    const renderTimeout = setTimeout(() => {
+      const providerReturn = providerInfo();
+      providerInfoRef.current = providerReturn;
+      const renderProps = {
+        name,
+        dom: rootRef.current,
+        basename,
+        memoryRoute,
+        ...resProps
       };
-    }, []);
-    return /* @__PURE__ */ React.createElement(
-      "div",
-      {
-        className: props == null ? void 0 : props.className,
-        style: props == null ? void 0 : props.style,
-        ref: rootRef
-      }
-    );
-  };
-  RemoteApp2["__APP_VERSION__"] = "0.5.0";
-  return /* @__PURE__ */ React.createElement(RemoteApp2, null);
-});
+      renderDom.current = rootRef.current;
+      context.LoggerInstance.log(
+        `createRemoteComponent LazyComponent render >>>`,
+        renderProps
+      );
+      providerReturn.render(renderProps);
+    });
+    return () => {
+      clearTimeout(renderTimeout);
+      setTimeout(() => {
+        var _a, _b;
+        if ((_a = providerInfoRef.current) == null ? void 0 : _a.destroy) {
+          context.LoggerInstance.log(
+            `createRemoteComponent LazyComponent destroy >>>`,
+            { name, basename, dom: renderDom.current }
+          );
+          (_b = providerInfoRef.current) == null ? void 0 : _b.destroy({
+            dom: renderDom.current
+          });
+        }
+      });
+    };
+  }, []);
+  return /* @__PURE__ */ React.createElement("div", { ref: rootRef });
+};
+RemoteApp["__APP_VERSION__"] = "0.4.0";
 function withRouterData(WrappedComponent) {
-  const Component = React.forwardRef(function(props, ref) {
+  return (props) => {
     var _a;
     let enableDispathPopstate = false;
     let routerContextVal;
@@ -239,13 +223,10 @@ function withRouterData(WrappedComponent) {
         setPathname(location.pathname);
       }, [location]);
     }
-    return /* @__PURE__ */ React.createElement(WrappedComponent, { ...props, basename, ref });
-  });
-  return React.forwardRef(function(props, ref) {
-    return /* @__PURE__ */ React.createElement(Component, { ...props, ref });
-  });
+    return /* @__PURE__ */ React.createElement(WrappedComponent, { ...props, basename });
+  };
 }
-const RemoteApp = withRouterData(RemoteAppWrapper);
+const RemoteApp$1 = withRouterData(RemoteApp);
 function createLazyRemoteComponent(info) {
   const exportName = (info == null ? void 0 : info.export) || "default";
   return React.lazy(async () => {
@@ -262,15 +243,13 @@ function createLazyRemoteComponent(info) {
       );
       const exportFn = m2[exportName];
       if (exportName in m2 && typeof exportFn === "function") {
-        const RemoteAppComponent = React.forwardRef((props, ref) => {
+        const RemoteAppComponent = React.forwardRef((props, _ref) => {
           return /* @__PURE__ */ React.createElement(
-            RemoteApp,
+            RemoteApp$1,
             {
-              moduleName,
+              name: moduleName,
               providerInfo: exportFn,
               exportName: info.export || "default",
-              fallback: info.fallback,
-              ref,
               ...props
             }
           );
@@ -295,12 +274,10 @@ function createLazyRemoteComponent(info) {
   });
 }
 function createRemoteComponent(info) {
-  return React.forwardRef(
-    (props, ref) => {
-      const LazyComponent = createLazyRemoteComponent(info);
-      return /* @__PURE__ */ React.createElement(ErrorBoundary, { FallbackComponent: info.fallback }, /* @__PURE__ */ React.createElement(React.Suspense, { fallback: info.loading }, /* @__PURE__ */ React.createElement(LazyComponent, { ...props, ref })));
-    }
-  );
+  const LazyComponent = createLazyRemoteComponent(info);
+  return (props) => {
+    return /* @__PURE__ */ React.createElement(ErrorBoundary, { FallbackComponent: info.fallback }, /* @__PURE__ */ React.createElement(React.Suspense, { fallback: info.loading }, /* @__PURE__ */ React.createElement(LazyComponent, { ...props })));
+  };
 }
 var client = {};
 var m = ReactDOM;
@@ -327,76 +304,69 @@ if (process.env.NODE_ENV === "production") {
   };
 }
 function createBridgeComponent(bridgeInfo) {
+  let provider;
   return () => {
     const rootMap = /* @__PURE__ */ new Map();
     const RawComponent = (info) => {
-      const { appInfo, propsInfo, ...restProps } = info;
-      const { moduleName, memoryRoute, basename = "/" } = appInfo;
-      return /* @__PURE__ */ React__namespace.createElement(context.RouterContext.Provider, { value: { moduleName, basename, memoryRoute } }, /* @__PURE__ */ React__namespace.createElement(
-        bridgeInfo.rootComponent,
-        {
-          ...propsInfo,
-          basename,
-          ...restProps
-        }
-      ));
+      const { appInfo, propsInfo } = info;
+      const { name, memoryRoute, basename = "/" } = appInfo;
+      return /* @__PURE__ */ React__namespace.createElement(context.RouterContext.Provider, { value: { name, basename, memoryRoute } }, /* @__PURE__ */ React__namespace.createElement(bridgeInfo.rootComponent, { ...propsInfo, basename }));
     };
-    return {
-      async render(info) {
-        context.LoggerInstance.log(`createBridgeComponent render Info`, info);
-        const {
-          moduleName,
-          dom,
-          basename,
-          memoryRoute,
-          fallback,
-          ...propsInfo
-        } = 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(
-            RawComponent,
-            {
-              appInfo: {
-                moduleName,
-                basename,
-                memoryRoute
-              },
-              propsInfo
-            }
-          ))
-        );
-        if (context.atLeastReact18(React__namespace)) {
-          if (bridgeInfo == null ? void 0 : bridgeInfo.render) {
-            Promise.resolve(
-              bridgeInfo == null ? void 0 : bridgeInfo.render(rootComponentWithErrorBoundary, dom)
-            ).then((root) => rootMap.set(info.dom, root));
-          } else {
+    if (!provider) {
+      provider = {
+        render(info) {
+          context.LoggerInstance.log(`createBridgeComponent render Info`, info);
+          const { name, basename, memoryRoute, ...propsInfo } = info;
+          if (context.atLeastReact18(React__namespace)) {
             const root = client.createRoot(info.dom);
-            root.render(rootComponentWithErrorBoundary);
             rootMap.set(info.dom, root);
+            root.render(
+              /* @__PURE__ */ React__namespace.createElement(
+                RawComponent,
+                {
+                  propsInfo,
+                  appInfo: {
+                    name,
+                    basename,
+                    memoryRoute
+                  }
+                }
+              )
+            );
+          } else {
+            ReactDOM.render(
+              /* @__PURE__ */ React__namespace.createElement(
+                RawComponent,
+                {
+                  propsInfo,
+                  appInfo: {
+                    name,
+                    basename,
+                    memoryRoute
+                  }
+                }
+              ),
+              info.dom
+            );
           }
-        } else {
-          const renderFn = (bridgeInfo == null ? void 0 : bridgeInfo.render) || ReactDOM.render;
-          renderFn == null ? void 0 : renderFn(rootComponentWithErrorBoundary, info.dom);
-        }
-      },
-      async destroy(info) {
-        context.LoggerInstance.log(`createBridgeComponent destroy Info`, {
-          dom: info.dom
-        });
-        if (context.atLeastReact18(React__namespace)) {
-          const root = rootMap.get(info.dom);
-          root == null ? void 0 : root.unmount();
-          rootMap.delete(info.dom);
-        } else {
-          ReactDOM.unmountComponentAtNode(info.dom);
+        },
+        destroy(info) {
+          context.LoggerInstance.log(`createBridgeComponent destroy Info`, {
+            dom: info.dom
+          });
+          if (context.atLeastReact18(React__namespace)) {
+            const root = rootMap.get(info.dom);
+            root == null ? void 0 : root.unmount();
+          } else {
+            ReactDOM.unmountComponentAtNode(info.dom);
+          }
+        },
+        rawComponent: bridgeInfo.rootComponent,
+        __BRIDGE_FN__: (_args) => {
         }
-      },
-      rawComponent: bridgeInfo.rootComponent,
-      __BRIDGE_FN__: (_args) => {
-      }
-    };
+      };
+    }
+    return provider;
   };
 }
 exports.createBridgeComponent = createBridgeComponent;

package/dist/index.d.ts

@@ -1,25 +1,20 @@
 import { ComponentType } from 'react';
 import { default as default_2 } from 'react';
-import { default as default_3 } from 'react-dom/client';
 import { ErrorInfo } from 'react';
 import { PropsWithChildren } from 'react';
 import * as React_2 from 'react';
 
-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;
-};
+export declare function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>): () => Provider<T>;
 
 export declare function createRemoteComponent<T, E extends keyof T>(info: {
     loader: () => Promise<T>;
     loading: default_2.ReactNode;
     fallback: ErrorBoundaryPropsWithComponent['FallbackComponent'];
     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>>;
+}): (props: {
+    basename?: ProviderParams['basename'];
+    memoryRoute?: ProviderParams['memoryRoute'];
+} & ("__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.JSX.Element;
 
 declare type ErrorBoundaryPropsWithComponent = ErrorBoundarySharedProps & {
     fallback?: never;
@@ -45,25 +40,29 @@ declare type FallbackProps = {
     resetErrorBoundary: (...args: any[]) => void;
 };
 
+declare interface Provider<T> {
+    render(info: any): void;
+    destroy(info: {
+        dom: HTMLElement;
+    }): void;
+    rawComponent: React_2.ComponentType;
+    __BRIDGE_FN__: (_args: T) => void;
+}
+
 declare type ProviderFnParams<T> = {
     rootComponent: React_2.ComponentType<T>;
-    render?: (App: React_2.ReactElement, id?: HTMLElement | string) => RootType | Promise<RootType>;
 };
 
 export declare interface ProviderParams {
-    moduleName?: string;
+    name?: string;
     basename?: string;
     memoryRoute?: {
         entryPath: string;
     };
-    style?: React.CSSProperties;
-    className?: string;
 }
 
 export declare interface RenderFnParams extends ProviderParams {
     dom: HTMLElement;
 }
 
-declare type RootType = HTMLElement | default_3.Root;
-
 export { }