rwsdk 1.0.0-beta.1 → 1.0.0-beta.11

package/dist/runtime/client/client.js

@@ -4,6 +4,7 @@ import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 // context(justinvdm, 14 Aug 2025): `react-server-dom-webpack` uses this global
 // to load modules, so we need to define it here before importing
 // "react-server-dom-webpack."
+// prettier-ignore
 import "./setWebpackRequire";
 import React from "react";
 import { hydrateRoot } from "react-dom/client";
@@ -11,6 +12,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,44 @@ 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);
+    }
+    // @ts-expect-error
+    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 +75,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/db/createDb.d.ts

@@ -1,3 +1,2 @@
 import { Kysely } from "kysely";
-import { type SqliteDurableObject } from "./index.js";
-export declare function createDb<T>(durableObjectBinding: DurableObjectNamespace<SqliteDurableObject>, name?: string): Kysely<T>;
+export declare function createDb<DatabaseType>(durableObjectBinding: DurableObjectNamespace<any>, name?: string): Kysely<DatabaseType>;

package/dist/runtime/lib/db/createDb.js

@@ -5,6 +5,10 @@ export function createDb(durableObjectBinding, name = "main") {
         dialect: new DOWorkerDialect({
             kyselyExecuteQuery: (...args) => {
                 const durableObjectId = durableObjectBinding.idFromName(name);
+                // context(justinvdm, 2 Oct 2025): First prize would be a type parameter
+                // for the durable object and then use it for `durableObjectBinding`'s
+                // type, rather than casting like this. However, that would prevent
+                // users from being able to do createDb<InferredDbType> then though.
                 const stub = durableObjectBinding.get(durableObjectId);
                 stub.initialize();
                 return stub.kyselyExecuteQuery(...args);

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/runtime/lib/realtime/client.js

@@ -1,7 +1,13 @@
-import { createFromReadableStream } from "react-server-dom-webpack/client.browser";
+// context(justinvdm, 14 Aug 2025): `react-server-dom-webpack` uses this globa ___webpack_require__ global,
+// so we need to import our client entry point (which sets it), before importing
+// prettier-ignore
 import { initClient } from "../../client/client";
-import { packMessage, unpackMessage, } from "./protocol";
+// prettier-ignore
+import { createFromReadableStream } from "react-server-dom-webpack/client.browser";
+// prettier-ignore
 import { MESSAGE_TYPE } from "./shared";
+// prettier-ignore
+import { packMessage, unpackMessage, } from "./protocol";
 const DEFAULT_KEY = "default";
 export const initRealtimeClient = ({ key = DEFAULT_KEY, handleResponse, } = {}) => {
     const transport = realtimeTransport({ key, handleResponse });

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

@@ -1,24 +1,6 @@
-import type { Kysely } from "kysely";
 import React from "react";
 import { RequestInfo } from "../requestInfo/types";
-export type DocumentProps<T extends RequestInfo = RequestInfo> = T & {
-    children: React.ReactNode;
-};
-export type LayoutProps<T extends RequestInfo = RequestInfo> = {
-    children?: React.ReactNode;
-    requestInfo?: T;
-};
-export type RwContext = {
-    nonce: string;
-    Document: React.FC<DocumentProps<any>>;
-    rscPayload: boolean;
-    ssr: boolean;
-    layouts?: React.FC<LayoutProps<any>>[];
-    databases: Map<string, Kysely<any>>;
-    scriptsToBeLoaded: Set<string>;
-    pageRouteResolved: PromiseWithResolvers<void> | undefined;
-    actionResult?: unknown;
-};
+import type { DocumentProps, LayoutProps } from "./types.js";
 export type RouteMiddleware<T extends RequestInfo = RequestInfo> = (requestInfo: T) => MaybePromise<React.JSX.Element | Response | void>;
 type RouteFunction<T extends RequestInfo = RequestInfo> = (requestInfo: T) => MaybePromise<Response>;
 type MaybePromise<T> = T | Promise<T>;

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

@@ -71,6 +71,8 @@ describe("defineRoutes - Request Handling Behavior", () => {
                 ssr: true,
                 databases: new Map(),
                 scriptsToBeLoaded: new Set(),
+                entryScripts: new Set(),
+                inlineScripts: new Set(),
                 pageRouteResolved: undefined,
             },
             cf: {},

package/dist/runtime/lib/{rwContext.d.ts → types.d.ts}

@@ -1,4 +1,5 @@
 import { type Kysely } from "kysely";
+import React from "react";
 import { type RequestInfo } from "../requestInfo/types.js";
 export type RwContext = {
     nonce: string;

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

@@ -1,4 +1,4 @@
-import { type DocumentProps } from "../lib/router.js";
+import { type DocumentProps } from "../lib/types.js";
 import { type RequestInfo } from "../requestInfo/types.js";
 export declare const renderDocumentHtmlStream: ({ rscPayloadStream, Document, requestInfo, shouldSSR, onError, }: {
     rscPayloadStream: ReadableStream;

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

@@ -1,5 +1,5 @@
 import { FC, ReactElement } from "react";
-import { DocumentProps } from "../lib/router";
+import { DocumentProps } from "../lib/types.js";
 export interface RenderToStreamOptions {
     Document?: FC<DocumentProps>;
     ssr?: boolean;

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

@@ -1,5 +1,5 @@
 import { FC, ReactElement } from "react";
-import { DocumentProps } from "../lib/router";
+import { DocumentProps } from "../lib/types.js";
 export interface RenderToStringOptions {
     Document?: FC<DocumentProps>;
     injectRSCPayload?: boolean;

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

@@ -1,4 +1,4 @@
-import { RwContext } from "../lib/router";
+import { RwContext } from "../lib/types.js";
 export interface DefaultAppContext {
 }
 export interface RequestInfo<Params = any, AppContext = DefaultAppContext> {

package/dist/runtime/script.d.ts

@@ -1,5 +1,3 @@
 export declare const defineScript: (fn: ({ env }: {
     env: Env;
-}) => Promise<unknown>) => {
-    fetch: (request: Request, env: Env, cf: ExecutionContext) => Promise<Response>;
-};
+}) => Promise<unknown>) => () => Promise<unknown>;

package/dist/runtime/script.js

@@ -1,11 +1,2 @@
 import { env } from "cloudflare:workers";
-import { defineApp } from "./worker";
-export const defineScript = (fn) => {
-    const app = defineApp([
-        async () => {
-            await fn({ env: env });
-            return new Response("Done!");
-        },
-    ]);
-    return app;
-};
+export const defineScript = (fn) => () => fn({ env: env });

package/dist/runtime/worker.js

@@ -23,6 +23,29 @@ export const defineApp = (routes) => {
                 url.pathname = url.pathname.slice("/assets/".length);
                 return env.ASSETS.fetch(new Request(url.toString(), request));
             }
+            else if (import.meta.env.VITE_IS_DEV_SERVER &&
+                new URL(request.url).pathname === "/__worker-run") {
+                const url = new URL(request.url);
+                const scriptPath = url.searchParams.get("script");
+                if (!scriptPath) {
+                    return new Response("Missing 'script' query parameter", {
+                        status: 400,
+                    });
+                }
+                try {
+                    const scriptModule = await import(/* @vite-ignore */ scriptPath);
+                    if (scriptModule.default) {
+                        await scriptModule.default(request, env, cf);
+                    }
+                    return new Response("Script executed successfully");
+                }
+                catch (e) {
+                    console.error(`Error executing script: ${scriptPath}\n\n${e.stack}`);
+                    return new Response(`Error executing script: ${e.message}`, {
+                        status: 500,
+                    });
+                }
+            }
             else if (import.meta.env.VITE_IS_DEV_SERVER &&
                 request.url.includes("/__vite_preamble__")) {
                 return new Response('import RefreshRuntime from "/@react-refresh"; RefreshRuntime.injectIntoGlobalHook(window); window.$RefreshReg$ = () => {}; window.$RefreshSig$ = () => (type) => type; window.__vite_plugin_react_preamble_installed__ = true;', {
@@ -43,6 +66,8 @@ export const defineApp = (routes) => {
                     ssr: true,
                     databases: new Map(),
                     scriptsToBeLoaded: new Set(),
+                    entryScripts: new Set(),
+                    inlineScripts: new Set(),
                     pageRouteResolved: undefined,
                 };
                 const userResponseInit = {

package/dist/scripts/addon.mjs

@@ -35,7 +35,7 @@ export const addon = async () => {
             console.error('Could not find "rwsdk" in your dependencies or devDependencies.');
             process.exit(1);
         }
-        if (/^\\d/.test(rwsdkVersion)) {
+        if (/^\d/.test(rwsdkVersion)) {
             rwsdkVersion = `v${rwsdkVersion}`;
         }
         const tmpDirPrefix = path.join(os.tmpdir(), `rwsdk-addon-${addonName}-`);

package/dist/scripts/smoke-test.mjs

@@ -1,5 +1,5 @@
 import debug from "debug";
-import { join } from "path";
+import { dirname, join } from "path";
 import { fileURLToPath } from "url";
 import { runSmokeTests } from "../lib/smokeTests/runSmokeTests.mjs";
 import { isRunningInCI } from "../lib/smokeTests/utils.mjs";
@@ -16,11 +16,13 @@ if (fileURLToPath(import.meta.url) === process.argv[1]) {
     // Check for CI flag first
     const ciFlag = args.includes("--ci");
     // Set initial default values (sync will be determined below)
+    const __dirname = dirname(fileURLToPath(import.meta.url));
+    const starterPath = join(__dirname, "..", "..", "..", "starter");
     const options = {
         skipDev: false,
         skipRelease: false,
         skipClient: false,
-        projectDir: undefined,
+        projectDir: starterPath,
         artifactDir: join(process.cwd(), ".artifacts"), // Default to .artifacts in current directory
         keep: isRunningInCI(ciFlag), // Default to true in CI environments
         headless: true,

package/dist/scripts/worker-run.d.mts

@@ -1 +1 @@
-export declare const runWorkerScript: (relativeScriptPath: string) => Promise<never>;
+export {};

package/dist/scripts/worker-run.mjs

@@ -1,131 +1,68 @@
-import { Lang, parse } from "@ast-grep/napi";
-import baseDebug from "debug";
-import enhancedResolve from "enhanced-resolve";
-import { readFile, writeFile } from "fs/promises";
-import path, { resolve } from "path";
-import tmp from "tmp-promise";
-import { createServer as createViteServer } from "vite";
-import { unstable_readConfig } from "wrangler";
-import { findWranglerConfig } from "../lib/findWranglerConfig.mjs";
-import { redwood } from "../vite/index.mjs";
-const debug = baseDebug("rwsdk:worker-run");
-export const runWorkerScript = async (relativeScriptPath) => {
+import dbg from "debug";
+import getPort from "get-port";
+import path from "path";
+import * as vite from "vite";
+import { createLogger } from "vite";
+const debug = dbg("rwsdk:worker-run");
+const main = async () => {
+    process.env.RWSDK_WORKER_RUN = "1";
+    const relativeScriptPath = process.argv[2];
     if (!relativeScriptPath) {
         console.error("Error: Script path is required");
         console.log("\nUsage:");
-        console.log("  npm run worker:run <script-path>");
-        console.log("\nOptions:");
-        console.log("  RWSDK_WRANGLER_CONFIG      Environment variable for config path");
+        console.log("  rwsdk worker-run <script-path>");
         console.log("\nExamples:");
-        console.log("  npm run worker:run src/scripts/seed.ts");
-        console.log("  RWSDK_WRANGLER_CONFIG=custom.toml npm run worker:run src/scripts/seed.ts\n");
+        console.log("  rwsdk worker-run src/scripts/seed.ts\n");
         process.exit(1);
     }
-    const scriptPath = resolve(process.cwd(), relativeScriptPath);
-    debug("Running worker script: %s", scriptPath);
-    const workerConfigPath = process.env.RWSDK_WRANGLER_CONFIG
-        ? resolve(process.cwd(), process.env.RWSDK_WRANGLER_CONFIG)
-        : await findWranglerConfig(process.cwd());
-    debug("Using wrangler config: %s", workerConfigPath);
-    const workerConfig = unstable_readConfig({
-        config: workerConfigPath,
-        env: "dev",
-    });
-    const durableObjectsToExport = workerConfig.durable_objects?.bindings
-        .filter((binding) => !binding.script_name)
-        .map((binding) => binding.class_name) ?? [];
-    const workerEntryRelativePath = workerConfig.main;
-    const workerEntryPath = workerEntryRelativePath ?? path.join(process.cwd(), "src/worker.tsx");
-    const durableObjectExports = [];
-    if (durableObjectsToExport.length > 0) {
-        const resolver = enhancedResolve.create.sync({
-            extensions: [".mts", ".ts", ".tsx", ".mjs", ".js", ".jsx", ".json"],
-        });
-        const workerEntryContents = await readFile(workerEntryPath, "utf-8");
-        const workerEntryAst = parse(Lang.Tsx, workerEntryContents);
-        const exportDeclarations = [
-            ...workerEntryAst.root().findAll('export { $$$EXPORTS } from "$MODULE"'),
-            ...workerEntryAst.root().findAll("export { $$$EXPORTS } from '$MODULE'"),
-            ...workerEntryAst.root().findAll("export { $$$EXPORTS } from '$MODULE'"),
-        ];
-        for (const exportDeclaration of exportDeclarations) {
-            const moduleMatch = exportDeclaration.getMatch("MODULE");
-            const exportsMatch = exportDeclaration.getMultipleMatches("EXPORTS");
-            if (!moduleMatch || exportsMatch.length === 0) {
-                continue;
-            }
-            const modulePath = moduleMatch.text();
-            const specifiers = exportsMatch.map((m) => m.text().trim());
-            for (const specifier of specifiers) {
-                if (durableObjectsToExport.includes(specifier)) {
-                    const resolvedPath = resolver(path.dirname(workerEntryPath), modulePath);
-                    durableObjectExports.push(`export { ${specifier} } from "${resolvedPath}";`);
-                }
-            }
+    const scriptPath = path.resolve(process.cwd(), relativeScriptPath);
+    const port = await getPort();
+    let server;
+    const cleanup = async () => {
+        if (server) {
+            await server.close();
         }
-    }
-    const tmpDir = await tmp.dir({
-        prefix: "rw-worker-run-",
-        unsafeCleanup: true,
-    });
-    const relativeTmpWorkerEntryPath = "worker.tsx";
-    const tmpWorkerPath = path.join(tmpDir.path, "wrangler.json");
-    const tmpWorkerEntryPath = path.join(tmpDir.path, relativeTmpWorkerEntryPath);
-    const scriptWorkerConfig = {
-        ...workerConfig,
-        configPath: tmpWorkerPath,
-        userConfigPath: tmpWorkerPath,
-        main: relativeTmpWorkerEntryPath,
+        process.exit();
     };
+    process.on("SIGINT", cleanup);
+    process.on("SIGTERM", cleanup);
     try {
-        await writeFile(tmpWorkerPath, JSON.stringify(scriptWorkerConfig, null, 2));
-        await writeFile(tmpWorkerEntryPath, `
-${durableObjectExports.join("\n")}
-export { default } from "${scriptPath}";
-`);
-        debug("Worker config written to: %s", tmpWorkerPath);
-        debug("Worker entry written to: %s", tmpWorkerEntryPath);
-        process.env.RWSDK_WORKER_RUN = "1";
-        const server = await createViteServer({
-            configFile: false,
-            plugins: [
-                redwood({
-                    configPath: tmpWorkerPath,
-                    includeCloudflarePlugin: true,
-                    entry: {
-                        worker: tmpWorkerEntryPath,
-                    },
-                }),
-            ],
+        server = await vite.createServer({
+            logLevel: "silent",
+            build: {
+                outDir: ".rwsdk",
+            },
+            customLogger: createLogger("info", {
+                prefix: "[rwsdk]",
+                allowClearScreen: true,
+            }),
             server: {
-                port: 0,
+                port,
+                host: "localhost",
             },
         });
-        debug("Vite server created");
-        try {
-            await server.listen();
-            const address = server.httpServer?.address();
-            debug("Server listening on address: %o", address);
-            if (!address || typeof address === "string") {
-                throw new Error("Dev server address is invalid");
+        await server.listen();
+        const url = `http://localhost:${port}/__worker-run?script=${scriptPath}`;
+        debug("Fetching %s", url);
+        const response = await fetch(url);
+        debug("Response from worker: %s", response);
+        if (!response.ok) {
+            const errorText = await response.text();
+            console.error(`Error: worker-run script failed with status ${response.status}.`);
+            if (errorText) {
+                console.error("Response:", errorText);
             }
-            debug("Fetching worker...");
-            await fetch(`http://localhost:${address.port}/`);
-            debug("Worker fetched successfully");
-        }
-        finally {
-            debug("Closing server...");
-            server.close();
-            debug("Server closed");
+            process.exit(1);
         }
+        const responseText = await response.text();
+        debug("Response from worker: %s", responseText);
+    }
+    catch (e) {
+        console.error("rwsdk: Error running script:\n\n%s", e.message);
+        process.exit(1);
     }
     finally {
-        debug("Closing inspector servers...");
-        debug("Temporary files cleaned up");
+        await cleanup();
     }
-    // todo(justinvdm, 01 Apr 2025): Investigate what handles are remaining open
-    process.exit(0);
 };
-if (import.meta.url === new URL(process.argv[1], import.meta.url).href) {
-    runWorkerScript(process.argv[2]);
-}
+main();

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/directiveModulesDevPlugin.mjs

@@ -38,7 +38,7 @@ export const directiveModulesDevPlugin = ({ clientFiles, serverFiles, projectRoo
     return {
         name: "rwsdk:directive-modules-dev",
         configureServer(server) {
-            if (!process.env.VITE_IS_DEV_SERVER || process.env.RWSDK_WORKER_RUN) {
+            if (!process.env.VITE_IS_DEV_SERVER) {
                 resolveScanPromise();
                 return;
             }

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 }),