@module-federation/bridge-react 0.0.0-next-20241118092546 → 0.0.0-next-20241118100312

package/src/remote/index.tsx

@@ -10,7 +10,7 @@ import type { ProviderParams } from '@module-federation/bridge-shared';
 import { dispatchPopstateEnv } from '@module-federation/bridge-shared';
 import { ErrorBoundaryPropsWithComponent } from 'react-error-boundary';
 import { LoggerInstance, pathJoin, getRootDomDefaultClassName } from '../utils';
-import type { FederationHost } from '@module-federation/runtime';
+import { getInstance } from '@module-federation/runtime';
 
 declare const __APP_VERSION__: string;
 export interface RenderFnParams extends ProviderParams {
@@ -34,7 +34,6 @@ interface RemoteAppParams {
   providerInfo: NonNullable<RemoteModule['provider']>;
   exportName: string | number | symbol;
   fallback: ErrorBoundaryPropsWithComponent['FallbackComponent'];
-  instance: FederationHost;
 }
 
 const RemoteAppWrapper = forwardRef(function (
@@ -51,7 +50,6 @@ const RemoteAppWrapper = forwardRef(function (
       className,
       style,
       fallback,
-      instance,
       ...resProps
     } = props;
 
@@ -62,7 +60,8 @@ const RemoteAppWrapper = forwardRef(function (
 
     const renderDom: React.MutableRefObject<HTMLElement | null> = useRef(null);
     const providerInfoRef = useRef<any>(null);
-    LoggerInstance.log(`RemoteAppWrapper instance from props >>>`, instance);
+    const hostInstance = getInstance();
+    LoggerInstance.log(`RemoteAppWrapper hostInstance >>>`, hostInstance);
 
     useEffect(() => {
       const renderTimeout = setTimeout(() => {
@@ -85,16 +84,18 @@ const RemoteAppWrapper = forwardRef(function (
 
         LoggerInstance.log(
           `createRemoteComponent LazyComponent hostInstance >>>`,
-          instance,
+          hostInstance,
         );
         const beforeBridgeRenderRes =
-          instance?.bridgeHook?.lifecycle?.beforeBridgeRender?.emit(
+          hostInstance?.bridgeHook?.lifecycle?.beforeBridgeRender?.emit(
             renderProps,
           ) || {};
         // @ts-ignore
         renderProps = { ...renderProps, ...beforeBridgeRenderRes.extraProps };
         providerReturn.render(renderProps);
-        instance?.bridgeHook?.lifecycle?.afterBridgeRender?.emit(renderProps);
+        hostInstance?.bridgeHook?.lifecycle?.afterBridgeRender?.emit(
+          renderProps,
+        );
       });
 
       return () => {
@@ -106,7 +107,7 @@ const RemoteAppWrapper = forwardRef(function (
               { moduleName, basename, dom: renderDom.current },
             );
 
-            instance?.bridgeHook?.lifecycle?.beforeBridgeDestroy?.emit({
+            hostInstance?.bridgeHook?.lifecycle?.beforeBridgeDestroy?.emit({
               moduleName,
               dom: renderDom.current,
               basename,
@@ -120,7 +121,7 @@ const RemoteAppWrapper = forwardRef(function (
               dom: renderDom.current,
             });
 
-            instance?.bridgeHook?.lifecycle?.afterBridgeDestroy?.emit({
+            hostInstance?.bridgeHook?.lifecycle?.afterBridgeDestroy?.emit({
               moduleName,
               dom: renderDom.current,
               basename,

package/src/router-v5.tsx

@@ -36,7 +36,7 @@ function WraperRouter(
 }
 
 // @ts-ignore
-// because export directly from react-router-dom/index.js will cause build falied.
+// cause export directly from react-router-dom/index.js will cause build falied.
 // it will be replace by react-router-dom/index.js in building phase
 export * from 'react-router-dom/';
 

package/src/router-v6.tsx

@@ -69,7 +69,6 @@ function WraperRouterProvider(
   }
 }
 
-// export * from 'react-router-dom/dist/index.js';
-export * from 'react-router-dom/';
+export * from 'react-router-dom/dist/index.js';
 export { WraperRouter as BrowserRouter };
 export { WraperRouterProvider as RouterProvider };

package/src/utils.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { FederationHost } from '@module-federation/runtime';
 import { createLogger } from '@module-federation/sdk';
 
 export const LoggerInstance = createLogger(

package/vite.config.ts

@@ -1,8 +1,8 @@
 import { defineConfig } from 'vite';
-// import vue from '@vitejs/plugin-vue';
+import vue from '@vitejs/plugin-vue';
 import path from 'path';
 import dts from 'vite-plugin-dts';
-// import react from '@vitejs/plugin-react';
+import react from '@vitejs/plugin-react';
 import packageJson from './package.json';
 
 const perDepsKeys = Object.keys(packageJson.peerDependencies);
@@ -21,7 +21,6 @@ export default defineConfig({
     lib: {
       entry: {
         index: path.resolve(__dirname, 'src/index.ts'),
-        plugin: path.resolve(__dirname, 'src/plugin.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'),
@@ -37,6 +36,7 @@ export default defineConfig({
         'react-router-dom/',
         'react-router-dom/index.js',
         'react-router-dom/dist/index.js',
+        '@module-federation/runtime',
       ],
       plugins: [
         {
@@ -44,13 +44,13 @@ export default defineConfig({
           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-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(

package/dist/plugin-CfJaHqe4.cjs

@@ -1,473 +0,0 @@
-"use strict";
-const React = require("react");
-const context = require("./context-BcJ-YlNr.cjs");
-const ReactRouterDOM = require("react-router-dom");
-const ReactDOM = require("react-dom");
-function _interopNamespaceDefault(e2) {
-  const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
-  if (e2) {
-    for (const k in e2) {
-      if (k !== "default") {
-        const d = Object.getOwnPropertyDescriptor(e2, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: () => e2[k]
-        });
-      }
-    }
-  }
-  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];
-      }
-      (_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 === null || React.isValidElement(fallback)) {
-        childToRender = fallback;
-      } else {
-        throw error;
-      }
-    }
-    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 e() {
-  const t = new PopStateEvent("popstate", { state: window.history.state });
-  window.dispatchEvent(t);
-}
-const RemoteAppWrapper = React.forwardRef(function(props, ref) {
-  const RemoteApp2 = () => {
-    context.LoggerInstance.log(`RemoteAppWrapper RemoteApp props >>>`, { props });
-    const {
-      moduleName,
-      memoryRoute,
-      basename,
-      providerInfo,
-      className,
-      style,
-      fallback,
-      instance,
-      ...resProps
-    } = props;
-    const rootRef = ref && "current" in ref ? ref : React.useRef(null);
-    const renderDom = React.useRef(null);
-    const providerInfoRef = React.useRef(null);
-    context.LoggerInstance.log(`RemoteAppWrapper instance from props >>>`, instance);
-    React.useEffect(() => {
-      const renderTimeout = setTimeout(() => {
-        var _a, _b, _c, _d, _e, _f;
-        const providerReturn = providerInfo();
-        providerInfoRef.current = providerReturn;
-        let renderProps = {
-          moduleName,
-          dom: rootRef.current,
-          basename,
-          memoryRoute,
-          fallback,
-          ...resProps
-        };
-        renderDom.current = rootRef.current;
-        context.LoggerInstance.log(
-          `createRemoteComponent LazyComponent render >>>`,
-          renderProps
-        );
-        context.LoggerInstance.log(
-          `createRemoteComponent LazyComponent hostInstance >>>`,
-          instance
-        );
-        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 };
-        providerReturn.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);
-      });
-      return () => {
-        clearTimeout(renderTimeout);
-        setTimeout(() => {
-          var _a, _b, _c, _d, _e, _f, _g, _h;
-          if ((_a = providerInfoRef.current) == null ? void 0 : _a.destroy) {
-            context.LoggerInstance.log(
-              `createRemoteComponent LazyComponent destroy >>>`,
-              { moduleName, basename, dom: renderDom.current }
-            );
-            (_d = (_c = (_b = instance == null ? void 0 : instance.bridgeHook) == null ? void 0 : _b.lifecycle) == null ? void 0 : _c.beforeBridgeDestroy) == null ? void 0 : _d.emit({
-              moduleName,
-              dom: renderDom.current,
-              basename,
-              memoryRoute,
-              fallback,
-              ...resProps
-            });
-            (_e = providerInfoRef.current) == null ? void 0 : _e.destroy({
-              moduleName,
-              dom: renderDom.current
-            });
-            (_h = (_g = (_f = instance == null ? void 0 : instance.bridgeHook) == null ? void 0 : _f.lifecycle) == null ? void 0 : _g.afterBridgeDestroy) == null ? void 0 : _h.emit({
-              moduleName,
-              dom: renderDom.current,
-              basename,
-              memoryRoute,
-              fallback,
-              ...resProps
-            });
-          }
-        });
-      };
-    }, []);
-    const rootComponentClassName = `${context.getRootDomDefaultClassName(moduleName)} ${props == null ? void 0 : props.className}`;
-    return /* @__PURE__ */ React.createElement(
-      "div",
-      {
-        className: rootComponentClassName,
-        style: props == null ? void 0 : props.style,
-        ref: rootRef
-      }
-    );
-  };
-  RemoteApp2["__APP_VERSION__"] = "0.7.4";
-  return /* @__PURE__ */ React.createElement(RemoteApp2, null);
-});
-function withRouterData(WrappedComponent) {
-  const Component = React.forwardRef(function(props, ref) {
-    var _a;
-    let enableDispathPopstate = false;
-    let routerContextVal;
-    try {
-      ReactRouterDOM__namespace.useLocation();
-      enableDispathPopstate = true;
-    } catch {
-      enableDispathPopstate = false;
-    }
-    let basename = "/";
-    if (!props.basename && enableDispathPopstate) {
-      const ReactRouterDOMAny = ReactRouterDOM__namespace;
-      const useRouteMatch = ReactRouterDOMAny["useRouteMatch"];
-      const useHistory = ReactRouterDOMAny["useHistory"];
-      const useHref = ReactRouterDOMAny["useHref"];
-      const UNSAFE_RouteContext = ReactRouterDOMAny["UNSAFE_RouteContext"];
-      if (UNSAFE_RouteContext) {
-        if (useHref) {
-          basename = useHref == null ? void 0 : useHref("/");
-        }
-        routerContextVal = React.useContext(UNSAFE_RouteContext);
-        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 || "/");
-        }
-      } else {
-        const match = useRouteMatch == null ? void 0 : useRouteMatch();
-        if (useHistory) {
-          const history = useHistory == null ? void 0 : useHistory();
-          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) || "/");
-        }
-      }
-    }
-    context.LoggerInstance.log(`createRemoteComponent withRouterData >>>`, {
-      ...props,
-      basename,
-      routerContextVal,
-      enableDispathPopstate
-    });
-    if (enableDispathPopstate) {
-      const location = ReactRouterDOM__namespace.useLocation();
-      const [pathname, setPathname] = React.useState(location.pathname);
-      React.useEffect(() => {
-        if (pathname !== "" && pathname !== location.pathname) {
-          context.LoggerInstance.log(`createRemoteComponent dispatchPopstateEnv >>>`, {
-            name: props.name,
-            pathname: location.pathname
-          });
-          e();
-        }
-        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 });
-  });
-}
-const RemoteApp = withRouterData(RemoteAppWrapper);
-function createLazyRemoteComponent(info) {
-  const exportName = (info == null ? void 0 : info.export) || "default";
-  return React.lazy(async () => {
-    context.LoggerInstance.log(`createRemoteComponent LazyComponent create >>>`, {
-      lazyComponent: info.loader,
-      exportName
-    });
-    try {
-      const m2 = await info.loader();
-      const moduleName = m2 && m2[Symbol.for("mf_module_id")];
-      context.LoggerInstance.log(
-        `createRemoteComponent LazyComponent loadRemote info >>>`,
-        { name: moduleName, module: m2, exportName }
-      );
-      const exportFn = m2[exportName];
-      if (exportName in m2 && typeof exportFn === "function") {
-        const RemoteAppComponent = React.forwardRef((props, ref) => {
-          return /* @__PURE__ */ React.createElement(
-            RemoteApp,
-            {
-              moduleName,
-              providerInfo: exportFn,
-              exportName: info.export || "default",
-              fallback: info.fallback,
-              ref,
-              instance: info.instance,
-              ...props
-            }
-          );
-        });
-        return {
-          default: RemoteAppComponent
-        };
-      } else {
-        context.LoggerInstance.log(
-          `createRemoteComponent LazyComponent module not found >>>`,
-          { name: moduleName, module: m2, exportName }
-        );
-        throw Error(
-          `Make sure that ${moduleName} has the correct export when export is ${String(
-            exportName
-          )}`
-        );
-      }
-    } catch (error) {
-      throw error;
-    }
-  });
-}
-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 })));
-    }
-  );
-}
-var client = {};
-var m = ReactDOM;
-if (process.env.NODE_ENV === "production") {
-  client.createRoot = m.createRoot;
-  client.hydrateRoot = m.hydrateRoot;
-} else {
-  var i = m.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
-  client.createRoot = function(c, o) {
-    i.usingClientEntryPoint = true;
-    try {
-      return m.createRoot(c, o);
-    } finally {
-      i.usingClientEntryPoint = false;
-    }
-  };
-  client.hydrateRoot = function(c, h, o) {
-    i.usingClientEntryPoint = true;
-    try {
-      return m.hydrateRoot(c, h, o);
-    } finally {
-      i.usingClientEntryPoint = false;
-    }
-  };
-}
-function createBridgeComponent(bridgeInfo) {
-  return () => {
-    const rootMap = /* @__PURE__ */ new Map();
-    const { instance } = bridgeInfo;
-    context.LoggerInstance.log(
-      `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 _a, _b, _c, _d, _e, _f;
-        context.LoggerInstance.log(`createBridgeComponent render Info`, info);
-        const {
-          moduleName,
-          dom,
-          basename,
-          memoryRoute,
-          fallback,
-          ...propsInfo
-        } = info;
-        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(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: { ...propsInfo, ...beforeBridgeRenderRes == null ? void 0 : beforeBridgeRenderRes.extraProps }
-            }
-          ))
-        );
-        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 {
-            const root = client.createRoot(info.dom);
-            root.render(rootComponentWithErrorBoundary);
-            rootMap.set(info.dom, root);
-          }
-        } else {
-          const renderFn = (bridgeInfo == null ? void 0 : bridgeInfo.render) || ReactDOM.render;
-          renderFn == null ? void 0 : renderFn(rootComponentWithErrorBoundary, info.dom);
-        }
-        ((_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)) || {};
-      },
-      async destroy(info) {
-        var _a, _b, _c, _d, _e, _f;
-        context.LoggerInstance.log(`createBridgeComponent destroy Info`, {
-          dom: info.dom
-        });
-        (_c = (_b = (_a = instance == null ? void 0 : instance.bridgeHook) == null ? void 0 : _a.lifecycle) == null ? void 0 : _b.beforeBridgeDestroy) == null ? void 0 : _c.emit(info);
-        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);
-        }
-        (_f = (_e = (_d = instance == null ? void 0 : instance.bridgeHook) == null ? void 0 : _d.lifecycle) == null ? void 0 : _e.afterBridgeDestroy) == null ? void 0 : _f.emit(
-          info
-        );
-      },
-      rawComponent: bridgeInfo.rootComponent,
-      __BRIDGE_FN__: (_args) => {
-      }
-    };
-  };
-}
-function BridgeReactPlugin() {
-  return {
-    name: "bridge-react-plugin",
-    beforeInit(args) {
-      const originalCreateRemoteComponent = createRemoteComponent;
-      args.origin.createRemoteComponent = function(info) {
-        return originalCreateRemoteComponent({
-          ...info,
-          instance: args.origin
-        });
-      };
-      const originalCreateBridgeComponentt = createBridgeComponent;
-      args.origin.createBridgeComponent = function(info) {
-        return originalCreateBridgeComponentt({
-          ...info,
-          instance: args.origin
-        });
-      };
-      return args;
-    }
-  };
-}
-exports.BridgeReactPlugin = BridgeReactPlugin;
-exports.createBridgeComponent = createBridgeComponent;
-exports.createRemoteComponent = createRemoteComponent;