remote-components 0.1.0 → 0.2.0

package/dist/{react/index.cjs → host/react.cjs}

@@ -27,87 +27,20 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/react/index.tsx
+// src/host/react/index.tsx
 var react_exports = {};
 __export(react_exports, {
-  RemoteComponent: () => RemoteComponent,
-  RemoteComponentsProvider: () => import_context2.RemoteComponentsProvider,
-  proxyClientRequestsThroughHost: () => proxyClientRequestsThroughHost
+  ConsumeRemoteComponent: () => ConsumeRemoteComponent
 });
 module.exports = __toCommonJS(react_exports);
 var import_react3 = require("react");
 var import_react_dom = require("react-dom");
 
-// src/shared/client/apply-origin.ts
-var tagNames = [
-  "img",
-  "source",
-  "video",
-  "audio",
-  "track",
-  "iframe",
-  "embed",
-  "script",
-  "link"
-];
-function applyOriginToNodes(doc, url, resolveClientUrl) {
-  if (url.origin !== location.origin) {
-    const nodes = doc.querySelectorAll(
-      tagNames.map(
-        (type) => `${type}[src],${type}[srcset],${type}[href],${type}[imagesrcset]`
-      ).join(",")
-    );
-    nodes.forEach((node) => {
-      if (node.hasAttribute("src") && /^[./]+\/?/.test(node.getAttribute("src") ?? "")) {
-        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",
-          resolveClientUrl?.(absoluteHref) ?? absoluteHref
-        );
-      }
-      if (node.hasAttribute("srcset")) {
-        const srcSet = node.getAttribute("srcset")?.split(",").map((entry) => {
-          const [urlPart, descriptor] = entry.trim().split(/\s+/);
-          if (!urlPart)
-            return entry;
-          const absoluteUrl = new URL(urlPart, url).href;
-          const resolvedUrl = resolveClientUrl?.(absoluteUrl) ?? absoluteUrl;
-          return descriptor ? `${resolvedUrl} ${descriptor}` : resolvedUrl;
-        }).join(", ");
-        if (srcSet) {
-          node.setAttribute("srcset", srcSet);
-        }
-      }
-      if (node.hasAttribute("imagesrcset")) {
-        const srcSet = node.getAttribute("imagesrcset")?.split(",").map((entry) => {
-          const [urlPart, descriptor] = entry.trim().split(/\s+/);
-          if (!urlPart)
-            return entry;
-          const absoluteUrl = new URL(urlPart, url).href;
-          const resolvedUrl = resolveClientUrl?.(absoluteUrl) ?? absoluteUrl;
-          return descriptor ? `${resolvedUrl} ${descriptor}` : resolvedUrl;
-        }).join(", ");
-        if (srcSet) {
-          node.setAttribute("imagesrcset", srcSet);
-        }
-      }
-    });
-  }
-}
-
-// src/shared/constants.ts
+// src/utils/constants.ts
 var RC_PROTECTED_REMOTE_FETCH_PATHNAME = "/rc-fetch-protected-remote";
 var 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)}`;
-}
+// src/runtime/url/protected-rc-fallback.ts
 function isProxiedUrl(url) {
   try {
     return new URL(url, location.href).pathname === RC_PROTECTED_REMOTE_FETCH_PATHNAME;
@@ -116,7 +49,7 @@ function isProxiedUrl(url) {
   }
 }
 
-// src/shared/utils/abort.ts
+// src/utils/abort.ts
 function isAbortError(error) {
   if (error instanceof DOMException && error.name === "AbortError") {
     return true;
@@ -128,7 +61,7 @@ function isAbortError(error) {
   return false;
 }
 
-// src/shared/error.ts
+// src/utils/error.ts
 var RemoteComponentsError = class extends Error {
   code = "REMOTE_COMPONENTS_ERROR";
   constructor(message, options) {
@@ -194,7 +127,7 @@ function failedProxyFetchError(originalUrl, proxyUrl, status, responseBody) {
 The host server needs middleware or a route that handles "${RC_PROTECTED_REMOTE_FETCH_PATHNAME}".
 
 Proxying requires two pieces:
-  1. resolveClientUrl={proxyClientRequestsThroughHost} on <RemoteComponent>
+  1. resolveClientUrl={routeThroughHostProxy} on <RemoteComponent>
   2. Middleware or a route for "${RC_PROTECTED_REMOTE_FETCH_PATHNAME}" on the host server
 
 Docs: ${CORS_DOCS_URL}`
@@ -211,7 +144,7 @@ Docs: ${CORS_DOCS_URL}`
   );
 }
 
-// src/shared/utils/logger.ts
+// src/utils/logger.ts
 var PREFIX = "remote-components";
 var DEBUG = typeof window !== "undefined" && localStorage.getItem("RC_DEBUG") === "true";
 function logDebug(location2, message) {
@@ -237,13 +170,68 @@ function warnCrossOriginFetchError(logLocation, url) {
     }
     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}`
+      `Failed to fetch cross-origin resource "${parsed.href}". If this is a protected deployment, ensure withRemoteComponentsHostProxy middleware is configured in your host and that the remote URL is included in allowedProxyUrls. See: ${CORS_DOCS_URL}`
     );
   } catch {
   }
 }
 
-// src/shared/client/polyfill.tsx
+// src/host/server/fetch-headers.ts
+function remoteFetchHeaders() {
+  return {
+    /**
+     * Authenticates deployment protection for the remote. Needed for SSR and SSG clients.
+     * If the remote component uses vercel deployment protection, ensure the host and remote vercel
+     * projects share a common automation bypass secret, and the shared secret is used as the
+     * VERCEL_AUTOMATION_BYPASS_SECRET env var in the host project.
+     */
+    ...typeof process === "object" && typeof process.env === "object" && typeof process.env.VERCEL_AUTOMATION_BYPASS_SECRET === "string" ? {
+      "x-vercel-protection-bypass": process.env.VERCEL_AUTOMATION_BYPASS_SECRET
+    } : {},
+    Accept: "text/html"
+  };
+}
+
+// src/host/server/fetch-with-hooks.ts
+async function fetchWithWarning(url, init) {
+  try {
+    return await fetch(url, init);
+  } catch (error) {
+    warnCrossOriginFetchError("FetchRemoteComponent", url);
+    throw error;
+  }
+}
+async function fetchWithHooks(url, additionalInit, options = {}) {
+  const {
+    onRequest,
+    onResponse,
+    abortController = new AbortController()
+  } = options;
+  const signal = abortController.signal;
+  const hookOptions = {
+    signal,
+    abort: (reason) => abortController.abort(reason)
+  };
+  const init = {
+    method: "GET",
+    headers: remoteFetchHeaders(),
+    signal,
+    ...additionalInit
+  };
+  const res = await onRequest?.(url, init, hookOptions) ?? await fetchWithWarning(url, init);
+  return await onResponse?.(url, res, hookOptions) ?? res;
+}
+
+// src/host/server/get-client-or-server-url.ts
+function getClientOrServerUrl(src, serverFallback) {
+  const fallback = typeof location !== "undefined" ? location.href : serverFallback;
+  if (!src) {
+    return new URL(fallback);
+  }
+  return typeof src === "string" ? new URL(src, fallback) : src;
+}
+
+// src/host/shared/polyfill.tsx
 var import_jsx_runtime = (
   // eslint-disable-next-line @next/next/no-img-element, jsx-a11y/alt-text
   require("react/jsx-runtime")
@@ -266,7 +254,7 @@ function applyBundleUrlToImagePropsSrc(bundle, src) {
   const propSrc = src;
   return applyBundleUrlToSrc(bundle, propSrc.src);
 }
-var imageImpl = (bundle) => function RemoteImage({
+var imageImpl = (bundle, resolveClientUrl) => function RemoteImage({
   fill: _fill,
   loader: _loader,
   quality: _quality,
@@ -283,18 +271,19 @@ var imageImpl = (bundle) => function RemoteImage({
     bundle,
     typeof src === "string" ? src : src.src
   );
+  const proxiedSrc = resolveClientUrl?.(newSrc) ?? newSrc;
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
     "img",
     {
       decoding: "async",
       style: { color: "transparent" },
       ...props,
-      src: newSrc,
+      src: proxiedSrc,
       suppressHydrationWarning: true
     }
   );
 };
-function sharedPolyfills(shared) {
+function sharedPolyfills(shared, resolveClientUrl) {
   const self = globalThis;
   const polyfill = {
     "next/dist/client/components/navigation": self.__remote_component_host_shared_modules__?.["next/navigation"] ?? shared?.["next/navigation"] ?? (() => Promise.resolve({
@@ -385,11 +374,11 @@ function sharedPolyfills(shared) {
       __esModule: true
     })),
     "next/dist/client/image-component": self.__remote_component_host_shared_modules__?.["next/image"] ?? shared?.["next/image"] ?? ((bundle) => Promise.resolve({
-      Image: imageImpl(bundle),
+      Image: imageImpl(bundle, resolveClientUrl),
       __esModule: true
     })),
     "next/image": self.__remote_component_host_shared_modules__?.["next/image"] ?? shared?.["next/image"] ?? ((bundle) => Promise.resolve({
-      default: imageImpl(bundle),
+      default: imageImpl(bundle, resolveClientUrl),
       getImageProps: (_imgProps) => {
         throw new Error(
           "Next.js getImageProps() is not implemented in remote components"
@@ -439,14 +428,319 @@ function sharedPolyfills(shared) {
   return polyfill;
 }
 
-// src/shared/client/component-loader.ts
+// src/host/shared/state.ts
+function createHostState() {
+  return {
+    stage: "idle",
+    prevSrc: void 0,
+    prevUrl: void 0,
+    prevName: void 0,
+    prevIsRemoteComponent: false,
+    abortController: void 0
+  };
+}
+
+// src/host/utils/resolve-name-from-src.ts
+function resolveNameFromSrc(src, defaultName) {
+  if (!src) {
+    return defaultName;
+  }
+  const hash = typeof src === "string" ? src : src.hash;
+  const hashIndex = hash.indexOf("#");
+  if (hashIndex < 0) {
+    return defaultName;
+  }
+  const name = hash.slice(hashIndex + 1);
+  return name || defaultName;
+}
+
+// src/utils/index.ts
+function escapeString(str) {
+  return str.replace(/[^a-z0-9]/g, "_");
+}
+var attrToProp = {
+  fetchpriority: "fetchPriority",
+  crossorigin: "crossOrigin",
+  imagesrcset: "imageSrcSet",
+  imagesizes: "imageSizes",
+  srcset: "srcSet"
+};
+
+// src/runtime/constants.ts
+var DEFAULT_ROUTE = "/";
+var RUNTIME_WEBPACK = "webpack";
+var RUNTIME_TURBOPACK = "turbopack";
+var RUNTIME_SCRIPT = "script";
+var REMOTE_COMPONENT_REGEX = /(?<prefix>.*?)\[(?<bundle>[^\]]+)\](?:%20| )(?<id>.+)/;
+var NEXT_BUNDLE_PATH_RE = /\/_next\/\[.+\](?:%20| )/;
+function getBundleKey(bundle) {
+  return escapeString(bundle);
+}
+
+// src/runtime/html/apply-origin.ts
+var tagNames = [
+  "img",
+  "source",
+  "video",
+  "audio",
+  "track",
+  "iframe",
+  "embed",
+  "script",
+  "link"
+];
+function applyOriginToNodes(doc, url, resolveClientUrl) {
+  if (url.origin !== location.origin) {
+    const nodes = doc.querySelectorAll(
+      tagNames.map(
+        (type) => `${type}[src],${type}[srcset],${type}[href],${type}[imagesrcset]`
+      ).join(",")
+    );
+    nodes.forEach((node) => {
+      if (node.hasAttribute("src") && /^[./]+\/?/.test(node.getAttribute("src") ?? "")) {
+        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",
+          resolveClientUrl?.(absoluteHref) ?? absoluteHref
+        );
+      }
+      if (node.hasAttribute("srcset")) {
+        const srcSet = node.getAttribute("srcset")?.split(",").map((entry) => {
+          const [urlPart, descriptor] = entry.trim().split(/\s+/);
+          if (!urlPart)
+            return entry;
+          const absoluteUrl = new URL(urlPart, url).href;
+          const resolvedUrl = resolveClientUrl?.(absoluteUrl) ?? absoluteUrl;
+          return descriptor ? `${resolvedUrl} ${descriptor}` : resolvedUrl;
+        }).join(", ");
+        if (srcSet) {
+          node.setAttribute("srcset", srcSet);
+        }
+      }
+      if (node.hasAttribute("imagesrcset")) {
+        const srcSet = node.getAttribute("imagesrcset")?.split(",").map((entry) => {
+          const [urlPart, descriptor] = entry.trim().split(/\s+/);
+          if (!urlPart)
+            return entry;
+          const absoluteUrl = new URL(urlPart, url).href;
+          const resolvedUrl = resolveClientUrl?.(absoluteUrl) ?? absoluteUrl;
+          return descriptor ? `${resolvedUrl} ${descriptor}` : resolvedUrl;
+        }).join(", ");
+        if (srcSet) {
+          node.setAttribute("imagesrcset", srcSet);
+        }
+      }
+    });
+  }
+}
+
+// src/runtime/html/parse-remote-html.ts
+function validateSingleComponent(doc, name, url) {
+  if (doc.querySelectorAll("div[data-bundle][data-route]").length > 1 && !doc.querySelector(`div[data-bundle][data-route][id^="${name}"]`) || doc.querySelectorAll("remote-component:not([src])").length > 1 && !doc.querySelector(`remote-component[name="${name}"]`)) {
+    throw multipleRemoteComponentsError(url);
+  }
+}
+function findComponentElement(doc, name) {
+  return doc.querySelector(`div[data-bundle][data-route][id^="${name}"]`) ?? doc.querySelector("div[data-bundle][data-route]") ?? doc.querySelector("div#__next") ?? doc.querySelector(`remote-component[name="${name}"]:not([src])`) ?? doc.querySelector("remote-component:not([src])");
+}
+function parseNextData(doc) {
+  return JSON.parse(
+    (doc.querySelector("#__NEXT_DATA__") ?? doc.querySelector("#__REMOTE_NEXT_DATA__"))?.textContent ?? "null"
+  );
+}
+function resolveComponentName(component, nextData, fallbackName) {
+  const isRemoteComponent = component?.tagName.toLowerCase() === "remote-component";
+  const name = component?.getAttribute("id")?.replace(/_ssr$/, "") || isRemoteComponent && component?.getAttribute("name") || (nextData ? "__next" : fallbackName);
+  return { name, isRemoteComponent };
+}
+function extractComponentMetadata(component, nextData, name, url) {
+  return {
+    name,
+    bundle: component?.getAttribute("data-bundle") || nextData?.props.__REMOTE_COMPONENT__?.bundle || "default",
+    route: component?.getAttribute("data-route") ?? nextData?.page ?? (url.pathname || DEFAULT_ROUTE),
+    runtime: component?.getAttribute("data-runtime") ?? (nextData?.props.__REMOTE_COMPONENT__?.runtime || RUNTIME_SCRIPT)
+  };
+}
+function extractRemoteShared(doc, name, nextData) {
+  const remoteSharedEl = doc.querySelector(
+    `#${name}_shared[data-remote-components-shared]`
+  );
+  const remoteShared = nextData?.props.__REMOTE_COMPONENT__?.shared ?? (JSON.parse(remoteSharedEl?.textContent ?? "{}") ?? {});
+  remoteSharedEl?.remove();
+  return remoteShared;
+}
+function validateComponentFound(component, rsc, nextData, isRemoteComponent, url, name) {
+  if (!component || !(rsc || nextData || isRemoteComponent)) {
+    throw new RemoteComponentsError(
+      `Remote Component not found on ${url}.${name !== "__vercel_remote_component" ? ` The name for the <RemoteComponent> is "${name}". Check <RemoteComponent> usage.` : ""} Did you forget to wrap the content in <RemoteComponent>?`
+    );
+  }
+}
+function extractLinks(doc, component) {
+  return Array.from(doc.querySelectorAll("link[href]")).filter(
+    (link) => !component.contains(link)
+  );
+}
+function extractScripts(doc, component, isRemoteComponent) {
+  return Array.from(
+    (isRemoteComponent ? component : doc).querySelectorAll(
+      "script[src],script[data-src]"
+    )
+  );
+}
+function parseRemoteComponentDocument(doc, name, url) {
+  validateSingleComponent(doc, name, url.href);
+  const component = findComponentElement(doc, name);
+  const nextData = parseNextData(doc);
+  const { name: resolvedName, isRemoteComponent } = resolveComponentName(
+    component,
+    nextData,
+    name
+  );
+  const rsc = doc.querySelector(`#${resolvedName}_rsc`);
+  const metadata = extractComponentMetadata(
+    component,
+    nextData,
+    resolvedName,
+    url
+  );
+  const remoteShared = extractRemoteShared(doc, resolvedName, nextData);
+  validateComponentFound(
+    component,
+    rsc,
+    nextData,
+    isRemoteComponent,
+    url.href,
+    resolvedName
+  );
+  const links = extractLinks(doc, component);
+  const scripts = extractScripts(doc, component, isRemoteComponent);
+  return {
+    component,
+    name: resolvedName,
+    isRemoteComponent,
+    metadata,
+    nextData,
+    rsc,
+    remoteShared,
+    links,
+    scripts
+  };
+}
+
+// src/runtime/html/set-attributes-from-props.ts
+var DOMAttributeNames = {
+  acceptCharset: "accept-charset",
+  className: "class",
+  htmlFor: "for",
+  httpEquiv: "http-equiv",
+  noModule: "noModule"
+};
+var ignoreProps = [
+  "onLoad",
+  "onReady",
+  "dangerouslySetInnerHTML",
+  "children",
+  "onError",
+  "strategy",
+  "stylesheets"
+];
+function isBooleanScriptAttribute(attr) {
+  return ["async", "defer", "noModule"].includes(attr);
+}
+function setAttributesFromProps(el, props) {
+  for (const [p, value] of Object.entries(props)) {
+    if (!Object.hasOwn(props, p))
+      continue;
+    if (ignoreProps.includes(p))
+      continue;
+    if (value === void 0) {
+      continue;
+    }
+    const attr = DOMAttributeNames[p] || p.toLowerCase();
+    if (el.tagName === "SCRIPT" && isBooleanScriptAttribute(attr)) {
+      el[attr] = Boolean(value);
+    } else {
+      el.setAttribute(attr, String(value));
+    }
+    if (value === false || el.tagName === "SCRIPT" && isBooleanScriptAttribute(attr) && (!value || value === "false")) {
+      el.setAttribute(attr, "");
+      el.removeAttribute(attr);
+    }
+  }
+}
+
+// src/runtime/loaders/component-loader.ts
 var React = __toESM(require("react"), 1);
 var JSXDevRuntime = __toESM(require("react/jsx-dev-runtime"), 1);
 var JSXRuntime = __toESM(require("react/jsx-runtime"), 1);
 var ReactDOM = __toESM(require("react-dom"), 1);
 var ReactDOMClient = __toESM(require("react-dom/client"), 1);
 
-// src/shared/webpack/next-client-pages-loader.ts
+// src/config/webpack/apply-shared-modules.ts
+function applySharedModules(bundle, resolve) {
+  logDebug(
+    "SharedModules",
+    `applySharedModules called for bundle: "${bundle}"`
+  );
+  logDebug(
+    "SharedModules",
+    `Shared modules to resolve: ${Object.keys(resolve)}`
+  );
+  const self = globalThis;
+  if (self.__remote_webpack_require__?.[bundle]) {
+    const modulePaths = Object.keys(
+      self.__remote_webpack_module_map__?.[bundle] ?? self.__remote_webpack_require__[bundle].m ?? {}
+    );
+    logDebug(
+      "SharedModules",
+      `Available module paths in __remote_webpack_require__[${bundle}]: ${modulePaths}`
+    );
+    for (const [key, value] of Object.entries(resolve)) {
+      const exactIds = modulePaths.filter((p) => p === key);
+      const ids = exactIds.length > 0 ? exactIds : modulePaths.filter((p) => p.includes(key));
+      if (ids.length === 0) {
+        logDebug(
+          "SharedModules",
+          `No matching module path found for shared module "${key}"`
+        );
+      }
+      for (const id of ids) {
+        const webpackBundle = self.__remote_webpack_require__[bundle];
+        if (webpackBundle.m) {
+          const resolvedId = self.__remote_webpack_module_map__?.[bundle]?.[id] ? `${self.__remote_webpack_module_map__[bundle][id]}` : id;
+          if (resolvedId !== id) {
+            logDebug(
+              "SharedModules",
+              `Mapped module id: "${id}" -> "${resolvedId}"`
+            );
+          }
+          webpackBundle.m[resolvedId] = (module2) => {
+            module2.exports = value;
+          };
+        } else {
+          logWarn(
+            "SharedModules",
+            `webpackBundle.m is not available for bundle "${bundle}"`
+          );
+        }
+      }
+    }
+  } else {
+    logWarn("SharedModules", `No webpack require found for bundle "${bundle}"`);
+    logDebug(
+      "SharedModules",
+      `Available bundles: ${Object.keys(self.__remote_webpack_require__ ?? {})}`
+    );
+  }
+}
+
+// src/config/webpack/next-client-pages-loader.ts
 function nextClientPagesLoader(bundle, route, styleContainer = document.head) {
   const self = globalThis;
   const nextCssOriginal = document.querySelector(
@@ -515,111 +809,50 @@ function nextClientPagesLoader(bundle, route, styleContainer = document.head) {
     if (!self.__remote_next_css__) {
       self.__remote_next_css__ = {};
     }
-    if (!self.__remote_next_css__[bundle]) {
-      const cssRE = /\.s?css$/;
-      Object.keys(self.__remote_webpack_require__?.[bundle]?.m ?? {}).filter((id) => cssRE.test(id)).forEach((id) => {
-        self.__remote_webpack_require__?.[bundle]?.(id);
-      });
-      Object.keys(self.__remote_webpack_module_map__?.[bundle] ?? {}).filter((path) => cssRE.test(path)).forEach((path) => {
-        const id = self.__remote_webpack_module_map__?.[bundle]?.[path];
-        if (id) {
-          self.__remote_webpack_require__?.[bundle]?.(id);
-        }
-      });
-      const elements = [];
-      let node = nextCss.previousSibling;
-      while (node && node !== nextCssEnd) {
-        elements.push(node);
-        node.remove();
-        node = nextCss.previousSibling;
-      }
-      self.__remote_next_css__[bundle] = elements;
-    }
-    if (styleContainer) {
-      const elements = self.__remote_next_css__[bundle];
-      elements.forEach((el) => {
-        styleContainer.appendChild(el.cloneNode(true));
-      });
-    } else {
-      const elements = self.__remote_next_css__[bundle];
-      elements.forEach((el) => {
-        document.head.appendChild(el);
-      });
-    }
-    delete self.__NEXT_P;
-    self.__NEXT_P = __NEXT_P_ORIGINAL;
-    if (nextCssOriginal) {
-      nextCssOriginal.parentNode?.appendChild(nextCssOriginal);
-    }
-    nextCss.remove();
-    nextCssEnd.remove();
-    return { Component, App };
-  }
-  return { Component: null, App: null };
-}
-
-// src/shared/webpack/shared-modules.ts
-function applySharedModules(bundle, resolve) {
-  logDebug(
-    "SharedModules",
-    `applySharedModules called for bundle: "${bundle}"`
-  );
-  logDebug(
-    "SharedModules",
-    `Shared modules to resolve: ${Object.keys(resolve)}`
-  );
-  const self = globalThis;
-  if (self.__remote_webpack_require__?.[bundle]) {
-    const modulePaths = Object.keys(
-      self.__remote_webpack_module_map__?.[bundle] ?? self.__remote_webpack_require__[bundle].m ?? {}
-    );
-    logDebug(
-      "SharedModules",
-      `Available module paths in __remote_webpack_require__[${bundle}]: ${modulePaths}`
-    );
-    for (const [key, value] of Object.entries(resolve)) {
-      let ids = modulePaths.filter((p) => p === key);
-      if (ids.length === 0) {
-        ids = modulePaths.filter((p) => p.includes(key));
-      }
-      if (ids.length === 0) {
-        logDebug(
-          "SharedModules",
-          `No matching module path found for shared module "${key}"`
-        );
-      }
-      for (let id of ids) {
-        const webpackBundle = self.__remote_webpack_require__[bundle];
-        if (webpackBundle.m) {
-          if (self.__remote_webpack_module_map__?.[bundle]?.[id]) {
-            const mappedId = `${self.__remote_webpack_module_map__[bundle][id]}`;
-            logDebug(
-              "SharedModules",
-              `Mapped module id: "${id}" -> "${mappedId}"`
-            );
-            id = mappedId;
-          }
-          webpackBundle.m[id] = (module2) => {
-            module2.exports = value;
-          };
-        } else {
-          logWarn(
-            "SharedModules",
-            `webpackBundle.m is not available for bundle "${bundle}"`
-          );
+    if (!self.__remote_next_css__[bundle]) {
+      const cssRE = /\.s?css$/;
+      Object.keys(self.__remote_webpack_require__?.[bundle]?.m ?? {}).filter((id) => cssRE.test(id)).forEach((id) => {
+        self.__remote_webpack_require__?.[bundle]?.(id);
+      });
+      Object.keys(self.__remote_webpack_module_map__?.[bundle] ?? {}).filter((path) => cssRE.test(path)).forEach((path) => {
+        const id = self.__remote_webpack_module_map__?.[bundle]?.[path];
+        if (id) {
+          self.__remote_webpack_require__?.[bundle]?.(id);
         }
+      });
+      const elements = [];
+      let node = nextCss.previousSibling;
+      while (node && node !== nextCssEnd) {
+        elements.push(node);
+        node.remove();
+        node = nextCss.previousSibling;
       }
+      self.__remote_next_css__[bundle] = elements;
     }
-  } else {
-    logWarn("SharedModules", `No webpack require found for bundle "${bundle}"`);
-    logDebug(
-      "SharedModules",
-      `Available bundles: ${Object.keys(self.__remote_webpack_require__ ?? {})}`
-    );
+    if (styleContainer) {
+      const elements = self.__remote_next_css__[bundle];
+      elements.forEach((el) => {
+        styleContainer.appendChild(el.cloneNode(true));
+      });
+    } else {
+      const elements = self.__remote_next_css__[bundle];
+      elements.forEach((el) => {
+        document.head.appendChild(el);
+      });
+    }
+    delete self.__NEXT_P;
+    self.__NEXT_P = __NEXT_P_ORIGINAL;
+    if (nextCssOriginal) {
+      nextCssOriginal.parentNode?.appendChild(nextCssOriginal);
+    }
+    nextCss.remove();
+    nextCssEnd.remove();
+    return { Component, App };
   }
+  return { Component: null, App: null };
 }
 
-// src/shared/client/rsc.ts
+// src/runtime/rsc.ts
 var import_web_streams_polyfill = require("web-streams-polyfill");
 function fixPayload(payload) {
   if (Array.isArray(payload)) {
@@ -685,78 +918,15 @@ function createRSCStream(rscName, data) {
   });
 }
 
-// src/shared/client/webpack-patterns.ts
-var NEXT_BUNDLE_PATH_RE = /\/_next\/\[.+\](?:%20| )/;
-
-// 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);
-      });
-    })
-  );
-}
-
-// src/shared/utils/index.ts
-function escapeString(str) {
-  return str.replace(/[^a-z0-9]/g, "_");
-}
-var attrToProp = {
-  fetchpriority: "fetchPriority",
-  crossorigin: "crossOrigin",
-  imagesrcset: "imageSrcSet",
-  imagesizes: "imageSizes",
-  srcset: "srcSet"
-};
-
-// src/shared/client/const.ts
-var DEFAULT_ROUTE = "/";
-var RUNTIME_WEBPACK = "webpack";
-var RUNTIME_TURBOPACK = "turbopack";
-var RUNTIME_SCRIPT = "script";
-var REMOTE_COMPONENT_REGEX = /(?<prefix>.*?)\[(?<bundle>[^\]]+)\](?:%20| )(?<id>.+)/;
-function getBundleKey(bundle) {
-  return escapeString(bundle);
-}
-
-// src/shared/client/turbopack-patterns.ts
+// src/runtime/turbopack/patterns.ts
 var REMOTE_SHARED_MARKER_RE = /(?:self|[a-z])\.TURBOPACK_REMOTE_SHARED/;
-var REMOTE_SHARED_ASSIGNMENT_RE = /\.TURBOPACK_REMOTE_SHARED=await (?:__turbopack_context__|e)\.A\((?<sharedModuleId>[0-9]+)\)/;
+var REMOTE_SHARED_ASSIGNMENT_RE = /\.TURBOPACK_REMOTE_SHARED=await (?:__turbopack_context__|[a-z])\.A\((?<sharedModuleId>[0-9]+)\)/;
 var ASYNC_MODULE_LOADER_RE = /(?:__turbopack_context__|e)\.A\((?<asyncSharedModuleId>[0-9]+)\)/;
 var ASYNC_MODULE_RESOLVE_RE = /(?<ctx>__turbopack_context__|e)=>\{\k<ctx>\.v\((?<inner>parentImport|e)=>Promise\.resolve\(\)\.then\(\(\)=>\k<inner>\((?<sharedModuleId>[0-9]+)\)\)\)\}/;
 var 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]+)\)\)\)\}/;
 var TURBOPACK_GLOBAL_RE = /(?:globalThis|self)\s*(?:\.TURBOPACK|\[\s*["']TURBOPACK["']\s*\])/;
 
-// src/shared/client/chunk-loader.ts
+// src/runtime/turbopack/chunk-loader.ts
 function createChunkLoader(runtime, resolveClientUrl) {
   return function __turbopack_chunk_load__(chunkId, scriptBundle) {
     logDebug("ChunkLoader", `Loading chunk: "${chunkId}"`);
@@ -818,7 +988,7 @@ function createChunkLoader(runtime, resolveClientUrl) {
         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}`
+              `Failed to load chunk "${url}" via proxy "${resolvedUrl}". Ensure withRemoteComponentsHostProxy middleware is configured and "${RC_PROTECTED_REMOTE_FETCH_PATHNAME}" is in the matcher. See: ${CORS_DOCS_URL}`
             )
           );
         } else {
@@ -968,7 +1138,7 @@ async function handleTurbopackChunk(code, bundle, url) {
   }
 }
 
-// src/shared/client/turbopack-module.ts
+// src/runtime/turbopack/module.ts
 function handleTurbopackModule(bundle, moduleId, id) {
   const self = globalThis;
   const bundleKey = getBundleKey(bundle);
@@ -1197,7 +1367,7 @@ function createTurbopackContext(bundle, exports, moduleExports, modules, moduleI
   };
 }
 
-// src/shared/client/shared-modules.ts
+// src/runtime/turbopack/shared-modules.ts
 async function initializeSharedModules(bundle, hostShared = {}, remoteShared = {}) {
   const self = globalThis;
   self.__remote_shared_modules__ = self.__remote_shared_modules__ ?? {};
@@ -1317,7 +1487,7 @@ function getSharedModule(bundle, id) {
   return null;
 }
 
-// src/shared/client/webpack-adapter.ts
+// src/runtime/turbopack/webpack-runtime.ts
 async function setupWebpackRuntime(runtime, scripts = [], url = new URL(location.href), bundle, shared = {}, remoteShared = {}, resolveClientUrl) {
   const self = globalThis;
   if (!self.__remote_bundle_url__) {
@@ -1372,7 +1542,7 @@ function createModuleRequire(runtime) {
       id
     };
     const remoteRuntime = self.__remote_webpack_require__?.[bundle ?? "default"] ? self.__remote_webpack_require__[bundle ?? "default"]?.type || "webpack" : runtime;
-    logDebug("WebpackAdapter", `remoteRuntime: "${remoteRuntime}"`);
+    logDebug("WebpackRuntime", `remoteRuntime: "${remoteRuntime}"`);
     try {
       if (remoteRuntime === RUNTIME_WEBPACK && bundle && moduleId) {
         return self.__remote_webpack_require__?.[bundle]?.(moduleId);
@@ -1388,7 +1558,7 @@ function createModuleRequire(runtime) {
       throw new Error(`Module "${id}" not found.`);
     } catch (requireError) {
       logWarn(
-        "WebpackAdapter",
+        "WebpackRuntime",
         `Module require failed: ${String(requireError)}`
       );
       if (typeof self.__original_webpack_require__ !== "function") {
@@ -1400,7 +1570,7 @@ function createModuleRequire(runtime) {
         );
       }
       try {
-        logDebug("WebpackAdapter", "Falling back to original webpack require");
+        logDebug("WebpackRuntime", "Falling back to original webpack require");
         return self.__original_webpack_require__(id);
       } catch (originalError) {
         throw new RemoteComponentsError(
@@ -1412,7 +1582,45 @@ function createModuleRequire(runtime) {
   };
 }
 
-// src/shared/client/component-loader.ts
+// src/runtime/loaders/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 withRemoteComponentsHostProxy 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);
+      });
+    })
+  );
+}
+
+// src/runtime/loaders/component-loader.ts
 async function loadRemoteComponent({
   url,
   name,
@@ -1515,17 +1723,19 @@ async function loadRemoteComponent({
     };
   }
 }
-async function loadRSCComponent(rscName, data) {
-  let createFromReadableStream;
+async function importCreateFromReadableStream() {
   try {
-    const { createFromReadableStream: _createFromReadableStream } = await import("next/dist/compiled/react-server-dom-webpack/client.browser");
-    createFromReadableStream = _createFromReadableStream;
+    const { createFromReadableStream } = await import("next/dist/compiled/react-server-dom-webpack/client.browser");
+    return createFromReadableStream;
   } catch {
     const {
-      default: { createFromReadableStream: _createFromReadableStream }
+      default: { createFromReadableStream }
     } = await import("react-server-dom-webpack/client.browser");
-    createFromReadableStream = _createFromReadableStream;
+    return createFromReadableStream;
   }
+}
+async function loadRSCComponent(rscName, data) {
+  const createFromReadableStream = await importCreateFromReadableStream();
   if (typeof createFromReadableStream !== "function") {
     throw new RemoteComponentsError(
       'Failed to import "react-server-dom-webpack". Is Next.js installed correctly?'
@@ -1546,71 +1756,7 @@ function loadNextPagesComponent(bundle, route, nextData, name, container) {
   return { component };
 }
 
-// src/shared/client/proxy-through-host.ts
-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/set-attributes-from-props.ts
-var DOMAttributeNames = {
-  acceptCharset: "accept-charset",
-  className: "class",
-  htmlFor: "for",
-  httpEquiv: "http-equiv",
-  noModule: "noModule"
-};
-var ignoreProps = [
-  "onLoad",
-  "onReady",
-  "dangerouslySetInnerHTML",
-  "children",
-  "onError",
-  "strategy",
-  "stylesheets"
-];
-function isBooleanScriptAttribute(attr) {
-  return ["async", "defer", "noModule"].includes(attr);
-}
-function setAttributesFromProps(el, props) {
-  for (const [p, value] of Object.entries(props)) {
-    if (!Object.hasOwn(props, p))
-      continue;
-    if (ignoreProps.includes(p))
-      continue;
-    if (value === void 0) {
-      continue;
-    }
-    const attr = DOMAttributeNames[p] || p.toLowerCase();
-    if (el.tagName === "SCRIPT" && isBooleanScriptAttribute(attr)) {
-      el[attr] = Boolean(value);
-    } else {
-      el.setAttribute(attr, String(value));
-    }
-    if (value === false || el.tagName === "SCRIPT" && isBooleanScriptAttribute(attr) && (!value || value === "false")) {
-      el.setAttribute(attr, "");
-      el.removeAttribute(attr);
-    }
-  }
-}
-
-// src/shared/client/static-loader.ts
+// src/runtime/loaders/static-loader.ts
 async function importViaCallback(absoluteSrc, resolveClientUrl) {
   const resolvedUrl = resolveClientUrl(absoluteSrc) ?? absoluteSrc;
   const fetchUrl = new URL(resolvedUrl, location.href).href;
@@ -1760,75 +1906,35 @@ async function loadStaticRemoteComponent(scripts, url, resolveClientUrl) {
   );
 }
 
-// src/shared/ssr/fetch-headers.ts
-function remoteFetchHeaders() {
-  return {
-    /**
-     * Authenticates deployment protection for the remote. Needed for SSR and SSG clients.
-     * If the remote component uses vercel deployment protection, ensure the host and remote vercel
-     * projects share a common automation bypass secret, and the shared secret is used as the
-     * VERCEL_AUTOMATION_BYPASS_SECRET env var in the host project.
-     */
-    ...typeof process === "object" && typeof process.env === "object" && typeof process.env.VERCEL_AUTOMATION_BYPASS_SECRET === "string" ? {
-      "x-vercel-protection-bypass": process.env.VERCEL_AUTOMATION_BYPASS_SECRET
-    } : {},
-    Accept: "text/html"
-  };
-}
+// src/host/react/hooks/use-resolve-client-url.ts
+var import_react = require("react");
+var import_context = require("#internal/host/react/context");
 
-// src/shared/ssr/fetch-with-hooks.ts
-async function fetchWithHooks(url, additionalInit, options = {}) {
-  const {
-    onRequest,
-    onResponse,
-    abortController = new AbortController()
-  } = options;
-  const signal = abortController.signal;
-  const hookOptions = {
-    signal,
-    abort: (reason) => abortController.abort(reason)
-  };
-  const init = {
-    method: "GET",
-    headers: remoteFetchHeaders(),
-    signal,
-    ...additionalInit
-  };
-  let res = await onRequest?.(url, init, hookOptions);
-  if (!res) {
-    try {
-      res = await fetch(url, init);
-    } catch (error) {
-      warnCrossOriginFetchError("FetchRemoteComponent", url);
-      throw error;
+// src/runtime/url/resolve-client-url.ts
+function withRemoteSrc(resolveClientUrl, remoteSrc) {
+  const remoteOrigin = parseOrigin(remoteSrc);
+  return (url) => {
+    const urlOrigin = parseOrigin(url);
+    if (remoteOrigin && urlOrigin && urlOrigin !== remoteOrigin) {
+      return void 0;
     }
-  }
-  const transformedRes = await onResponse?.(url, res, hookOptions);
-  if (transformedRes) {
-    res = transformedRes;
-  }
-  return res;
+    return resolveClientUrl(remoteSrc, url);
+  };
 }
-
-// src/shared/ssr/get-client-or-server-url.ts
-function getClientOrServerUrl(src, serverFallback) {
-  const fallback = typeof location !== "undefined" ? location.href : serverFallback;
-  if (!src) {
-    return new URL(fallback);
+function parseOrigin(url) {
+  try {
+    return new URL(url).origin;
+  } catch {
+    return void 0;
   }
-  return typeof src === "string" ? new URL(src, fallback) : src;
 }
 
-// src/react/hooks/use-resolve-client-url.ts
-var import_react = require("react");
-var import_context = require("#internal/react/context");
-
-// src/shared/client/default-resolve-client-url.ts
+// src/runtime/url/default-resolve-client-url.ts
 function bindResolveClientUrl(prop, remoteSrc) {
   return prop ? withRemoteSrc(prop, remoteSrc) : void 0;
 }
 
-// src/react/hooks/use-resolve-client-url.ts
+// src/host/react/hooks/use-resolve-client-url.ts
 function useResolveClientUrl(prop, urlHref) {
   const { resolveClientUrl: contextValue } = (0, import_context.useRemoteComponentsContext)();
   const resolveClientUrl = prop ?? contextValue;
@@ -1838,7 +1944,7 @@ function useResolveClientUrl(prop, urlHref) {
   );
 }
 
-// src/react/hooks/use-shadow-root.ts
+// src/host/react/hooks/use-shadow-root.ts
 var import_react2 = require("react");
 function useShadowRoot({
   isolate,
@@ -1887,7 +1993,7 @@ function useShadowRoot({
   return { shadowRoot, shadowRootContainerRef };
 }
 
-// src/react/utils/parse-remote-html.ts
+// src/host/react/utils/extract-remote-html.ts
 var DUMMY_FALLBACK = "http://remote-components-dummy-fallback";
 function getRemoteComponentHtml(html) {
   if (typeof document === "undefined")
@@ -1909,14 +2015,13 @@ function getRemoteComponentHtml(html) {
   return "";
 }
 
-// src/react/index.tsx
-var import_context2 = require("#internal/react/context");
+// src/host/react/index.tsx
 var import_jsx_runtime2 = (
   // TODO: remove wrapper div by converting HTML to RSC or React tree
   require("react/jsx-runtime")
 );
 var import_react4 = require("react");
-function RemoteComponent({
+function ConsumeRemoteComponent({
   src,
   isolate,
   mode = "open",
@@ -1934,21 +2039,13 @@ function RemoteComponent({
   resolveClientUrl: _resolveClientUrl
 }) {
   const instanceId = (0, import_react3.useId)();
-  const name = (0, import_react3.useMemo)(() => {
-    if (typeof src === "string") {
-      const url2 = new URL(
-        src,
-        typeof document !== "undefined" ? location.href : DUMMY_FALLBACK
-      );
-      if (url2.hash) {
-        return url2.hash.slice(1);
-      }
-    } else if (typeof src === "object" && "hash" in src && src.hash) {
-      return src.hash.slice(1) || nameProp;
-    }
-    return nameProp;
-  }, [src, nameProp]);
-  const [data, setData] = (0, import_react3.useState)(null);
+  const name = (0, import_react3.useMemo)(
+    () => resolveNameFromSrc(src, nameProp),
+    [src, nameProp]
+  );
+  const [data, setData] = (0, import_react3.useState)(
+    null
+  );
   const url = (0, import_react3.useMemo)(() => getClientOrServerUrl(src, DUMMY_FALLBACK), [src]);
   const resolveClientUrl = useResolveClientUrl(_resolveClientUrl, url.href);
   const id = url.origin === (typeof location !== "undefined" ? location.origin : DUMMY_FALLBACK) ? url.pathname : url.href;
@@ -1980,13 +2077,10 @@ function RemoteComponent({
       return elements;
     })() : []
   );
-  const prevSrcRef = (0, import_react3.useRef)(null);
+  const hostStateRef = (0, import_react3.useRef)(createHostState());
   const componentHydrationHtml = (0, import_react3.useRef)(null);
-  const prevIsRemoteComponentRef = (0, import_react3.useRef)(false);
-  const prevUrlRef = (0, import_react3.useRef)(null);
   const prevRemoteComponentContainerRef = (0, import_react3.useRef)(null);
   const unmountRef = (0, import_react3.useRef)(null);
-  const prevNameRef = (0, import_react3.useRef)(void 0);
   (0, import_react3.useLayoutEffect)(() => {
     const shadowRootKey = `__remote_components_shadowroot_${keySuffix}`;
     return () => {
@@ -2025,14 +2119,18 @@ function RemoteComponent({
     }
   }, [shadowRoot, remoteComponent, name]);
   (0, import_react3.useEffect)(() => {
-    if (src && src !== prevSrcRef.current) {
-      const previousSrc = prevSrcRef.current;
-      const previousName = prevNameRef.current;
-      prevSrcRef.current = src;
+    if (src && src !== hostStateRef.current.prevSrc) {
+      const previousSrc = hostStateRef.current.prevSrc;
+      const previousName = hostStateRef.current.prevName;
+      hostStateRef.current.prevSrc = src;
       if (previousSrc !== null) {
         htmlRef.current = null;
       }
+      hostStateRef.current.abortController?.abort();
+      hostStateRef.current.abortController = new AbortController();
+      const { signal } = hostStateRef.current.abortController;
       onBeforeLoad?.(src);
+      hostStateRef.current.stage = "loading";
       (0, import_react3.startTransition)(async () => {
         try {
           let html = getRemoteComponentHtml(
@@ -2046,59 +2144,41 @@ function RemoteComponent({
               resolveClientUrl?.(url.href) ?? url.href,
               location.href
             );
-            const abortController = new AbortController();
             const res = await fetchWithHooks(resolvedUrl, fetchInit, {
               onRequest,
               onResponse,
-              abortController
+              abortController: hostStateRef.current.abortController
             });
             if (!res || !res.ok) {
               throw await errorFromFailedFetch(url.href, resolvedUrl, res);
             }
             const remoteHtml = await res.text();
+            if (signal.aborted)
+              return;
             htmlRef.current = remoteHtml;
             html = getRemoteComponentHtml(remoteHtml);
           }
+          if (signal.aborted)
+            return;
           const parser = new DOMParser();
           const doc = parser.parseFromString(html, "text/html");
-          if (doc.querySelectorAll("div[data-bundle][data-route]").length > 1 && !doc.querySelector(
-            `div[data-bundle][data-route][id^="${name}"]`
-          ) || doc.querySelectorAll("remote-component:not([src])").length > 1 && !doc.querySelector(`remote-component[name="${name}"]`)) {
-            throw multipleRemoteComponentsError(url.href);
-          }
-          const component = doc.querySelector(`div[data-bundle][data-route][id^="${name}"]`) ?? // fallback to the first element with the data-bundle and data-route attributes when not using a named remote component
-          doc.querySelector("div[data-bundle][data-route]") ?? // fallback to Next.js Pages Router
-          doc.querySelector("div#__next") ?? // fallback to the remote-component web component
-          doc.querySelector(`remote-component[name="${name}"]:not([src])`) ?? doc.querySelector("remote-component:not([src])");
-          const nextData = JSON.parse(
-            (doc.querySelector("#__NEXT_DATA__") ?? doc.querySelector("#__REMOTE_NEXT_DATA__"))?.textContent ?? "null"
-          );
-          const remoteName = component?.getAttribute("id")?.replace(/_ssr$/, "") || (nextData ? "__next" : name);
-          const rsc = doc.querySelector(`#${remoteName}_rsc`);
-          const bundle = component?.getAttribute("data-bundle") || nextData?.props.__REMOTE_COMPONENT__?.bundle || "default";
-          const isRemoteComponent = component?.tagName.toLowerCase() === "remote-component";
-          const metadata = {
+          const {
+            component,
             name: remoteName,
-            bundle,
-            route: component?.getAttribute("data-route") ?? nextData?.page ?? (url.pathname || DEFAULT_ROUTE),
-            runtime: component?.getAttribute("data-runtime") ?? (nextData?.props.__REMOTE_COMPONENT__?.runtime || RUNTIME_SCRIPT)
-          };
-          const remoteSharedEl = doc.querySelector(
-            `#${remoteName}_shared[data-remote-components-shared]`
-          );
-          const remoteShared = nextData?.props.__REMOTE_COMPONENT__?.shared ?? (JSON.parse(remoteSharedEl?.textContent ?? "{}") ?? {});
-          remoteSharedEl?.remove();
-          if (!component || !(rsc || nextData || isRemoteComponent)) {
-            throw new RemoteComponentsError(
-              `Remote Component not found on ${url.href}.${remoteName !== "__vercel_remote_component" ? `The name for the <RemoteComponent> is "${remoteName}". Check <RemoteComponent> usage.` : ""} Did you forget to wrap the content in <RemoteComponent>?`
-            );
-          }
-          if (prevIsRemoteComponentRef.current) {
+            isRemoteComponent,
+            metadata,
+            nextData,
+            rsc,
+            remoteShared,
+            links: linkElements,
+            scripts: scriptElements
+          } = parseRemoteComponentDocument(doc, name, url);
+          if (hostStateRef.current.prevIsRemoteComponent) {
             if (shadowRoot) {
               shadowRoot.innerHTML = "";
             }
             const self = globalThis;
-            const prevUrl = prevUrlRef.current;
+            const prevUrl = hostStateRef.current.prevUrl;
             if (prevUrl && self.__remote_script_entrypoint_unmount__?.[prevUrl.href]) {
               const unmountPromises = Promise.all(
                 Array.from(unmountRef.current ?? []).map(
@@ -2111,15 +2191,11 @@ function RemoteComponent({
               await unmountPromises;
             }
           }
-          prevIsRemoteComponentRef.current = isRemoteComponent;
-          prevUrlRef.current = url;
-          prevNameRef.current = remoteName;
+          hostStateRef.current.prevIsRemoteComponent = isRemoteComponent;
+          hostStateRef.current.prevUrl = url;
+          hostStateRef.current.prevName = remoteName;
           applyOriginToNodes(doc, url, resolveClientUrl);
-          const links = Array.from(
-            doc.querySelectorAll("link[href]")
-          ).filter((link) => {
-            return !component.contains(link);
-          }).map((link) => ({
+          const links = linkElements.map((link) => ({
             href: new URL(link.getAttribute("href") ?? link.href, url).href,
             ...link.getAttributeNames().reduce((acc, key) => {
               if (key !== "href") {
@@ -2128,7 +2204,7 @@ function RemoteComponent({
               return acc;
             }, {})
           }));
-          const scripts = (isRemoteComponent ? component : doc).querySelectorAll("script[src],script[data-src]");
+          const scripts = scriptElements;
           const inlineScripts = (isRemoteComponent ? component : doc).querySelectorAll(
             "script:not([src]):not([data-src]):not([id*='_rsc']):not([id='__NEXT_DATA__']):not([id='__REMOTE_NEXT_DATA__'])"
           );
@@ -2186,11 +2262,10 @@ function RemoteComponent({
             });
             self.__next_s = prevNextScripts;
           }
-          let rscName;
+          const rscName = rsc ? `__remote_component_rsc_${escapeString(id)}_${escapeString(
+            remoteName
+          )}` : void 0;
           if (rsc) {
-            rscName = `__remote_component_rsc_${escapeString(
-              id
-            )}_${escapeString(remoteName)}`;
             rsc.textContent = rsc.textContent?.replace(
               new RegExp(`self\\["${remoteName}"\\]`, "g"),
               `self["${rscName}"]`
@@ -2219,7 +2294,7 @@ function RemoteComponent({
             );
           }
           if (isRemoteComponent) {
-            if (previousSrc !== null) {
+            if (previousSrc !== void 0) {
               onChange?.({
                 previousSrc,
                 nextSrc: src,
@@ -2229,10 +2304,7 @@ function RemoteComponent({
             }
             setData(newData);
             if (shadowRoot) {
-              let shadowRootHtml = component.innerHTML;
-              if (reset) {
-                shadowRootHtml = `<style data-remote-components-reset="">:host { all: initial; }</style>${shadowRootHtml}`;
-              }
+              const shadowRootHtml = reset ? `<style data-remote-components-reset="">:host { all: initial; }</style>${component.innerHTML}` : component.innerHTML;
               shadowRoot.innerHTML = shadowRootHtml;
               htmlRef.current = null;
               setRemoteComponent(null);
@@ -2270,12 +2342,13 @@ function RemoteComponent({
               );
               onLoad?.(src);
             }
+            hostStateRef.current.stage = "loaded";
           } else {
             const result = await loadRemoteComponent({
               url,
               name: remoteName,
               rscName,
-              bundle,
+              bundle: metadata.bundle,
               route: metadata.route,
               runtime: metadata.runtime,
               data: newData.data,
@@ -2299,7 +2372,7 @@ function RemoteComponent({
                 };
               }),
               shared: {
-                ...sharedPolyfills(userShared),
+                ...sharedPolyfills(userShared, resolveClientUrl),
                 ...userShared
               },
               remoteShared,
@@ -2310,7 +2383,7 @@ function RemoteComponent({
               rsc.remove();
             }
             setData(newData);
-            if (previousSrc !== null) {
+            if (previousSrc !== void 0) {
               onChange?.({
                 previousSrc,
                 nextSrc: src,
@@ -2319,17 +2392,21 @@ function RemoteComponent({
               });
             }
             if (result.error) {
+              hostStateRef.current.stage = "error";
               setRemoteComponent(result.error);
               onError?.(result.error);
             } else {
+              hostStateRef.current.stage = "loaded";
               setRemoteComponent(result.component);
               onLoad?.(src);
             }
           }
         } catch (error) {
           if (isAbortError(error)) {
+            hostStateRef.current.stage = "idle";
             return;
           }
+          hostStateRef.current.stage = "error";
           setRemoteComponent(error);
           onError?.(error);
         }
@@ -2360,7 +2437,7 @@ function RemoteComponent({
     name: data?.name || name,
     bundle: data?.bundle || "default",
     route: data?.route || DEFAULT_ROUTE,
-    runtime: prevIsRemoteComponentRef.current ? RUNTIME_SCRIPT : data?.runtime || RUNTIME_WEBPACK
+    runtime: hostStateRef.current.prevIsRemoteComponent ? RUNTIME_SCRIPT : data?.runtime || RUNTIME_WEBPACK
   }) });
   const resetStyle = reset ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("style", { "data-remote-components-reset": "react", children: `:host { all: initial; }` }) : null;
   const linksToRender = data?.links?.map((link) => /* @__PURE__ */ (0, import_react4.createElement)(
@@ -2379,7 +2456,7 @@ function RemoteComponent({
   if (componentHydrationHtml.current && shadowRoot && !shadowRoot.innerHTML) {
     shadowRoot.innerHTML = componentHydrationHtml.current;
     componentHydrationHtml.current = null;
-    if (prevIsRemoteComponentRef.current) {
+    if (hostStateRef.current.prevIsRemoteComponent) {
       loadStaticRemoteComponent(
         Array.from(shadowRoot.querySelectorAll("script")),
         url,
@@ -2467,8 +2544,6 @@ function RemoteComponent({
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  RemoteComponent,
-  RemoteComponentsProvider,
-  proxyClientRequestsThroughHost
+  ConsumeRemoteComponent
 });
-//# sourceMappingURL=index.cjs.map
+//# sourceMappingURL=react.cjs.map