@ice/mf-runtime 1.0.3 → 1.0.4-beta.0

package/es2017/RemoteModule.js

@@ -5,7 +5,6 @@ import { useMemo, useState, useLayoutEffect, forwardRef } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
 import { FallBack } from './FallBack';
 import { setFederatedModulePublicPath } from './set-public-path';
-import { getMicroMod } from './mf-global-store';
 const useMountNode = (mountNodeConfig)=>{
     const [resolvedNode, setResolvedNode] = useState(undefined);
     // 解析各种类型的 mountNode
@@ -32,12 +31,9 @@ const useMountNode = (mountNodeConfig)=>{
     return resolvedNode;
 };
 const RemoteModuleInner = ({ module, scope, runtime, publicPath, LoadingComponent, ErrorComponent, onError, componentProps = {}, children = null, mountNode, fallbackContainerClassName }, ref)=>{
-    var _microMod, _runtime, _runtime1;
-    const microMod = getMicroMod(scope);
+    var _runtime, _runtime1;
     const resolvedMountNode = useMountNode(mountNode);
-    if ((_microMod = microMod) === null || _microMod === void 0 ? void 0 : _microMod.publicPath) {
-        setFederatedModulePublicPath(microMod.moduleFederatedName, microMod.publicPath);
-    }
+    // 运行时传入的 publicPath 优先级更高，会覆盖 initGlobalStore 中设置的值
     if (publicPath) {
         setFederatedModulePublicPath(scope, publicPath);
     }

package/es2017/index.js

@@ -1,4 +1,3 @@
-import { getBasename } from '@ice/stark-app';
 import { registerPlugins, init as mfInit } from '@module-federation/runtime';
 import { runtimePlugin } from './runtime-plugin';
 import { initGlobalStore } from './mf-global-store';
@@ -12,6 +11,13 @@ export function init(options, microMods) {
         runtimePlugin()
     ]);
 }
+// 获取当前 URL 的 basename（路径）
+function getBasename() {
+    // 使用 window.location.pathname 获取当前 URL 的真实路径
+    const pathname = window.location.pathname;
+    // 移除开头的 '/' 和结尾的 '/'，并将中划线转换为下划线
+    return (pathname.replace(/^\/|\/$/g, '') || 'root').replace(/-/g, '_');
+}
 // 需要一个稳定的，微应用唯一的 ID
 function generateUniqueId() {
     const prefix = 'ice_standard';
@@ -34,6 +40,6 @@ export function initByMicroMods(microMods, hostName) {
     });
     init({
         remotes,
-        name: hostName || generateUniqueId()
+        name: generateUniqueId() || hostName
     }, microMods);
 }

package/es2017/mf-global-store.js

@@ -1,3 +1,4 @@
+import { setFederatedModulePublicPath } from './set-public-path';
 export function getCurrentModuleNames() {
     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__.currentModuleNames) || [];
@@ -38,6 +39,12 @@ export function initGlobalStore(options, microMods) {
             window.__MF_GLOBAL_STORE__.microMods = new Map();
         }
         window.__MF_GLOBAL_STORE__.microMods.set(options.name, microMods);
+        // 批量设置 microMods 的 publicPath
+        microMods.forEach((microMod)=>{
+            if (microMod.publicPath && microMod.moduleFederatedName) {
+                setFederatedModulePublicPath(microMod.moduleFederatedName, microMod.publicPath);
+            }
+        });
     }
     const store = window.__MF_GLOBAL_STORE__;
     if (!window.getCurrentIceMicroMods) {

package/esm/RemoteModule.js

@@ -9,7 +9,6 @@ import { useMemo, useState, useLayoutEffect, forwardRef } from "react";
 import { ErrorBoundary } from "react-error-boundary";
 import { FallBack } from "./FallBack";
 import { setFederatedModulePublicPath } from "./set-public-path";
-import { getMicroMod } from "./mf-global-store";
 var useMountNode = function(mountNodeConfig) {
     var _useState = _sliced_to_array(useState(undefined), 2), resolvedNode = _useState[0], setResolvedNode = _useState[1];
     // 解析各种类型的 mountNode
@@ -37,12 +36,9 @@ var useMountNode = function(mountNodeConfig) {
 };
 var RemoteModuleInner = function(param, ref) {
     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, mountNode = param.mountNode, fallbackContainerClassName = param.fallbackContainerClassName;
-    var _microMod, _runtime, _runtime1;
-    var microMod = getMicroMod(scope);
+    var _runtime, _runtime1;
     var resolvedMountNode = useMountNode(mountNode);
-    if ((_microMod = microMod) === null || _microMod === void 0 ? void 0 : _microMod.publicPath) {
-        setFederatedModulePublicPath(microMod.moduleFederatedName, microMod.publicPath);
-    }
+    // 运行时传入的 publicPath 优先级更高，会覆盖 initGlobalStore 中设置的值
     if (publicPath) {
         setFederatedModulePublicPath(scope, publicPath);
     }

package/esm/index.js

@@ -1,4 +1,3 @@
-import { getBasename } from "@ice/stark-app";
 import { registerPlugins, init as mfInit } from "@module-federation/runtime";
 import { runtimePlugin } from "./runtime-plugin";
 import { initGlobalStore } from "./mf-global-store";
@@ -12,6 +11,13 @@ export function init(options, microMods) {
         runtimePlugin()
     ]);
 }
+// 获取当前 URL 的 basename（路径）
+function getBasename() {
+    // 使用 window.location.pathname 获取当前 URL 的真实路径
+    var pathname = window.location.pathname;
+    // 移除开头的 '/' 和结尾的 '/'，并将中划线转换为下划线
+    return (pathname.replace(/^\/|\/$/g, "") || "root").replace(/-/g, "_");
+}
 // 需要一个稳定的，微应用唯一的 ID
 function generateUniqueId() {
     var prefix = "ice_standard";
@@ -34,6 +40,6 @@ export function initByMicroMods(microMods, hostName) {
     });
     init({
         remotes: remotes,
-        name: hostName || generateUniqueId()
+        name: generateUniqueId() || hostName
     }, microMods);
 }

package/esm/mf-global-store.js

@@ -1,5 +1,6 @@
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
+import { setFederatedModulePublicPath } from "./set-public-path";
 export function getCurrentModuleNames() {
     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__.currentModuleNames) || [];
@@ -59,6 +60,12 @@ export function initGlobalStore(options, microMods) {
             window.__MF_GLOBAL_STORE__.microMods = new Map();
         }
         window.__MF_GLOBAL_STORE__.microMods.set(options.name, microMods);
+        // 批量设置 microMods 的 publicPath
+        microMods.forEach(function(microMod) {
+            if (microMod.publicPath && microMod.moduleFederatedName) {
+                setFederatedModulePublicPath(microMod.moduleFederatedName, microMod.publicPath);
+            }
+        });
     }
     var store = window.__MF_GLOBAL_STORE__;
     if (!window.getCurrentIceMicroMods) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ice/mf-runtime",
-  "version": "1.0.3",
+  "version": "1.0.4-beta.0",
   "description": "ice mf runtime",
   "files": [
     "esm",