@module-federation/bridge-react 2.8.1 → 2.9.0

package/dist/{prefetch-QJLnti7A.js → prefetch-CMvAw8F3.js}

@@ -492,6 +492,7 @@ const processModuleAlias = (name, subPath) => {
   moduleName = moduleName + subPath;
   return moduleName;
 };
+const MAX_PRELOADED_ASSETS = 2e3;
 const CurrentGlobal = typeof globalThis === "object" ? globalThis : window;
 const nativeGlobal = (() => {
   try {
@@ -513,7 +514,7 @@ function includeOwnProperty(target, key) {
 if (!includeOwnProperty(CurrentGlobal, "__GLOBAL_LOADING_REMOTE_ENTRY__")) definePropertyGlobalVal(CurrentGlobal, "__GLOBAL_LOADING_REMOTE_ENTRY__", {});
 const globalLoading = CurrentGlobal.__GLOBAL_LOADING_REMOTE_ENTRY__;
 function setGlobalDefaultVal(target) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g;
   if (includeOwnProperty(target, "__VMOK__") && !includeOwnProperty(target, "__FEDERATION__")) definePropertyGlobalVal(target, "__FEDERATION__", target.__VMOK__);
   if (!includeOwnProperty(target, "__FEDERATION__")) {
     definePropertyGlobalVal(target, "__FEDERATION__", {
@@ -522,7 +523,8 @@ function setGlobalDefaultVal(target) {
       moduleInfo: {},
       __SHARE__: {},
       __MANIFEST_LOADING__: {},
-      __PRELOADED_MAP__: /* @__PURE__ */ new Map()
+      __PRELOADED_MAP__: /* @__PURE__ */ new Map(),
+      __PRELOADED_ASSETS__: /* @__PURE__ */ new Set()
     });
     definePropertyGlobalVal(target, "__VMOK__", target.__FEDERATION__);
   }
@@ -532,6 +534,7 @@ function setGlobalDefaultVal(target) {
   (_d = target.__FEDERATION__).__SHARE__ ?? (_d.__SHARE__ = {});
   (_e = target.__FEDERATION__).__MANIFEST_LOADING__ ?? (_e.__MANIFEST_LOADING__ = {});
   (_f = target.__FEDERATION__).__PRELOADED_MAP__ ?? (_f.__PRELOADED_MAP__ = /* @__PURE__ */ new Map());
+  (_g = target.__FEDERATION__).__PRELOADED_ASSETS__ ?? (_g.__PRELOADED_ASSETS__ = /* @__PURE__ */ new Set());
 }
 setGlobalDefaultVal(CurrentGlobal);
 setGlobalDefaultVal(nativeGlobal);
@@ -542,6 +545,15 @@ const getRemoteEntryExports = (name, globalName) => {
     entryExports: CurrentGlobal[remoteEntryKey]
   };
 };
+const getPreloadedAsset = (url) => CurrentGlobal.__FEDERATION__.__PRELOADED_ASSETS__.has(url);
+const setPreloadedAsset = (url) => {
+  const preloadedAssets = CurrentGlobal.__FEDERATION__.__PRELOADED_ASSETS__;
+  preloadedAssets.add(url);
+  if (preloadedAssets.size > MAX_PRELOADED_ASSETS) {
+    const oldestUrl = preloadedAssets.values().next().value;
+    if (oldestUrl !== void 0) preloadedAssets.delete(oldestUrl);
+  }
+};
 const DEFAULT_SCOPE = "default";
 const DEFAULT_REMOTE_TYPE = "global";
 function composeRemoteRequestId(remoteName, expose) {
@@ -622,21 +634,47 @@ const runtimeDescMap = {
   ...runtimeDescMap
 });
 const importCallback = ".then(callbacks[0]).catch(callbacks[1])";
+const remoteEntryLoadingOrigins = /* @__PURE__ */ new WeakMap();
+const esmRemoteEntryLoadErrorMessages = [
+  "Failed to fetch dynamically imported module",
+  "Importing a module script failed",
+  "error loading dynamically imported module"
+];
+function isEsmRemoteEntryLoadError(err) {
+  if (!(err instanceof TypeError)) return false;
+  return esmRemoteEntryLoadErrorMessages.some((loadErrorMessage) => err.message.includes(loadErrorMessage));
+}
 function isEsmRemoteType(type) {
   return type === "esm" || type === "module";
 }
-async function loadEsmEntry({ entry, remoteEntryExports }) {
+async function loadEsmEntry({ entry, remoteEntryExports, name, getEntryUrl }) {
   return new Promise((resolve, reject) => {
+    const rejectEntry = (loadError) => {
+      if (isEsmRemoteEntryLoadError(loadError)) {
+        const originalMsg = loadError instanceof Error ? loadError.message : String(loadError);
+        try {
+          error(RUNTIME_008, runtimeDescMap, {
+            remoteName: name,
+            resourceUrl: url
+          }, originalMsg);
+        } catch (runtimeError) {
+          reject(runtimeError);
+          return;
+        }
+      }
+      reject(loadError);
+    };
+    const url = getEntryUrl ? getEntryUrl(entry) : entry;
     try {
-      if (!remoteEntryExports) if (typeof FEDERATION_ALLOW_NEW_FUNCTION !== "undefined") new Function("callbacks", `import("${entry}")${importCallback}`)([resolve, reject]);
+      if (!remoteEntryExports) if (typeof FEDERATION_ALLOW_NEW_FUNCTION !== "undefined") new Function("callbacks", `import("${url}")${importCallback}`)([resolve, rejectEntry]);
       else import(
         /* webpackIgnore: true */
         /* @vite-ignore */
-        entry
-      ).then(resolve).catch(reject);
+        url
+      ).then(resolve).catch(rejectEntry);
       else resolve(remoteEntryExports);
     } catch (e) {
-      error(`Failed to load ESM entry from "${entry}". ${e instanceof Error ? e.message : String(e)}`);
+      error(`Failed to load ESM entry from "${url}". ${e instanceof Error ? e.message : String(e)}`);
     }
   });
 }
@@ -694,7 +732,9 @@ async function loadEntryDom({ remoteInfo, remoteEntryExports, loaderHook, getEnt
   const { entry, entryGlobalName: globalName, name, type } = remoteInfo;
   if (isEsmRemoteType(type)) return loadEsmEntry({
     entry,
-    remoteEntryExports
+    remoteEntryExports,
+    name,
+    getEntryUrl
   });
   if (type === "system") return loadSystemJsEntry({
     entry,
@@ -746,7 +786,16 @@ function getRemoteEntryUniqueKey(remoteInfo) {
 async function getRemoteEntry(params) {
   const { origin, remoteEntryExports, remoteInfo, getEntryUrl, resourceContext, _inErrorHandling = false } = params;
   const uniqueKey = getRemoteEntryUniqueKey(remoteInfo);
-  if (remoteEntryExports) return remoteEntryExports;
+  if (remoteEntryExports) {
+    await origin.loaderHook.lifecycle.afterLoadEntry.emit({
+      origin,
+      remoteInfo,
+      remoteEntryExports,
+      resourceContext,
+      cached: true
+    });
+    return remoteEntryExports;
+  }
   if (!globalLoading[uniqueKey]) {
     const loadEntryHook = origin.remoteHandler.hooks.lifecycle.loadEntry;
     const loaderHook = origin.loaderHook;
@@ -754,7 +803,8 @@ async function getRemoteEntry(params) {
       origin,
       loaderHook,
       remoteInfo,
-      remoteEntryExports
+      remoteEntryExports,
+      resourceContext
     }).then((res) => {
       if (res) return res;
       return (typeof ENV_TARGET !== "undefined" ? ENV_TARGET === "web" : logger.isBrowserEnvValue) ? loadEntryDom({
@@ -772,46 +822,69 @@ async function getRemoteEntry(params) {
       await origin.loaderHook.lifecycle.afterLoadEntry.emit({
         origin,
         remoteInfo,
-        remoteEntryExports: res
+        remoteEntryExports: res,
+        resourceContext
       });
       return res;
-    }).catch(async (err) => {
-      const uniqueKey2 = getRemoteEntryUniqueKey(remoteInfo);
-      const isScriptExecutionError = err instanceof Error && err.message.includes("ScriptExecutionError");
-      if (err instanceof Error && err.message.includes(RUNTIME_008) && !isScriptExecutionError && !_inErrorHandling) {
+    }).catch(async (loadError) => {
+      const isScriptExecutionError = loadError instanceof Error && loadError.message.includes("ScriptExecutionError");
+      if (loadError instanceof Error && loadError.message.includes(RUNTIME_008) && !isScriptExecutionError && !_inErrorHandling) {
         const wrappedGetRemoteEntry = (params2) => {
           return getRemoteEntry({
             ...params2,
             _inErrorHandling: true
           });
         };
-        const RemoteEntryExports = await origin.loaderHook.lifecycle.loadEntryError.emit({
+        const recoveredRemoteEntryExports = await origin.loaderHook.lifecycle.loadEntryError.emit({
           getRemoteEntry: wrappedGetRemoteEntry,
           origin,
           remoteInfo,
           remoteEntryExports,
           globalLoading,
-          uniqueKey: uniqueKey2
+          uniqueKey
         });
-        if (RemoteEntryExports) {
+        if (recoveredRemoteEntryExports) {
           await origin.loaderHook.lifecycle.afterLoadEntry.emit({
             origin,
             remoteInfo,
-            remoteEntryExports: RemoteEntryExports,
+            remoteEntryExports: recoveredRemoteEntryExports,
+            resourceContext,
+            error: loadError,
             recovered: true
           });
-          return RemoteEntryExports;
+          return recoveredRemoteEntryExports;
         }
       }
       await origin.loaderHook.lifecycle.afterLoadEntry.emit({
         origin,
         remoteInfo,
-        error: err
+        resourceContext,
+        error: loadError
       });
-      throw err;
+      throw loadError;
     });
+    remoteEntryLoadingOrigins.set(globalLoading[uniqueKey], origin);
   }
-  return globalLoading[uniqueKey];
+  const remoteEntryLoading = globalLoading[uniqueKey];
+  if (remoteEntryLoadingOrigins.get(remoteEntryLoading) !== origin) try {
+    const result = await remoteEntryLoading;
+    await origin.loaderHook.lifecycle.afterLoadEntry.emit({
+      origin,
+      remoteInfo,
+      remoteEntryExports: result,
+      resourceContext
+    });
+    return result;
+  } catch (loadError) {
+    await origin.loaderHook.lifecycle.afterLoadEntry.emit({
+      origin,
+      remoteInfo,
+      resourceContext,
+      error: loadError
+    });
+    throw loadError;
+  }
+  return remoteEntryLoading;
 }
 function getRemoteInfo(remote) {
   return {
@@ -872,6 +945,12 @@ function createAssetResult(context, url, status, error2) {
     error: error2
   };
 }
+function preloadAssetOnce(context, url, recordPreloadedAssets, preload) {
+  if (!recordPreloadedAssets) return preload();
+  if (getPreloadedAsset(url)) return Promise.resolve(createAssetResult(context, url, "cached"));
+  setPreloadedAsset(url);
+  return preload();
+}
 async function waitForRemoteEntryPreload(host, remoteInfo, entryRemoteInfo, context) {
   const cachedRemote = host.moduleCache.get(entryRemoteInfo.name);
   const url = entryRemoteInfo.entry;
@@ -958,7 +1037,7 @@ function createResourceContext(baseContext, resourceType) {
 function preloadAssets(remoteInfo, host, assets, useLinkPreload = true, baseContext = {
   initiator: "preloadRemote",
   id: remoteInfo.name
-}) {
+}, recordPreloadedAssets = true) {
   const { cssAssets, jsAssetsWithoutEntry, entryAssets } = assets;
   const results = [];
   if (host.options.inBrowser) {
@@ -972,13 +1051,14 @@ function preloadAssets(remoteInfo, host, assets, useLinkPreload = true, baseCont
         as: "style"
       };
       cssAssets.forEach((cssUrl) => {
-        results.push(waitForLinkPreload({
+        const context = createResourceContext(baseContext, "css");
+        results.push(preloadAssetOnce(context, cssUrl, recordPreloadedAssets, () => waitForLinkPreload({
           host,
           remoteInfo,
           url: cssUrl,
           attrs: defaultAttrs2,
-          context: createResourceContext(baseContext, "css")
-        }));
+          context
+        })));
       });
     } else {
       const defaultAttrs2 = {
@@ -986,14 +1066,15 @@ function preloadAssets(remoteInfo, host, assets, useLinkPreload = true, baseCont
         type: "text/css"
       };
       cssAssets.forEach((cssUrl) => {
-        results.push(waitForLinkPreload({
+        const context = createResourceContext(baseContext, "css");
+        results.push(preloadAssetOnce(context, cssUrl, recordPreloadedAssets, () => waitForLinkPreload({
           host,
           remoteInfo,
           url: cssUrl,
           attrs: defaultAttrs2,
           needDeleteLink: false,
-          context: createResourceContext(baseContext, "css")
-        }));
+          context
+        })));
       });
     }
     let preloadJsAsset = waitForScriptPreload;
@@ -1015,13 +1096,14 @@ function preloadAssets(remoteInfo, host, assets, useLinkPreload = true, baseCont
       };
     }
     jsAssetsWithoutEntry.forEach((jsUrl) => {
-      results.push(preloadJsAsset({
+      const context = createResourceContext(baseContext, "js");
+      results.push(preloadAssetOnce(context, jsUrl, recordPreloadedAssets, () => preloadJsAsset({
         host,
         remoteInfo,
         url: jsUrl,
         attrs: defaultAttrs,
-        context: createResourceContext(baseContext, "js")
-      }));
+        context
+      })));
     });
   }
   return Promise.all(results);
@@ -1067,25 +1149,27 @@ var Module$1 = class {
     this.remoteInfo = remoteInfo;
     this.host = host;
   }
-  async getEntry(expose) {
-    if (this.remoteEntryExports) return this.remoteEntryExports;
+  async getEntry(expose, resourceContext) {
+    const effectiveResourceContext = resourceContext || {
+      initiator: "loadRemote",
+      id: composeRemoteRequestId(this.remoteInfo.name, expose),
+      resourceType: "remoteEntry",
+      url: this.remoteInfo.entry,
+      expose
+    };
     const remoteEntryExports = await getRemoteEntry({
       origin: this.host,
       remoteInfo: this.remoteInfo,
       remoteEntryExports: this.remoteEntryExports,
-      resourceContext: {
-        initiator: "loadRemote",
-        id: composeRemoteRequestId(this.remoteInfo.name, expose),
-        resourceType: "remoteEntry"
-      }
+      resourceContext: effectiveResourceContext
     });
     assert(remoteEntryExports, `remoteEntryExports is undefined 
  ${lazyUtils.safeToString(this.remoteInfo)}`);
     this.remoteEntryExports = remoteEntryExports;
     return this.remoteEntryExports;
   }
-  async init(id, remoteSnapshot, rawInitScope, expose) {
-    const remoteEntryExports = await this.getEntry(expose);
+  async init(id, remoteSnapshot, rawInitScope, expose, resourceContext) {
+    const remoteEntryExports = await this.getEntry(expose, resourceContext);
     if (this.inited) {
       await this.host.loaderHook.lifecycle.afterInitRemote.emit({
         id,

package/dist/{prefetch-BzCq3MT3.mjs → prefetch-xvZIEaJL.mjs}

@@ -491,6 +491,7 @@ const processModuleAlias = (name, subPath) => {
   moduleName = moduleName + subPath;
   return moduleName;
 };
+const MAX_PRELOADED_ASSETS = 2e3;
 const CurrentGlobal = typeof globalThis === "object" ? globalThis : window;
 const nativeGlobal = (() => {
   try {
@@ -512,7 +513,7 @@ function includeOwnProperty(target, key) {
 if (!includeOwnProperty(CurrentGlobal, "__GLOBAL_LOADING_REMOTE_ENTRY__")) definePropertyGlobalVal(CurrentGlobal, "__GLOBAL_LOADING_REMOTE_ENTRY__", {});
 const globalLoading = CurrentGlobal.__GLOBAL_LOADING_REMOTE_ENTRY__;
 function setGlobalDefaultVal(target) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g;
   if (includeOwnProperty(target, "__VMOK__") && !includeOwnProperty(target, "__FEDERATION__")) definePropertyGlobalVal(target, "__FEDERATION__", target.__VMOK__);
   if (!includeOwnProperty(target, "__FEDERATION__")) {
     definePropertyGlobalVal(target, "__FEDERATION__", {
@@ -521,7 +522,8 @@ function setGlobalDefaultVal(target) {
       moduleInfo: {},
       __SHARE__: {},
       __MANIFEST_LOADING__: {},
-      __PRELOADED_MAP__: /* @__PURE__ */ new Map()
+      __PRELOADED_MAP__: /* @__PURE__ */ new Map(),
+      __PRELOADED_ASSETS__: /* @__PURE__ */ new Set()
     });
     definePropertyGlobalVal(target, "__VMOK__", target.__FEDERATION__);
   }
@@ -531,6 +533,7 @@ function setGlobalDefaultVal(target) {
   (_d = target.__FEDERATION__).__SHARE__ ?? (_d.__SHARE__ = {});
   (_e = target.__FEDERATION__).__MANIFEST_LOADING__ ?? (_e.__MANIFEST_LOADING__ = {});
   (_f = target.__FEDERATION__).__PRELOADED_MAP__ ?? (_f.__PRELOADED_MAP__ = /* @__PURE__ */ new Map());
+  (_g = target.__FEDERATION__).__PRELOADED_ASSETS__ ?? (_g.__PRELOADED_ASSETS__ = /* @__PURE__ */ new Set());
 }
 setGlobalDefaultVal(CurrentGlobal);
 setGlobalDefaultVal(nativeGlobal);
@@ -541,6 +544,15 @@ const getRemoteEntryExports = (name, globalName) => {
     entryExports: CurrentGlobal[remoteEntryKey]
   };
 };
+const getPreloadedAsset = (url) => CurrentGlobal.__FEDERATION__.__PRELOADED_ASSETS__.has(url);
+const setPreloadedAsset = (url) => {
+  const preloadedAssets = CurrentGlobal.__FEDERATION__.__PRELOADED_ASSETS__;
+  preloadedAssets.add(url);
+  if (preloadedAssets.size > MAX_PRELOADED_ASSETS) {
+    const oldestUrl = preloadedAssets.values().next().value;
+    if (oldestUrl !== void 0) preloadedAssets.delete(oldestUrl);
+  }
+};
 const DEFAULT_SCOPE = "default";
 const DEFAULT_REMOTE_TYPE = "global";
 function composeRemoteRequestId(remoteName, expose) {
@@ -621,21 +633,47 @@ const runtimeDescMap = {
   ...runtimeDescMap
 });
 const importCallback = ".then(callbacks[0]).catch(callbacks[1])";
+const remoteEntryLoadingOrigins = /* @__PURE__ */ new WeakMap();
+const esmRemoteEntryLoadErrorMessages = [
+  "Failed to fetch dynamically imported module",
+  "Importing a module script failed",
+  "error loading dynamically imported module"
+];
+function isEsmRemoteEntryLoadError(err) {
+  if (!(err instanceof TypeError)) return false;
+  return esmRemoteEntryLoadErrorMessages.some((loadErrorMessage) => err.message.includes(loadErrorMessage));
+}
 function isEsmRemoteType(type) {
   return type === "esm" || type === "module";
 }
-async function loadEsmEntry({ entry, remoteEntryExports }) {
+async function loadEsmEntry({ entry, remoteEntryExports, name, getEntryUrl }) {
   return new Promise((resolve, reject) => {
+    const rejectEntry = (loadError) => {
+      if (isEsmRemoteEntryLoadError(loadError)) {
+        const originalMsg = loadError instanceof Error ? loadError.message : String(loadError);
+        try {
+          error(RUNTIME_008, runtimeDescMap, {
+            remoteName: name,
+            resourceUrl: url
+          }, originalMsg);
+        } catch (runtimeError) {
+          reject(runtimeError);
+          return;
+        }
+      }
+      reject(loadError);
+    };
+    const url = getEntryUrl ? getEntryUrl(entry) : entry;
     try {
-      if (!remoteEntryExports) if (typeof FEDERATION_ALLOW_NEW_FUNCTION !== "undefined") new Function("callbacks", `import("${entry}")${importCallback}`)([resolve, reject]);
+      if (!remoteEntryExports) if (typeof FEDERATION_ALLOW_NEW_FUNCTION !== "undefined") new Function("callbacks", `import("${url}")${importCallback}`)([resolve, rejectEntry]);
       else import(
         /* webpackIgnore: true */
         /* @vite-ignore */
-        entry
-      ).then(resolve).catch(reject);
+        url
+      ).then(resolve).catch(rejectEntry);
       else resolve(remoteEntryExports);
     } catch (e) {
-      error(`Failed to load ESM entry from "${entry}". ${e instanceof Error ? e.message : String(e)}`);
+      error(`Failed to load ESM entry from "${url}". ${e instanceof Error ? e.message : String(e)}`);
     }
   });
 }
@@ -693,7 +731,9 @@ async function loadEntryDom({ remoteInfo, remoteEntryExports, loaderHook, getEnt
   const { entry, entryGlobalName: globalName, name, type } = remoteInfo;
   if (isEsmRemoteType(type)) return loadEsmEntry({
     entry,
-    remoteEntryExports
+    remoteEntryExports,
+    name,
+    getEntryUrl
   });
   if (type === "system") return loadSystemJsEntry({
     entry,
@@ -745,7 +785,16 @@ function getRemoteEntryUniqueKey(remoteInfo) {
 async function getRemoteEntry(params) {
   const { origin, remoteEntryExports, remoteInfo, getEntryUrl, resourceContext, _inErrorHandling = false } = params;
   const uniqueKey = getRemoteEntryUniqueKey(remoteInfo);
-  if (remoteEntryExports) return remoteEntryExports;
+  if (remoteEntryExports) {
+    await origin.loaderHook.lifecycle.afterLoadEntry.emit({
+      origin,
+      remoteInfo,
+      remoteEntryExports,
+      resourceContext,
+      cached: true
+    });
+    return remoteEntryExports;
+  }
   if (!globalLoading[uniqueKey]) {
     const loadEntryHook = origin.remoteHandler.hooks.lifecycle.loadEntry;
     const loaderHook = origin.loaderHook;
@@ -753,7 +802,8 @@ async function getRemoteEntry(params) {
       origin,
       loaderHook,
       remoteInfo,
-      remoteEntryExports
+      remoteEntryExports,
+      resourceContext
     }).then((res) => {
       if (res) return res;
       return (typeof ENV_TARGET !== "undefined" ? ENV_TARGET === "web" : isBrowserEnvValue) ? loadEntryDom({
@@ -771,46 +821,69 @@ async function getRemoteEntry(params) {
       await origin.loaderHook.lifecycle.afterLoadEntry.emit({
         origin,
         remoteInfo,
-        remoteEntryExports: res
+        remoteEntryExports: res,
+        resourceContext
       });
       return res;
-    }).catch(async (err) => {
-      const uniqueKey2 = getRemoteEntryUniqueKey(remoteInfo);
-      const isScriptExecutionError = err instanceof Error && err.message.includes("ScriptExecutionError");
-      if (err instanceof Error && err.message.includes(RUNTIME_008) && !isScriptExecutionError && !_inErrorHandling) {
+    }).catch(async (loadError) => {
+      const isScriptExecutionError = loadError instanceof Error && loadError.message.includes("ScriptExecutionError");
+      if (loadError instanceof Error && loadError.message.includes(RUNTIME_008) && !isScriptExecutionError && !_inErrorHandling) {
         const wrappedGetRemoteEntry = (params2) => {
           return getRemoteEntry({
             ...params2,
             _inErrorHandling: true
           });
         };
-        const RemoteEntryExports = await origin.loaderHook.lifecycle.loadEntryError.emit({
+        const recoveredRemoteEntryExports = await origin.loaderHook.lifecycle.loadEntryError.emit({
           getRemoteEntry: wrappedGetRemoteEntry,
           origin,
           remoteInfo,
           remoteEntryExports,
           globalLoading,
-          uniqueKey: uniqueKey2
+          uniqueKey
         });
-        if (RemoteEntryExports) {
+        if (recoveredRemoteEntryExports) {
           await origin.loaderHook.lifecycle.afterLoadEntry.emit({
             origin,
             remoteInfo,
-            remoteEntryExports: RemoteEntryExports,
+            remoteEntryExports: recoveredRemoteEntryExports,
+            resourceContext,
+            error: loadError,
             recovered: true
           });
-          return RemoteEntryExports;
+          return recoveredRemoteEntryExports;
         }
       }
       await origin.loaderHook.lifecycle.afterLoadEntry.emit({
         origin,
         remoteInfo,
-        error: err
+        resourceContext,
+        error: loadError
       });
-      throw err;
+      throw loadError;
     });
+    remoteEntryLoadingOrigins.set(globalLoading[uniqueKey], origin);
   }
-  return globalLoading[uniqueKey];
+  const remoteEntryLoading = globalLoading[uniqueKey];
+  if (remoteEntryLoadingOrigins.get(remoteEntryLoading) !== origin) try {
+    const result = await remoteEntryLoading;
+    await origin.loaderHook.lifecycle.afterLoadEntry.emit({
+      origin,
+      remoteInfo,
+      remoteEntryExports: result,
+      resourceContext
+    });
+    return result;
+  } catch (loadError) {
+    await origin.loaderHook.lifecycle.afterLoadEntry.emit({
+      origin,
+      remoteInfo,
+      resourceContext,
+      error: loadError
+    });
+    throw loadError;
+  }
+  return remoteEntryLoading;
 }
 function getRemoteInfo(remote) {
   return {
@@ -871,6 +944,12 @@ function createAssetResult(context, url, status, error2) {
     error: error2
   };
 }
+function preloadAssetOnce(context, url, recordPreloadedAssets, preload) {
+  if (!recordPreloadedAssets) return preload();
+  if (getPreloadedAsset(url)) return Promise.resolve(createAssetResult(context, url, "cached"));
+  setPreloadedAsset(url);
+  return preload();
+}
 async function waitForRemoteEntryPreload(host, remoteInfo, entryRemoteInfo, context) {
   const cachedRemote = host.moduleCache.get(entryRemoteInfo.name);
   const url = entryRemoteInfo.entry;
@@ -957,7 +1036,7 @@ function createResourceContext(baseContext, resourceType) {
 function preloadAssets(remoteInfo, host, assets, useLinkPreload = true, baseContext = {
   initiator: "preloadRemote",
   id: remoteInfo.name
-}) {
+}, recordPreloadedAssets = true) {
   const { cssAssets, jsAssetsWithoutEntry, entryAssets } = assets;
   const results = [];
   if (host.options.inBrowser) {
@@ -971,13 +1050,14 @@ function preloadAssets(remoteInfo, host, assets, useLinkPreload = true, baseCont
         as: "style"
       };
       cssAssets.forEach((cssUrl) => {
-        results.push(waitForLinkPreload({
+        const context = createResourceContext(baseContext, "css");
+        results.push(preloadAssetOnce(context, cssUrl, recordPreloadedAssets, () => waitForLinkPreload({
           host,
           remoteInfo,
           url: cssUrl,
           attrs: defaultAttrs2,
-          context: createResourceContext(baseContext, "css")
-        }));
+          context
+        })));
       });
     } else {
       const defaultAttrs2 = {
@@ -985,14 +1065,15 @@ function preloadAssets(remoteInfo, host, assets, useLinkPreload = true, baseCont
         type: "text/css"
       };
       cssAssets.forEach((cssUrl) => {
-        results.push(waitForLinkPreload({
+        const context = createResourceContext(baseContext, "css");
+        results.push(preloadAssetOnce(context, cssUrl, recordPreloadedAssets, () => waitForLinkPreload({
           host,
           remoteInfo,
           url: cssUrl,
           attrs: defaultAttrs2,
           needDeleteLink: false,
-          context: createResourceContext(baseContext, "css")
-        }));
+          context
+        })));
       });
     }
     let preloadJsAsset = waitForScriptPreload;
@@ -1014,13 +1095,14 @@ function preloadAssets(remoteInfo, host, assets, useLinkPreload = true, baseCont
       };
     }
     jsAssetsWithoutEntry.forEach((jsUrl) => {
-      results.push(preloadJsAsset({
+      const context = createResourceContext(baseContext, "js");
+      results.push(preloadAssetOnce(context, jsUrl, recordPreloadedAssets, () => preloadJsAsset({
         host,
         remoteInfo,
         url: jsUrl,
         attrs: defaultAttrs,
-        context: createResourceContext(baseContext, "js")
-      }));
+        context
+      })));
     });
   }
   return Promise.all(results);
@@ -1066,25 +1148,27 @@ var Module$1 = class {
     this.remoteInfo = remoteInfo;
     this.host = host;
   }
-  async getEntry(expose) {
-    if (this.remoteEntryExports) return this.remoteEntryExports;
+  async getEntry(expose, resourceContext) {
+    const effectiveResourceContext = resourceContext || {
+      initiator: "loadRemote",
+      id: composeRemoteRequestId(this.remoteInfo.name, expose),
+      resourceType: "remoteEntry",
+      url: this.remoteInfo.entry,
+      expose
+    };
     const remoteEntryExports = await getRemoteEntry({
       origin: this.host,
       remoteInfo: this.remoteInfo,
       remoteEntryExports: this.remoteEntryExports,
-      resourceContext: {
-        initiator: "loadRemote",
-        id: composeRemoteRequestId(this.remoteInfo.name, expose),
-        resourceType: "remoteEntry"
-      }
+      resourceContext: effectiveResourceContext
     });
     assert(remoteEntryExports, `remoteEntryExports is undefined 
  ${safeToString(this.remoteInfo)}`);
     this.remoteEntryExports = remoteEntryExports;
     return this.remoteEntryExports;
   }
-  async init(id, remoteSnapshot, rawInitScope, expose) {
-    const remoteEntryExports = await this.getEntry(expose);
+  async init(id, remoteSnapshot, rawInitScope, expose, resourceContext) {
+    const remoteEntryExports = await this.getEntry(expose, resourceContext);
     if (this.inited) {
       await this.host.loaderHook.lifecycle.afterInitRemote.emit({
         id,

package/dist/v18.cjs.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const client = require("react-dom/client");
-const bridgeBase = require("./bridge-base-Ch33UJuN.js");
+const bridgeBase = require("./bridge-base-DSYKAGGD.js");
 function createReact18Root(container, options) {
   return client.createRoot(container, options);
 }