rwsdk 0.2.0-alpha.0 → 0.2.0-alpha.10

package/dist/vite/ssrBridgePlugin.mjs

@@ -1,6 +1,7 @@
 import debug from "debug";
 import { SSR_BRIDGE_PATH } from "../lib/constants.mjs";
-import { findSsrImportSpecifiers } from "./findSsrSpecifiers.mjs";
+import { findSsrImportCallSites } from "./findSsrSpecifiers.mjs";
+import MagicString from "magic-string";
 const log = debug("rwsdk:vite:ssr-bridge-plugin");
 export const VIRTUAL_SSR_PREFIX = "virtual:rwsdk:ssr:";
 export const ssrBridgePlugin = ({ clientFiles, serverFiles, }) => {
@@ -108,35 +109,27 @@ export const ssrBridgePlugin = ({ clientFiles, serverFiles, }) => {
                         return "export default {};";
                     }
                     log("Fetched SSR module code length: %d", code?.length || 0);
-                    const { imports, dynamicImports } = findSsrImportSpecifiers(idForFetch, code || "", log);
-                    const allSpecifiers = [
-                        ...new Set([...imports, ...dynamicImports]),
-                    ].map((id) => id.startsWith("/@id/") ? id.slice("/@id/".length) : id);
-                    const switchCases = allSpecifiers
-                        .map((specifier) => `    case "${specifier}": void import("${VIRTUAL_SSR_PREFIX}${specifier}");`)
-                        .join("\n");
-                    const transformedCode = `
-await (async function(__vite_ssr_import__, __vite_ssr_dynamic_import__) {${code}})(
-  __ssrImport.bind(null, false),
-  __ssrImport.bind(null, true)
-);
-
-function __ssrImport(isDynamic, id, ...args) {
-  id = id.startsWith('/@id/') ? id.slice('/@id/'.length) : id;
-
-  switch (id) {
-${switchCases}
-  }
-
-  return isDynamic
-    ? __vite_ssr_dynamic_import__("/@id/${VIRTUAL_SSR_PREFIX}" + id, ...args)
-    : __vite_ssr_import__("/@id/${VIRTUAL_SSR_PREFIX}" + id, ...args);
-}
-`;
-                    log("Transformed SSR module code length: %d", transformedCode.length);
+                    const s = new MagicString(code || "");
+                    const callsites = findSsrImportCallSites(idForFetch, code || "", log);
+                    for (const site of callsites) {
+                        const normalized = site.specifier.startsWith("/@id/")
+                            ? site.specifier.slice("/@id/".length)
+                            : site.specifier;
+                        // context(justinvdm, 11 Aug 2025):
+                        // - We replace __vite_ssr_import__ and __vite_ssr_dynamic_import__
+                        //   with import() calls so that the module graph can be built
+                        //   correctly (vite looks for imports and import()s to build module
+                        //   graph)
+                        // - We prepend /@id/$VIRTUAL_SSR_PREFIX to the specifier so that we
+                        //   can stay within the SSR subgraph of the worker module graph
+                        const replacement = `import("/@id/${VIRTUAL_SSR_PREFIX}${normalized}")`;
+                        s.overwrite(site.start, site.end, replacement);
+                    }
+                    const out = s.toString();
+                    log("Transformed SSR module code length: %d", out.length);
                     process.env.VERBOSE &&
-                        log("Transformed SSR module code for realId=%s: %s", realId, transformedCode);
-                    return transformedCode;
+                        log("Transformed SSR module code for realId=%s: %s", realId, out);
+                    return out;
                 }
             }
             process.env.VERBOSE && log("No load handling for id=%s", id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "0.2.0-alpha.0",
+  "version": "0.2.0-alpha.10",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {