rwsdk 0.2.0-alpha.8 → 0.2.0

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.8",
+  "version": "0.2.0",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {
@@ -144,10 +144,7 @@
     "picocolors": "^1.1.1",
     "proper-lockfile": "^4.1.2",
     "puppeteer-core": "^22.8.1",
-    "react": "19.2.0-canary-39cad7af-20250411",
-    "react-dom": "19.2.0-canary-39cad7af-20250411",
     "react-is": "^19.0.0",
-    "react-server-dom-webpack": "19.2.0-canary-39cad7af-20250411",
     "rsc-html-stream": "^0.0.6",
     "tmp-promise": "^3.0.3",
     "ts-morph": "^25.0.1",
@@ -157,14 +154,35 @@
     "wrangler": "^4.20.5"
   },
   "peerDependencies": {
+    "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"
   },
+  "optionalDependencies": {
+    "react": "19.2.0-canary-39cad7af-20250411",
+    "react-dom": "19.2.0-canary-39cad7af-20250411",
+    "react-server-dom-webpack": "19.2.0-canary-39cad7af-20250411"
+  },
+  "peerDependenciesMeta": {
+    "react": {
+      "optional": true
+    },
+    "react-dom": {
+      "optional": true
+    },
+    "react-server-dom-webpack": {
+      "optional": true
+    }
+  },
   "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",