rwsdk 1.0.0-beta.5 → 1.0.0-beta.50

package/dist/vite/transformClientComponents.test.mjs

@@ -288,6 +288,7 @@ function SidebarGroup() { return jsx("div", {}); }
 function SidebarGroupLabel() { return jsx("div", {}); }
 function SidebarGroupAction() { return jsx("div", {}); }
 function SidebarGroupContent() { return jsx("div", {}); }
+function SidebarGroupContent() { return jsx("div", {}); }
 function SidebarMenu() { return jsx("div", {}); }
 function SidebarMenuItem() { return jsx("div", {}); }
 function SidebarMenuButton() { return jsx("div", {}); }
@@ -326,6 +327,37 @@ const SidebarSeparator = registerClientReference(SSRModule, "/test/file.tsx", "S
 const SidebarTrigger = registerClientReference(SSRModule, "/test/file.tsx", "SidebarTrigger");
 const useSidebar = registerClientReference(SSRModule, "/test/file.tsx", "useSidebar");
 export { Sidebar, SidebarContent, SidebarFooter, SidebarGroup, SidebarGroupAction, SidebarGroupContent, SidebarGroupLabel, SidebarHeader, SidebarInput, SidebarInset, SidebarMenu, SidebarMenuAction, SidebarMenuBadge, SidebarMenuButton, SidebarMenuItem, SidebarMenuSkeleton, SidebarMenuSub, SidebarMenuSubButton, SidebarMenuSubItem, SidebarProvider, SidebarRail, SidebarSeparator, SidebarTrigger, useSidebar };
+`);
+    });
+    it("does not transform inlined functions (Issue #471)", async () => {
+        const code = `"use client"
+
+export function Stars({ level }) {
+  const renderStars = (level) => {
+    return level;
+  }
+  return renderStars(level);
+}`;
+        expect((await transform(code)) ?? "").toEqual(`import { ssrLoadModule } from "rwsdk/__ssr_bridge";
+import { registerClientReference } from "rwsdk/worker";
+const SSRModule = await ssrLoadModule("/test/file.tsx");
+const Stars = registerClientReference(SSRModule, "/test/file.tsx", "Stars");
+export { Stars };
+`);
+    });
+    it("does not transform inlined functions in default export (Issue #471)", async () => {
+        const code = `"use client"
+
+export default function Stars({ level }) {
+  const renderStars = (level) => {
+    return level;
+  }
+  return renderStars(level);
+}`;
+        expect((await transform(code)) ?? "").toEqual(`import { ssrLoadModule } from "rwsdk/__ssr_bridge";
+import { registerClientReference } from "rwsdk/worker";
+const SSRModule = await ssrLoadModule("/test/file.tsx");
+export default registerClientReference(SSRModule, "/test/file.tsx", "default");
 `);
     });
 });

package/dist/vite/transformJsxScriptTagsPlugin.mjs

@@ -319,10 +319,6 @@ export const transformJsxScriptTagsPlugin = ({ clientEntryPoints, projectRootDir
             isBuild = config.command === "build";
         },
         async transform(code, id) {
-            // Skip during directive scanning to avoid performance issues
-            if (process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE) {
-                return;
-            }
             if (isBuild &&
                 this.environment?.name === "worker" &&
                 process.env.RWSDK_BUILD_PASS !== "worker") {
@@ -330,7 +326,6 @@ export const transformJsxScriptTagsPlugin = ({ clientEntryPoints, projectRootDir
             }
             if (this.environment?.name === "worker" &&
                 id.endsWith(".tsx") &&
-                !id.includes("node_modules") &&
                 hasJsxFunctions(code)) {
                 log("Transforming JSX script tags in %s", id);
                 process.env.VERBOSE && log("Code:\n%s", code);

package/dist/vite/transformServerFunctions.mjs

@@ -111,16 +111,78 @@ export const transformServerFunctions = (code, normalizedId, environment, server
         else {
             s.append('import { createServerReference } from "rwsdk/client";\n\n');
         }
+        const ext = path.extname(normalizedId).toLowerCase();
+        const lang = ext === ".tsx" || ext === ".jsx" ? Lang.Tsx : SgLang.TypeScript;
+        const root = sgParse(lang, code);
         for (const name of allExports) {
             if (name !== "default" && name !== defaultFunctionName) {
-                s.append(`export let ${name} = createServerReference(${JSON.stringify(normalizedId)}, ${JSON.stringify(name)});\n`);
-                log(`Added ${environment} server reference for function: %s in normalizedId=%s`, name, normalizedId);
+                let method;
+                let source = "action";
+                // Try to find if this export is a serverQuery or serverAction call to extract the method
+                const patterns = [
+                    `export const ${name} = serverQuery($$$, { method: "$METHOD" })`,
+                    `export const ${name} = serverQuery($$$)`,
+                    `export const ${name} = serverAction($$$)`,
+                ];
+                for (const pattern of patterns) {
+                    const matches = root.root().findAll(pattern);
+                    if (matches.length > 0) {
+                        if (pattern.includes("serverQuery")) {
+                            const methodMatch = matches[0].getMatch("METHOD");
+                            method = methodMatch ? methodMatch.text() : "GET";
+                            source = "query";
+                        }
+                        else if (pattern.includes("serverAction")) {
+                            method = "POST";
+                            source = "action";
+                        }
+                        break;
+                    }
+                }
+                let extraArgs = "";
+                if (source === "query") {
+                    extraArgs = `, ${JSON.stringify(method ?? "GET")}, "query"`;
+                }
+                else if (method !== undefined) {
+                    extraArgs = `, ${JSON.stringify(method)}`;
+                }
+                s.append(`export let ${name} = createServerReference(${JSON.stringify(normalizedId)}, ${JSON.stringify(name)}${extraArgs});\n`);
+                log(`Added ${environment} server reference for function: %s (method: %s, source: %s) in normalizedId=%s`, name, method || "default", source, normalizedId);
             }
         }
         // Check for default export in the actual module (not re-exports)
         if (hasDefaultExport(code, normalizedId)) {
-            s.append(`\nexport default createServerReference(${JSON.stringify(normalizedId)}, "default");\n`);
-            log(`Added ${environment} server reference for default export in normalizedId=%s`, normalizedId);
+            let method;
+            let source = "action";
+            const patterns = [
+                `export default serverQuery($$$, { method: "$METHOD" })`,
+                `export default serverQuery($$$)`,
+                `export default serverAction($$$)`,
+            ];
+            for (const pattern of patterns) {
+                const matches = root.root().findAll(pattern);
+                if (matches.length > 0) {
+                    if (pattern.includes("serverQuery")) {
+                        const methodMatch = matches[0].getMatch("METHOD");
+                        method = methodMatch ? methodMatch.text() : "GET";
+                        source = "query";
+                    }
+                    else if (pattern.includes("serverAction")) {
+                        method = "POST";
+                        source = "action";
+                    }
+                    break;
+                }
+            }
+            let extraArgs = "";
+            if (source === "query") {
+                extraArgs = `, ${JSON.stringify(method ?? "GET")}, "query"`;
+            }
+            else if (method !== undefined) {
+                extraArgs = `, ${JSON.stringify(method)}`;
+            }
+            s.append(`\nexport default createServerReference(${JSON.stringify(normalizedId)}, "default"${extraArgs});\n`);
+            log(`Added ${environment} server reference for default export (method: %s, source: %s) in normalizedId=%s`, method || "default", source, normalizedId);
         }
         process.env.VERBOSE &&
             log(`${environment} transformation complete for normalizedId=%s`, normalizedId);

package/dist/vite/transformServerFunctions.test.mjs

@@ -89,6 +89,36 @@ export async function sum() {
 export { sum } from './math';
 export { default as multiply } from './multiply';
 export * from './utils';
+`;
+    let SERVER_QUERY_GET_CODE = `
+"use server";
+export const getProject = serverQuery(async (id) => {
+  return { id, name: "Project X" };
+});
+`;
+    let SERVER_QUERY_POST_CODE = `
+"use server";
+export const getProject = serverQuery(async (id) => {
+  return { id, name: "Project X" };
+}, { method: "POST" });
+`;
+    let SERVER_ACTION_CODE = `
+"use server";
+export const upvote = serverAction(async (id) => {
+  return { id, count: 1 };
+});
+`;
+    let SERVER_QUERY_DEFAULT_CODE = `
+"use server";
+export default serverQuery(async (id) => {
+  return { id, name: "Project X" };
+});
+`;
+    let SERVER_ACTION_DEFAULT_CODE = `
+"use server";
+export default serverAction(async (id) => {
+  return { id, name: "Project X" };
+});
 `;
     const TEST_CASES = {
         COMMENT_CODE,
@@ -102,6 +132,11 @@ export * from './utils';
         RE_EXPORT_CODE,
         PREDEFINED_DEFAULT_EXPORT_CODE,
         EXPORT_DEFAULT_FUNCTION_CODE,
+        SERVER_QUERY_GET_CODE,
+        SERVER_QUERY_POST_CODE,
+        SERVER_ACTION_CODE,
+        SERVER_QUERY_DEFAULT_CODE,
+        SERVER_ACTION_DEFAULT_CODE,
     };
     describe("TRANSFORMS", () => {
         for (const [key, CODE] of Object.entries(TEST_CASES)) {

package/dist/vite/virtualPlugin.mjs

@@ -3,9 +3,12 @@ export const virtualPlugin = (name, load) => {
     name = "virtual:" + name;
     return {
         name: `rwsdk:virtual-${name}`,
-        resolveId(source, _importer, _options) {
-            // Skip during directive scanning to avoid performance issues
-            if (process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE) {
+        resolveId(source, _importer, options) {
+            // Skip during our directive scanning to avoid performance issues
+            // context(justinvdm, 20 Jan 2025): We check options.custom?.rwsdk?.directiveScan to distinguish
+            // between our directive scan (which should skip) and external calls like Cloudflare's early
+            // dispatch (which should be handled normally).
+            if (options?.custom?.rwsdk?.directiveScan === true) {
                 return;
             }
             if (source === name || source.startsWith(`${name}?`)) {
@@ -14,10 +17,6 @@ export const virtualPlugin = (name, load) => {
             return;
         },
         load(id, options) {
-            // Skip during directive scanning to avoid performance issues
-            if (process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE) {
-                return;
-            }
             if (id === `\0${name}` || id.startsWith(`\0${name}?`)) {
                 return load.apply(this, [id, options]);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.50",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {
@@ -15,15 +15,19 @@
   ],
   "scripts": {
     "build": "tsc --build --clean && tsc",
+    "build:watch": "npm run build -- --watch",
     "release": "./scripts/release.sh",
     "test": "vitest --run",
+    "bench": "vitest bench --run",
+    "bench:baseline": "vitest bench --run --outputJson=benchmarks/router-bench-baseline.json",
+    "bench:compare": "vitest bench --run --compare=benchmarks/router-bench-baseline.json",
     "debug:sync": "tsx ./src/scripts/debug-sync.mts",
     "smoke-test": "tsx ./src/scripts/smoke-test.mts"
   },
   "exports": {
     "./vite": {
-      "default": "./dist/vite/index.mjs",
-      "types": "./dist/vite/index.d.mts"
+      "types": "./dist/vite/index.d.mts",
+      "default": "./dist/vite/index.mjs"
     },
     "./worker": {
       "react-server": "./dist/runtime/entries/worker.js",
@@ -36,6 +40,10 @@
       "types": "./dist/runtime/entries/client.d.ts",
       "default": "./dist/runtime/entries/client.js"
     },
+    "./__state": {
+      "types": "./dist/runtime/state.d.ts",
+      "default": "./dist/runtime/state.js"
+    },
     "./__ssr": {
       "react-server": "./dist/runtime/entries/no-react-server.js",
       "types": "./dist/runtime/entries/ssr.d.ts",
@@ -54,7 +62,8 @@
     },
     "./router": {
       "types": "./dist/runtime/entries/router.d.ts",
-      "default": "./dist/runtime/entries/router.js"
+      "workerd": "./dist/runtime/entries/router.js",
+      "default": "./dist/runtime/entries/routerClient.js"
     },
     "./auth": {
       "types": "./dist/runtime/entries/auth.d.ts",
@@ -99,6 +108,14 @@
     "./realtime/durableObject": {
       "types": "./dist/runtime/lib/realtime/durableObject.d.ts",
       "default": "./dist/runtime/lib/realtime/durableObject.js"
+    },
+    "./use-synced-state/client": {
+      "types": "./dist/use-synced-state/client.d.ts",
+      "default": "./dist/use-synced-state/client.js"
+    },
+    "./use-synced-state/worker": {
+      "types": "./dist/use-synced-state/worker.d.mts",
+      "workerd": "./dist/use-synced-state/worker.mjs"
     }
   },
   "keywords": [
@@ -134,62 +151,67 @@
   "license": "MIT",
   "dependencies": {
     "@ast-grep/napi": "~0.39.0",
-    "@cloudflare/workers-types": "~4.20250924.0",
+    "@cloudflare/workers-types": "~4.20260122.0",
     "@mdx-js/mdx": "~3.1.1",
     "@puppeteer/browsers": "~2.10.0",
     "@types/decompress": "~4.2.7",
     "@types/fs-extra": "~11.0.4",
-    "@types/react": "~19.1.2",
-    "@types/react-dom": "~19.1.2",
+    "@types/glob": "^8.1.0",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
     "@types/react-is": "~19.0.0",
     "@vitejs/plugin-react": "~5.0.0",
     "chokidar": "~4.0.0",
     "debug": "~4.4.0",
+    "decompress": "~4.2.1",
     "enhanced-resolve": "~5.18.1",
     "eventsource-parser": "~3.0.0",
     "execa": "~9.6.0",
     "find-up": "~8.0.0",
     "fs-extra": "~11.3.0",
-    "glob": "~11.0.1",
+    "get-port": "^7.1.0",
+    "glob": "~11.1.0",
     "ignore": "~7.0.4",
     "jsonc-parser": "~3.3.1",
     "kysely": "~0.28.2",
     "kysely-do": "~0.0.1-rc.1",
-    "lodash": "~4.17.21",
+    "lodash": "~4.17.23",
     "magic-string": "~0.30.17",
     "picocolors": "~1.1.1",
     "proper-lockfile": "~4.1.2",
     "puppeteer-core": "~24.22.0",
     "react-is": "~19.1.0",
     "rsc-html-stream": "~0.0.6",
+    "server-only": "^0.0.1",
     "tmp-promise": "~3.0.3",
     "ts-morph": "~27.0.0",
     "unique-names-generator": "~4.7.1",
     "vibe-rules": "~0.3.0",
-    "vite-tsconfig-paths": "~5.1.4",
-    "decompress": "~4.2.1"
+    "vite-tsconfig-paths": "~5.1.4"
   },
   "peerDependencies": {
-    "@cloudflare/vite-plugin": "^1.12.4",
-    "react": ">=19.2.0-canary-3fb190f7-20250908 <20.0.0",
-    "react-dom": ">=19.2.0-canary-3fb190f7-20250908 <20.0.0",
-    "react-server-dom-webpack": ">=19.2.0-canary-3fb190f7-20250908 <20.0.0",
+    "@cloudflare/vite-plugin": "^1.13.10",
+    "capnweb": "~0.2.0",
+    "react": ">=19.2.0-0 <19.3.0 || >=19.3.0-0 <20.0.0",
+    "react-dom": ">=19.2.0-0 <19.3.0 || >=19.3.0-0 <20.0.0",
+    "react-server-dom-webpack": ">=19.2.0-0 <19.3.0 || >=19.3.0-0 <20.0.0",
     "vite": "^6.2.6 || 7.x",
     "wrangler": "^4.35.0"
   },
   "packageManager": "pnpm@10.0.0+sha512.b8fef5494bd3fe4cbd4edabd0745df2ee5be3e4b0b8b08fa643aa3e4c6702ccc0f00d68fa8a8c9858a735a0032485a44990ed2810526c875e416f001b17df12b",
   "devDependencies": {
-    "@cloudflare/vite-plugin": "1.13.3",
+    "@cloudflare/vite-plugin": "1.21.2",
+    "capnweb": "~0.2.0",
     "@types/debug": "~4.1.12",
     "@types/js-beautify": "~1.14.3",
     "@types/lodash": "~4.17.16",
-    "@types/node": "~24.5.2",
+    "@types/node": "~24.10.0",
     "@types/proper-lockfile": "~4.1.4",
     "js-beautify": "~1.15.4",
     "semver": "~7.7.1",
-    "tsx": "~4.20.0",
+    "tsx": "~4.21.0",
     "typescript": "~5.9.0",
-    "vite": "7.1.6",
+    "vite": "~7.3.0",
     "vitest": "~3.2.0"
   }
 }

package/dist/vite/manifestPlugin.d.mts

@@ -1,4 +0,0 @@
-import { type Plugin } from "vite";
-export declare const manifestPlugin: ({ projectRootDir, }: {
-    projectRootDir: string;
-}) => Plugin;

package/dist/vite/manifestPlugin.mjs

@@ -1,63 +0,0 @@
-import debug from "debug";
-const log = debug("rwsdk:vite:manifest-plugin");
-const virtualModuleId = "virtual:rwsdk:manifest.js";
-const resolvedVirtualModuleId = "\0" + virtualModuleId;
-export const manifestPlugin = ({ projectRootDir, }) => {
-    let isBuild = false;
-    return {
-        name: "rwsdk:vite:manifest-plugin",
-        enforce: "pre",
-        configResolved(config) {
-            isBuild = config.command === "build";
-        },
-        resolveId(id) {
-            // Skip during directive scanning to avoid performance issues
-            if (process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE) {
-                return;
-            }
-            if (id === virtualModuleId) {
-                return resolvedVirtualModuleId;
-            }
-        },
-        async load(id) {
-            // Skip during directive scanning to avoid performance issues
-            if (process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE) {
-                return;
-            }
-            if (id === resolvedVirtualModuleId) {
-                if (isBuild) {
-                    // context(justinvdm, 28 Aug 2025): During the build, we don't have
-                    // the manifest yet. We insert a placeholder that the linker plugin
-                    // will replace in the final phase.
-                    log("Returning manifest placeholder for build");
-                    return `export default "__RWSDK_MANIFEST_PLACEHOLDER__"`;
-                }
-                // In dev, we can return an empty object.
-                log("Not a build, returning empty manifest");
-                return `export default {}`;
-            }
-        },
-        configEnvironment(name, config) {
-            if (name !== "worker" && name !== "ssr") {
-                return;
-            }
-            log("Configuring environment: name=%s", name);
-            config.optimizeDeps ??= {};
-            config.optimizeDeps.esbuildOptions ??= {};
-            config.optimizeDeps.esbuildOptions.plugins ??= [];
-            config.optimizeDeps.esbuildOptions.plugins.push({
-                name: "rwsdk:manifest:esbuild",
-                setup(build) {
-                    log("Setting up esbuild plugin for environment: %s", name);
-                    build.onResolve({ filter: /^virtual:rwsdk:manifest\.js$/ }, () => {
-                        log("Resolving virtual manifest module in esbuild");
-                        return {
-                            path: "virtual:rwsdk:manifest.js",
-                            external: true,
-                        };
-                    });
-                },
-            });
-        },
-    };
-};