rwsdk 1.0.0-beta.16 → 1.0.0-beta.18

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

@@ -1,3 +1,4 @@
 import "./types/shared";
 export * from "../lib/links";
 export * from "../lib/router";
+export type { DocumentProps, LayoutProps } from "../lib/types";

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.16",
+  "version": "1.0.0-beta.18",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {