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

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, f, a as atLeastReact18, R as RouterContext } from "./context-Bw2PEwa6.js";
+import React__default, { createContext, Component, createElement, isValidElement, useContext, useState, useEffect, useRef, forwardRef } from "react";
+import { p as pathJoin, L as LoggerInstance, f, a as atLeastReact18, R as RouterContext } from "./context-Bw2PEwa6.js";
 import * as ReactRouterDOM from "react-router-dom";
 import ReactDOM from "react-dom";
 const ErrorBoundaryContext = createContext(null);
@@ -98,79 +98,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 = forwardRef(function(props, ref) {
-  const RemoteApp2 = () => {
-    const {
-      name,
-      memoryRoute,
-      basename,
-      providerInfo,
-      dom,
-      className,
-      style,
-      ...resProps
-    } = props;
-    const rootRef = ref && "current" in ref ? ref : useRef(null);
-    const renderDom = useRef(null);
-    const providerInfoRef = useRef(null);
-    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 = useRef(null);
+  const renderDom = useRef(null);
+  const providerInfoRef = useRef(null);
+  useEffect(() => {
+    const renderTimeout = setTimeout(() => {
+      const providerReturn = providerInfo();
+      providerInfoRef.current = providerReturn;
+      const renderProps = {
+        name,
+        dom: rootRef.current,
+        basename,
+        memoryRoute,
+        ...resProps
+      };
+      renderDom.current = rootRef.current;
+      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) {
+          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;
-        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) {
-            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__default.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__default.createElement(RemoteApp2, null);
-});
+    };
+  }, []);
+  return /* @__PURE__ */ React__default.createElement("div", { ref: rootRef });
+};
+RemoteApp["__APP_VERSION__"] = "0.3.3";
 function withRouterData(WrappedComponent) {
-  const Component2 = forwardRef(function(props, ref) {
+  return (props) => {
     var _a;
     let enableDispathPopstate = false;
     let routerContextVal;
@@ -228,13 +204,10 @@ function withRouterData(WrappedComponent) {
         setPathname(location.pathname);
       }, [location]);
     }
-    return /* @__PURE__ */ React__default.createElement(WrappedComponent, { ...props, basename, ref });
-  });
-  return forwardRef(function(props, ref) {
-    return /* @__PURE__ */ React__default.createElement(Component2, { ...props, ref });
-  });
+    return /* @__PURE__ */ React__default.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__default.lazy(async () => {
@@ -251,14 +224,13 @@ function createLazyRemoteComponent(info) {
       );
       const exportFn = m2[exportName];
       if (exportName in m2 && typeof exportFn === "function") {
-        const RemoteAppComponent = forwardRef((props, ref) => {
+        const RemoteAppComponent = forwardRef((props, _ref) => {
           return /* @__PURE__ */ React__default.createElement(
-            RemoteApp,
+            RemoteApp$1,
             {
               name: moduleName,
               providerInfo: exportFn,
               exportName: info.export || "default",
-              ref,
               ...props
             }
           );
@@ -283,10 +255,10 @@ function createLazyRemoteComponent(info) {
   });
 }
 function createRemoteComponent(info) {
-  return forwardRef(function(props, ref) {
-    const LazyComponent = createLazyRemoteComponent(info);
-    return /* @__PURE__ */ React__default.createElement(ErrorBoundary, { FallbackComponent: info.fallback }, /* @__PURE__ */ React__default.createElement(React__default.Suspense, { fallback: info.loading }, /* @__PURE__ */ React__default.createElement(LazyComponent, { ...props, dom: info == null ? void 0 : info.dom, ref })));
-  });
+  const LazyComponent = createLazyRemoteComponent(info);
+  return (props) => {
+    return /* @__PURE__ */ React__default.createElement(ErrorBoundary, { FallbackComponent: info.fallback }, /* @__PURE__ */ React__default.createElement(React__default.Suspense, { fallback: info.loading }, /* @__PURE__ */ React__default.createElement(LazyComponent, { ...props })));
+  };
 }
 var client = {};
 var m = ReactDOM;
@@ -316,59 +288,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.createElement(RouterContext.Provider, { value: { name, basename, memoryRoute } }, /* @__PURE__ */ React.createElement(
-        bridgeInfo.rootComponent,
-        {
-          ...propsInfo,
-          basename,
-          ...restProps
-        }
-      ));
+      return /* @__PURE__ */ React.createElement(RouterContext.Provider, { value: { name, basename, memoryRoute } }, /* @__PURE__ */ React.createElement(bridgeInfo.rootComponent, { ...propsInfo, basename }));
     };
     return {
-      async render(info) {
+      render(info) {
         LoggerInstance.log(`createBridgeComponent render Info`, info);
         const { name, basename, memoryRoute, ...propsInfo } = info;
         if (atLeastReact18(React)) {
-          if (bridgeInfo == null ? void 0 : bridgeInfo.render) {
-            Promise.resolve(
-              bridgeInfo == null ? void 0 : bridgeInfo.render(
-                /* @__PURE__ */ React.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.createElement(
-                RawComponent,
-                {
-                  propsInfo,
-                  appInfo: {
-                    name,
-                    basename,
-                    memoryRoute
-                  }
+          const root = client.createRoot(info.dom);
+          rootMap.set(info.dom, root);
+          root.render(
+            /* @__PURE__ */ React.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.createElement(
               RawComponent,
               {
@@ -384,7 +329,7 @@ function createBridgeComponent(bridgeInfo) {
           );
         }
       },
-      async destroy(info) {
+      destroy(info) {
         LoggerInstance.log(`createBridgeComponent destroy Info`, {
           dom: info.dom
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/bridge-react",
-  "version": "0.0.0-next-20240731105745",
+  "version": "0.0.0-next-20240801085730",
   "publishConfig": {
     "access": "public"
   },
@@ -20,22 +20,12 @@
       "import": "./dist/router.es.js",
       "require": "./dist/router.cjs.js"
     },
-    "./router-v5": {
-      "types": "./dist/router-v5.d.ts",
-      "import": "./dist/router-v5.es.js",
-      "require": "./dist/router-v5.cjs.js"
-    },
-    "./router-v6": {
-      "types": "./dist/router-v6.d.ts",
-      "import": "./dist/router-v6.es.js",
-      "require": "./dist/router-v6.cjs.js"
-    },
     "./*": "./*"
   },
   "dependencies": {
     "@loadable/component": "^5.16.4",
     "react-error-boundary": "^4.0.13",
-    "@module-federation/bridge-shared": "0.0.0-next-20240731105745"
+    "@module-federation/bridge-shared": "0.0.0-next-20240801085730"
   },
   "peerDependencies": {
     "react": ">=16.9.0",

package/src/create.tsx

@@ -1,9 +1,4 @@
 import React, { forwardRef } from 'react';
-import type {
-  ForwardRefExoticComponent,
-  PropsWithoutRef,
-  RefAttributes,
-} from 'react';
 import type { ProviderParams } from '@module-federation/bridge-shared';
 import { LoggerInstance } from './utils';
 import {
@@ -18,7 +13,11 @@ export interface RenderFnParams extends ProviderParams {
 
 interface RemoteModule {
   provider: () => {
-    render: (info: RenderFnParams) => void;
+    render: (
+      info: ProviderParams & {
+        dom: any;
+      },
+    ) => void;
     destroy: (info: { dom: any }) => void;
   };
 }
@@ -28,7 +27,6 @@ function createLazyRemoteComponent<T, E extends keyof T>(info: {
   loading: React.ReactNode;
   fallback: ErrorBoundaryPropsWithComponent['FallbackComponent'];
   export?: E;
-  dom?: string;
 }) {
   const exportName = info?.export || 'default';
   return React.lazy(async () => {
@@ -55,13 +53,12 @@ function createLazyRemoteComponent<T, E extends keyof T>(info: {
             basename?: ProviderParams['basename'];
             memoryRoute?: ProviderParams['memoryRoute'];
           }
-        >((props, ref) => {
+        >((props, _ref) => {
           return (
             <RemoteApp
               name={moduleName}
               providerInfo={exportFn}
               exportName={info.export || 'default'}
-              ref={ref}
               {...props}
             />
           );
@@ -92,27 +89,30 @@ export function createRemoteComponent<T, E extends keyof T>(info: {
   loading: React.ReactNode;
   fallback: ErrorBoundaryPropsWithComponent['FallbackComponent'];
   export?: E;
-  dom?: string;
-}): ForwardRefExoticComponent<
-  PropsWithoutRef<ProviderParams> & RefAttributes<HTMLElement | HTMLDivElement>
-> {
-  // type ExportType = T[E] extends (...args: any) => any
-  //   ? ReturnType<T[E]>
-  //   : never;
-  // type RawComponentType = '__BRIDGE_FN__' extends keyof ExportType
-  //   ? ExportType['__BRIDGE_FN__'] extends (...args: any) => any
-  //     ? Parameters<ExportType['__BRIDGE_FN__']>[0]
-  //     : {}
-  //   : {};
+}) {
+  type ExportType = T[E] extends (...args: any) => any
+    ? ReturnType<T[E]>
+    : never;
+  type RawComponentType = '__BRIDGE_FN__' extends keyof ExportType
+    ? ExportType['__BRIDGE_FN__'] extends (...args: any) => any
+      ? Parameters<ExportType['__BRIDGE_FN__']>[0]
+      : {}
+    : {};
+
+  const LazyComponent = createLazyRemoteComponent(info);
 
-  return forwardRef(function (props, ref) {
-    const LazyComponent = createLazyRemoteComponent(info);
+  return (
+    props: {
+      basename?: ProviderParams['basename'];
+      memoryRoute?: ProviderParams['memoryRoute'];
+    } & RawComponentType,
+  ) => {
     return (
       <ErrorBoundary FallbackComponent={info.fallback}>
         <React.Suspense fallback={info.loading}>
-          <LazyComponent {...props} dom={info?.dom} ref={ref} />
+          <LazyComponent {...props} />
         </React.Suspense>
       </ErrorBoundary>
     );
-  });
+  };
 }

package/src/provider.tsx

@@ -9,69 +9,45 @@ import type {
 } from '@module-federation/bridge-shared';
 import { LoggerInstance, atLeastReact18 } from './utils';
 
-type RootType = HTMLElement | ReactDOMClient.Root;
 type ProviderFnParams<T> = {
   rootComponent: React.ComponentType<T>;
-  render?: (
-    App: React.ReactElement,
-    id?: HTMLElement | string,
-  ) => RootType | Promise<RootType>;
 };
 
 export function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>) {
   return () => {
-    const rootMap = new Map<any, RootType>();
+    const rootMap = new Map<any, ReactDOMClient.Root>();
+
     const RawComponent = (info: { propsInfo: T; appInfo: ProviderParams }) => {
-      const { appInfo, propsInfo, ...restProps } = info;
+      const { appInfo, propsInfo } = info;
       const { name, memoryRoute, basename = '/' } = appInfo;
 
       return (
         <RouterContext.Provider value={{ name, basename, memoryRoute }}>
-          <bridgeInfo.rootComponent
-            {...propsInfo}
-            basename={basename}
-            {...restProps}
-          />
+          <bridgeInfo.rootComponent {...propsInfo} basename={basename} />
         </RouterContext.Provider>
       );
     };
 
     return {
-      async render(info: RenderFnParams & any) {
+      render(info: RenderFnParams & any) {
         LoggerInstance.log(`createBridgeComponent render Info`, info);
         const { name, basename, memoryRoute, ...propsInfo } = info;
+
         if (atLeastReact18(React)) {
-          if (bridgeInfo?.render) {
-            Promise.resolve(
-              bridgeInfo?.render(
-                <RawComponent
-                  propsInfo={propsInfo}
-                  appInfo={{
-                    name,
-                    basename,
-                    memoryRoute,
-                  }}
-                />,
-                info.dom,
-              ),
-            ).then((root: RootType) => rootMap.set(info.dom, root));
-          } else {
-            const root: RootType = ReactDOMClient.createRoot(info.dom);
-            root.render(
-              <RawComponent
-                propsInfo={propsInfo}
-                appInfo={{
-                  name,
-                  basename,
-                  memoryRoute,
-                }}
-              />,
-            );
-            rootMap.set(info.dom, root);
-          }
+          const root = ReactDOMClient.createRoot(info.dom);
+          rootMap.set(info.dom, root);
+          root.render(
+            <RawComponent
+              propsInfo={propsInfo}
+              appInfo={{
+                name,
+                basename,
+                memoryRoute,
+              }}
+            />,
+          );
         } else {
-          const renderFunc = bridgeInfo?.render || ReactDOM.render;
-          renderFunc(
+          ReactDOM.render(
             <RawComponent
               propsInfo={propsInfo}
               appInfo={{
@@ -84,13 +60,13 @@ export function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>) {
           );
         }
       },
-      async destroy(info: { dom: HTMLElement }) {
+      destroy(info: { dom: HTMLElement }) {
         LoggerInstance.log(`createBridgeComponent destroy Info`, {
           dom: info.dom,
         });
         if (atLeastReact18(React)) {
           const root = rootMap.get(info.dom);
-          (root as ReactDOMClient.Root)?.unmount();
+          root?.unmount();
         } else {
           ReactDOM.unmountComponentAtNode(info.dom);
         }
@@ -108,3 +84,5 @@ export function ShadowRoot(info: { children: () => JSX.Element }) {
 
   return <div ref={domRef}>{root && <info.children />}</div>;
 }
+
+// function ShadowContent() {}