rwsdk 1.0.0-beta.17 → 1.0.0-beta.19

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

@@ -6,6 +6,7 @@ export * from "../register/worker";
 export * from "../render/renderToStream";
 export * from "../render/renderToString";
 export * from "../requestInfo/types";
+export * from "../requestInfo/utils";
 export * from "../requestInfo/worker";
 export * from "../script";
 export * from "../worker";

package/dist/runtime/entries/worker.js

@@ -6,6 +6,7 @@ export * from "../register/worker";
 export * from "../render/renderToStream";
 export * from "../render/renderToString";
 export * from "../requestInfo/types";
+export * from "../requestInfo/utils";
 export * from "../requestInfo/worker";
 export * from "../script";
 export * from "../worker";

package/dist/runtime/render/renderToStream.d.ts

@@ -1,10 +1,12 @@
 import { FC, ReactElement } from "react";
 import { DocumentProps } from "../lib/types.js";
+import { type PartialRequestInfo } from "../requestInfo/types";
 export interface RenderToStreamOptions {
     Document?: FC<DocumentProps>;
     ssr?: boolean;
     injectRSCPayload?: boolean;
     onError?: (error: unknown) => void;
+    requestInfo?: PartialRequestInfo;
 }
 export declare const IdentityDocument: FC<DocumentProps>;
-export declare const renderToStream: (element: ReactElement, { ssr: shouldSSR, Document, injectRSCPayload: shouldInjectRSCPayload, onError, }?: RenderToStreamOptions) => Promise<ReadableStream>;
+export declare const renderToStream: (element: ReactElement, { ssr: shouldSSR, Document, injectRSCPayload: shouldInjectRSCPayload, requestInfo: givenRequestInfo, onError, }?: RenderToStreamOptions) => Promise<ReadableStream>;

package/dist/runtime/render/renderToStream.js

@@ -1,10 +1,29 @@
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { injectRSCPayload } from "rsc-html-stream/server";
-import { requestInfo } from "../requestInfo/worker";
+import { constructWithDefaultRequestInfo } from "../requestInfo/utils";
+import { getRequestInfo } 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, onError = () => { }, } = {}) => {
+export const renderToStream = async (element, { ssr: shouldSSR = true, Document = IdentityDocument, injectRSCPayload: shouldInjectRSCPayload = true, requestInfo: givenRequestInfo, onError = () => { }, } = {}) => {
+    // Try to get the context requestInfo from the async store.
+    let contextRequestInfo;
+    try {
+        contextRequestInfo = getRequestInfo();
+    }
+    catch (e) {
+        // No requestInfo detected from store.
+    }
+    // Construct requestInfo with defaults where overrides take precedence.
+    // If provided, `givenRequestInfo` will override values from context requestInfo if it exists
+    const requestInfo = constructWithDefaultRequestInfo({
+        ...contextRequestInfo,
+        ...givenRequestInfo,
+        rw: {
+            ...contextRequestInfo?.rw,
+            ...givenRequestInfo?.rw,
+        },
+    });
     let rscStream = renderToRscStream({
         input: {
             node: element,

package/dist/runtime/render/renderToString.d.ts

@@ -1,7 +1,9 @@
 import { FC, ReactElement } from "react";
 import { DocumentProps } from "../lib/types.js";
+import { type PartialRequestInfo } from "../requestInfo/types";
 export interface RenderToStringOptions {
     Document?: FC<DocumentProps>;
     injectRSCPayload?: boolean;
+    requestInfo?: PartialRequestInfo;
 }
 export declare const renderToString: (element: ReactElement, options?: RenderToStringOptions) => Promise<string>;

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

@@ -12,3 +12,6 @@ export interface RequestInfo<Params = any, AppContext = DefaultAppContext> {
     };
     isAction: boolean;
 }
+export type PartialRequestInfo<Params = any, AppContext = DefaultAppContext> = Omit<Partial<RequestInfo<Params, AppContext>>, "rw"> & {
+    rw?: Partial<RwContext>;
+};

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

@@ -0,0 +1,9 @@
+import { FC } from "react";
+import { type DocumentProps } from "../lib/types";
+import { type PartialRequestInfo, type RequestInfo } from "./types";
+export declare const DefaultRequestInfoDocument: FC<DocumentProps>;
+/**
+ * Constructs a generic requestInfo that can be used as defaults.
+ * Allows for passing in overrides to initialize with defaults.
+ */
+export declare const constructWithDefaultRequestInfo: (overrides?: PartialRequestInfo) => RequestInfo;

package/dist/runtime/requestInfo/utils.js

@@ -0,0 +1,44 @@
+import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+import { generateNonce } from "../lib/utils";
+export const DefaultRequestInfoDocument = ({ children }) => (_jsx(_Fragment, { children: children }));
+/**
+ * Constructs a generic requestInfo that can be used as defaults.
+ * Allows for passing in overrides to initialize with defaults.
+ */
+export const constructWithDefaultRequestInfo = (overrides = {}) => {
+    const { rw: rwOverrides, ...otherRequestInfoOverrides } = overrides;
+    const defaultRequestInfo = {
+        request: new Request("http://localhost/"),
+        params: {},
+        ctx: {},
+        cf: {
+            waitUntil: () => { },
+            passThroughOnException: () => { },
+            props: {},
+        },
+        response: {
+            status: 200,
+            headers: new Headers(),
+        },
+        isAction: false,
+        rw: {
+            Document: DefaultRequestInfoDocument,
+            nonce: generateNonce(),
+            rscPayload: true,
+            ssr: true,
+            databases: new Map(),
+            scriptsToBeLoaded: new Set(),
+            entryScripts: new Set(),
+            inlineScripts: new Set(),
+            pageRouteResolved: undefined,
+        },
+    };
+    return {
+        ...defaultRequestInfo,
+        ...otherRequestInfoOverrides,
+        rw: {
+            ...defaultRequestInfo.rw,
+            ...rwOverrides,
+        },
+    };
+};

package/dist/vite/linkerPlugin.d.mts

@@ -1,8 +1,9 @@
 import type { Plugin } from "vite";
-export declare function linkWorkerBundle({ code, manifestContent, projectRootDir, }: {
+export declare function linkWorkerBundle({ code, manifestContent, projectRootDir, base, }: {
     code: string;
     manifestContent: string;
     projectRootDir: string;
+    base?: string;
 }): {
     code: string;
     map: null;

package/dist/vite/linkerPlugin.mjs

@@ -4,7 +4,7 @@ import path from "node:path";
 import { CLIENT_MANIFEST_RELATIVE_PATH } from "../lib/constants.mjs";
 import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
 const log = debug("rwsdk:vite:linker-plugin");
-export function linkWorkerBundle({ code, manifestContent, projectRootDir, }) {
+export function linkWorkerBundle({ code, manifestContent, projectRootDir, base, }) {
     let newCode = code;
     const manifest = JSON.parse(manifestContent);
     // 1. Replace the manifest placeholder with the actual manifest content.
@@ -16,7 +16,10 @@ export function linkWorkerBundle({ code, manifestContent, projectRootDir, }) {
         const normalizedKey = normalizeModulePath(key, projectRootDir, {
             isViteStyle: false,
         });
-        newCode = newCode.replaceAll(`rwsdk_asset:${normalizedKey}`, `/${value.file}`);
+        // If base is provided, prepend it with the final hashed path.
+        // Base is assumed to have a trailing "/".
+        const assetPath = (base ? base : "/") + value.file;
+        newCode = newCode.replaceAll(`rwsdk_asset:${normalizedKey}`, assetPath);
     }
     // 3. Deprefix any remaining placeholders that were not in the manifest.
     // This handles public assets that don't go through the bundler.
@@ -28,8 +31,12 @@ export function linkWorkerBundle({ code, manifestContent, projectRootDir, }) {
     };
 }
 export const linkerPlugin = ({ projectRootDir, }) => {
+    let config;
     return {
         name: "rwsdk:linker",
+        configResolved(resolvedConfig) {
+            config = resolvedConfig;
+        },
         async renderChunk(code) {
             if (this.environment.name !== "worker" ||
                 process.env.RWSDK_BUILD_PASS !== "linker") {
@@ -41,6 +48,7 @@ export const linkerPlugin = ({ projectRootDir, }) => {
                 code,
                 manifestContent,
                 projectRootDir,
+                base: config.base,
             });
             log("Final worker chunk rendered");
             return result;

package/dist/vite/linkerPlugin.test.mjs

@@ -29,6 +29,21 @@ describe("linkWorkerBundle", () => {
         expect(result.code).toContain(`const stylesheet = "/assets/styles.123.css";`);
         expect(result.code).toContain(`const logo = "/assets/logo.abc.svg";`);
     });
+    it("should replace asset placeholder with a base + hashed paths from the manifest if base is provided", () => {
+        const code = `
+      const stylesheet = "rwsdk_asset:/src/styles.css";
+      const logo = "rwsdk_asset:/src/logo.svg";
+    `;
+        const base = "/base/";
+        const result = linkWorkerBundle({
+            code,
+            manifestContent,
+            projectRootDir,
+            base,
+        });
+        expect(result.code).toContain(`const stylesheet = "/base/assets/styles.123.css";`);
+        expect(result.code).toContain(`const logo = "/base/assets/logo.abc.svg";`);
+    });
     it("should deprefix remaining asset placeholders not in the manifest", () => {
         const code = `const publicImg = "rwsdk_asset:/images/photo.jpg";`;
         const result = linkWorkerBundle({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "1.0.0-beta.17",
+  "version": "1.0.0-beta.19",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {