@ice/mf-runtime 1.0.3-beta.2 → 1.0.3

package/esm/RemoteModule.js

@@ -6,13 +6,10 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { loadRemote } from "@module-federation/runtime";
 import * as React from "react";
 import { useMemo, useState, useLayoutEffect, forwardRef } from "react";
-import * as ReactDOM from "react-dom";
 import { ErrorBoundary } from "react-error-boundary";
 import { FallBack } from "./FallBack";
 import { setFederatedModulePublicPath } from "./set-public-path";
 import { getMicroMod } from "./mf-global-store";
-import { useEnhancedPluginManager } from "./plugin-manager";
-import { isRuntimePluginWrapper } from "./types";
 var useMountNode = function(mountNodeConfig) {
     var _useState = _sliced_to_array(useState(undefined), 2), resolvedNode = _useState[0], setResolvedNode = _useState[1];
     // 解析各种类型的 mountNode
@@ -43,7 +40,6 @@ var RemoteModuleInner = function(param, ref) {
     var _microMod, _runtime, _runtime1;
     var microMod = getMicroMod(scope);
     var resolvedMountNode = useMountNode(mountNode);
-    var enhancedPluginManager = useEnhancedPluginManager();
     if ((_microMod = microMod) === null || _microMod === void 0 ? void 0 : _microMod.publicPath) {
         setFederatedModulePublicPath(microMod.moduleFederatedName, microMod.publicPath);
     }
@@ -53,7 +49,7 @@ var RemoteModuleInner = function(param, ref) {
     var Component = useMemo(function() {
         if (!module || !scope) return null;
         return /*#__PURE__*/ React.lazy(/*#__PURE__*/ _async_to_generator(function() {
-            var _typedRemoteModule, remoteModule, _remoteModule, originalComponent, runtimeInfo, reactInstances, remoteReact, remoteReactDOM, PluginWrappedComponent, FinalComponent, typedRemoteModule, BaseComponent, FinalComponent1, react, reactDOM, PluginWrappedComponent1;
+            var _typedRemoteModule, remoteModule, ComponentFromPlugin, typedRemoteModule, react, reactDOM;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -63,80 +59,48 @@ var RemoteModuleInner = function(param, ref) {
                         ];
                     case 1:
                         remoteModule = _state.sent();
-                        // 使用清晰的对象结构检查是否为 Runtime Plugin 包装器
-                        if (isRuntimePluginWrapper(remoteModule)) {
-                            _remoteModule = remoteModule(), originalComponent = _remoteModule.originalComponent, runtimeInfo = _remoteModule.runtimeInfo, reactInstances = _remoteModule.reactInstances;
-                            remoteReact = reactInstances.react;
-                            remoteReactDOM = reactInstances.reactDOM;
-                            PluginWrappedComponent = enhancedPluginManager.wrapComponent(originalComponent, {
-                                remoteName: scope,
-                                moduleName: module,
-                                props: componentProps || {},
-                                React: remoteReact,
-                                ReactDOM: remoteReactDOM
-                            });
-                            FinalComponent = FallBack({
-                                Original: PluginWrappedComponent,
-                                remoteVersion: runtimeInfo.remoteVersion ? function() {
-                                    return runtimeInfo.remoteVersion;
-                                } : undefined,
-                                hostVersion: runtimeInfo.hostVersion ? function() {
-                                    return runtimeInfo.hostVersion;
-                                } : undefined,
-                                remoteReactDOM: runtimeInfo.remoteReactDOM,
-                                remoteReact: runtimeInfo.remoteReact,
-                                mountNode: resolvedMountNode,
-                                containerClassName: fallbackContainerClassName
-                            });
+                        // 检查是否是来自 runtime plugin 的包装函数（通过标记识别）
+                        if (typeof remoteModule === "function" && remoteModule.__ICE_MF_RUNTIME_WRAPPER__) {
+                            ComponentFromPlugin = remoteModule(resolvedMountNode, fallbackContainerClassName);
                             return [
                                 2,
                                 {
-                                    default: FinalComponent
+                                    default: ComponentFromPlugin
                                 }
                             ];
                         }
                         typedRemoteModule = remoteModule;
                         if (!((_typedRemoteModule = typedRemoteModule) === null || _typedRemoteModule === void 0 ? void 0 : _typedRemoteModule.default)) {
-                            BaseComponent = remoteModule;
-                        } else {
-                            BaseComponent = typedRemoteModule.default;
+                            return [
+                                2,
+                                {
+                                    default: remoteModule
+                                }
+                            ];
                         }
-                        // 如果需要 runtime 处理（不同 React 版本或 mountNode）
                         if (runtime) {
                             react = runtime.react, reactDOM = runtime.reactDOM;
-                            PluginWrappedComponent1 = enhancedPluginManager.wrapComponent(BaseComponent, {
-                                remoteName: scope,
-                                moduleName: module,
-                                props: componentProps || {},
-                                React: react,
-                                ReactDOM: reactDOM
-                            });
-                            FinalComponent1 = FallBack({
-                                Original: PluginWrappedComponent1,
-                                remoteReact: function() {
-                                    return react;
-                                },
-                                remoteReactDOM: function() {
-                                    return reactDOM;
-                                },
-                                mountNode: resolvedMountNode,
-                                containerClassName: fallbackContainerClassName
-                            });
-                        } else {
-                            // 没有 runtime 需求时，直接应用插件包装器
-                            FinalComponent1 = enhancedPluginManager.wrapComponent(BaseComponent, {
-                                remoteName: scope,
-                                moduleName: module,
-                                props: componentProps || {},
-                                React: React,
-                                ReactDOM: ReactDOM
-                            });
+                            return [
+                                2,
+                                {
+                                    default: FallBack({
+                                        Original: typedRemoteModule.default,
+                                        remoteReact: function() {
+                                            return react;
+                                        },
+                                        remoteReactDOM: function() {
+                                            return reactDOM;
+                                        },
+                                        mountNode: resolvedMountNode,
+                                        containerClassName: fallbackContainerClassName
+                                    })
+                                }
+                            ];
                         }
-                        console.log("FinalComponent", FinalComponent1);
                         return [
                             2,
                             {
-                                default: FinalComponent1
+                                default: typedRemoteModule.default
                             }
                         ];
                 }
@@ -148,9 +112,7 @@ var RemoteModuleInner = function(param, ref) {
         (_runtime = runtime) === null || _runtime === void 0 ? void 0 : _runtime.react,
         (_runtime1 = runtime) === null || _runtime1 === void 0 ? void 0 : _runtime1.reactDOM,
         resolvedMountNode,
-        fallbackContainerClassName,
-        enhancedPluginManager,
-        componentProps
+        fallbackContainerClassName
     ]);
     var Loading = LoadingComponent || /*#__PURE__*/ React.createElement("div", null, "Loading...");
     var ErrorFallback = function(param) {
@@ -158,11 +120,6 @@ var RemoteModuleInner = function(param, ref) {
         return ErrorComponent || /*#__PURE__*/ React.createElement("div", null, "远程模块加载失败: ", error.message);
     };
     if (!Component) return Loading;
-    // 应用增强插件的属性注入
-    var injectedProps = enhancedPluginManager.injectProps(componentProps || {}, {
-        remoteName: scope,
-        moduleName: module
-    });
     return /*#__PURE__*/ React.createElement(ErrorBoundary, {
         resetKeys: [
             module,
@@ -175,7 +132,7 @@ var RemoteModuleInner = function(param, ref) {
         fallback: Loading
     }, /*#__PURE__*/ React.createElement(Component, _object_spread({
         ref: ref
-    }, injectedProps), children)));
+    }, componentProps), children)));
 };
 // 使用 forwardRef 包装组件以支持 ref
 export var RemoteModule = /*#__PURE__*/ forwardRef(RemoteModuleInner);

package/esm/index.d.ts

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

package/esm/index.js

@@ -1,16 +1,14 @@
 import { getBasename } from "@ice/stark-app";
-import { registerPlugins as mfRegisterPlugins, init as mfInit } from "@module-federation/runtime";
+import { registerPlugins, init as mfInit } from "@module-federation/runtime";
 import { runtimePlugin } from "./runtime-plugin";
 import { initGlobalStore } from "./mf-global-store";
 export { loadRemote, registerPlugins } from "@module-federation/runtime";
 export * from "./FallBack";
 export * from "./RemoteModule";
-export * from "./types";
-export * from "./plugin-manager";
 export function init(options, microMods) {
     initGlobalStore(options, microMods);
     mfInit(options);
-    mfRegisterPlugins([
+    registerPlugins([
         runtimePlugin()
     ]);
 }
@@ -36,6 +34,6 @@ export function initByMicroMods(microMods, hostName) {
     });
     init({
         remotes: remotes,
-        name: generateUniqueId() || hostName
+        name: hostName || generateUniqueId()
     }, microMods);
 }

package/esm/runtime-plugin.js

@@ -2,10 +2,10 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import * as React from "react";
 import { getExtraInfo, getRemoteInfoFromStore, hasConflict } from "./mf-global-store";
-import { createRuntimePluginWrapper } from "./types";
+import { FallBack } from "./FallBack";
 var loadRemotePackagedReactAndRender = function() {
     var _ref = _async_to_generator(function(args) {
-        var _args_origin_options_shared_reactdom_, _args_origin_options_shared_reactdom, _args_origin_options_shared, _args_origin_options, _remoteInstance_options_shared_reactdom_, _remoteInstance_options_shared_reactdom, _remoteInstance_options_shared, _remoteInstance_options, hostVersion, remoteInstance, remoteVersion, _sharedOptions_find, remoteReactDOM, _sharedOptions_find1, remoteReact;
+        var _args_origin_options_shared_reactdom_, _args_origin_options_shared_reactdom, _args_origin_options_shared, _args_origin_options, _remoteInstance_options_shared_reactdom_, _remoteInstance_options_shared_reactdom, _remoteInstance_options_shared, _remoteInstance_options, hostVersion, remoteInstance, remoteVersion, _sharedOptions_find, remoteReactDOM, _sharedOptions_find1, remoteReact, wrappedRender;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -23,8 +23,8 @@ var loadRemotePackagedReactAndRender = function() {
                         4,
                         remoteInstance.loadShare("react-dom", {
                             resolver: function(sharedOptions) {
-                                return (_sharedOptions_find = sharedOptions.find(function(option) {
-                                    return option.version === remoteVersion;
+                                return (_sharedOptions_find = sharedOptions.find(function(i) {
+                                    return i.version === remoteVersion;
                                 })) !== null && _sharedOptions_find !== void 0 ? _sharedOptions_find : sharedOptions[0];
                             }
                         })
@@ -35,8 +35,8 @@ var loadRemotePackagedReactAndRender = function() {
                         4,
                         remoteInstance.loadShare("react", {
                             resolver: function(sharedOptions) {
-                                return (_sharedOptions_find1 = sharedOptions.find(function(option) {
-                                    return option.version === remoteVersion;
+                                return (_sharedOptions_find1 = sharedOptions.find(function(i) {
+                                    return i.version === remoteVersion;
                                 })) !== null && _sharedOptions_find1 !== void 0 ? _sharedOptions_find1 : sharedOptions[0];
                             }
                         })
@@ -49,22 +49,26 @@ var loadRemotePackagedReactAndRender = function() {
                             null
                         ];
                     }
-                    // 创建 Runtime Plugin 包装器对象，返回原始组件和运行时信息
-                    // 让 RemoteModule 控制 HOC 的正确层级顺序
+                    wrappedRender = function(mountNode, containerClassName) {
+                        return FallBack({
+                            Original: args.exposeModule.default,
+                            remoteVersion: function() {
+                                return remoteVersion;
+                            },
+                            hostVersion: function() {
+                                return hostVersion;
+                            },
+                            remoteReactDOM: remoteReactDOM,
+                            remoteReact: remoteReact,
+                            mountNode: mountNode,
+                            containerClassName: containerClassName
+                        });
+                    };
+                    // 添加标记，用于在 RemoteModule 中识别
+                    wrappedRender.__ICE_MF_RUNTIME_WRAPPER__ = true;
                     return [
                         2,
-                        createRuntimePluginWrapper(// 原始组件
-                        args.exposeModule.default, // 运行时信息
-                        {
-                            remoteVersion: remoteVersion,
-                            hostVersion: hostVersion,
-                            remoteReact: remoteReact,
-                            remoteReactDOM: remoteReactDOM
-                        }, // React 实例信息
-                        {
-                            react: remoteReact(),
-                            reactDOM: remoteReactDOM()
-                        })
+                        wrappedRender
                     ];
                 case 3:
                     return [
@@ -95,7 +99,7 @@ export var runtimePlugin = function() {
         },
         onLoad: function onLoad(args) {
             return _async_to_generator(function() {
-                var _args_origin_options_shared_reactdom_, _args_origin_options_shared_reactdom, _args_origin_options_shared, _args_origin_options, _extraInfo, hostName, remoteName, hostVersion, extraInfo, externalReact, externalReactDOM, remoteReact, remoteReactDOM, fallBackRender;
+                var _args_origin_options_shared_reactdom_, _args_origin_options_shared_reactdom, _args_origin_options_shared, _args_origin_options, _extraInfo, hostName, remoteName, hostVersion, extraInfo, externalReact, externalReactDOM, remoteReact, remoteReactDOM, wrappedRender, fallBackRender;
                 return _ts_generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
@@ -120,20 +124,20 @@ export var runtimePlugin = function() {
                                             args
                                         ];
                                     }
-                                    // 创建 Runtime Plugin 包装器对象，返回原始组件和运行时信息
-                                    // 让 RemoteModule 控制 HOC 的正确层级顺序
+                                    wrappedRender = function(mountNode, containerClassName) {
+                                        return FallBack({
+                                            Original: args.exposeModule.default,
+                                            remoteReactDOM: remoteReactDOM,
+                                            remoteReact: remoteReact,
+                                            mountNode: mountNode,
+                                            containerClassName: containerClassName
+                                        });
+                                    };
+                                    // 添加标记，用于在 RemoteModule 中识别
+                                    wrappedRender.__ICE_MF_RUNTIME_WRAPPER__ = true;
                                     return [
                                         2,
-                                        createRuntimePluginWrapper(// 原始组件
-                                        args.exposeModule.default, // 运行时信息
-                                        {
-                                            remoteReact: remoteReact,
-                                            remoteReactDOM: remoteReactDOM
-                                        }, // React 实例信息
-                                        {
-                                            react: remoteReact(),
-                                            reactDOM: remoteReactDOM()
-                                        })
+                                        wrappedRender
                                     ];
                                 }
                             }

package/esm/types.d.ts

@@ -1,6 +1,5 @@
 import type { UserOptions } from '@module-federation/runtime-core';
 import type { Remote } from '@module-federation/runtime-core/dist/src/types';
-import * as React from 'react';
 export interface ExtraInfo {
     external?: Record<string, string>;
     legacy?: boolean;
@@ -19,69 +18,3 @@ export interface MicroMod {
     moduleFederatedName: string;
     extraInfo?: ExtraInfo;
 }
-export interface FederationRuntimePlugin {
-    name: string;
-    afterResolve?: (args: any) => any;
-    onLoad?: (args: any) => any;
-    beforeRequest?: (args: any) => any;
-}
-export interface WrapperContext {
-    remoteName: string;
-    moduleName: string;
-    props: Record<string, any>;
-    React: typeof import('react');
-    ReactDOM?: typeof import('react-dom');
-}
-export interface InjectionContext {
-    remoteName: string;
-    moduleName: string;
-}
-export interface ComponentWrapper {
-    (WrappedComponent: React.ComponentType<any>, context: WrapperContext): React.ComponentType<any>;
-}
-export interface PropInjector {
-    (props: Record<string, any>, context: InjectionContext): Record<string, any>;
-}
-export interface EnhancedRuntimePlugin {
-    name: string;
-    wrapComponent?: ComponentWrapper;
-    injectProps?: PropInjector;
-}
-/**
- * Runtime Plugin 包装器对象的接口
- * 包含原始组件和运行时信息，让 RemoteModule 控制 HOC 层级顺序
- */
-export interface RuntimePluginWrapper {
-    readonly type: 'runtime-plugin-wrapper';
-    readonly originalComponent: React.ComponentType<any>;
-    readonly runtimeInfo: {
-        readonly remoteVersion?: string;
-        readonly hostVersion?: string;
-        readonly remoteReact: () => typeof import('react');
-        readonly remoteReactDOM: () => typeof import('react-dom');
-        readonly mountNode?: HTMLElement;
-        readonly containerClassName?: string;
-    };
-    readonly reactInstances: {
-        readonly react: typeof import('react');
-        readonly reactDOM?: typeof import('react-dom');
-    };
-}
-/**
- * 类型守卫：检查是否为 Runtime Plugin 包装器
- */
-export declare function isRuntimePluginWrapper(value: any): value is () => RuntimePluginWrapper;
-/**
- * 创建 Runtime Plugin 包装器的工厂函数
- */
-export declare function createRuntimePluginWrapper(originalComponent: React.ComponentType<any>, runtimeInfo: {
-    remoteVersion?: string;
-    hostVersion?: string;
-    remoteReact: () => typeof import('react');
-    remoteReactDOM: () => typeof import('react-dom');
-    mountNode?: HTMLElement;
-    containerClassName?: string;
-}, reactInstances: {
-    react: typeof import('react');
-    reactDOM?: typeof import('react-dom');
-}): () => RuntimePluginWrapper;

package/esm/types.js

@@ -1,20 +1 @@
-import * as React from "react";
-/**
- * 类型守卫：检查是否为 Runtime Plugin 包装器
- */ export function isRuntimePluginWrapper(value) {
-    return value && value.__mf_fallback_render;
-}
-/**
- * 创建 Runtime Plugin 包装器的工厂函数
- */ export function createRuntimePluginWrapper(originalComponent, runtimeInfo, reactInstances) {
-    var wrapper = function() {
-        return {
-            type: "runtime-plugin-wrapper",
-            originalComponent: originalComponent,
-            runtimeInfo: runtimeInfo,
-            reactInstances: reactInstances
-        };
-    };
-    wrapper.__mf_fallback_render = true;
-    return wrapper;
-} // 不再需要联合类型，两种插件分开管理
+export { };

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@ice/mf-runtime",
-  "version": "1.0.3-beta.2",
+  "version": "1.0.3",
   "description": "ice mf runtime",
   "files": [
     "esm",
     "es2017",
     "cjs",
-    "dist",
-    "docs"
+    "dist"
   ],
   "main": "esm/index.js",
   "module": "esm/index.js",
@@ -35,9 +34,6 @@
     "start": "ice-pkg start",
     "build": "ice-pkg build",
     "prepublishOnly": "npm run build",
-    "test": "vitest",
-    "test:run": "vitest run",
-    "test:coverage": "vitest run --coverage",
     "eslint": "eslint --cache --ext .js,.jsx,.ts,.tsx ./",
     "eslint:fix": "npm run eslint -- --fix",
     "stylelint": "stylelint \"**/*.{css,scss,less}\"",
@@ -61,19 +57,12 @@
     "@applint/spec": "^1.2.3",
     "@ice/pkg": "^1.0.0",
     "@ice/runtime": "^1.0.0",
-    "@ice/stark-app": "^1.5.0",
-    "@testing-library/jest-dom": "^6.0.0",
-    "@testing-library/react": "^14.0.0",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
-    "@vitest/coverage-v8": "^1.0.0",
     "eslint": "^8.0.0",
-    "jsdom": "^23.0.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
-    "stylelint": "^15.0.0",
-    "typescript": "^5.0.0",
-    "vitest": "^1.0.0"
+    "stylelint": "^15.0.0"
   },
   "publishConfig": {
     "access": "public",