rwsdk 1.0.0-beta.29 → 1.0.0-beta.30

package/dist/vite/configPlugin.mjs

@@ -3,6 +3,7 @@ import path, { resolve } from "node:path";
 import { INTERMEDIATE_SSR_BRIDGE_PATH } from "../lib/constants.mjs";
 import { buildApp } from "./buildApp.mjs";
 import { externalModules } from "./constants.mjs";
+import { ssrBridgeWrapPlugin } from "./ssrBridgeWrapPlugin.mjs";
 export const configPlugin = ({ silent, projectRootDir, workerEntryPathname, clientFiles, serverFiles, clientEntryPoints, }) => ({
     name: "rwsdk:config",
     config: async (_, { command }) => {
@@ -162,22 +163,14 @@ export const configPlugin = ({ silent, projectRootDir, workerEntryPathname, clie
                                 // causes a redeclaration error. To solve this, we wrap the SSR
                                 // bundle in an exporting IIFE. This creates a scope boundary,
                                 // preventing symbol collisions while producing a valid,
-                                // tree-shakeable ES module. The inline plugin below removes the
-                                // original `export` statement from the bundle to prevent syntax
-                                // errors.
+                                // tree-shakeable ES module.
+                                //
+                                // context(justinvdm, 19 Nov 2025): We use a custom plugin
+                                // (ssrBridgeWrapPlugin) to intelligently inject the IIFE *after*
+                                // any top-level external imports, ensuring they remain valid.
                                 inlineDynamicImports: true,
-                                banner: `export const { renderHtmlStream, ssrLoadModule, ssrWebpackRequire, ssrGetModuleExport, createThenableFromReadableStream } = (function() {`,
-                                footer: `return { renderHtmlStream, ssrLoadModule, ssrWebpackRequire, ssrGetModuleExport, createThenableFromReadableStream };\n})();`,
                             },
-                            plugins: [
-                                {
-                                    name: "rwsdk:ssr-bridge-exports",
-                                    renderChunk(code) {
-                                        // Remove the original export statement as it's now handled by the banner/footer
-                                        return code.replace(/export\s*{[^}]+};?/, "");
-                                    },
-                                },
-                            ],
+                            plugins: [ssrBridgeWrapPlugin()],
                         },
                     },
                 },

package/dist/vite/ssrBridgePlugin.mjs

@@ -77,6 +77,15 @@ export const ssrBridgePlugin = ({ clientFiles, serverFiles, }) => {
             if (process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE) {
                 return;
             }
+            // context(justinvdm, 19 Nov 2025):
+            // Ensure platform-specific modules are always treated as external in the
+            // SSR environment. This is critical for builds, where we produce a
+            // standalone SSR bundle. Without this, Vite might try to bundle these
+            // virtual modules or fail to resolve them.
+            if (this.environment.name === "ssr" && externalModulesSet.has(id)) {
+                log("SSR environment: marking %s as external", id);
+                return { id, external: true };
+            }
             if (isDev) {
                 // context(justinvdm, 27 May 2025): In dev, we need to dynamically load
                 // SSR modules, so we return the virtual id so that the dynamic loading

package/dist/vite/ssrBridgeWrapPlugin.d.mts

@@ -0,0 +1,2 @@
+import type { Plugin } from "vite";
+export declare const ssrBridgeWrapPlugin: () => Plugin;

package/dist/vite/ssrBridgeWrapPlugin.mjs

@@ -0,0 +1,85 @@
+import { Lang, parse as sgParse } from "@ast-grep/napi";
+import debug from "debug";
+import MagicString from "magic-string";
+const log = debug("rwsdk:vite:ssr-bridge-wrap");
+export const ssrBridgeWrapPlugin = () => {
+    return {
+        name: "rwsdk:ssr-bridge-wrap",
+        apply: "build",
+        renderChunk(code, chunk) {
+            try {
+                if (!chunk.fileName.endsWith("ssr_bridge.js")) {
+                    return null;
+                }
+                const s = new MagicString(code);
+                // Use AST parsing to find actual import statements (not in comments)
+                const root = sgParse(Lang.JavaScript, code);
+                // Find all import statements using AST patterns
+                const importPatterns = [
+                    'import { $$$ } from "$MODULE"',
+                    "import { $$$ } from '$MODULE'",
+                    'import $DEFAULT from "$MODULE"',
+                    "import $DEFAULT from '$MODULE'",
+                    'import * as $NS from "$MODULE"',
+                    "import * as $NS from '$MODULE'",
+                    'import "$MODULE"',
+                    "import '$MODULE'",
+                ];
+                let lastImportEnd = -1;
+                for (const pattern of importPatterns) {
+                    const matches = root.root().findAll(pattern);
+                    for (const match of matches) {
+                        const range = match.range();
+                        if (range.end.index > lastImportEnd) {
+                            lastImportEnd = range.end.index;
+                        }
+                    }
+                }
+                // Find the export statement using AST
+                const exportPatterns = [
+                    "export { $$$ }",
+                    'export { $$$ } from "$MODULE"',
+                    "export { $$$ } from '$MODULE'",
+                ];
+                let exportStart = -1;
+                let exportEnd = -1;
+                for (const pattern of exportPatterns) {
+                    const matches = root.root().findAll(pattern);
+                    for (const match of matches) {
+                        const range = match.range();
+                        // Check if this export contains our target symbols
+                        const text = match.text();
+                        if (text.includes("renderHtmlStream") &&
+                            text.includes("ssrLoadModule") &&
+                            text.includes("ssrWebpackRequire")) {
+                            exportStart = range.start.index;
+                            exportEnd = range.end.index;
+                            break;
+                        }
+                    }
+                    if (exportStart !== -1)
+                        break;
+                }
+                const banner = `export const { renderHtmlStream, ssrLoadModule, ssrWebpackRequire, ssrGetModuleExport, createThenableFromReadableStream } = (function() {`;
+                const footer = `return { renderHtmlStream, ssrLoadModule, ssrWebpackRequire, ssrGetModuleExport, createThenableFromReadableStream };\n})();`;
+                // Insert banner after the last import (or at the beginning if no imports)
+                const insertIndex = lastImportEnd === -1 ? 0 : lastImportEnd;
+                s.appendLeft(insertIndex, banner + "\n");
+                // Append footer at the end
+                s.append(footer);
+                // Remove the original export statement if found
+                if (exportStart !== -1 && exportEnd !== -1) {
+                    s.remove(exportStart, exportEnd);
+                }
+                return {
+                    code: s.toString(),
+                    map: s.generateMap(),
+                };
+            }
+            catch (e) {
+                console.error("Error in ssrBridgeWrapPlugin:", e);
+                throw e;
+            }
+        },
+    };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "1.0.0-beta.29",
+  "version": "1.0.0-beta.30",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {