rwsdk 0.2.0 → 0.3.0

package/dist/vite/transformJsxScriptTagsPlugin.test.mjs

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

package/dist/vite/transformServerFunctions.d.mts

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

package/dist/vite/transformServerFunctions.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {
@@ -45,6 +45,12 @@
       "types": "./dist/runtime/ssrBridge.d.ts",
       "default": "./dist/runtime/ssrBridge.js"
     },
+    "./__client_barrel": {
+      "default": "./dist/__intermediate_builds/rwsdk-client-barrel.js"
+    },
+    "./__server_barrel": {
+      "default": "./dist/__intermediate_builds/rwsdk-server-barrel.js"
+    },
     "./router": {
       "types": "./dist/runtime/entries/router.d.ts",
       "default": "./dist/runtime/entries/router.js"

package/dist/runtime/clientNavigation.d.ts

@@ -1,9 +0,0 @@
-export interface ClientNavigationOptions {
-    onNavigate?: () => void;
-    scrollToTop?: boolean;
-    scrollBehavior?: "auto" | "smooth" | "instant";
-}
-export declare function validateClickEvent(event: MouseEvent, target: HTMLElement): boolean;
-export declare function initClientNavigation(opts?: ClientNavigationOptions): {
-    handleResponse: (response: Response) => boolean;
-};

package/dist/runtime/clientNavigation.js

@@ -1,88 +0,0 @@
-function saveScrollPosition(x, y) {
-    window.history.replaceState({
-        ...window.history.state,
-        scrollX: x,
-        scrollY: y,
-    }, "", window.location.href);
-}
-export function validateClickEvent(event, target) {
-    // should this only work for left click?
-    if (event.button !== 0) {
-        return false;
-    }
-    if (event.ctrlKey || event.metaKey || event.shiftKey || event.altKey) {
-        return false;
-    }
-    const link = target.closest("a");
-    if (!link) {
-        return false;
-    }
-    const href = link.getAttribute("href");
-    if (!href) {
-        return false;
-    }
-    if (href.includes("#")) {
-        return false;
-    }
-    // Skip if target="_blank" or similar
-    if (link.target && link.target !== "_self") {
-        return false;
-    }
-    if (href.startsWith("http")) {
-        return false;
-    }
-    // Skip if download attribute
-    if (link.hasAttribute("download")) {
-        return false;
-    }
-    return true;
-}
-export function initClientNavigation(opts = {}) {
-    const options = {
-        onNavigate: async function onNavigate() {
-            // @ts-expect-error
-            await globalThis.__rsc_callServer();
-        },
-        scrollToTop: true,
-        scrollBehavior: "instant",
-        ...opts,
-    };
-    history.scrollRestoration = "auto";
-    document.addEventListener("click", async function handleClickEvent(event) {
-        // Prevent default navigation
-        if (!validateClickEvent(event, event.target)) {
-            return;
-        }
-        event.preventDefault();
-        const el = event.target;
-        const a = el.closest("a");
-        const href = a?.getAttribute("href");
-        saveScrollPosition(window.scrollX, window.scrollY);
-        window.history.pushState({ path: href }, "", window.location.origin + href);
-        await options.onNavigate();
-        if (options.scrollToTop && history.scrollRestoration === "auto") {
-            window.scrollTo({
-                top: 0,
-                left: 0,
-                behavior: options.scrollBehavior,
-            });
-            saveScrollPosition(0, 0);
-        }
-        history.scrollRestoration = "auto";
-    }, true);
-    window.addEventListener("popstate", async function handlePopState() {
-        saveScrollPosition(window.scrollX, window.scrollY);
-        await options.onNavigate();
-    });
-    // Return a handleResponse function for use with initClient
-    return {
-        handleResponse: function handleResponse(response) {
-            if (!response.ok) {
-                // Redirect to the current page (window.location) to show the error
-                window.location.href = window.location.href;
-                return false;
-            }
-            return true;
-        },
-    };
-}