rwsdk 1.0.0-beta.37 → 1.0.0-beta.39

package/dist/runtime/worker.js

@@ -26,6 +26,12 @@ export const defineApp = (routes) => {
             }
             else if (import.meta.env.VITE_IS_DEV_SERVER &&
                 new URL(request.url).pathname === "/__worker-run") {
+                const expectedToken = import.meta.env
+                    .VITE_RWSDK_WORKER_RUN_TOKEN;
+                const requestToken = request.headers.get("x-rwsdk-worker-run-token");
+                if (!expectedToken || expectedToken !== requestToken) {
+                    return new Response("Forbidden", { status: 403 });
+                }
                 const url = new URL(request.url);
                 const scriptPath = url.searchParams.get("script");
                 if (!scriptPath) {

package/dist/scripts/worker-run.mjs

@@ -1,3 +1,4 @@
+import crypto from "crypto";
 import dbg from "debug";
 import getPort from "get-port";
 import path from "path";
@@ -7,6 +8,8 @@ import { createLogger } from "vite";
 const debug = dbg("rwsdk:worker-run");
 const main = async () => {
     process.env.RWSDK_WORKER_RUN = "1";
+    const token = crypto.randomBytes(32).toString("hex");
+    process.env.VITE_RWSDK_WORKER_RUN_TOKEN = token;
     const relativeScriptPath = process.argv[2];
     if (!relativeScriptPath) {
         console.error("Error: Script path is required");
@@ -46,7 +49,11 @@ const main = async () => {
         const fileUrl = pathToFileURL(scriptPath).href;
         const url = `http://localhost:${port}/__worker-run?script=${encodeURIComponent(fileUrl)}`;
         debug("Fetching %s", url);
-        const response = await fetch(url);
+        const response = await fetch(url, {
+            headers: {
+                "x-rwsdk-worker-run-token": token,
+            },
+        });
         debug("Response from worker: %s", response);
         if (!response.ok) {
             const errorText = await response.text();

package/dist/vite/configPlugin.mjs

@@ -56,6 +56,7 @@ export const configPlugin = ({ silent, projectRootDir, workerEntryPathname, clie
             build: {
                 outDir: resolve(projectRootDir, "dist", "worker"),
                 emitAssets: true,
+                ssrManifest: true,
                 emptyOutDir: false,
                 ssr: true,
             },

package/dist/vite/diagnosticAssetGraphPlugin.d.mts

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

package/dist/vite/diagnosticAssetGraphPlugin.mjs

@@ -0,0 +1,41 @@
+export const diagnosticAssetGraphPlugin = ({ rootDir, }) => ({
+    name: "rwsdk:diagnostic-asset-graph",
+    apply: "build",
+    async buildEnd() {
+        if (this.environment.name === "worker" &&
+            process.env.RWSDK_BUILD_PASS === "worker") {
+            console.log("\n=== Asset Graph Diagnostic ===");
+            const moduleIds = Array.from(this.getModuleIds());
+            console.log(`Total modules: ${moduleIds.length}`);
+            const urlImportedModules = new Set();
+            const publicAssets = new Set();
+            for (const moduleId of moduleIds) {
+                const moduleInfo = this.getModuleInfo(moduleId);
+                if (moduleInfo) {
+                    const isImportedByUrl = moduleInfo.importers.some((importer) => importer.includes("?url")) || moduleId.includes("?url");
+                    if (isImportedByUrl) {
+                        urlImportedModules.add(moduleId);
+                        console.log(`\nModule imported with ?url: ${moduleId}`);
+                        console.log(`  Importers: ${moduleInfo.importers.join(", ")}`);
+                        if (moduleInfo.importedIds) {
+                            console.log(`  Imports: ${moduleInfo.importedIds.join(", ")}`);
+                            for (const importedId of moduleInfo.importedIds) {
+                                publicAssets.add(importedId);
+                            }
+                        }
+                    }
+                    if (moduleInfo.importers.some((importer) => importer.includes("Document.tsx"))) {
+                        console.log(`\nModule imported by Document.tsx: ${moduleId}`);
+                        console.log(`  Importers: ${moduleInfo.importers.join(", ")}`);
+                        if (moduleInfo.importedIds) {
+                            console.log(`  Imports: ${moduleInfo.importedIds.join(", ")}`);
+                        }
+                    }
+                }
+            }
+            console.log(`\nTotal modules imported with ?url: ${urlImportedModules.size}`);
+            console.log(`Total transitive dependencies: ${publicAssets.size}`);
+            console.log("\n=== End Asset Graph Diagnostic ===\n");
+        }
+    },
+});

package/dist/vite/moveStaticAssetsPlugin.mjs

@@ -11,8 +11,25 @@ export const moveStaticAssetsPlugin = ({ rootDir, }) => ({
             if (!(await fs.pathExists(sourceDir))) {
                 return;
             }
+            const ssrManifestPath = path.join(rootDir, "dist", "worker", ".vite", "ssr-manifest.json");
+            if (!(await fs.pathExists(ssrManifestPath))) {
+                return;
+            }
+            const manifestContent = await fs.readFile(ssrManifestPath, "utf-8");
+            const ssrManifest = JSON.parse(manifestContent);
+            const publicAssets = new Set();
+            for (const [moduleId, assetPaths] of Object.entries(ssrManifest)) {
+                if (moduleId.includes("?url")) {
+                    for (const assetPath of assetPaths) {
+                        const assetFileName = path.basename(assetPath);
+                        publicAssets.add(assetFileName);
+                    }
+                }
+            }
             const allFiles = await fs.readdir(sourceDir);
-            const filesToMove = allFiles.filter((file) => !file.endsWith(".js") && !file.endsWith(".map"));
+            const filesToMove = allFiles.filter((file) => !file.endsWith(".js") &&
+                !file.endsWith(".map") &&
+                publicAssets.has(file));
             if (filesToMove.length > 0) {
                 await fs.ensureDir(destDir);
                 for (const file of filesToMove) {
@@ -21,6 +38,7 @@ export const moveStaticAssetsPlugin = ({ rootDir, }) => ({
                     await fs.move(sourceFile, destFile, { overwrite: true });
                 }
             }
+            await fs.remove(ssrManifestPath);
         }
     },
 });

package/package.json

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