@module-federation/bridge-react 0.0.0-next-20240731105745 → 0.0.0-next-20240801085730

package/CHANGELOG.md

@@ -1,12 +1,10 @@
 # @module-federation/bridge-react
 
-## 0.0.0-next-20240731105745
+## 0.0.0-next-20240801085730
 
 ### Patch Changes
 
-- 67fa05b: feat(@module-federation/bridge): optimize @module-federation/bridge package
-- Updated dependencies [67fa05b]
-  - @module-federation/bridge-shared@0.0.0-next-20240731105745
+- @module-federation/bridge-shared@0.0.0-next-20240801085730
 
 ## 0.3.3
 

package/__tests__/bridge.spec.tsx

@@ -8,7 +8,7 @@ import {
   screen,
   waitFor,
 } from '@testing-library/react';
-import { createContainer, createCustomContainer, getHtml, sleep } from './util';
+import { createContainer, getHtml, sleep } from './util';
 
 describe('bridge', () => {
   let containerInfo: ReturnType<typeof createContainer>;
@@ -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,82 +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 with dom provided, will render on the provided dom', async () => {
-    containerInfo = createCustomContainer();
-
-    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>,
-      dom: '#container-custom',
-    });
-
-    const { container } = render(
-      <RemoteComponent props={{ msg: 'hello there' }} />,
-    );
-    expect(getHtml(container)).toMatch('loading');
-
-    await sleep(200);
-
-    const element = screen.getByTestId('container-custom');
-    expect(element.children.length).toBeGreaterThan(0);
-    expect(element.innerHTML).toContain('life cycle render');
-    expect(element.innerHTML).toContain('hello there');
-
-    const elementDefault = screen.getByTestId('container');
-    expect(elementDefault.children.length).toBe(0);
-    expect(elementDefault.innerHTML).toContain('');
-  });
-
-  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/__tests__/util.ts

@@ -12,24 +12,6 @@ export async function sleep(time: number) {
 export function createContainer() {
   const container = document.createElement('div');
   container.setAttribute('id', 'container');
-  container.setAttribute('data-testid', 'container');
-
-  container.setAttribute('background', 'rgb(255, 112, 127)');
-
-  document.body.appendChild(container);
-
-  return {
-    clean: () => {
-      document.body.removeChild(container);
-    },
-    container,
-  };
-}
-
-export function createCustomContainer() {
-  const container = document.createElement('div');
-  container.setAttribute('id', 'container-custom');
-  container.setAttribute('data-testid', 'container-custom');
   document.body.appendChild(container);
 
   return {

package/dist/index.cjs.js

@@ -117,79 +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 = () => {
-    const {
-      name,
-      memoryRoute,
-      basename,
-      providerInfo,
-      dom,
-      className,
-      style,
-      ...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;
-        let domElement = null;
-        if (dom) {
-          domElement = document.querySelector(dom);
-          if (!domElement || !(domElement instanceof HTMLElement)) {
-            throw new Error(`Invalid dom: ${dom}`);
-          }
-          rootRef.current = domElement;
-        } else {
-          domElement = rootRef.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
+      };
+      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
+          });
         }
-        const renderProps = {
-          name,
-          dom: domElement,
-          basename,
-          memoryRoute,
-          ...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 >>>`,
-              { name, basename, dom: renderDom.current }
-            );
-            (_b = providerInfoRef.current) == null ? void 0 : _b.destroy({
-              dom: renderDom.current
-            });
-          }
-        });
-      };
-    }, []);
-    return dom ? null : /* @__PURE__ */ React.createElement(
-      "div",
-      {
-        className: props == null ? void 0 : props.className,
-        style: props == null ? void 0 : props.style,
-        ref: rootRef
-      }
-    );
-  };
-  RemoteApp2["__APP_VERSION__"] = "0.3.3";
-  return /* @__PURE__ */ React.createElement(RemoteApp2, null);
-});
+    };
+  }, []);
+  return /* @__PURE__ */ React.createElement("div", { ref: rootRef });
+};
+RemoteApp["__APP_VERSION__"] = "0.3.3";
 function withRouterData(WrappedComponent) {
-  const Component = React.forwardRef(function(props, ref) {
+  return (props) => {
     var _a;
     let enableDispathPopstate = false;
     let routerContextVal;
@@ -247,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 () => {
@@ -270,14 +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,
             {
               name: moduleName,
               providerInfo: exportFn,
               exportName: info.export || "default",
-              ref,
               ...props
             }
           );
@@ -302,10 +274,10 @@ function createLazyRemoteComponent(info) {
   });
 }
 function createRemoteComponent(info) {
-  return React.forwardRef(function(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, dom: info == null ? void 0 : info.dom, 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;
@@ -335,59 +307,32 @@ function createBridgeComponent(bridgeInfo) {
   return () => {
     const rootMap = /* @__PURE__ */ new Map();
     const RawComponent = (info) => {
-      const { appInfo, propsInfo, ...restProps } = info;
+      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,
-          ...restProps
-        }
-      ));
+      return /* @__PURE__ */ React__namespace.createElement(context.RouterContext.Provider, { value: { name, basename, memoryRoute } }, /* @__PURE__ */ React__namespace.createElement(bridgeInfo.rootComponent, { ...propsInfo, basename }));
     };
     return {
-      async render(info) {
+      render(info) {
         context.LoggerInstance.log(`createBridgeComponent render Info`, info);
         const { name, basename, memoryRoute, ...propsInfo } = info;
         if (context.atLeastReact18(React__namespace)) {
-          if (bridgeInfo == null ? void 0 : bridgeInfo.render) {
-            Promise.resolve(
-              bridgeInfo == null ? void 0 : bridgeInfo.render(
-                /* @__PURE__ */ React__namespace.createElement(
-                  RawComponent,
-                  {
-                    propsInfo,
-                    appInfo: {
-                      name,
-                      basename,
-                      memoryRoute
-                    }
-                  }
-                ),
-                info.dom
-              )
-            ).then((root) => rootMap.set(info.dom, root));
-          } else {
-            const root = client.createRoot(info.dom);
-            root.render(
-              /* @__PURE__ */ React__namespace.createElement(
-                RawComponent,
-                {
-                  propsInfo,
-                  appInfo: {
-                    name,
-                    basename,
-                    memoryRoute
-                  }
+          const root = client.createRoot(info.dom);
+          rootMap.set(info.dom, root);
+          root.render(
+            /* @__PURE__ */ React__namespace.createElement(
+              RawComponent,
+              {
+                propsInfo,
+                appInfo: {
+                  name,
+                  basename,
+                  memoryRoute
                 }
-              )
-            );
-            rootMap.set(info.dom, root);
-          }
+              }
+            )
+          );
         } else {
-          const renderFunc = (bridgeInfo == null ? void 0 : bridgeInfo.render) || ReactDOM.render;
-          renderFunc(
+          ReactDOM.render(
             /* @__PURE__ */ React__namespace.createElement(
               RawComponent,
               {
@@ -403,7 +348,7 @@ function createBridgeComponent(bridgeInfo) {
           );
         }
       },
-      async destroy(info) {
+      destroy(info) {
         context.LoggerInstance.log(`createBridgeComponent destroy Info`, {
           dom: info.dom
         });

package/dist/index.d.ts

@@ -1,18 +1,14 @@
 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 { ForwardRefExoticComponent } from 'react';
 import { PropsWithChildren } from 'react';
-import { PropsWithoutRef } from 'react';
 import * as React_2 from 'react';
-import { RefAttributes } from 'react';
 
 export declare function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>): () => {
-    render(info: RenderFnParams & any): Promise<void>;
+    render(info: RenderFnParams & any): void;
     destroy(info: {
         dom: HTMLElement;
-    }): Promise<void>;
+    }): void;
     rawComponent: React_2.ComponentType<T>;
     __BRIDGE_FN__: (_args: T) => void;
 };
@@ -22,8 +18,10 @@ export declare function createRemoteComponent<T, E extends keyof T>(info: {
     loading: default_2.ReactNode;
     fallback: ErrorBoundaryPropsWithComponent['FallbackComponent'];
     export?: E;
-    dom?: string;
-}): ForwardRefExoticComponent<PropsWithoutRef<ProviderParams> & RefAttributes<HTMLElement | 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;
@@ -51,24 +49,18 @@ declare type FallbackProps = {
 
 declare type ProviderFnParams<T> = {
     rootComponent: React_2.ComponentType<T>;
-    render?: (App: React_2.ReactElement, id?: HTMLElement | string) => RootType | Promise<RootType>;
 };
 
-export declare interface ProviderParams extends default_2.HTMLAttributes<HTMLDivElement> {
+export declare interface ProviderParams {
     name?: string;
     basename?: string;
     memoryRoute?: {
         entryPath: string;
     };
-    props?: {
-        [key: string]: any;
-    };
 }
 
 export declare interface RenderFnParams extends ProviderParams {
     dom: HTMLElement;
 }
 
-declare type RootType = HTMLElement | default_3.Root;
-
 export { }