remote-components 0.0.24 → 0.0.26

package/dist/html/host.cjs

@@ -179,14 +179,25 @@ var init_next_client_pages_loader = __esm({
   }
 });
 
+// src/shared/utils/index.ts
+function escapeString(str) {
+  return str.replace(/[^a-z0-9]/g, "_");
+}
+var init_utils = __esm({
+  "src/shared/utils/index.ts"() {
+    "use strict";
+  }
+});
+
 // src/shared/client/const.ts
 function getBundleKey(bundle) {
-  return bundle.replace(/-/g, "_");
+  return escapeString(bundle);
 }
 var RUNTIME_WEBPACK, RUNTIME_TURBOPACK, REMOTE_COMPONENT_REGEX;
 var init_const = __esm({
   "src/shared/client/const.ts"() {
     "use strict";
+    init_utils();
     RUNTIME_WEBPACK = "webpack";
     RUNTIME_TURBOPACK = "turbopack";
     REMOTE_COMPONENT_REGEX = /(?<prefix>.*?)\[(?<bundle>[^\]]+)\](?:%20| )(?<id>.+)/;
@@ -369,17 +380,21 @@ function createModuleRequire(runtime) {
         return handleTurbopackModule(bundle, moduleId, id);
       }
       throw new Error(`Module ${id} not found`);
-    } catch {
+    } catch (requireError) {
       if (typeof self.__original_webpack_require__ !== "function") {
         throw new Error(
-          `Module ${id} not found in remote component bundle ${bundle}`
+          `Module ${id} not found in remote component bundle ${bundle}`,
+          {
+            cause: requireError instanceof Error ? requireError : void 0
+          }
         );
       }
       try {
         return self.__original_webpack_require__(id);
-      } catch {
+      } catch (originalError) {
         throw new Error(
-          `Module ${id} not found in remote component bundle ${bundle}`
+          `Module ${id} not found in remote component bundle ${bundle}`,
+          { cause: originalError instanceof Error ? originalError : void 0 }
         );
       }
     }
@@ -475,7 +490,8 @@ function handleTurbopackModule(bundle, moduleId, id) {
         registerExports() {
         },
         signature() {
-          return () => {
+          return (fn) => {
+            return fn;
           };
         }
       },
@@ -508,8 +524,18 @@ function handleTurbopackModule(bundle, moduleId, id) {
         const mod = self.__webpack_require__?.(
           `[${bundle}] ${normalizedId}`
         );
-        if (exportSource && exportName && typeof mod[exportSource] !== "undefined" && typeof mod[exportName] === "undefined") {
-          mod[exportName] = mod[exportSource];
+        if (exportSource && exportName && (exportSource === "*" || typeof mod[exportSource] !== "undefined") && typeof mod[exportName] === "undefined") {
+          if (exportSource === "*") {
+            mod[exportName] = mod;
+          } else {
+            mod[exportName] = mod[exportSource];
+          }
+        }
+        if (!("default" in mod) && mod.toString() !== "[object Module]") {
+          try {
+            mod.default = mod;
+          } catch {
+          }
         }
         return mod;
       },
@@ -519,6 +545,21 @@ function handleTurbopackModule(bundle, moduleId, id) {
       v(value) {
         exports.default = value;
       },
+      async a(mod) {
+        let result;
+        await mod(
+          () => {
+          },
+          (value) => result = value
+        );
+        exports.default = result;
+      },
+      async A(Aid) {
+        const mod = self.__webpack_require__?.(`[${bundle}] ${Aid}`);
+        return mod.default(
+          (parentId) => self.__webpack_require__?.(`[${bundle}] ${parentId}`)
+        );
+      },
       g: self.__remote_components_turbopack_global__[bundle],
       m: moduleExports,
       e: exports
@@ -531,6 +572,9 @@ function handleTurbopackModule(bundle, moduleId, id) {
       exports[name] = exports[name]();
     }
   }
+  if (self.__remote_components_turbopack_modules__[bundle][moduleId] !== moduleExports.exports) {
+    self.__remote_components_turbopack_modules__[bundle][moduleId] = moduleExports.exports;
+  }
   return moduleExports.exports;
 }
 var init_webpack_adapter = __esm({
@@ -631,7 +675,15 @@ function sharedPolyfills(shared) {
         },
         __esModule: true
       })
-    ))
+    )),
+    "next/dist/build/polyfills/process": () => Promise.resolve({
+      default: {
+        env: {
+          NODE_ENV: "production"
+        }
+      },
+      __esModule: true
+    })
   };
   polyfill["next/navigation"] = polyfill["next/dist/client/components/navigation"];
   polyfill["next/link"] = polyfill["next/dist/client/app-dir/link"];
@@ -868,29 +920,30 @@ function fixPayload(payload) {
     }
   }
 }
-function createRSCStream(name, data) {
+function createRSCStream(rscName, data) {
   return new import_web_streams_polyfill.ReadableStream({
     type: "bytes",
     start(controller) {
       const encoder = new TextEncoder();
       const self = globalThis;
-      if (!self[name] && data.length > 0) {
+      if (data.length > 0) {
         data.forEach((chunk) => {
           const lines = chunk.split("\n");
           for (const line of lines) {
             const match = /\.push\("(?<rsc>.*)"\);$/.exec(line);
             if (match?.groups?.rsc) {
-              self[name] = self[name] ?? [];
-              self[name].push(JSON.parse(`"${match.groups.rsc}"`));
+              self[rscName] = self[rscName] ?? [];
+              self[rscName].push(JSON.parse(`"${match.groups.rsc}"`));
             }
           }
         });
       }
-      const allChunks = (self[name] ?? [`0:[null]
+      const allChunks = (self[rscName] ?? [`0:[null]
 `]).join("");
+      self[rscName] = null;
       allChunks.split("\n").forEach((chunk) => {
         if (chunk.length > 0) {
-          const { before, id, prefix, payload } = /^(?<before>.*?)?(?<id>[0-9a-zA-Z]+):(?<prefix>[A-Z])?(?<payload>\[.*\])/.exec(
+          const { before, id, prefix, payload } = /^(?<before>[^:]*?)?(?<id>[0-9a-zA-Z]+):(?<prefix>[A-Z])?(?<payload>\[.*\])/.exec(
             chunk
           )?.groups ?? {};
           if (payload) {
@@ -917,6 +970,9 @@ function createRSCStream(name, data) {
 init_webpack_adapter();
 init_const();
 
+// src/html/host/index.tsx
+init_utils();
+
 // src/shared/client/apply-origin.ts
 var tagNames = [
   "img",
@@ -930,26 +986,28 @@ var tagNames = [
   "link"
 ];
 function applyOriginToNodes(doc, url) {
-  const nodes = doc.querySelectorAll(
-    tagNames.map((type) => `${type}[src],${type}[srcset]`).join(",")
-  );
-  nodes.forEach((node) => {
-    if (node.hasAttribute("src") && /^[./]+\/?/.test(node.getAttribute("src") ?? "")) {
-      node.src = new URL(node.getAttribute("src") ?? "/", url).href;
-    }
-    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;
-        return descriptor ? `${absoluteUrl} ${descriptor}` : absoluteUrl;
-      }).join(", ");
-      if (srcSet) {
-        node.setAttribute("srcset", srcSet);
+  if (url.origin !== location.origin) {
+    const nodes = doc.querySelectorAll(
+      tagNames.map((type) => `${type}[src],${type}[srcset]`).join(",")
+    );
+    nodes.forEach((node) => {
+      if (node.hasAttribute("src") && /^[./]+\/?/.test(node.getAttribute("src") ?? "")) {
+        node.src = new URL(node.getAttribute("src") ?? "/", url).href;
       }
-    }
-  });
+      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;
+          return descriptor ? `${absoluteUrl} ${descriptor}` : absoluteUrl;
+        }).join(", ");
+        if (srcSet) {
+          node.setAttribute("srcset", srcSet);
+        }
+      }
+    });
+  }
 }
 
 // src/html/host/runtime/index.ts
@@ -1253,17 +1311,24 @@ if (typeof HTMLElement !== "undefined") {
       };
       if (rsc) {
         rsc.parentElement?.removeChild(rsc);
+        const rscName = `__remote_component_rsc_${escapeString(url.href)}_${escapeString(this.name)}`;
         const rscClone = document.createElement("script");
-        rscClone.id = `${this.name}_rsc`;
-        rscClone.textContent = rsc.textContent;
+        rscClone.id = `${rscName}_rsc`;
+        rscClone.textContent = rsc.textContent?.replace(
+          new RegExp(`self\\["${this.name}"\\]`, "g"),
+          `self["${rscName}"]`
+        ) ?? "";
         document.body.appendChild(rscClone);
         let cache;
         const RemoteComponentFromReadableStream = ({
           name,
           initial
         }) => {
-          const stream = createRSCStream(name, self[name] ?? [`0:[null]
-`]);
+          const stream = createRSCStream(
+            rscName,
+            self[rscName] ?? [`0:[null]
+`]
+          );
           const Component = cache ?? // cache the component to avoid reloading the RSC flight data
           (cache = createFromReadableStream(stream));
           (0, import_react.useLayoutEffect)(() => {