remote-components 0.3.2 → 0.3.3

package/dist/host/nextjs/app/client-only.js

@@ -20,19 +20,27 @@ var init_constants = __esm({
   }
 });
 
+// src/host/defaults/shared.ts
+var shared;
+var init_shared = __esm({
+  "src/host/defaults/shared.ts"() {
+    "use strict";
+    init_constants();
+    shared = {
+      __remote_components_missing_shared__: () => Promise.reject(new Error(MISSING_SHARED_MODULES_MESSAGE))
+    };
+  }
+});
+
 // src/host/defaults/app.ts
 var app_exports = {};
 __export(app_exports, {
   shared: () => shared
 });
-var shared;
 var init_app = __esm({
   "src/host/defaults/app.ts"() {
     "use strict";
-    init_constants();
-    shared = {
-      __remote_components_missing_shared__: () => Promise.reject(new Error(MISSING_SHARED_MODULES_MESSAGE))
-    };
+    init_shared();
   }
 });
 
@@ -353,6 +361,16 @@ function createImageLoaderSharedEntries({
   };
 }
 
+// src/host/nextjs/shared-import.ts
+async function tryImportShared() {
+  try {
+    const { shared: shared2 } = await Promise.resolve().then(() => (init_app(), app_exports));
+    return shared2;
+  } catch {
+    return {};
+  }
+}
+
 // src/host/nextjs/app-client-only.tsx
 import { RemoteComponentsContext } from "#internal/host/react/context";
 
@@ -1363,10 +1381,8 @@ function requireModule(scope, moduleId, fullId) {
   if (scope.moduleCache[idStr])
     return scope.moduleCache[idStr];
   const sharedModule = getSharedModule(scope, moduleId);
-  if (sharedModule) {
-    scope.moduleCache[idStr] = sharedModule;
+  if (sharedModule)
     return sharedModule;
-  }
   return handleTurbopackModule(
     scope,
     idStr,
@@ -1374,19 +1390,10 @@ function requireModule(scope, moduleId, fullId) {
   );
 }
 function handleTurbopackModule(scope, moduleId, id) {
-  const self = globalThis;
   if (scope.moduleCache[moduleId]) {
     return scope.moduleCache[moduleId];
   }
-  const raw = self[`TURBOPACK_${scope.globalKey}`];
-  let modules;
-  if (raw && typeof raw === "object" && "__chunks__" in raw) {
-    modules = raw.__chunks__.flat();
-  } else if (Array.isArray(raw)) {
-    modules = raw.flat();
-  } else {
-    modules = raw;
-  }
+  const modules = getTurbopackModules(scope);
   if (!modules) {
     logError(
       "TurbopackModule",
@@ -1704,6 +1711,13 @@ async function loadScripts(scripts, resolveClientUrl) {
           location.origin
         ).href;
         const resolvedSrc = resolveClientUrl?.(newSrc) ?? newSrc;
+        const alreadyLoaded = Array.from(
+          document.querySelectorAll("script[src]")
+        ).some((s) => s.src === resolvedSrc);
+        if (alreadyLoaded) {
+          resolve();
+          return;
+        }
         const newScript = document.createElement("script");
         newScript.onload = () => resolve();
         newScript.onerror = () => {
@@ -2686,14 +2700,6 @@ var routerImpl = async () => {
 
 // src/host/nextjs/app-client-only.tsx
 import { jsx as jsx3 } from "react/jsx-runtime";
-async function tryImportShared() {
-  try {
-    const { shared: shared2 } = await Promise.resolve().then(() => (init_app(), app_exports));
-    return shared2;
-  } catch {
-    return {};
-  }
-}
 var sharedModules = async (userShared, resolveClientUrl) => {
   const [resolvedShared, resolvedUserShared] = await Promise.all([
     tryImportShared(),