@ice/mf-runtime 0.0.7 → 0.0.8-beta.2

package/es2017/RemoteModule.js

@@ -7,40 +7,45 @@ import { useMemo } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
 import { FallBack } from './FallBack';
 import { setFederatedModulePublicPath } from './set-public-path';
+import { getMicroMod } from './mf-global-store';
 export const RemoteModule = ({ module, scope, runtime, publicPath, LoadingComponent, ErrorComponent, onError, componentProps = {}, children = null })=>{
+    var _microMod, _runtime, _runtime1;
+    const microMod = getMicroMod(scope);
+    if ((_microMod = microMod) === null || _microMod === void 0 ? void 0 : _microMod.publicPath) {
+        setFederatedModulePublicPath(microMod.moduleFederatedName, microMod.publicPath);
+    }
     if (publicPath) {
         setFederatedModulePublicPath(scope, publicPath);
     }
     const Component = useMemo(()=>{
         if (!module || !scope) return null;
-        const RemoteComponent = /*#__PURE__*/ React.lazy(async ()=>{
-            try {
-                const remoteModule = await loadRemote(`${scope}/${module}`);
-                if (runtime) {
-                    const { react, reactDOM } = runtime;
-                    const wrappedComponent = FallBack({
+        return /*#__PURE__*/ React.lazy(async ()=>{
+            var _remoteModule;
+            const remoteModule = await loadRemote(`${scope}/${module}`);
+            if (!((_remoteModule = remoteModule) === null || _remoteModule === void 0 ? void 0 : _remoteModule.default)) {
+                return {
+                    default: remoteModule
+                };
+            }
+            if (runtime) {
+                const { react, reactDOM } = runtime;
+                return {
+                    default: FallBack({
                         Original: remoteModule.default,
                         remoteReact: ()=>react,
                         remoteReactDOM: ()=>reactDOM
-                    });
-                    return {
-                        default: wrappedComponent
-                    };
-                }
-                return {
-                    default: remoteModule.default
+                    })
                 };
-            } catch (error) {
-                console.error(`Error loading remote module ${scope}/${module}:`, error);
-                throw error;
             }
+            return {
+                default: remoteModule.default
+            };
         });
-        return RemoteComponent;
     }, [
         module,
         scope,
-        runtime.react,
-        runtime.reactDOM
+        (_runtime = runtime) === null || _runtime === void 0 ? void 0 : _runtime.react,
+        (_runtime1 = runtime) === null || _runtime1 === void 0 ? void 0 : _runtime1.reactDOM
     ]);
     const Loading = LoadingComponent || /*#__PURE__*/ _jsx("div", {
         children: "Loading..."
@@ -51,17 +56,15 @@ export const RemoteModule = ({ module, scope, runtime, publicPath, LoadingCompon
                 error.message
             ]
         });
-    if (Component) {
-        return /*#__PURE__*/ _jsx(ErrorBoundary, {
-            FallbackComponent: ErrorFallback,
-            onError: onError,
-            children: /*#__PURE__*/ _jsx(React.Suspense, {
-                fallback: null,
-                children: /*#__PURE__*/ _jsx(Component, _object_spread_props(_object_spread({}, componentProps), {
-                    children: children
-                }))
-            })
-        });
-    }
-    return Loading;
+    if (!Component) return Loading;
+    return /*#__PURE__*/ _jsx(ErrorBoundary, {
+        FallbackComponent: ErrorFallback,
+        onError: onError,
+        children: /*#__PURE__*/ _jsx(React.Suspense, {
+            fallback: Loading,
+            children: /*#__PURE__*/ _jsx(Component, _object_spread_props(_object_spread({}, componentProps), {
+                children: children
+            }))
+        })
+    });
 };

package/es2017/index.d.ts

@@ -1,5 +1,5 @@
-import type { ExtendedUserOptions } from './types';
+import type { ExtendedUserOptions, MicroMod } from './types';
 export { loadRemote, registerPlugins } from '@module-federation/runtime';
 export * from './FallBack';
 export * from './RemoteModule';
-export declare function init(options: ExtendedUserOptions): void;
+export declare function init(options: ExtendedUserOptions, microMods?: MicroMod[]): void;

package/es2017/index.js

@@ -4,8 +4,8 @@ import { initGlobalStore } from './mf-global-store';
 export { loadRemote, registerPlugins } from '@module-federation/runtime';
 export * from './FallBack';
 export * from './RemoteModule';
-export function init(options) {
-    initGlobalStore(options);
+export function init(options, microMods) {
+    initGlobalStore(options, microMods);
     mfInit(options);
     registerPlugins([
         runtimePlugin()

package/es2017/mf-global-store.d.ts

@@ -1,4 +1,4 @@
-import type { ExtraInfo, ExtendedUserOptions } from './types';
+import type { ExtraInfo, ExtendedUserOptions, MicroMod } from './types';
 export interface RemoteModuleInfo {
     key: string;
     name: string;
@@ -17,10 +17,14 @@ declare global {
         __MF_GLOBAL_STORE__: {
             remotes: Map<string, RemoteModuleInfo>;
             hostRemotes: Map<string, HostRemoteInfo>;
+            microMods: Map<string, MicroMod[]>;
+            currentModuleName?: string;
         };
     }
 }
-export declare function initGlobalStore(options: ExtendedUserOptions): void;
+export declare function getCurrentModuleName(): string;
+export declare function getMicroMod(scope: string): MicroMod;
+export declare function initGlobalStore(options: ExtendedUserOptions, microMods?: MicroMod[]): void;
 export declare function generateRemoteKey(name: string, entry: string): string;
 export declare function getRemoteInfoFromStore(hostName: string, remoteName: string): RemoteModuleInfo | undefined;
 export declare function hasConflict(hostName: string, remoteName: string): boolean;

package/es2017/mf-global-store.js

@@ -1,10 +1,29 @@
-export function initGlobalStore(options) {
+export function getCurrentModuleName() {
+    var _window___MF_GLOBAL_STORE__;
+    return (_window___MF_GLOBAL_STORE__ = window.__MF_GLOBAL_STORE__) === null || _window___MF_GLOBAL_STORE__ === void 0 ? void 0 : _window___MF_GLOBAL_STORE__.currentModuleName;
+}
+export function getMicroMod(scope) {
+    var _microMods;
+    const store = window.__MF_GLOBAL_STORE__;
+    const currentModuleName = getCurrentModuleName();
+    if (!currentModuleName) {
+        return undefined;
+    }
+    const microMods = store.microMods.get(currentModuleName);
+    return (_microMods = microMods) === null || _microMods === void 0 ? void 0 : _microMods.find((microMod)=>microMod.appName === scope);
+}
+export function initGlobalStore(options, microMods) {
     if (!window.__MF_GLOBAL_STORE__) {
         window.__MF_GLOBAL_STORE__ = {
             remotes: new Map(),
-            hostRemotes: new Map()
+            hostRemotes: new Map(),
+            microMods: new Map(),
+            currentModuleName: options.name
         };
     }
+    if (microMods) {
+        window.__MF_GLOBAL_STORE__.microMods.set(options.name, microMods);
+    }
     const store = window.__MF_GLOBAL_STORE__;
     // 获取或创建 hostInfo
     const existingHostInfo = store.hostRemotes.get(options.name);

package/es2017/types.d.ts

@@ -10,3 +10,11 @@ export type ExtendedRemote = Remote & {
 export interface ExtendedUserOptions extends Omit<UserOptions, 'remotes'> {
     remotes: ExtendedRemote[];
 }
+export interface MicroMod {
+    appName: string;
+    version: string;
+    publicPath: string;
+    remoteEntry: string;
+    moduleFederatedName: string;
+    extraInfo?: ExtraInfo;
+}

package/esm/RemoteModule.js

@@ -9,45 +9,52 @@ import { useMemo } from "react";
 import { ErrorBoundary } from "react-error-boundary";
 import { FallBack } from "./FallBack";
 import { setFederatedModulePublicPath } from "./set-public-path";
+import { getMicroMod } from "./mf-global-store";
 export var RemoteModule = function(param) {
     var module = param.module, scope = param.scope, runtime = param.runtime, publicPath = param.publicPath, LoadingComponent = param.LoadingComponent, ErrorComponent = param.ErrorComponent, onError = param.onError, _param_componentProps = param.componentProps, componentProps = _param_componentProps === void 0 ? {} : _param_componentProps, _param_children = param.children, children = _param_children === void 0 ? null : _param_children;
+    var _microMod, _runtime, _runtime1;
+    var microMod = getMicroMod(scope);
+    if ((_microMod = microMod) === null || _microMod === void 0 ? void 0 : _microMod.publicPath) {
+        setFederatedModulePublicPath(microMod.moduleFederatedName, microMod.publicPath);
+    }
     if (publicPath) {
         setFederatedModulePublicPath(scope, publicPath);
     }
     var Component = useMemo(function() {
         if (!module || !scope) return null;
-        var RemoteComponent = /*#__PURE__*/ React.lazy(/*#__PURE__*/ _async_to_generator(function() {
-            var remoteModule, react, reactDOM, wrappedComponent, error;
+        return /*#__PURE__*/ React.lazy(/*#__PURE__*/ _async_to_generator(function() {
+            var _remoteModule, remoteModule, react, reactDOM;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
-                        _state.trys.push([
-                            0,
-                            2,
-                            ,
-                            3
-                        ]);
                         return [
                             4,
                             loadRemote("".concat(scope, "/").concat(module))
                         ];
                     case 1:
                         remoteModule = _state.sent();
+                        if (!((_remoteModule = remoteModule) === null || _remoteModule === void 0 ? void 0 : _remoteModule.default)) {
+                            return [
+                                2,
+                                {
+                                    default: remoteModule
+                                }
+                            ];
+                        }
                         if (runtime) {
                             react = runtime.react, reactDOM = runtime.reactDOM;
-                            wrappedComponent = FallBack({
-                                Original: remoteModule.default,
-                                remoteReact: function() {
-                                    return react;
-                                },
-                                remoteReactDOM: function() {
-                                    return reactDOM;
-                                }
-                            });
                             return [
                                 2,
                                 {
-                                    default: wrappedComponent
+                                    default: FallBack({
+                                        Original: remoteModule.default,
+                                        remoteReact: function() {
+                                            return react;
+                                        },
+                                        remoteReactDOM: function() {
+                                            return reactDOM;
+                                        }
+                                    })
                                 }
                             ];
                         }
@@ -57,23 +64,14 @@ export var RemoteModule = function(param) {
                                 default: remoteModule.default
                             }
                         ];
-                    case 2:
-                        error = _state.sent();
-                        console.error("Error loading remote module ".concat(scope, "/").concat(module, ":"), error);
-                        throw error;
-                    case 3:
-                        return [
-                            2
-                        ];
                 }
             });
         }));
-        return RemoteComponent;
     }, [
         module,
         scope,
-        runtime.react,
-        runtime.reactDOM
+        (_runtime = runtime) === null || _runtime === void 0 ? void 0 : _runtime.react,
+        (_runtime1 = runtime) === null || _runtime1 === void 0 ? void 0 : _runtime1.reactDOM
     ]);
     var Loading = LoadingComponent || /*#__PURE__*/ _jsx("div", {
         children: "Loading..."
@@ -87,17 +85,15 @@ export var RemoteModule = function(param) {
             ]
         });
     };
-    if (Component) {
-        return /*#__PURE__*/ _jsx(ErrorBoundary, {
-            FallbackComponent: ErrorFallback,
-            onError: onError,
-            children: /*#__PURE__*/ _jsx(React.Suspense, {
-                fallback: null,
-                children: /*#__PURE__*/ _jsx(Component, _object_spread_props(_object_spread({}, componentProps), {
-                    children: children
-                }))
-            })
-        });
-    }
-    return Loading;
+    if (!Component) return Loading;
+    return /*#__PURE__*/ _jsx(ErrorBoundary, {
+        FallbackComponent: ErrorFallback,
+        onError: onError,
+        children: /*#__PURE__*/ _jsx(React.Suspense, {
+            fallback: Loading,
+            children: /*#__PURE__*/ _jsx(Component, _object_spread_props(_object_spread({}, componentProps), {
+                children: children
+            }))
+        })
+    });
 };

package/esm/index.d.ts

@@ -1,5 +1,5 @@
-import type { ExtendedUserOptions } from './types';
+import type { ExtendedUserOptions, MicroMod } from './types';
 export { loadRemote, registerPlugins } from '@module-federation/runtime';
 export * from './FallBack';
 export * from './RemoteModule';
-export declare function init(options: ExtendedUserOptions): void;
+export declare function init(options: ExtendedUserOptions, microMods?: MicroMod[]): void;

package/esm/index.js

@@ -4,8 +4,8 @@ import { initGlobalStore } from "./mf-global-store";
 export { loadRemote, registerPlugins } from "@module-federation/runtime";
 export * from "./FallBack";
 export * from "./RemoteModule";
-export function init(options) {
-    initGlobalStore(options);
+export function init(options, microMods) {
+    initGlobalStore(options, microMods);
     mfInit(options);
     registerPlugins([
         runtimePlugin()

package/esm/mf-global-store.d.ts

@@ -1,4 +1,4 @@
-import type { ExtraInfo, ExtendedUserOptions } from './types';
+import type { ExtraInfo, ExtendedUserOptions, MicroMod } from './types';
 export interface RemoteModuleInfo {
     key: string;
     name: string;
@@ -17,10 +17,14 @@ declare global {
         __MF_GLOBAL_STORE__: {
             remotes: Map<string, RemoteModuleInfo>;
             hostRemotes: Map<string, HostRemoteInfo>;
+            microMods: Map<string, MicroMod[]>;
+            currentModuleName?: string;
         };
     }
 }
-export declare function initGlobalStore(options: ExtendedUserOptions): void;
+export declare function getCurrentModuleName(): string;
+export declare function getMicroMod(scope: string): MicroMod;
+export declare function initGlobalStore(options: ExtendedUserOptions, microMods?: MicroMod[]): void;
 export declare function generateRemoteKey(name: string, entry: string): string;
 export declare function getRemoteInfoFromStore(hostName: string, remoteName: string): RemoteModuleInfo | undefined;
 export declare function hasConflict(hostName: string, remoteName: string): boolean;

package/esm/mf-global-store.js

@@ -1,11 +1,32 @@
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
-export function initGlobalStore(options) {
+export function getCurrentModuleName() {
+    var _window___MF_GLOBAL_STORE__;
+    return (_window___MF_GLOBAL_STORE__ = window.__MF_GLOBAL_STORE__) === null || _window___MF_GLOBAL_STORE__ === void 0 ? void 0 : _window___MF_GLOBAL_STORE__.currentModuleName;
+}
+export function getMicroMod(scope) {
+    var _microMods;
+    var store = window.__MF_GLOBAL_STORE__;
+    var currentModuleName = getCurrentModuleName();
+    if (!currentModuleName) {
+        return undefined;
+    }
+    var microMods = store.microMods.get(currentModuleName);
+    return (_microMods = microMods) === null || _microMods === void 0 ? void 0 : _microMods.find(function(microMod) {
+        return microMod.appName === scope;
+    });
+}
+export function initGlobalStore(options, microMods) {
     if (!window.__MF_GLOBAL_STORE__) {
         window.__MF_GLOBAL_STORE__ = {
             remotes: new Map(),
-            hostRemotes: new Map()
+            hostRemotes: new Map(),
+            microMods: new Map(),
+            currentModuleName: options.name
         };
     }
+    if (microMods) {
+        window.__MF_GLOBAL_STORE__.microMods.set(options.name, microMods);
+    }
     var store = window.__MF_GLOBAL_STORE__;
     // 获取或创建 hostInfo
     var existingHostInfo = store.hostRemotes.get(options.name);

package/esm/types.d.ts

@@ -10,3 +10,11 @@ export type ExtendedRemote = Remote & {
 export interface ExtendedUserOptions extends Omit<UserOptions, 'remotes'> {
     remotes: ExtendedRemote[];
 }
+export interface MicroMod {
+    appName: string;
+    version: string;
+    publicPath: string;
+    remoteEntry: string;
+    moduleFederatedName: string;
+    extraInfo?: ExtraInfo;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ice/mf-runtime",
-  "version": "0.0.7",
+  "version": "0.0.8-beta.2",
   "description": "ice mf runtime",
   "files": [
     "esm",
@@ -22,7 +22,7 @@
         "default": "./esm/index.js"
       }
     },
-    "./*": "./*"
+    "./types": "./esm/types.js"
   },
   "sideEffects": [
     "dist/*",