rwsdk 1.0.0-alpha.1-test.20250911154541 → 1.0.0-alpha.11

package/dist/vite/runDirectivesScan.d.mts

@@ -1,7 +1,27 @@
 import { Environment, ResolvedConfig } from "vite";
-export declare const runDirectivesScan: ({ rootConfig, environments, clientFiles, serverFiles, }: {
+type Resolver = (context: {}, path: string, request: string, resolveContext: {}, callback: (err: Error | null, result?: string | false) => void) => void;
+export declare function resolveModuleWithEnvironment({ path, importer, importerEnv, clientResolver, workerResolver, }: {
+    path: string;
+    importer?: string;
+    importerEnv: "client" | "worker";
+    clientResolver: Resolver;
+    workerResolver: Resolver;
+}): Promise<{
+    id: string;
+} | null>;
+export declare function classifyModule({ contents, inheritedEnv, }: {
+    contents: string;
+    inheritedEnv: "client" | "worker";
+}): {
+    moduleEnv: "client" | "worker";
+    isClient: boolean;
+    isServer: boolean;
+};
+export declare const runDirectivesScan: ({ rootConfig, environments, clientFiles, serverFiles, entries: initialEntries, }: {
     rootConfig: ResolvedConfig;
     environments: Record<string, Environment>;
     clientFiles: Set<string>;
     serverFiles: Set<string>;
+    entries: string[];
 }) => Promise<void>;
+export {};

package/dist/vite/runDirectivesScan.mjs

@@ -4,8 +4,9 @@ import path from "node:path";
 import debug from "debug";
 import { getViteEsbuild } from "./getViteEsbuild.mjs";
 import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
+import { INTERMEDIATES_OUTPUT_DIR } from "../lib/constants.mjs";
 import { externalModules } from "./constants.mjs";
-import { createViteAwareResolver, } from "./createViteAwareResolver.mjs";
+import { createViteAwareResolver } from "./createViteAwareResolver.mjs";
 const log = debug("rwsdk:vite:run-directives-scan");
 // Copied from Vite's source code.
 // https://github.com/vitejs/vite/blob/main/packages/vite/src/shared/utils.ts
@@ -14,13 +15,47 @@ const isObject = (value) => Object.prototype.toString.call(value) === "[object O
 // https://github.com/vitejs/vite/blob/main/packages/vite/src/node/utils.ts
 const externalRE = /^(https?:)?\/\//;
 const isExternalUrl = (url) => externalRE.test(url);
-export const runDirectivesScan = async ({ rootConfig, environments, clientFiles, serverFiles, }) => {
+export async function resolveModuleWithEnvironment({ path, importer, importerEnv, clientResolver, workerResolver, }) {
+    const resolver = importerEnv === "client" ? clientResolver : workerResolver;
+    return new Promise((resolvePromise) => {
+        resolver({}, importer || "", path, {}, (err, result) => {
+            if (!err && result) {
+                resolvePromise({ id: result });
+            }
+            else {
+                if (err) {
+                    const errorMessage = err.message || String(err);
+                    if (errorMessage.includes("Package path . is not exported")) {
+                        log("Package exports error for %s, marking as external", path);
+                    }
+                    else {
+                        log("Resolution failed for %s: %s", path, errorMessage);
+                    }
+                }
+                resolvePromise(null);
+            }
+        });
+    });
+}
+export function classifyModule({ contents, inheritedEnv, }) {
+    let moduleEnv = inheritedEnv;
+    const isClient = hasDirective(contents, "use client");
+    const isServer = hasDirective(contents, "use server");
+    if (isClient) {
+        moduleEnv = "client";
+    }
+    else if (isServer) {
+        moduleEnv = "worker";
+    }
+    return { moduleEnv, isClient, isServer };
+}
+export const runDirectivesScan = async ({ rootConfig, environments, clientFiles, serverFiles, entries: initialEntries, }) => {
     console.log("\n🔍 Scanning for 'use client' and 'use server' directives...");
     // Set environment variable to indicate scanning is in progress
     process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE = "true";
     try {
         const esbuild = await getViteEsbuild(rootConfig.root);
-        const input = environments.worker.config.build.rollupOptions?.input;
+        const input = initialEntries ?? environments.worker.config.build.rollupOptions?.input;
         let entries;
         if (Array.isArray(input)) {
             entries = input;
@@ -38,7 +73,9 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
             log("No entries found for directives scan in worker environment, skipping.");
             return;
         }
-        const absoluteEntries = entries.map((entry) => path.resolve(rootConfig.root, entry));
+        // Filter out virtual modules since they can't be scanned by esbuild
+        const realEntries = entries.filter((entry) => !entry.includes("virtual:"));
+        const absoluteEntries = realEntries.map((entry) => path.resolve(rootConfig.root, entry));
         log("Starting directives scan for worker environment with entries:", absoluteEntries);
         const workerResolver = createViteAwareResolver(rootConfig, environments.worker);
         const clientResolver = createViteAwareResolver(rootConfig, environments.client);
@@ -87,17 +124,12 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
                         /\.(m|c)?[jt]sx?$/.test(args.importer)) {
                         try {
                             const importerContents = await readFileWithCache(args.importer);
-                            if (hasDirective(importerContents, "use client")) {
-                                importerEnv = "client";
-                                log("Pre-detected importer 'use client' in:", args.importer);
-                            }
-                            else if (hasDirective(importerContents, "use server")) {
-                                importerEnv = "worker";
-                                log("Pre-detected importer 'use server' in:", args.importer);
-                            }
-                            else {
-                                importerEnv = "worker"; // Default for entry points
-                            }
+                            const classification = classifyModule({
+                                contents: importerContents,
+                                inheritedEnv: "worker", // Default for entry points
+                            });
+                            importerEnv = classification.moduleEnv;
+                            log("Pre-detected importer environment in:", args.importer, "as", importerEnv);
                             moduleEnvironments.set(args.importer, importerEnv);
                         }
                         catch (e) {
@@ -109,25 +141,12 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
                         importerEnv = "worker"; // Default for entry points or non-script files
                     }
                     log("Importer:", args.importer, "environment:", importerEnv);
-                    const resolver = importerEnv === "client" ? clientResolver : workerResolver;
-                    const resolved = await new Promise((resolve) => {
-                        resolver({}, args.importer || rootConfig.root, args.path, {}, (err, result) => {
-                            if (!err && result) {
-                                resolve({ id: result });
-                            }
-                            else {
-                                if (err) {
-                                    const errorMessage = err.message || String(err);
-                                    if (errorMessage.includes("Package path . is not exported")) {
-                                        log("Package exports error for %s, marking as external", args.path);
-                                    }
-                                    else {
-                                        log("Resolution failed for %s: %s", args.path, errorMessage);
-                                    }
-                                }
-                                resolve(null);
-                            }
-                        });
+                    const resolved = await resolveModuleWithEnvironment({
+                        path: args.path,
+                        importer: args.importer,
+                        importerEnv,
+                        clientResolver,
+                        workerResolver,
                     });
                     log("Resolution result:", resolved);
                     const resolvedPath = resolved?.id;
@@ -158,29 +177,22 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
                     try {
                         const contents = await readFileWithCache(args.path);
                         const inheritedEnv = args.pluginData?.inheritedEnv || "worker";
-                        let currentEnv = inheritedEnv;
-                        const isClient = hasDirective(contents, "use client");
-                        const isServer = hasDirective(contents, "use server");
-                        // A file's own directive takes precedence over the inherited environment.
-                        if (isClient) {
-                            currentEnv = "client";
-                        }
-                        else if (isServer) {
-                            // `else if` handles cases where a file might have both directives.
-                            // "use client" takes precedence.
-                            currentEnv = "worker";
-                        }
+                        const { moduleEnv, isClient, isServer } = classifyModule({
+                            contents,
+                            inheritedEnv,
+                        });
                         // Store the definitive environment for this module, so it can be used when it becomes an importer.
-                        moduleEnvironments.set(args.path, currentEnv);
-                        log("Set environment for", args.path, "to", currentEnv);
+                        const realPath = await fsp.realpath(args.path);
+                        moduleEnvironments.set(realPath, moduleEnv);
+                        log("Set environment for", realPath, "to", moduleEnv);
                         // Finally, populate the output sets if the file has a directive.
                         if (isClient) {
-                            log("Discovered 'use client' in:", args.path);
-                            clientFiles.add(normalizeModulePath(args.path, rootConfig.root));
+                            log("Discovered 'use client' in:", realPath);
+                            clientFiles.add(normalizeModulePath(realPath, rootConfig.root));
                         }
                         if (isServer) {
-                            log("Discovered 'use server' in:", args.path);
-                            serverFiles.add(normalizeModulePath(args.path, rootConfig.root));
+                            log("Discovered 'use server' in:", realPath);
+                            serverFiles.add(normalizeModulePath(realPath, rootConfig.root));
                         }
                         return { contents, loader: "default" };
                     }
@@ -195,6 +207,7 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
             entryPoints: absoluteEntries,
             bundle: true,
             write: false,
+            outdir: path.join(INTERMEDIATES_OUTPUT_DIR, "directive-scan"),
             platform: "node",
             format: "esm",
             logLevel: "silent",
@@ -208,5 +221,7 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
         // Always clear the scanning flag when done
         delete process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE;
         console.log("✅ Scan complete.");
+        process.env.VERBOSE &&
+            log("Client/server files after scanning: client=%O, server=%O", Array.from(clientFiles), Array.from(serverFiles));
     }
 };

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

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

package/dist/vite/runDirectivesScan.test.mjs

@@ -0,0 +1,73 @@
+import { describe, it, expect, vi } from "vitest";
+import { resolveModuleWithEnvironment, classifyModule, } from "./runDirectivesScan.mjs";
+describe("runDirectivesScan helpers", () => {
+    describe("resolveModuleWithEnvironment", () => {
+        it("should use the client resolver when importerEnv is 'client'", async () => {
+            const clientResolver = vi.fn((_a, _b, _c, _d, cb) => cb(null, "/resolved/client"));
+            const workerResolver = vi.fn();
+            const result = await resolveModuleWithEnvironment({
+                path: "test-path",
+                importerEnv: "client",
+                clientResolver,
+                workerResolver,
+            });
+            expect(clientResolver).toHaveBeenCalled();
+            expect(workerResolver).not.toHaveBeenCalled();
+            expect(result).toEqual({ id: "/resolved/client" });
+        });
+        it("should use the worker resolver when importerEnv is 'worker'", async () => {
+            const clientResolver = vi.fn();
+            const workerResolver = vi.fn((_a, _b, _c, _d, cb) => cb(null, "/resolved/worker"));
+            const result = await resolveModuleWithEnvironment({
+                path: "test-path",
+                importerEnv: "worker",
+                clientResolver,
+                workerResolver,
+            });
+            expect(workerResolver).toHaveBeenCalled();
+            expect(clientResolver).not.toHaveBeenCalled();
+            expect(result).toEqual({ id: "/resolved/worker" });
+        });
+        it("should return null on resolution error", async () => {
+            const clientResolver = vi.fn((_a, _b, _c, _d, cb) => cb(new Error("Resolution failed")));
+            const workerResolver = vi.fn();
+            const result = await resolveModuleWithEnvironment({
+                path: "test-path",
+                importerEnv: "client",
+                clientResolver,
+                workerResolver,
+            });
+            expect(result).toBeNull();
+        });
+    });
+    describe("classifyModule", () => {
+        it("should return 'client' if 'use client' directive is present", () => {
+            const contents = `'use client';\nconsole.log('hello');`;
+            const result = classifyModule({ contents, inheritedEnv: "worker" });
+            expect(result.moduleEnv).toBe("client");
+            expect(result.isClient).toBe(true);
+            expect(result.isServer).toBe(false);
+        });
+        it("should return 'worker' if 'use server' directive is present", () => {
+            const contents = `"use server";\nexport default () => {};`;
+            const result = classifyModule({ contents, inheritedEnv: "client" });
+            expect(result.moduleEnv).toBe("worker");
+            expect(result.isClient).toBe(false);
+            expect(result.isServer).toBe(true);
+        });
+        it("should prioritize 'use client' over 'use server'", () => {
+            const contents = `'use client';\n'use server';\nconsole.log('hello');`;
+            const result = classifyModule({ contents, inheritedEnv: "worker" });
+            expect(result.moduleEnv).toBe("client");
+            expect(result.isClient).toBe(true);
+            expect(result.isServer).toBe(false);
+        });
+        it("should return the inherited environment if no directive is present", () => {
+            const contents = `console.log('no directive');`;
+            const result = classifyModule({ contents, inheritedEnv: "worker" });
+            expect(result.moduleEnv).toBe("worker");
+            expect(result.isClient).toBe(false);
+            expect(result.isServer).toBe(false);
+        });
+    });
+});

package/dist/vite/ssrBridgePlugin.mjs

@@ -34,7 +34,8 @@ export const ssrBridgePlugin = ({ clientFiles, serverFiles, }) => {
                         build.onResolve({ filter: /.*$/ }, (args) => {
                             process.env.VERBOSE &&
                                 log("Esbuild onResolve called for path=%s, args=%O", args.path, args);
-                            if (args.path === "rwsdk/__ssr_bridge") {
+                            if (args.path === "rwsdk/__ssr_bridge" ||
+                                args.path.startsWith(VIRTUAL_SSR_PREFIX)) {
                                 log("Marking as external: %s", args.path);
                                 return {
                                     path: args.path,
@@ -77,6 +78,12 @@ export const ssrBridgePlugin = ({ clientFiles, serverFiles, }) => {
             }
             else {
                 // In build mode, the behavior depends on the build pass
+                if (id.startsWith(VIRTUAL_SSR_PREFIX)) {
+                    if (this.environment.name === "worker") {
+                        log("Virtual SSR module case (build-worker pass): resolving to external");
+                        return { id, external: true };
+                    }
+                }
                 if (id === "rwsdk/__ssr_bridge" && this.environment.name === "worker") {
                     if (process.env.RWSDK_BUILD_PASS === "worker") {
                         // First pass: resolve to a temporary, external path

package/dist/vite/transformClientComponents.mjs

@@ -5,7 +5,8 @@ import { findExports } from "./findSpecifiers.mjs";
 const logVite = debug("rwsdk:vite:transform-client-components:vite");
 const logEsbuild = debug("rwsdk:vite:transform-client-components:esbuild");
 export async function transformClientComponents(code, normalizedId, ctx) {
-    if (!hasDirective(code, "use client")) {
+    if (!ctx.clientFiles?.has(normalizedId) &&
+        !hasDirective(code, "use client")) {
         return;
     }
     const log = ctx.isEsbuild ? logEsbuild : logVite;
@@ -76,13 +77,14 @@ export async function transformClientComponents(code, normalizedId, ctx) {
     // 4. Non-SSR files: replace all implementation with registerClientReference logic
     // Generate completely new code for worker/client environments
     const s = new MagicString("");
-    // Add import declaration
+    s.append('import { ssrLoadModule } from "rwsdk/__ssr_bridge";\n');
     s.append('import { registerClientReference } from "rwsdk/worker";\n');
+    s.append(`const SSRModule = await ssrLoadModule("${normalizedId}");\n`);
     // Compute unique computed local names first
     const computedLocalNames = new Map(processedExports.map((info) => [getComputedLocalName(info), info]));
     // Add registerClientReference assignments for unique names
     for (const [computedLocalName, correspondingInfo] of computedLocalNames) {
-        s.append(`const ${computedLocalName} = registerClientReference("${normalizedId}", "${correspondingInfo.exported}");\n`);
+        s.append(`const ${computedLocalName} = registerClientReference(SSRModule, "${normalizedId}", "${correspondingInfo.exported}");\n`);
     }
     // Add grouped export statement for named exports (preserving order and alias)
     if (processedExports.length > 0) {
@@ -94,7 +96,7 @@ export async function transformClientComponents(code, normalizedId, ctx) {
     // Add default export if present
     if (defaultExportInfo) {
         log(":isEsbuild=%s: Registering client reference for default export: %s", !!ctx.isEsbuild, defaultExportInfo.exported);
-        s.append(`export default registerClientReference("${normalizedId}", "${defaultExportInfo.exported}");\n`);
+        s.append(`export default registerClientReference(SSRModule, "${normalizedId}", "${defaultExportInfo.exported}");\n`);
     }
     const sourceMap = s.generateMap({
         source: normalizedId,

package/dist/vite/transformClientComponents.test.mjs

@@ -13,8 +13,10 @@ describe("transformClientComponents", () => {
 export const Component = () => {
   return jsx('div', { children: 'Hello' });
 }
-`)) ?? "").toEqual(`import { registerClientReference } from "rwsdk/worker";
-const Component = registerClientReference("/test/file.tsx", "Component");
+`)) ?? "").toEqual(`import { ssrLoadModule } from "rwsdk/__ssr_bridge";
+import { registerClientReference } from "rwsdk/worker";
+const SSRModule = await ssrLoadModule("/test/file.tsx");
+const Component = registerClientReference(SSRModule, "/test/file.tsx", "Component");
 export { Component };
 `);
     });
@@ -24,8 +26,10 @@ export { Component };
 export const Component = async () => {
   return jsx('div', { children: 'Hello' });
 }
-  `)) ?? "").toEqual(`import { registerClientReference } from "rwsdk/worker";
-const Component = registerClientReference("/test/file.tsx", "Component");
+  `)) ?? "").toEqual(`import { ssrLoadModule } from "rwsdk/__ssr_bridge";
+import { registerClientReference } from "rwsdk/worker";
+const SSRModule = await ssrLoadModule("/test/file.tsx");
+const Component = registerClientReference(SSRModule, "/test/file.tsx", "Component");
 export { Component };
 `);
     });
@@ -34,8 +38,10 @@ export { Component };
 
 export function Component() {
   return jsx('div', { children: 'Hello' });
-}`)) ?? "").toEqual(`import { registerClientReference } from "rwsdk/worker";
-const Component = registerClientReference("/test/file.tsx", "Component");
+}`)) ?? "").toEqual(`import { ssrLoadModule } from "rwsdk/__ssr_bridge";
+import { registerClientReference } from "rwsdk/worker";
+const SSRModule = await ssrLoadModule("/test/file.tsx");
+const Component = registerClientReference(SSRModule, "/test/file.tsx", "Component");
 export { Component };
 `);
     });
@@ -44,8 +50,10 @@ export { Component };
 
 export default () => {
   return jsx('div', { children: 'Hello' });
-}`)) ?? "").toEqual(`import { registerClientReference } from "rwsdk/worker";
-export default registerClientReference("/test/file.tsx", "default");
+}`)) ?? "").toEqual(`import { ssrLoadModule } from "rwsdk/__ssr_bridge";
+import { registerClientReference } from "rwsdk/worker";
+const SSRModule = await ssrLoadModule("/test/file.tsx");
+export default registerClientReference(SSRModule, "/test/file.tsx", "default");
 `);
     });
     it("transforms default export function declaration component", async () => {
@@ -53,8 +61,10 @@ export default registerClientReference("/test/file.tsx", "default");
 
 export default function Component({ prop1, prop2 }) {
   return jsx('div', { children: 'Hello' });
-}`)) ?? "").toEqual(`import { registerClientReference } from "rwsdk/worker";
-export default registerClientReference("/test/file.tsx", "default");
+}`)) ?? "").toEqual(`import { ssrLoadModule } from "rwsdk/__ssr_bridge";
+import { registerClientReference } from "rwsdk/worker";
+const SSRModule = await ssrLoadModule("/test/file.tsx");
+export default registerClientReference(SSRModule, "/test/file.tsx", "default");
 `);
     });
     it("transforms mixed export styles (inline, grouped, and default)", async () => {
@@ -81,13 +91,15 @@ export default function Main() {
 }
 
 export { Second, Third }
-export { Fourth as AnotherName }`)) ?? "").toEqual(`import { registerClientReference } from "rwsdk/worker";
-const First = registerClientReference("/test/file.tsx", "First");
-const Second = registerClientReference("/test/file.tsx", "Second");
-const Third = registerClientReference("/test/file.tsx", "Third");
-const Fourth_AnotherName = registerClientReference("/test/file.tsx", "AnotherName");
+export { Fourth as AnotherName }`)) ?? "").toEqual(`import { ssrLoadModule } from "rwsdk/__ssr_bridge";
+import { registerClientReference } from "rwsdk/worker";
+const SSRModule = await ssrLoadModule("/test/file.tsx");
+const First = registerClientReference(SSRModule, "/test/file.tsx", "First");
+const Second = registerClientReference(SSRModule, "/test/file.tsx", "Second");
+const Third = registerClientReference(SSRModule, "/test/file.tsx", "Third");
+const Fourth_AnotherName = registerClientReference(SSRModule, "/test/file.tsx", "AnotherName");
 export { First, Second, Third, Fourth_AnotherName as AnotherName };
-export default registerClientReference("/test/file.tsx", "default");
+export default registerClientReference(SSRModule, "/test/file.tsx", "default");
 `);
     });
     it("transforms function declaration that is exported default separately", async () => {
@@ -98,8 +110,10 @@ function Component({ prop1, prop2 }) {
   return jsx('div', { children: 'Hello' });
 }
 
-export default Component;`)) ?? "").toEqual(`import { registerClientReference } from "rwsdk/worker";
-export default registerClientReference("/test/file.tsx", "default");
+export default Component;`)) ?? "").toEqual(`import { ssrLoadModule } from "rwsdk/__ssr_bridge";
+import { registerClientReference } from "rwsdk/worker";
+const SSRModule = await ssrLoadModule("/test/file.tsx");
+export default registerClientReference(SSRModule, "/test/file.tsx", "default");
 `);
     });
     it("Works in dev", async () => {
@@ -183,8 +197,10 @@ export function Chat() {
     columnNumber: 5
   }, this);
 }
-`)) ?? "").toEqual(`import { registerClientReference } from "rwsdk/worker";
-const Chat = registerClientReference("/test/file.tsx", "Chat");
+`)) ?? "").toEqual(`import { ssrLoadModule } from "rwsdk/__ssr_bridge";
+import { registerClientReference } from "rwsdk/worker";
+const SSRModule = await ssrLoadModule("/test/file.tsx");
+const Chat = registerClientReference(SSRModule, "/test/file.tsx", "Chat");
 export { Chat };
 `);
     });
@@ -198,8 +214,10 @@ const MyComponent = () => {
   return jsx('div', { children: 'Hello' });
 }
 
-export { MyComponent as CustomName }`)) ?? "").toEqual(`import { registerClientReference } from "rwsdk/worker";
-const MyComponent_CustomName = registerClientReference("/test/file.tsx", "CustomName");
+export { MyComponent as CustomName }`)) ?? "").toEqual(`import { ssrLoadModule } from "rwsdk/__ssr_bridge";
+import { registerClientReference } from "rwsdk/worker";
+const SSRModule = await ssrLoadModule("/test/file.tsx");
+const MyComponent_CustomName = registerClientReference(SSRModule, "/test/file.tsx", "CustomName");
 export { MyComponent_CustomName as CustomName };
 `);
     });
@@ -210,10 +228,12 @@ const First = () => jsx('div', { children: 'First' });
 const Second = () => jsx('div', { children: 'Second' });
 const Third = () => jsx('div', { children: 'Third' });
 
-export { First, Second, Third }`)) ?? "").toEqual(`import { registerClientReference } from "rwsdk/worker";
-const First = registerClientReference("/test/file.tsx", "First");
-const Second = registerClientReference("/test/file.tsx", "Second");
-const Third = registerClientReference("/test/file.tsx", "Third");
+export { First, Second, Third }`)) ?? "").toEqual(`import { ssrLoadModule } from "rwsdk/__ssr_bridge";
+import { registerClientReference } from "rwsdk/worker";
+const SSRModule = await ssrLoadModule("/test/file.tsx");
+const First = registerClientReference(SSRModule, "/test/file.tsx", "First");
+const Second = registerClientReference(SSRModule, "/test/file.tsx", "Second");
+const Third = registerClientReference(SSRModule, "/test/file.tsx", "Third");
 export { First, Second, Third };
 `);
     });
@@ -224,10 +244,12 @@ const Component = () => jsx('div', {});
 const data = { value: 42 };
 const helper = () => console.log('helper');
 
-export { Component, data, helper }`)) ?? "").toEqual(`import { registerClientReference } from "rwsdk/worker";
-const Component = registerClientReference("/test/file.tsx", "Component");
-const data = registerClientReference("/test/file.tsx", "data");
-const helper = registerClientReference("/test/file.tsx", "helper");
+export { Component, data, helper }`)) ?? "").toEqual(`import { ssrLoadModule } from "rwsdk/__ssr_bridge";
+import { registerClientReference } from "rwsdk/worker";
+const SSRModule = await ssrLoadModule("/test/file.tsx");
+const Component = registerClientReference(SSRModule, "/test/file.tsx", "Component");
+const data = registerClientReference(SSRModule, "/test/file.tsx", "data");
+const helper = registerClientReference(SSRModule, "/test/file.tsx", "helper");
 export { Component, data, helper };
 `);
     });
@@ -239,9 +261,11 @@ export const Slot = () => {
 }
 
 export { Slot, Slot as Root }
-`)) ?? "").toEqual(`import { registerClientReference } from "rwsdk/worker";
-const Slot = registerClientReference("/test/file.tsx", "Slot");
-const Slot_Root = registerClientReference("/test/file.tsx", "Root");
+`)) ?? "").toEqual(`import { ssrLoadModule } from "rwsdk/__ssr_bridge";
+import { registerClientReference } from "rwsdk/worker";
+const SSRModule = await ssrLoadModule("/test/file.tsx");
+const Slot = registerClientReference(SSRModule, "/test/file.tsx", "Slot");
+const Slot_Root = registerClientReference(SSRModule, "/test/file.tsx", "Root");
 export { Slot, Slot_Root as Root };
 `);
     });
@@ -274,31 +298,33 @@ function SidebarMenuSub() { return jsx("div", {}); }
 function SidebarMenuSubItem() { return jsx("div", {}); }
 function SidebarMenuSubButton() { return jsx("div", {}); }
 export { Sidebar, SidebarContent, SidebarFooter, SidebarGroup, SidebarGroupAction, SidebarGroupContent, SidebarGroupLabel, SidebarHeader, SidebarInput, SidebarInset, SidebarMenu, SidebarMenuAction, SidebarMenuBadge, SidebarMenuButton, SidebarMenuItem, SidebarMenuSkeleton, SidebarMenuSub, SidebarMenuSubButton, SidebarMenuSubItem, SidebarProvider, SidebarRail, SidebarSeparator, SidebarTrigger, useSidebar, };`;
-        expect((await transform(code)) ?? "").toEqual(`import { registerClientReference } from "rwsdk/worker";
-const Sidebar = registerClientReference("/test/file.tsx", "Sidebar");
-const SidebarContent = registerClientReference("/test/file.tsx", "SidebarContent");
-const SidebarFooter = registerClientReference("/test/file.tsx", "SidebarFooter");
-const SidebarGroup = registerClientReference("/test/file.tsx", "SidebarGroup");
-const SidebarGroupAction = registerClientReference("/test/file.tsx", "SidebarGroupAction");
-const SidebarGroupContent = registerClientReference("/test/file.tsx", "SidebarGroupContent");
-const SidebarGroupLabel = registerClientReference("/test/file.tsx", "SidebarGroupLabel");
-const SidebarHeader = registerClientReference("/test/file.tsx", "SidebarHeader");
-const SidebarInput = registerClientReference("/test/file.tsx", "SidebarInput");
-const SidebarInset = registerClientReference("/test/file.tsx", "SidebarInset");
-const SidebarMenu = registerClientReference("/test/file.tsx", "SidebarMenu");
-const SidebarMenuAction = registerClientReference("/test/file.tsx", "SidebarMenuAction");
-const SidebarMenuBadge = registerClientReference("/test/file.tsx", "SidebarMenuBadge");
-const SidebarMenuButton = registerClientReference("/test/file.tsx", "SidebarMenuButton");
-const SidebarMenuItem = registerClientReference("/test/file.tsx", "SidebarMenuItem");
-const SidebarMenuSkeleton = registerClientReference("/test/file.tsx", "SidebarMenuSkeleton");
-const SidebarMenuSub = registerClientReference("/test/file.tsx", "SidebarMenuSub");
-const SidebarMenuSubButton = registerClientReference("/test/file.tsx", "SidebarMenuSubButton");
-const SidebarMenuSubItem = registerClientReference("/test/file.tsx", "SidebarMenuSubItem");
-const SidebarProvider = registerClientReference("/test/file.tsx", "SidebarProvider");
-const SidebarRail = registerClientReference("/test/file.tsx", "SidebarRail");
-const SidebarSeparator = registerClientReference("/test/file.tsx", "SidebarSeparator");
-const SidebarTrigger = registerClientReference("/test/file.tsx", "SidebarTrigger");
-const useSidebar = registerClientReference("/test/file.tsx", "useSidebar");
+        expect((await transform(code)) ?? "").toEqual(`import { ssrLoadModule } from "rwsdk/__ssr_bridge";
+import { registerClientReference } from "rwsdk/worker";
+const SSRModule = await ssrLoadModule("/test/file.tsx");
+const Sidebar = registerClientReference(SSRModule, "/test/file.tsx", "Sidebar");
+const SidebarContent = registerClientReference(SSRModule, "/test/file.tsx", "SidebarContent");
+const SidebarFooter = registerClientReference(SSRModule, "/test/file.tsx", "SidebarFooter");
+const SidebarGroup = registerClientReference(SSRModule, "/test/file.tsx", "SidebarGroup");
+const SidebarGroupAction = registerClientReference(SSRModule, "/test/file.tsx", "SidebarGroupAction");
+const SidebarGroupContent = registerClientReference(SSRModule, "/test/file.tsx", "SidebarGroupContent");
+const SidebarGroupLabel = registerClientReference(SSRModule, "/test/file.tsx", "SidebarGroupLabel");
+const SidebarHeader = registerClientReference(SSRModule, "/test/file.tsx", "SidebarHeader");
+const SidebarInput = registerClientReference(SSRModule, "/test/file.tsx", "SidebarInput");
+const SidebarInset = registerClientReference(SSRModule, "/test/file.tsx", "SidebarInset");
+const SidebarMenu = registerClientReference(SSRModule, "/test/file.tsx", "SidebarMenu");
+const SidebarMenuAction = registerClientReference(SSRModule, "/test/file.tsx", "SidebarMenuAction");
+const SidebarMenuBadge = registerClientReference(SSRModule, "/test/file.tsx", "SidebarMenuBadge");
+const SidebarMenuButton = registerClientReference(SSRModule, "/test/file.tsx", "SidebarMenuButton");
+const SidebarMenuItem = registerClientReference(SSRModule, "/test/file.tsx", "SidebarMenuItem");
+const SidebarMenuSkeleton = registerClientReference(SSRModule, "/test/file.tsx", "SidebarMenuSkeleton");
+const SidebarMenuSub = registerClientReference(SSRModule, "/test/file.tsx", "SidebarMenuSub");
+const SidebarMenuSubButton = registerClientReference(SSRModule, "/test/file.tsx", "SidebarMenuSubButton");
+const SidebarMenuSubItem = registerClientReference(SSRModule, "/test/file.tsx", "SidebarMenuSubItem");
+const SidebarProvider = registerClientReference(SSRModule, "/test/file.tsx", "SidebarProvider");
+const SidebarRail = registerClientReference(SSRModule, "/test/file.tsx", "SidebarRail");
+const SidebarSeparator = registerClientReference(SSRModule, "/test/file.tsx", "SidebarSeparator");
+const SidebarTrigger = registerClientReference(SSRModule, "/test/file.tsx", "SidebarTrigger");
+const useSidebar = registerClientReference(SSRModule, "/test/file.tsx", "useSidebar");
 export { Sidebar, SidebarContent, SidebarFooter, SidebarGroup, SidebarGroupAction, SidebarGroupContent, SidebarGroupLabel, SidebarHeader, SidebarInput, SidebarInset, SidebarMenu, SidebarMenuAction, SidebarMenuBadge, SidebarMenuButton, SidebarMenuItem, SidebarMenuSkeleton, SidebarMenuSub, SidebarMenuSubButton, SidebarMenuSubItem, SidebarProvider, SidebarRail, SidebarSeparator, SidebarTrigger, useSidebar };
 `);
     });
@@ -319,3 +345,35 @@ describe("transformClientComponents logic branches (from transformClientComponen
         expect(result?.code).toEqual("export const foo = 1;");
     });
 });
+describe("transformClientComponents (dev server node_modules)", () => {
+    async function transformDev(code, id) {
+        process.env.VITE_IS_DEV_SERVER = "1";
+        const result = await transformClientComponents(code, id, {
+            environmentName: "worker",
+        });
+        delete process.env.VITE_IS_DEV_SERVER;
+        return result?.code;
+    }
+    it("uses barrel file import for node_modules files in dev", async () => {
+        const id = "/test/node_modules/my-lib/component.js";
+        const code = `"use client";
+export const MyComponent = () => {};`;
+        expect((await transformDev(code, id)) ?? "").toEqual(`import { ssrLoadModule } from "rwsdk/__ssr_bridge";
+import { registerClientReference } from "rwsdk/worker";
+const SSRModule = await ssrLoadModule("/test/node_modules/my-lib/component.js");
+const MyComponent = registerClientReference(SSRModule, "/test/node_modules/my-lib/component.js", "MyComponent");
+export { MyComponent };
+`);
+    });
+    it("uses virtual module import for app source files in dev", async () => {
+        const id = "/test/app/component.tsx";
+        const code = `"use client";
+export const MyComponent = () => {};`;
+        expect((await transformDev(code, id)) ?? "").toEqual(`import { ssrLoadModule } from "rwsdk/__ssr_bridge";
+import { registerClientReference } from "rwsdk/worker";
+const SSRModule = await ssrLoadModule("/test/app/component.tsx");
+const MyComponent = registerClientReference(SSRModule, "/test/app/component.tsx", "MyComponent");
+export { MyComponent };
+`);
+    });
+});

package/dist/vite/transformServerFunctions.d.mts

@@ -12,5 +12,5 @@ type ExportInfoCompat = {
 };
 export declare const findExportedFunctions: (code: string, normalizedId?: string) => Set<string>;
 export declare const findExportInfo: (code: string, normalizedId?: string) => ExportInfoCompat;
-export declare const transformServerFunctions: (code: string, normalizedId: string, environment: "client" | "worker" | "ssr", serverFiles?: Set<string>) => TransformResult | undefined;
+export declare const transformServerFunctions: (code: string, normalizedId: string, environment: "client" | "worker" | "ssr", serverFiles: Set<string>) => TransformResult | undefined;
 export type { TransformResult };