rwsdk 1.0.0-beta.4 → 1.0.0-beta.6

package/dist/runtime/client/client.d.ts

@@ -1,6 +1,7 @@
 import "./setWebpackRequire";
 export { default as React } from "react";
 export { ClientOnly } from "./ClientOnly.js";
+export { initClientNavigation, navigate } from "./navigation.js";
 import type { HydrationOptions, Transport } from "./types";
 export declare const fetchTransport: Transport;
 export declare const initClient: ({ transport, hydrateRootOptions, handleResponse, }?: {

package/dist/runtime/client/client.js

@@ -11,6 +11,7 @@ import { createFromFetch, createFromReadableStream, encodeReply, } from "react-s
 import { rscStream } from "rsc-html-stream/client";
 export { default as React } from "react";
 export { ClientOnly } from "./ClientOnly.js";
+export { initClientNavigation, navigate } from "./navigation.js";
 export const fetchTransport = (transportContext) => {
     const fetchCallServer = async (id, args) => {
         const url = new URL(window.location.href);

package/dist/runtime/client/navigation.d.ts

@@ -4,6 +4,14 @@ export interface ClientNavigationOptions {
     scrollBehavior?: "auto" | "smooth" | "instant";
 }
 export declare function validateClickEvent(event: MouseEvent, target: HTMLElement): boolean;
+export interface NavigateOptions {
+    history?: "push" | "replace";
+    info?: {
+        scrollToTop?: boolean;
+        scrollBehavior?: "auto" | "smooth" | "instant";
+    };
+}
+export declare function navigate(href: string, options?: NavigateOptions): Promise<void>;
 export declare function initClientNavigation(opts?: ClientNavigationOptions): {
     handleResponse: (response: Response) => boolean;
 };

package/dist/runtime/client/navigation.js

@@ -1,10 +1,3 @@
-function saveScrollPosition(x, y) {
-    window.history.replaceState({
-        ...window.history.state,
-        scrollX: x,
-        scrollY: y,
-    }, "", window.location.href);
-}
 export function validateClickEvent(event, target) {
     // should this only work for left click?
     if (event.button !== 0) {
@@ -37,19 +30,43 @@ export function validateClickEvent(event, target) {
     }
     return true;
 }
+let IS_CLIENT_NAVIGATION = false;
+export async function navigate(href, options = { history: "push" }) {
+    if (!IS_CLIENT_NAVIGATION) {
+        window.location.href = href;
+        return;
+    }
+    saveScrollPosition(window.scrollX, window.scrollY);
+    const url = window.location.origin + href;
+    if (options.history === "push") {
+        window.history.pushState({ path: href }, "", url);
+    }
+    else {
+        window.history.replaceState({ path: href }, "", url);
+    }
+    await globalThis.__rsc_callServer;
+    const scrollToTop = options.info?.scrollToTop ?? true;
+    const scrollBehavior = options.info?.scrollBehavior ?? "instant";
+    if (scrollToTop && history.scrollRestoration === "auto") {
+        window.scrollTo({
+            top: 0,
+            left: 0,
+            behavior: scrollBehavior,
+        });
+        saveScrollPosition(0, 0);
+    }
+}
+function saveScrollPosition(x, y) {
+    window.history.replaceState({
+        ...window.history.state,
+        scrollX: x,
+        scrollY: y,
+    }, "", window.location.href);
+}
 export function initClientNavigation(opts = {}) {
-    const options = {
-        onNavigate: async function onNavigate() {
-            // @ts-expect-error
-            await globalThis.__rsc_callServer();
-        },
-        scrollToTop: true,
-        scrollBehavior: "instant",
-        ...opts,
-    };
+    IS_CLIENT_NAVIGATION = true;
     history.scrollRestoration = "auto";
     document.addEventListener("click", async function handleClickEvent(event) {
-        // Prevent default navigation
         if (!validateClickEvent(event, event.target)) {
             return;
         }
@@ -57,28 +74,18 @@ export function initClientNavigation(opts = {}) {
         const el = event.target;
         const a = el.closest("a");
         const href = a?.getAttribute("href");
-        saveScrollPosition(window.scrollX, window.scrollY);
-        window.history.pushState({ path: href }, "", window.location.origin + href);
-        await options.onNavigate();
-        if (options.scrollToTop && history.scrollRestoration === "auto") {
-            window.scrollTo({
-                top: 0,
-                left: 0,
-                behavior: options.scrollBehavior,
-            });
-            saveScrollPosition(0, 0);
-        }
-        history.scrollRestoration = "auto";
+        navigate(href);
     }, true);
     window.addEventListener("popstate", async function handlePopState() {
-        saveScrollPosition(window.scrollX, window.scrollY);
-        await options.onNavigate();
+        // @ts-expect-error
+        await globalThis.__rsc_callServer();
     });
     // Return a handleResponse function for use with initClient
     return {
         handleResponse: function handleResponse(response) {
             if (!response.ok) {
                 // Redirect to the current page (window.location) to show the error
+                // This means the page that produced the error is called twice.
                 window.location.href = window.location.href;
                 return false;
             }

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

@@ -1,2 +1,3 @@
 import "./types/ssr";
 export * from "../lib/streams/consumeEventStream";
+export declare const navigate: () => void;

package/dist/runtime/entries/clientSSR.js

@@ -1,2 +1,5 @@
 import "./types/ssr";
 export * from "../lib/streams/consumeEventStream";
+export const navigate = () => {
+    /* stub */
+};

package/dist/runtime/lib/manifest.d.ts

@@ -8,4 +8,4 @@ export interface ManifestChunk {
     css?: string[];
     assets?: string[];
 }
-export declare const getManifest: () => Promise<Manifest>;
+export declare function getManifest(): Promise<Manifest>;

package/dist/runtime/lib/manifest.js

@@ -1,14 +1,17 @@
 let manifest;
-export const getManifest = async () => {
+export async function getManifest() {
     if (manifest) {
         return manifest;
     }
     if (import.meta.env.VITE_IS_DEV_SERVER) {
+        // In dev, there's no manifest, so we can use an empty object.
         manifest = {};
     }
     else {
-        const { default: prodManifest } = await import("virtual:rwsdk:manifest.js");
-        manifest = prodManifest;
+        // context(justinvdm, 2 Oct 2025): In production, the manifest is a
+        // placeholder string that will be replaced by the linker plugin with the
+        // actual manifest JSON object.
+        manifest = "__RWSDK_MANIFEST_PLACEHOLDER__";
     }
     return manifest;
-};
+}

package/dist/vite/buildApp.mjs

@@ -1,4 +1,5 @@
 import debug from "debug";
+import { rm } from "node:fs/promises";
 import { resolve } from "node:path";
 import { runDirectivesScan } from "./runDirectivesScan.mjs";
 const log = debug("rwsdk:vite:build-app");
@@ -10,6 +11,7 @@ const log = debug("rwsdk:vite:build-app");
  * @see docs/architecture/productionBuildProcess.md
  */
 export async function buildApp({ builder, clientEntryPoints, clientFiles, serverFiles, projectRootDir, workerEntryPathname, }) {
+    await rm(resolve(projectRootDir, "dist"), { recursive: true, force: true });
     const workerEnv = builder.environments.worker;
     await runDirectivesScan({
         rootConfig: builder.config,

package/dist/vite/linkerPlugin.mjs

@@ -9,7 +9,7 @@ export function linkWorkerBundle({ code, manifestContent, projectRootDir, }) {
     const manifest = JSON.parse(manifestContent);
     // 1. Replace the manifest placeholder with the actual manifest content.
     log("Injecting manifest into worker bundle");
-    newCode = newCode.replace('"__RWSDK_MANIFEST_PLACEHOLDER__"', manifestContent);
+    newCode = newCode.replace(/['"]__RWSDK_MANIFEST_PLACEHOLDER__['"]/, manifestContent);
     // 2. Replace asset placeholders with their final hashed paths.
     log("Replacing asset placeholders in final worker bundle");
     for (const [key, value] of Object.entries(manifest)) {

package/dist/vite/redwoodPlugin.mjs

@@ -18,7 +18,6 @@ import { directivesPlugin } from "./directivesPlugin.mjs";
 import { injectVitePreamble } from "./injectVitePreamblePlugin.mjs";
 import { knownDepsResolverPlugin } from "./knownDepsResolverPlugin.mjs";
 import { linkerPlugin } from "./linkerPlugin.mjs";
-import { manifestPlugin } from "./manifestPlugin.mjs";
 import { miniflareHMRPlugin } from "./miniflareHMRPlugin.mjs";
 import { moveStaticAssetsPlugin } from "./moveStaticAssetsPlugin.mjs";
 import { prismaPlugin } from "./prismaPlugin.mjs";
@@ -144,9 +143,6 @@ export const redwoodPlugin = async (options = {}) => {
             clientEntryPoints,
             projectRootDir,
         }),
-        manifestPlugin({
-            projectRootDir,
-        }),
         moveStaticAssetsPlugin({ rootDir: projectRootDir }),
         prismaPlugin({ projectRootDir }),
         linkerPlugin({ projectRootDir }),

package/package.json

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

package/dist/vite/manifestPlugin.d.mts

@@ -1,4 +0,0 @@
-import { type Plugin } from "vite";
-export declare const manifestPlugin: ({ projectRootDir, }: {
-    projectRootDir: string;
-}) => Plugin;

package/dist/vite/manifestPlugin.mjs

@@ -1,63 +0,0 @@
-import debug from "debug";
-const log = debug("rwsdk:vite:manifest-plugin");
-const virtualModuleId = "virtual:rwsdk:manifest.js";
-const resolvedVirtualModuleId = "\0" + virtualModuleId;
-export const manifestPlugin = ({ projectRootDir, }) => {
-    let isBuild = false;
-    return {
-        name: "rwsdk:vite:manifest-plugin",
-        enforce: "pre",
-        configResolved(config) {
-            isBuild = config.command === "build";
-        },
-        resolveId(id) {
-            // Skip during directive scanning to avoid performance issues
-            if (process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE) {
-                return;
-            }
-            if (id === virtualModuleId) {
-                return resolvedVirtualModuleId;
-            }
-        },
-        async load(id) {
-            // Skip during directive scanning to avoid performance issues
-            if (process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE) {
-                return;
-            }
-            if (id === resolvedVirtualModuleId) {
-                if (isBuild) {
-                    // context(justinvdm, 28 Aug 2025): During the build, we don't have
-                    // the manifest yet. We insert a placeholder that the linker plugin
-                    // will replace in the final phase.
-                    log("Returning manifest placeholder for build");
-                    return `export default "__RWSDK_MANIFEST_PLACEHOLDER__"`;
-                }
-                // In dev, we can return an empty object.
-                log("Not a build, returning empty manifest");
-                return `export default {}`;
-            }
-        },
-        configEnvironment(name, config) {
-            if (name !== "worker" && name !== "ssr") {
-                return;
-            }
-            log("Configuring environment: name=%s", name);
-            config.optimizeDeps ??= {};
-            config.optimizeDeps.esbuildOptions ??= {};
-            config.optimizeDeps.esbuildOptions.plugins ??= [];
-            config.optimizeDeps.esbuildOptions.plugins.push({
-                name: "rwsdk:manifest:esbuild",
-                setup(build) {
-                    log("Setting up esbuild plugin for environment: %s", name);
-                    build.onResolve({ filter: /^virtual:rwsdk:manifest\.js$/ }, () => {
-                        log("Resolving virtual manifest module in esbuild");
-                        return {
-                            path: "virtual:rwsdk:manifest.js",
-                            external: true,
-                        };
-                    });
-                },
-            });
-        },
-    };
-};