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

package/dist/scripts/debug-sync.mjs

@@ -7,9 +7,6 @@ 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",
@@ -66,23 +63,6 @@ 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 || "[]");
@@ -104,29 +84,6 @@ 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/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,9 +90,8 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
     }
     const project = new Project({ useInMemoryFileSystem: true });
     const sourceFile = project.createSourceFile("temp.tsx", code);
-    const modifications = [];
+    let hasModifications = false;
     const needsRequestInfoImportRef = { value: false };
-    const entryPointsPerCallExpr = new Map();
     // Check for existing imports up front
     let hasRequestInfoImport = false;
     let sdkWorkerImportDecl;
@@ -170,11 +169,8 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                                     const path = srcValue.slice(1); // Remove leading slash
                                     if (manifest[path]) {
                                         const transformedSrc = `/${manifest[path].file}`;
-                                        modifications.push({
-                                            type: "literalValue",
-                                            node: initializer,
-                                            value: transformedSrc,
-                                        });
+                                        initializer.setLiteralValue(transformedSrc);
+                                        hasModifications = true;
                                     }
                                 }
                             }
@@ -192,14 +188,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);
-                                const replacementText = isTemplateLiteral
-                                    ? "`" + transformedContent + "`"
-                                    : JSON.stringify(transformedContent);
-                                modifications.push({
-                                    type: "replaceText",
-                                    node: initializer,
-                                    text: replacementText,
-                                });
+                                if (isTemplateLiteral) {
+                                    // Simply wrap the transformed content in backticks
+                                    initializer.replaceWithText("`" + transformedContent + "`");
+                                }
+                                else {
+                                    initializer.replaceWithText(JSON.stringify(transformedContent));
+                                }
+                                hasModifications = true;
                             }
                         }
                         // For link tags, first check if it's a preload/modulepreload
@@ -225,16 +221,15 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                     !hasNonce &&
                     !hasDangerouslySetInnerHTML &&
                     (hasStringLiteralChildren || hasSrc)) {
-                    // Collect nonce property addition
-                    modifications.push({
-                        type: "addProperty",
-                        node: propsArg,
+                    // Add nonce property to the props object
+                    propsArg.addPropertyAssignment({
                         name: "nonce",
                         initializer: "requestInfo.rw.nonce",
                     });
                     if (!hasRequestInfoImport) {
                         needsRequestInfoImportRef.value = true;
                     }
+                    hasModifications = true;
                 }
                 // Transform href if this is a preload link
                 if (tagName === "link" &&
@@ -255,22 +250,17 @@ export async function transformJsxScriptTagsCode(code, manifest = {}) {
                                 const quote = isTemplateLiteral
                                     ? "`"
                                     : originalText.charAt(0);
-                                // Preserve the original quote style and prepare replacement text
-                                let replacementText;
+                                // Preserve the original quote style
                                 if (isTemplateLiteral) {
-                                    replacementText = `\`/${transformedHref}\``;
+                                    initializer.replaceWithText(`\`/${transformedHref}\``);
                                 }
                                 else if (quote === '"') {
-                                    replacementText = `"/${transformedHref}"`;
+                                    initializer.replaceWithText(`"/${transformedHref}"`);
                                 }
                                 else {
-                                    replacementText = `'/${transformedHref}'`;
+                                    initializer.replaceWithText(`'/${transformedHref}'`);
                                 }
-                                modifications.push({
-                                    type: "replaceText",
-                                    node: initializer,
-                                    text: replacementText,
-                                });
+                                hasModifications = true;
                             }
                         }
                     }
@@ -284,103 +274,51 @@ 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();
-            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) {
+            if (pureComment) {
+                const pureCommentText = pureComment.getText();
                 const newText = `(
-${mod.sideEffects},
-${mod.pureCommentText} ${mod.callExprText}
-)`;
-                const newLeadingTriviaText = mod.leadingTriviaText.replace(mod.pureCommentText, "");
+            ${sideEffects},
+            ${pureCommentText} ${callExprText}
+          )`;
+                const fullText = callExpr.getFullText();
+                const leadingTriviaText = fullText.substring(0, fullText.length - callExprText.length);
+                const newLeadingTriviaText = leadingTriviaText.replace(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.
-                sourceFile.replaceText([mod.fullStart, mod.end], newLeadingTriviaText + newText);
+                callExpr
+                    .getSourceFile()
+                    .replaceText([callExpr.getFullStart(), callExpr.getEnd()], newLeadingTriviaText + newText);
             }
             else {
-                // 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}
-)`);
+                callExpr.replaceWithText(`(
+              ${sideEffects},
+              ${callExprText}
+            )`);
             }
+            needsRequestInfoImportRef.value = true;
+            hasModifications = true;
         }
-        // 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"],
-                });
+    });
+    // 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");
             }
         }
+        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,
@@ -400,8 +338,6 @@ 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,10 +1,5 @@
 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" },
@@ -19,17 +14,17 @@ describe("transformJsxScriptTagsCode", () => {
       })
     `;
         const result = await transformJsxScriptTagsCode(code, mockManifest);
-        const expected = `import { requestInfo } from "rwsdk/worker";
+        expect(result?.code).toEqual(`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
-})
-)`;
-        expect(normalizeCode(result?.code || "")).toEqual(normalizeCode(expected));
+      (
+              (requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
+              jsx("script", {
+        src: "/assets/client-a1b2c3d4.js",
+        type: "module",
+          nonce: requestInfo.rw.nonce
+    })
+            )
+    `);
     });
     it("transforms inline scripts with dynamic imports", async () => {
         const code = `
@@ -39,32 +34,32 @@ nonce: requestInfo.rw.nonce
       })
     `;
         const result = await transformJsxScriptTagsCode(code, mockManifest);
-        const expected = `import { requestInfo } from "rwsdk/worker";
+        expect(result?.code).toEqual(`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
-})
-)`;
-        expect(normalizeCode(result?.code || "")).toEqual(normalizeCode(expected));
+      (
+              (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
+    })
+            )
+    `);
     });
     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);
-        const expected = `import { requestInfo } from "rwsdk/worker";
+        expect(result?.code).toEqual(`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
-})
-)`;
-        expect(normalizeCode(result?.code || "")).toEqual(normalizeCode(expected));
+      (
+              (requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
+              jsx("script", { type: "module", children: "import('/assets/client-a1b2c3d4.js')",
+          nonce: requestInfo.rw.nonce
+    })
+            )
+    `);
     });
     it("transforms inline scripts with multiline content", async () => {
         const code = `
@@ -81,13 +76,13 @@ nonce: requestInfo.rw.nonce
       })
     `;
         const result = await transformJsxScriptTagsCode(code, mockManifest);
-        const expected = `import { requestInfo } from "rwsdk/worker";
+        expect(result?.code).toEqual(`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');
@@ -95,37 +90,37 @@ children: \`
           };
           init();
         \`,
-nonce: requestInfo.rw.nonce
-})
-)`;
-        expect(normalizeCode(result?.code || "")).toEqual(normalizeCode(expected));
+          nonce: requestInfo.rw.nonce
+    })
+            )
+    `);
     });
     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);
-        const expected = `import { requestInfo } from "rwsdk/worker";
+        expect(result?.code).toEqual(`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
-})
-)`;
-        expect(normalizeCode(result?.code || "")).toEqual(normalizeCode(expected));
+              jsx("script", {
+        type: "module",
+        children: \`
+          import('/assets/client-a1b2c3d4.js');
+          import('/assets/entry-e5f6g7h8.js');
+        \`,
+          nonce: requestInfo.rw.nonce
+    })
+            )
+    `);
     });
     it("transforms link href attributes with preload rel", async () => {
         const code = `
@@ -182,33 +177,33 @@ nonce: requestInfo.rw.nonce
       })
     `;
         const result = await transformJsxScriptTagsCode(code, mockManifest);
-        const expected = `import { requestInfo } from "rwsdk/worker";
+        expect(result?.code).toEqual(`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
-})
-)
-]
-})
-]
-})`;
-        expect(normalizeCode(result?.code || "")).toEqual(normalizeCode(expected));
+      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
+                            })
+                            )
+            ]
+          })
+        ]
+      })
+    `);
     });
     it("returns null when no transformations are needed", async () => {
         const code = `
@@ -225,17 +220,17 @@ nonce: requestInfo.rw.nonce
       })
     `;
         const result = await transformJsxScriptTagsCode(code, mockManifest);
-        const expected = `import { requestInfo } from "rwsdk/worker";
+        expect(result?.code).toEqual(`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
-})
-)`;
-        expect(normalizeCode(result?.code || "")).toEqual(normalizeCode(expected));
+      (
+              (requestInfo.rw.scriptsToBeLoaded.add("/src/non-existent.js")),
+              jsx("script", {
+        src: "/src/non-existent.js",
+        type: "module",
+          nonce: requestInfo.rw.nonce
+    })
+            )
+    `);
     });
     it("adds nonce to script tags with src attribute and imports requestInfo", async () => {
         const code = `
@@ -245,17 +240,17 @@ nonce: requestInfo.rw.nonce
       })
     `;
         const result = await transformJsxScriptTagsCode(code, mockManifest);
-        const expected = `import { requestInfo } from "rwsdk/worker";
+        expect(result?.code).toEqual(`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
-})
-)`;
-        expect(normalizeCode(result?.code || "")).toEqual(normalizeCode(expected));
+      (
+              (requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
+              jsx("script", {
+        src: "/assets/client-a1b2c3d4.js",
+        type: "module",
+          nonce: requestInfo.rw.nonce
+    })
+            )
+    `);
     });
     it("adds nonce to script tags with string literal children", async () => {
         const code = `
@@ -352,242 +347,16 @@ nonce: requestInfo.rw.nonce
     `;
         // Call without providing manifest (simulating dev mode)
         const result = await transformJsxScriptTagsCode(code);
-        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
-})
-)`;
-        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";
+        expect(result?.code).toEqual(`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));
+      (
+              (requestInfo.rw.scriptsToBeLoaded.add("/src/client.tsx")),
+              jsx("script", {
+        src: "/src/client.tsx",
+        type: "module",
+          nonce: requestInfo.rw.nonce
+    })
+            )
+    `);
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "0.2.0-alpha.16-test.20250825032050",
+  "version": "0.2.0-alpha.17",
   "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",
-    "vite": "^6.2.6"
+    "react-server-dom-webpack": ">=19.2.0-0 <20"
   },
   "optionalDependencies": {
     "react": "19.2.0-canary-39cad7af-20250411",
@@ -178,11 +178,9 @@
   "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",