@module-federation/bridge-react 2.4.0 → 2.5.0

package/dist/{prefetch-ByDYONsx.mjs → prefetch-zNZ70qRm.mjs}

@@ -1,4 +1,4 @@
-import { A as warn, x as DATA_FETCH_FUNCTION, F as FS_HREF, l as logger, e as getDataFetchMap, i as initDataFetchMap, n as getDataFetchItem, M as MF_DATA_FETCH_STATUS, p as MF_DATA_FETCH_TYPE, B as DOWNGRADE_KEY, G as callAllDowngrade, H as callDowngrade, I as getDowngradeTag, J as composeKeyWithSeparator, k as getDataFetchInfo, m as getDataFetchMapKey } from "./utils-D4k5eixv.mjs";
+import { B as warn, y as DATA_FETCH_FUNCTION, F as FS_HREF, l as logger, e as getDataFetchMap, i as initDataFetchMap, o as getDataFetchItem, M as MF_DATA_FETCH_STATUS, q as MF_DATA_FETCH_TYPE, G as DOWNGRADE_KEY, H as callAllDowngrade, I as callDowngrade, J as getDowngradeTag, K as composeKeyWithSeparator, m as getDataFetchInfo, n as getDataFetchMapKey } from "./utils-DGS4pYp8.mjs";
 import { i as isBrowserEnvValue } from "./logger-DwWkXsWl.mjs";
 async function safeWrapper(callback, disableWarn) {
   try {
@@ -104,6 +104,8 @@ function createScript(info) {
 function createLink(info) {
   let link = null;
   let needAttach = true;
+  let timeout = 2e4;
+  let timeoutId;
   const links = document.getElementsByTagName("link");
   for (let i = 0; i < links.length; i++) {
     const l = links[i];
@@ -119,19 +121,42 @@ function createLink(info) {
     link = document.createElement("link");
     link.setAttribute("href", info.url);
     let createLinkRes = void 0;
+    let shouldApplyAttrs = true;
     const attrs = info.attrs;
     if (info.createLinkHook) {
       createLinkRes = info.createLinkHook(info.url, attrs);
-      if (createLinkRes instanceof HTMLLinkElement) link = createLinkRes;
+      if (createLinkRes instanceof HTMLLinkElement) {
+        link = createLinkRes;
+        shouldApplyAttrs = false;
+      } else if (typeof createLinkRes === "object") {
+        if ("link" in createLinkRes && createLinkRes.link) {
+          link = createLinkRes.link;
+          shouldApplyAttrs = false;
+        }
+        if ("timeout" in createLinkRes && createLinkRes.timeout) timeout = createLinkRes.timeout;
+      }
     }
-    if (attrs && !createLinkRes) Object.keys(attrs).forEach((name) => {
+    if (attrs && shouldApplyAttrs) Object.keys(attrs).forEach((name) => {
       if (link && !link.getAttribute(name)) link.setAttribute(name, attrs[name]);
     });
   }
+  if (!needAttach) {
+    Promise.resolve().then(() => {
+      (info == null ? void 0 : info.cb) && (info == null ? void 0 : info.cb());
+    });
+    return {
+      link,
+      needAttach
+    };
+  }
   const onLinkComplete = (prev, event) => {
+    if (timeoutId) clearTimeout(timeoutId);
     const onLinkCompleteCallback = () => {
-      if ((event == null ? void 0 : event.type) === "error") (info == null ? void 0 : info.onErrorCallback) && (info == null ? void 0 : info.onErrorCallback(event));
-      else (info == null ? void 0 : info.cb) && (info == null ? void 0 : info.cb());
+      if ((event == null ? void 0 : event.type) === "error") {
+        const linkError = /* @__PURE__ */ new Error((event == null ? void 0 : event.isTimeout) ? `LinkNetworkError: Link "${info.url}" timed out.` : `LinkNetworkError: Failed to load link "${info.url}" - the URL is unreachable or the server returned an error.`);
+        linkError.name = "LinkNetworkError";
+        (info == null ? void 0 : info.onErrorCallback) && (info == null ? void 0 : info.onErrorCallback(linkError));
+      } else (info == null ? void 0 : info.cb) && (info == null ? void 0 : info.cb());
     };
     if (link) {
       link.onerror = null;
@@ -150,6 +175,12 @@ function createLink(info) {
   };
   link.onerror = onLinkComplete.bind(null, link.onerror);
   link.onload = onLinkComplete.bind(null, link.onload);
+  timeoutId = setTimeout(() => {
+    onLinkComplete(null, {
+      type: "error",
+      isTimeout: true
+    });
+  }, timeout);
   return {
     link,
     needAttach
@@ -493,6 +524,9 @@ const RUNTIME_009 = "RUNTIME-009";
 const RUNTIME_010 = "RUNTIME-010";
 const RUNTIME_011 = "RUNTIME-011";
 const RUNTIME_012 = "RUNTIME-012";
+const RUNTIME_013 = "RUNTIME-013";
+const RUNTIME_014 = "RUNTIME-014";
+const RUNTIME_015 = "RUNTIME-015";
 const runtimeDescMap = {
   [RUNTIME_001]: "Failed to get remoteEntry exports.",
   [RUNTIME_002]: 'The remote entry interface does not contain "init"',
@@ -505,7 +539,10 @@ const runtimeDescMap = {
   [RUNTIME_009]: "Please call createInstance first.",
   [RUNTIME_010]: 'The name option cannot be changed after initialization. If you want to create a new instance with a different name, please use "createInstance" api.',
   [RUNTIME_011]: "The remoteEntry URL is missing from the remote snapshot.",
-  [RUNTIME_012]: 'The getter for the shared module is not a function. This may be caused by setting "shared.import: false" without the host providing the corresponding lib.'
+  [RUNTIME_012]: 'The getter for the shared module is not a function. This may be caused by setting "shared.import: false" without the host providing the corresponding lib.',
+  [RUNTIME_013]: "The manifest is not a valid Module Federation manifest.",
+  [RUNTIME_014]: "The remote does not expose the requested module.",
+  [RUNTIME_015]: "Remote container initialization failed."
 };
 ({
   ...runtimeDescMap
@@ -546,7 +583,7 @@ function handleRemoteEntryLoaded(name, globalName, entry) {
   });
   return entryExports;
 }
-async function loadEntryScript({ name, globalName, entry, remoteInfo, loaderHook, getEntryUrl }) {
+async function loadEntryScript({ name, globalName, entry, remoteInfo, loaderHook, getEntryUrl, resourceContext }) {
   const { entryExports: remoteEntryExports } = getRemoteEntryExports(name, globalName);
   if (remoteEntryExports) return remoteEntryExports;
   const url = getEntryUrl ? getEntryUrl(entry) : entry;
@@ -556,7 +593,11 @@ async function loadEntryScript({ name, globalName, entry, remoteInfo, loaderHook
       const res = loaderHook.lifecycle.createScript.emit({
         url: url2,
         attrs,
-        remoteInfo
+        remoteInfo,
+        resourceContext: resourceContext ? {
+          ...resourceContext,
+          url: url2
+        } : void 0
       });
       if (!res) return;
       if (res instanceof HTMLScriptElement) return res;
@@ -572,7 +613,7 @@ async function loadEntryScript({ name, globalName, entry, remoteInfo, loaderHook
     }, originalMsg);
   });
 }
-async function loadEntryDom({ remoteInfo, remoteEntryExports, loaderHook, getEntryUrl }) {
+async function loadEntryDom({ remoteInfo, remoteEntryExports, loaderHook, getEntryUrl, resourceContext }) {
   const { entry, entryGlobalName: globalName, name, type } = remoteInfo;
   switch (type) {
     case "esm":
@@ -593,11 +634,12 @@ async function loadEntryDom({ remoteInfo, remoteEntryExports, loaderHook, getEnt
         name,
         remoteInfo,
         loaderHook,
-        getEntryUrl
+        getEntryUrl,
+        resourceContext
       });
   }
 }
-async function loadEntryNode({ remoteInfo, loaderHook }) {
+async function loadEntryNode({ remoteInfo, loaderHook, resourceContext }) {
   const { entry, entryGlobalName: globalName, name, type } = remoteInfo;
   const { entryExports: remoteEntryExports } = getRemoteEntryExports(name, globalName);
   if (remoteEntryExports) return remoteEntryExports;
@@ -611,7 +653,11 @@ async function loadEntryNode({ remoteInfo, loaderHook }) {
       const res = loaderHook.lifecycle.createScript.emit({
         url,
         attrs,
-        remoteInfo
+        remoteInfo,
+        resourceContext: resourceContext ? {
+          ...resourceContext,
+          url
+        } : void 0
       });
       if (!res) return;
       if ("url" in res) return res;
@@ -627,13 +673,14 @@ function getRemoteEntryUniqueKey(remoteInfo) {
   return composeKeyWithSeparator(name, entry);
 }
 async function getRemoteEntry(params) {
-  const { origin, remoteEntryExports, remoteInfo, getEntryUrl, _inErrorHandling = false } = params;
+  const { origin, remoteEntryExports, remoteInfo, getEntryUrl, resourceContext, _inErrorHandling = false } = params;
   const uniqueKey = getRemoteEntryUniqueKey(remoteInfo);
   if (remoteEntryExports) return remoteEntryExports;
   if (!globalLoading[uniqueKey]) {
     const loadEntryHook = origin.remoteHandler.hooks.lifecycle.loadEntry;
     const loaderHook = origin.loaderHook;
     globalLoading[uniqueKey] = loadEntryHook.emit({
+      origin,
       loaderHook,
       remoteInfo,
       remoteEntryExports
@@ -643,11 +690,20 @@ async function getRemoteEntry(params) {
         remoteInfo,
         remoteEntryExports,
         loaderHook,
-        getEntryUrl
+        getEntryUrl,
+        resourceContext
       }) : loadEntryNode({
         remoteInfo,
-        loaderHook
+        loaderHook,
+        resourceContext
       });
+    }).then(async (res) => {
+      await origin.loaderHook.lifecycle.afterLoadEntry.emit({
+        origin,
+        remoteInfo,
+        remoteEntryExports: res
+      });
+      return res;
     }).catch(async (err) => {
       const uniqueKey2 = getRemoteEntryUniqueKey(remoteInfo);
       const isScriptExecutionError = err instanceof Error && err.message.includes("ScriptExecutionError");
@@ -666,8 +722,21 @@ async function getRemoteEntry(params) {
           globalLoading,
           uniqueKey: uniqueKey2
         });
-        if (RemoteEntryExports) return RemoteEntryExports;
+        if (RemoteEntryExports) {
+          await origin.loaderHook.lifecycle.afterLoadEntry.emit({
+            origin,
+            remoteInfo,
+            remoteEntryExports: RemoteEntryExports,
+            recovered: true
+          });
+          return RemoteEntryExports;
+        }
       }
+      await origin.loaderHook.lifecycle.afterLoadEntry.emit({
+        origin,
+        remoteInfo,
+        error: err
+      });
       throw err;
     });
   }
@@ -682,22 +751,113 @@ function getRemoteInfo(remote) {
     shareScope: remote.shareScope || DEFAULT_SCOPE
   };
 }
-function preloadAssets(remoteInfo, host, assets, useLinkPreload = true) {
+function isTimeoutError(error2) {
+  if (!(error2 instanceof Error)) return false;
+  return error2.message.includes("timed out") || error2.name.includes("Timeout");
+}
+function createAssetResult(context, url, status, error2) {
+  return {
+    url,
+    status,
+    resourceType: context.resourceType,
+    initiator: context.initiator,
+    id: context.id,
+    error: error2
+  };
+}
+async function waitForRemoteEntryPreload(host, remoteInfo, entryRemoteInfo, context) {
+  const cachedRemote = host.moduleCache.get(entryRemoteInfo.name);
+  const url = entryRemoteInfo.entry;
+  if (cachedRemote == null ? void 0 : cachedRemote.remoteEntryExports) return createAssetResult(context, url, "cached");
+  try {
+    if (!await getRemoteEntry({
+      origin: host,
+      remoteInfo: entryRemoteInfo,
+      remoteEntryExports: cachedRemote == null ? void 0 : cachedRemote.remoteEntryExports,
+      resourceContext: {
+        ...context,
+        url
+      }
+    })) throw new Error(`Failed to load remoteEntry "${url}".`);
+    return createAssetResult(context, url, "success");
+  } catch (error2) {
+    return createAssetResult(context, url, isTimeoutError(error2) ? "timeout" : "error", error2);
+  }
+}
+function waitForLinkPreload({ host, remoteInfo, url, attrs, context, needDeleteLink }) {
+  return new Promise((resolve) => {
+    const { link, needAttach } = createLink({
+      url,
+      cb: () => {
+        resolve(createAssetResult(context, url, needAttach ? "success" : "cached"));
+      },
+      onErrorCallback: (error2) => {
+        resolve(createAssetResult(context, url, isTimeoutError(error2) ? "timeout" : "error", error2));
+      },
+      attrs,
+      createLinkHook: (hookUrl, hookAttrs) => {
+        const res = host.loaderHook.lifecycle.createLink.emit({
+          url: hookUrl,
+          attrs: hookAttrs,
+          remoteInfo,
+          resourceContext: {
+            ...context,
+            url: hookUrl
+          }
+        });
+        if (res instanceof HTMLLinkElement) return res;
+        return res;
+      },
+      needDeleteLink
+    });
+    needAttach && document.head.appendChild(link);
+  });
+}
+function waitForScriptPreload({ host, remoteInfo, url, attrs, context }) {
+  return new Promise((resolve) => {
+    const { script, needAttach } = createScript({
+      url,
+      cb: () => {
+        resolve(createAssetResult(context, url, needAttach ? "success" : "cached"));
+      },
+      onErrorCallback: (error2) => {
+        resolve(createAssetResult(context, url, isTimeoutError(error2) ? "timeout" : "error", error2));
+      },
+      attrs,
+      createScriptHook: (hookUrl, hookAttrs) => {
+        const res = host.loaderHook.lifecycle.createScript.emit({
+          url: hookUrl,
+          attrs: hookAttrs,
+          remoteInfo,
+          resourceContext: {
+            ...context,
+            url: hookUrl
+          }
+        });
+        if (res instanceof HTMLScriptElement) return res;
+        return res;
+      },
+      needDeleteScript: true
+    });
+    needAttach && document.head.appendChild(script);
+  });
+}
+function createResourceContext(baseContext, resourceType) {
+  return {
+    ...baseContext,
+    resourceType
+  };
+}
+function preloadAssets(remoteInfo, host, assets, useLinkPreload = true, baseContext = {
+  initiator: "preloadRemote",
+  id: remoteInfo.name
+}) {
   const { cssAssets, jsAssetsWithoutEntry, entryAssets } = assets;
+  const results = [];
   if (host.options.inBrowser) {
     entryAssets.forEach((asset) => {
-      const { moduleInfo } = asset;
-      const module = host.moduleCache.get(remoteInfo.name);
-      if (module) getRemoteEntry({
-        origin: host,
-        remoteInfo: moduleInfo,
-        remoteEntryExports: module.remoteEntryExports
-      });
-      else getRemoteEntry({
-        origin: host,
-        remoteInfo: moduleInfo,
-        remoteEntryExports: void 0
-      });
+      const { moduleInfo: entryRemoteInfo } = asset;
+      results.push(waitForRemoteEntryPreload(host, remoteInfo, entryRemoteInfo, createResourceContext(baseContext, "remoteEntry")));
     });
     if (useLinkPreload) {
       const defaultAttrs = {
@@ -705,21 +865,13 @@ function preloadAssets(remoteInfo, host, assets, useLinkPreload = true) {
         as: "style"
       };
       cssAssets.forEach((cssUrl) => {
-        const { link: cssEl, needAttach } = createLink({
+        results.push(waitForLinkPreload({
+          host,
+          remoteInfo,
           url: cssUrl,
-          cb: () => {
-          },
           attrs: defaultAttrs,
-          createLinkHook: (url, attrs) => {
-            const res = host.loaderHook.lifecycle.createLink.emit({
-              url,
-              attrs,
-              remoteInfo
-            });
-            if (res instanceof HTMLLinkElement) return res;
-          }
-        });
-        needAttach && document.head.appendChild(cssEl);
+          context: createResourceContext(baseContext, "css")
+        }));
       });
     } else {
       const defaultAttrs = {
@@ -727,22 +879,14 @@ function preloadAssets(remoteInfo, host, assets, useLinkPreload = true) {
         type: "text/css"
       };
       cssAssets.forEach((cssUrl) => {
-        const { link: cssEl, needAttach } = createLink({
+        results.push(waitForLinkPreload({
+          host,
+          remoteInfo,
           url: cssUrl,
-          cb: () => {
-          },
           attrs: defaultAttrs,
-          createLinkHook: (url, attrs) => {
-            const res = host.loaderHook.lifecycle.createLink.emit({
-              url,
-              attrs,
-              remoteInfo
-            });
-            if (res instanceof HTMLLinkElement) return res;
-          },
-          needDeleteLink: false
-        });
-        needAttach && document.head.appendChild(cssEl);
+          needDeleteLink: false,
+          context: createResourceContext(baseContext, "css")
+        }));
       });
     }
     if (useLinkPreload) {
@@ -751,21 +895,13 @@ function preloadAssets(remoteInfo, host, assets, useLinkPreload = true) {
         as: "script"
       };
       jsAssetsWithoutEntry.forEach((jsUrl) => {
-        const { link: linkEl, needAttach } = createLink({
+        results.push(waitForLinkPreload({
+          host,
+          remoteInfo,
           url: jsUrl,
-          cb: () => {
-          },
           attrs: defaultAttrs,
-          createLinkHook: (url, attrs) => {
-            const res = host.loaderHook.lifecycle.createLink.emit({
-              url,
-              attrs,
-              remoteInfo
-            });
-            if (res instanceof HTMLLinkElement) return res;
-          }
-        });
-        needAttach && document.head.appendChild(linkEl);
+          context: createResourceContext(baseContext, "js")
+        }));
       });
     } else {
       const defaultAttrs = {
@@ -773,25 +909,17 @@ function preloadAssets(remoteInfo, host, assets, useLinkPreload = true) {
         type: (remoteInfo == null ? void 0 : remoteInfo.type) === "module" ? "module" : "text/javascript"
       };
       jsAssetsWithoutEntry.forEach((jsUrl) => {
-        const { script: scriptEl, needAttach } = createScript({
+        results.push(waitForScriptPreload({
+          host,
+          remoteInfo,
           url: jsUrl,
-          cb: () => {
-          },
           attrs: defaultAttrs,
-          createScriptHook: (url, attrs) => {
-            const res = host.loaderHook.lifecycle.createScript.emit({
-              url,
-              attrs,
-              remoteInfo
-            });
-            if (res instanceof HTMLScriptElement) return res;
-          },
-          needDeleteScript: true
-        });
-        needAttach && document.head.appendChild(scriptEl);
+          context: createResourceContext(baseContext, "js")
+        }));
       });
     }
   }
+  return Promise.all(results);
 }
 var helpers_default = {
   utils: {

package/dist/{utils-D4k5eixv.mjs → utils-DGS4pYp8.mjs}

@@ -1987,17 +1987,17 @@ function getLoadedRemoteInfos(id, instance) {
   };
 }
 export {
-  warn as A,
-  DOWNGRADE_KEY as B,
+  setDataFetchItemLoadedStatus as A,
+  warn as B,
   CacheSize as C,
   DATA_FETCH_QUERY as D,
   ERROR_TYPE as E,
   FS_HREF as F,
-  callAllDowngrade as G,
-  callDowngrade as H,
-  getDowngradeTag as I,
-  composeKeyWithSeparator as J,
-  flushDataFetch as K,
+  DOWNGRADE_KEY as G,
+  callAllDowngrade as H,
+  callDowngrade as I,
+  getDowngradeTag as J,
+  composeKeyWithSeparator as K,
   LOAD_REMOTE_ERROR_PREFIX as L,
   MF_DATA_FETCH_STATUS as M,
   getDataFetchCache as N,
@@ -2006,25 +2006,25 @@ export {
   cache as c,
   configureCache as d,
   getDataFetchMap as e,
-  fetchData as f,
+  flushDataFetch as f,
   generateKey as g,
-  loadDataFetchModule as h,
+  fetchData as h,
   initDataFetchMap as i,
-  isDataLoaderExpose as j,
-  getDataFetchInfo as k,
+  loadDataFetchModule as j,
+  isDataLoaderExpose as k,
   logger as l,
-  getDataFetchMapKey as m,
-  getDataFetchItem as n,
-  DATA_FETCH_CLIENT_SUFFIX as o,
-  MF_DATA_FETCH_TYPE as p,
-  isCSROnly as q,
+  getDataFetchInfo as m,
+  getDataFetchMapKey as n,
+  getDataFetchItem as o,
+  DATA_FETCH_CLIENT_SUFFIX as p,
+  MF_DATA_FETCH_TYPE as q,
   revalidateTag as r,
   setSSREnv as s,
-  isServerEnv as t,
-  getDataFetchIdWithErrorMsgs as u,
-  DATA_FETCH_ERROR_PREFIX as v,
-  wrapDataFetchId as w,
-  DATA_FETCH_FUNCTION as x,
-  getLoadedRemoteInfos as y,
-  setDataFetchItemLoadedStatus as z
+  isCSROnly as t,
+  isServerEnv as u,
+  getDataFetchIdWithErrorMsgs as v,
+  DATA_FETCH_ERROR_PREFIX as w,
+  wrapDataFetchId as x,
+  DATA_FETCH_FUNCTION as y,
+  getLoadedRemoteInfos as z
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/bridge-react",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "sideEffects": false,
   "publishConfig": {
     "access": "public"
@@ -75,6 +75,11 @@
       "import": "./dist/data-fetch-utils.es.js",
       "require": "./dist/data-fetch-utils.cjs.js"
     },
+    "./data-fetch": {
+      "types": "./dist/data-fetch.d.ts",
+      "import": "./dist/data-fetch.es.js",
+      "require": "./dist/data-fetch.cjs.js"
+    },
     "./data-fetch-server-middleware": {
       "types": "./dist/data-fetch-server-middleware.d.ts",
       "import": "./dist/data-fetch-server-middleware.es.js",
@@ -125,6 +130,9 @@
       "data-fetch-utils": [
         "./dist/data-fetch-utils.d.ts"
       ],
+      "data-fetch": [
+        "./dist/data-fetch.d.ts"
+      ],
       "data-fetch-server-middleware": [
         "./dist/data-fetch-server-middleware.d.ts"
       ]
@@ -132,14 +140,13 @@
   },
   "dependencies": {
     "lru-cache": "10.4.3",
-    "@module-federation/sdk": "2.4.0"
+    "@module-federation/sdk": "2.5.0"
   },
   "peerDependencies": {
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0",
     "react-router-dom": "^4 || ^5 || ^6 || ^7",
-    "react-router": "^6 || ^7",
-    "hono": "^4.12.7"
+    "react-router": "^6 || ^7"
   },
   "peerDependenciesMeta": {
     "react-router-dom": {
@@ -147,9 +154,6 @@
     },
     "react-router": {
       "optional": true
-    },
-    "hono": {
-      "optional": true
     }
   },
   "devDependencies": {
@@ -170,9 +174,9 @@
     "vite-plugin-dts": "^4.3.0",
     "hono": "4.12.7",
     "vitest": "1.6.0",
-    "@module-federation/bridge-shared": "2.4.0",
-    "@module-federation/runtime": "2.4.0",
-    "@module-federation/runtime-core": "2.4.0"
+    "@module-federation/runtime-core": "2.5.0",
+    "@module-federation/bridge-shared": "2.5.0",
+    "@module-federation/runtime": "2.5.0"
   },
   "scripts": {
     "dev": "vite",