rwsdk 1.0.0-beta.20 → 1.0.0-beta.22

package/dist/lib/constants.mjs

@@ -1,12 +1,14 @@
-import path, { resolve } from "node:path";
-const __dirname = new URL(".", import.meta.url).pathname;
+import { fileURLToPath } from "url";
+import { dirname, resolve } from "path";
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 export const ROOT_DIR = resolve(__dirname, "..", "..");
 export const SRC_DIR = resolve(ROOT_DIR, "src");
 export const DIST_DIR = resolve(ROOT_DIR, "dist");
 export const VITE_DIR = resolve(ROOT_DIR, "src", "vite");
 export const INTERMEDIATES_OUTPUT_DIR = resolve(DIST_DIR, "__intermediate_builds");
-export const VENDOR_CLIENT_BARREL_PATH = path.resolve(INTERMEDIATES_OUTPUT_DIR, "rwsdk-vendor-client-barrel.js");
-export const VENDOR_SERVER_BARREL_PATH = path.resolve(INTERMEDIATES_OUTPUT_DIR, "rwsdk-vendor-server-barrel.js");
+export const VENDOR_CLIENT_BARREL_PATH = resolve(INTERMEDIATES_OUTPUT_DIR, "rwsdk-vendor-client-barrel.js");
+export const VENDOR_SERVER_BARREL_PATH = resolve(INTERMEDIATES_OUTPUT_DIR, "rwsdk-vendor-server-barrel.js");
 export const VENDOR_CLIENT_BARREL_EXPORT_PATH = "rwsdk/__vendor_client_barrel";
 export const VENDOR_SERVER_BARREL_EXPORT_PATH = "rwsdk/__vendor_server_barrel";
 export const RW_STATE_EXPORT_PATH = "rwsdk/__state";

package/dist/lib/e2e/dev.mjs

@@ -1,6 +1,6 @@
 import debug from "debug";
 import { setTimeout as sleep } from "node:timers/promises";
-import { $ } from "../../lib/$.mjs";
+import { $, $sh } from "../../lib/$.mjs";
 import { poll } from "./poll.mjs";
 const DEV_SERVER_CHECK_TIMEOUT = process.env.RWSDK_DEV_SERVER_CHECK_TIMEOUT
     ? parseInt(process.env.RWSDK_DEV_SERVER_CHECK_TIMEOUT, 10)
@@ -21,43 +21,30 @@ export async function runDevServer(packageManager = "pnpm", cwd) {
             return;
         }
         console.log("Stopping development server...");
-        try {
-            // Send a regular termination signal to the entire process group first
-            process.kill(-devProcess.pid, "SIGTERM");
-        }
-        catch (e) {
-            log("Could not send SIGTERM to dev server process group: %O", e);
-        }
-        // Wait for the process to terminate with a timeout
-        const terminationTimeout = 5000; // 5 seconds
-        const processExitPromise = devProcess.catch(() => {
-            // We expect this promise to reject when the process is killed,
-            // so we catch and ignore the error.
-        });
-        const timeoutPromise = new Promise((resolve) => setTimeout(() => resolve(undefined), terminationTimeout));
-        await Promise.race([processExitPromise, timeoutPromise]);
-        // Check if the process is still alive. We can't reliably check exitCode
-        // on a detached process, so we try sending a signal 0, which errors
-        // if the process doesn't exist.
-        let isAlive = true;
-        try {
-            // Sending signal 0 doesn't kill the process, but checks if it exists
-            process.kill(-devProcess.pid, 0);
-        }
-        catch (e) {
-            isAlive = false;
+        if (process.platform === "win32") {
+            try {
+                await $sh(`taskkill /pid ${devProcess.pid} /f /t`);
+            }
+            catch (err) {
+                log("Failed to kill process tree with taskkill:", err);
+            }
         }
-        // If not terminated within timeout, force kill the entire process group
-        if (isAlive) {
-            log("Dev server process did not terminate within timeout, force killing with SIGKILL");
-            console.log("⚠️ Development server not responding after 5 seconds timeout, force killing...");
+        else {
+            // On Unix-like systems, we kill the entire process group by sending a signal
+            // to the negative PID. This is the equivalent of the `/t` flag for `taskkill` on Windows.
+            // This relies on `detached: true` being set in the execa options, which makes
+            // the child process the leader of a new process group.
             try {
                 process.kill(-devProcess.pid, "SIGKILL");
             }
             catch (e) {
-                log("Could not send SIGKILL to dev server process group: %O", e);
+                log("Failed to kill process group. This may happen if the process already exited. %O", e);
             }
         }
+        await devProcess.catch(() => {
+            // We expect this promise to reject when the process is killed,
+            // so we catch and ignore the error.
+        });
         console.log("Development server stopped");
     };
     try {
@@ -88,8 +75,9 @@ export async function runDevServer(packageManager = "pnpm", cwd) {
         // Use the provided cwd if available
         devProcess = $({
             all: true,
-            detached: true, // Run in a new process group so we can kill the entire group
-            cleanup: false, // Don't auto-kill on exit
+            detached: true, // Re-enable for reliable process cleanup
+            cleanup: true, // Let execa handle cleanup
+            forceKillAfterTimeout: 2000, // Force kill if graceful shutdown fails
             cwd: cwd || process.cwd(), // Use provided directory or current directory
             env, // Pass the updated environment variables
             stdio: "pipe", // Ensure streams are piped

package/dist/lib/e2e/testHarness.mjs

@@ -9,6 +9,7 @@ import { runDevServer } from "./dev.mjs";
 import { poll, pollValue } from "./poll.mjs";
 import { deleteD1Database, deleteWorker, isRelatedToTest, runRelease, } from "./release.mjs";
 import { setupTarballEnvironment } from "./tarball.mjs";
+import { fileURLToPath } from "url";
 export { DEPLOYMENT_CHECK_TIMEOUT, DEPLOYMENT_MIN_TRIES, DEPLOYMENT_TIMEOUT, DEV_SERVER_MIN_TRIES, DEV_SERVER_TIMEOUT, HYDRATION_TIMEOUT, INSTALL_DEPENDENCIES_RETRIES, PUPPETEER_TIMEOUT, SETUP_PLAYGROUND_ENV_TIMEOUT, SETUP_WAIT_TIMEOUT, TEST_MAX_RETRIES, TEST_MAX_RETRIES_PER_CODE, };
 // Environment variable flags for skipping tests
 const SKIP_DEV_SERVER_TESTS = process.env.RWSDK_SKIP_DEV === "1";
@@ -64,11 +65,11 @@ function getProjectDirectory() {
  * Derive the playground directory from import.meta.url by finding the nearest package.json
  */
 function getPlaygroundDirFromImportMeta(importMetaUrl) {
-    const url = new URL(importMetaUrl);
-    const testFilePath = url.pathname;
+    const testFilePath = fileURLToPath(importMetaUrl);
     let currentDir = dirname(testFilePath);
     // Walk up the tree from the test file's directory
-    while (currentDir !== "/") {
+    // Stop when the parent directory is the same as the current directory (we've reached the root)
+    while (dirname(currentDir) !== currentDir) {
         // Check if a package.json exists in the current directory
         if (fs.existsSync(pathJoin(currentDir, "package.json"))) {
             return currentDir;

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

@@ -0,0 +1 @@
+export { defineLinks } from "../lib/links.js";

package/dist/runtime/entries/routerClient.js

@@ -0,0 +1 @@
+export { defineLinks } from "../lib/links.js";

package/dist/runtime/render/renderToStream.js

@@ -1,11 +1,15 @@
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { injectRSCPayload } from "rsc-html-stream/server";
+import { ssrWebpackRequire } from "../imports/worker.js";
 import { constructWithDefaultRequestInfo } from "../requestInfo/utils";
-import { getRequestInfo } from "../requestInfo/worker";
+import { getRequestInfo, runWithRequestInfo } 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, requestInfo: givenRequestInfo, onError = () => { }, } = {}) => {
+    if (!globalThis.__webpack_require__) {
+        globalThis.__webpack_require__ = ssrWebpackRequire;
+    }
     // Try to get the context requestInfo from the async store.
     let contextRequestInfo;
     try {
@@ -24,30 +28,36 @@ export const renderToStream = async (element, { ssr: shouldSSR = true, Document
             ...givenRequestInfo?.rw,
         },
     });
-    let rscStream = renderToRscStream({
-        input: {
-            node: element,
-            actionResult: undefined,
-        },
-        onError,
-    });
-    let injectRSCStream;
-    if (shouldInjectRSCPayload) {
-        const [rscPayloadStream1, rscPayloadStream2] = rscStream.tee();
-        rscStream = rscPayloadStream1;
-        injectRSCStream = injectRSCPayload(rscPayloadStream2, {
-            nonce: requestInfo.rw.nonce,
+    // context(gching, 2025-10-29): We wrap the following with context to the requestInfo
+    // due to `ssrWebpackRequire` needing to reference the `requestInfo` in context.
+    // Therefore, we need to wrap + also pass in the requestInfo in their independent
+    // function calls
+    return runWithRequestInfo(requestInfo, async () => {
+        let rscStream = renderToRscStream({
+            input: {
+                node: element,
+                actionResult: undefined,
+            },
+            onError,
         });
-    }
-    let htmlStream = await renderDocumentHtmlStream({
-        rscPayloadStream: rscStream,
-        Document,
-        requestInfo,
-        shouldSSR,
-        onError,
+        let injectRSCStream;
+        if (shouldInjectRSCPayload) {
+            const [rscPayloadStream1, rscPayloadStream2] = rscStream.tee();
+            rscStream = rscPayloadStream1;
+            injectRSCStream = injectRSCPayload(rscPayloadStream2, {
+                nonce: requestInfo.rw.nonce,
+            });
+        }
+        let htmlStream = await renderDocumentHtmlStream({
+            rscPayloadStream: rscStream,
+            Document,
+            requestInfo,
+            shouldSSR,
+            onError,
+        });
+        if (injectRSCStream) {
+            htmlStream = htmlStream.pipeThrough(injectRSCStream);
+        }
+        return htmlStream;
     });
-    if (injectRSCStream) {
-        htmlStream = htmlStream.pipeThrough(injectRSCStream);
-    }
-    return htmlStream;
 };

package/dist/scripts/worker-run.mjs

@@ -1,6 +1,7 @@
 import dbg from "debug";
 import getPort from "get-port";
 import path from "path";
+import { pathToFileURL } from "url";
 import * as vite from "vite";
 import { createLogger } from "vite";
 const debug = dbg("rwsdk:worker-run");
@@ -42,7 +43,8 @@ const main = async () => {
             },
         });
         await server.listen();
-        const url = `http://localhost:${port}/__worker-run?script=${scriptPath}`;
+        const fileUrl = pathToFileURL(scriptPath).href;
+        const url = `http://localhost:${port}/__worker-run?script=${encodeURIComponent(fileUrl)}`;
         debug("Fetching %s", url);
         const response = await fetch(url);
         debug("Response from worker: %s", response);

package/dist/vite/configPlugin.mjs

@@ -93,6 +93,7 @@ export const configPlugin = ({ silent, projectRootDir, workerEntryPathname, clie
                             "rwsdk/constants",
                             "rwsdk/debug",
                             "rwsdk/realtime/client",
+                            "rwsdk/router",
                             "rwsdk/turnstile",
                         ],
                         entries: [],

package/dist/vite/getViteEsbuild.mjs

@@ -1,5 +1,6 @@
 import { createRequire } from "node:module";
 import path from "node:path";
+import { pathToFileURL } from "node:url";
 const require = createRequire(import.meta.url);
 export async function getViteEsbuild(projectRootDir) {
     const vitePath = require.resolve("vite/package.json", {
@@ -7,6 +8,6 @@ export async function getViteEsbuild(projectRootDir) {
     });
     const viteDir = path.dirname(vitePath);
     const esbuildPath = require.resolve("esbuild", { paths: [viteDir] });
-    const esbuildModule = await import(esbuildPath);
+    const esbuildModule = await import(pathToFileURL(esbuildPath).href);
     return esbuildModule.default || esbuildModule;
 }

package/dist/vite/moveStaticAssetsPlugin.mjs

@@ -1,13 +1,23 @@
-import { $sh } from "../lib/$.mjs";
+import path from "node:path";
+import fs from "fs-extra";
+import { glob } from "glob";
 export const moveStaticAssetsPlugin = ({ rootDir, }) => ({
     name: "rwsdk:move-static-assets",
     apply: "build",
     async closeBundle() {
         if (this.environment.name === "worker" &&
             process.env.RWSDK_BUILD_PASS === "linker") {
-            await $sh({
-                cwd: rootDir,
-            }) `mv dist/worker/assets/*.css dist/client/assets/ || true`;
+            const sourceDir = path.join(rootDir, "dist", "worker", "assets");
+            const destDir = path.join(rootDir, "dist", "client", "assets");
+            const cssFiles = await glob("*.css", { cwd: sourceDir });
+            if (cssFiles.length > 0) {
+                await fs.ensureDir(destDir);
+                for (const file of cssFiles) {
+                    const sourceFile = path.join(sourceDir, file);
+                    const destFile = path.join(destDir, file);
+                    await fs.move(sourceFile, destFile, { overwrite: true });
+                }
+            }
         }
     },
 });

package/dist/vite/runDirectivesScan.mjs

@@ -210,11 +210,11 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
                 });
                 build.onLoad({ filter: /\.(m|c)?[jt]sx?$|\.mdx$/ }, async (args) => {
                     log("onLoad called for:", args.path);
-                    if (!args.path.startsWith("/") ||
+                    if (!path.isAbsolute(args.path) ||
                         args.path.includes("virtual:") ||
                         isExternalUrl(args.path)) {
                         log("Skipping file due to filter:", args.path, {
-                            startsWithSlash: args.path.startsWith("/"),
+                            isAbsolute: path.isAbsolute(args.path),
                             hasVirtual: args.path.includes("virtual:"),
                             isExternal: isExternalUrl(args.path),
                         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "1.0.0-beta.20",
+  "version": "1.0.0-beta.22",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {
@@ -58,7 +58,8 @@
     },
     "./router": {
       "types": "./dist/runtime/entries/router.d.ts",
-      "default": "./dist/runtime/entries/router.js"
+      "workerd": "./dist/runtime/entries/router.js",
+      "default": "./dist/runtime/entries/routerClient.js"
     },
     "./auth": {
       "types": "./dist/runtime/entries/auth.d.ts",