rwsdk 0.2.0 → 0.3.1

package/dist/vite/transformJsxScriptTagsPlugin.mjs

@@ -1,19 +1,16 @@
 import { Project, Node, SyntaxKind, } from "ts-morph";
-import { readFile } from "node:fs/promises";
-import { pathExists } from "fs-extra";
 import debug from "debug";
+import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
 const log = debug("rwsdk:vite:transform-jsx-script-tags");
-let manifestCache;
-const readManifest = async (manifestPath) => {
-    if (manifestCache === undefined) {
-        const exists = await pathExists(manifestPath);
-        if (!exists) {
-            throw new Error(`RedwoodSDK expected client manifest to exist at ${manifestPath}. This is likely a bug. Please report it at https://github.com/redwoodjs/sdk/issues/new`);
-        }
-        manifestCache = JSON.parse(await readFile(manifestPath, "utf-8"));
+function transformAssetPath(importPath, projectRootDir) {
+    if (process.env.VITE_IS_DEV_SERVER === "1") {
+        return importPath;
     }
-    return manifestCache;
-};
+    const normalizedImportPath = normalizeModulePath(importPath, projectRootDir);
+    return `rwsdk_asset:${normalizedImportPath}`;
+}
+// Note: This plugin only runs during discovery phase (Phase 1)
+// Manifest reading and asset linking happens later in Phase 5
 function hasJsxFunctions(text) {
     return (text.includes('jsx("script"') ||
         text.includes("jsx('script'") ||
@@ -28,7 +25,7 @@ function hasJsxFunctions(text) {
         text.includes('jsxDEV("link"') ||
         text.includes("jsxDEV('link'"));
 }
-function transformScriptImports(scriptContent, manifest) {
+function transformScriptImports(scriptContent, clientEntryPoints, manifest, projectRootDir) {
     const scriptProject = new Project({ useInMemoryFileSystem: true });
     try {
         const wrappedContent = `function __wrapper() {${scriptContent}}`;
@@ -49,12 +46,10 @@ function transformScriptImports(scriptContent, manifest) {
                     if (importPath.startsWith("/")) {
                         log("Found dynamic import with root-relative path: %s", importPath);
                         entryPoints.push(importPath);
-                        const path = importPath.slice(1);
-                        if (manifest[path]) {
-                            const transformedSrc = `/${manifest[path].file}`;
-                            args[0].setLiteralValue(transformedSrc);
-                            hasChanges = true;
-                        }
+                        clientEntryPoints.add(importPath);
+                        const transformedImportPath = transformAssetPath(importPath, projectRootDir);
+                        args[0].setLiteralValue(transformedImportPath);
+                        hasChanges = true;
                     }
                 }
             }
@@ -73,7 +68,7 @@ function transformScriptImports(scriptContent, manifest) {
         return { content: undefined, hasChanges: false, entryPoints: [] };
     }
 }
-export async function transformJsxScriptTagsCode(code, manifest = {}) {
+export async function transformJsxScriptTagsCode(code, clientEntryPoints, manifest = {}, projectRootDir) {
     // context(justinvdm, 15 Jun 2025): Optimization to exit early
     // to avoidunnecessary ts-morph parsing
     if (!hasJsxFunctions(code)) {
@@ -124,7 +119,7 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                 let hasStringLiteralChildren = false;
                 let hasSrc = false;
                 let isPreload = false;
-                let hrefValue = null;
+                let hrefProp;
                 for (const prop of properties) {
                     if (Node.isPropertyAssignment(prop)) {
                         const propName = prop.getName();
@@ -142,15 +137,13 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                                 const srcValue = initializer.getLiteralValue();
                                 if (srcValue.startsWith("/")) {
                                     entryPoints.push(srcValue);
-                                    const path = srcValue.slice(1);
-                                    if (manifest[path]) {
-                                        const transformedSrc = `/${manifest[path].file}`;
-                                        modifications.push({
-                                            type: "literalValue",
-                                            node: initializer,
-                                            value: transformedSrc,
-                                        });
-                                    }
+                                    clientEntryPoints.add(srcValue);
+                                    const transformedSrc = transformAssetPath(srcValue, projectRootDir);
+                                    modifications.push({
+                                        type: "literalValue",
+                                        node: initializer,
+                                        value: transformedSrc,
+                                    });
                                 }
                             }
                         }
@@ -160,7 +153,7 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                                 Node.isNoSubstitutionTemplateLiteral(initializer))) {
                             hasStringLiteralChildren = true;
                             const scriptContent = initializer.getLiteralValue();
-                            const { content: transformedContent, hasChanges: contentHasChanges, entryPoints: dynamicEntryPoints, } = transformScriptImports(scriptContent, manifest);
+                            const { content: transformedContent, hasChanges: contentHasChanges, entryPoints: dynamicEntryPoints, } = transformScriptImports(scriptContent, clientEntryPoints, manifest, projectRootDir);
                             entryPoints.push(...dynamicEntryPoints);
                             if (contentHasChanges && transformedContent) {
                                 const isTemplateLiteral = Node.isNoSubstitutionTemplateLiteral(initializer);
@@ -174,21 +167,35 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                                 });
                             }
                         }
-                        if (tagName === "link") {
-                            if (propName === "rel" &&
-                                (Node.isStringLiteral(initializer) ||
-                                    Node.isNoSubstitutionTemplateLiteral(initializer))) {
-                                const relValue = initializer.getLiteralValue();
-                                if (relValue === "preload" || relValue === "modulepreload") {
-                                    isPreload = true;
-                                }
-                            }
-                            if (propName === "href" &&
-                                (Node.isStringLiteral(initializer) ||
-                                    Node.isNoSubstitutionTemplateLiteral(initializer))) {
-                                hrefValue = initializer.getLiteralValue();
+                        if (tagName === "link" &&
+                            propName === "rel" &&
+                            initializer &&
+                            (Node.isStringLiteral(initializer) ||
+                                Node.isNoSubstitutionTemplateLiteral(initializer))) {
+                            const relValue = initializer.getLiteralValue();
+                            if (relValue === "preload" || relValue === "modulepreload") {
+                                isPreload = true;
                             }
                         }
+                        if (tagName === "link" && propName === "href") {
+                            hrefProp = prop;
+                        }
+                    }
+                }
+                if (isPreload && hrefProp) {
+                    const initializer = hrefProp.getInitializer();
+                    if (initializer &&
+                        (Node.isStringLiteral(initializer) ||
+                            Node.isNoSubstitutionTemplateLiteral(initializer))) {
+                        const hrefValue = initializer.getLiteralValue();
+                        if (hrefValue.startsWith("/")) {
+                            const transformedHref = transformAssetPath(hrefValue, projectRootDir);
+                            modifications.push({
+                                type: "literalValue",
+                                node: initializer,
+                                value: transformedHref,
+                            });
+                        }
                     }
                 }
                 if (tagName === "script" &&
@@ -205,43 +212,8 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                         needsRequestInfoImportRef.value = true;
                     }
                 }
-                if (tagName === "link" &&
-                    isPreload &&
-                    hrefValue &&
-                    hrefValue.startsWith("/") &&
-                    manifest[hrefValue.slice(1)]) {
-                    const path = hrefValue.slice(1);
-                    for (const prop of properties) {
-                        if (Node.isPropertyAssignment(prop) &&
-                            prop.getName() === "href") {
-                            const initializer = prop.getInitializer();
-                            if (Node.isStringLiteral(initializer) ||
-                                Node.isNoSubstitutionTemplateLiteral(initializer)) {
-                                const transformedHref = manifest[path].file;
-                                const originalText = initializer.getText();
-                                const isTemplateLiteral = Node.isNoSubstitutionTemplateLiteral(initializer);
-                                const quote = isTemplateLiteral
-                                    ? "`"
-                                    : originalText.charAt(0);
-                                let replacementText;
-                                if (isTemplateLiteral) {
-                                    replacementText = `\`/${transformedHref}\``;
-                                }
-                                else if (quote === '"') {
-                                    replacementText = `"/${transformedHref}"`;
-                                }
-                                else {
-                                    replacementText = `'/${transformedHref}'`;
-                                }
-                                modifications.push({
-                                    type: "replaceText",
-                                    node: initializer,
-                                    text: replacementText,
-                                });
-                            }
-                        }
-                    }
-                }
+                // Note: Link preload href transformations happen in Phase 5 (Asset Linking)
+                // During discovery phase, we only transform script tags
             }
         }
         if (entryPoints.length > 0) {
@@ -339,7 +311,7 @@ ${mod.callExprText}
     }
     return;
 }
-export const transformJsxScriptTagsPlugin = ({ manifestPath, }) => {
+export const transformJsxScriptTagsPlugin = ({ clientEntryPoints, projectRootDir, }) => {
     let isBuild = false;
     return {
         name: "rwsdk:vite:transform-jsx-script-tags",
@@ -347,14 +319,24 @@ export const transformJsxScriptTagsPlugin = ({ manifestPath, }) => {
             isBuild = config.command === "build";
         },
         async transform(code, id) {
+            // Skip during directive scanning to avoid performance issues
+            if (process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE) {
+                return;
+            }
+            if (isBuild &&
+                this.environment?.name === "worker" &&
+                process.env.RWSDK_BUILD_PASS !== "worker") {
+                return null;
+            }
             if (this.environment?.name === "worker" &&
                 id.endsWith(".tsx") &&
                 !id.includes("node_modules") &&
                 hasJsxFunctions(code)) {
                 log("Transforming JSX script tags in %s", id);
                 process.env.VERBOSE && log("Code:\n%s", code);
-                const manifest = isBuild ? await readManifest(manifestPath) : {};
-                const result = await transformJsxScriptTagsCode(code, manifest);
+                // During discovery phase, never use manifest - it doesn't exist yet
+                const result = await transformJsxScriptTagsCode(code, clientEntryPoints, {}, // Empty manifest during discovery
+                projectRootDir);
                 if (result) {
                     log("Transformed JSX script tags in %s", id);
                     process.env.VERBOSE &&

package/dist/vite/transformJsxScriptTagsPlugin.test.mjs

@@ -1,10 +1,15 @@
-import { describe, it, expect } from "vitest";
+import { describe, it, expect, beforeEach } from "vitest";
 import { transformJsxScriptTagsCode } from "./transformJsxScriptTagsPlugin.mjs";
 import jsBeautify from "js-beautify";
+import stubEnvVars from "../lib/testUtils/stubEnvVars.mjs";
 // Helper function to normalize code formatting for test comparisons
 function normalizeCode(code) {
     return jsBeautify(code, { indent_size: 2 });
 }
+stubEnvVars();
+beforeEach(() => {
+    process.env.RWSDK_BUILD_PASS = "worker";
+});
 describe("transformJsxScriptTagsCode", () => {
     const mockManifest = {
         "src/client.tsx": { file: "assets/client-a1b2c3d4.js" },
@@ -18,13 +23,14 @@ describe("transformJsxScriptTagsCode", () => {
         type: "module"
       })
     `;
-        const result = await transformJsxScriptTagsCode(code, mockManifest);
+        const clientEntryPoints = new Set();
+        const result = await transformJsxScriptTagsCode(code, clientEntryPoints, mockManifest, "/Users/justin/rw/forks/workers-sdk/sdk/sdk");
         const expected = `import { requestInfo } from "rwsdk/worker";
 
 (
 (requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
 jsx("script", {
-src: "/assets/client-a1b2c3d4.js",
+src: "rwsdk_asset:/src/client.tsx",
 type: "module",
 nonce: requestInfo.rw.nonce
 })
@@ -38,14 +44,15 @@ nonce: requestInfo.rw.nonce
         children: "import('/src/client.tsx').then(module => { console.log(module); })"
       })
     `;
-        const result = await transformJsxScriptTagsCode(code, mockManifest);
+        const clientEntryPoints = new Set();
+        const result = await transformJsxScriptTagsCode(code, clientEntryPoints, mockManifest, "/project/root/dir");
         const expected = `import { requestInfo } from "rwsdk/worker";
 
 (
 (requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
 jsx("script", {
 type: "module",
-children: "import('/assets/client-a1b2c3d4.js').then(module => { console.log(module); })",
+children: "import('rwsdk_asset:/src/client.tsx').then(module => { console.log(module); })",
 nonce: requestInfo.rw.nonce
 })
 )`;
@@ -55,12 +62,13 @@ nonce: requestInfo.rw.nonce
         const code = `
       jsx("script", { type: "module", children: "import('/src/client.tsx')" })
     `;
-        const result = await transformJsxScriptTagsCode(code, mockManifest);
+        const clientEntryPoints = new Set();
+        const result = await transformJsxScriptTagsCode(code, clientEntryPoints, mockManifest, "/project/root/dir");
         const expected = `import { requestInfo } from "rwsdk/worker";
 
 (
 (requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
-jsx("script", { type: "module", children: "import('/assets/client-a1b2c3d4.js')",
+jsx("script", { type: "module", children: "import('rwsdk_asset:/src/client.tsx')",
 nonce: requestInfo.rw.nonce
 })
 )`;
@@ -80,7 +88,8 @@ nonce: requestInfo.rw.nonce
         \`
       })
     `;
-        const result = await transformJsxScriptTagsCode(code, mockManifest);
+        const clientEntryPoints = new Set();
+        const result = await transformJsxScriptTagsCode(code, clientEntryPoints, mockManifest, "/project/root/dir");
         const expected = `import { requestInfo } from "rwsdk/worker";
 
 (
@@ -90,7 +99,7 @@ type: "module",
 children: \`
           // Some comments here
           const init = async () => {
-            await import('/assets/entry-e5f6g7h8.js');
+            await import('rwsdk_asset:/src/entry.js');
             console.log('initialized');
           };
           init();
@@ -110,7 +119,8 @@ import('/src/entry.js');
 \`
       })
     `;
-        const result = await transformJsxScriptTagsCode(code, mockManifest);
+        const clientEntryPoints = new Set();
+        const result = await transformJsxScriptTagsCode(code, clientEntryPoints, mockManifest, "/project/root/dir");
         const expected = `import { requestInfo } from "rwsdk/worker";
 
 (
@@ -119,8 +129,8 @@ import('/src/entry.js');
 jsx("script", {
 type: "module",
 children: \`
-import('/assets/client-a1b2c3d4.js');
-import('/assets/entry-e5f6g7h8.js');
+import('rwsdk_asset:/src/client.tsx');
+import('rwsdk_asset:/src/entry.js');
 \`,
 nonce: requestInfo.rw.nonce
 })
@@ -135,14 +145,17 @@ nonce: requestInfo.rw.nonce
         as: "script"
       })
     `;
-        const result = await transformJsxScriptTagsCode(code, mockManifest);
-        expect(result?.code).toEqual(`
+        const clientEntryPoints = new Set();
+        const result = await transformJsxScriptTagsCode(code, clientEntryPoints, mockManifest, "/project/root/dir");
+        const expected = `
       jsx("link", {
         rel: "preload",
-        href: "/assets/client-a1b2c3d4.js",
+        href: "rwsdk_asset:/src/client.tsx",
         as: "script"
       })
-    `);
+    `;
+        expect(normalizeCode(result?.code || "")).toEqual(normalizeCode(expected));
+        expect(clientEntryPoints.size).toBe(0); // Make sure it doesn't incorrectly add to entry points
     });
     it("transforms link href attributes with modulepreload rel", async () => {
         const code = `
@@ -151,13 +164,15 @@ nonce: requestInfo.rw.nonce
         rel: "modulepreload"
       })
     `;
-        const result = await transformJsxScriptTagsCode(code, mockManifest);
-        expect(result?.code).toEqual(`
+        const clientEntryPoints = new Set();
+        const result = await transformJsxScriptTagsCode(code, clientEntryPoints, mockManifest, "/project/root/dir");
+        const expected = `
       jsx("link", {
-        href: "/assets/client-a1b2c3d4.js",
+        href: "rwsdk_asset:/src/client.tsx",
         rel: "modulepreload"
       })
-    `);
+    `;
+        expect(normalizeCode(result?.code || "")).toEqual(normalizeCode(expected));
     });
     it("transforms real-world Document component example", async () => {
         const code = `
@@ -169,7 +184,7 @@ nonce: requestInfo.rw.nonce
               jsx("meta", { charSet: "utf-8" }),
               jsx("meta", { name: "viewport", content: "width=device-width, initial-scale=1" }),
               jsx("title", { children: "@redwoodjs/starter-standard" }),
-              jsx("link", { rel: "modulepreload", href: "/src/client.tsx", as: "script" })
+              jsx("link", { rel: "modulepreload", href: "rwsdk_asset:/src/client.tsx", as: "script" })
             ]
           }),
           jsx("body", {
@@ -181,7 +196,8 @@ nonce: requestInfo.rw.nonce
         ]
       })
     `;
-        const result = await transformJsxScriptTagsCode(code, mockManifest);
+        const clientEntryPoints = new Set();
+        const result = await transformJsxScriptTagsCode(code, clientEntryPoints, mockManifest, "/project/root/dir");
         const expected = `import { requestInfo } from "rwsdk/worker";
 
 jsx("html", {
@@ -192,7 +208,7 @@ children: [
 jsx("meta", { charSet: "utf-8" }),
 jsx("meta", { name: "viewport", content: "width=device-width, initial-scale=1" }),
 jsx("title", { children: "@redwoodjs/starter-standard" }),
-jsx("link", { rel: "modulepreload", href: "/assets/client-a1b2c3d4.js", as: "script" })
+jsx("link", { rel: "modulepreload", href: "rwsdk_asset:/src/client.tsx", as: "script" })
 ]
 }),
 jsx("body", {
@@ -200,7 +216,7 @@ children: [
 jsx("div", { id: "root", children: props.children }),
 (
 (requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
-jsx("script", { children: "import(\\"/assets/client-a1b2c3d4.js\\")",
+jsx("script", { children: "import(\\"rwsdk_asset:/src/client.tsx\\")",
 nonce: requestInfo.rw.nonce
 })
 )
@@ -214,7 +230,8 @@ nonce: requestInfo.rw.nonce
         const code = `
       jsx("div", { children: "No scripts or links here" })
     `;
-        const result = await transformJsxScriptTagsCode(code, mockManifest);
+        const clientEntryPoints = new Set();
+        const result = await transformJsxScriptTagsCode(code, clientEntryPoints, mockManifest, "/project/root/dir");
         expect(result).toBeUndefined();
     });
     it("handles paths not found in manifest", async () => {
@@ -224,13 +241,14 @@ nonce: requestInfo.rw.nonce
         type: "module"
       })
     `;
-        const result = await transformJsxScriptTagsCode(code, mockManifest);
+        const clientEntryPoints = new Set();
+        const result = await transformJsxScriptTagsCode(code, clientEntryPoints, mockManifest, "/project/root/dir");
         const expected = `import { requestInfo } from "rwsdk/worker";
 
 (
 (requestInfo.rw.scriptsToBeLoaded.add("/src/non-existent.js")),
 jsx("script", {
-src: "/src/non-existent.js",
+src: "rwsdk_asset:/src/non-existent.js",
 type: "module",
 nonce: requestInfo.rw.nonce
 })
@@ -244,13 +262,14 @@ nonce: requestInfo.rw.nonce
         type: "module"
       })
     `;
-        const result = await transformJsxScriptTagsCode(code, mockManifest);
+        const clientEntryPoints = new Set();
+        const result = await transformJsxScriptTagsCode(code, clientEntryPoints, mockManifest, "/project/root/dir");
         const expected = `import { requestInfo } from "rwsdk/worker";
 
 (
 (requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
 jsx("script", {
-src: "/assets/client-a1b2c3d4.js",
+src: "rwsdk_asset:/src/client.tsx",
 type: "module",
 nonce: requestInfo.rw.nonce
 })
@@ -264,7 +283,8 @@ nonce: requestInfo.rw.nonce
         children: "console.log('hello world')"
       })
     `;
-        const result = await transformJsxScriptTagsCode(code, {});
+        const clientEntryPoints = new Set();
+        const result = await transformJsxScriptTagsCode(code, clientEntryPoints, mockManifest, "/project/root/dir");
         expect(result?.code).toEqual(`import { requestInfo } from "rwsdk/worker";
 
       jsx("script", {
@@ -281,7 +301,8 @@ nonce: requestInfo.rw.nonce
         dangerouslySetInnerHTML: { __html: "console.log('hello world')" }
       })
     `;
-        const result = await transformJsxScriptTagsCode(code, {});
+        const clientEntryPoints = new Set();
+        const result = await transformJsxScriptTagsCode(code, clientEntryPoints, mockManifest, "/project/root/dir");
         expect(result?.code).toEqual(undefined);
     });
     it("does not add nonce to script tags that already have nonce", async () => {
@@ -292,7 +313,8 @@ nonce: requestInfo.rw.nonce
         nonce: "existing-nonce"
       })
     `;
-        const result = await transformJsxScriptTagsCode(code, {});
+        const clientEntryPoints = new Set();
+        const result = await transformJsxScriptTagsCode(code, clientEntryPoints, mockManifest, "/project/root/dir");
         expect(result?.code).toEqual(undefined);
     });
     it("uses existing requestInfo import if already present", async () => {
@@ -305,7 +327,8 @@ nonce: requestInfo.rw.nonce
         children: "console.log('hello world')"
       })
     `;
-        const result = await transformJsxScriptTagsCode(code, {});
+        const clientEntryPoints = new Set();
+        const result = await transformJsxScriptTagsCode(code, clientEntryPoints, mockManifest, "/project/root/dir");
         expect(result?.code).toEqual(`
       import { foo } from 'bar';
       import { requestInfo, someOtherThing } from "rwsdk/worker";
@@ -331,7 +354,8 @@ nonce: requestInfo.rw.nonce
         children: "console.log('hello world')"
       })
     `;
-        const result = await transformJsxScriptTagsCode(code, {});
+        const clientEntryPoints = new Set();
+        const result = await transformJsxScriptTagsCode(code, clientEntryPoints, mockManifest, "/project/root/dir");
         expect(result?.code).toEqual(`
       import { foo } from 'bar';
       import { someOtherThing, requestInfo } from "rwsdk/worker";
@@ -351,13 +375,14 @@ nonce: requestInfo.rw.nonce
       })
     `;
         // Call without providing manifest (simulating dev mode)
-        const result = await transformJsxScriptTagsCode(code);
+        const clientEntryPoints = new Set();
+        const result = await transformJsxScriptTagsCode(code, clientEntryPoints, mockManifest, "/project/root/dir");
         const expected = `import { requestInfo } from "rwsdk/worker";
 
 (
 (requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
 jsx("script", {
-src: "/src/client.tsx",
+src: "rwsdk_asset:/src/client.tsx",
 type: "module",
 nonce: requestInfo.rw.nonce
 })
@@ -433,7 +458,7 @@ export const Document = ({
       lineNumber: 22,
       columnNumber: 4
     }, this),
-    /* @__PURE__ */ jsxDEV("link", { rel: "modulepreload", href: "/src/client.tsx" }, void 0, false, {
+    /* @__PURE__ */ jsxDEV("link", { rel: "modulepreload", href: "rwsdk_asset:/src/client.tsx" }, void 0, false, {
       fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
       lineNumber: 23,
       columnNumber: 4
@@ -470,7 +495,8 @@ export const Document = ({
   columnNumber: 2
 }, this);
 `;
-        const result = await transformJsxScriptTagsCode(code, mockManifest);
+        const clientEntryPoints = new Set();
+        const result = await transformJsxScriptTagsCode(code, clientEntryPoints, mockManifest, "/project/root/dir");
         // For this complex test, we'll just verify the key transformations
         const expected = `
 import { jsxDEV } from "react/jsx-dev-runtime";
@@ -534,7 +560,7 @@ children
   ),
   (
 (requestInfo.rw.scriptsToBeLoaded.add("/theme-script.js")),
-/* @__PURE__ */ jsxDEV("script", { src: "/theme-script.js",
+/* @__PURE__ */ jsxDEV("script", { src: "rwsdk_asset:/theme-script.js",
                           nonce: requestInfo.rw.nonce
                     }, void 0, false, {
       fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
@@ -547,7 +573,7 @@ children
     lineNumber: 22,
     columnNumber: 4
   }, this),
-  /* @__PURE__ */ jsxDEV("link", { rel: "modulepreload", href: "/assets/client-a1b2c3d4.js" }, void 0, false, {
+  /* @__PURE__ */ jsxDEV("link", { rel: "modulepreload", href: "rwsdk_asset:/src/client.tsx" }, void 0, false, {
     fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
     lineNumber: 23,
     columnNumber: 4
@@ -570,7 +596,7 @@ children
   }, this),
   (
 (requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
-/* @__PURE__ */ jsxDEV("script", { children: "import(\\"/assets/client-a1b2c3d4.js\\")",
+/* @__PURE__ */ jsxDEV("script", { children: "import(\\"rwsdk_asset:/src/client.tsx\\")",
                         nonce: requestInfo.rw.nonce
                   }, void 0, false, {
       fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",

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>, addServerModule?: (environment: string, id: string) => void) => TransformResult | undefined;
+export declare const transformServerFunctions: (code: string, normalizedId: string, environment: "client" | "worker" | "ssr", serverFiles?: Set<string>) => TransformResult | undefined;
 export type { TransformResult };

package/dist/vite/transformServerFunctions.mjs

@@ -84,19 +84,15 @@ function hasDefaultExport(code, normalizedId) {
     }
     return false;
 }
-export const transformServerFunctions = (code, normalizedId, environment, serverFiles, addServerModule) => {
-    process.env.VERBOSE &&
-        log("Transform server functions called for normalizedId=%s, environment=%s", normalizedId, environment);
+export const transformServerFunctions = (code, normalizedId, environment, serverFiles) => {
     if (!hasDirective(code, "use server")) {
-        log("Skipping: no 'use server' directive in id=%s", normalizedId);
-        process.env.VERBOSE &&
-            log(":VERBOSE: Returning code unchanged for id=%s:\n%s", normalizedId, code);
         return;
     }
-    log("Processing 'use server' module: normalizedId=%s, environment=%s", normalizedId, environment);
-    addServerModule?.(environment, normalizedId);
+    process.env.VERBOSE &&
+        log("Processing 'use server' module: normalizedId=%s, environment=%s", normalizedId, environment);
     if (environment === "ssr" || environment === "client") {
-        log(`Transforming for ${environment} environment: normalizedId=%s`, normalizedId);
+        process.env.VERBOSE &&
+            log(`Transforming for ${environment} environment: normalizedId=%s`, normalizedId);
         const exportInfo = findExportInfo(code, normalizedId);
         const allExports = new Set([
             ...exportInfo.localFunctions,
@@ -126,7 +122,8 @@ export const transformServerFunctions = (code, normalizedId, environment, server
             s.append(`\nexport default createServerReference(${JSON.stringify(normalizedId)}, "default");\n`);
             log(`Added ${environment} server reference for default export in normalizedId=%s`, normalizedId);
         }
-        log(`${environment} transformation complete for normalizedId=%s`, normalizedId);
+        process.env.VERBOSE &&
+            log(`${environment} transformation complete for normalizedId=%s`, normalizedId);
         return {
             code: s.toString(),
             map: s.generateMap({
@@ -137,7 +134,8 @@ export const transformServerFunctions = (code, normalizedId, environment, server
         };
     }
     else if (environment === "worker") {
-        log("Transforming for worker environment: normalizedId=%s", normalizedId);
+        process.env.VERBOSE &&
+            log("Transforming for worker environment: normalizedId=%s", normalizedId);
         const exportInfo = findExportInfo(code, normalizedId);
         const s = new MagicString(code);
         // Remove "use server" directive first
@@ -281,7 +279,8 @@ export const transformServerFunctions = (code, normalizedId, environment, server
         if (registrationCalls.length > 0) {
             s.append(registrationCalls.join("\n") + "\n");
         }
-        log("Worker transformation complete for normalizedId=%s", normalizedId);
+        process.env.VERBOSE &&
+            log("Worker transformation complete for normalizedId=%s", normalizedId);
         return {
             code: s.toString(),
             map: s.generateMap({

package/dist/vite/virtualPlugin.mjs

@@ -4,12 +4,20 @@ export const virtualPlugin = (name, load) => {
     return {
         name: `rwsdk:virtual-${name}`,
         resolveId(source, _importer, _options) {
+            // Skip during directive scanning to avoid performance issues
+            if (process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE) {
+                return;
+            }
             if (source === name || source.startsWith(`${name}?`)) {
                 return `\0${source}`;
             }
             return;
         },
         load(id, options) {
+            // Skip during directive scanning to avoid performance issues
+            if (process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE) {
+                return;
+            }
             if (id === `\0${name}` || id.startsWith(`\0${name}?`)) {
                 return load.apply(this, [id, options]);
             }