@module-federation/bridge-react 0.0.0-next-20241115100504 → 0.0.0-next-20241117185051

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/bridge-react",
-  "version": "0.0.0-next-20241115100504",
+  "version": "0.0.0-next-20241117185051",
   "publishConfig": {
     "access": "public"
   },
@@ -12,42 +12,38 @@
     "directory": "packages/bridge-react"
   },
   "type": "module",
-  "main": "./dist/index.js",
+  "main": "./dist/index.cjs.js",
   "module": "./dist/index.es.js",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
       "import": "./dist/index.es.js",
-      "require": "./dist/index.js"
-    },
-    "./plugin": {
-      "types": "./dist/plugin.d.ts",
-      "import": "./dist/plugin.es.js",
-      "require": "./dist/plugin.js"
+      "require": "./dist/index.cjs.js"
     },
     "./router": {
       "types": "./dist/router.d.ts",
       "import": "./dist/router.es.js",
-      "require": "./dist/router.js"
+      "require": "./dist/router.cjs.js"
     },
     "./router-v5": {
       "types": "./dist/router-v5.d.ts",
       "import": "./dist/router-v5.es.js",
-      "require": "./dist/router-v5.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.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-20241115100504",
-    "@module-federation/sdk": "0.0.0-next-20241115100504"
+    "@module-federation/bridge-shared": "0.0.0-next-20241117185051",
+    "@module-federation/sdk": "0.0.0-next-20241117185051",
+    "@module-federation/runtime": "0.0.0-next-20241117185051"
   },
   "peerDependencies": {
     "react": ">=16.9.0",
@@ -67,8 +63,7 @@
     "react-router-dom": "6.22.3",
     "typescript": "^5.2.2",
     "vite": "^5.2.14",
-    "vite-plugin-dts": "^3.9.1",
-    "@module-federation/enhanced": "0.0.0-next-20241115100504"
+    "vite-plugin-dts": "^3.9.1"
   },
   "scripts": {
     "dev": "vite",

package/src/create.tsx

@@ -1,5 +1,4 @@
 import React, { forwardRef } from 'react';
-import type { FederationHost } from '@module-federation/enhanced/runtime';
 import {
   ErrorBoundary,
   ErrorBoundaryPropsWithComponent,
@@ -19,17 +18,12 @@ interface RemoteModule {
   };
 }
 
-type LazyRemoteComponentInfo<T, E extends keyof T> = {
+function createLazyRemoteComponent<T, E extends keyof T>(info: {
   loader: () => Promise<T>;
   loading: React.ReactNode;
   fallback: ErrorBoundaryPropsWithComponent['FallbackComponent'];
   export?: E;
-  instance?: FederationHost;
-};
-
-function createLazyRemoteComponent<T, E extends keyof T>(
-  info: LazyRemoteComponentInfo<T, E>,
-) {
+}) {
   const exportName = info?.export || 'default';
   return React.lazy(async () => {
     LoggerInstance.log(`createRemoteComponent LazyComponent create >>>`, {
@@ -64,7 +58,6 @@ function createLazyRemoteComponent<T, E extends keyof T>(
               exportName={info.export || 'default'}
               fallback={info.fallback}
               ref={ref}
-              instance={info.instance}
               {...props}
             />
           );
@@ -90,9 +83,12 @@ function createLazyRemoteComponent<T, E extends keyof T>(
   });
 }
 
-export function createRemoteComponent<T, E extends keyof T>(
-  info: LazyRemoteComponentInfo<T, E>,
-) {
+export function createRemoteComponent<T, E extends keyof T>(info: {
+  loader: () => Promise<T>;
+  loading: React.ReactNode;
+  fallback: ErrorBoundaryPropsWithComponent['FallbackComponent'];
+  export?: E;
+}) {
   type ExportType = T[E] extends (...args: any) => any
     ? ReturnType<T[E]>
     : never;

package/src/index.ts

@@ -1,7 +1,5 @@
 export { createRemoteComponent } from './create';
 export { createBridgeComponent } from './provider';
-export { default as BridgeReactPlugin } from './plugin';
-
 export type {
   ProviderParams,
   RenderFnParams,

package/src/provider.tsx

@@ -9,7 +9,7 @@ import type {
 import { ErrorBoundary } from 'react-error-boundary';
 import { RouterContext } from './context';
 import { LoggerInstance, atLeastReact18 } from './utils';
-import type { FederationHost } from '@module-federation/enhanced/runtime';
+import { getInstance } from '@module-federation/runtime';
 
 type RenderParams = RenderFnParams & {
   [key: string]: unknown;
@@ -26,17 +26,13 @@ type ProviderFnParams<T> = {
     App: React.ReactElement,
     id?: HTMLElement | string,
   ) => RootType | Promise<RootType>;
-  instance?: FederationHost;
 };
 
 export function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>) {
   return () => {
     const rootMap = new Map<any, RootType>();
-    const { instance } = bridgeInfo;
-    LoggerInstance.log(
-      `createBridgeComponent instance from props >>>`,
-      instance,
-    );
+    const instance = getInstance();
+    LoggerInstance.log(`createBridgeComponent remote instance`, instance);
 
     const RawComponent = (info: { propsInfo: T; appInfo: ProviderParams }) => {
       const { appInfo, propsInfo, ...restProps } = info;
@@ -99,6 +95,7 @@ export function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>) {
           const renderFn = bridgeInfo?.render || ReactDOM.render;
           renderFn?.(rootComponentWithErrorBoundary, info.dom);
         }
+
         instance?.bridgeHook?.lifecycle?.afterBridgeRender?.emit(info) || {};
       },
 
@@ -106,6 +103,7 @@ export function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>) {
         LoggerInstance.log(`createBridgeComponent destroy Info`, {
           dom: info.dom,
         });
+
         instance?.bridgeHook?.lifecycle?.beforeBridgeDestroy?.emit(info);
 
         // call destroy function
@@ -117,9 +115,7 @@ export function createBridgeComponent<T>(bridgeInfo: ProviderFnParams<T>) {
           ReactDOM.unmountComponentAtNode(info.dom);
         }
 
-        (instance as any)?.bridgeHook?.lifecycle?.afterBridgeDestroy?.emit(
-          info,
-        );
+        instance?.bridgeHook?.lifecycle?.afterBridgeDestroy?.emit(info);
       },
       rawComponent: bridgeInfo.rootComponent,
       __BRIDGE_FN__: (_args: T) => {},

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/enhanced/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/vite.config.ts

@@ -21,14 +21,12 @@ 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'),
       },
       formats: ['cjs', 'es'],
-      fileName: (format, entryName) =>
-        `${entryName}.${format.replace('cjs', '')}.js`,
+      fileName: (format, entryName) => `${entryName}.${format}.js`,
     },
     rollupOptions: {
       external: [
@@ -38,6 +36,7 @@ export default defineConfig({
         'react-router-dom/',
         'react-router-dom/index.js',
         'react-router-dom/dist/index.js',
+        '@module-federation/runtime',
       ],
       plugins: [
         {

package/dist/index..js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const plugin = require("./plugin-CfJaHqe4.cjs");
-exports.BridgeReactPlugin = plugin.BridgeReactPlugin;
-exports.createBridgeComponent = plugin.createBridgeComponent;
-exports.createRemoteComponent = plugin.createRemoteComponent;