rwsdk 1.0.0-alpha.11 → 1.0.0-alpha.13

package/dist/lib/e2e/testHarness.d.mts

@@ -124,3 +124,9 @@ export declare namespace testDevAndDeploy {
  * This should be used before any user interaction is simulated.
  */
 export declare function waitForHydration(page: Page): Promise<void>;
+export declare function trackPageErrors(page: Page): {
+    get: () => {
+        consoleErrors: string[];
+        failedRequests: string[];
+    };
+};

package/dist/lib/e2e/testHarness.mjs

@@ -416,3 +416,22 @@ export async function waitForHydration(page) {
     // This is a pragmatic approach to ensure React has mounted.
     await new Promise((resolve) => setTimeout(resolve, HYDRATION_TIMEOUT));
 }
+export function trackPageErrors(page) {
+    const consoleErrors = [];
+    const failedRequests = [];
+    page.on("requestfailed", (request) => {
+        failedRequests.push(`${request.url()} | ${request.failure()?.errorText}`);
+    });
+    page.on("console", (msg) => {
+        if (msg.type() === "error") {
+            consoleErrors.push(msg.text());
+        }
+    });
+    return {
+        get: () => ({
+            // context(justinvdm, 25 Sep 2025): Filter out irrelevant 404s (e.g. favicon)
+            consoleErrors: consoleErrors.filter((e) => !e.includes("404")),
+            failedRequests,
+        }),
+    };
+}

package/dist/llms/rules/middleware.d.ts

@@ -1 +1 @@
-export declare const middleware = "\n\n# RedwoodSDK: Middleware\n\nYou're an expert at Cloudflare, TypeScript, and building web apps with RedwoodSDK. Generate high quality **RedwoodSDK middleware** that adhere to the following best practices:\n\n## Guidelines\n\n1. Create focused, single-responsibility middleware functions\n2. Organize middleware in dedicated files (e.g., `middleware.ts`, `middleware.tsx`)\n3. Use typed parameters and return values\n4. Include clear error handling and logging\n5. Follow the principle of least privilege\n6. Implement proper security headers and CORS policies\n7. Optimize for performance with caching strategies\n\n## What is Middleware?\n\nMiddleware functions in RedwoodSDK are functions that run on every request before your route handlers. They can:\n\n- Add security headers\n- Handle CORS\n- Implement caching strategies\n- Add request/response logging\n- Transform request/response data\n- Implement rate limiting\n- Add performance monitoring\n- Handle error boundaries\n- Setup sessions\n- Authenticate users\n\n## Example Templates\n\n### Basic Middleware Structure\n\n```tsx\nexport default defineApp([\n  setCommonHeaders(),\n  async ({ ctx, request, headers }) => {\n    await setupDb(env);\n    setupSessionStore(env);\n    try {\n      // Grab the session's data.\n      ctx.session = await sessions.load(request);\n    } catch (error) {\n      if (error instanceof ErrorResponse && error.code === 401) {\n        await sessions.remove(request, headers);\n        headers.set(\"Location\", \"/user/login\");\n\n        return new Response(null, {\n          status: 302,\n          headers,\n        });\n      }\n\n      throw error;\n    }\n\n    // Populate the ctx with the user's data\n    if (ctx.session?.userId) {\n      ctx.user = await db.user.findUnique({\n        where: {\n          id: ctx.session.userId,\n        },\n      });\n    }\n  },\n  // Route handlers\n]);\n```\n";
+export declare const middleware = "\n\n# RedwoodSDK: Middleware\n\nYou're an expert at Cloudflare, TypeScript, and building web apps with RedwoodSDK. Generate high quality **RedwoodSDK middleware** that adhere to the following best practices:\n\n## Guidelines\n\n1. Create focused, single-responsibility middleware functions\n2. Organize middleware in dedicated files (e.g., `middleware.ts`, `middleware.tsx`)\n3. Use typed parameters and return values\n4. Include clear error handling and logging\n5. Follow the principle of least privilege\n6. Implement proper security headers and CORS policies\n7. Optimize for performance with caching strategies\n\n## What is Middleware?\n\nMiddleware functions in RedwoodSDK are functions that run on every request before your route handlers. They can:\n\n- Add security headers\n- Handle CORS\n- Implement caching strategies\n- Add request/response logging\n- Transform request/response data\n- Implement rate limiting\n- Add performance monitoring\n- Handle error boundaries\n- Setup sessions\n- Authenticate users\n\n## Example Templates\n\n### Basic Middleware Structure\n\n```tsx\nexport default defineApp([\n  setCommonHeaders(),\n  async ({ ctx, request, response }) => {\n    await setupDb(env);\n    setupSessionStore(env);\n    try {\n      // Grab the session's data.\n      ctx.session = await sessions.load(request);\n    } catch (error) {\n      if (error instanceof ErrorResponse && error.code === 401) {\n        await sessions.remove(request, response.headers);\n        response.headers.set(\"Location\", \"/user/login\");\n\n        return new Response(null, {\n          status: 302,\n          headers: response.headers,\n        });\n      }\n\n      throw error;\n    }\n\n    // Populate the ctx with the user's data\n    if (ctx.session?.userId) {\n      ctx.user = await db.user.findUnique({\n        where: {\n          id: ctx.session.userId,\n        },\n      });\n    }\n  },\n  // Route handlers\n]);\n```\n";

package/dist/llms/rules/middleware.js

@@ -36,7 +36,7 @@ Middleware functions in RedwoodSDK are functions that run on every request befor
 \`\`\`tsx
 export default defineApp([
   setCommonHeaders(),
-  async ({ ctx, request, headers }) => {
+  async ({ ctx, request, response }) => {
     await setupDb(env);
     setupSessionStore(env);
     try {
@@ -44,12 +44,12 @@ export default defineApp([
       ctx.session = await sessions.load(request);
     } catch (error) {
       if (error instanceof ErrorResponse && error.code === 401) {
-        await sessions.remove(request, headers);
-        headers.set("Location", "/user/login");
+        await sessions.remove(request, response.headers);
+        response.headers.set("Location", "/user/login");
 
         return new Response(null, {
           status: 302,
-          headers,
+          headers: response.headers,
         });
       }
 

package/dist/runtime/entries/worker.d.ts

@@ -8,4 +8,3 @@ export * from "../requestInfo/types";
 export * from "../requestInfo/worker";
 export * from "../render/renderToString";
 export * from "../render/renderToStream";
-export * from "../imports/resolveSSRValue";

package/dist/runtime/entries/worker.js

@@ -8,4 +8,3 @@ export * from "../requestInfo/types";
 export * from "../requestInfo/worker";
 export * from "../render/renderToString";
 export * from "../render/renderToStream";
-export * from "../imports/resolveSSRValue";

package/dist/runtime/lib/auth/session.d.ts

@@ -35,10 +35,10 @@ export declare const defineSessionStore: <Session, SessionInputData>({ cookieNam
     unset: (sessionId: string) => Promise<void>;
 }) => {
     load: (request: Request) => Promise<Session | null>;
-    save: (headers: Headers, sessionInputData: SessionInputData, { maxAge }?: {
+    save: (responseHeaders: Headers, sessionInputData: SessionInputData, { maxAge }?: {
         maxAge?: number | true;
     }) => Promise<void>;
-    remove: (request: Request, headers: Headers) => Promise<void>;
+    remove: (request: Request, responseHeaders: Headers) => Promise<void>;
 };
 type SessionStoreFromDurableObject<SessionDurableObject> = SessionDurableObject extends DurableObjectMethods<infer Session, infer SessionInputData> ? SessionStore<Session, SessionInputData> : never;
 export declare const defineDurableSession: <SessionDurableObject extends DurableObjectMethods<any, any>>({ cookieName, createCookie, secretKey, sessionDurableObject, }: {

package/dist/runtime/lib/auth/session.js

@@ -89,17 +89,17 @@ export const defineSessionStore = ({ cookieName = "session_id", createCookie = c
             throw new ErrorResponse(401, "Invalid session id");
         }
     };
-    const save = async (headers, sessionInputData, { maxAge } = {}) => {
+    const save = async (responseHeaders, sessionInputData, { maxAge } = {}) => {
         const sessionId = await generateSessionId({ secretKey });
         await set(sessionId, sessionInputData);
-        headers.set("Set-Cookie", createCookie({ name: cookieName, sessionId, maxAge }));
+        responseHeaders.set("Set-Cookie", createCookie({ name: cookieName, sessionId, maxAge }));
     };
-    const remove = async (request, headers) => {
+    const remove = async (request, responseHeaders) => {
         const sessionId = getSessionIdFromCookie(request);
         if (sessionId) {
             await unset(sessionId);
         }
-        headers.set("Set-Cookie", createCookie({ name: cookieName, sessionId: "", maxAge: 0 }));
+        responseHeaders.set("Set-Cookie", createCookie({ name: cookieName, sessionId: "", maxAge: 0 }));
     };
     return {
         load,

package/dist/runtime/lib/router.test.js

@@ -64,7 +64,6 @@ describe("defineRoutes - Request Handling Behavior", () => {
             request: new Request("http://localhost:3000/"),
             params: {},
             ctx: {},
-            headers: new Headers(),
             rw: {
                 nonce: "test-nonce",
                 Document: () => React.createElement("html"),

package/dist/runtime/register/worker.js

@@ -9,6 +9,7 @@ export function registerServerReference(action, id, name) {
     // Note: We no longer need to register in a Map since we use virtual lookup
     return baseRegisterServerReference(action, id, name);
 }
+const isComponent = (target) => isValidElementType(target) && target?.toString().includes("jsx");
 export function registerClientReference(ssrModule, id, exportName) {
     const target = ssrModule[exportName] ?? {};
     if (isValidElementType(target)) {
@@ -31,7 +32,13 @@ export function registerClientReference(ssrModule, id, exportName) {
         }
         finalDescriptors.$$async = { value: true };
         finalDescriptors.$$isClientReference = { value: true };
-        return Object.defineProperties(() => null, finalDescriptors);
+        // context(justinvdm, 25 Sep 2025): We create a wrapper function to avoid
+        // getting the SSR component's property descriptors - otherwise
+        // this will take precedence over the client reference descriptors
+        const fn = typeof target === "function"
+            ? (...args) => target(...args)
+            : () => null;
+        return Object.defineProperties(fn, finalDescriptors);
     }
     // For non-components, return the target object directly for use in SSR.
     return target;

package/dist/runtime/requestInfo/types.d.ts

@@ -5,8 +5,6 @@ export interface RequestInfo<Params = any, AppContext = DefaultAppContext> {
     request: Request;
     params: Params;
     ctx: AppContext;
-    /** @deprecated: Use `response.headers` instead */
-    headers: Headers;
     rw: RwContext;
     cf: ExecutionContext;
     response: ResponseInit & {

package/dist/runtime/requestInfo/worker.js

@@ -2,15 +2,7 @@ import { AsyncLocalStorage } from "async_hooks";
 const requestInfoDeferred = Promise.withResolvers();
 const requestInfoStore = new AsyncLocalStorage();
 const requestInfoBase = {};
-const REQUEST_INFO_KEYS = [
-    "request",
-    "params",
-    "ctx",
-    "headers",
-    "rw",
-    "cf",
-    "response",
-];
+const REQUEST_INFO_KEYS = ["request", "params", "ctx", "rw", "cf", "response"];
 REQUEST_INFO_KEYS.forEach((key) => {
     Object.defineProperty(requestInfoBase, key, {
         enumerable: true,

package/dist/runtime/worker.js

@@ -36,7 +36,6 @@ export const defineApp = (routes) => {
                 const isRSCRequest = url.searchParams.has("__rsc") ||
                     request.headers.get("accept")?.includes("text/x-component");
                 const isAction = url.searchParams.has("__rsc_action_id");
-                const userHeaders = new Headers();
                 const rw = {
                     Document: DefaultDocument,
                     nonce: generateNonce(),
@@ -52,7 +51,6 @@ export const defineApp = (routes) => {
                 };
                 const outerRequestInfo = {
                     request,
-                    headers: userHeaders,
                     cf,
                     params: {},
                     ctx: {},
@@ -144,12 +142,6 @@ export const defineApp = (routes) => {
                 // context(justinvdm, 18 Mar 2025): In some cases, such as a .fetch() call to a durable object instance, or Response.redirect(),
                 // we need to return a mutable response object.
                 const mutableResponse = new Response(response.body, response);
-                // Merge user headers from the legacy headers object
-                for (const [key, value] of userHeaders.entries()) {
-                    if (!response.headers.has(key)) {
-                        mutableResponse.headers.set(key, value);
-                    }
-                }
                 // Merge headers from user response init (these take precedence)
                 if (userResponseInit.headers) {
                     const userResponseHeaders = new Headers(userResponseInit.headers);

package/dist/vite/directiveModulesDevPlugin.mjs

@@ -84,7 +84,7 @@ export const directiveModulesDevPlugin = ({ clientFiles, serverFiles, projectRoo
                 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);
-                if (envName === "client") {
+                if (envName === "client" || envName === "ssr") {
                     entries.push(APP_CLIENT_BARREL_PATH);
                 }
                 else if (envName === "worker") {

package/dist/vite/runDirectivesScan.d.mts

@@ -17,11 +17,12 @@ export declare function classifyModule({ contents, inheritedEnv, }: {
     isClient: boolean;
     isServer: boolean;
 };
+export type EsbuildLoader = "js" | "jsx" | "ts" | "tsx" | "default";
 export declare const runDirectivesScan: ({ rootConfig, environments, clientFiles, serverFiles, entries: initialEntries, }: {
     rootConfig: ResolvedConfig;
     environments: Record<string, Environment>;
     clientFiles: Set<string>;
     serverFiles: Set<string>;
-    entries: string[];
+    entries?: string[];
 }) => Promise<void>;
 export {};

package/dist/vite/runDirectivesScan.mjs

@@ -7,6 +7,7 @@ import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
 import { INTERMEDIATES_OUTPUT_DIR } from "../lib/constants.mjs";
 import { externalModules } from "./constants.mjs";
 import { createViteAwareResolver } from "./createViteAwareResolver.mjs";
+import { compile } from "@mdx-js/mdx";
 const log = debug("rwsdk:vite:run-directives-scan");
 // Copied from Vite's source code.
 // https://github.com/vitejs/vite/blob/main/packages/vite/src/shared/utils.ts
@@ -50,7 +51,7 @@ export function classifyModule({ contents, inheritedEnv, }) {
     return { moduleEnv, isClient, isServer };
 }
 export const runDirectivesScan = async ({ rootConfig, environments, clientFiles, serverFiles, entries: initialEntries, }) => {
-    console.log("\n🔍 Scanning for 'use client' and 'use server' directives...");
+    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 {
@@ -94,7 +95,7 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
             setup(build) {
                 // Match Vite's behavior by externalizing assets and special queries.
                 // This prevents esbuild from trying to bundle them, which would fail.
-                const scriptFilter = /\.(c|m)?[jt]sx?$/;
+                const scriptFilter = /\.(c|m)?[jt]sx?$|\.mdx$/;
                 const specialQueryFilter = /[?&](?:url|raw|worker|sharedworker|inline)\b/;
                 // This regex is used to identify if a path has any file extension.
                 const hasExtensionRegex = /\.[^/]+$/;
@@ -162,7 +163,7 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
                     log("Marking as external:", args.path, "resolved to:", resolvedPath);
                     return { external: true };
                 });
-                build.onLoad({ filter: /\.(m|c)?[jt]sx?$/ }, async (args) => {
+                build.onLoad({ filter: /\.(m|c)?[jt]sx?$|\.mdx$/ }, async (args) => {
                     log("onLoad called for:", args.path);
                     if (!args.path.startsWith("/") ||
                         args.path.includes("virtual:") ||
@@ -175,10 +176,10 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
                         return null;
                     }
                     try {
-                        const contents = await readFileWithCache(args.path);
+                        const originalContents = await readFileWithCache(args.path);
                         const inheritedEnv = args.pluginData?.inheritedEnv || "worker";
                         const { moduleEnv, isClient, isServer } = classifyModule({
-                            contents,
+                            contents: originalContents,
                             inheritedEnv,
                         });
                         // Store the definitive environment for this module, so it can be used when it becomes an importer.
@@ -194,7 +195,33 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
                             log("Discovered 'use server' in:", realPath);
                             serverFiles.add(normalizeModulePath(realPath, rootConfig.root));
                         }
-                        return { contents, loader: "default" };
+                        let code;
+                        let loader;
+                        if (args.path.endsWith(".mdx")) {
+                            const result = await compile(originalContents, {
+                                jsx: true,
+                                jsxImportSource: "react",
+                            });
+                            code = String(result.value);
+                            loader = "tsx";
+                        }
+                        else if (/\.(m|c)?tsx$/.test(args.path)) {
+                            code = originalContents;
+                            loader = "tsx";
+                        }
+                        else if (/\.(m|c)?ts$/.test(args.path)) {
+                            code = originalContents;
+                            loader = "ts";
+                        }
+                        else if (/\.(m|c)?jsx$/.test(args.path)) {
+                            code = originalContents;
+                            loader = "jsx";
+                        }
+                        else {
+                            code = originalContents;
+                            loader = "js";
+                        }
+                        return { contents: code, loader };
                     }
                     catch (e) {
                         log("Could not read file during scan, skipping:", args.path, e);
@@ -220,8 +247,13 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
     finally {
         // Always clear the scanning flag when done
         delete process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE;
-        console.log("✅ Scan complete.");
+        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));
     }
 };
+const deferredLog = (message) => {
+    setTimeout(() => {
+        console.log(message);
+    }, 500);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "1.0.0-alpha.11",
+  "version": "1.0.0-alpha.13",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {
@@ -134,6 +134,7 @@
   "dependencies": {
     "@ast-grep/napi": "^0.38.5",
     "@cloudflare/workers-types": "^4.20250407.0",
+    "@mdx-js/mdx": "^3.1.1",
     "@puppeteer/browsers": "^2.8.0",
     "@types/fs-extra": "^11.0.4",
     "@types/react": "^19.1.2",

package/dist/runtime/imports/resolveSSRValue.d.ts

@@ -1 +0,0 @@
-export declare const resolveSSRValue: <Value>(clientReference: Value) => Promise<Value>;

package/dist/runtime/imports/resolveSSRValue.js

@@ -1,8 +0,0 @@
-import { ssrGetModuleExport } from "rwsdk/__ssr_bridge";
-export const resolveSSRValue = (clientReference) => {
-    const id = clientReference.__rwsdk_clientReferenceId;
-    if (!id) {
-        throw new Error("RWSDK: Client reference is not a client reference");
-    }
-    return ssrGetModuleExport(id);
-};