rwsdk 0.2.0 → 0.3.1

package/dist/lib/constants.d.mts

@@ -1,4 +1,9 @@
 export declare const ROOT_DIR: string;
 export declare const SRC_DIR: string;
 export declare const DIST_DIR: string;
-export declare const SSR_BRIDGE_PATH: string;
+export declare const VITE_DIR: string;
+export declare const INTERMEDIATES_OUTPUT_DIR: string;
+export declare const CLIENT_BARREL_PATH: string;
+export declare const SERVER_BARREL_PATH: string;
+export declare const INTERMEDIATE_SSR_BRIDGE_PATH: string;
+export declare const CLIENT_MANIFEST_RELATIVE_PATH: string;

package/dist/lib/constants.mjs

@@ -3,4 +3,9 @@ const __dirname = new URL(".", import.meta.url).pathname;
 export const ROOT_DIR = resolve(__dirname, "..", "..");
 export const SRC_DIR = resolve(ROOT_DIR, "src");
 export const DIST_DIR = resolve(ROOT_DIR, "dist");
-export const SSR_BRIDGE_PATH = resolve(DIST_DIR, "worker", "__ssr_bridge.js");
+export const VITE_DIR = resolve(ROOT_DIR, "src", "vite");
+export const INTERMEDIATES_OUTPUT_DIR = resolve(DIST_DIR, "__intermediate_builds");
+export const CLIENT_BARREL_PATH = resolve(INTERMEDIATES_OUTPUT_DIR, "rwsdk-client-barrel.js");
+export const SERVER_BARREL_PATH = resolve(INTERMEDIATES_OUTPUT_DIR, "rwsdk-server-barrel.js");
+export const INTERMEDIATE_SSR_BRIDGE_PATH = resolve(INTERMEDIATES_OUTPUT_DIR, "ssr", "ssr_bridge.js");
+export const CLIENT_MANIFEST_RELATIVE_PATH = resolve("dist", "client", ".vite", "manifest.json");

package/dist/lib/smokeTests/browser.mjs

@@ -316,25 +316,9 @@ export async function checkUrl(url, artifactDir, browserPath, headless = true, b
 export async function checkUrlSmoke(page, url, isRealtime, bail = false, skipClient = false, environment = "Development", timestampState, targetDir, skipHmr = false, skipStyleTests = false) {
     const phase = isRealtime ? "Post-upgrade" : "Initial";
     console.log(`🔍 Testing ${phase} smoke tests at ${url}`);
-    // Parse the base URL and path to properly handle smoke test queries
-    const parsedUrl = new URL(url);
-    log("Parsed URL: %O", {
-        origin: parsedUrl.origin,
-        pathname: parsedUrl.pathname,
-        search: parsedUrl.search,
-    });
-    // Add __smoke_test query parameter, preserving any existing query parameters
-    if (parsedUrl.searchParams.has("__smoke_test")) {
-        console.log(`URL already has __smoke_test parameter: ${url}`);
-    }
-    else {
-        parsedUrl.searchParams.append("__smoke_test", "1");
-        log("Added __smoke_test parameter to URL");
-    }
     // Navigate to smoke test page
-    const smokeUrl = parsedUrl.toString();
-    console.log(`🔍 Accessing smoke test page: ${smokeUrl}`);
-    await page.goto(smokeUrl, { waitUntil: "networkidle0" });
+    console.log(`🔍 Accessing smoke test page: ${url}`);
+    await page.goto(url, { waitUntil: "networkidle0" });
     log("Page loaded successfully");
     // Track failures to report at the end
     let hasFailures = false;
@@ -692,9 +676,9 @@ export async function checkClientSmoke(page, phase = "", environment = "Developm
         // Check if we're on a smoke test page - in which case missing the refresh button is a failure
         const currentUrl = page.url();
         log("Current URL: %s", currentUrl);
-        if (currentUrl.includes("__smoke_test")) {
-            log("ERROR: Smoke test page is missing the refresh-health button");
-            throw new Error("Smoke test page is missing the refresh-health button - this is a test failure");
+        if (!currentUrl.includes("/__smoke_test")) {
+            log("ERROR: Smoke test page is not the current URL");
+            throw new Error("Smoke test page is not the current URL - this is a test failure");
         }
         console.log("ℹ️ Basic page structure verified, continuing without client-side smoke test");
         return null;

package/dist/lib/smokeTests/codeUpdates.d.mts

@@ -6,4 +6,4 @@ export declare function createSmokeTestStylesheets(targetDir: string): Promise<v
 /**
  * Modifies the worker.tsx and wrangler.jsonc files to add realtime support
  */
-export declare function modifyAppForRealtime(targetDir: string): Promise<void>;
+export declare function modifyAppForRealtime(targetDir: string, skipClient?: boolean): Promise<void>;

package/dist/lib/smokeTests/codeUpdates.mjs

@@ -46,7 +46,7 @@ export async function createSmokeTestComponents(targetDir, skipClient = false) {
         log("Skipping client-side smoke test component creation");
     }
     // Modify worker.tsx and wrangler.jsonc for realtime support
-    await modifyAppForRealtime(targetDir);
+    await modifyAppForRealtime(targetDir, skipClient);
     log("Smoke test components created successfully");
     console.log("Created smoke test components:");
     console.log(`- ${smokeTestFunctionsPath}`);
@@ -104,7 +104,7 @@ export async function createSmokeTestStylesheets(targetDir) {
 /**
  * Modifies the worker.tsx and wrangler.jsonc files to add realtime support
  */
-export async function modifyAppForRealtime(targetDir) {
+export async function modifyAppForRealtime(targetDir, skipClient = false) {
     log("Modifying worker.tsx and wrangler.jsonc for realtime support");
     // Modify worker.tsx
     const workerPath = join(targetDir, "src", "worker.tsx");
@@ -118,8 +118,14 @@ export async function modifyAppForRealtime(targetDir) {
         const hasRealtimeExport = workerContent.includes('export { RealtimeDurableObject } from "rwsdk/realtime/durableObject"');
         const hasRealtimeRoute = workerContent.includes("realtimeRoute(");
         const hasEnvImport = workerContent.includes('import { env } from "cloudflare:workers"');
-        if (!hasRealtimeExport || !hasRealtimeRoute || !hasEnvImport) {
-            log("Need to modify worker.tsx for realtime support");
+        const hasSmokeTestImport = workerContent.includes('import { SmokeTest } from "@/app/components/__SmokeTest.tsx"');
+        const hasSmokeTestRoute = workerContent.includes('route("/__smoke_test", SmokeTest)');
+        if (!hasRealtimeExport ||
+            !hasRealtimeRoute ||
+            !hasEnvImport ||
+            !hasSmokeTestImport ||
+            !hasSmokeTestRoute) {
+            log("Need to modify worker.tsx for realtime and smoke test support");
             const s = new MagicString(workerContent);
             // Add the export line if it doesn't exist
             if (!hasRealtimeExport) {
@@ -145,6 +151,26 @@ export async function modifyAppForRealtime(targetDir) {
                     log("Added env import from cloudflare:workers");
                 }
             }
+            // Add SmokeTest import if it doesn't exist
+            if (!hasSmokeTestImport) {
+                const importRegex = /import.*?from.*?;\n/g;
+                let lastImportMatch;
+                let lastImportPosition = 0;
+                // Find the position after the last import statement
+                while ((lastImportMatch = importRegex.exec(workerContent)) !== null) {
+                    lastImportPosition =
+                        lastImportMatch.index + lastImportMatch[0].length;
+                }
+                if (lastImportPosition > 0) {
+                    s.appendRight(lastImportPosition, 'import { SmokeTest } from "@/app/components/__SmokeTest";\n');
+                    log("Added SmokeTest import");
+                }
+                else {
+                    // if no imports found, just prepend to the file
+                    s.prepend('import { SmokeTest } from "@/app/components/__SmokeTest";\n');
+                    log("Added SmokeTest import to the beginning of the file");
+                }
+            }
             // Add the realtimeRoute line if it doesn't exist
             if (!hasRealtimeRoute) {
                 const defineAppMatch = workerContent.match(/export default defineApp\(\[/);
@@ -154,6 +180,16 @@ export async function modifyAppForRealtime(targetDir) {
                     log("Added realtimeRoute to defineApp");
                 }
             }
+            // Add the smoke test route if it doesn't exist
+            if (!hasSmokeTestRoute) {
+                const defineAppRegex = /(export default defineApp\(\[)([\s\S]*)(\]\);)/m;
+                const match = workerContent.match(defineAppRegex);
+                if (match) {
+                    const insertionPoint = match.index + match[1].length + match[2].length;
+                    s.appendLeft(insertionPoint, '  render(Document, [route("/__smoke_test", SmokeTest)]),\n');
+                    log("Added smoke test route to defineApp");
+                }
+            }
             // Import realtimeRoute if it's not already imported
             if (!workerContent.includes("realtimeRoute")) {
                 // First check if we already have the import from rwsdk/realtime/worker
@@ -196,7 +232,7 @@ export async function modifyAppForRealtime(targetDir) {
             log("Successfully modified worker.tsx");
         }
         else {
-            log("worker.tsx already has realtime support, no changes needed");
+            log("worker.tsx already has realtime and smoke test support, no changes needed");
         }
     }
     else {

package/dist/lib/smokeTests/development.d.mts

@@ -8,4 +8,4 @@ export declare function runDevServer(cwd?: string): Promise<{
 /**
  * Runs tests against the development server
  */
-export declare function runDevTest(url: string, artifactDir: string, customPath?: string, browserPath?: string, headless?: boolean, bail?: boolean, skipClient?: boolean, realtime?: boolean, skipHmr?: boolean, skipStyleTests?: boolean): Promise<void>;
+export declare function runDevTest(url: string, artifactDir: string, browserPath?: string, headless?: boolean, bail?: boolean, skipClient?: boolean, realtime?: boolean, skipHmr?: boolean, skipStyleTests?: boolean): Promise<void>;

package/dist/lib/smokeTests/development.mjs

@@ -172,21 +172,15 @@ export async function runDevServer(cwd) {
 /**
  * Runs tests against the development server
  */
-export async function runDevTest(url, artifactDir, customPath = "/", browserPath, headless = true, bail = false, skipClient = false, realtime = false, skipHmr = false, skipStyleTests = false) {
-    log("Starting dev server test with path: %s", customPath || "/");
+export async function runDevTest(url, artifactDir, browserPath, headless = true, bail = false, skipClient = false, realtime = false, skipHmr = false, skipStyleTests = false) {
+    log("Starting dev server test");
     console.log("🚀 Testing local development server");
     const browser = await launchBrowser(browserPath, headless);
     const page = await browser.newPage();
     try {
+        const testUrl = new URL("/__smoke_test", url).toString();
         // DRY: check both root and custom path
-        await checkServerUp(url, customPath, RETRIES, bail);
-        // Now run the tests with the custom path
-        const testUrl = url +
-            (customPath === "/"
-                ? ""
-                : customPath.startsWith("/")
-                    ? customPath
-                    : "/" + customPath);
+        await checkServerUp(url, "/", RETRIES, bail);
         // Pass the target directory to checkUrl for HMR testing
         const targetDir = state.resources.targetDir;
         await page.goto(testUrl, { waitUntil: "networkidle0" });

package/dist/lib/smokeTests/release.d.mts

@@ -40,7 +40,7 @@ export declare function runRelease(cwd: string, projectDir: string, resourceUniq
 /**
  * Runs tests against the production deployment
  */
-export declare function runReleaseTest(customPath: string | undefined, artifactDir: string, resources: TestResources, browserPath?: string, headless?: boolean, bail?: boolean, skipClient?: boolean, projectDir?: string, realtime?: boolean, skipHmr?: boolean, skipStyleTests?: boolean): Promise<void>;
+export declare function runReleaseTest(artifactDir: string, resources: TestResources, browserPath?: string, headless?: boolean, bail?: boolean, skipClient?: boolean, projectDir?: string, realtime?: boolean, skipHmr?: boolean, skipStyleTests?: boolean): Promise<void>;
 /**
  * Check if a resource name includes a specific resource unique key
  * This is used to identify resources created during our tests

package/dist/lib/smokeTests/release.mjs

@@ -379,8 +379,8 @@ export async function runRelease(cwd, projectDir, resourceUniqueKey) {
 /**
  * Runs tests against the production deployment
  */
-export async function runReleaseTest(customPath = "/", artifactDir, resources, browserPath, headless = true, bail = false, skipClient = false, projectDir, realtime = false, skipHmr = false, skipStyleTests = false) {
-    log("Starting release test with path: %s", customPath || "/");
+export async function runReleaseTest(artifactDir, resources, browserPath, headless = true, bail = false, skipClient = false, projectDir, realtime = false, skipHmr = false, skipStyleTests = false) {
+    log("Starting release test");
     console.log("\n🚀 Testing production deployment");
     try {
         log("Running release process");
@@ -389,14 +389,9 @@ export async function runReleaseTest(customPath = "/", artifactDir, resources, b
         log("Waiting 1s before checking server...");
         await setTimeout(1000);
         // DRY: check both root and custom path
-        await checkServerUp(url, customPath);
+        await checkServerUp(url, "/");
         // Now run the tests with the custom path
-        const testUrl = url +
-            (customPath === "/"
-                ? ""
-                : customPath.startsWith("/")
-                    ? customPath
-                    : "/" + customPath);
+        const testUrl = new URL("/__smoke_test", url).toString();
         await checkUrl(testUrl, artifactDir, browserPath, headless, bail, skipClient, "Production", realtime, resources.targetDir, // Add target directory parameter
         true, // Always skip HMR in production
         skipStyleTests);

package/dist/lib/smokeTests/runSmokeTests.mjs

@@ -57,7 +57,7 @@ export async function runSmokeTests(options = {}) {
                 resources.stopDev = stopDev;
                 state.resources.stopDev = stopDev;
                 log("Running development server tests");
-                await runDevTest(url, options.artifactDir, options.customPath, browserPath, options.headless !== false, options.bail, options.skipClient, options.realtime, options.skipHmr, options.skipStyleTests);
+                await runDevTest(url, options.artifactDir, browserPath, options.headless !== false, options.bail, options.skipClient, options.realtime, options.skipHmr, options.skipStyleTests);
                 // Mark that dev tests have run successfully
                 state.devTestsRan = true;
                 // Update the overall dev test status to PASSED
@@ -95,7 +95,7 @@ export async function runSmokeTests(options = {}) {
                 // Update status when release command runs
                 try {
                     console.log("\n🚀 Running release command smoke test");
-                    await runReleaseTest(options.customPath, options.artifactDir, resources, browserPath, options.headless !== false, options.bail, options.skipClient, options.projectDir, options.realtime, options.skipHmr, options.skipStyleTests);
+                    await runReleaseTest(options.artifactDir, resources, browserPath, options.headless !== false, options.bail, options.skipClient, options.projectDir, options.realtime, options.skipHmr, options.skipStyleTests);
                     // Update release command status to PASSED
                     updateTestStatus("production", "releaseCommand", "PASSED");
                     // Mark that release tests have run successfully

package/dist/lib/smokeTests/templates/SmokeTest.template.js

@@ -5,7 +5,7 @@ import { RequestInfo } from "rwsdk/worker";
 ${skipClient ? "" : 'import { SmokeTestClient } from "./__SmokeTestClient";'}
 import { getSmokeTestTimestamp } from "./__smokeTestFunctions";
 
-export const SmokeTestInfo: React.FC = async () => {
+export const SmokeTest = async () => {
   const currentTime = Date.now();
   let status = "error";
   let timestamp = 0;
@@ -77,5 +77,6 @@ export const SmokeTestInfo: React.FC = async () => {
       ${!skipClient ? "<SmokeTestClient/>" : ""}
     </div>
   );
-};`;
+};
+`;
 }

package/dist/lib/testUtils/stubEnvVars.d.mts

@@ -0,0 +1,2 @@
+declare const stubEnvVars: () => void;
+export default stubEnvVars;

package/dist/lib/testUtils/stubEnvVars.mjs

@@ -0,0 +1,11 @@
+import { beforeEach, afterEach } from "vitest";
+const stubEnvVars = () => {
+    let originals = {};
+    beforeEach(() => {
+        originals = { ...process.env };
+    });
+    afterEach(() => {
+        process.env = { ...originals };
+    });
+};
+export default stubEnvVars;

package/dist/runtime/imports/client.js

@@ -4,16 +4,11 @@ import { memoizeOnId } from "../lib/memoizeOnId";
 // @ts-ignore
 import { useClientLookup } from "virtual:use-client-lookup.js";
 export const loadModule = memoizeOnId(async (id) => {
-    if (import.meta.env.VITE_IS_DEV_SERVER) {
-        return await import(/* @vite-ignore */ id);
-    }
-    else {
-        const moduleFn = useClientLookup[id];
-        if (!moduleFn) {
-            throw new Error(`(client) No module found for '${id}' in module lookup for "use client" directive`);
-        }
-        return await moduleFn();
+    const moduleFn = useClientLookup[id];
+    if (!moduleFn) {
+        throw new Error(`(client) No module found for '${id}' in module lookup for "use client" directive`);
     }
+    return await moduleFn();
 });
 // context(justinvdm, 2 Dec 2024): re memoize(): React relies on the same promise instance being returned for the same id
 export const clientWebpackRequire = memoizeOnId(async (id) => {

package/dist/runtime/imports/worker.js

@@ -1,8 +1,9 @@
 import { requestInfo } from "../requestInfo/worker";
 import { ssrWebpackRequire as baseSsrWebpackRequire } from "rwsdk/__ssr_bridge";
 import { memoizeOnId } from "../lib/memoizeOnId";
+// @ts-ignore
+import { useServerLookup } from "virtual:use-server-lookup.js";
 export const loadServerModule = memoizeOnId(async (id) => {
-    const { useServerLookup } = await import("virtual:use-server-lookup.js");
     const moduleFn = useServerLookup[id];
     if (!moduleFn) {
         throw new Error(`(worker) No module found for '${id}' in module lookup for "use server" directive`);

package/dist/runtime/register/ssr.js

@@ -1,7 +1,8 @@
 import { createServerReference as baseCreateServerReference } from "react-server-dom-webpack/client.edge";
 import { memoizeOnId } from "../lib/memoizeOnId";
+// @ts-ignore
+import { useServerLookup } from "virtual:use-server-lookup.js";
 export const loadServerModule = memoizeOnId(async (id) => {
-    const { useServerLookup } = await import("virtual:use-server-lookup.js");
     const moduleFn = useServerLookup[id];
     if (!moduleFn) {
         throw new Error(`(worker) No module found for '${id}' in module lookup for "use server" directive`);

package/dist/runtime/requestInfo/worker.js

@@ -2,7 +2,15 @@ import { AsyncLocalStorage } from "async_hooks";
 const requestInfoDeferred = Promise.withResolvers();
 const requestInfoStore = new AsyncLocalStorage();
 const requestInfoBase = {};
-const REQUEST_INFO_KEYS = ["request", "params", "ctx", "headers", "rw", "cf", "response"];
+const REQUEST_INFO_KEYS = [
+    "request",
+    "params",
+    "ctx",
+    "headers",
+    "rw",
+    "cf",
+    "response",
+];
 REQUEST_INFO_KEYS.forEach((key) => {
     Object.defineProperty(requestInfoBase, key, {
         enumerable: true,

package/dist/runtime/worker.d.ts

@@ -10,9 +10,6 @@ declare global {
 export declare const defineApp: <T extends RequestInfo = RequestInfo<any, DefaultAppContext>>(routes: Route<T>[]) => {
     fetch: (request: Request, env: Env, cf: ExecutionContext) => Promise<Response>;
 };
-export declare const SmokeTestWrapper: React.FC<{
-    children: React.ReactNode;
-}>;
 export declare const DefaultDocument: React.FC<{
     children: React.ReactNode;
 }>;

package/dist/runtime/worker.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { transformRscToHtmlStream } from "./render/transformRscToHtmlStream";
 import { renderToRscStream } from "./render/renderToRscStream";
 import { rscActionHandler } from "./register/worker";
@@ -33,7 +33,6 @@ export const defineApp = (routes) => {
                 const url = new URL(request.url);
                 const isRSCRequest = url.searchParams.has("__rsc") ||
                     request.headers.get("accept")?.includes("text/x-component");
-                const isSmokeTest = url.searchParams.has("__smoke_test");
                 const userHeaders = new Headers();
                 const rw = {
                     Document: DefaultDocument,
@@ -67,9 +66,6 @@ export const defineApp = (routes) => {
                     else {
                         pageElement = _jsx(Page, { ...requestInfo });
                     }
-                    if (isSmokeTest) {
-                        pageElement = _jsx(SmokeTestWrapper, { children: pageElement });
-                    }
                     return pageElement;
                 };
                 const renderPage = async (requestInfo, Page, onError) => {
@@ -175,11 +171,6 @@ export const defineApp = (routes) => {
         },
     };
 };
-export const SmokeTestWrapper = async ({ children }) => {
-    const smokeTestInfo = await Object.values(await import.meta.glob("/src/app/components/__SmokeTest.tsx"))[0]();
-    const SmokeTestInfo = smokeTestInfo.SmokeTestInfo;
-    return (_jsxs(_Fragment, { children: [_jsx(SmokeTestInfo, {}), children] }));
-};
 export const DefaultDocument = ({ children, }) => (_jsxs("html", { lang: "en", children: [_jsxs("head", { children: [_jsx("meta", { charSet: "utf-8" }), _jsx("meta", { name: "viewport", content: "width=device-width, initial-scale=1" })] }), _jsx("body", { children: _jsx("div", { id: "root", children: children }) })] }));
 const isClientReference = (Component) => {
     return Object.prototype.hasOwnProperty.call(Component, "$$isClientReference");

package/dist/scripts/debug-sync.mjs

@@ -59,30 +59,11 @@ const cleanupViteEntries = async (targetDir) => {
     }
 };
 const performFullSync = async (sdkDir, targetDir) => {
-    const sdkPackageJsonPath = path.join(sdkDir, "package.json");
-    let originalSdkPackageJson = null;
     let tarballPath = "";
     let tarballName = "";
     // Clean up vite cache
     await cleanupViteEntries(targetDir);
     try {
-        try {
-            originalSdkPackageJson = await fs.readFile(sdkPackageJsonPath, "utf-8");
-            const packageJson = JSON.parse(originalSdkPackageJson);
-            const originalVersion = packageJson.version;
-            const timestamp = new Date()
-                .toISOString()
-                .replace(/[-:T.]/g, "")
-                .slice(0, 14);
-            const newVersion = `${originalVersion}+build.${timestamp}`;
-            console.log(`Temporarily setting version to ${newVersion}`);
-            packageJson.version = newVersion;
-            await fs.writeFile(sdkPackageJsonPath, JSON.stringify(packageJson, null, 2));
-        }
-        catch (e) {
-            console.warn("Could not modify package.json version, proceeding without it.");
-            originalSdkPackageJson = null; // don't restore if we failed to modify
-        }
         console.log("📦 Packing SDK...");
         const packResult = await $({ cwd: sdkDir }) `npm pack --json`;
         const json = JSON.parse(packResult.stdout || "[]");
@@ -152,10 +133,6 @@ const performFullSync = async (sdkDir, targetDir) => {
         }
     }
     finally {
-        if (originalSdkPackageJson) {
-            console.log("Restoring package.json...");
-            await fs.writeFile(sdkPackageJsonPath, originalSdkPackageJson);
-        }
         if (tarballPath) {
             console.log("Removing tarball...");
             await fs.unlink(tarballPath).catch(() => {

package/dist/scripts/smoke-test.mjs

@@ -17,7 +17,6 @@ if (fileURLToPath(import.meta.url) === process.argv[1]) {
     const ciFlag = args.includes("--ci");
     // Set initial default values (sync will be determined below)
     const options = {
-        customPath: "/", // Default path
         skipDev: false,
         skipRelease: false,
         skipClient: false,
@@ -88,7 +87,6 @@ Smoke Test Usage:
   node smoke-test.mjs [options]
 
 Options:
-  --url=PATH              Custom URL path to test (e.g., "/login")
   --skip-dev              Skip testing the local development server
   --skip-release          Skip testing the release/production deployment
   --skip-client           Skip client-side tests, only run server-side checks
@@ -114,14 +112,6 @@ Options:
         else if (arg.startsWith("--artifact-dir=")) {
             options.artifactDir = arg.substring(15);
         }
-        else if (arg.startsWith("--url=")) {
-            options.customPath = arg.substring(6);
-        }
-        else if (!arg.startsWith("--")) {
-            // For backwards compatibility, any non-flag argument is treated as the custom path
-            console.log(`Setting URL path to "${arg}" (use --url= format in the future)`);
-            options.customPath = arg;
-        }
         else {
             // Throw error for unknown options instead of just warning
             log("Unknown option: %s", arg);

package/dist/vite/buildApp.d.mts

@@ -0,0 +1,15 @@
+import type { ViteBuilder } from "vite";
+/**
+ * The build orchestrator is responsible for running the multi-phase build
+ * process for production. It is designed to solve the circular dependency
+ * between the worker, client, and SSR builds.
+ *
+ * @see docs/architecture/productionBuildProcess.md
+ */
+export declare function buildApp({ builder, clientEntryPoints, clientFiles, serverFiles, projectRootDir, }: {
+    builder: ViteBuilder;
+    clientEntryPoints: Set<string>;
+    clientFiles: Set<string>;
+    serverFiles: Set<string>;
+    projectRootDir: string;
+}): Promise<void>;

package/dist/vite/buildApp.mjs

@@ -0,0 +1,53 @@
+import { resolve } from "node:path";
+import debug from "debug";
+import { runDirectivesScan } from "./runDirectivesScan.mjs";
+const log = debug("rwsdk:vite:build-app");
+/**
+ * The build orchestrator is responsible for running the multi-phase build
+ * process for production. It is designed to solve the circular dependency
+ * between the worker, client, and SSR builds.
+ *
+ * @see docs/architecture/productionBuildProcess.md
+ */
+export async function buildApp({ builder, clientEntryPoints, clientFiles, serverFiles, projectRootDir, }) {
+    const workerEnv = builder.environments.worker;
+    await runDirectivesScan({
+        rootConfig: builder.config,
+        environment: workerEnv,
+        clientFiles,
+        serverFiles,
+    });
+    console.log("Building worker to discover used client components...");
+    process.env.RWSDK_BUILD_PASS = "worker";
+    await builder.build(workerEnv);
+    log("Used client files after worker build & filtering: %O", Array.from(clientFiles));
+    console.log("Building SSR...");
+    await builder.build(builder.environments.ssr);
+    log("Discovered clientEntryPoints: %O", Array.from(clientEntryPoints));
+    console.log("Building client...");
+    const clientEnv = builder.environments["client"];
+    clientEnv.config.build ??= {};
+    clientEnv.config.build.rollupOptions ??= {};
+    const clientEntryPointsArray = Array.from(clientEntryPoints);
+    if (clientEntryPointsArray.length === 0) {
+        log("No client entry points discovered, using default: src/client.tsx");
+        clientEnv.config.build.rollupOptions.input = ["src/client.tsx"];
+    }
+    else {
+        clientEnv.config.build.rollupOptions.input = clientEntryPointsArray;
+    }
+    await builder.build(clientEnv);
+    console.log("Linking worker build...");
+    process.env.RWSDK_BUILD_PASS = "linker";
+    // Re-configure the worker environment for the linking pass
+    const workerConfig = workerEnv.config;
+    workerConfig.build.emptyOutDir = false;
+    workerConfig.build.rollupOptions.input = {
+        worker: resolve(projectRootDir, "dist", "worker", "worker.js"),
+    };
+    workerConfig.build.rollupOptions.output = {
+        entryFileNames: "worker.js",
+    };
+    await builder.build(workerEnv);
+    console.log("Build complete!");
+}

package/dist/vite/configPlugin.d.mts

@@ -1,9 +1,9 @@
 import { Plugin } from "vite";
-export declare const cloudflareBuiltInModules: string[];
-export declare const externalModules: string[];
-export declare const configPlugin: ({ silent, projectRootDir, clientEntryPathnames, workerEntryPathname, }: {
+export declare const configPlugin: ({ silent, projectRootDir, workerEntryPathname, clientFiles, serverFiles, clientEntryPoints, }: {
     silent: boolean;
     projectRootDir: string;
-    clientEntryPathnames: string[];
     workerEntryPathname: string;
+    clientFiles: Set<string>;
+    serverFiles: Set<string>;
+    clientEntryPoints: Set<string>;
 }) => Plugin;