rwsdk 1.0.0-alpha.2 → 1.0.0-alpha.20

package/dist/runtime/render/stylesheets.js

@@ -1,5 +1,4 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-import { use } from "react";
 import { getManifest } from "../lib/manifest.js";
 const findCssForModule = (scriptId, manifest) => {
     const css = new Set();
@@ -22,8 +21,8 @@ const findCssForModule = (scriptId, manifest) => {
     inner(scriptId);
     return Array.from(css);
 };
-export const Stylesheets = ({ requestInfo }) => {
-    const manifest = use(getManifest());
+export const Stylesheets = async ({ requestInfo, }) => {
+    const manifest = await getManifest();
     const allStylesheets = new Set();
     for (const scriptId of requestInfo.rw.scriptsToBeLoaded) {
         const css = findCssForModule(scriptId, manifest);

package/dist/runtime/requestInfo/types.d.ts

@@ -5,8 +5,6 @@ export interface RequestInfo<Params = any, AppContext = DefaultAppContext> {
     request: Request;
     params: Params;
     ctx: AppContext;
-    /** @deprecated: Use `response.headers` instead */
-    headers: Headers;
     rw: RwContext;
     cf: ExecutionContext;
     response: ResponseInit & {

package/dist/runtime/requestInfo/worker.js

@@ -2,15 +2,7 @@ import { AsyncLocalStorage } from "async_hooks";
 const requestInfoDeferred = Promise.withResolvers();
 const requestInfoStore = new AsyncLocalStorage();
 const requestInfoBase = {};
-const REQUEST_INFO_KEYS = [
-    "request",
-    "params",
-    "ctx",
-    "headers",
-    "rw",
-    "cf",
-    "response",
-];
+const REQUEST_INFO_KEYS = ["request", "params", "ctx", "rw", "cf", "response"];
 REQUEST_INFO_KEYS.forEach((key) => {
     Object.defineProperty(requestInfoBase, key, {
         enumerable: true,

package/dist/runtime/ssrBridge.d.ts

@@ -1,2 +1,3 @@
-export { renderRscThenableToHtmlStream } from "./render/renderRscThenableToHtmlStream";
+export { renderHtmlStream } from "./render/renderHtmlStream";
+export { createThenableFromReadableStream } from "./render/createThenableFromReadableStream";
 export { ssrLoadModule, ssrGetModuleExport, ssrWebpackRequire, } from "./imports/ssr";

package/dist/runtime/ssrBridge.js

@@ -7,5 +7,6 @@
 // import it through this bridge module, using the bare import path
 // `rwsdk/__ssr_bridge`. We have bundler logic (ssrBridgePlugin) that looks out
 // for imports to it.
-export { renderRscThenableToHtmlStream } from "./render/renderRscThenableToHtmlStream";
+export { renderHtmlStream } from "./render/renderHtmlStream";
+export { createThenableFromReadableStream } from "./render/createThenableFromReadableStream";
 export { ssrLoadModule, ssrGetModuleExport, ssrWebpackRequire, } from "./imports/ssr";

package/dist/runtime/worker.d.ts

@@ -1,6 +1,7 @@
 import React from "react";
 import { RequestInfo, DefaultAppContext } from "./requestInfo/types";
 import { Route } from "./lib/router";
+export * from "./requestInfo/types";
 declare global {
     type Env = {
         ASSETS: Fetcher;

package/dist/runtime/worker.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { transformRscToHtmlStream } from "./render/transformRscToHtmlStream";
+import { renderDocumentHtmlStream } from "./render/renderDocumentHtmlStream";
+import { normalizeActionResult } from "./render/normalizeActionResult";
 import { renderToRscStream } from "./render/renderToRscStream";
 import { rscActionHandler } from "./register/worker";
 import { injectRSCPayload } from "rsc-html-stream/server";
@@ -8,6 +9,7 @@ import { getRequestInfo, runWithRequestInfo, runWithRequestInfoOverrides, } from
 import { defineRoutes } from "./lib/router";
 import { generateNonce } from "./lib/utils";
 import { ssrWebpackRequire } from "./imports/worker";
+export * from "./requestInfo/types";
 export const defineApp = (routes) => {
     return {
         fetch: async (request, env, cf) => {
@@ -34,7 +36,6 @@ export const defineApp = (routes) => {
                 const isRSCRequest = url.searchParams.has("__rsc") ||
                     request.headers.get("accept")?.includes("text/x-component");
                 const isAction = url.searchParams.has("__rsc_action_id");
-                const userHeaders = new Headers();
                 const rw = {
                     Document: DefaultDocument,
                     nonce: generateNonce(),
@@ -50,7 +51,6 @@ export const defineApp = (routes) => {
                 };
                 const outerRequestInfo = {
                     request,
-                    headers: userHeaders,
                     cf,
                     params: {},
                     ctx: {},
@@ -79,12 +79,14 @@ export const defineApp = (routes) => {
                             status: 500,
                         });
                     }
-                    const actionResult = requestInfo.rw.actionResult;
+                    const actionResult = normalizeActionResult(requestInfo.rw.actionResult);
                     const pageElement = createPageElement(requestInfo, Page);
                     const { rscPayload: shouldInjectRSCPayload } = rw;
                     let rscPayloadStream = renderToRscStream({
-                        node: pageElement,
-                        actionResult: actionResult instanceof Response ? null : actionResult,
+                        input: {
+                            node: pageElement,
+                            actionResult,
+                        },
                         onError,
                     });
                     if (isRSCRequest) {
@@ -104,11 +106,12 @@ export const defineApp = (routes) => {
                             nonce: rw.nonce,
                         });
                     }
-                    let html = await transformRscToHtmlStream({
-                        stream: rscPayloadStream,
+                    let html = await renderDocumentHtmlStream({
+                        rscPayloadStream: rscPayloadStream,
                         Document: rw.Document,
                         requestInfo: requestInfo,
                         onError,
+                        shouldSSR: rw.ssr,
                     });
                     if (injectRSCPayloadStream) {
                         html = html.pipeThrough(injectRSCPayloadStream);
@@ -139,12 +142,6 @@ export const defineApp = (routes) => {
                 // context(justinvdm, 18 Mar 2025): In some cases, such as a .fetch() call to a durable object instance, or Response.redirect(),
                 // we need to return a mutable response object.
                 const mutableResponse = new Response(response.body, response);
-                // Merge user headers from the legacy headers object
-                for (const [key, value] of userHeaders.entries()) {
-                    if (!response.headers.has(key)) {
-                        mutableResponse.headers.set(key, value);
-                    }
-                }
                 // Merge headers from user response init (these take precedence)
                 if (userResponseInit.headers) {
                     const userResponseHeaders = new Headers(userResponseInit.headers);

package/dist/scripts/debug-sync.mjs

@@ -6,27 +6,6 @@ import { existsSync } from "node:fs";
 import chokidar from "chokidar";
 import { lock } from "proper-lockfile";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const getPackageManagerInfo = (targetDir) => {
-    if (existsSync(path.join(targetDir, "bun.lock"))) {
-        return { name: "bun", lockFile: "bun.lock", command: "add" };
-    }
-    const pnpmResult = {
-        name: "pnpm",
-        lockFile: "pnpm-lock.yaml",
-        command: "add",
-    };
-    if (existsSync(path.join(targetDir, "yarn.lock"))) {
-        return { name: "yarn", lockFile: "yarn.lock", command: "add" };
-    }
-    if (existsSync(path.join(targetDir, "pnpm-lock.yaml")) ||
-        existsSync(path.join(targetDir, "node_modules", ".pnpm"))) {
-        return pnpmResult;
-    }
-    if (existsSync(path.join(targetDir, "package-lock.json"))) {
-        return { name: "npm", lockFile: "package-lock.json", command: "install" };
-    }
-    return pnpmResult;
-};
 const cleanupViteEntries = async (targetDir) => {
     const nodeModulesDir = path.join(targetDir, "node_modules");
     if (!existsSync(nodeModulesDir)) {
@@ -58,91 +37,6 @@ const cleanupViteEntries = async (targetDir) => {
         console.log(`Failed to cleanup vite cache entries: ${error}`);
     }
 };
-const performFullSync = async (sdkDir, targetDir) => {
-    let tarballPath = "";
-    let tarballName = "";
-    // Clean up vite cache
-    await cleanupViteEntries(targetDir);
-    try {
-        console.log("📦 Packing SDK...");
-        const packResult = await $({ cwd: sdkDir }) `npm pack --json`;
-        const json = JSON.parse(packResult.stdout || "[]");
-        const packInfo = Array.isArray(json) ? json[0] : undefined;
-        tarballName = (packInfo && (packInfo.filename || packInfo.name)) || "";
-        if (!tarballName) {
-            console.error("❌ Failed to get tarball name from npm pack.");
-            return;
-        }
-        tarballPath = path.resolve(sdkDir, tarballName);
-        console.log(`💿 Installing ${tarballName} in ${targetDir}...`);
-        const pm = getPackageManagerInfo(targetDir);
-        const packageJsonPath = path.join(targetDir, "package.json");
-        const lockfilePath = path.join(targetDir, pm.lockFile);
-        const originalPackageJson = await fs
-            .readFile(packageJsonPath, "utf-8")
-            .catch(() => null);
-        const originalLockfile = await fs
-            .readFile(lockfilePath, "utf-8")
-            .catch(() => null);
-        try {
-            // For bun, we need to remove the existing dependency from package.json
-            // before adding the tarball to avoid a dependency loop error.
-            if (pm.name === "bun" && originalPackageJson) {
-                try {
-                    const targetPackageJson = JSON.parse(originalPackageJson);
-                    let modified = false;
-                    if (targetPackageJson.dependencies?.rwsdk) {
-                        delete targetPackageJson.dependencies.rwsdk;
-                        modified = true;
-                    }
-                    if (targetPackageJson.devDependencies?.rwsdk) {
-                        delete targetPackageJson.devDependencies.rwsdk;
-                        modified = true;
-                    }
-                    if (modified) {
-                        console.log("Temporarily removing rwsdk from target package.json to prevent dependency loop with bun.");
-                        await fs.writeFile(packageJsonPath, JSON.stringify(targetPackageJson, null, 2));
-                    }
-                }
-                catch (e) {
-                    console.warn("Could not modify target package.json, proceeding anyway.");
-                }
-            }
-            const cmd = pm.name;
-            const args = [pm.command];
-            if (pm.name === "yarn") {
-                // For modern yarn, disable PnP to avoid resolution issues with local tarballs
-                process.env.YARN_NODE_LINKER = "node-modules";
-                args.push(`rwsdk@file:${tarballPath}`);
-            }
-            else {
-                args.push(tarballPath);
-            }
-            await $(cmd, args, {
-                cwd: targetDir,
-                stdio: "inherit",
-            });
-        }
-        finally {
-            if (originalPackageJson) {
-                console.log("Restoring package.json...");
-                await fs.writeFile(packageJsonPath, originalPackageJson);
-            }
-            if (originalLockfile) {
-                console.log(`Restoring ${pm.lockFile}...`);
-                await fs.writeFile(lockfilePath, originalLockfile);
-            }
-        }
-    }
-    finally {
-        if (tarballPath) {
-            console.log("Removing tarball...");
-            await fs.unlink(tarballPath).catch(() => {
-                // ignore if deletion fails
-            });
-        }
-    }
-};
 const syncFilesWithRsyncOrFs = async (sdkDir, destDir, filesEntries) => {
     const sources = filesEntries.map((p) => path.join(sdkDir, p));
     // Always include package.json in sync
@@ -191,45 +85,120 @@ const syncFilesWithRsyncOrFs = async (sdkDir, destDir, filesEntries) => {
         }
     }
 };
-const performFastSync = async (sdkDir, targetDir) => {
-    console.log("⚡️ No dependency changes, performing fast sync...");
-    // Clean up vite cache
-    await cleanupViteEntries(targetDir);
-    const nodeModulesPkgDir = path.join(targetDir, "node_modules", "rwsdk");
-    // Copy directories/files declared in package.json#files (plus package.json)
-    const filesToSync = JSON.parse(await fs.readFile(path.join(sdkDir, "package.json"), "utf-8"))
-        .files || [];
-    await syncFilesWithRsyncOrFs(sdkDir, nodeModulesPkgDir, filesToSync);
+const findUp = async (names, startDir) => {
+    let dir = startDir;
+    while (dir !== path.dirname(dir)) {
+        for (const name of names) {
+            const filePath = path.join(dir, name);
+            if (existsSync(filePath)) {
+                return dir;
+            }
+        }
+        dir = path.dirname(dir);
+    }
+    return undefined;
+};
+const getMonorepoRoot = async (startDir) => {
+    try {
+        // `pnpm root` is the most reliable way to find the workspace root node_modules
+        const { stdout } = await $({
+            cwd: startDir,
+        }) `pnpm root`;
+        // pnpm root returns the node_modules path, so we go up one level
+        return path.resolve(stdout, "..");
+    }
+    catch (e) {
+        console.warn(`Could not determine pnpm root from ${startDir}. Falling back to file search.`);
+        const root = await findUp(["pnpm-workspace.yaml"], startDir);
+        if (root) {
+            return root;
+        }
+    }
+    console.warn("Could not find pnpm monorepo root. Using parent directory of target as fallback.");
+    return path.resolve(startDir, "..");
 };
 const areDependenciesEqual = (deps1, deps2) => {
     // Simple string comparison for this use case is sufficient
     return JSON.stringify(deps1 ?? {}) === JSON.stringify(deps2 ?? {});
 };
+const performFullSync = async (sdkDir, targetDir, monorepoRoot) => {
+    console.log("📦 Performing full sync with tarball...");
+    let tarballPath = "";
+    const projectName = path.basename(targetDir);
+    const rwsyncDir = path.join(monorepoRoot, "node_modules", `.rwsync_${projectName}`);
+    try {
+        // 1. Pack the SDK
+        const packResult = await $({ cwd: sdkDir }) `npm pack --json`;
+        const json = JSON.parse(packResult.stdout || "[]");
+        const packInfo = Array.isArray(json) ? json[0] : undefined;
+        const tarballName = (packInfo && (packInfo.filename || packInfo.name)) || "";
+        if (!tarballName) {
+            throw new Error("Failed to get tarball name from npm pack.");
+        }
+        tarballPath = path.resolve(sdkDir, tarballName);
+        // 2. Prepare isolated install directory
+        console.log(`Preparing isolated install directory at ${rwsyncDir}`);
+        await fs.rm(rwsyncDir, { recursive: true, force: true });
+        await fs.mkdir(rwsyncDir, { recursive: true });
+        await fs.writeFile(path.join(rwsyncDir, "package.json"), JSON.stringify({ name: `rwsync-env-${projectName}` }, null, 2));
+        // 3. Perform isolated install
+        console.log(`Installing ${tarballName} in isolation...`);
+        await $("pnpm", ["add", tarballPath], {
+            cwd: rwsyncDir,
+            stdio: "inherit",
+        });
+        // 4. Create symlink
+        const symlinkSource = path.join(rwsyncDir, "node_modules", "rwsdk");
+        const symlinkTarget = path.join(targetDir, "node_modules", "rwsdk");
+        console.log(`Symlinking ${symlinkTarget} -> ${symlinkSource}`);
+        await fs.rm(symlinkTarget, { recursive: true, force: true });
+        await fs.mkdir(path.dirname(symlinkTarget), { recursive: true });
+        await fs.symlink(symlinkSource, symlinkTarget, "dir");
+    }
+    finally {
+        if (tarballPath) {
+            console.log("Removing tarball...");
+            await fs.unlink(tarballPath).catch(() => { });
+        }
+    }
+};
+const performFastSync = async (sdkDir, targetDir, monorepoRoot) => {
+    console.log("⚡️ Performing fast sync with rsync...");
+    const projectName = path.basename(targetDir);
+    const rwsyncDir = path.join(monorepoRoot, "node_modules", `.rwsync_${projectName}`);
+    const syncDestDir = path.join(rwsyncDir, "node_modules", "rwsdk");
+    // Copy directories/files declared in package.json#files (plus package.json)
+    const filesToSync = JSON.parse(await fs.readFile(path.join(sdkDir, "package.json"), "utf-8"))
+        .files || [];
+    await syncFilesWithRsyncOrFs(sdkDir, syncDestDir, filesToSync);
+};
 const performSync = async (sdkDir, targetDir) => {
     console.log("🏗️  Rebuilding SDK...");
     await $ `pnpm build`;
-    const forceFullSync = Boolean(process.env.RWSDK_FORCE_FULL_SYNC);
-    if (forceFullSync) {
-        console.log("🏃 Force full sync mode is enabled.");
-        await performFullSync(sdkDir, targetDir);
-        console.log("✅ Done syncing");
-        return;
+    // Clean up vite cache in the target project
+    await cleanupViteEntries(targetDir);
+    const monorepoRoot = await getMonorepoRoot(targetDir);
+    const projectName = path.basename(targetDir);
+    const installedSdkPackageJsonPath = path.join(monorepoRoot, "node_modules", `.rwsync_${projectName}`, "node_modules", "rwsdk", "package.json");
+    let needsFullSync = false;
+    if (!existsSync(installedSdkPackageJsonPath)) {
+        console.log("No previous sync found, performing full sync.");
+        needsFullSync = true;
     }
-    const sdkPackageJsonPath = path.join(sdkDir, "package.json");
-    const installedSdkPackageJsonPath = path.join(targetDir, "node_modules/rwsdk/package.json");
-    let packageJsonChanged = true;
-    if (existsSync(installedSdkPackageJsonPath)) {
-        const sdkPackageJsonContent = await fs.readFile(sdkPackageJsonPath, "utf-8");
-        const installedSdkPackageJsonContent = await fs.readFile(installedSdkPackageJsonPath, "utf-8");
-        packageJsonChanged =
-            sdkPackageJsonContent !== installedSdkPackageJsonContent;
+    else {
+        const sdkPackageJson = JSON.parse(await fs.readFile(path.join(sdkDir, "package.json"), "utf-8"));
+        const installedSdkPackageJson = JSON.parse(await fs.readFile(installedSdkPackageJsonPath, "utf-8"));
+        if (!areDependenciesEqual(sdkPackageJson.dependencies, installedSdkPackageJson.dependencies) ||
+            !areDependenciesEqual(sdkPackageJson.devDependencies, installedSdkPackageJson.devDependencies)) {
+            console.log("Dependency changes detected, performing full sync.");
+            needsFullSync = true;
+        }
     }
-    if (packageJsonChanged) {
-        console.log("📦 package.json changed, performing full sync...");
-        await performFullSync(sdkDir, targetDir);
+    if (needsFullSync) {
+        await performFullSync(sdkDir, targetDir, monorepoRoot);
     }
     else {
-        await performFastSync(sdkDir, targetDir);
+        await performFastSync(sdkDir, targetDir, monorepoRoot);
     }
     console.log("✅ Done syncing");
 };

package/dist/vite/buildApp.d.mts

@@ -6,10 +6,11 @@ import type { ViteBuilder } from "vite";
  *
  * @see docs/architecture/productionBuildProcess.md
  */
-export declare function buildApp({ builder, clientEntryPoints, clientFiles, serverFiles, projectRootDir, }: {
+export declare function buildApp({ builder, clientEntryPoints, clientFiles, serverFiles, projectRootDir, workerEntryPathname, }: {
     builder: ViteBuilder;
     clientEntryPoints: Set<string>;
     clientFiles: Set<string>;
     serverFiles: Set<string>;
     projectRootDir: string;
+    workerEntryPathname: string;
 }): Promise<void>;

package/dist/vite/buildApp.mjs

@@ -9,13 +9,14 @@ const log = debug("rwsdk:vite:build-app");
  *
  * @see docs/architecture/productionBuildProcess.md
  */
-export async function buildApp({ builder, clientEntryPoints, clientFiles, serverFiles, projectRootDir, }) {
+export async function buildApp({ builder, clientEntryPoints, clientFiles, serverFiles, projectRootDir, workerEntryPathname, }) {
     const workerEnv = builder.environments.worker;
     await runDirectivesScan({
         rootConfig: builder.config,
         environments: builder.environments,
         clientFiles,
         serverFiles,
+        entries: [workerEntryPathname],
     });
     console.log("Building worker to discover used client components...");
     process.env.RWSDK_BUILD_PASS = "worker";
@@ -42,11 +43,14 @@ export async function buildApp({ builder, clientEntryPoints, clientFiles, server
     // Re-configure the worker environment for the linking pass
     const workerConfig = workerEnv.config;
     workerConfig.build.emptyOutDir = false;
+    // context(justinvdm, 22 Sep 2025): This is a workaround to satisfy the
+    // Cloudflare plugin's expectation of an entry chunk named `index`. The plugin
+    // now manages the worker build, so we no longer set rollup options
+    // directly. Instead, we re-point the original entry to the intermediate
+    // worker bundle from the first pass. This allows the linker pass to re-use
+    // the same plugin-driven configuration while bundling the final worker.
     workerConfig.build.rollupOptions.input = {
-        worker: resolve(projectRootDir, "dist", "worker", "worker.js"),
-    };
-    workerConfig.build.rollupOptions.output = {
-        entryFileNames: "worker.js",
+        index: resolve(projectRootDir, "dist", "worker", "index.js"),
     };
     await builder.build(workerEnv);
     console.log("Build complete!");

package/dist/vite/checkIsUsingPrisma.d.mts

@@ -1,6 +1,10 @@
 export type PrismaCheckResult = {
     isUsingPrisma: boolean;
 };
+export declare const isUsingPrisma: ({ projectRootDir, resolver, }: {
+    projectRootDir: string;
+    resolver?: (path: string, request: string) => string | false;
+}) => boolean;
 export declare const checkPrismaStatus: ({ projectRootDir, }: {
     projectRootDir: string;
 }) => PrismaCheckResult;

package/dist/vite/checkIsUsingPrisma.mjs

@@ -1,7 +1,7 @@
 import enhancedResolve from "enhanced-resolve";
-const isUsingPrisma = ({ projectRootDir }) => {
+export const isUsingPrisma = ({ projectRootDir, resolver = enhancedResolve.sync, }) => {
     try {
-        const prismaClientPath = enhancedResolve.sync(projectRootDir, "@prisma/client");
+        const prismaClientPath = resolver(projectRootDir, "@prisma/client");
         if (!prismaClientPath) {
             return false;
         }

package/dist/vite/checkIsUsingPrisma.test.d.mts

@@ -0,0 +1 @@
+export {};

package/dist/vite/checkIsUsingPrisma.test.mjs

@@ -0,0 +1,30 @@
+import { describe, it, expect } from "vitest";
+import { isUsingPrisma } from "./checkIsUsingPrisma.mjs";
+describe("isUsingPrisma", () => {
+    it("should return true if prisma client is resolved", () => {
+        const resolver = () => "/path/to/prisma/client";
+        const result = isUsingPrisma({
+            projectRootDir: "/test/project",
+            resolver: resolver,
+        });
+        expect(result).toBe(true);
+    });
+    it("should return false if prisma client is not resolved", () => {
+        const resolver = () => false;
+        const result = isUsingPrisma({
+            projectRootDir: "/test/project",
+            resolver: resolver,
+        });
+        expect(result).toBe(false);
+    });
+    it("should return false if resolver throws", () => {
+        const resolver = () => {
+            throw new Error("Module not found");
+        };
+        const result = isUsingPrisma({
+            projectRootDir: "/test/project",
+            resolver: resolver,
+        });
+        expect(result).toBe(false);
+    });
+});

package/dist/vite/configPlugin.mjs

@@ -1,13 +1,11 @@
 import path, { resolve } from "node:path";
 import enhancedResolve from "enhanced-resolve";
-import debug from "debug";
 import { INTERMEDIATE_SSR_BRIDGE_PATH } from "../lib/constants.mjs";
 import { buildApp } from "./buildApp.mjs";
 import { externalModules } from "./constants.mjs";
-const log = debug("rwsdk:vite:config");
 export const configPlugin = ({ silent, projectRootDir, workerEntryPathname, clientFiles, serverFiles, clientEntryPoints, }) => ({
     name: "rwsdk:config",
-    config: async (_) => {
+    config: async (_, { command }) => {
         const mode = process.env.NODE_ENV;
         const workerConfig = {
             resolve: {
@@ -33,7 +31,17 @@ export const configPlugin = ({ silent, projectRootDir, workerEntryPathname, clie
             },
             optimizeDeps: {
                 noDiscovery: false,
-                include: ["rwsdk/worker"],
+                include: [
+                    "rwsdk/__ssr_bridge",
+                    "rwsdk/auth",
+                    "rwsdk/constants",
+                    "rwsdk/db",
+                    "rwsdk/debug",
+                    "rwsdk/realtime/durableObject",
+                    "rwsdk/realtime/worker",
+                    "rwsdk/router",
+                    "rwsdk/worker",
+                ],
                 exclude: [],
                 entries: [workerEntryPathname],
                 esbuildOptions: {
@@ -49,14 +57,6 @@ export const configPlugin = ({ silent, projectRootDir, workerEntryPathname, clie
                 emitAssets: true,
                 emptyOutDir: false,
                 ssr: true,
-                rollupOptions: {
-                    output: {
-                        inlineDynamicImports: true,
-                    },
-                    input: {
-                        worker: workerEntryPathname,
-                    },
-                },
             },
         };
         const baseConfig = {
@@ -88,7 +88,13 @@ export const configPlugin = ({ silent, projectRootDir, workerEntryPathname, clie
                     },
                     optimizeDeps: {
                         noDiscovery: false,
-                        include: ["rwsdk/client"],
+                        include: [
+                            "rwsdk/client",
+                            "rwsdk/constants",
+                            "rwsdk/debug",
+                            "rwsdk/realtime/client",
+                            "rwsdk/turnstile",
+                        ],
                         entries: [],
                         esbuildOptions: {
                             jsx: "automatic",
@@ -115,7 +121,18 @@ export const configPlugin = ({ silent, projectRootDir, workerEntryPathname, clie
                         noDiscovery: false,
                         entries: [workerEntryPathname],
                         exclude: externalModules,
-                        include: ["rwsdk/__ssr", "rwsdk/__ssr_bridge"],
+                        include: [
+                            "rwsdk/__ssr",
+                            "rwsdk/__ssr_bridge",
+                            "rwsdk/client",
+                            "rwsdk/constants",
+                            "rwsdk/debug",
+                            "rwsdk/realtime/client",
+                            "rwsdk/router",
+                            "rwsdk/worker",
+                            "rwsdk/realtime/durableObject",
+                            "rwsdk/realtime/worker",
+                        ],
                         esbuildOptions: {
                             jsx: "automatic",
                             jsxImportSource: "react",
@@ -136,8 +153,30 @@ export const configPlugin = ({ silent, projectRootDir, workerEntryPathname, clie
                         outDir: path.dirname(INTERMEDIATE_SSR_BRIDGE_PATH),
                         rollupOptions: {
                             output: {
+                                // context(justinvdm, 15 Sep 2025): The SSR bundle is a
+                                // pre-compiled artifact. When the linker pass bundles it into
+                                // the intermediate worker bundle (another pre-compiled
+                                // artifact), Rollup merges their top-level scopes. Since both
+                                // may have identical minified identifiers (e.g., `l0`), this
+                                // 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.
                                 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*{[^}]+};?/, "");
+                                    },
+                                },
+                            ],
                         },
                     },
                 },
@@ -154,6 +193,7 @@ export const configPlugin = ({ silent, projectRootDir, workerEntryPathname, clie
                         clientEntryPoints,
                         clientFiles,
                         serverFiles,
+                        workerEntryPathname,
                     });
                 },
             },

package/dist/vite/createDirectiveLookupPlugin.d.mts

@@ -1,4 +1,13 @@
 import { Plugin } from "vite";
+export declare function generateLookupMap({ files, isDev, kind, exportName, }: {
+    files: Set<string>;
+    isDev: boolean;
+    kind: "client" | "server";
+    exportName: string;
+}): {
+    code: string;
+    map: import("magic-string").SourceMap;
+};
 interface DirectiveLookupConfig {
     kind: "client" | "server";
     directive: "use client" | "use server";