remote-components 0.0.50 → 0.1.0

package/dist/html/host.js

@@ -8,6 +8,51 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
+// src/shared/constants.ts
+var RC_PROTECTED_REMOTE_FETCH_PATHNAME, CORS_DOCS_URL;
+var init_constants = __esm({
+  "src/shared/constants.ts"() {
+    "use strict";
+    RC_PROTECTED_REMOTE_FETCH_PATHNAME = "/rc-fetch-protected-remote";
+    CORS_DOCS_URL = "https://vercel.com/docs/remote-components/concepts/cors-external-urls#accessing-cross-site-protected-remote-components";
+  }
+});
+
+// src/shared/client/protected-rc-fallback.ts
+function generateProtectedRcFallbackSrc(url) {
+  return `${RC_PROTECTED_REMOTE_FETCH_PATHNAME}?url=${encodeURIComponent(url)}`;
+}
+function isProxiedUrl(url) {
+  try {
+    return new URL(url, location.href).pathname === RC_PROTECTED_REMOTE_FETCH_PATHNAME;
+  } catch {
+    return false;
+  }
+}
+var init_protected_rc_fallback = __esm({
+  "src/shared/client/protected-rc-fallback.ts"() {
+    "use strict";
+    init_constants();
+  }
+});
+
+// src/shared/utils/abort.ts
+function isAbortError(error) {
+  if (error instanceof DOMException && error.name === "AbortError") {
+    return true;
+  }
+  if (error !== null && typeof error === "object" && "name" in error && error.name === "AbortError" && "message" in error && typeof error.message === "string") {
+    const e = error;
+    return typeof e.code === "number" || e.constructor?.name === "DOMException";
+  }
+  return false;
+}
+var init_abort = __esm({
+  "src/shared/utils/abort.ts"() {
+    "use strict";
+  }
+});
+
 // src/shared/error.ts
 function multipleRemoteComponentsError(url) {
   return new RemoteComponentsError(
@@ -20,10 +65,76 @@ function failedToFetchRemoteComponentError(url, { status, statusText }, help = "
     { cause: new Error(`${status} ${statusText}`) }
   );
 }
+async function errorFromFailedFetch(originalUrl, resolvedUrl, res) {
+  const isProxied = isProxiedUrl(resolvedUrl.href);
+  if (isProxied && res) {
+    const body = await res.text().catch(() => "");
+    return failedProxyFetchError(
+      originalUrl,
+      resolvedUrl.href,
+      res.status,
+      body
+    );
+  }
+  const fallback = failedToFetchRemoteComponentError(
+    originalUrl,
+    res ?? { status: 0, statusText: "No Response" }
+  );
+  if (!res)
+    return fallback;
+  try {
+    const body = await res.text();
+    const parser = new DOMParser();
+    const doc = parser.parseFromString(body, "text/html");
+    const errorTemplate = doc.querySelector(
+      "template[data-next-error-message]"
+    );
+    const errorMessage = errorTemplate?.getAttribute("data-next-error-message");
+    if (errorMessage) {
+      const error = new RemoteComponentsError(errorMessage);
+      const errorStack = errorTemplate?.getAttribute("data-next-error-stack");
+      if (errorStack) {
+        error.stack = errorStack;
+      }
+      return error;
+    }
+  } catch (parseError) {
+    if (isAbortError(parseError))
+      throw parseError;
+  }
+  return fallback;
+}
+function failedProxyFetchError(originalUrl, proxyUrl, status, responseBody) {
+  if (status === 404) {
+    return new RemoteComponentsError(
+      `Could not proxy the request to "${originalUrl}" \u2014 the proxy endpoint "${RC_PROTECTED_REMOTE_FETCH_PATHNAME}" returned 404.
+
+The host server needs middleware or a route that handles "${RC_PROTECTED_REMOTE_FETCH_PATHNAME}".
+
+Proxying requires two pieces:
+  1. resolveClientUrl={proxyClientRequestsThroughHost} on <RemoteComponent>
+  2. Middleware or a route for "${RC_PROTECTED_REMOTE_FETCH_PATHNAME}" on the host server
+
+Docs: ${CORS_DOCS_URL}`
+    );
+  }
+  if (status === 403) {
+    const detail = responseBody ? ` ${responseBody}` : "";
+    return new RemoteComponentsError(
+      `Proxied request to "${proxyUrl}" was forbidden.${detail} See: ${CORS_DOCS_URL}`
+    );
+  }
+  return new RemoteComponentsError(
+    `Proxied request for "${originalUrl}" via "${proxyUrl}" failed with status ${status}. See: ${CORS_DOCS_URL}`
+  );
+}
 var RemoteComponentsError;
 var init_error = __esm({
   "src/shared/error.ts"() {
     "use strict";
+    init_protected_rc_fallback();
+    init_constants();
+    init_abort();
     RemoteComponentsError = class extends Error {
       code = "REMOTE_COMPONENTS_ERROR";
       constructor(message, options) {
@@ -40,9 +151,6 @@ function logDebug(location2, message) {
     console.debug(`[${PREFIX}:${location2}]: ${message}`);
   }
 }
-function logInfo(location2, message) {
-  console.info(`[${PREFIX}:${location2}]: ${message}`);
-}
 function logWarn(location2, message) {
   console.warn(`[${PREFIX}:${location2}]: ${message}`);
 }
@@ -53,10 +161,24 @@ function logError(location2, message, cause) {
     })
   );
 }
+function warnCrossOriginFetchError(logLocation, url) {
+  try {
+    const parsed = typeof url === "string" ? new URL(url) : url;
+    if (typeof location === "undefined" || parsed.origin === location.origin) {
+      return;
+    }
+    logWarn(
+      logLocation,
+      `Failed to fetch cross-origin resource "${parsed.href}". If this is a protected deployment, ensure withRemoteComponentsHost middleware is configured in your host and that the remote URL is included in allowedProxyUrls. See: ${CORS_DOCS_URL}`
+    );
+  } catch {
+  }
+}
 var PREFIX, DEBUG;
 var init_logger = __esm({
   "src/shared/utils/logger.ts"() {
     "use strict";
+    init_constants();
     init_error();
     PREFIX = "remote-components";
     DEBUG = typeof window !== "undefined" && localStorage.getItem("RC_DEBUG") === "true";
@@ -248,60 +370,60 @@ var init_shared_modules = __esm({
   }
 });
 
-// src/shared/utils/abort.ts
-function isAbortError(error) {
-  if (error instanceof DOMException && error.name === "AbortError") {
-    return true;
-  }
-  if (error !== null && typeof error === "object" && "name" in error && error.name === "AbortError" && "message" in error && typeof error.message === "string") {
-    const e = error;
-    return typeof e.code === "number" || e.constructor?.name === "DOMException";
-  }
-  return false;
-}
-var init_abort = __esm({
-  "src/shared/utils/abort.ts"() {
+// src/shared/client/webpack-patterns.ts
+var NEXT_BUNDLE_PATH_RE;
+var init_webpack_patterns = __esm({
+  "src/shared/client/webpack-patterns.ts"() {
     "use strict";
+    NEXT_BUNDLE_PATH_RE = /\/_next\/\[.+\](?:%20| )/;
   }
 });
 
-// src/shared/ssr/fetch-with-protected-rc-fallback.ts
-async function fetchWithProtectedRcFallback(url, init) {
-  try {
-    const res = await fetch(url, init);
-    return res;
-  } catch (error) {
-    if (isAbortError(error)) {
-      throw error;
-    }
-    if (typeof document === "object" && typeof document.location === "object" && document.location.origin !== new URL(url).origin) {
-      logInfo(
-        "FetchRemoteComponent",
-        "Request failed due to CORS, attempting to fetch it via the withRemoteComponentsHost proxy."
-      );
-      const proxiedRes = await fetch(
-        `${RC_PROTECTED_REMOTE_FETCH_PATHNAME}?url=${url}`,
-        init?.signal ? { signal: init.signal } : void 0
-      );
-      if (proxiedRes.status === 200) {
-        return proxiedRes;
-      } else {
-        logError(
-          "FetchRemoteComponent",
-          `Could not proxy remote: [response status ${proxiedRes.status}] ${await proxiedRes.text()}`
-        );
-      }
-    }
-    throw error;
-  }
+// src/shared/client/script-loader.ts
+async function loadScripts(scripts, resolveClientUrl) {
+  await Promise.all(
+    scripts.map((script) => {
+      return new Promise((resolve, reject) => {
+        const newSrc = new URL(
+          // remove the remote component bundle name identifier from the script src
+          script.src.replace(NEXT_BUNDLE_PATH_RE, "/_next/"),
+          location.origin
+        ).href;
+        const resolvedSrc = resolveClientUrl?.(newSrc) ?? newSrc;
+        const newScript = document.createElement("script");
+        newScript.onload = () => resolve();
+        newScript.onerror = () => {
+          const isProxied = isProxiedUrl(resolvedSrc);
+          if (isProxied) {
+            reject(
+              new RemoteComponentsError(
+                `Failed to load script "${newSrc}" via proxy "${resolvedSrc}". Ensure withRemoteComponentsHost middleware is configured and "${RC_PROTECTED_REMOTE_FETCH_PATHNAME}" is in the matcher. See: ${CORS_DOCS_URL}`
+              )
+            );
+          } else {
+            warnCrossOriginFetchError("ScriptLoader", newSrc);
+            reject(
+              new RemoteComponentsError(
+                `Failed to load <script src="${newSrc}"> for Remote Component. Check the URL is correct.`
+              )
+            );
+          }
+        };
+        newScript.src = resolvedSrc;
+        newScript.async = true;
+        document.head.appendChild(newScript);
+      });
+    })
+  );
 }
-var RC_PROTECTED_REMOTE_FETCH_PATHNAME;
-var init_fetch_with_protected_rc_fallback = __esm({
-  "src/shared/ssr/fetch-with-protected-rc-fallback.ts"() {
+var init_script_loader = __esm({
+  "src/shared/client/script-loader.ts"() {
     "use strict";
-    init_abort();
+    init_constants();
+    init_error();
     init_logger();
-    RC_PROTECTED_REMOTE_FETCH_PATHNAME = "/rc-fetch-protected-remote";
+    init_protected_rc_fallback();
+    init_webpack_patterns();
   }
 });
 
@@ -331,7 +453,7 @@ var init_const = __esm({
 });
 
 // src/shared/client/turbopack-patterns.ts
-var REMOTE_SHARED_MARKER_RE, REMOTE_SHARED_ASSIGNMENT_RE, ASYNC_MODULE_LOADER_RE, ASYNC_MODULE_RESOLVE_RE, ASYNC_MODULE_ALL_RE, NUMERIC_MODULE_ID_RE, TURBOPACK_GLOBAL_RE;
+var REMOTE_SHARED_MARKER_RE, REMOTE_SHARED_ASSIGNMENT_RE, ASYNC_MODULE_LOADER_RE, ASYNC_MODULE_RESOLVE_RE, ASYNC_MODULE_ALL_RE, TURBOPACK_GLOBAL_RE;
 var init_turbopack_patterns = __esm({
   "src/shared/client/turbopack-patterns.ts"() {
     "use strict";
@@ -340,13 +462,12 @@ var init_turbopack_patterns = __esm({
     ASYNC_MODULE_LOADER_RE = /(?:__turbopack_context__|e)\.A\((?<asyncSharedModuleId>[0-9]+)\)/;
     ASYNC_MODULE_RESOLVE_RE = /(?<ctx>__turbopack_context__|e)=>\{\k<ctx>\.v\((?<inner>parentImport|e)=>Promise\.resolve\(\)\.then\(\(\)=>\k<inner>\((?<sharedModuleId>[0-9]+)\)\)\)\}/;
     ASYNC_MODULE_ALL_RE = /(?<ctx>__turbopack_context__|e)=>\{\k<ctx>\.v\((?<vCb>parentImport|t)=>Promise\.all\(\["[^"]+"\]\.map\((?<mapCb>chunk|t)=>\k<ctx>\.l\(\k<mapCb>\)\)\)\.then\(\(\)=>\k<vCb>\((?<sharedModuleId>[0-9]+)\)\)\)\}/;
-    NUMERIC_MODULE_ID_RE = /^[0-9]+$/;
     TURBOPACK_GLOBAL_RE = /(?:globalThis|self)\s*(?:\.TURBOPACK|\[\s*["']TURBOPACK["']\s*\])/;
   }
 });
 
 // src/shared/client/chunk-loader.ts
-function createChunkLoader(runtime) {
+function createChunkLoader(runtime, resolveClientUrl) {
   return function __turbopack_chunk_load__(chunkId, scriptBundle) {
     logDebug("ChunkLoader", `Loading chunk: "${chunkId}"`);
     const self = globalThis;
@@ -386,9 +507,10 @@ function createChunkLoader(runtime) {
       logDebug("ChunkLoader", `Returning cached promise for: "${url}"`);
       return self.__remote_components_turbopack_chunk_loader_promise__[url];
     }
-    logDebug("ChunkLoader", `Fetching chunk from: "${url}"`);
+    const resolvedUrl = resolveClientUrl?.(url) ?? url;
+    logDebug("ChunkLoader", `Fetching chunk from: "${resolvedUrl}"`);
     self.__remote_components_turbopack_chunk_loader_promise__[url] = new Promise((resolve, reject) => {
-      fetchWithProtectedRcFallback(url).then((res) => res.text()).then((code) => {
+      fetch(resolvedUrl).then((res) => res.text()).then((code) => {
         const hasTurbopack = TURBOPACK_GLOBAL_RE.test(code);
         if (hasTurbopack) {
           return handleTurbopackChunk(code, bundle ?? "", url);
@@ -401,7 +523,19 @@ function createChunkLoader(runtime) {
           "ChunkLoader",
           `First 500 chars of chunk: ${code.slice(0, 500)}`
         );
-      }).then(resolve).catch(reject);
+      }).then(resolve).catch((error) => {
+        const isProxied = isProxiedUrl(resolvedUrl);
+        if (isProxied) {
+          reject(
+            new RemoteComponentsError(
+              `Failed to load chunk "${url}" via proxy "${resolvedUrl}". Ensure withRemoteComponentsHost middleware is configured and "${RC_PROTECTED_REMOTE_FETCH_PATHNAME}" is in the matcher. See: ${CORS_DOCS_URL}`
+            )
+          );
+        } else {
+          warnCrossOriginFetchError("ChunkLoader", url);
+          reject(error);
+        }
+      });
     });
     return self.__remote_components_turbopack_chunk_loader_promise__[url];
   };
@@ -546,10 +680,11 @@ async function handleTurbopackChunk(code, bundle, url) {
 var init_chunk_loader = __esm({
   "src/shared/client/chunk-loader.ts"() {
     "use strict";
+    init_constants();
     init_error();
-    init_fetch_with_protected_rc_fallback();
     init_logger();
     init_const();
+    init_protected_rc_fallback();
     init_turbopack_patterns();
   }
 });
@@ -558,10 +693,14 @@ var init_chunk_loader = __esm({
 function handleTurbopackModule(bundle, moduleId, id) {
   const self = globalThis;
   const bundleKey = getBundleKey(bundle);
-  let modules = self[`TURBOPACK_${bundleKey}`];
-  if (modules && typeof modules === "object" && "__chunks__" in modules) {
-    const chunks = modules.__chunks__;
-    modules = chunks.flat();
+  const raw = self[`TURBOPACK_${bundleKey}`];
+  let modules;
+  if (raw && typeof raw === "object" && "__chunks__" in raw) {
+    modules = raw.__chunks__.flat();
+  } else if (Array.isArray(raw)) {
+    modules = raw.flat();
+  } else {
+    modules = raw;
   }
   if (!self.__remote_components_turbopack_modules__) {
     self.__remote_components_turbopack_modules__ = {};
@@ -590,13 +729,12 @@ function handleTurbopackModule(bundle, moduleId, id) {
   if (!self.__remote_components_turbopack_global__[bundle]) {
     self.__remote_components_turbopack_global__[bundle] = {};
   }
-  const allModules = Array.isArray(modules) ? modules.flat() : modules ? Object.values(modules) : [];
   moduleInit(
     createTurbopackContext(
       bundle,
       exports,
       moduleExports,
-      allModules,
+      modules,
       moduleInit,
       id,
       self
@@ -610,46 +748,27 @@ function handleTurbopackModule(bundle, moduleId, id) {
   return moduleExports.exports;
 }
 function findModuleInit(modules, moduleId) {
-  if (modules && !Array.isArray(modules) && typeof modules === "object") {
-    const normalizedId = NUMERIC_MODULE_ID_RE.test(moduleId) ? Number(moduleId) : moduleId;
-    if (normalizedId in modules) {
-      return modules[normalizedId];
-    }
-    if (typeof normalizedId === "number" && String(normalizedId) in modules) {
-      return modules[String(normalizedId)];
-    }
-    const matchingKey = Object.keys(modules).find(
-      (key) => typeof key === "string" && key.includes(String(moduleId))
+  if (!modules || typeof modules !== "object")
+    return;
+  if (!Array.isArray(modules)) {
+    const key = moduleId in modules ? moduleId : Object.keys(modules).find((k) => k.startsWith(moduleId));
+    return key !== void 0 ? modules[key] : void 0;
+  }
+  const flat = modules.flat();
+  let idx = flat.findIndex((e) => String(e) === String(moduleId));
+  if (idx < 0) {
+    idx = flat.findIndex(
+      (e) => typeof e === "string" && e.startsWith(moduleId)
     );
-    if (matchingKey) {
-      return modules[matchingKey];
-    }
-    logError("TurbopackModule", `No match found for module ID: ${moduleId}`);
-    return void 0;
   }
-  const allModules = modules?.flat() ?? [];
-  if (typeof allModules[1] === "string" || typeof allModules[1] === "number") {
-    const normalizedId = NUMERIC_MODULE_ID_RE.test(moduleId) ? Number(moduleId) : moduleId;
-    let moduleIdIndex = allModules.indexOf(normalizedId);
-    if (moduleIdIndex === -1) {
-      moduleIdIndex = allModules.findIndex(
-        (bundleEntry) => typeof bundleEntry === "string" && bundleEntry.startsWith(moduleId) || bundleEntry === normalizedId
-      );
-    }
-    if (moduleIdIndex !== -1) {
-      while (typeof allModules[moduleIdIndex] !== "function" && moduleIdIndex < allModules.length) {
-        moduleIdIndex++;
-      }
-      return allModules[moduleIdIndex];
-    }
-  } else {
-    return allModules.find(
-      (bundleEntry) => typeof bundleEntry === "object" && bundleEntry !== null && moduleId in bundleEntry
-    )?.[moduleId];
+  if (idx >= 0) {
+    return flat.slice(idx + 1).find((e) => typeof e === "function");
   }
-  return void 0;
+  return flat.find(
+    (e) => Boolean(e && typeof e === "object" && moduleId in e)
+  )?.[moduleId];
 }
-function createTurbopackContext(bundle, exports, moduleExports, allModules, moduleInit, id, self) {
+function createTurbopackContext(bundle, exports, moduleExports, modules, moduleInit, id, self) {
   return {
     // HMR not implemented for Remote Components
     k: {
@@ -770,13 +889,17 @@ function createTurbopackContext(bundle, exports, moduleExports, allModules, modu
         (parentId) => self.__webpack_require__?.(`[${bundle}] ${parentId}`)
       );
     },
+    // dynamic import tracking — no-op for remote components
+    j() {
+    },
     // chunk loader
     l(url) {
-      const moduleInitIndex = allModules.indexOf(moduleInit);
+      const flatModules = Array.isArray(modules) ? modules : [];
+      const moduleInitIndex = flatModules.indexOf(moduleInit);
       if (moduleInitIndex !== -1) {
-        const scriptIndex = allModules.slice(0, moduleInitIndex).findLastIndex((bundleEntry) => bundleEntry instanceof Element);
+        const scriptIndex = flatModules.slice(0, moduleInitIndex).findLastIndex((bundleEntry) => bundleEntry instanceof Element);
         if (scriptIndex !== -1) {
-          const script = allModules[scriptIndex];
+          const script = flatModules[scriptIndex];
           const scriptSrc = script.getAttribute("data-turbopack-src") || "";
           const nextIndex = scriptSrc.indexOf("/_next");
           const baseUrl = nextIndex !== -1 ? scriptSrc.slice(0, nextIndex) : "";
@@ -799,7 +922,6 @@ var init_turbopack_module = __esm({
     "use strict";
     init_logger();
     init_const();
-    init_turbopack_patterns();
   }
 });
 
@@ -933,7 +1055,7 @@ var init_shared_modules2 = __esm({
 });
 
 // src/shared/client/webpack-adapter.ts
-async function setupWebpackRuntime(runtime, scripts = [], url = new URL(location.href), bundle, shared = {}, remoteShared = {}) {
+async function setupWebpackRuntime(runtime, scripts = [], url = new URL(location.href), bundle, shared = {}, remoteShared = {}, resolveClientUrl) {
   const self = globalThis;
   if (!self.__remote_bundle_url__) {
     self.__remote_bundle_url__ = {};
@@ -945,7 +1067,7 @@ async function setupWebpackRuntime(runtime, scripts = [], url = new URL(location
       self.__original_webpack_chunk_load__ = self.__webpack_chunk_load__;
       self.__original_webpack_require__ = self.__webpack_require__;
     }
-    self.__webpack_chunk_load__ = createChunkLoader(runtime);
+    self.__webpack_chunk_load__ = createChunkLoader(runtime, resolveClientUrl);
     self.__webpack_require__ = createModuleRequire(runtime);
     self.__webpack_require_type__ = runtime;
     if (self.__remote_webpack_require__ && runtime === RUNTIME_TURBOPACK) {
@@ -1039,7 +1161,81 @@ var init_webpack_adapter = __esm({
 });
 
 // src/shared/client/static-loader.ts
-async function loadStaticRemoteComponent(scripts, url) {
+async function importViaCallback(absoluteSrc, resolveClientUrl) {
+  const resolvedUrl = resolveClientUrl(absoluteSrc) ?? absoluteSrc;
+  const fetchUrl = new URL(resolvedUrl, location.href).href;
+  const response = await fetch(fetchUrl);
+  if (!response.ok)
+    throw new Error(`Proxied fetch failed: ${response.status}`);
+  const content = (await response.text()).replace(/import\.meta\.url/g, JSON.stringify(absoluteSrc)).replace(
+    /\b(from|import)\s*(["'])(\.\.?\/[^"']+)\2/g,
+    (_, keyword, quote, relativePath) => {
+      const absoluteImportUrl = new URL(relativePath, absoluteSrc).href;
+      const resolvedImportUrl = new URL(
+        resolveClientUrl(absoluteImportUrl) ?? absoluteImportUrl,
+        location.href
+      ).href;
+      return `${keyword} ${quote}${resolvedImportUrl}${quote}`;
+    }
+  );
+  const moduleBlobUrl = URL.createObjectURL(
+    new Blob([content], { type: "text/javascript" })
+  );
+  const wrapperContent = [
+    `import*as m from${JSON.stringify(moduleBlobUrl)};`,
+    `globalThis.__rc_module_registry__=globalThis.__rc_module_registry__||{};`,
+    `globalThis.__rc_module_registry__[${JSON.stringify(absoluteSrc)}]=m;`
+  ].join("");
+  const wrapperBlobUrl = URL.createObjectURL(
+    new Blob([wrapperContent], { type: "text/javascript" })
+  );
+  const scriptEl = document.createElement("script");
+  scriptEl.type = "module";
+  scriptEl.src = wrapperBlobUrl;
+  try {
+    await new Promise((resolve, reject) => {
+      scriptEl.onload = () => resolve();
+      scriptEl.onerror = () => reject(new Error(`Failed to load module for ${absoluteSrc}`));
+      document.head.appendChild(scriptEl);
+    });
+  } finally {
+    scriptEl.remove();
+    URL.revokeObjectURL(moduleBlobUrl);
+    URL.revokeObjectURL(wrapperBlobUrl);
+  }
+  const registry = globalThis.__rc_module_registry__;
+  const mod = registry?.[absoluteSrc] ?? {};
+  if (registry)
+    delete registry[absoluteSrc];
+  return mod;
+}
+async function importDirectly(absoluteSrc) {
+  try {
+    return await import(
+      /* @vite-ignore */
+      /* webpackIgnore: true */
+      absoluteSrc
+    );
+  } catch (importError) {
+    if (!absoluteSrc.startsWith("blob:")) {
+      warnCrossOriginFetchError("StaticLoader", absoluteSrc);
+    }
+    throw importError;
+  }
+}
+function resolveScriptSrc(script, url) {
+  const rawSrc = typeof script.getAttribute === "function" ? script.getAttribute("src") ?? script.src : script.src;
+  if (!rawSrc && script.textContent) {
+    return URL.createObjectURL(
+      new Blob(
+        [script.textContent.replace(/import\.meta\.url/g, JSON.stringify(url))],
+        { type: "text/javascript" }
+      )
+    );
+  }
+  return rawSrc;
+}
+async function loadStaticRemoteComponent(scripts, url, resolveClientUrl) {
   const self = globalThis;
   if (self.__remote_script_entrypoint_mount__?.[url.href]) {
     self.__remote_script_entrypoint_mount__[url.href] = /* @__PURE__ */ new Set();
@@ -1050,26 +1246,9 @@ async function loadStaticRemoteComponent(scripts, url) {
   const mountUnmountSets = await Promise.all(
     scripts.map(async (script) => {
       try {
-        let src = typeof script.getAttribute === "function" ? script.getAttribute("src") ?? script.src : script.src;
-        if (!src && script.textContent) {
-          const blob = new Blob(
-            [
-              script.textContent.replace(
-                /import\.meta\.url/g,
-                JSON.stringify(url)
-              )
-            ],
-            {
-              type: "text/javascript"
-            }
-          );
-          src = URL.createObjectURL(blob);
-        }
-        const mod = await import(
-          /* @vite-ignore */
-          /* webpackIgnore: true */
-          new URL(src, url).href
-        );
+        const src = resolveScriptSrc(script, url);
+        const absoluteSrc = new URL(src, url).href;
+        const mod = resolveClientUrl ? await importViaCallback(absoluteSrc, resolveClientUrl) : await importDirectly(absoluteSrc);
         if (src.startsWith("blob:")) {
           URL.revokeObjectURL(src);
         }
@@ -1345,7 +1524,7 @@ var webpack_exports = {};
 __export(webpack_exports, {
   webpackRuntime: () => webpackRuntime
 });
-async function webpackRuntime(bundle, shared, remoteShared) {
+async function webpackRuntime(bundle, shared, remoteShared, resolveClientUrl) {
   const self = globalThis;
   if (!self.__DISABLE_WEBPACK_EXEC__) {
     self.__DISABLE_WEBPACK_EXEC__ = {};
@@ -1377,35 +1556,18 @@ async function webpackRuntime(bundle, shared, remoteShared) {
     default: { createFromReadableStream }
   } = await import("react-server-dom-webpack/client.browser");
   async function preloadScripts(scripts, url, remoteBundle, _) {
-    await Promise.all(
-      scripts.map((script) => {
-        return new Promise((resolve2, reject) => {
-          const newScript = document.createElement("script");
-          newScript.onload = () => {
-            resolve2();
-            newScript.remove();
-          };
-          newScript.onerror = () => {
-            reject(
-              new RemoteComponentsError(
-                `Failed to load <script src="${script.src}"> for Remote Component. Check the URL is correct.`
-              )
-            );
-            newScript.remove();
-          };
-          const scriptSrc = script.getAttribute("src") || script.getAttribute("data-src");
-          if (scriptSrc) {
-            newScript.src = new URL(
-              scriptSrc.replace(/\/_next\/\[(?:.+)\](?:%20| )/, "/_next/"),
-              url
-            ).href;
-          }
-          newScript.async = true;
-          document.body.appendChild(newScript);
-          script.parentElement?.removeChild(script);
-        });
-      })
-    );
+    const scriptSrcs = scripts.flatMap((script) => {
+      const scriptSrc = script.getAttribute("src") || script.getAttribute("data-src");
+      script.parentElement?.removeChild(script);
+      if (!scriptSrc)
+        return [];
+      return [
+        {
+          src: new URL(scriptSrc.replace(NEXT_BUNDLE_PATH_RE, "/_next/"), url).href
+        }
+      ];
+    });
+    await loadScripts(scriptSrcs, resolveClientUrl);
     const hostShared = {
       ...sharedPolyfills(shared),
       ...self.__remote_component_host_shared_modules__,
@@ -1449,6 +1611,8 @@ var init_webpack = __esm({
   "src/html/host/runtime/webpack.ts"() {
     "use strict";
     init_polyfill();
+    init_script_loader();
+    init_webpack_patterns();
     init_error();
     init_next_client_pages_loader();
     init_shared_modules();
@@ -1460,7 +1624,7 @@ var turbopack_exports = {};
 __export(turbopack_exports, {
   turbopackRuntime: () => turbopackRuntime
 });
-async function turbopackRuntime(url, bundle, shared, remoteShared) {
+async function turbopackRuntime(url, bundle, shared, remoteShared, resolveClientUrl) {
   const self = globalThis;
   const hostShared = {
     ...sharedPolyfills(shared),
@@ -1474,7 +1638,8 @@ async function turbopackRuntime(url, bundle, shared, remoteShared) {
     url,
     bundle,
     hostShared,
-    remoteShared
+    remoteShared,
+    resolveClientUrl
   );
   const {
     default: { createFromReadableStream }
@@ -1488,7 +1653,8 @@ async function turbopackRuntime(url, bundle, shared, remoteShared) {
       url,
       bundle,
       hostShared,
-      remoteShared
+      remoteShared,
+      resolveClientUrl
     );
   }
   return {
@@ -1514,7 +1680,7 @@ var script_exports = {};
 __export(script_exports, {
   scriptRuntime: () => scriptRuntime
 });
-function scriptRuntime() {
+function scriptRuntime(resolveClientUrl) {
   const self = globalThis;
   return {
     self,
@@ -1524,7 +1690,7 @@ function scriptRuntime() {
       Component: null,
       App: null
     }),
-    preloadScripts: loadStaticRemoteComponent
+    preloadScripts: (scripts, url) => loadStaticRemoteComponent(scripts, url, resolveClientUrl)
   };
 }
 var init_script = __esm({
@@ -1550,7 +1716,7 @@ var tagNames = [
   "script",
   "link"
 ];
-function applyOriginToNodes(doc, url) {
+function applyOriginToNodes(doc, url, resolveClientUrl) {
   if (url.origin !== location.origin) {
     const nodes = doc.querySelectorAll(
       tagNames.map(
@@ -1559,12 +1725,15 @@ function applyOriginToNodes(doc, url) {
     );
     nodes.forEach((node) => {
       if (node.hasAttribute("src") && /^[./]+\/?/.test(node.getAttribute("src") ?? "")) {
-        node.src = new URL(node.getAttribute("src") ?? "/", url).href;
+        const absoluteSrc = new URL(node.getAttribute("src") ?? "/", url).href;
+        const isScript = node.tagName.toLowerCase() === "script";
+        node.src = isScript ? absoluteSrc : resolveClientUrl?.(absoluteSrc) ?? absoluteSrc;
       }
       if (node.hasAttribute("href") && /^[./]+\/?/.test(node.getAttribute("href") ?? "")) {
+        const absoluteHref = new URL(node.getAttribute("href") ?? "/", url).href;
         node.setAttribute(
           "href",
-          new URL(node.getAttribute("href") ?? "/", url).href
+          resolveClientUrl?.(absoluteHref) ?? absoluteHref
         );
       }
       if (node.hasAttribute("srcset")) {
@@ -1573,7 +1742,8 @@ function applyOriginToNodes(doc, url) {
           if (!urlPart)
             return entry;
           const absoluteUrl = new URL(urlPart, url).href;
-          return descriptor ? `${absoluteUrl} ${descriptor}` : absoluteUrl;
+          const resolvedUrl = resolveClientUrl?.(absoluteUrl) ?? absoluteUrl;
+          return descriptor ? `${resolvedUrl} ${descriptor}` : resolvedUrl;
         }).join(", ");
         if (srcSet) {
           node.setAttribute("srcset", srcSet);
@@ -1585,7 +1755,8 @@ function applyOriginToNodes(doc, url) {
           if (!urlPart)
             return entry;
           const absoluteUrl = new URL(urlPart, url).href;
-          return descriptor ? `${absoluteUrl} ${descriptor}` : absoluteUrl;
+          const resolvedUrl = resolveClientUrl?.(absoluteUrl) ?? absoluteUrl;
+          return descriptor ? `${resolvedUrl} ${descriptor}` : resolvedUrl;
         }).join(", ");
         if (srcSet) {
           node.setAttribute("imagesrcset", srcSet);
@@ -1595,6 +1766,34 @@ function applyOriginToNodes(doc, url) {
   }
 }
 
+// src/shared/client/proxy-through-host.ts
+init_protected_rc_fallback();
+function withRemoteSrc(resolveClientUrl, remoteSrc) {
+  return (url) => resolveClientUrl(remoteSrc, url);
+}
+var proxyClientRequestsThroughHost = (remoteSrc, url) => {
+  if (typeof location === "undefined") {
+    return void 0;
+  }
+  const remoteOrigin = new URL(remoteSrc, location.href).origin;
+  if (remoteOrigin === location.origin) {
+    return void 0;
+  }
+  try {
+    const parsed = new URL(url, location.href);
+    if (parsed.origin === remoteOrigin) {
+      return generateProtectedRcFallbackSrc(url);
+    }
+  } catch {
+  }
+  return void 0;
+};
+
+// src/shared/client/default-resolve-client-url.ts
+function bindResolveClientUrl(prop, remoteSrc) {
+  return prop ? withRemoteSrc(prop, remoteSrc) : void 0;
+}
+
 // src/shared/client/remote-component.ts
 init_error();
 
@@ -1675,20 +1874,22 @@ function createRSCStream(rscName, data) {
   });
 }
 
-// src/shared/client/script-loader.ts
-init_error();
-
 // src/shared/client/component-loader.ts
+init_script_loader();
 init_webpack_adapter();
 
 // src/shared/client/remote-component.ts
 init_const();
+init_script_loader();
 init_static_loader();
 init_webpack_adapter();
 
 // src/html/host/index.tsx
 init_error();
 
+// src/shared/ssr/fetch-with-hooks.ts
+init_logger();
+
 // src/shared/ssr/fetch-headers.ts
 function remoteFetchHeaders() {
   return {
@@ -1706,7 +1907,6 @@ function remoteFetchHeaders() {
 }
 
 // src/shared/ssr/fetch-with-hooks.ts
-init_fetch_with_protected_rc_fallback();
 async function fetchWithHooks(url, additionalInit, options = {}) {
   const {
     onRequest,
@@ -1726,7 +1926,12 @@ async function fetchWithHooks(url, additionalInit, options = {}) {
   };
   let res = await onRequest?.(url, init, hookOptions);
   if (!res) {
-    res = await fetchWithProtectedRcFallback(url, init);
+    try {
+      res = await fetch(url, init);
+    } catch (error) {
+      warnCrossOriginFetchError("FetchRemoteComponent", url);
+      throw error;
+    }
   }
   const transformedRes = await onResponse?.(url, res, hookOptions);
   if (transformedRes) {
@@ -1749,7 +1954,8 @@ async function attachStyles({
   signal,
   baseUrl,
   remoteComponentSrc,
-  root
+  root,
+  resolveClientUrl
 }) {
   const appendedLinks = [];
   let abortReject = null;
@@ -1784,9 +1990,13 @@ async function attachStyles({
         });
         for (const attr of link.attributes) {
           if (attr.name === "href") {
+            const absoluteHref = new URL(
+              attr.value,
+              baseUrl ?? location.origin
+            ).href;
             newLink.setAttribute(
               attr.name,
-              new URL(attr.value, baseUrl ?? location.origin).href
+              resolveClientUrl?.(absoluteHref) ?? absoluteHref
             );
           } else {
             newLink.setAttribute(attr.name, attr.value);
@@ -1820,7 +2030,7 @@ async function attachStyles({
 
 // src/html/host/runtime/index.ts
 init_error();
-async function getRuntime(type, url, bundle, shared, remoteShared) {
+async function getRuntime(type, url, bundle, shared, remoteShared, resolveClientUrl) {
   if (typeof globalThis.process === "undefined") {
     globalThis.process = {
       env: {}
@@ -1828,13 +2038,24 @@ async function getRuntime(type, url, bundle, shared, remoteShared) {
   }
   if (type === "webpack") {
     const { webpackRuntime: webpackRuntime2 } = await Promise.resolve().then(() => (init_webpack(), webpack_exports));
-    return webpackRuntime2(bundle ?? "default", shared, remoteShared);
+    return webpackRuntime2(
+      bundle ?? "default",
+      shared,
+      remoteShared,
+      resolveClientUrl
+    );
   } else if (type === "turbopack") {
     const { turbopackRuntime: turbopackRuntime2 } = await Promise.resolve().then(() => (init_turbopack(), turbopack_exports));
-    return turbopackRuntime2(url, bundle, shared, remoteShared);
+    return turbopackRuntime2(
+      url,
+      bundle,
+      shared,
+      remoteShared,
+      resolveClientUrl
+    );
   } else if (type === "script") {
     const { scriptRuntime: scriptRuntime2 } = await Promise.resolve().then(() => (init_script(), script_exports));
-    return scriptRuntime2();
+    return scriptRuntime2(resolveClientUrl);
   }
   throw new RemoteComponentsError(
     `Remote Components runtime "${type}" is not supported. Supported runtimes are "webpack", "turbopack", and "script".`
@@ -1859,6 +2080,7 @@ if (typeof HTMLElement !== "undefined") {
     reactRoot;
     onRequest;
     onResponse;
+    resolveClientUrl;
     /** Current AbortController for the loading operation - can be used to cancel loading via controller.abort() */
     abortController;
     static get observedAttributes() {
@@ -1872,7 +2094,6 @@ if (typeof HTMLElement !== "undefined") {
         if (this.getAttribute("src")) {
           this.load().catch((e) => {
             if (isAbortError(e)) {
-              this.isLoading = false;
               return;
             }
             logError("HtmlHost", "Error loading remote component.", e);
@@ -1898,7 +2119,6 @@ if (typeof HTMLElement !== "undefined") {
         this.root = newRoot;
         this.load().catch((e) => {
           if (isAbortError(e)) {
-            this.isLoading = false;
             return;
           }
           logError("HtmlHost", "Error reloading remote component.", e);
@@ -1921,7 +2141,14 @@ if (typeof HTMLElement !== "undefined") {
         });
       });
       if (this.isLoading) {
-        return;
+        this.abortController?.abort();
+        this.isLoading = false;
+        if (this.root && !this.reactRoot) {
+          this.root.innerHTML = "";
+          this.fouc = null;
+          this.fallbackSlot = document.createElement("slot");
+          this.root.appendChild(this.fallbackSlot);
+        }
       }
       if (!this.root) {
         this.root = this.attachShadow({
@@ -1932,28 +2159,16 @@ if (typeof HTMLElement !== "undefined") {
       }
       this.name = this.getAttribute("name") || "__vercel_remote_component";
       this.bundle = "default";
-      if (this.hasAttribute("src") || this.querySelector("div#__REMOTE_COMPONENT__") || this.hasAttribute("data-ssr")) {
-        this.load().catch((e) => {
-          if (isAbortError(e)) {
-            this.isLoading = false;
-            return;
-          }
-          logError("HtmlHost", "Error loading remote component.", e);
-          const errorEvent = new Event("error", {
-            bubbles: true,
-            composed: true
-          });
-          Object.assign(errorEvent, {
-            error: e,
-            src: this.getAttribute("src")
-          });
-          this.dispatchEvent(errorEvent);
-        });
-      }
       this.isLoading = true;
       const src = this.getAttribute("src");
       this.abortController = new AbortController();
       const signal = this.abortController.signal;
+      const isCurrentLoad = () => !signal.aborted && this.getAttribute("src") === src;
+      const abandonLoad = () => {
+        if (this.abortController?.signal === signal && this.isLoading) {
+          this.isLoading = false;
+        }
+      };
       const beforeLoadEvent = new Event("beforeload", {
         bubbles: true,
         composed: true
@@ -1972,46 +2187,42 @@ if (typeof HTMLElement !== "undefined") {
           this.name = url.hash.slice(1);
         }
       }
+      const resolveClientUrl = url ? bindResolveClientUrl(this.resolveClientUrl, url.href) : void 0;
       if (!remoteComponentChild && url) {
         const fetchInit = {
           credentials: this.getAttribute("credentials") || "same-origin"
         };
-        const res = await fetchWithHooks(url, fetchInit, {
-          onRequest: this.onRequest,
-          onResponse: this.onResponse,
-          abortController: this.abortController
-        });
+        const resolvedUrl = new URL(
+          resolveClientUrl?.(url.href) ?? url.href,
+          window.location.href
+        );
+        let res;
+        try {
+          res = await fetchWithHooks(resolvedUrl, fetchInit, {
+            onRequest: this.onRequest,
+            onResponse: this.onResponse,
+            abortController: this.abortController
+          });
+        } catch (e) {
+          if (isAbortError(e)) {
+            return abandonLoad();
+          }
+          throw e;
+        }
         if (!res || !res.ok) {
-          let error = failedToFetchRemoteComponentError(
-            url.href,
-            res ?? new Response(null, { status: 0 })
-          );
-          try {
-            const body = res ? await res.text() : "";
-            const parser2 = new DOMParser();
-            const doc2 = parser2.parseFromString(body, "text/html");
-            const errorTemplate = doc2.querySelector(
-              "template[data-next-error-message]"
-            );
-            const errorMessage = errorTemplate?.getAttribute(
-              "data-next-error-message"
-            );
-            const errorStack = errorTemplate?.getAttribute(
-              "data-next-error-stack"
-            );
-            if (errorMessage) {
-              error = new RemoteComponentsError(errorMessage);
-              if (errorStack) {
-                error.stack = errorStack;
-              }
-            }
-          } catch (parseError) {
-            if (isAbortError(parseError))
-              throw parseError;
+          throw await errorFromFailedFetch(url.href, resolvedUrl, res);
+        }
+        try {
+          html = await res.text();
+        } catch (e) {
+          if (isAbortError(e)) {
+            return abandonLoad();
           }
-          throw error;
+          throw e;
+        }
+        if (!isCurrentLoad()) {
+          return abandonLoad();
         }
-        html = await res.text();
       }
       const parser = new DOMParser();
       const doc = parser.parseFromString(html, "text/html");
@@ -2094,6 +2305,9 @@ if (typeof HTMLElement !== "undefined") {
                 }
               })
             );
+            if (!isCurrentLoad()) {
+              return abandonLoad();
+            }
           }
         }
         this.root.innerHTML = "";
@@ -2111,7 +2325,7 @@ if (typeof HTMLElement !== "undefined") {
         });
         this.dispatchEvent(changeEvent);
       }
-      this.prevUrl = url ?? new URL(location.href);
+      this.prevUrl = url ?? new URL(window.location.href);
       this.prevIsRemoteComponent = isRemoteComponent;
       this.prevSrc = src;
       this.prevName = this.name;
@@ -2126,7 +2340,8 @@ if (typeof HTMLElement !== "undefined") {
         // Effects run after load, no abort needed
         baseUrl: url?.href,
         remoteComponentSrc,
-        root: this.root ?? null
+        root: this.root ?? null,
+        resolveClientUrl
       });
       if (!this.reactRoot) {
         await attachStyles({
@@ -2136,19 +2351,31 @@ if (typeof HTMLElement !== "undefined") {
           signal,
           baseUrl: url?.href,
           remoteComponentSrc,
-          root: this.root
+          root: this.root,
+          resolveClientUrl
         });
+        if (!isCurrentLoad()) {
+          return abandonLoad();
+        }
       }
-      applyOriginToNodes(doc, url ?? new URL(location.href));
+      applyOriginToNodes(
+        doc,
+        url ?? new URL(window.location.href),
+        resolveClientUrl
+      );
       if (!this.reactRoot) {
         Array.from(component.children).forEach((el) => {
           if (!isRemoteComponent && el.tagName.toLowerCase() === "script") {
             const newScript = document.createElement("script");
             for (const attr of el.attributes) {
               if (attr.name === "src") {
+                const absoluteSrc = new URL(
+                  attr.value,
+                  url ?? window.location.origin
+                ).href;
                 newScript.setAttribute(
                   attr.name,
-                  new URL(attr.value, url ?? location.origin).href
+                  resolveClientUrl?.(absoluteSrc) ?? absoluteSrc
                 );
               } else {
                 newScript.setAttribute(attr.name, attr.value);
@@ -2210,7 +2437,7 @@ if (typeof HTMLElement !== "undefined") {
         preloadScripts
       } = await getRuntime(
         metadataObj.runtime,
-        url ?? new URL(location.href),
+        url ?? new URL(window.location.href),
         this.bundle,
         {
           react: async () => (await import("react")).default,
@@ -2219,8 +2446,12 @@ if (typeof HTMLElement !== "undefined") {
           "react-dom": async () => (await import("react-dom")).default,
           "react-dom/client": async () => (await import("react-dom/client")).default
         },
-        remoteShared
+        remoteShared,
+        resolveClientUrl
       );
+      if (!isCurrentLoad()) {
+        return abandonLoad();
+      }
       const scripts = isRemoteComponent ? component.querySelectorAll("script") : doc.querySelectorAll(
         "script[src],script[data-src],script[data-remote-component-entrypoint]"
       );
@@ -2236,6 +2467,9 @@ if (typeof HTMLElement !== "undefined") {
         this.bundle ?? "default",
         this.name ?? "__vercel_remote_component"
       );
+      if (!isCurrentLoad()) {
+        return abandonLoad();
+      }
       if (isRemoteComponent) {
         Array.from(component.children).forEach((child) => {
           if (child.tagName === "SCRIPT") {
@@ -2296,7 +2530,9 @@ if (typeof HTMLElement !== "undefined") {
                 logError("HtmlHost", "Error attaching styles.", e);
               });
             }
-            this.isLoading = false;
+            if (isCurrentLoad()) {
+              this.isLoading = false;
+            }
             const loadEvent = new Event("load", {
               bubbles: true,
               composed: true
@@ -2349,7 +2585,9 @@ if (typeof HTMLElement !== "undefined") {
                   logError("HtmlHost", "Error attaching styles.", e);
                 });
               }
-              remoteComponent.isLoading = false;
+              if (isCurrentLoad()) {
+                remoteComponent.isLoading = false;
+              }
               const loadEvent = new Event("load", {
                 bubbles: true,
                 composed: true
@@ -2366,7 +2604,9 @@ if (typeof HTMLElement !== "undefined") {
             startTransition(() => {
               root.render(/* @__PURE__ */ jsx2(RemoteComponentFromNext, { initial: false }));
               doCleanup();
-              this.isLoading = false;
+              if (isCurrentLoad()) {
+                this.isLoading = false;
+              }
             });
             return;
           }
@@ -2410,7 +2650,9 @@ if (typeof HTMLElement !== "undefined") {
         Object.assign(loadEvent, { src: this.getAttribute("src") });
         this.dispatchEvent(loadEvent);
       }
-      this.isLoading = false;
+      if (isCurrentLoad()) {
+        this.isLoading = false;
+      }
     }
   }
   customElements.define("remote-component", RemoteComponent);
@@ -2427,6 +2669,7 @@ function registerSharedModules(modules = {}) {
   });
 }
 export {
+  proxyClientRequestsThroughHost,
   registerSharedModules
 };
 //# sourceMappingURL=host.js.map