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

package/src/provider.tsx

@@ -8,91 +8,84 @@ import type {
   RenderFnParams,
 } from '@module-federation/bridge-shared';
 import { LoggerInstance, atLeastReact18 } from './utils';
-import { ErrorBoundary } from 'react-error-boundary';
 
-type RootType = HTMLElement | ReactDOMClient.Root;
 type ProviderFnParams<T> = {
   rootComponent: React.ComponentType<T>;
-  render?: (
-    App: React.ReactElement,
-    id?: HTMLElement | string,
-  ) => RootType | Promise<RootType>;
 };
 
+interface Provider<T> {
+  render(info: any): void;
+  destroy(info: { dom: HTMLElement }): void;
+  rawComponent: React.ComponentType;
+  __BRIDGE_FN__: (_args: T) => void;
+}
+
 export function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>) {
+  let provider: Provider<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 { moduleName, memoryRoute, basename = '/' } = appInfo;
+      const { appInfo, propsInfo } = info;
+      const { name, memoryRoute, basename = '/' } = appInfo;
+
       return (
-        <RouterContext.Provider value={{ moduleName, basename, memoryRoute }}>
-          <bridgeInfo.rootComponent
-            {...propsInfo}
-            basename={basename}
-            {...restProps}
-          />
+        <RouterContext.Provider value={{ name, basename, memoryRoute }}>
+          <bridgeInfo.rootComponent {...propsInfo} basename={basename} />
         </RouterContext.Provider>
       );
     };
 
-    return {
-      async render(info: RenderFnParams & any) {
-        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
-          <ErrorBoundary FallbackComponent={fallback}>
-            <RawComponent
-              appInfo={{
-                moduleName,
-                basename,
-                memoryRoute,
-              }}
-              propsInfo={propsInfo}
-            />
-          </ErrorBoundary>
-        );
+    if (!provider) {
+      provider = {
+        render(info: RenderFnParams & any) {
+          LoggerInstance.log(`createBridgeComponent render Info`, info);
+          const { name, basename, memoryRoute, ...propsInfo } = info;
 
-        if (atLeastReact18(React)) {
-          if (bridgeInfo?.render) {
-            // in case bridgeInfo?.render is an async function, resolve this to promise
-            Promise.resolve(
-              bridgeInfo?.render(rootComponentWithErrorBoundary, dom),
-            ).then((root: RootType) => rootMap.set(info.dom, root));
-          } else {
-            const root: RootType = ReactDOMClient.createRoot(info.dom);
-            root.render(rootComponentWithErrorBoundary);
+          if (atLeastReact18(React)) {
+            const root = ReactDOMClient.createRoot(info.dom);
             rootMap.set(info.dom, root);
+            root.render(
+              <RawComponent
+                propsInfo={propsInfo}
+                appInfo={{
+                  name,
+                  basename,
+                  memoryRoute,
+                }}
+              />,
+            );
+          } else {
+            ReactDOM.render(
+              <RawComponent
+                propsInfo={propsInfo}
+                appInfo={{
+                  name,
+                  basename,
+                  memoryRoute,
+                }}
+              />,
+              info.dom,
+            );
           }
-        } else {
-          // react 17 render
-          const renderFn = bridgeInfo?.render || ReactDOM.render;
-          renderFn?.(rootComponentWithErrorBoundary, info.dom);
-        }
-      },
-      async 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();
-          rootMap.delete(info.dom);
-        } else {
-          ReactDOM.unmountComponentAtNode(info.dom);
-        }
-      },
-      rawComponent: bridgeInfo.rootComponent,
-      __BRIDGE_FN__: (_args: T) => {},
-    };
+        },
+        destroy(info: { dom: HTMLElement }) {
+          LoggerInstance.log(`createBridgeComponent destroy Info`, {
+            dom: info.dom,
+          });
+          if (atLeastReact18(React)) {
+            const root = rootMap.get(info.dom);
+            root?.unmount();
+          } else {
+            ReactDOM.unmountComponentAtNode(info.dom);
+          }
+        },
+        rawComponent: bridgeInfo.rootComponent,
+        __BRIDGE_FN__: (_args: T) => {},
+      };
+    }
+    return provider;
   };
 }
 
@@ -103,3 +96,5 @@ export function ShadowRoot(info: { children: () => JSX.Element }) {
 
   return <div ref={domRef}>{root && <info.children />}</div>;
 }
+
+// function ShadowContent() {}

package/src/remote/index.tsx

@@ -1,20 +1,13 @@
-import React, {
-  useContext,
-  useEffect,
-  useRef,
-  useState,
-  forwardRef,
-} from 'react';
+import React, { useContext, useEffect, useRef, useState } 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';
 
 declare const __APP_VERSION__: string;
+
 export interface RenderFnParams extends ProviderParams {
   dom?: any;
-  fallback: ErrorBoundaryPropsWithComponent['FallbackComponent'];
 }
 
 interface RemoteModule {
@@ -29,97 +22,71 @@ interface RemoteModule {
 }
 
 interface RemoteAppParams {
-  moduleName: string;
+  name: string;
   providerInfo: NonNullable<RemoteModule['provider']>;
   exportName: string | number | symbol;
-  fallback: ErrorBoundaryPropsWithComponent['FallbackComponent'];
 }
 
-const RemoteAppWrapper = forwardRef(function (
-  props: RemoteAppParams & RenderFnParams,
-  ref,
-) {
-  const RemoteApp = () => {
-    LoggerInstance.log(`RemoteAppWrapper RemoteApp props >>>`, { props });
-    const {
-      moduleName,
-      memoryRoute,
-      basename,
-      providerInfo,
-      className,
-      style,
-      fallback,
-      ...resProps
-    } = props;
-
-    const rootRef: React.MutableRefObject<HTMLDivElement | null> =
-      ref && 'current' in ref
-        ? (ref as React.MutableRefObject<HTMLDivElement | null>)
-        : useRef(null);
-
-    const renderDom: React.MutableRefObject<HTMLElement | null> = useRef(null);
-    const providerInfoRef = useRef<any>(null);
-
-    useEffect(() => {
-      const renderTimeout = setTimeout(() => {
-        const providerReturn = providerInfo();
-        providerInfoRef.current = providerReturn;
-
-        const renderProps = {
-          moduleName,
-          dom: rootRef.current,
-          basename,
-          memoryRoute,
-          fallback,
-          ...resProps,
-        };
-        renderDom.current = rootRef.current;
-        LoggerInstance.log(
-          `createRemoteComponent LazyComponent render >>>`,
-          renderProps,
-        );
-        providerReturn.render(renderProps);
+const RemoteApp = ({
+  name,
+  memoryRoute,
+  basename,
+  providerInfo,
+  ...resProps
+}: RemoteAppParams & ProviderParams) => {
+  const rootRef = useRef(null);
+  const renderDom = useRef(null);
+  const providerInfoRef = useRef<any>(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(() => {
+        if (providerInfoRef.current?.destroy) {
+          LoggerInstance.log(
+            `createRemoteComponent LazyComponent destroy >>>`,
+            { name, basename, dom: renderDom.current },
+          );
+          providerInfoRef.current?.destroy({
+            dom: renderDom.current,
+          });
+        }
       });
+    };
+  }, []);
 
-      return () => {
-        clearTimeout(renderTimeout);
-        setTimeout(() => {
-          if (providerInfoRef.current?.destroy) {
-            LoggerInstance.log(
-              `createRemoteComponent LazyComponent destroy >>>`,
-              { moduleName, basename, dom: renderDom.current },
-            );
-            providerInfoRef.current?.destroy({
-              dom: renderDom.current,
-            });
-          }
-        });
-      };
-    }, []);
-
-    return (
-      <div
-        className={props?.className}
-        style={props?.style}
-        ref={rootRef}
-      ></div>
-    );
-  };
+  //@ts-ignore
+  return <div ref={rootRef}></div>;
+};
 
-  (RemoteApp as any)['__APP_VERSION__'] = __APP_VERSION__;
-  return <RemoteApp />;
-});
+(RemoteApp as any)['__APP_VERSION__'] = __APP_VERSION__;
 
 interface ExtraDataProps {
   basename?: string;
 }
 
-export function withRouterData<
-  P extends Parameters<typeof RemoteAppWrapper>[0],
->(
+export function withRouterData<P extends Parameters<typeof RemoteApp>[0]>(
   WrappedComponent: React.ComponentType<P & ExtraDataProps>,
 ): React.FC<Omit<P, keyof ExtraDataProps>> {
-  const Component = forwardRef(function (props: any, ref) {
+  return (props: any) => {
     let enableDispathPopstate = false;
     let routerContextVal: any;
     try {
@@ -191,12 +158,8 @@ export function withRouterData<
       }, [location]);
     }
 
-    return <WrappedComponent {...(props as P)} basename={basename} ref={ref} />;
-  });
-
-  return forwardRef(function (props, ref) {
-    return <Component {...props} ref={ref} />;
-  }) as any;
+    return <WrappedComponent {...(props as P)} basename={basename} />;
+  };
 }
 
-export default withRouterData(RemoteAppWrapper);
+export default withRouterData(RemoteApp);

package/src/router.tsx

@@ -4,7 +4,7 @@ import * as ReactRouterDom from 'react-router-dom/';
 import { RouterContext } from './context';
 import { LoggerInstance } from './utils';
 
-function WrapperRouter(
+function WraperRouter(
   props:
     | Parameters<typeof ReactRouterDom.BrowserRouter>[0]
     | Parameters<typeof ReactRouterDom.MemoryRouter>[0],
@@ -12,11 +12,12 @@ function WrapperRouter(
   const { basename, ...propsRes } = props;
   const routerContextProps = useContext(RouterContext) || {};
 
-  LoggerInstance.log(`WrapperRouter info >>>`, {
+  LoggerInstance.log(`WraperRouter info >>>`, {
     ...routerContextProps,
     routerContextProps,
-    WrapperRouterProps: props,
+    WraperRouterProps: props,
   });
+  if (!routerContextProps) return <ReactRouterDom.BrowserRouter {...props} />;
 
   if (routerContextProps?.memoryRoute) {
     return (
@@ -34,16 +35,16 @@ function WrapperRouter(
   );
 }
 
-function WrapperRouterProvider(
+function WraperRouterProvider(
   props: Parameters<typeof ReactRouterDom.RouterProvider>[0],
 ) {
   const { router, ...propsRes } = props;
   const routerContextProps = useContext(RouterContext) || {};
   const routers = router.routes;
-  LoggerInstance.log(`WrapperRouterProvider info >>>`, {
+  LoggerInstance.log(`WraperRouterProvider info >>>`, {
     ...routerContextProps,
     routerContextProps,
-    WrapperRouterProviderProps: props,
+    WraperRouterProviderProps: props,
     router,
   });
   const RouterProvider = (ReactRouterDom as any)['Router' + 'Provider'];
@@ -51,6 +52,7 @@ function WrapperRouterProvider(
   const createBrowserRouter = (ReactRouterDom as any)[
     'create' + 'BrowserRouter'
   ];
+  if (!routerContextProps) return <RouterProvider {...props} />;
 
   if (routerContextProps.memoryRoute) {
     const MemeoryRouterInstance = createMemoryRouter(routers, {
@@ -69,5 +71,5 @@ function WrapperRouterProvider(
 
 export * from 'react-router-dom/';
 
-export { WrapperRouter as BrowserRouter };
-export { WrapperRouterProvider as RouterProvider };
+export { WraperRouter as BrowserRouter };
+export { WraperRouterProvider as RouterProvider };

package/vite.config.ts

@@ -22,8 +22,6 @@ export default defineConfig({
       entry: {
         index: path.resolve(__dirname, 'src/index.ts'),
         router: path.resolve(__dirname, 'src/router.tsx'),
-        'router-v5': path.resolve(__dirname, 'src/router-v5.tsx'),
-        'router-v6': path.resolve(__dirname, 'src/router-v6.tsx'),
       },
       formats: ['cjs', 'es'],
       fileName: (format, entryName) => `${entryName}.${format}.js`,
@@ -34,33 +32,6 @@ export default defineConfig({
         '@remix-run/router',
         'react-router',
         'react-router-dom/',
-        'react-router-dom/index.js',
-        'react-router-dom/dist/index.js',
-      ],
-      plugins: [
-        {
-          name: 'modify-output-plugin',
-          generateBundle(options, bundle) {
-            for (const fileName in bundle) {
-              const chunk = bundle[fileName];
-              // if (fileName.includes('router-v6') && chunk.type === 'chunk') {
-              //   chunk.code = chunk.code.replace(
-              //     // Match 'react-router-dom/' followed by single quotes, double quotes, or backticks, replacing only 'react-router-dom/' to react-router-v6 dist file structure
-              //     /react-router-dom\/(?=[\'\"\`])/g,
-              //     'react-router-dom/dist/index.js',
-              //   );
-              // }
-
-              if (fileName.includes('router-v5') && chunk.type === 'chunk') {
-                chunk.code = chunk.code.replace(
-                  // Match 'react-router-dom/' followed by single quotes, double quotes, or backticks, replacing only 'react-router-dom/' to react-router-v5 dist file structure
-                  /react-router-dom\/(?=[\'\"\`])/g,
-                  'react-router-dom/index.js',
-                );
-              }
-            }
-          },
-        },
       ],
     },
     minify: false,

package/dist/router-v5.cjs.js

@@ -1,56 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const React = require("react");
-const ReactRouterDom$1 = require("react-router-dom/index.js");
-const context = require("./context--mtFt3tp.cjs");
-const ReactRouterDom = require("react-router-dom/index.js");
-function _interopNamespaceDefault(e) {
-  const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
-  if (e) {
-    for (const k in e) {
-      if (k !== "default") {
-        const d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: () => e[k]
-        });
-      }
-    }
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-const ReactRouterDom__namespace = /* @__PURE__ */ _interopNamespaceDefault(ReactRouterDom$1);
-function WraperRouter(props) {
-  const { basename, ...propsRes } = props;
-  const routerContextProps = React.useContext(context.RouterContext) || {};
-  context.LoggerInstance.log(`WraperRouter info >>>`, {
-    ...routerContextProps,
-    routerContextProps,
-    WraperRouterProps: props
-  });
-  if (routerContextProps == null ? void 0 : routerContextProps.memoryRoute) {
-    return /* @__PURE__ */ React.createElement(
-      ReactRouterDom__namespace.MemoryRouter,
-      {
-        ...props,
-        initialEntries: [routerContextProps == null ? void 0 : routerContextProps.memoryRoute.entryPath]
-      }
-    );
-  }
-  return /* @__PURE__ */ React.createElement(
-    ReactRouterDom__namespace.BrowserRouter,
-    {
-      ...propsRes,
-      basename: (routerContextProps == null ? void 0 : routerContextProps.basename) || basename
-    }
-  );
-}
-exports.BrowserRouter = WraperRouter;
-Object.keys(ReactRouterDom).forEach((k) => {
-  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k))
-    Object.defineProperty(exports, k, {
-      enumerable: true,
-      get: () => ReactRouterDom[k]
-    });
-});

package/dist/router-v5.d.ts

@@ -1,9 +0,0 @@
-import { default as default_2 } from 'react';
-import * as ReactRouterDom from 'react-router-dom/index.js';
-
-export declare function BrowserRouter(props: Parameters<typeof ReactRouterDom.BrowserRouter>[0] | Parameters<typeof ReactRouterDom.MemoryRouter>[0]): default_2.JSX.Element;
-
-
-export * from "react-router-dom/";
-
-export { }

package/dist/router-v5.es.js

@@ -1,32 +0,0 @@
-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-Bw2PEwa6.js";
-export * from "react-router-dom/index.js";
-function WraperRouter(props) {
-  const { basename, ...propsRes } = props;
-  const routerContextProps = useContext(RouterContext) || {};
-  LoggerInstance.log(`WraperRouter info >>>`, {
-    ...routerContextProps,
-    routerContextProps,
-    WraperRouterProps: props
-  });
-  if (routerContextProps == null ? void 0 : routerContextProps.memoryRoute) {
-    return /* @__PURE__ */ React__default.createElement(
-      ReactRouterDom$1.MemoryRouter,
-      {
-        ...props,
-        initialEntries: [routerContextProps == null ? void 0 : routerContextProps.memoryRoute.entryPath]
-      }
-    );
-  }
-  return /* @__PURE__ */ React__default.createElement(
-    ReactRouterDom$1.BrowserRouter,
-    {
-      ...propsRes,
-      basename: (routerContextProps == null ? void 0 : routerContextProps.basename) || basename
-    }
-  );
-}
-export {
-  WraperRouter as BrowserRouter
-};

package/dist/router-v6.cjs.js

@@ -1,83 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const React = require("react");
-const ReactRouterDom = require("react-router-dom/dist/index.js");
-const context = require("./context--mtFt3tp.cjs");
-function _interopNamespaceDefault(e) {
-  const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
-  if (e) {
-    for (const k in e) {
-      if (k !== "default") {
-        const d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: () => e[k]
-        });
-      }
-    }
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-const ReactRouterDom__namespace = /* @__PURE__ */ _interopNamespaceDefault(ReactRouterDom);
-function WraperRouter(props) {
-  const { basename, ...propsRes } = props;
-  const routerContextProps = React.useContext(context.RouterContext) || {};
-  context.LoggerInstance.log(`WraperRouter info >>>`, {
-    ...routerContextProps,
-    routerContextProps,
-    WraperRouterProps: props
-  });
-  if (routerContextProps == null ? void 0 : routerContextProps.memoryRoute) {
-    return /* @__PURE__ */ React.createElement(
-      ReactRouterDom__namespace.MemoryRouter,
-      {
-        ...props,
-        initialEntries: [routerContextProps == null ? void 0 : routerContextProps.memoryRoute.entryPath]
-      }
-    );
-  }
-  return /* @__PURE__ */ React.createElement(
-    ReactRouterDom__namespace.BrowserRouter,
-    {
-      ...propsRes,
-      basename: (routerContextProps == null ? void 0 : routerContextProps.basename) || basename
-    }
-  );
-}
-function WraperRouterProvider(props) {
-  const { router, ...propsRes } = props;
-  const routerContextProps = React.useContext(context.RouterContext) || {};
-  const routers = router.routes;
-  context.LoggerInstance.log(`WraperRouterProvider info >>>`, {
-    ...routerContextProps,
-    routerContextProps,
-    WraperRouterProviderProps: props,
-    router
-  });
-  const RouterProvider = ReactRouterDom__namespace["RouterProvider"];
-  const createMemoryRouter = ReactRouterDom__namespace["createMemoryRouter"];
-  const createBrowserRouter = ReactRouterDom__namespace["createBrowserRouter"];
-  if (routerContextProps.memoryRoute) {
-    const MemeoryRouterInstance = createMemoryRouter(routers, {
-      initialEntries: [routerContextProps == null ? void 0 : routerContextProps.memoryRoute.entryPath]
-    });
-    return /* @__PURE__ */ React.createElement(RouterProvider, { router: MemeoryRouterInstance });
-  } else {
-    const BrowserRouterInstance = createBrowserRouter(routers, {
-      basename: routerContextProps.basename,
-      future: router.future,
-      window: router.window
-    });
-    return /* @__PURE__ */ React.createElement(RouterProvider, { ...propsRes, router: BrowserRouterInstance });
-  }
-}
-exports.BrowserRouter = WraperRouter;
-exports.RouterProvider = WraperRouterProvider;
-Object.keys(ReactRouterDom).forEach((k) => {
-  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k))
-    Object.defineProperty(exports, k, {
-      enumerable: true,
-      get: () => ReactRouterDom[k]
-    });
-});

package/dist/router-v6.d.ts

@@ -1,11 +0,0 @@
-import { default as default_2 } from 'react';
-import * as ReactRouterDom from 'react-router-dom/dist/index.js';
-
-export declare function BrowserRouter(props: Parameters<typeof ReactRouterDom.BrowserRouter>[0] | Parameters<typeof ReactRouterDom.MemoryRouter>[0]): default_2.JSX.Element;
-
-export declare function RouterProvider(props: Parameters<typeof ReactRouterDom.RouterProvider>[0]): default_2.JSX.Element;
-
-
-export * from "react-router-dom/dist/index.js";
-
-export { }