remote-components 0.0.23 → 0.0.24

package/dist/react/index.cjs

@@ -23,13 +23,16 @@ __export(react_exports, {
 module.exports = __toCommonJS(react_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
+var import_react2 = require("react");
 var import_react_dom = require("react-dom");
 var import_remote_component = require("#internal/shared/client/remote-component");
+var import_polyfill = require("#internal/shared/client/polyfill");
+var import_apply_origin = require("#internal/shared/client/apply-origin");
 function getRemoteComponentHtml(html) {
   if (typeof document === "undefined")
     return html;
-  const temp = document.createElement("div");
-  temp.innerHTML = html;
+  const parser = new DOMParser();
+  const temp = parser.parseFromString(html, "text/html");
   const ssrRemoteComponentContainer = temp.querySelector(
     'div[id^="__REMOTE_COMPONENT"]'
   );
@@ -44,6 +47,10 @@ function getRemoteComponentHtml(html) {
   }
   return "";
 }
+const attrToProp = {
+  fetchpriority: "fetchPriority",
+  crossorigin: "crossOrigin"
+};
 function RemoteComponent({
   src,
   isolate,
@@ -54,7 +61,7 @@ function RemoteComponent({
   shared = {},
   children
 }) {
-  const name = (0, import_react.useMemo)(() => {
+  const name = (0, import_react2.useMemo)(() => {
     if (typeof src === "string") {
       const url2 = new URL(
         src,
@@ -68,26 +75,25 @@ function RemoteComponent({
     }
     return nameProp;
   }, [src, nameProp]);
-  const [data, setData] = (0, import_react.useState)(null);
-  const [remoteComponent, setRemoteComponent] = (0, import_react.useState)(null);
-  const shadowRootContainerRef = (0, import_react.useRef)(null);
-  const [shadowRoot, setShadowRoot] = (0, import_react.useState)(() => {
+  const [data, setData] = (0, import_react2.useState)(null);
+  const [remoteComponent, setRemoteComponent] = (0, import_react2.useState)(null);
+  const shadowRootContainerRef = (0, import_react2.useRef)(null);
+  const [shadowRoot, setShadowRoot] = (0, import_react2.useState)(() => {
     const self = globalThis;
     const shadowRootKey = `__remote_components_shadowroot_${src ? new URL(src, typeof location !== "undefined" ? location.origin : "http://localhost").href.replace(/[^a-z0-9]/g, "_") : ""}_${(data?.name ?? name).replace(/[^a-z0-9]/g, "_")}`;
-    const ssrShadowRoot = typeof document !== "undefined" ? document.getElementById(
-      `shadowroot_${src ? new URL(src, typeof location !== "undefined" ? location.origin : "http://localhost").href.replace(/[^a-z0-9]/g, "_") : ""}_${(data?.name ?? name).replace(/[^a-z0-9]/g, "_")}`
+    const ssrShadowRoot = typeof document !== "undefined" ? document.querySelector(
+      `[data-remote-component-id="shadowroot_${src ? new URL(src, typeof location !== "undefined" ? location.origin : "http://localhost").href.replace(/[^a-z0-9]/g, "_") : ""}_${(data?.name ?? name).replace(/[^a-z0-9]/g, "_")}"]`
     )?.shadowRoot ?? self[shadowRootKey] ?? null : null;
     self[shadowRootKey] = null;
     return ssrShadowRoot;
   });
-  const htmlRef = (0, import_react.useRef)(
-    typeof document !== "undefined" ? document.getElementById(
-      `shadowroot_${src ? new URL(src, typeof location !== "undefined" ? location.origin : "http://localhost").href.replace(/[^a-z0-9]/g, "_") : ""}_${(data?.name ?? name).replace(/[^a-z0-9]/g, "_")}`
+  const htmlRef = (0, import_react2.useRef)(
+    typeof document !== "undefined" ? document.querySelector(
+      `[data-remote-component-id="shadowroot_${src ? new URL(src, typeof location !== "undefined" ? location.origin : "http://localhost").href.replace(/[^a-z0-9]/g, "_") : ""}_${(data?.name ?? name).replace(/[^a-z0-9]/g, "_")}"]`
     )?.shadowRoot?.innerHTML ?? document.getElementById(`__REMOTE_COMPONENT${name}`)?.innerHTML ?? document.querySelector(`div[data-bundle][data-route][id^="${name}"]`)?.innerHTML ?? document.querySelector("div[data-bundle][data-route]")?.innerHTML : null
   );
-  const ssrHtmlRef = (0, import_react.useRef)(htmlRef.current);
-  const endTemplateRef = (0, import_react.useRef)(null);
-  const childrenRef = (0, import_react.useRef)(
+  const endTemplateRef = (0, import_react2.useRef)(null);
+  const childrenRef = (0, import_react2.useRef)(
     typeof document !== "undefined" ? (() => {
       let el = document.querySelector(`template[id="${name}_start"]`);
       const elements = [];
@@ -100,7 +106,8 @@ function RemoteComponent({
       return elements;
     })() : []
   );
-  (0, import_react.useLayoutEffect)(() => {
+  const prevSrcRef = (0, import_react2.useRef)(null);
+  (0, import_react2.useLayoutEffect)(() => {
     if (childrenRef.current.length > 0 && remoteComponent) {
       childrenRef.current.forEach((el) => {
         el.remove();
@@ -108,14 +115,17 @@ function RemoteComponent({
       childrenRef.current = [];
     }
     if (isolate !== false && typeof document !== "undefined" && !shadowRoot) {
+      const self = globalThis;
+      const shadowRootKey = `__remote_components_shadowroot_${src ? new URL(src, typeof location !== "undefined" ? location.origin : "http://localhost").href.replace(/[^a-z0-9]/g, "_") : ""}_${(data?.name ?? name).replace(/[^a-z0-9]/g, "_")}`;
       let shadowRootElement = null;
-      const element = document.getElementById(
-        `shadowroot_${src ? new URL(src, typeof location !== "undefined" ? location.origin : "http://localhost").href.replace(/[^a-z0-9]/g, "_") : ""}_${(data?.name ?? name).replace(/[^a-z0-9]/g, "_")}`
+      const element = document.querySelector(
+        `[data-remote-component-id="shadowroot_${src ? new URL(src, typeof location !== "undefined" ? location.origin : "http://localhost").href.replace(/[^a-z0-9]/g, "_") : ""}_${(data?.name ?? name).replace(/[^a-z0-9]/g, "_")}"]`
       );
-      shadowRootElement = element?.shadowRoot ?? null;
+      shadowRootElement = self[shadowRootKey] ?? element?.shadowRoot ?? null;
       if (!shadowRootElement && element) {
         try {
           shadowRootElement = element.attachShadow({ mode });
+          self[shadowRootKey] = shadowRootElement;
         } catch {
         }
       }
@@ -126,8 +136,31 @@ function RemoteComponent({
         setShadowRoot(shadowRootElement);
       }
     }
-  }, [name, isolate, shadowRoot, remoteComponent, mode]);
-  const url = (0, import_react.useMemo)(() => {
+  }, [name, isolate, shadowRoot, remoteComponent, mode, src, data]);
+  (0, import_react2.useLayoutEffect)(() => {
+    if (shadowRoot && remoteComponent) {
+      const resetStyles = shadowRoot.querySelectorAll(
+        "style[data-remote-components-reset]"
+      );
+      if (resetStyles.length > 1) {
+        resetStyles.forEach((style, index) => {
+          if (index > 0) {
+            style.remove();
+          }
+        });
+      }
+      htmlRef.current = null;
+      let el = shadowRoot.childNodes[0] ?? null;
+      while (el && (!("id" in el) || el.id !== `${name}_start`)) {
+        const nextEl = el.nextSibling;
+        if (el.nodeName !== "LINK" && el.nodeName !== "STYLE") {
+          el.parentNode?.removeChild(el);
+        }
+        el = nextEl;
+      }
+    }
+  }, [shadowRoot, remoteComponent, name]);
+  const url = (0, import_react2.useMemo)(() => {
     if (typeof src !== "string")
       return new URL(
         typeof document !== "undefined" ? location.href : "http://localhost"
@@ -138,116 +171,130 @@ function RemoteComponent({
       return new URL(src, "http://localhost");
     }
   }, [src]);
-  (0, import_react.useEffect)(() => {
+  (0, import_react2.useEffect)(() => {
     let mounted = true;
-    (0, import_react.startTransition)(async () => {
-      try {
-        let html = getRemoteComponentHtml(
-          htmlRef.current ?? (endTemplateRef.current?.previousElementSibling?.tagName === "div" ? endTemplateRef.current.previousElementSibling.innerHTML : "")
-        );
-        if (!html && src) {
-          const fetchInit = {
-            method: "GET",
-            headers: {
-              Accept: "text/html"
-            },
-            credentials
+    if (src && src !== prevSrcRef.current) {
+      prevSrcRef.current = src;
+      (0, import_react2.startTransition)(async () => {
+        try {
+          let html = getRemoteComponentHtml(
+            htmlRef.current ?? (endTemplateRef.current?.previousElementSibling?.tagName === "div" ? endTemplateRef.current.previousElementSibling.innerHTML : "")
+          );
+          if (!html && src) {
+            const fetchInit = {
+              method: "GET",
+              headers: {
+                Accept: "text/html"
+              },
+              credentials
+            };
+            const res = await fetch(url, fetchInit);
+            if (!res.ok) {
+              throw new Error(
+                `Failed to fetch remote component "${name}": ${res.status}`
+              );
+            }
+            const remoteHtml = await res.text();
+            htmlRef.current = remoteHtml;
+            html = getRemoteComponentHtml(remoteHtml);
+          }
+          const parser = new DOMParser();
+          const doc = parser.parseFromString(html, "text/html");
+          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");
+          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 metadata = {
+            name: remoteName,
+            bundle,
+            route: component?.getAttribute("data-route") ?? nextData?.page ?? import_remote_component.DEFAULT_ROUTE,
+            runtime: component?.getAttribute("data-runtime") ?? (nextData?.props.__REMOTE_COMPONENT__?.runtime || import_remote_component.RUNTIME_WEBPACK)
           };
-          const res = await fetch(url, fetchInit);
-          if (!res.ok) {
-            throw new Error(
-              `Failed to fetch remote component "${name}": ${res.status}`
-            );
+          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)) {
+            throw new Error(`Failed to find component with id "${remoteName}"`);
           }
-          const remoteHtml = await res.text();
-          htmlRef.current = remoteHtml;
-          html = getRemoteComponentHtml(remoteHtml);
-        }
-        const doc = document.createElement("div");
-        doc.innerHTML = html;
-        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");
-        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 metadata = {
-          name: remoteName,
-          bundle,
-          route: component?.getAttribute("data-route") ?? nextData?.page ?? import_remote_component.DEFAULT_ROUTE,
-          runtime: component?.getAttribute("data-runtime") ?? (nextData?.props.__REMOTE_COMPONENT__?.runtime || import_remote_component.RUNTIME_WEBPACK)
-        };
-        const remoteSharedEl = doc.querySelector(`#${remoteName}_shared`);
-        const remoteShared = JSON.parse(remoteSharedEl?.textContent ?? "{}") ?? {};
-        remoteSharedEl?.parentElement?.removeChild(remoteSharedEl);
-        if (!component || !(rsc || nextData)) {
-          throw new Error(`Failed to find component with id "${remoteName}"`);
-        }
-        const links = Array.from(
-          doc.querySelectorAll("link[href]")
-        ).map((link) => ({
-          rel: link.rel,
-          href: new URL(link.getAttribute("href") ?? link.href, url).href,
-          as: link.getAttribute("as") || void 0
-        }));
-        const scripts = doc.querySelectorAll(
-          "script[src],script[data-src]"
-        );
-        const inlineScripts = doc.querySelectorAll(
-          "script:not([src]):not([data-src]):not([id*='_rsc']):not([id='__NEXT_DATA__']):not([id='__REMOTE_NEXT_DATA__'])"
-        );
-        const self = globalThis;
-        const prevNextScripts = self.__next_s;
-        const nextScripts = [];
-        self.__next_s = nextScripts;
-        await Promise.all(
-          Array.from(inlineScripts).map((script) => {
-            return new Promise((resolve) => {
-              if (script.textContent && !script.textContent.includes("self.__next_f=") && !script.textContent.includes("self.__next_f.push")) {
-                if (!script.getAttribute("type") || script.getAttribute("type") === "text/javascript" || script.getAttribute("type") === "application/javascript") {
-                  const newScript = document.createElement("script");
-                  const blob = new Blob([script.textContent], {
-                    type: "application/javascript"
-                  });
-                  const blobUrl = URL.createObjectURL(blob);
-                  newScript.onload = () => {
-                    resolve(void 0);
-                    URL.revokeObjectURL(blobUrl);
-                    newScript.remove();
-                  };
-                  newScript.onerror = () => {
-                    URL.revokeObjectURL(blobUrl);
-                    newScript.remove();
+          (0, import_apply_origin.applyOriginToNodes)(doc, url);
+          const links = Array.from(
+            doc.querySelectorAll("link[href]")
+          ).filter((link) => {
+            return !component.contains(link);
+          }).map((link) => ({
+            href: new URL(link.getAttribute("href") ?? link.href, url).href,
+            ...link.getAttributeNames().reduce((acc, key) => {
+              if (key !== "href") {
+                acc[attrToProp[key] ?? key] = link.getAttribute(key) ?? "";
+              }
+              return acc;
+            }, {})
+          }));
+          const scripts = doc.querySelectorAll(
+            "script[src],script[data-src]"
+          );
+          const inlineScripts = doc.querySelectorAll(
+            "script:not([src]):not([data-src]):not([id*='_rsc']):not([id='__NEXT_DATA__']):not([id='__REMOTE_NEXT_DATA__'])"
+          );
+          const self = globalThis;
+          const prevNextScripts = self.__next_s;
+          const nextScripts = [];
+          self.__next_s = nextScripts;
+          await Promise.all(
+            Array.from(inlineScripts).filter(
+              (script) => !(script.id.endsWith("_shared") && script.getAttribute("type") === "application/json" && typeof script.getAttribute(
+                "data-remote-components-shared"
+              ) === "string")
+            ).map((script) => {
+              return new Promise((resolve) => {
+                if (script.textContent && !script.textContent.includes("self.__next_f=") && !script.textContent.includes("self.__next_f.push")) {
+                  if (!script.getAttribute("type") || script.getAttribute("type") === "text/javascript" || script.getAttribute("type") === "application/javascript") {
+                    const newScript = document.createElement("script");
+                    const blob = new Blob([script.textContent], {
+                      type: "application/javascript"
+                    });
+                    const blobUrl = URL.createObjectURL(blob);
+                    newScript.onload = () => {
+                      resolve(void 0);
+                      URL.revokeObjectURL(blobUrl);
+                      newScript.remove();
+                    };
+                    newScript.onerror = () => {
+                      URL.revokeObjectURL(blobUrl);
+                      newScript.remove();
+                      resolve(void 0);
+                    };
+                    newScript.src = blobUrl;
+                    document.body.appendChild(newScript);
+                  } else {
                     resolve(void 0);
-                  };
-                  newScript.src = blobUrl;
-                  document.body.appendChild(newScript);
+                    document.body.appendChild(script);
+                  }
                 } else {
                   resolve(void 0);
-                  document.body.appendChild(script);
                 }
-              } else {
-                resolve(void 0);
-              }
-            });
-          })
-        );
-        nextScripts.forEach(([scriptSrc, props]) => {
-          const script = document.createElement("script");
-          if (scriptSrc) {
-            script.src = scriptSrc;
-          }
-          if (typeof props.children === "string") {
-            script.textContent = props.children;
-          }
-          (0, import_remote_component.setAttributesFromProps)(script, props);
-          document.head.appendChild(script);
-        });
-        self.__next_s = prevNextScripts;
-        if (mounted) {
+              });
+            })
+          );
+          nextScripts.forEach(([scriptSrc, props]) => {
+            const script = document.createElement("script");
+            if (scriptSrc) {
+              script.src = scriptSrc;
+            }
+            if (typeof props.children === "string") {
+              script.textContent = props.children;
+            }
+            (0, import_remote_component.setAttributesFromProps)(script, props);
+            document.head.appendChild(script);
+          });
+          self.__next_s = prevNextScripts;
           if (rsc) {
             document.body.appendChild(rsc);
           }
@@ -258,6 +305,7 @@ function RemoteComponent({
             url: url.href,
             data: rsc ? (rsc.textContent || "").split("\n").filter(Boolean) : []
           };
+          const userShared = await shared;
           const result = await (0, import_remote_component.loadRemoteComponent)({
             url: new URL(url, location.origin),
             name: remoteName,
@@ -284,25 +332,29 @@ function RemoteComponent({
                 ).href
               };
             }),
-            shared,
+            shared: {
+              ...(0, import_polyfill.sharedPolyfills)(userShared),
+              ...userShared
+            },
             remoteShared,
             container: shadowRoot
           });
+          if (rsc) {
+            rsc.remove();
+          }
+          setData(newData);
+          if (result.error) {
+            setRemoteComponent(result.error);
+          } else {
+            setRemoteComponent(result.component);
+          }
+        } catch (error) {
           if (mounted) {
-            setData(newData);
-            if (result.error) {
-              setRemoteComponent(result.error);
-            } else {
-              setRemoteComponent(result.component);
-            }
+            setRemoteComponent(error);
           }
         }
-      } catch (error) {
-        if (mounted) {
-          setRemoteComponent(error);
-        }
-      }
-    });
+      });
+    }
     return () => {
       mounted = false;
     };
@@ -316,16 +368,17 @@ function RemoteComponent({
     route: data?.route || import_remote_component.DEFAULT_ROUTE,
     runtime: data?.runtime || import_remote_component.RUNTIME_WEBPACK
   }) });
-  const linksToRender = data?.links?.map((link) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+  const resetStyle = reset ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("style", { "data-remote-components-reset": "", children: `:host { all: initial; }` }) : null;
+  const linksToRender = data?.links?.map((link) => /* @__PURE__ */ (0, import_react.createElement)(
     "link",
     {
-      as: link.as,
+      ...link,
       href: new URL(link.href, url).href,
-      rel: link.rel
-    },
-    `${link.href}_${link.rel}`
+      key: JSON.stringify(link)
+    }
   )) || null;
   const componentToRender = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+    resetStyle,
     linksToRender,
     remoteComponent ?? children
   ] });
@@ -334,20 +387,13 @@ function RemoteComponent({
     if (shadowRemoteComponentHtml) {
       shadowRemoteComponentHtml.remove();
     }
-    if (shadowRoot && remoteComponent && htmlRef.current) {
-      if (ssrHtmlRef.current) {
-        const content = shadowRoot.querySelectorAll(":not(link,style)");
-        content.forEach((node) => node.remove());
-        ssrHtmlRef.current = null;
-      }
-      htmlRef.current = null;
-    }
     return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
       metadataJson,
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
         "div",
         {
-          id: `shadowroot_${src ? new URL(src, typeof location !== "undefined" ? location.origin : "http://localhost").href.replace(/[^a-z0-9]/g, "_") : ""}_${(data?.name ?? name).replace(/[^a-z0-9]/g, "_")}`,
+          "data-remote-component-id": `shadowroot_${src ? new URL(src, typeof location !== "undefined" ? location.origin : "http://localhost").href.replace(/[^a-z0-9]/g, "_") : ""}_${(data?.name ?? name).replace(/[^a-z0-9]/g, "_")}`,
+          id: `shadowroot_${data?.name ?? name}`,
           ref: shadowRootContainerRef,
           children: [
             typeof document === "undefined" ? (
@@ -369,21 +415,18 @@ function RemoteComponent({
                     }
                   }
                 ) : null,
-                reset ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-                  "style",
-                  {
-                    "data-remote-components-reset": true,
-                    children: `:host { all: initial; }`
-                  }
-                ) : null,
+                resetStyle,
                 linksToRender,
                 children
               ] })
             ) : null,
             shadowRoot && remoteComponent ? (0, import_react_dom.createPortal)(
               /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)("template", { id: `${name}_start` }),
+                resetStyle,
                 linksToRender,
-                remoteComponent
+                remoteComponent,
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)("template", { id: `${name}_end`, ref: endTemplateRef })
               ] }),
               shadowRoot
             ) : null
@@ -392,6 +435,7 @@ function RemoteComponent({
       )
     ] });
   }
+  htmlRef.current = null;
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)("template", { id: `${name}_start` }),
     metadataJson,