@module-federation/bridge-react 0.12.0 → 0.13.1

package/dist/index.cjs.js

@@ -1,11 +1,11 @@
 "use strict";
-var _a;
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const bridgeBase = require("./bridge-base-DIOcSEVT.cjs");
+const ReactDOM = require("react-dom");
 const React = require("react");
-const context = require("./context-C79iMWYD.cjs");
+const index = require("./index-BYDWxFmi.cjs");
 const ReactRouterDOM = require("react-router-dom");
 const plugin = require("./plugin.cjs.js");
-const ReactDOM = require("react-dom");
 function _interopNamespaceDefault(e2) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e2) {
@@ -22,102 +22,36 @@ function _interopNamespaceDefault(e2) {
   n.default = e2;
   return Object.freeze(n);
 }
-const React__namespace = /* @__PURE__ */ _interopNamespaceDefault(React);
 const ReactRouterDOM__namespace = /* @__PURE__ */ _interopNamespaceDefault(ReactRouterDOM);
-const ErrorBoundaryContext = React.createContext(null);
-const initialState = {
-  didCatch: false,
-  error: null
-};
-class ErrorBoundary extends React.Component {
-  constructor(props) {
-    super(props);
-    this.resetErrorBoundary = this.resetErrorBoundary.bind(this);
-    this.state = initialState;
-  }
-  static getDerivedStateFromError(error) {
-    return {
-      didCatch: true,
-      error
-    };
-  }
-  resetErrorBoundary() {
-    const {
-      error
-    } = this.state;
-    if (error !== null) {
-      var _this$props$onReset, _this$props;
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
+function createReact16Or17Root(container) {
+  return {
+    render(children) {
+      const reactVersion = ReactDOM.version || "";
+      const isReact18 = reactVersion.startsWith("18");
+      const isReact19 = reactVersion.startsWith("19");
+      if (isReact19) {
+        throw new Error(
+          `React 19 detected in legacy mode. This is not supported. Please use the version-specific import: import { createBridgeComponent } from '@module-federation/bridge-react/v19'`
+        );
       }
-      (_this$props$onReset = (_this$props = this.props).onReset) === null || _this$props$onReset === void 0 ? void 0 : _this$props$onReset.call(_this$props, {
-        args,
-        reason: "imperative-api"
-      });
-      this.setState(initialState);
-    }
-  }
-  componentDidCatch(error, info) {
-    var _this$props$onError, _this$props2;
-    (_this$props$onError = (_this$props2 = this.props).onError) === null || _this$props$onError === void 0 ? void 0 : _this$props$onError.call(_this$props2, error, info);
-  }
-  componentDidUpdate(prevProps, prevState) {
-    const {
-      didCatch
-    } = this.state;
-    const {
-      resetKeys
-    } = this.props;
-    if (didCatch && prevState.error !== null && hasArrayChanged(prevProps.resetKeys, resetKeys)) {
-      var _this$props$onReset2, _this$props3;
-      (_this$props$onReset2 = (_this$props3 = this.props).onReset) === null || _this$props$onReset2 === void 0 ? void 0 : _this$props$onReset2.call(_this$props3, {
-        next: resetKeys,
-        prev: prevProps.resetKeys,
-        reason: "keys"
-      });
-      this.setState(initialState);
-    }
-  }
-  render() {
-    const {
-      children,
-      fallbackRender,
-      FallbackComponent,
-      fallback
-    } = this.props;
-    const {
-      didCatch,
-      error
-    } = this.state;
-    let childToRender = children;
-    if (didCatch) {
-      const props = {
-        error,
-        resetErrorBoundary: this.resetErrorBoundary
-      };
-      if (typeof fallbackRender === "function") {
-        childToRender = fallbackRender(props);
-      } else if (FallbackComponent) {
-        childToRender = React.createElement(FallbackComponent, props);
-      } else if (fallback !== void 0) {
-        childToRender = fallback;
-      } else {
-        throw error;
+      if (isReact18) {
+        console.warn(
+          `[Bridge-React] React 18 detected in legacy mode. For better compatibility, please use the version-specific import: import { createBridgeComponent } from '@module-federation/bridge-react/v18'`
+        );
       }
+      ReactDOM.render(children, container);
+    },
+    unmount() {
+      ReactDOM.unmountComponentAtNode(container);
     }
-    return React.createElement(ErrorBoundaryContext.Provider, {
-      value: {
-        didCatch,
-        error,
-        resetErrorBoundary: this.resetErrorBoundary
-      }
-    }, childToRender);
-  }
+  };
 }
-function hasArrayChanged() {
-  let a = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [];
-  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]));
+function createBridgeComponent(bridgeInfo) {
+  const fullBridgeInfo = {
+    createRoot: createReact16Or17Root,
+    ...bridgeInfo
+  };
+  return bridgeBase.createBaseBridgeComponent(fullBridgeInfo);
 }
 function e() {
   const t = new PopStateEvent("popstate", { state: window.history.state });
@@ -139,16 +73,16 @@ const RemoteAppWrapper = React.forwardRef(function(props, ref) {
   const renderDom = React.useRef(null);
   const providerInfoRef = React.useRef(null);
   const [initialized, setInitialized] = React.useState(false);
-  context.LoggerInstance.debug(`RemoteAppWrapper instance from props >>>`, instance);
+  index.LoggerInstance.debug(`RemoteAppWrapper instance from props >>>`, instance);
   React.useEffect(() => {
     if (initialized) return;
     const providerReturn = providerInfo();
     providerInfoRef.current = providerReturn;
     setInitialized(true);
     return () => {
-      var _a2, _b, _c, _d, _e, _f, _g, _h;
-      if ((_a2 = providerInfoRef.current) == null ? void 0 : _a2.destroy) {
-        context.LoggerInstance.debug(
+      var _a, _b, _c, _d, _e, _f, _g, _h;
+      if ((_a = providerInfoRef.current) == null ? void 0 : _a.destroy) {
+        index.LoggerInstance.debug(
           `createRemoteComponent LazyComponent destroy >>>`,
           { moduleName, basename, dom: renderDom.current }
         );
@@ -176,7 +110,7 @@ const RemoteAppWrapper = React.forwardRef(function(props, ref) {
     };
   }, [moduleName]);
   React.useEffect(() => {
-    var _a2, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f;
     if (!initialized || !providerInfoRef.current) return;
     let renderProps = {
       moduleName,
@@ -187,17 +121,17 @@ const RemoteAppWrapper = React.forwardRef(function(props, ref) {
       ...resProps
     };
     renderDom.current = rootRef.current;
-    const beforeBridgeRenderRes = ((_c = (_b = (_a2 = instance == null ? void 0 : instance.bridgeHook) == null ? void 0 : _a2.lifecycle) == null ? void 0 : _b.beforeBridgeRender) == null ? void 0 : _c.emit(renderProps)) || {};
+    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(renderProps)) || {};
     renderProps = { ...renderProps, ...beforeBridgeRenderRes.extraProps };
     providerInfoRef.current.render(renderProps);
     (_f = (_e = (_d = instance == null ? void 0 : instance.bridgeHook) == null ? void 0 : _d.lifecycle) == null ? void 0 : _e.afterBridgeRender) == null ? void 0 : _f.emit(renderProps);
   }, [initialized, ...Object.values(props)]);
-  const rootComponentClassName = `${context.getRootDomDefaultClassName(moduleName)} ${className || ""}`;
+  const rootComponentClassName = `${index.getRootDomDefaultClassName(moduleName)} ${className || ""}`;
   return /* @__PURE__ */ React.createElement("div", { className: rootComponentClassName, style, ref: rootRef });
 });
 function withRouterData(WrappedComponent) {
   const Component = React.forwardRef(function(props, ref) {
-    var _a2;
+    var _a;
     if (props == null ? void 0 : props.basename) {
       return /* @__PURE__ */ React.createElement(WrappedComponent, { ...props, basename: props.basename, ref });
     }
@@ -224,20 +158,20 @@ function withRouterData(WrappedComponent) {
         if (routerContextVal && routerContextVal.matches && routerContextVal.matches.length > 0) {
           const matchIndex = routerContextVal.matches.length - 1;
           const pathnameBase = routerContextVal.matches[matchIndex].pathnameBase;
-          basename = context.pathJoin(basename, pathnameBase || "/");
+          basename = index.pathJoin(basename, pathnameBase || "/");
         }
       } else {
         const match = useRouteMatch == null ? void 0 : useRouteMatch();
         if (useHistory) {
           const history = useHistory == null ? void 0 : useHistory();
-          basename = (_a2 = history == null ? void 0 : history.createHref) == null ? void 0 : _a2.call(history, { pathname: "/" });
+          basename = (_a = history == null ? void 0 : history.createHref) == null ? void 0 : _a.call(history, { pathname: "/" });
         }
         if (match) {
-          basename = context.pathJoin(basename, (match == null ? void 0 : match.path) || "/");
+          basename = index.pathJoin(basename, (match == null ? void 0 : match.path) || "/");
         }
       }
     }
-    context.LoggerInstance.debug(`createRemoteComponent withRouterData >>>`, {
+    index.LoggerInstance.debug(`createRemoteComponent withRouterData >>>`, {
       ...props,
       basename,
       routerContextVal,
@@ -248,7 +182,7 @@ function withRouterData(WrappedComponent) {
       const [pathname, setPathname] = React.useState(location.pathname);
       React.useEffect(() => {
         if (pathname !== "" && pathname !== location.pathname) {
-          context.LoggerInstance.debug(
+          index.LoggerInstance.debug(
             `createRemoteComponent dispatchPopstateEnv >>>`,
             {
               name: props.name,
@@ -270,14 +204,14 @@ const RemoteApp = withRouterData(RemoteAppWrapper);
 function createLazyRemoteComponent(info) {
   const exportName = (info == null ? void 0 : info.export) || "default";
   return React.lazy(async () => {
-    context.LoggerInstance.debug(`createRemoteComponent LazyComponent create >>>`, {
+    index.LoggerInstance.debug(`createRemoteComponent LazyComponent create >>>`, {
       lazyComponent: info.loader,
       exportName
     });
     try {
       const m = await info.loader();
       const moduleName = m && m[Symbol.for("mf_module_id")];
-      context.LoggerInstance.debug(
+      index.LoggerInstance.debug(
         `createRemoteComponent LazyComponent loadRemote info >>>`,
         { name: moduleName, module: m, exportName }
       );
@@ -300,7 +234,7 @@ function createLazyRemoteComponent(info) {
           default: RemoteAppComponent
         };
       } else {
-        context.LoggerInstance.debug(
+        index.LoggerInstance.debug(
           `createRemoteComponent LazyComponent module not found >>>`,
           { name: moduleName, module: m, exportName }
         );
@@ -318,103 +252,14 @@ function createLazyRemoteComponent(info) {
 function createRemoteComponent(info) {
   const LazyComponent = createLazyRemoteComponent(info);
   return React.forwardRef((props, ref) => {
-    return /* @__PURE__ */ React.createElement(ErrorBoundary, { FallbackComponent: info.fallback }, /* @__PURE__ */ React.createElement(React.Suspense, { fallback: info.loading }, /* @__PURE__ */ React.createElement(LazyComponent, { ...props, ref })));
-  });
-}
-const isReact18 = (_a = ReactDOM.version) == null ? void 0 : _a.startsWith("18");
-function createRoot(container, options) {
-  if (isReact18) {
-    return ReactDOM.createRoot(container, options);
-  }
-  return {
-    render(children) {
-      ReactDOM.render(children, container);
-    },
-    unmount() {
-      ReactDOM.unmountComponentAtNode(container);
-    }
-  };
-}
-function createBridgeComponent({
-  createRoot: createRoot$1 = createRoot,
-  ...bridgeInfo
-}) {
-  return () => {
-    const rootMap = /* @__PURE__ */ new Map();
-    const instance = plugin.federationRuntime.instance;
-    context.LoggerInstance.debug(
-      `createBridgeComponent instance from props >>>`,
-      instance
-    );
-    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
-        }
-      ));
-    };
-    return {
-      async render(info) {
-        var _a2, _b, _c, _d, _e, _f;
-        context.LoggerInstance.debug(`createBridgeComponent render Info`, info);
-        const {
-          moduleName,
-          dom,
-          basename,
-          memoryRoute,
-          fallback,
-          ...propsInfo
-        } = info;
-        const beforeBridgeRenderRes = ((_c = (_b = (_a2 = instance == null ? void 0 : instance.bridgeHook) == null ? void 0 : _a2.lifecycle) == null ? void 0 : _b.beforeBridgeRender) == null ? void 0 : _c.emit(info)) || {};
-        const rootComponentWithErrorBoundary = /* @__PURE__ */ React__namespace.createElement(ErrorBoundary, { FallbackComponent: fallback }, /* @__PURE__ */ React__namespace.createElement(
-          RawComponent,
-          {
-            appInfo: {
-              moduleName,
-              basename,
-              memoryRoute
-            },
-            propsInfo: { ...propsInfo, ...beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps }
-          }
-        ));
-        if (bridgeInfo.render) {
-          await Promise.resolve(
-            bridgeInfo.render(rootComponentWithErrorBoundary, dom)
-          ).then((root) => rootMap.set(dom, root));
-        } else {
-          let root = rootMap.get(dom);
-          if (!root) {
-            root = createRoot$1(dom);
-            rootMap.set(dom, root);
-          }
-          if ("render" in root) {
-            root.render(rootComponentWithErrorBoundary);
-          }
-        }
-        ((_f = (_e = (_d = instance == null ? void 0 : instance.bridgeHook) == null ? void 0 : _d.lifecycle) == null ? void 0 : _e.afterBridgeRender) == null ? void 0 : _f.emit(info)) || {};
+    return /* @__PURE__ */ React.createElement(
+      bridgeBase.ErrorBoundary,
+      {
+        FallbackComponent: info.fallback
       },
-      destroy(info) {
-        var _a2, _b, _c;
-        const { dom } = info;
-        context.LoggerInstance.debug(`createBridgeComponent destroy Info`, info);
-        const root = rootMap.get(dom);
-        if (root) {
-          if ("unmount" in root) {
-            root.unmount();
-          } else {
-            ReactDOM.unmountComponentAtNode(root);
-          }
-          rootMap.delete(dom);
-        }
-        (_c = (_b = (_a2 = instance == null ? void 0 : instance.bridgeHook) == null ? void 0 : _a2.lifecycle) == null ? void 0 : _b.afterBridgeDestroy) == null ? void 0 : _c.emit(info);
-      }
-    };
-  };
+      /* @__PURE__ */ React.createElement(React.Suspense, { fallback: info.loading }, /* @__PURE__ */ React.createElement(LazyComponent, { ...props, ref }))
+    );
+  });
 }
 exports.createBridgeComponent = createBridgeComponent;
 exports.createRemoteComponent = createRemoteComponent;

package/dist/index.d.ts

@@ -1,17 +1,22 @@
 import { default as default_2 } from 'react';
 import * as React_2 from 'react';
 
-export declare function createBridgeComponent<T>({ createRoot, ...bridgeInfo }: ProviderFnParams<T>): () => {
+export declare function createBridgeComponent<T = any>(bridgeInfo: Omit<ProviderFnParams<T>, 'createRoot'>): () => {
     render(info: RenderParams): Promise<void>;
     destroy(info: DestroyParams): void;
 };
 
 export declare function createRemoteComponent<T = Record<string, unknown>, E extends keyof T = keyof T>(info: LazyRemoteComponentInfo<T, E>): default_2.ForwardRefExoticComponent<Omit<RemoteComponentProps<Record<string, unknown>>, "ref"> & default_2.RefAttributes<HTMLDivElement>>;
 
+export declare interface CreateRootOptions {
+    identifierPrefix?: string;
+    onRecoverableError?: (error: unknown, errorInfo: unknown) => void;
+}
+
 /**
  * Options for creating a React root
  */
-declare interface CreateRootOptions {
+declare interface CreateRootOptions_2 {
     identifierPrefix?: string;
     onRecoverableError?: (error: unknown) => void;
     transitionCallbacks?: unknown;
@@ -30,10 +35,20 @@ declare type LazyRemoteComponentInfo<T, E extends keyof T> = RemoteComponentPara
 /**
  * Parameters for the provider function
  */
-declare interface ProviderFnParams<T> {
+export declare interface ProviderFnParams<T> {
     rootComponent: React_2.ComponentType<T>;
     render?: (App: React_2.ReactElement, id?: HTMLElement | string) => RootType | Promise<RootType>;
-    createRoot?: (container: Element | DocumentFragment, options?: CreateRootOptions) => Root;
+    createRoot?: (container: Element | DocumentFragment, options?: CreateRootOptions_2) => Root_2;
+    /**
+     * Default options to pass to createRoot for React 18 and 19
+     * These options will be used when creating a root unless overridden by rootOptions in render params
+     * @example
+     * {
+     *   identifierPrefix: 'app-',
+     *   onRecoverableError: (err) => console.error(err)
+     * }
+     */
+    defaultRootOptions?: CreateRootOptions_2;
 }
 
 /**
@@ -75,17 +90,6 @@ declare interface RemoteComponentProps<T = Record<string, unknown>> {
     [key: string]: unknown;
 }
 
-/**
- * Parameters for the render function, extending ProviderParams
- */
-export declare interface RenderFnParams extends ProviderParams {
-    dom: HTMLElement;
-    fallback?: React_2.ComponentType<{
-        error: Error;
-    }>;
-    [key: string]: unknown;
-}
-
 /**
  * Parameters for the render function
  */
@@ -97,13 +101,27 @@ export declare interface RenderParams {
         initialState?: Record<string, unknown>;
     };
     dom: HTMLElement;
+    /**
+     * Options to pass to createRoot for React 18 and 19
+     * @example
+     * {
+     *   identifierPrefix: 'app-',
+     *   onRecoverableError: (err) => console.error(err)
+     * }
+     */
+    rootOptions?: CreateRootOptions_2;
     [key: string]: unknown;
 }
 
+export declare interface Root {
+    render(children: React.ReactNode): void;
+    unmount(): void;
+}
+
 /**
  * Interface for a React root object
  */
-declare interface Root {
+declare interface Root_2 {
     render(children: React_2.ReactNode): void;
     unmount(): void;
 }
@@ -111,6 +129,6 @@ declare interface Root {
 /**
  * Type for a root element, which can be either an HTMLElement or a React root
  */
-declare type RootType = HTMLElement | Root;
+export declare type RootType = HTMLElement | Root_2;
 
 export { }