rwsdk 1.0.0-beta.30-test.20251119220440 → 1.0.0-beta.30-test.20251120213828

package/dist/use-synced-state/useSyncedState.d.ts

@@ -1,4 +1,4 @@
-import { React } from "../runtime/client/client";
+import React from "react";
 type HookDeps = {
     useState: typeof React.useState;
     useEffect: typeof React.useEffect;
@@ -6,7 +6,7 @@ type HookDeps = {
     useCallback: typeof React.useCallback;
 };
 type Setter<T> = (value: T | ((previous: T) => T)) => void;
-export type CreateSyncStateHookOptions = {
+export type CreateSyncedStateHookOptions = {
     url?: string;
     hooks?: HookDeps;
 };
@@ -15,6 +15,6 @@ export type CreateSyncStateHookOptions = {
  * @param options Optional overrides for endpoint and React primitives.
  * @returns Hook that syncs state through the sync state service.
  */
-export declare const createSyncStateHook: (options?: CreateSyncStateHookOptions) => <T>(initialValue: T, key: string) => [T, Setter<T>];
+export declare const createSyncedStateHook: (options?: CreateSyncedStateHookOptions) => <T>(initialValue: T, key: string) => [T, Setter<T>];
 export declare const useSyncedState: <T>(initialValue: T, key: string) => [T, Setter<T>];
 export {};

package/dist/use-synced-state/useSyncedState.js

@@ -1,6 +1,6 @@
-import { React } from "../runtime/client/client";
-import { getSyncStateClient } from "./client";
-import { DEFAULT_SYNC_STATE_PATH } from "./constants.mjs";
+import React from "react";
+import { getSyncedStateClient } from "./client-core.js";
+import { DEFAULT_SYNCED_STATE_PATH } from "./constants.mjs";
 const defaultDeps = {
     useState: React.useState,
     useEffect: React.useEffect,
@@ -12,15 +12,15 @@ const defaultDeps = {
  * @param options Optional overrides for endpoint and React primitives.
  * @returns Hook that syncs state through the sync state service.
  */
-export const createSyncStateHook = (options = {}) => {
-    const resolvedUrl = options.url ?? DEFAULT_SYNC_STATE_PATH;
+export const createSyncedStateHook = (options = {}) => {
+    const resolvedUrl = options.url ?? DEFAULT_SYNCED_STATE_PATH;
     const deps = options.hooks ?? defaultDeps;
     const { useState, useEffect, useRef, useCallback } = deps;
     return function useSyncedState(initialValue, key) {
         if (typeof window === "undefined" && !options.hooks) {
             return [initialValue, () => { }];
         }
-        const client = getSyncStateClient(resolvedUrl);
+        const client = getSyncedStateClient(resolvedUrl);
         const [value, setValue] = useState(initialValue);
         const valueRef = useRef(value);
         valueRef.current = value;
@@ -55,4 +55,4 @@ export const createSyncStateHook = (options = {}) => {
         return [value, setSyncValue];
     };
 };
-export const useSyncedState = createSyncStateHook();
+export const useSyncedState = createSyncedStateHook();

package/dist/use-synced-state/worker.d.mts

@@ -1,14 +1,13 @@
-import { SyncStateServer } from "./SyncStateServer.mjs";
-export { SyncStateServer } from "./SyncStateServer.mjs";
-export type SyncStateRouteOptions = {
+import { SyncedStateServer } from "./SyncedStateServer.mjs";
+export { SyncedStateServer };
+export type SyncedStateRouteOptions = {
     basePath?: string;
-    resetPath?: string;
     durableObjectName?: string;
 };
 /**
  * Registers routes that forward sync state requests to the configured Durable Object namespace.
  * @param getNamespace Function that returns the Durable Object namespace from the Worker env.
- * @param options Optional overrides for base path, reset path, and object name.
- * @returns Router entries for the sync state API and reset endpoint.
+ * @param options Optional overrides for base path and object name.
+ * @returns Router entries for the sync state API.
  */
-export declare const syncStateRoutes: (getNamespace: (env: Cloudflare.Env) => DurableObjectNamespace<SyncStateServer>, options?: SyncStateRouteOptions) => import("../runtime/lib/router.js").RouteDefinition<`/${string}`, import("../runtime/worker.js").RequestInfo<any, import("../runtime/worker.js").DefaultAppContext>>[];
+export declare const syncedStateRoutes: (getNamespace: (env: Cloudflare.Env) => DurableObjectNamespace<SyncedStateServer>, options?: SyncedStateRouteOptions) => import("../runtime/lib/router.js").RouteDefinition<`/${string}`, import("../runtime/worker.js").RequestInfo<any, import("../runtime/worker.js").DefaultAppContext>>[];

package/dist/use-synced-state/worker.mjs

@@ -9,52 +9,51 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SyncStateProxy_stub, _SyncStateProxy_keyHandler;
+var _SyncedStateProxy_stub, _SyncedStateProxy_keyHandler;
 import { RpcTarget, newWorkersRpcResponse } from "capnweb";
 import { env } from "cloudflare:workers";
 import { route } from "../runtime/entries/router";
-import { SyncStateServer } from "./SyncStateServer.mjs";
-import { DEFAULT_SYNC_STATE_PATH } from "./constants.mjs";
-export { SyncStateServer } from "./SyncStateServer.mjs";
+import { SyncedStateServer, } from "./SyncedStateServer.mjs";
+import { DEFAULT_SYNCED_STATE_PATH } from "./constants.mjs";
+export { SyncedStateServer };
 const DEFAULT_SYNC_STATE_NAME = "syncedState";
-class SyncStateProxy extends RpcTarget {
+class SyncedStateProxy extends RpcTarget {
     constructor(stub, keyHandler) {
         super();
-        _SyncStateProxy_stub.set(this, void 0);
-        _SyncStateProxy_keyHandler.set(this, void 0);
-        __classPrivateFieldSet(this, _SyncStateProxy_stub, stub, "f");
-        __classPrivateFieldSet(this, _SyncStateProxy_keyHandler, keyHandler, "f");
+        _SyncedStateProxy_stub.set(this, void 0);
+        _SyncedStateProxy_keyHandler.set(this, void 0);
+        __classPrivateFieldSet(this, _SyncedStateProxy_stub, stub, "f");
+        __classPrivateFieldSet(this, _SyncedStateProxy_keyHandler, keyHandler, "f");
     }
     async getState(key) {
-        const transformedKey = __classPrivateFieldGet(this, _SyncStateProxy_keyHandler, "f") ? await __classPrivateFieldGet(this, _SyncStateProxy_keyHandler, "f").call(this, key) : key;
-        return __classPrivateFieldGet(this, _SyncStateProxy_stub, "f").getState(transformedKey);
+        const transformedKey = __classPrivateFieldGet(this, _SyncedStateProxy_keyHandler, "f") ? await __classPrivateFieldGet(this, _SyncedStateProxy_keyHandler, "f").call(this, key) : key;
+        return __classPrivateFieldGet(this, _SyncedStateProxy_stub, "f").getState(transformedKey);
     }
     async setState(value, key) {
-        const transformedKey = __classPrivateFieldGet(this, _SyncStateProxy_keyHandler, "f") ? await __classPrivateFieldGet(this, _SyncStateProxy_keyHandler, "f").call(this, key) : key;
-        return __classPrivateFieldGet(this, _SyncStateProxy_stub, "f").setState(value, transformedKey);
+        const transformedKey = __classPrivateFieldGet(this, _SyncedStateProxy_keyHandler, "f") ? await __classPrivateFieldGet(this, _SyncedStateProxy_keyHandler, "f").call(this, key) : key;
+        return __classPrivateFieldGet(this, _SyncedStateProxy_stub, "f").setState(value, transformedKey);
     }
     async subscribe(key, client) {
-        const transformedKey = __classPrivateFieldGet(this, _SyncStateProxy_keyHandler, "f") ? await __classPrivateFieldGet(this, _SyncStateProxy_keyHandler, "f").call(this, key) : key;
-        return __classPrivateFieldGet(this, _SyncStateProxy_stub, "f").subscribe(transformedKey, client);
+        const transformedKey = __classPrivateFieldGet(this, _SyncedStateProxy_keyHandler, "f") ? await __classPrivateFieldGet(this, _SyncedStateProxy_keyHandler, "f").call(this, key) : key;
+        return __classPrivateFieldGet(this, _SyncedStateProxy_stub, "f").subscribe(transformedKey, client);
     }
     async unsubscribe(key, client) {
-        const transformedKey = __classPrivateFieldGet(this, _SyncStateProxy_keyHandler, "f") ? await __classPrivateFieldGet(this, _SyncStateProxy_keyHandler, "f").call(this, key) : key;
-        return __classPrivateFieldGet(this, _SyncStateProxy_stub, "f").unsubscribe(transformedKey, client);
+        const transformedKey = __classPrivateFieldGet(this, _SyncedStateProxy_keyHandler, "f") ? await __classPrivateFieldGet(this, _SyncedStateProxy_keyHandler, "f").call(this, key) : key;
+        return __classPrivateFieldGet(this, _SyncedStateProxy_stub, "f").unsubscribe(transformedKey, client);
     }
 }
-_SyncStateProxy_stub = new WeakMap(), _SyncStateProxy_keyHandler = new WeakMap();
+_SyncedStateProxy_stub = new WeakMap(), _SyncedStateProxy_keyHandler = new WeakMap();
 /**
  * Registers routes that forward sync state requests to the configured Durable Object namespace.
  * @param getNamespace Function that returns the Durable Object namespace from the Worker env.
- * @param options Optional overrides for base path, reset path, and object name.
- * @returns Router entries for the sync state API and reset endpoint.
+ * @param options Optional overrides for base path and object name.
+ * @returns Router entries for the sync state API.
  */
-export const syncStateRoutes = (getNamespace, options = {}) => {
-    const basePath = options.basePath ?? DEFAULT_SYNC_STATE_PATH;
-    const resetPath = options.resetPath ?? `${basePath}/reset`;
+export const syncedStateRoutes = (getNamespace, options = {}) => {
+    const basePath = options.basePath ?? DEFAULT_SYNCED_STATE_PATH;
     const durableObjectName = options.durableObjectName ?? DEFAULT_SYNC_STATE_NAME;
     const forwardRequest = async (request) => {
-        const keyHandler = SyncStateServer.getKeyHandler();
+        const keyHandler = SyncedStateServer.getKeyHandler();
         if (!keyHandler) {
             const namespace = getNamespace(env);
             const id = namespace.idFromName(durableObjectName);
@@ -63,11 +62,8 @@ export const syncStateRoutes = (getNamespace, options = {}) => {
         const namespace = getNamespace(env);
         const id = namespace.idFromName(durableObjectName);
         const coordinator = namespace.get(id);
-        const proxy = new SyncStateProxy(coordinator, keyHandler);
+        const proxy = new SyncedStateProxy(coordinator, keyHandler);
         return newWorkersRpcResponse(request, proxy);
     };
-    return [
-        route(basePath, ({ request }) => forwardRequest(request)),
-        route(resetPath, ({ request }) => forwardRequest(request)),
-    ];
+    return [route(basePath, ({ request }) => forwardRequest(request))];
 };

package/dist/vite/cloudflarePreInitPlugin.d.mts

@@ -0,0 +1,11 @@
+import type { Plugin } from "vite";
+/**
+ * Plugin that performs initialization workarounds that must run before
+ * the Cloudflare plugin's `configureServer` hook executes.
+ *
+ * Cloudflare plugin v1.15.0 executes the worker entry file during
+ * `configureServer` to detect exports, which triggers SSR code evaluation
+ * before normal server initialization completes. This plugin ensures
+ * required systems are initialized beforehand.
+ */
+export declare const cloudflarePreInitPlugin: () => Plugin;

package/dist/vite/cloudflarePreInitPlugin.mjs

@@ -0,0 +1,40 @@
+/**
+ * Plugin that performs initialization workarounds that must run before
+ * the Cloudflare plugin's `configureServer` hook executes.
+ *
+ * Cloudflare plugin v1.15.0 executes the worker entry file during
+ * `configureServer` to detect exports, which triggers SSR code evaluation
+ * before normal server initialization completes. This plugin ensures
+ * required systems are initialized beforehand.
+ */
+export const cloudflarePreInitPlugin = () => {
+    return {
+        name: "rwsdk:cloudflare-pre-init",
+        // context(justinvdm, 20 Jan 2025): This plugin must run before the
+        // Cloudflare plugin's `configureServer` hook. The Cloudflare plugin
+        // executes the worker entry file during `configureServer` to detect
+        // exports, and blocks the rest of the configureServer plugins until the
+        // request is complete. We must initialize required systems (SSR dependency
+        // optimizer + our own plugins to them, as well as CSS plugin's moduleCache)
+        // before this happens to prevent errors.
+        enforce: "pre",
+        async configureServer(server) {
+            // context(justinvdm, 20 Jan 2025): Initialize SSR dependency optimizer before
+            // Cloudflare plugin triggers SSR code evaluation. This ensures dependencies
+            // in `optimizeDeps.include` (like `react-dom/server.edge`) are correctly
+            // registered before they are discovered lazily.
+            if (server.environments.ssr?.depsOptimizer) {
+                await server.environments.ssr.depsOptimizer.init();
+            }
+            // context(justinvdm, 20 Jan 2025): Initialize CSS plugin's shared moduleCache
+            // before CSS modules are processed. The Cloudflare plugin's export detection
+            // can trigger CSS module processing in the SSR environment during `configureServer`,
+            // which happens before `initServer` runs. Vite's CSS plugin uses a shared
+            // `moduleCache` that is initialized in the client environment's `buildStart` hook.
+            // By calling `buildStart` here (which is idempotent), we ensure the CSS plugin's
+            // cache is initialized before CSS modules are processed, preventing "Cannot read
+            // properties of undefined (reading 'set')" errors.
+            await server.environments.client.pluginContainer.buildStart();
+        },
+    };
+};

package/dist/vite/createDirectiveLookupPlugin.mjs

@@ -101,9 +101,12 @@ export const createDirectiveLookupPlugin = async ({ projectRootDir, files, confi
                 log("Skipping optimizeDeps and aliasing for environment: %s", env);
             }
         },
-        resolveId(source) {
-            // 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 !== `${config.virtualModuleName}.js`) {
@@ -144,10 +147,6 @@ export const createDirectiveLookupPlugin = async ({ projectRootDir, files, confi
             return source;
         },
         async load(id) {
-            // Skip during directive scanning to avoid performance issues
-            if (process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE) {
-                return;
-            }
             if (id === config.virtualModuleName + ".js") {
                 log("Loading %s module with %d files", config.virtualModuleName, files.size);
                 const environment = this.environment?.name || "client";

package/dist/vite/directivesPlugin.mjs

@@ -56,10 +56,6 @@ export const directivesPlugin = ({ projectRootDir, clientFiles, serverFiles, })
             });
         },
         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") {

package/dist/vite/injectVitePreamblePlugin.mjs

@@ -4,10 +4,6 @@ export const injectVitePreamble = ({ clientEntryPoints, projectRootDir, }) => ({
     name: "rwsdk:inject-vite-preamble",
     apply: "serve",
     transform(code, id) {
-        // Skip during directive scanning to avoid performance issues
-        if (process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE) {
-            return;
-        }
         if (this.environment.name !== "client") {
             return;
         }

package/dist/vite/knownDepsResolverPlugin.mjs

@@ -135,23 +135,10 @@ export const knownDepsResolverPlugin = ({ projectRootDir, }) => {
     return [
         {
             name: "rwsdk:known-dependencies-resolver:config",
-            enforce: "pre",
             config(config, { command }) {
                 isBuild = command === "build";
                 log("Configuring plugin for command=%s", command);
             },
-            async configureServer(server) {
-                // context(justinvdm, 19 Nov 2025): This hook must run before the
-                // Cloudflare plugin's `configureServer` hook, so we use `enforce: 'pre'`.
-                // The Cloudflare plugin's hook executes the worker entry file to discover
-                // its exports. This can trigger the evaluation of SSR code. We must initialize
-                // the SSR dependency optimizer *before* that happens to ensure that any
-                // dependencies in `optimizeDeps.include` (like `react-dom/server.edge`)
-                // are correctly registered before they are discovered lazily.
-                if (server.environments.ssr?.depsOptimizer) {
-                    await server.environments.ssr.depsOptimizer.init();
-                }
-            },
             configResolved(config) {
                 log("Setting up resolve aliases and optimizeDeps for each environment");
                 // Set up aliases and optimizeDeps for each environment
@@ -191,9 +178,12 @@ export const knownDepsResolverPlugin = ({ projectRootDir, }) => {
         {
             name: "rwsdk:known-dependencies-resolver:resolveId",
             enforce: "pre",
-            async resolveId(id, importer) {
-                // Skip during directive scanning to avoid performance issues
-                if (process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE) {
+            async resolveId(id, 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 (!isBuild) {

package/dist/vite/redwoodPlugin.mjs

@@ -10,6 +10,7 @@ import { pathExists } from "fs-extra";
 import { $ } from "../lib/$.mjs";
 import { findWranglerConfig } from "../lib/findWranglerConfig.mjs";
 import { hasPkgScript } from "../lib/hasPkgScript.mjs";
+import { cloudflarePreInitPlugin } from "./cloudflarePreInitPlugin.mjs";
 import { configPlugin } from "./configPlugin.mjs";
 import { devServerTimingPlugin } from "./devServerTimingPlugin.mjs";
 import { directiveModulesDevPlugin } from "./directiveModulesDevPlugin.mjs";
@@ -106,6 +107,7 @@ export const redwoodPlugin = async (options = {}) => {
             projectRootDir,
         }),
         knownDepsResolverPlugin({ projectRootDir }),
+        cloudflarePreInitPlugin(),
         tsconfigPaths({ root: projectRootDir }),
         shouldIncludeCloudflarePlugin
             ? cloudflare({

package/dist/vite/runDirectivesScan.mjs

@@ -87,8 +87,6 @@ export function classifyModule({ contents, inheritedEnv, }) {
 }
 export const runDirectivesScan = async ({ rootConfig, environments, clientFiles, serverFiles, entries: initialEntries, }) => {
     deferredLog("\n… (rwsdk) Scanning for 'use client' and 'use server' directives...");
-    // Set environment variable to indicate scanning is in progress
-    process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE = "true";
     try {
         const fileContentCache = new Map();
         const directiveCheckCache = new Map();
@@ -197,6 +195,19 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
                     log("Resolution result:", resolved);
                     const resolvedPath = resolved?.id;
                     if (resolvedPath && path.isAbsolute(resolvedPath)) {
+                        try {
+                            const stats = await fsp.stat(resolvedPath);
+                            if (stats.isDirectory()) {
+                                log("Resolved path is a directory, marking as external to avoid scan error:", resolvedPath);
+                                return { external: true };
+                            }
+                        }
+                        catch (e) {
+                            // This can happen for virtual modules or special paths that don't
+                            // exist on the filesystem. We can safely externalize them.
+                            log("Could not stat resolved path, marking as external:", resolvedPath);
+                            return { external: true };
+                        }
                         // Normalize the path for esbuild compatibility
                         const normalizedPath = normalizeModulePath(resolvedPath, rootConfig.root, { absolute: true });
                         log("Normalized path:", normalizedPath);
@@ -290,8 +301,6 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
         throw new Error(`RWSDK directive scan failed:\n${e.stack}`);
     }
     finally {
-        // Always clear the scanning flag when done
-        delete process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE;
         deferredLog("✔ (rwsdk) Done scanning for 'use client' and 'use server' directives.");
         process.env.VERBOSE &&
             log("Client/server files after scanning: client=%O, server=%O", Array.from(clientFiles), Array.from(serverFiles));

package/dist/vite/ssrBridgePlugin.mjs

@@ -58,12 +58,14 @@ export const ssrBridgePlugin = ({ clientFiles, serverFiles, }) => {
                 config.optimizeDeps.esbuildOptions.plugins.push({
                     name: "rwsdk-ssr-external",
                     setup(build) {
+                        console.log("[TIMING] rwsdk-ssr-external.setup: START - Plugin setup function called");
                         log("Setting up esbuild plugin to mark rwsdk/__ssr paths as external for worker");
                         build.onResolve({ filter: /.*$/ }, (args) => {
                             process.env.VERBOSE &&
                                 log("Esbuild onResolve called for path=%s, args=%O", args.path, args);
                             if (args.path === "rwsdk/__ssr_bridge" ||
                                 args.path.startsWith(VIRTUAL_SSR_PREFIX)) {
+                                console.log(`[TIMING] rwsdk-ssr-external.onResolve: Intercepted ${args.path}`);
                                 log("Marking as external: %s", args.path);
                                 return {
                                     path: args.path,
@@ -71,14 +73,19 @@ export const ssrBridgePlugin = ({ clientFiles, serverFiles, }) => {
                                 };
                             }
                         });
+                        console.log("[TIMING] rwsdk-ssr-external.setup: COMPLETE - onResolve hook registered");
                     },
                 });
                 log("Worker environment esbuild configuration complete");
             }
         },
-        async resolveId(id, importer) {
-            // Skip during directive scanning to avoid performance issues
-            if (process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE) {
+        async resolveId(id, 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). This prevents race conditions where external
+            // calls happen during directive scanning.
+            if (options?.custom?.rwsdk?.directiveScan === true) {
                 return;
             }
             // context(justinvdm, 19 Nov 2025):
@@ -137,10 +144,6 @@ export const ssrBridgePlugin = ({ clientFiles, serverFiles, }) => {
             }
         },
         async load(id) {
-            // Skip during directive scanning to avoid performance issues
-            if (process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE) {
-                return;
-            }
             if (id.startsWith(VIRTUAL_SSR_PREFIX) &&
                 this.environment.name === "worker") {
                 const realId = id.slice(VIRTUAL_SSR_PREFIX.length);

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") {

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.30-test.20251119220440",
+  "version": "1.0.0-beta.30-test.20251120213828",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {
@@ -110,8 +110,8 @@
       "default": "./dist/use-synced-state/client.js"
     },
     "./use-synced-state/worker": {
-      "types": "./dist/use-synced-state/worker.d.ts",
-      "default": "./dist/use-synced-state/worker.js"
+      "types": "./dist/use-synced-state/worker.d.mts",
+      "workerd": "./dist/use-synced-state/worker.mjs"
     }
   },
   "keywords": [
@@ -157,7 +157,6 @@
     "@types/react-dom": "~19.1.2",
     "@types/react-is": "~19.0.0",
     "@vitejs/plugin-react": "~5.0.0",
-    "capnweb": "~0.2.0",
     "chokidar": "~4.0.0",
     "debug": "~4.4.0",
     "decompress": "~4.2.1",
@@ -187,6 +186,7 @@
   },
   "peerDependencies": {
     "@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",
@@ -196,6 +196,7 @@
   "packageManager": "pnpm@10.0.0+sha512.b8fef5494bd3fe4cbd4edabd0745df2ee5be3e4b0b8b08fa643aa3e4c6702ccc0f00d68fa8a8c9858a735a0032485a44990ed2810526c875e416f001b17df12b",
   "devDependencies": {
     "@cloudflare/vite-plugin": "1.13.3",
+    "capnweb": "~0.2.0",
     "@types/debug": "~4.1.12",
     "@types/js-beautify": "~1.14.3",
     "@types/lodash": "~4.17.16",

package/dist/use-synced-state/SyncStateServer.d.mts

@@ -1,20 +0,0 @@
-import { RpcStub } from "capnweb";
-import { DurableObject } from "cloudflare:workers";
-export type SyncStateValue = unknown;
-type OnSetHandler = (key: string, value: SyncStateValue) => void;
-type OnGetHandler = (key: string, value: SyncStateValue | undefined) => void;
-/**
- * Durable Object that keeps shared state for multiple clients and notifies subscribers.
- */
-export declare class SyncStateServer extends DurableObject {
-    #private;
-    static registerKeyHandler(handler: (key: string) => Promise<string>): void;
-    static getKeyHandler(): ((key: string) => Promise<string>) | null;
-    static registerSetStateHandler(handler: OnSetHandler | null): void;
-    static registerGetStateHandler(handler: OnGetHandler | null): void;
-    getState(key: string): SyncStateValue;
-    setState(value: SyncStateValue, key: string): void;
-    subscribe(key: string, client: RpcStub<(value: SyncStateValue) => void>): void;
-    unsubscribe(key: string, client: RpcStub<(value: SyncStateValue) => void>): void;
-}
-export {};

package/dist/use-synced-state/useSyncState.d.ts

@@ -1,20 +0,0 @@
-import { React } from "../runtime/client/client";
-type HookDeps = {
-    useState: typeof React.useState;
-    useEffect: typeof React.useEffect;
-    useRef: typeof React.useRef;
-    useCallback: typeof React.useCallback;
-};
-type Setter<T> = (value: T | ((previous: T) => T)) => void;
-export type CreateSyncStateHookOptions = {
-    url?: string;
-    hooks?: HookDeps;
-};
-/**
- * Builds a `useSyncedState` hook configured with optional endpoint and hook overrides.
- * @param options Optional overrides for endpoint and React primitives.
- * @returns Hook that syncs state through the sync state service.
- */
-export declare const createSyncStateHook: (options?: CreateSyncStateHookOptions) => <T>(initialValue: T, key: string) => [T, Setter<T>];
-export declare const useSyncedState: <T>(initialValue: T, key: string) => [T, Setter<T>];
-export {};

package/dist/use-synced-state/useSyncState.js

@@ -1,58 +0,0 @@
-import { React } from "../runtime/client/client";
-import { getSyncStateClient } from "./client";
-import { DEFAULT_SYNC_STATE_PATH } from "./constants.mjs";
-const defaultDeps = {
-    useState: React.useState,
-    useEffect: React.useEffect,
-    useRef: React.useRef,
-    useCallback: React.useCallback,
-};
-/**
- * Builds a `useSyncedState` hook configured with optional endpoint and hook overrides.
- * @param options Optional overrides for endpoint and React primitives.
- * @returns Hook that syncs state through the sync state service.
- */
-export const createSyncStateHook = (options = {}) => {
-    const resolvedUrl = options.url ?? DEFAULT_SYNC_STATE_PATH;
-    const deps = options.hooks ?? defaultDeps;
-    const { useState, useEffect, useRef, useCallback } = deps;
-    return function useSyncedState(initialValue, key) {
-        if (typeof window === "undefined" && !options.hooks) {
-            return [initialValue, () => { }];
-        }
-        const client = getSyncStateClient(resolvedUrl);
-        const [value, setValue] = useState(initialValue);
-        const valueRef = useRef(value);
-        valueRef.current = value;
-        const setSyncValue = useCallback((nextValue) => {
-            const resolved = typeof nextValue === "function"
-                ? nextValue(valueRef.current)
-                : nextValue;
-            setValue(resolved);
-            valueRef.current = resolved;
-            void client.setState(resolved, key);
-        }, [client, key, setValue, valueRef]);
-        useEffect(() => {
-            let isActive = true;
-            const handleUpdate = (next) => {
-                if (isActive) {
-                    setValue(next);
-                    valueRef.current = next;
-                }
-            };
-            void client.getState(key).then((existing) => {
-                if (existing !== undefined && isActive) {
-                    setValue(existing);
-                    valueRef.current = existing;
-                }
-            });
-            void client.subscribe(key, handleUpdate);
-            return () => {
-                isActive = false;
-                void client.unsubscribe(key, handleUpdate);
-            };
-        }, [client, key, setValue, valueRef]);
-        return [value, setSyncValue];
-    };
-};
-export const useSyncedState = createSyncStateHook();