rwsdk 1.3.1 → 1.3.2

package/dist/__intermediate_builds/__vendor_client_barrel.dev-virtual.d.ts

@@ -0,0 +1,2 @@
+declare const _default: {};
+export default _default;

package/dist/__intermediate_builds/__vendor_client_barrel.dev-virtual.js

@@ -0,0 +1,5 @@
+// This file is intentionally a placeholder. In dev, directiveModulesDevPlugin
+// intercepts the `rwsdk/__vendor_client_barrel` specifier and serves generated
+// content from in-memory temp barrels. This export exists only so the
+// `optimizeDeps.include` entry has a resolvable fallback path.
+export default {};

package/dist/__intermediate_builds/__vendor_server_barrel.dev-virtual.d.ts

@@ -0,0 +1,2 @@
+declare const _default: {};
+export default _default;

package/dist/__intermediate_builds/__vendor_server_barrel.dev-virtual.js

@@ -0,0 +1,5 @@
+// This file is intentionally a placeholder. In dev, directiveModulesDevPlugin
+// intercepts the `rwsdk/__vendor_server_barrel` specifier and serves generated
+// content from in-memory temp barrels. This export exists only so the
+// `optimizeDeps.include` entry has a resolvable fallback path.
+export default {};

package/dist/lib/constants.mjs

@@ -7,8 +7,14 @@ export const SRC_DIR = resolve(ROOT_DIR, "src");
 export const DIST_DIR = resolve(ROOT_DIR, "dist");
 export const VITE_DIR = resolve(ROOT_DIR, "src", "vite");
 export const INTERMEDIATES_OUTPUT_DIR = resolve(DIST_DIR, "__intermediate_builds");
-export const VENDOR_CLIENT_BARREL_PATH = resolve(INTERMEDIATES_OUTPUT_DIR, "rwsdk-vendor-client-barrel.js");
-export const VENDOR_SERVER_BARREL_PATH = resolve(INTERMEDIATES_OUTPUT_DIR, "rwsdk-vendor-server-barrel.js");
+// Intentionally named `.dev-virtual.js`: these files are never written during
+// the SDK build. In dev, directiveModulesDevPlugin intercepts the matching
+// `rwsdk/__vendor_*_barrel` specifiers and serves generated content from
+// in-memory temp barrels. The package.json exports point here only as a
+// fallback marker/placeholder for cases where the dev plugin has not set temp
+// barrel paths.
+export const VENDOR_CLIENT_BARREL_PATH = resolve(INTERMEDIATES_OUTPUT_DIR, "__vendor_client_barrel.dev-virtual.js");
+export const VENDOR_SERVER_BARREL_PATH = resolve(INTERMEDIATES_OUTPUT_DIR, "__vendor_server_barrel.dev-virtual.js");
 export const VENDOR_CLIENT_BARREL_EXPORT_PATH = "rwsdk/__vendor_client_barrel";
 export const VENDOR_SERVER_BARREL_EXPORT_PATH = "rwsdk/__vendor_server_barrel";
 export const RW_STATE_EXPORT_PATH = "rwsdk/__state";

package/dist/lib/e2e/testHarness.mjs

@@ -196,6 +196,20 @@ export function createDevServer() {
             if (SKIP_DEV_SERVER_TESTS) {
                 throw new Error("Dev server tests are skipped via RWSDK_SKIP_DEV=1");
             }
+            // Reuse the global dev server when it is for the same project directory.
+            // This avoids spawning multiple Vite/Cloudflare dev servers in the same
+            // project (which compete for the same inspector port, etc.).
+            if (globalDevInstance && globalDevInstance.projectDir === projectDir) {
+                instance = globalDevInstance;
+                return instance;
+            }
+            if (globalDevInstancePromise) {
+                const globalInstance = await globalDevInstancePromise;
+                if (globalInstance && globalInstance.projectDir === projectDir) {
+                    instance = globalInstance;
+                    return instance;
+                }
+            }
             const devResult = await pollValue(() => runDevServer(packageManager, projectDir), {
                 timeout: DEV_SERVER_TIMEOUT,
                 minTries: DEV_SERVER_MIN_TRIES,

package/dist/vite/barrelPaths.d.mts

@@ -0,0 +1,14 @@
+/**
+ * Temporary paths for the generated vendor barrels in development.
+ *
+ * In dev, `directiveModulesDevPlugin` generates these paths in a temp directory
+ * (outside of node_modules) and provides barrel content to Vite's optimizer
+ * in-memory. The lookup plugins read these paths so the lookup map imports the
+ * same temp files the optimizer is configured to pre-bundle.
+ */
+export declare const setVendorBarrelPaths: ({ client, server, }: {
+    client: string;
+    server: string;
+}) => void;
+export declare const getVendorClientBarrelPath: () => string | undefined;
+export declare const getVendorServerBarrelPath: () => string | undefined;

package/dist/vite/barrelPaths.mjs

@@ -0,0 +1,16 @@
+/**
+ * Temporary paths for the generated vendor barrels in development.
+ *
+ * In dev, `directiveModulesDevPlugin` generates these paths in a temp directory
+ * (outside of node_modules) and provides barrel content to Vite's optimizer
+ * in-memory. The lookup plugins read these paths so the lookup map imports the
+ * same temp files the optimizer is configured to pre-bundle.
+ */
+let vendorClientBarrelPath;
+let vendorServerBarrelPath;
+export const setVendorBarrelPaths = ({ client, server, }) => {
+    vendorClientBarrelPath = client;
+    vendorServerBarrelPath = server;
+};
+export const getVendorClientBarrelPath = () => vendorClientBarrelPath;
+export const getVendorServerBarrelPath = () => vendorServerBarrelPath;

package/dist/vite/configPlugin.mjs

@@ -6,6 +6,7 @@ import { externalModules } from "./constants.mjs";
 import { ssrBridgeWrapPlugin } from "./ssrBridgeWrapPlugin.mjs";
 export const configPlugin = ({ silent, projectRootDir, workerEntryPathname, clientFiles, serverFiles, clientEntryPoints, esbuildOptions, }) => ({
     name: "rwsdk:config",
+    enforce: "pre",
     config: async (config, { command }) => {
         const mode = process.env.NODE_ENV;
         // context(justinvdm, 2026-05-06): Only set a sourcemap default if the user
@@ -101,6 +102,7 @@ export const configPlugin = ({ silent, projectRootDir, workerEntryPathname, clie
                             "rwsdk/realtime/client",
                             "rwsdk/router",
                             "rwsdk/turnstile",
+                            "rwsdk/use-synced-state/client",
                         ],
                         entries: [],
                         esbuildOptions: {
@@ -139,6 +141,7 @@ export const configPlugin = ({ silent, projectRootDir, workerEntryPathname, clie
                             "rwsdk/worker",
                             "rwsdk/realtime/durableObject",
                             "rwsdk/realtime/worker",
+                            "rwsdk/use-synced-state/client",
                         ],
                         esbuildOptions: {
                             jsx: "automatic",
@@ -200,4 +203,15 @@ export const configPlugin = ({ silent, projectRootDir, workerEntryPathname, clie
         };
         return baseConfig;
     },
+    configResolved(config) {
+        // context(chrisvdm, 2025-09-20): Vitest and some Vite defaults set
+        // `resolve.external` to Node built-ins for non-client environments. The
+        // Cloudflare Vite plugin rejects any `resolve.external` value on Worker
+        // environments. We clear it here after Vite has resolved the environment
+        // configs but before the Cloudflare plugin validates them. `noExternal: true`
+        // in the worker config ensures builtins are bundled rather than externalized.
+        if (config.environments.worker?.resolve) {
+            config.environments.worker.resolve.external = [];
+        }
+    },
 });

package/dist/vite/directiveModulesDevPlugin.mjs

@@ -1,9 +1,10 @@
-import { mkdirSync, mkdtempSync, writeFileSync } from "node:fs";
+import { mkdirSync, mkdtempSync, realpathSync, writeFileSync } from "node:fs";
 import os from "os";
 import path from "path";
-import { VENDOR_CLIENT_BARREL_EXPORT_PATH, VENDOR_CLIENT_BARREL_PATH, VENDOR_SERVER_BARREL_EXPORT_PATH, VENDOR_SERVER_BARREL_PATH, } from "../lib/constants.mjs";
+import { VENDOR_CLIENT_BARREL_PATH as SDK_VENDOR_CLIENT_BARREL_PATH, VENDOR_SERVER_BARREL_PATH as SDK_VENDOR_SERVER_BARREL_PATH, VENDOR_CLIENT_BARREL_EXPORT_PATH, VENDOR_SERVER_BARREL_EXPORT_PATH, } from "../lib/constants.mjs";
 import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
-import { runDirectivesScan } from "./runDirectivesScan.mjs";
+import { setVendorBarrelPaths } from "./barrelPaths.mjs";
+import { runDirectivesScan, } from "./runDirectivesScan.mjs";
 export const generateVendorBarrelContent = (files, projectRootDir) => {
     const imports = [...files]
         .filter((file) => file.includes("node_modules"))
@@ -31,13 +32,32 @@ export const generateAppBarrelContent = (files, projectRootDir) => {
         .join("\n");
 };
 export const directiveModulesDevPlugin = ({ clientFiles, serverFiles, projectRootDir, workerEntryPathname, esbuildOptions, }) => {
-    const { promise: scanPromise, resolve: resolveScanPromise } = Promise.withResolvers();
-    const tempDir = mkdtempSync(path.join(os.tmpdir(), "rwsdk-"));
+    const { promise: scanPromise, resolve: resolveScanPromise, reject: rejectScanPromise, } = Promise.withResolvers();
+    const tempDir = mkdtempSync(path.join(realpathSync(os.tmpdir()), "rwsdk-"));
     const APP_CLIENT_BARREL_PATH = path.join(tempDir, "app-client-barrel.js");
     const APP_SERVER_BARREL_PATH = path.join(tempDir, "app-server-barrel.js");
+    const VENDOR_CLIENT_BARREL_PATH = path.join(tempDir, "vendor-client-barrel.js");
+    const VENDOR_SERVER_BARREL_PATH = path.join(tempDir, "vendor-server-barrel.js");
+    setVendorBarrelPaths({
+        client: VENDOR_CLIENT_BARREL_PATH,
+        server: VENDOR_SERVER_BARREL_PATH,
+    });
     return {
         name: "rwsdk:directive-modules-dev",
         enforce: "pre",
+        load(id) {
+            const isClientBarrel = id === VENDOR_CLIENT_BARREL_EXPORT_PATH ||
+                id === SDK_VENDOR_CLIENT_BARREL_PATH;
+            const isServerBarrel = id === VENDOR_SERVER_BARREL_EXPORT_PATH ||
+                id === SDK_VENDOR_SERVER_BARREL_PATH;
+            if (isClientBarrel) {
+                return generateVendorBarrelContent(clientFiles, projectRootDir);
+            }
+            if (isServerBarrel) {
+                return generateVendorBarrelContent(serverFiles, projectRootDir);
+            }
+            return null;
+        },
         configureServer(server) {
             // context(justinvdm, 19 Nov 2025): We must run this hook before the
             // Cloudflare plugin's `configureServer` hook. The Cloudflare plugin makes
@@ -57,19 +77,14 @@ export const directiveModulesDevPlugin = ({ clientFiles, serverFiles, projectRoo
                 serverFiles,
                 entries: [workerEntryPathname],
                 esbuildOptions,
-            }).then(() => {
-                // context(justinvdm, 11 Sep 2025): For vendor barrels, we write the
-                // files directly to disk after the scan. For app barrels, we use a
-                // more complex esbuild plugin to provide content in-memory. This is
-                // because app barrels require special handling to prevent Vite from
-                // marking application code as `external: true`. Vendor barrels do not
-                // have this requirement and a simpler, direct-write approach is more
-                // stable.
-                const vendorClientBarrelContent = generateVendorBarrelContent(clientFiles, projectRootDir);
-                writeFileSync(VENDOR_CLIENT_BARREL_PATH, vendorClientBarrelContent);
-                const vendorServerBarrelContent = generateVendorBarrelContent(serverFiles, projectRootDir);
-                writeFileSync(VENDOR_SERVER_BARREL_PATH, vendorServerBarrelContent);
+            })
+                .then(() => {
+                writeFileSync(VENDOR_CLIENT_BARREL_PATH, generateVendorBarrelContent(clientFiles, projectRootDir));
+                writeFileSync(VENDOR_SERVER_BARREL_PATH, generateVendorBarrelContent(serverFiles, projectRootDir));
                 resolveScanPromise();
+            })
+                .catch((error) => {
+                rejectScanPromise(error);
             });
             server.middlewares.use(async (_req, _res, next) => {
                 await scanPromise;
@@ -78,6 +93,7 @@ export const directiveModulesDevPlugin = ({ clientFiles, serverFiles, projectRoo
         },
         configResolved(config) {
             if (config.command !== "serve") {
+                resolveScanPromise();
                 return;
             }
             mkdirSync(path.dirname(APP_CLIENT_BARREL_PATH), { recursive: true });
@@ -91,8 +107,9 @@ export const directiveModulesDevPlugin = ({ clientFiles, serverFiles, projectRoo
             for (const [envName, env] of Object.entries(config.environments || {})) {
                 env.optimizeDeps ??= {};
                 env.optimizeDeps.include ??= [];
-                const entries = (env.optimizeDeps.entries = castArray(env.optimizeDeps.entries ?? []));
                 env.optimizeDeps.include.push(VENDOR_CLIENT_BARREL_EXPORT_PATH, VENDOR_SERVER_BARREL_EXPORT_PATH);
+                const entries = (env.optimizeDeps.entries = castArray(env.optimizeDeps.entries ?? []));
+                entries.push(VENDOR_CLIENT_BARREL_EXPORT_PATH, VENDOR_SERVER_BARREL_EXPORT_PATH);
                 if (envName === "client" || envName === "ssr") {
                     entries.push(APP_CLIENT_BARREL_PATH);
                 }
@@ -108,17 +125,43 @@ export const directiveModulesDevPlugin = ({ clientFiles, serverFiles, projectRoo
                             APP_CLIENT_BARREL_PATH,
                             APP_SERVER_BARREL_PATH,
                         ];
-                        const appBarrelFilter = new RegExp(`(${appBarrelPaths
-                            .map((p) => p.replace(/\\/g, "\\\\"))
-                            .join("|")})$`);
+                        const vendorBarrelPaths = [
+                            VENDOR_CLIENT_BARREL_PATH,
+                            VENDOR_SERVER_BARREL_PATH,
+                        ];
+                        const barrelPaths = [...appBarrelPaths, ...vendorBarrelPaths];
+                        const escapeRegExp = (s) => s.replace(/[\\^$*+?.()|[\]{}]/g, "\\$&");
+                        const barrelFilter = new RegExp(`(${barrelPaths.map(escapeRegExp).join("|")})$`);
                         build.onResolve({ filter: /.*/ }, async (args) => {
                             // Block all resolutions until the scan is complete.
                             await scanPromise;
-                            // Handle app barrel files
-                            if (appBarrelFilter.test(args.path)) {
+                            // Handle stable vendor barrel specifiers by redirecting them to
+                            // the in-memory temp barrel files. This lets Vite rewrite the
+                            // specifier to its optimized dependency bundle while still serving
+                            // our generated content.
+                            const isClientBarrelPath = args.path === VENDOR_CLIENT_BARREL_EXPORT_PATH ||
+                                args.path === SDK_VENDOR_CLIENT_BARREL_PATH ||
+                                args.path.endsWith("/__vendor_client_barrel.dev-virtual.js");
+                            const isServerBarrelPath = args.path === VENDOR_SERVER_BARREL_EXPORT_PATH ||
+                                args.path === SDK_VENDOR_SERVER_BARREL_PATH ||
+                                args.path.endsWith("/__vendor_server_barrel.dev-virtual.js");
+                            if (isClientBarrelPath) {
+                                return {
+                                    path: VENDOR_CLIENT_BARREL_PATH,
+                                    namespace: "rwsdk-barrel-ns",
+                                };
+                            }
+                            if (isServerBarrelPath) {
+                                return {
+                                    path: VENDOR_SERVER_BARREL_PATH,
+                                    namespace: "rwsdk-barrel-ns",
+                                };
+                            }
+                            // Handle barrel files (app + vendor)
+                            if (barrelFilter.test(args.path)) {
                                 return {
                                     path: args.path,
-                                    namespace: "rwsdk-app-barrel-ns",
+                                    namespace: "rwsdk-barrel-ns",
                                 };
                             }
                             // context(justinvdm, 11 Sep 2025): Prevent Vite from
@@ -136,8 +179,26 @@ export const directiveModulesDevPlugin = ({ clientFiles, serverFiles, projectRoo
                                 };
                             }
                         });
-                        build.onLoad({ filter: /.*/, namespace: "rwsdk-app-barrel-ns" }, (args) => {
-                            const isServerBarrel = args.path.includes("app-server-barrel");
+                        build.onLoad({ filter: /__vendor_(client|server)_barrel\.dev-virtual\.js$/ }, async (args) => {
+                            await scanPromise;
+                            const isServerBarrel = args.path.includes("server-barrel");
+                            const files = isServerBarrel ? serverFiles : clientFiles;
+                            return {
+                                contents: generateVendorBarrelContent(files, projectRootDir),
+                                loader: "js",
+                            };
+                        });
+                        build.onLoad({ filter: /.*/, namespace: "rwsdk-barrel-ns" }, (args) => {
+                            const isServerBarrel = args.path.includes("server-barrel");
+                            const isVendorBarrel = args.path.includes("vendor");
+                            if (isVendorBarrel) {
+                                const files = isServerBarrel ? serverFiles : clientFiles;
+                                const content = generateVendorBarrelContent(files, projectRootDir);
+                                return {
+                                    contents: content,
+                                    loader: "js",
+                                };
+                            }
                             const files = isServerBarrel ? serverFiles : clientFiles;
                             const content = generateAppBarrelContent(files, projectRootDir);
                             return {

package/dist/vite/miniflareHMRPlugin.mjs

@@ -1,12 +1,17 @@
 import debug from "debug";
+import { writeFileSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { resolve } from "node:path";
 import colors from "picocolors";
+import { VENDOR_CLIENT_BARREL_EXPORT_PATH, VENDOR_SERVER_BARREL_EXPORT_PATH, } from "../lib/constants.mjs";
 import { getShortName } from "../lib/getShortName.mjs";
 import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
+import { getVendorClientBarrelPath, getVendorServerBarrelPath, } from "./barrelPaths.mjs";
+import { generateVendorBarrelContent } from "./directiveModulesDevPlugin.mjs";
 import { hasDirective as sourceHasDirective } from "./hasDirective.mjs";
 import { invalidateModule } from "./invalidateModule.mjs";
 import { isJsFile } from "./isJsFile.mjs";
+import { runDirectivesScan } from "./runDirectivesScan.mjs";
 import { VIRTUAL_SSR_PREFIX } from "./ssrVirtualModule.mjs";
 const log = debug("rwsdk:vite:hmr-plugin");
 let hasErrored = false;
@@ -148,6 +153,68 @@ export const miniflareHMRPlugin = (givenOptions) => [
             // The worker needs an update, and the hot check is for the worker environment
             // => Notify for custom RSC-based HMR update, then short circuit HMR
             if (isWorkerUpdate && this.environment.name === environment) {
+                // context(chrisvdm, 22 Jun 2026): When a worker file changes it may have imported
+                // a new dependency (or transitive dependency) that contains a directive.
+                // The directive scan only runs once at startup, so run a targeted sub-scan
+                // from the changed file to discover any new directive files and update the
+                // vendor barrels / lookup maps accordingly.
+                const clientFilesBefore = clientFiles.size;
+                const serverFilesBefore = serverFiles.size;
+                // context(chrisvdm, 22 Jun 2026): A full directive scan is expensive and
+                // awaiting it here can noticeably delay the HMR reload/refresh while the
+                // scan runs. However, this only happens when a changed worker file imports
+                // a dependency that was not seen in the initial scan (or a previous
+                // sub-scan). For files that were already part of the discovered directive
+                // graph, this branch is skipped. We are aware that blocking HMR for a full
+                // scan is not ideal, and we will monitor how it performs in practice. If it
+                // becomes a bottleneck, we should look into caching scan results and/or
+                // making the sub-scan incremental so we only pay the cost once per new
+                // dependency rather than on every unrelated edit.
+                await runDirectivesScan({
+                    rootConfig: ctx.server.config,
+                    environments: ctx.server.environments,
+                    clientFiles,
+                    serverFiles,
+                    entries: [ctx.file],
+                    esbuildOptions: {},
+                });
+                const clientFilesAfter = clientFiles.size;
+                const serverFilesAfter = serverFiles.size;
+                if (clientFilesAfter !== clientFilesBefore ||
+                    serverFilesAfter !== serverFilesBefore) {
+                    const clientBarrelPath = getVendorClientBarrelPath();
+                    const serverBarrelPath = getVendorServerBarrelPath();
+                    if (clientBarrelPath) {
+                        writeFileSync(clientBarrelPath, generateVendorBarrelContent(clientFiles, givenOptions.rootDir));
+                    }
+                    if (serverBarrelPath) {
+                        writeFileSync(serverBarrelPath, generateVendorBarrelContent(serverFiles, givenOptions.rootDir));
+                    }
+                    for (const envName of ["client", "ssr", environment]) {
+                        if (clientBarrelPath) {
+                            invalidateModule(ctx.server, envName, clientBarrelPath);
+                        }
+                        if (serverBarrelPath) {
+                            invalidateModule(ctx.server, envName, serverBarrelPath);
+                        }
+                        invalidateModule(ctx.server, envName, VENDOR_CLIENT_BARREL_EXPORT_PATH);
+                        invalidateModule(ctx.server, envName, VENDOR_SERVER_BARREL_EXPORT_PATH);
+                    }
+                    if (clientFilesAfter !== clientFilesBefore) {
+                        for (const envName of ["client", "ssr", environment]) {
+                            invalidateModule(ctx.server, envName, "virtual:use-client-lookup.js");
+                        }
+                        invalidateModule(ctx.server, environment, VIRTUAL_SSR_PREFIX + "/@id/virtual:use-client-lookup.js");
+                        invalidateModule(ctx.server, environment, VIRTUAL_SSR_PREFIX + "virtual:use-client-lookup.js");
+                    }
+                    if (serverFilesAfter !== serverFilesBefore) {
+                        for (const envName of ["client", "ssr", environment]) {
+                            invalidateModule(ctx.server, envName, "virtual:use-server-lookup.js");
+                        }
+                        invalidateModule(ctx.server, environment, VIRTUAL_SSR_PREFIX + "/@id/virtual:use-server-lookup.js");
+                        invalidateModule(ctx.server, environment, VIRTUAL_SSR_PREFIX + "virtual:use-server-lookup.js");
+                    }
+                }
                 invalidateModule(ctx.server, environment, ctx.file);
                 const shortName = getShortName(ctx.file, ctx.server.config.root);
                 this.environment.logger.info(`${colors.green(`worker update`)} ${colors.dim(shortName)}`, {

package/dist/vite/redwoodPlugin.mjs

@@ -117,6 +117,7 @@ export const redwoodPlugin = async (options = {}) => {
             ? cloudflare({
                 viteEnvironment: { name: "worker" },
                 configPath: workerConfigPath,
+                inspectorPort: process.env.RWSDK_WORKER_RUN === "1" ? false : undefined,
             })
             : [],
         miniflareHMRPlugin({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {
@@ -58,10 +58,10 @@
       "default": "./dist/runtime/ssrBridge.js"
     },
     "./__vendor_client_barrel": {
-      "default": "./dist/__intermediate_builds/rwsdk-vendor-client-barrel.js"
+      "default": "./dist/__intermediate_builds/__vendor_client_barrel.dev-virtual.js"
     },
     "./__vendor_server_barrel": {
-      "default": "./dist/__intermediate_builds/rwsdk-vendor-server-barrel.js"
+      "default": "./dist/__intermediate_builds/__vendor_server_barrel.dev-virtual.js"
     },
     "./router": {
       "types": "./dist/runtime/entries/router.d.ts",