remote-components 0.0.23 → 0.0.25

package/dist/html/host.js

@@ -157,14 +157,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>.+)/;
@@ -373,7 +384,7 @@ function initializeSharedModules(bundle, shared = {}, remoteShared = {}) {
     Object.entries(remoteShared).map(async ([id, module]) => {
       if (self.__remote_shared_modules__?.[bundle]) {
         if (shared[module]) {
-          self.__remote_shared_modules__[bundle][id.replace("[app-ssr]", "[app-client]")] = await shared[module]();
+          self.__remote_shared_modules__[bundle][id.replace("[app-ssr]", "[app-client]")] = await shared[module](bundle);
         } else {
           console.error(`Shared module "${module}" not found for "${bundle}".`);
         }
@@ -386,7 +397,7 @@ function getSharedModule(bundle, id) {
   for (const [key, value] of Object.entries(
     self.__remote_shared_modules__?.[bundle] ?? {}
   )) {
-    if (typeof id === "string" && id.includes(key) || id === key) {
+    if (typeof value !== "undefined" && (typeof id === "string" && id.includes(key) || id === key)) {
       return value;
     }
   }
@@ -520,6 +531,24 @@ var init_webpack_adapter = __esm({
 
 // src/shared/client/polyfill.tsx
 import { jsx } from "react/jsx-runtime";
+function applyBundleUrlToSrc(bundle, src) {
+  const self = globalThis;
+  if (self.__remote_bundle_url__?.[bundle]?.origin === location.origin) {
+    return src;
+  }
+  const { assetPrefix, path } = /^(?<assetPrefix>.*?)\/_next\/(?<path>.*)/.exec(src)?.groups ?? {};
+  if (!path) {
+    return new URL(src, self.__remote_bundle_url__?.[bundle]?.origin).href;
+  }
+  return `${self.__remote_bundle_url__?.[bundle]?.origin ?? ""}${assetPrefix}/_next/${path}`;
+}
+function applyBundleUrlToImagePropsSrc(bundle, src) {
+  if (typeof src === "string") {
+    return applyBundleUrlToSrc(bundle, src);
+  }
+  const propSrc = src;
+  return applyBundleUrlToSrc(bundle, propSrc.src);
+}
 function sharedPolyfills(shared) {
   const self = globalThis;
   const polyfill = {
@@ -555,18 +584,17 @@ function sharedPolyfills(shared) {
       },
       __esModule: true
     })),
-    "next/dist/client/image-component": self.__remote_component_host_shared_modules__?.["next/image"] ?? shared?.["next/image"] ?? (() => Promise.resolve({
-      Image: (props) => (
-        // eslint-disable-next-line @next/next/no-img-element, jsx-a11y/alt-text
-        /* @__PURE__ */ jsx(
-          "img",
-          {
-            ...props,
-            src: props.src,
-            suppressHydrationWarning: true
-          }
-        )
-      ),
+    "next/dist/client/image-component": self.__remote_component_host_shared_modules__?.["next/image"] ?? shared?.["next/image"] ?? ((bundle) => Promise.resolve({
+      Image: imageImpl(bundle),
+      __esModule: true
+    })),
+    "next/image": self.__remote_component_host_shared_modules__?.["next/image"] ?? shared?.["next/image"] ?? ((bundle) => Promise.resolve({
+      default: imageImpl(bundle),
+      getImageProps: (_imgProps) => {
+        throw new Error(
+          "Next.js getImageProps() is not implemented in remote components"
+        );
+      },
       __esModule: true
     })),
     "next/dist/client/script": self.__remote_component_host_shared_modules__?.["next/script"] ?? shared?.["next/script"] ?? (() => Promise.resolve({
@@ -574,19 +602,57 @@ function sharedPolyfills(shared) {
       // do not throw an error for now
       default: () => null,
       __esModule: true
-    }))
+    })),
+    "next/router": self.__remote_component_host_shared_modules__?.["next/router"] ?? shared?.["next/router"] ?? (() => (
+      // TODO: incomplete implementation
+      Promise.resolve({
+        useRouter() {
+          return {
+            push: (routerUrl) => {
+              history.pushState({}, "", routerUrl);
+            },
+            replace: (routerUrl) => {
+              history.replaceState({}, "", routerUrl);
+            },
+            back: () => {
+              history.back();
+            }
+          };
+        },
+        __esModule: true
+      })
+    ))
   };
   polyfill["next/navigation"] = polyfill["next/dist/client/components/navigation"];
   polyfill["next/link"] = polyfill["next/dist/client/app-dir/link"];
   polyfill["next/form"] = polyfill["next/dist/client/app-dir/form"];
-  polyfill["next/image"] = polyfill["next/dist/client/image-component"];
   polyfill["next/dist/api/image"] = polyfill["next/dist/client/image-component"];
   polyfill["next/script"] = polyfill["next/dist/client/script"];
   return polyfill;
 }
+var imageImpl;
 var init_polyfill = __esm({
   "src/shared/client/polyfill.tsx"() {
     "use strict";
+    imageImpl = (bundle) => function RemoteImage({ priority: _, ...props }) {
+      const newSrc = applyBundleUrlToImagePropsSrc(
+        bundle,
+        typeof props.src === "string" ? props.src : props.src.src
+      );
+      return (
+        // eslint-disable-next-line @next/next/no-img-element, jsx-a11y/alt-text
+        /* @__PURE__ */ jsx(
+          "img",
+          {
+            decoding: "async",
+            style: { color: "transparent" },
+            ...props,
+            src: newSrc,
+            suppressHydrationWarning: true
+          }
+        )
+      );
+    };
   }
 });
 
@@ -629,6 +695,7 @@ async function webpackRuntime(bundle, shared, remoteShared) {
           const newScript = document.createElement("script");
           newScript.onload = () => {
             resolve2();
+            newScript.remove();
           };
           newScript.onerror = () => {
             reject(
@@ -636,6 +703,7 @@ async function webpackRuntime(bundle, shared, remoteShared) {
                 `Failed to load script ${script.src} for remote component`
               )
             );
+            newScript.remove();
           };
           const scriptSrc = script.getAttribute("src") || script.getAttribute("data-src");
           if (scriptSrc) {
@@ -674,7 +742,7 @@ async function webpackRuntime(bundle, shared, remoteShared) {
     await Promise.all(
       Object.entries(resolve).map(async ([key, value]) => {
         if (typeof value === "function") {
-          resolve[key] = await value();
+          resolve[key] = await value(remoteBundle);
         }
         return Promise.resolve(value);
       })
@@ -753,7 +821,7 @@ var init_turbopack = __esm({
 });
 
 // src/html/host/index.tsx
-import { startTransition } from "react";
+import { startTransition, useLayoutEffect } from "react";
 import { hydrateRoot } from "react-dom/client";
 
 // src/shared/client/component-loader.ts
@@ -786,26 +854,27 @@ function fixPayload(payload) {
     }
   }
 }
-function createRSCStream(name, data) {
+function createRSCStream(rscName, data) {
   return new 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(
@@ -835,6 +904,44 @@ 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",
+  "source",
+  "video",
+  "audio",
+  "track",
+  "iframe",
+  "embed",
+  "script",
+  "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);
+      }
+    }
+  });
+}
+
 // src/html/host/runtime/index.ts
 async function getRuntime(type, url, bundle, shared, remoteShared) {
   if (typeof globalThis.process === "undefined") {
@@ -857,44 +964,64 @@ import { jsx as jsx2 } from "react/jsx-runtime";
 if (typeof HTMLElement !== "undefined") {
   class RemoteComponent extends HTMLElement {
     constructor() {
-      super();
+      super(...arguments);
       this.__next = null;
       this.fouc = null;
       this.isLoading = false;
       this.root = null;
-      this.root = this.attachShadow({
-        mode: this.getAttribute("mode") === "closed" ? "closed" : "open"
-      });
-      this.fallbackSlot = document.createElement("slot");
-      this.root.appendChild(this.fallbackSlot);
-      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) => {
-          throw new Error(`Failed to load remote component: ${e}`);
-        });
-      }
     }
     static get observedAttributes() {
-      return ["src", "name"];
+      return ["src", "name", "mode"];
     }
     // watch for src attribute changes
     // this is required to reload the remote component when the src attribute is added later
     // this is for rendering the custom element using React
     attributeChangedCallback(name, oldValue, newValue) {
       if ((name === "src" || name === "name") && oldValue !== newValue) {
+        if (this.getAttribute("src")) {
+          this.load().catch((e) => {
+            console.error(e);
+            throw new Error(
+              `Failed to load remote component: ${this.bundle ?? this.name ?? this.getAttribute("src")}`
+            );
+          });
+        }
+      } else if (name === "mode" && oldValue !== newValue && this.root) {
+        const newRoot = this.attachShadow({
+          mode: newValue === "closed" ? "closed" : "open"
+        });
+        Array.from(this.root.children).forEach((child) => {
+          newRoot.appendChild(child);
+        });
+        this.root = newRoot;
         this.load().catch((e) => {
-          console.error(e);
-          throw new Error(
-            `Failed to load remote component: ${this.bundle ?? this.name ?? this.getAttribute("src")}`
-          );
+          throw new Error(`Failed to load remote component: ${e}`);
         });
       }
     }
     async load() {
+      await new Promise((resolve) => {
+        (typeof queueMicrotask === "function" ? queueMicrotask : requestAnimationFrame)(() => {
+          resolve(void 0);
+        });
+      });
       if (this.isLoading) {
         return;
       }
+      if (!this.root) {
+        this.root = this.attachShadow({
+          mode: this.getAttribute("mode") === "closed" ? "closed" : "open"
+        });
+        this.fallbackSlot = document.createElement("slot");
+        this.root.appendChild(this.fallbackSlot);
+      }
+      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) => {
+          throw new Error(`Failed to load remote component: ${e}`);
+        });
+      }
       this.isLoading = true;
       const src = this.getAttribute("src");
       const remoteComponentChild = this.querySelector("div#__REMOTE_COMPONENT__") || this.querySelector("div[data-bundle][data-route]");
@@ -925,8 +1052,8 @@ if (typeof HTMLElement !== "undefined") {
         }
         html = await res.text();
       }
-      const doc = document.createElement("div");
-      doc.innerHTML = html;
+      const parser = new DOMParser();
+      const doc = parser.parseFromString(html, "text/html");
       const component = doc.querySelector(`div[data-bundle][data-route][id^="${this.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");
@@ -936,11 +1063,18 @@ if (typeof HTMLElement !== "undefined") {
       if (nextData && nextData.buildId === "development" && !this.reactRoot) {
         this.fouc = document.createElement("style");
         this.fouc.textContent = `:host { display: none; }`;
-        this.root?.appendChild(this.fouc);
+        this.root.appendChild(this.fouc);
       }
       this.name = component?.getAttribute("id")?.replace(/_ssr$/, "") || (nextData ? "__next" : this.name);
       const rsc = doc.querySelector(`#${this.name}_rsc`);
       this.bundle = component?.getAttribute("data-bundle") || nextData?.props.__REMOTE_COMPONENT__?.bundle || this.bundle;
+      if (url) {
+        const self2 = globalThis;
+        if (!self2.__remote_bundle_url__) {
+          self2.__remote_bundle_url__ = {};
+        }
+        self2.__remote_bundle_url__[this.bundle ?? "default"] = url;
+      }
       const metadata = document.createElement("script");
       metadata.type = "application/json";
       metadata.setAttribute("data-remote-component", "");
@@ -950,47 +1084,81 @@ if (typeof HTMLElement !== "undefined") {
         route: component?.getAttribute("data-route") ?? nextData?.page ?? "/",
         runtime: component?.getAttribute("data-runtime") ?? nextData?.props.__REMOTE_COMPONENT__?.runtime
       });
-      this.parentNode?.insertBefore(metadata, this);
-      const remoteSharedEl = doc.querySelector(`#${this.name}_shared`);
-      const remoteShared = JSON.parse(remoteSharedEl?.textContent ?? "{}") ?? {};
+      if (this.previousElementSibling?.getAttribute("data-remote-component") !== null) {
+        this.previousElementSibling?.remove();
+      }
+      this.parentElement?.insertBefore(metadata, this);
+      const remoteSharedEl = doc.querySelector(
+        `#${this.name}_shared[data-remote-components-shared]`
+      );
+      const remoteShared = nextData?.props.__REMOTE_COMPONENT__?.shared ?? (JSON.parse(remoteSharedEl?.textContent ?? "{}") ?? {});
       remoteSharedEl?.parentElement?.removeChild(remoteSharedEl);
       if (!component || !(rsc || nextData)) {
         throw new Error(`Failed to find component with id "${this.name}"`);
       }
       const removable = Array.from(this.childNodes);
       const links = doc.querySelectorAll("link[href]");
-      await Promise.all(
-        Array.from(links).map((link) => {
-          return new Promise((resolve, reject) => {
-            const newLink = document.createElement("link");
-            if (link.rel === "stylesheet") {
-              newLink.onload = () => {
+      const remoteComponentSrc = this.getAttribute("src");
+      const attachLinks = async () => {
+        await Promise.all(
+          Array.from(links).filter((link) => {
+            return !component.contains(link);
+          }).map((link) => {
+            return new Promise((resolve, reject) => {
+              const newLink = document.createElement("link");
+              if (link.rel === "stylesheet") {
+                newLink.onload = () => {
+                  resolve();
+                };
+                newLink.onerror = () => {
+                  reject(
+                    new Error(
+                      `Failed to load link ${link.href} for remote component`
+                    )
+                  );
+                };
+              } else {
                 resolve();
-              };
-              newLink.onerror = () => {
-                reject(
-                  new Error(
-                    `Failed to load link ${link.href} for remote component`
-                  )
-                );
-              };
-            } else {
-              resolve();
-            }
-            for (const attr of link.attributes) {
-              if (attr.name === "href") {
+              }
+              for (const attr of link.attributes) {
+                if (attr.name === "href") {
+                  newLink.setAttribute(
+                    attr.name,
+                    new URL(attr.value, url ?? location.origin).href
+                  );
+                } else {
+                  newLink.setAttribute(attr.name, attr.value);
+                }
+              }
+              if (remoteComponentSrc) {
                 newLink.setAttribute(
-                  attr.name,
-                  new URL(attr.value, url ?? location.origin).href
+                  "data-remote-component-src",
+                  remoteComponentSrc
                 );
-              } else {
-                newLink.setAttribute(attr.name, attr.value);
               }
+              this.root?.appendChild(newLink);
+            });
+          })
+        );
+        const styles = doc.querySelectorAll("style");
+        styles.forEach((style) => {
+          if (style.parentElement?.tagName.toLowerCase() === "head") {
+            const newStyle = document.createElement("style");
+            newStyle.textContent = style.textContent;
+            if (remoteComponentSrc) {
+              newStyle.setAttribute(
+                "data-remote-component-src",
+                remoteComponentSrc
+              );
             }
-            this.root?.appendChild(newLink);
-          });
-        })
-      );
+            this.root?.appendChild(newStyle);
+          }
+        });
+      };
+      if (!this.reactRoot) {
+        await attachLinks();
+      }
+      applyOriginToNodes(doc, url ?? new URL(location.href));
       if (!this.reactRoot) {
         Array.from(component.children).forEach((el) => {
           this.root?.appendChild(el);
@@ -999,12 +1167,32 @@ if (typeof HTMLElement !== "undefined") {
       for (const el of removable) {
         el.parentElement?.removeChild(el);
       }
-      this.fallbackSlot.remove();
-      if (this.getAttribute("reset") !== null && !this.root?.querySelector("style[data-remote-components-reset]")) {
-        const allInitial = document.createElement("style");
-        allInitial.setAttribute("data-remote-components-reset", "");
-        allInitial.textContent = `:host { all: initial; }`;
-        this.root?.prepend(allInitial);
+      this.fallbackSlot?.remove();
+      const applyReset = () => {
+        if (this.getAttribute("reset") !== null && !this.root?.querySelector("link[data-remote-components-reset]")) {
+          const allInitial = document.createElement("link");
+          allInitial.setAttribute("data-remote-components-reset", "");
+          const css = `:host { all: initial; }`;
+          const allInitialHref = URL.createObjectURL(
+            new Blob([css], { type: "text/css" })
+          );
+          allInitial.href = allInitialHref;
+          allInitial.rel = "stylesheet";
+          allInitial.onload = () => {
+            URL.revokeObjectURL(allInitialHref);
+            allInitial.removeAttribute("onload");
+          };
+          allInitial.onerror = () => {
+            URL.revokeObjectURL(allInitialHref);
+            allInitial.removeAttribute("onload");
+          };
+          this.root?.prepend(allInitial);
+        } else if (this.getAttribute("reset") === null && this.root?.querySelector("link[data-remote-components-reset]")) {
+          this.root.querySelector("link[data-remote-components-reset]")?.remove();
+        }
+      };
+      if (!this.reactRoot) {
+        applyReset();
       }
       const {
         self,
@@ -1039,20 +1227,59 @@ if (typeof HTMLElement !== "undefined") {
         this.bundle ?? "default",
         this.name ?? "__vercel_remote_component"
       );
+      const doCleanup = () => {
+        if (this.root && remoteComponentSrc) {
+          const selector = `[data-remote-component-src]:not([data-remote-component-src="${remoteComponentSrc}"])`;
+          const prevCleanup = [
+            ...this.root.querySelectorAll(selector),
+            ...document.body.querySelectorAll(selector)
+          ];
+          if (prevCleanup.length > 0) {
+            prevCleanup.forEach((prev) => {
+              prev.remove();
+            });
+          }
+        }
+      };
       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
+          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));
+          useLayoutEffect(() => {
+            if (self[name]) {
+              delete self[name];
+            }
+            const rscScript = document.getElementById(`${name}_rsc`);
+            if (rscScript) {
+              rscScript.remove();
+            }
+            doCleanup();
+            applyReset();
+            if (!initial) {
+              attachLinks().catch((e) => {
+                console.error(e);
+              });
+            }
+            this.isLoading = false;
+          }, [initial, name]);
           return Component;
         };
         if (this.reactRoot) {
@@ -1062,11 +1289,11 @@ if (typeof HTMLElement !== "undefined") {
               /* @__PURE__ */ jsx2(
                 RemoteComponentFromReadableStream,
                 {
+                  initial: false,
                   name: this.name ?? "__vercel_remote_component"
                 }
               )
             );
-            this.isLoading = false;
           });
           return;
         }
@@ -1077,6 +1304,7 @@ if (typeof HTMLElement !== "undefined") {
           /* @__PURE__ */ jsx2(
             RemoteComponentFromReadableStream,
             {
+              initial: true,
               name: this.name ?? "__vercel_remote_component"
             }
           )
@@ -1088,12 +1316,24 @@ if (typeof HTMLElement !== "undefined") {
           this.root
         );
         if (Component) {
+          const RemoteComponentFromNext = ((NextApp, NextComponent, remoteComponent = this) => function RemoteComponentNext({ initial }) {
+            useLayoutEffect(() => {
+              doCleanup();
+              if (!initial) {
+                applyReset();
+                attachLinks().catch((e) => {
+                  console.error(e);
+                });
+              }
+              remoteComponent.isLoading = false;
+            }, [initial]);
+            return NextApp ? /* @__PURE__ */ jsx2(NextApp, { Component: NextComponent, ...nextData.props }) : /* @__PURE__ */ jsx2(NextComponent, { ...nextData.props });
+          })(App, Component, this);
           if (this.reactRoot) {
             const root = this.reactRoot;
             startTransition(() => {
-              root.render(
-                App ? /* @__PURE__ */ jsx2(App, { Component, ...nextData.props }) : /* @__PURE__ */ jsx2(Component, { ...nextData.props })
-              );
+              root.render(/* @__PURE__ */ jsx2(RemoteComponentFromNext, { initial: false }));
+              doCleanup();
               this.isLoading = false;
             });
             return;
@@ -1102,11 +1342,11 @@ if (typeof HTMLElement !== "undefined") {
             // hydrateRoot expects a document or element, but it works for the shadow DOM too
             // @ts-expect-error support for shadow DOM
             this.root,
-            App ? /* @__PURE__ */ jsx2(App, { Component, ...nextData.props }) : /* @__PURE__ */ jsx2(Component, { ...nextData.props })
+            /* @__PURE__ */ jsx2(RemoteComponentFromNext, { initial: true })
           );
         }
         if (this.fouc) {
-          this.root?.removeChild(this.fouc);
+          this.root.removeChild(this.fouc);
         }
       }
       this.isLoading = false;