rwsdk 0.2.0-alpha.16 → 0.2.0-alpha.16-test.20250825032050

package/dist/scripts/debug-sync.mjs

@@ -7,6 +7,9 @@ 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",
@@ -63,6 +66,23 @@ const performFullSync = async (sdkDir, targetDir) => {
     // Clean up vite cache
     await cleanupViteEntries(targetDir);
     try {
+        try {
+            originalSdkPackageJson = await fs.readFile(sdkPackageJsonPath, "utf-8");
+            const packageJson = JSON.parse(originalSdkPackageJson);
+            const originalVersion = packageJson.version;
+            const timestamp = new Date()
+                .toISOString()
+                .replace(/[-:T.]/g, "")
+                .slice(0, 14);
+            const newVersion = `${originalVersion}+build.${timestamp}`;
+            console.log(`Temporarily setting version to ${newVersion}`);
+            packageJson.version = newVersion;
+            await fs.writeFile(sdkPackageJsonPath, JSON.stringify(packageJson, null, 2));
+        }
+        catch (e) {
+            console.warn("Could not modify package.json version, proceeding without it.");
+            originalSdkPackageJson = null; // don't restore if we failed to modify
+        }
         console.log("📦 Packing SDK...");
         const packResult = await $({ cwd: sdkDir }) `npm pack --json`;
         const json = JSON.parse(packResult.stdout || "[]");
@@ -84,6 +104,29 @@ const performFullSync = async (sdkDir, targetDir) => {
             .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") {

package/dist/scripts/worker-run.mjs

@@ -16,13 +16,18 @@ export const runWorkerScript = async (relativeScriptPath) => {
         console.error("Error: Script path is required");
         console.log("\nUsage:");
         console.log("  npm run worker:run <script-path>");
-        console.log("\nExample:");
-        console.log("  npm run worker:run src/scripts/seed.ts\n");
+        console.log("\nOptions:");
+        console.log("  RWSDK_WRANGLER_CONFIG      Environment variable for config path");
+        console.log("\nExamples:");
+        console.log("  npm run worker:run src/scripts/seed.ts");
+        console.log("  RWSDK_WRANGLER_CONFIG=custom.toml npm run worker:run src/scripts/seed.ts\n");
         process.exit(1);
     }
     const scriptPath = resolve(process.cwd(), relativeScriptPath);
     debug("Running worker script: %s", scriptPath);
-    const workerConfigPath = await findWranglerConfig(process.cwd());
+    const workerConfigPath = process.env.RWSDK_WRANGLER_CONFIG
+        ? resolve(process.cwd(), process.env.RWSDK_WRANGLER_CONFIG)
+        : await findWranglerConfig(process.cwd());
     debug("Using wrangler config: %s", workerConfigPath);
     const workerConfig = unstable_readConfig({
         config: workerConfigPath,

package/dist/vite/redwoodPlugin.mjs

@@ -33,7 +33,10 @@ const determineWorkerEntryPathname = async (projectRootDir, workerConfigPath, op
 };
 export const redwoodPlugin = async (options = {}) => {
     const projectRootDir = process.cwd();
-    const workerConfigPath = options.configPath ?? (await findWranglerConfig(projectRootDir));
+    const workerConfigPath = options.configPath ??
+        (process.env.RWSDK_WRANGLER_CONFIG
+            ? resolve(projectRootDir, process.env.RWSDK_WRANGLER_CONFIG)
+            : await findWranglerConfig(projectRootDir));
     const workerEntryPathname = await determineWorkerEntryPathname(projectRootDir, workerConfigPath, options);
     const clientEntryPathnames = (Array.isArray(options.entry?.client)
         ? options.entry.client

package/dist/vite/transformJsxScriptTagsPlugin.mjs

@@ -1,4 +1,4 @@
-import { Project, Node, SyntaxKind } from "ts-morph";
+import { Project, Node, SyntaxKind, } from "ts-morph";
 import { readFile } from "node:fs/promises";
 import { pathExists } from "fs-extra";
 import debug from "debug";
@@ -90,8 +90,9 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
     }
     const project = new Project({ useInMemoryFileSystem: true });
     const sourceFile = project.createSourceFile("temp.tsx", code);
-    let hasModifications = false;
+    const modifications = [];
     const needsRequestInfoImportRef = { value: false };
+    const entryPointsPerCallExpr = new Map();
     // Check for existing imports up front
     let hasRequestInfoImport = false;
     let sdkWorkerImportDecl;
@@ -169,8 +170,11 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                                     const path = srcValue.slice(1); // Remove leading slash
                                     if (manifest[path]) {
                                         const transformedSrc = `/${manifest[path].file}`;
-                                        initializer.setLiteralValue(transformedSrc);
-                                        hasModifications = true;
+                                        modifications.push({
+                                            type: "literalValue",
+                                            node: initializer,
+                                            value: transformedSrc,
+                                        });
                                     }
                                 }
                             }
@@ -188,14 +192,14 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                             if (contentHasChanges && transformedContent) {
                                 // Get the raw text with quotes to determine the exact format
                                 const isTemplateLiteral = Node.isNoSubstitutionTemplateLiteral(initializer);
-                                if (isTemplateLiteral) {
-                                    // Simply wrap the transformed content in backticks
-                                    initializer.replaceWithText("`" + transformedContent + "`");
-                                }
-                                else {
-                                    initializer.replaceWithText(JSON.stringify(transformedContent));
-                                }
-                                hasModifications = true;
+                                const replacementText = isTemplateLiteral
+                                    ? "`" + transformedContent + "`"
+                                    : JSON.stringify(transformedContent);
+                                modifications.push({
+                                    type: "replaceText",
+                                    node: initializer,
+                                    text: replacementText,
+                                });
                             }
                         }
                         // For link tags, first check if it's a preload/modulepreload
@@ -221,15 +225,16 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                     !hasNonce &&
                     !hasDangerouslySetInnerHTML &&
                     (hasStringLiteralChildren || hasSrc)) {
-                    // Add nonce property to the props object
-                    propsArg.addPropertyAssignment({
+                    // Collect nonce property addition
+                    modifications.push({
+                        type: "addProperty",
+                        node: propsArg,
                         name: "nonce",
                         initializer: "requestInfo.rw.nonce",
                     });
                     if (!hasRequestInfoImport) {
                         needsRequestInfoImportRef.value = true;
                     }
-                    hasModifications = true;
                 }
                 // Transform href if this is a preload link
                 if (tagName === "link" &&
@@ -250,17 +255,22 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                                 const quote = isTemplateLiteral
                                     ? "`"
                                     : originalText.charAt(0);
-                                // Preserve the original quote style
+                                // Preserve the original quote style and prepare replacement text
+                                let replacementText;
                                 if (isTemplateLiteral) {
-                                    initializer.replaceWithText(`\`/${transformedHref}\``);
+                                    replacementText = `\`/${transformedHref}\``;
                                 }
                                 else if (quote === '"') {
-                                    initializer.replaceWithText(`"/${transformedHref}"`);
+                                    replacementText = `"/${transformedHref}"`;
                                 }
                                 else {
-                                    initializer.replaceWithText(`'/${transformedHref}'`);
+                                    replacementText = `'/${transformedHref}'`;
                                 }
-                                hasModifications = true;
+                                modifications.push({
+                                    type: "replaceText",
+                                    node: initializer,
+                                    text: replacementText,
+                                });
                             }
                         }
                     }
@@ -274,51 +284,103 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                 .join(",\n");
             const leadingCommentRanges = callExpr.getLeadingCommentRanges();
             const pureComment = leadingCommentRanges.find((r) => r.getText().includes("@__PURE__"));
+            // Store position and static data for later processing
+            const wrapInfo = {
+                callExpr: callExpr,
+                sideEffects: sideEffects,
+                pureCommentText: pureComment?.getText(),
+            };
+            // We'll collect the actual wrap modifications after simple modifications are applied
+            if (!entryPointsPerCallExpr.has(callExpr)) {
+                entryPointsPerCallExpr.set(callExpr, wrapInfo);
+            }
+            needsRequestInfoImportRef.value = true;
+        }
+    });
+    // Apply all collected modifications
+    if (modifications.length > 0 || entryPointsPerCallExpr.size > 0) {
+        // Apply modifications in the right order to avoid invalidating nodes
+        // Apply simple modifications first (these are less likely to invalidate other nodes)
+        for (const mod of modifications) {
+            if (mod.type === "literalValue") {
+                mod.node.setLiteralValue(mod.value);
+            }
+            else if (mod.type === "replaceText") {
+                mod.node.replaceWithText(mod.text);
+            }
+            else if (mod.type === "addProperty") {
+                mod.node.addPropertyAssignment({
+                    name: mod.name,
+                    initializer: mod.initializer,
+                });
+            }
+        }
+        // Apply CallExpr wrapping last (these can invalidate other nodes)
+        // Now collect the wrap modifications with fresh data after simple modifications
+        const wrapModifications = [];
+        for (const [callExpr, wrapInfo] of entryPointsPerCallExpr) {
+            const fullStart = callExpr.getFullStart();
+            const end = callExpr.getEnd();
             const callExprText = callExpr.getText();
-            if (pureComment) {
-                const pureCommentText = pureComment.getText();
+            const fullText = callExpr.getFullText();
+            // Extract leading whitespace/newlines before the call expression
+            const leadingWhitespace = fullText.substring(0, fullText.length - callExprText.length);
+            let pureCommentText;
+            let leadingTriviaText;
+            if (wrapInfo.pureCommentText) {
+                pureCommentText = wrapInfo.pureCommentText;
+                leadingTriviaText = leadingWhitespace;
+            }
+            wrapModifications.push({
+                type: "wrapCallExpr",
+                sideEffects: wrapInfo.sideEffects,
+                pureCommentText: pureCommentText,
+                leadingTriviaText: leadingTriviaText,
+                fullStart: fullStart,
+                end: end,
+                callExprText: callExprText,
+                leadingWhitespace: leadingWhitespace,
+            });
+        }
+        // Sort by position in reverse order to avoid invalidating later nodes
+        wrapModifications.sort((a, b) => b.fullStart - a.fullStart);
+        for (const mod of wrapModifications) {
+            if (mod.pureCommentText && mod.leadingTriviaText) {
                 const newText = `(
-            ${sideEffects},
-            ${pureCommentText} ${callExprText}
-          )`;
-                const fullText = callExpr.getFullText();
-                const leadingTriviaText = fullText.substring(0, fullText.length - callExprText.length);
-                const newLeadingTriviaText = leadingTriviaText.replace(pureCommentText, "");
+${mod.sideEffects},
+${mod.pureCommentText} ${mod.callExprText}
+)`;
+                const newLeadingTriviaText = mod.leadingTriviaText.replace(mod.pureCommentText, "");
                 // By replacing from `getFullStart`, we remove the original node and all its leading trivia
                 // and replace it with our manually reconstructed string.
                 // This should correctly move the pure comment and preserve other comments and whitespace.
-                callExpr
-                    .getSourceFile()
-                    .replaceText([callExpr.getFullStart(), callExpr.getEnd()], newLeadingTriviaText + newText);
+                sourceFile.replaceText([mod.fullStart, mod.end], newLeadingTriviaText + newText);
             }
             else {
-                callExpr.replaceWithText(`(
-              ${sideEffects},
-              ${callExprText}
-            )`);
+                // Extract just the newlines and basic indentation, ignore extra padding
+                const leadingNewlines = mod.leadingWhitespace.match(/\n\s*/)?.[0] || "";
+                sourceFile.replaceText([mod.fullStart, mod.end], `${leadingNewlines}(
+${mod.sideEffects},
+${mod.callExprText}
+)`);
             }
-            needsRequestInfoImportRef.value = true;
-            hasModifications = true;
         }
-    });
-    // Add requestInfo import if needed and not already imported
-    if (needsRequestInfoImportRef.value && hasModifications) {
-        if (sdkWorkerImportDecl) {
-            // Module is imported but need to add requestInfo
-            if (!hasRequestInfoImport) {
-                sdkWorkerImportDecl.addNamedImport("requestInfo");
+        // Add requestInfo import if needed and not already imported
+        if (needsRequestInfoImportRef.value) {
+            if (sdkWorkerImportDecl) {
+                // Module is imported but need to add requestInfo
+                if (!hasRequestInfoImport) {
+                    sdkWorkerImportDecl.addNamedImport("requestInfo");
+                }
+            }
+            else {
+                // Add new import declaration
+                sourceFile.addImportDeclaration({
+                    moduleSpecifier: "rwsdk/worker",
+                    namedImports: ["requestInfo"],
+                });
             }
         }
-        else {
-            // Add new import declaration
-            sourceFile.addImportDeclaration({
-                moduleSpecifier: "rwsdk/worker",
-                namedImports: ["requestInfo"],
-            });
-        }
-    }
-    // Return the transformed code only if modifications were made
-    if (hasModifications) {
         return {
             code: sourceFile.getFullText(),
             map: null,
@@ -338,6 +400,8 @@ export const transformJsxScriptTagsPlugin = ({ manifestPath, }) => {
                 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);
                 if (result) {

package/dist/vite/transformJsxScriptTagsPlugin.test.mjs

@@ -1,5 +1,10 @@
 import { describe, it, expect } from "vitest";
 import { transformJsxScriptTagsCode } from "./transformJsxScriptTagsPlugin.mjs";
+import jsBeautify from "js-beautify";
+// Helper function to normalize code formatting for test comparisons
+function normalizeCode(code) {
+    return jsBeautify(code, { indent_size: 2 });
+}
 describe("transformJsxScriptTagsCode", () => {
     const mockManifest = {
         "src/client.tsx": { file: "assets/client-a1b2c3d4.js" },
@@ -14,17 +19,17 @@ describe("transformJsxScriptTagsCode", () => {
       })
     `;
         const result = await transformJsxScriptTagsCode(code, mockManifest);
-        expect(result?.code).toEqual(`import { requestInfo } from "rwsdk/worker";
+        const expected = `import { requestInfo } from "rwsdk/worker";
 
-      (
-              (requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
-              jsx("script", {
-        src: "/assets/client-a1b2c3d4.js",
-        type: "module",
-          nonce: requestInfo.rw.nonce
-    })
-            )
-    `);
+(
+(requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
+jsx("script", {
+src: "/assets/client-a1b2c3d4.js",
+type: "module",
+nonce: requestInfo.rw.nonce
+})
+)`;
+        expect(normalizeCode(result?.code || "")).toEqual(normalizeCode(expected));
     });
     it("transforms inline scripts with dynamic imports", async () => {
         const code = `
@@ -34,32 +39,32 @@ describe("transformJsxScriptTagsCode", () => {
       })
     `;
         const result = await transformJsxScriptTagsCode(code, mockManifest);
-        expect(result?.code).toEqual(`import { requestInfo } from "rwsdk/worker";
+        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); })",
-          nonce: requestInfo.rw.nonce
-    })
-            )
-    `);
+(
+(requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
+jsx("script", {
+type: "module",
+children: "import('/assets/client-a1b2c3d4.js').then(module => { console.log(module); })",
+nonce: requestInfo.rw.nonce
+})
+)`;
+        expect(normalizeCode(result?.code || "")).toEqual(normalizeCode(expected));
     });
     it("transforms inline scripts with type=module", async () => {
         const code = `
       jsx("script", { type: "module", children: "import('/src/client.tsx')" })
     `;
         const result = await transformJsxScriptTagsCode(code, mockManifest);
-        expect(result?.code).toEqual(`import { requestInfo } from "rwsdk/worker";
+        const expected = `import { requestInfo } from "rwsdk/worker";
 
-      (
-              (requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
-              jsx("script", { type: "module", children: "import('/assets/client-a1b2c3d4.js')",
-          nonce: requestInfo.rw.nonce
-    })
-            )
-    `);
+(
+(requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
+jsx("script", { type: "module", children: "import('/assets/client-a1b2c3d4.js')",
+nonce: requestInfo.rw.nonce
+})
+)`;
+        expect(normalizeCode(result?.code || "")).toEqual(normalizeCode(expected));
     });
     it("transforms inline scripts with multiline content", async () => {
         const code = `
@@ -76,13 +81,13 @@ describe("transformJsxScriptTagsCode", () => {
       })
     `;
         const result = await transformJsxScriptTagsCode(code, mockManifest);
-        expect(result?.code).toEqual(`import { requestInfo } from "rwsdk/worker";
+        const expected = `import { requestInfo } from "rwsdk/worker";
 
-      (
-              (requestInfo.rw.scriptsToBeLoaded.add("/src/entry.js")),
-              jsx("script", {
-        type: "module",
-        children: \`
+(
+(requestInfo.rw.scriptsToBeLoaded.add("/src/entry.js")),
+jsx("script", {
+type: "module",
+children: \`
           // Some comments here
           const init = async () => {
             await import('/assets/entry-e5f6g7h8.js');
@@ -90,37 +95,37 @@ describe("transformJsxScriptTagsCode", () => {
           };
           init();
         \`,
-          nonce: requestInfo.rw.nonce
-    })
-            )
-    `);
+nonce: requestInfo.rw.nonce
+})
+)`;
+        expect(normalizeCode(result?.code || "")).toEqual(normalizeCode(expected));
     });
     it("transforms multiple imports in the same inline script", async () => {
         const code = `
       jsx("script", {
         type: "module",
         children: \`
-          import('/src/client.tsx');
-          import('/src/entry.js');
-        \`
+import('/src/client.tsx');
+import('/src/entry.js');
+\`
       })
     `;
         const result = await transformJsxScriptTagsCode(code, mockManifest);
-        expect(result?.code).toEqual(`import { requestInfo } from "rwsdk/worker";
+        const expected = `import { requestInfo } from "rwsdk/worker";
 
-      (
-              (requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
+(
+(requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
 (requestInfo.rw.scriptsToBeLoaded.add("/src/entry.js")),
-              jsx("script", {
-        type: "module",
-        children: \`
-          import('/assets/client-a1b2c3d4.js');
-          import('/assets/entry-e5f6g7h8.js');
-        \`,
-          nonce: requestInfo.rw.nonce
-    })
-            )
-    `);
+jsx("script", {
+type: "module",
+children: \`
+import('/assets/client-a1b2c3d4.js');
+import('/assets/entry-e5f6g7h8.js');
+\`,
+nonce: requestInfo.rw.nonce
+})
+)`;
+        expect(normalizeCode(result?.code || "")).toEqual(normalizeCode(expected));
     });
     it("transforms link href attributes with preload rel", async () => {
         const code = `
@@ -177,33 +182,33 @@ describe("transformJsxScriptTagsCode", () => {
       })
     `;
         const result = await transformJsxScriptTagsCode(code, mockManifest);
-        expect(result?.code).toEqual(`import { requestInfo } from "rwsdk/worker";
+        const expected = `import { requestInfo } from "rwsdk/worker";
 
-      jsx("html", {
-        lang: "en",
-        children: [
-          jsx("head", {
-            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("body", {
-            children: [
-              jsx("div", { id: "root", children: props.children }),
-              (
-                              (requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
-                              jsx("script", { children: "import(\\"\/assets\/client-a1b2c3d4.js\\")",
-                                  nonce: requestInfo.rw.nonce
-                            })
-                            )
-            ]
-          })
-        ]
-      })
-    `);
+jsx("html", {
+lang: "en",
+children: [
+jsx("head", {
+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("body", {
+children: [
+jsx("div", { id: "root", children: props.children }),
+(
+(requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
+jsx("script", { children: "import(\\"/assets/client-a1b2c3d4.js\\")",
+nonce: requestInfo.rw.nonce
+})
+)
+]
+})
+]
+})`;
+        expect(normalizeCode(result?.code || "")).toEqual(normalizeCode(expected));
     });
     it("returns null when no transformations are needed", async () => {
         const code = `
@@ -220,17 +225,17 @@ describe("transformJsxScriptTagsCode", () => {
       })
     `;
         const result = await transformJsxScriptTagsCode(code, mockManifest);
-        expect(result?.code).toEqual(`import { requestInfo } from "rwsdk/worker";
+        const expected = `import { requestInfo } from "rwsdk/worker";
 
-      (
-              (requestInfo.rw.scriptsToBeLoaded.add("/src/non-existent.js")),
-              jsx("script", {
-        src: "/src/non-existent.js",
-        type: "module",
-          nonce: requestInfo.rw.nonce
-    })
-            )
-    `);
+(
+(requestInfo.rw.scriptsToBeLoaded.add("/src/non-existent.js")),
+jsx("script", {
+src: "/src/non-existent.js",
+type: "module",
+nonce: requestInfo.rw.nonce
+})
+)`;
+        expect(normalizeCode(result?.code || "")).toEqual(normalizeCode(expected));
     });
     it("adds nonce to script tags with src attribute and imports requestInfo", async () => {
         const code = `
@@ -240,17 +245,17 @@ describe("transformJsxScriptTagsCode", () => {
       })
     `;
         const result = await transformJsxScriptTagsCode(code, mockManifest);
-        expect(result?.code).toEqual(`import { requestInfo } from "rwsdk/worker";
+        const expected = `import { requestInfo } from "rwsdk/worker";
 
-      (
-              (requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
-              jsx("script", {
-        src: "/assets/client-a1b2c3d4.js",
-        type: "module",
-          nonce: requestInfo.rw.nonce
-    })
-            )
-    `);
+(
+(requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
+jsx("script", {
+src: "/assets/client-a1b2c3d4.js",
+type: "module",
+nonce: requestInfo.rw.nonce
+})
+)`;
+        expect(normalizeCode(result?.code || "")).toEqual(normalizeCode(expected));
     });
     it("adds nonce to script tags with string literal children", async () => {
         const code = `
@@ -347,16 +352,242 @@ describe("transformJsxScriptTagsCode", () => {
     `;
         // Call without providing manifest (simulating dev mode)
         const result = await transformJsxScriptTagsCode(code);
-        expect(result?.code).toEqual(`import { requestInfo } from "rwsdk/worker";
+        const expected = `import { requestInfo } from "rwsdk/worker";
 
-      (
-              (requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
-              jsx("script", {
-        src: "/src/client.tsx",
-        type: "module",
-          nonce: requestInfo.rw.nonce
-    })
-            )
-    `);
+(
+(requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
+jsx("script", {
+src: "/src/client.tsx",
+type: "module",
+nonce: requestInfo.rw.nonce
+})
+)`;
+        expect(normalizeCode(result?.code || "")).toEqual(normalizeCode(expected));
+    });
+    it("regression favicon links", async () => {
+        const code = `
+    import { jsxDEV } from "react/jsx-dev-runtime";
+import styles from "./index.css?url";
+export const Document = ({
+  children
+}) => /* @__PURE__ */ jsxDEV("html", { lang: "en", children: [
+  /* @__PURE__ */ jsxDEV("head", { children: [
+    /* @__PURE__ */ jsxDEV("meta", { charSet: "utf-8" }, void 0, false, {
+      fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+      lineNumber: 8,
+      columnNumber: 4
+    }, this),
+    /* @__PURE__ */ jsxDEV("meta", { name: "viewport", content: "width=device-width, initial-scale=1" }, void 0, false, {
+      fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+      lineNumber: 9,
+      columnNumber: 4
+    }, this),
+    /* @__PURE__ */ jsxDEV("title", { children: "rwsdk-guestbook" }, void 0, false, {
+      fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+      lineNumber: 10,
+      columnNumber: 4
+    }, this),
+    /* @__PURE__ */ jsxDEV("link", { rel: "preconnect", href: "https://fonts.googleapis.com" }, void 0, false, {
+      fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+      lineNumber: 11,
+      columnNumber: 4
+    }, this),
+    /* @__PURE__ */ jsxDEV(
+      "link",
+      {
+        rel: "preconnect",
+        href: "https://fonts.gstatic.com",
+        crossOrigin: "anonymous"
+      },
+      void 0,
+      false,
+      {
+        fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+        lineNumber: 12,
+        columnNumber: 4
+      },
+      this
+    ),
+    /* @__PURE__ */ jsxDEV(
+      "link",
+      {
+        href: "https://fonts.googleapis.com/css2?family=Geist+Mono:wght@100..900&display=swap",
+        rel: "stylesheet"
+      },
+      void 0,
+      false,
+      {
+        fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+        lineNumber: 17,
+        columnNumber: 4
+      },
+      this
+    ),
+    /* @__PURE__ */ jsxDEV("script", { src: "/theme-script.js" }, void 0, false, {
+      fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+      lineNumber: 21,
+      columnNumber: 4
+    }, this),
+    /* @__PURE__ */ jsxDEV("link", { rel: "icon", href: "/favicon.svg" }, void 0, false, {
+      fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+      lineNumber: 22,
+      columnNumber: 4
+    }, this),
+    /* @__PURE__ */ jsxDEV("link", { rel: "modulepreload", href: "/src/client.tsx" }, void 0, false, {
+      fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+      lineNumber: 23,
+      columnNumber: 4
+    }, this),
+    /* @__PURE__ */ jsxDEV("link", { rel: "stylesheet", href: styles }, void 0, false, {
+      fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+      lineNumber: 24,
+      columnNumber: 4
+    }, this)
+  ] }, void 0, true, {
+    fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+    lineNumber: 7,
+    columnNumber: 3
+  }, this),
+  /* @__PURE__ */ jsxDEV("body", { children: [
+    /* @__PURE__ */ jsxDEV("div", { id: "root", children }, void 0, false, {
+      fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+      lineNumber: 27,
+      columnNumber: 4
+    }, this),
+    /* @__PURE__ */ jsxDEV("script", { children: 'import("/src/client.tsx")' }, void 0, false, {
+      fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+      lineNumber: 28,
+      columnNumber: 4
+    }, this)
+  ] }, void 0, true, {
+    fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+    lineNumber: 26,
+    columnNumber: 3
+  }, this)
+] }, void 0, true, {
+  fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+  lineNumber: 6,
+  columnNumber: 2
+}, this);
+`;
+        const result = await transformJsxScriptTagsCode(code, mockManifest);
+        // For this complex test, we'll just verify the key transformations
+        const expected = `
+import { jsxDEV } from "react/jsx-dev-runtime";
+import styles from "./index.css?url";
+import { requestInfo } from "rwsdk/worker";
+
+export const Document = ({
+children
+}) => /* @__PURE__ */ jsxDEV("html", { lang: "en", children: [
+/* @__PURE__ */ jsxDEV("head", { children: [
+  /* @__PURE__ */ jsxDEV("meta", { charSet: "utf-8" }, void 0, false, {
+    fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+    lineNumber: 8,
+    columnNumber: 4
+  }, this),
+  /* @__PURE__ */ jsxDEV("meta", { name: "viewport", content: "width=device-width, initial-scale=1" }, void 0, false, {
+    fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+    lineNumber: 9,
+    columnNumber: 4
+  }, this),
+  /* @__PURE__ */ jsxDEV("title", { children: "rwsdk-guestbook" }, void 0, false, {
+    fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+    lineNumber: 10,
+    columnNumber: 4
+  }, this),
+  /* @__PURE__ */ jsxDEV("link", { rel: "preconnect", href: "https://fonts.googleapis.com" }, void 0, false, {
+    fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+    lineNumber: 11,
+    columnNumber: 4
+  }, this),
+  /* @__PURE__ */ jsxDEV(
+    "link",
+    {
+      rel: "preconnect",
+      href: "https://fonts.gstatic.com",
+      crossOrigin: "anonymous"
+    },
+    void 0,
+    false,
+    {
+      fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+      lineNumber: 12,
+      columnNumber: 4
+    },
+    this
+  ),
+  /* @__PURE__ */ jsxDEV(
+    "link",
+    {
+      href: "https://fonts.googleapis.com/css2?family=Geist+Mono:wght@100..900&display=swap",
+      rel: "stylesheet"
+    },
+    void 0,
+    false,
+    {
+      fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+      lineNumber: 17,
+      columnNumber: 4
+    },
+    this
+  ),
+  (
+(requestInfo.rw.scriptsToBeLoaded.add("/theme-script.js")),
+/* @__PURE__ */ jsxDEV("script", { src: "/theme-script.js",
+                          nonce: requestInfo.rw.nonce
+                    }, void 0, false, {
+      fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+      lineNumber: 21,
+      columnNumber: 4
+    }, this)
+),
+  /* @__PURE__ */ jsxDEV("link", { rel: "icon", href: "/favicon.svg" }, void 0, false, {
+    fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+    lineNumber: 22,
+    columnNumber: 4
+  }, this),
+  /* @__PURE__ */ jsxDEV("link", { rel: "modulepreload", href: "/assets/client-a1b2c3d4.js" }, void 0, false, {
+    fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+    lineNumber: 23,
+    columnNumber: 4
+  }, this),
+  /* @__PURE__ */ jsxDEV("link", { rel: "stylesheet", href: styles }, void 0, false, {
+    fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+    lineNumber: 24,
+    columnNumber: 4
+  }, this)
+] }, void 0, true, {
+  fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+  lineNumber: 7,
+  columnNumber: 3
+}, this),
+/* @__PURE__ */ jsxDEV("body", { children: [
+  /* @__PURE__ */ jsxDEV("div", { id: "root", children }, void 0, false, {
+    fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+    lineNumber: 27,
+    columnNumber: 4
+  }, this),
+  (
+(requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
+/* @__PURE__ */ jsxDEV("script", { children: "import(\\"/assets/client-a1b2c3d4.js\\")",
+                        nonce: requestInfo.rw.nonce
+                  }, void 0, false, {
+      fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+      lineNumber: 28,
+      columnNumber: 4
+    }, this)
+)
+] }, void 0, true, {
+  fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+  lineNumber: 26,
+  columnNumber: 3
+}, this)
+] }, void 0, true, {
+fileName: "/Users/justin/rw/blotter/rwsdk-guestbook/src/app/document/Document.tsx",
+lineNumber: 6,
+columnNumber: 2
+}, this);`;
+        expect(normalizeCode(result?.code || "")).toEqual(normalizeCode(expected));
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "0.2.0-alpha.16",
+  "version": "0.2.0-alpha.16-test.20250825032050",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {
@@ -154,10 +154,10 @@
     "wrangler": "^4.20.5"
   },
   "peerDependencies": {
-    "vite": "^6.2.6",
     "react": ">=19.2.0-0 <20",
     "react-dom": ">=19.2.0-0 <20",
-    "react-server-dom-webpack": ">=19.2.0-0 <20"
+    "react-server-dom-webpack": ">=19.2.0-0 <20",
+    "vite": "^6.2.6"
   },
   "optionalDependencies": {
     "react": "19.2.0-canary-39cad7af-20250411",
@@ -178,9 +178,11 @@
   "packageManager": "pnpm@9.14.4+sha512.c8180b3fbe4e4bca02c94234717896b5529740a6cbadf19fa78254270403ea2f27d4e1d46a08a0f56c89b63dc8ebfd3ee53326da720273794e6200fcf0d184ab",
   "devDependencies": {
     "@types/debug": "^4.1.12",
+    "@types/js-beautify": "^1.14.3",
     "@types/lodash": "^4.17.16",
     "@types/node": "^22.14.0",
     "@types/proper-lockfile": "^4.1.4",
+    "js-beautify": "^1.15.4",
     "semver": "^7.7.1",
     "tsx": "^4.19.4",
     "typescript": "^5.8.3",