rwsdk 1.0.0-beta.21 → 1.0.0-beta.22

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

@@ -0,0 +1 @@
+export { defineLinks } from "../lib/links.js";

package/dist/runtime/entries/routerClient.js

@@ -0,0 +1 @@
+export { defineLinks } from "../lib/links.js";

package/dist/runtime/render/renderToStream.js

@@ -1,11 +1,15 @@
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { injectRSCPayload } from "rsc-html-stream/server";
+import { ssrWebpackRequire } from "../imports/worker.js";
 import { constructWithDefaultRequestInfo } from "../requestInfo/utils";
-import { getRequestInfo } from "../requestInfo/worker";
+import { getRequestInfo, runWithRequestInfo } from "../requestInfo/worker";
 import { renderDocumentHtmlStream } from "./renderDocumentHtmlStream";
 import { renderToRscStream } from "./renderToRscStream";
 export const IdentityDocument = ({ children }) => (_jsx(_Fragment, { children: children }));
 export const renderToStream = async (element, { ssr: shouldSSR = true, Document = IdentityDocument, injectRSCPayload: shouldInjectRSCPayload = true, requestInfo: givenRequestInfo, onError = () => { }, } = {}) => {
+    if (!globalThis.__webpack_require__) {
+        globalThis.__webpack_require__ = ssrWebpackRequire;
+    }
     // Try to get the context requestInfo from the async store.
     let contextRequestInfo;
     try {
@@ -24,30 +28,36 @@ export const renderToStream = async (element, { ssr: shouldSSR = true, Document
             ...givenRequestInfo?.rw,
         },
     });
-    let rscStream = renderToRscStream({
-        input: {
-            node: element,
-            actionResult: undefined,
-        },
-        onError,
-    });
-    let injectRSCStream;
-    if (shouldInjectRSCPayload) {
-        const [rscPayloadStream1, rscPayloadStream2] = rscStream.tee();
-        rscStream = rscPayloadStream1;
-        injectRSCStream = injectRSCPayload(rscPayloadStream2, {
-            nonce: requestInfo.rw.nonce,
+    // context(gching, 2025-10-29): We wrap the following with context to the requestInfo
+    // due to `ssrWebpackRequire` needing to reference the `requestInfo` in context.
+    // Therefore, we need to wrap + also pass in the requestInfo in their independent
+    // function calls
+    return runWithRequestInfo(requestInfo, async () => {
+        let rscStream = renderToRscStream({
+            input: {
+                node: element,
+                actionResult: undefined,
+            },
+            onError,
         });
-    }
-    let htmlStream = await renderDocumentHtmlStream({
-        rscPayloadStream: rscStream,
-        Document,
-        requestInfo,
-        shouldSSR,
-        onError,
+        let injectRSCStream;
+        if (shouldInjectRSCPayload) {
+            const [rscPayloadStream1, rscPayloadStream2] = rscStream.tee();
+            rscStream = rscPayloadStream1;
+            injectRSCStream = injectRSCPayload(rscPayloadStream2, {
+                nonce: requestInfo.rw.nonce,
+            });
+        }
+        let htmlStream = await renderDocumentHtmlStream({
+            rscPayloadStream: rscStream,
+            Document,
+            requestInfo,
+            shouldSSR,
+            onError,
+        });
+        if (injectRSCStream) {
+            htmlStream = htmlStream.pipeThrough(injectRSCStream);
+        }
+        return htmlStream;
     });
-    if (injectRSCStream) {
-        htmlStream = htmlStream.pipeThrough(injectRSCStream);
-    }
-    return htmlStream;
 };

package/dist/vite/configPlugin.mjs

@@ -93,6 +93,7 @@ export const configPlugin = ({ silent, projectRootDir, workerEntryPathname, clie
                             "rwsdk/constants",
                             "rwsdk/debug",
                             "rwsdk/realtime/client",
+                            "rwsdk/router",
                             "rwsdk/turnstile",
                         ],
                         entries: [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "1.0.0-beta.21",
+  "version": "1.0.0-beta.22",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {
@@ -58,7 +58,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",