rwsdk 0.2.0-alpha.6-test.20250806100800 → 0.2.0-alpha.6-test.20250806132021

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

@@ -1,7 +1,6 @@
 import { Kysely } from "kysely";
-import { requestInfo } from "../../requestInfo/worker.js";
+import { requestInfo, waitForRequestInfo } from "../../requestInfo/worker.js";
 import { DOWorkerDialect } from "./DOWorkerDialect.js";
-const moduleLevelDbCache = new Map();
 const createDurableObjectDb = (durableObjectBinding, name = "main") => {
     const durableObjectId = durableObjectBinding.idFromName(name);
     const stub = durableObjectBinding.get(durableObjectId);
@@ -11,41 +10,26 @@ const createDurableObjectDb = (durableObjectBinding, name = "main") => {
     });
 };
 export function createDb(durableObjectBinding, name = "main") {
-    const cacheKey = `${durableObjectBinding.toString()}_${name}`;
-    const getDb = () => {
-        // requestInfo is available
-        if (requestInfo.rw) {
-            if (!requestInfo.rw.databases) {
-                requestInfo.rw.databases = new Map();
-            }
-            let db = requestInfo.rw.databases.get(cacheKey);
-            // db is in requestInfo cache
-            if (db) {
-                return db;
-            }
-            // db is in module-level cache
-            const moduleDb = moduleLevelDbCache.get(cacheKey);
-            if (moduleDb) {
-                requestInfo.rw.databases.set(cacheKey, moduleDb);
-                moduleLevelDbCache.delete(cacheKey);
-                return moduleDb;
-            }
-            // db is not in any cache
-            db = createDurableObjectDb(durableObjectBinding, name);
-            requestInfo.rw.databases.set(cacheKey, db);
-            return db;
+    const cacheKey = `${durableObjectBinding}_${name}`;
+    const doCreateDb = () => {
+        if (!requestInfo.rw) {
+            throw new Error(`
+  rwsdk: A database created using createDb() was accessed before requestInfo was available.
+
+  Please make sure database access is happening in a request handler or action handler.
+  `);
         }
-        // requestInfo is not available, use module-level cache
-        let db = moduleLevelDbCache.get(cacheKey);
+        let db = requestInfo.rw.databases.get(cacheKey);
         if (!db) {
             db = createDurableObjectDb(durableObjectBinding, name);
-            moduleLevelDbCache.set(cacheKey, db);
+            requestInfo.rw.databases.set(cacheKey, db);
         }
         return db;
     };
+    waitForRequestInfo().then(() => doCreateDb());
     return new Proxy({}, {
-        get(target, prop) {
-            const db = getDb();
+        get(target, prop, receiver) {
+            const db = doCreateDb();
             const value = db[prop];
             if (typeof value === "function") {
                 return value.bind(db);

package/dist/vite/ssrBridgePlugin.mjs

@@ -109,9 +109,9 @@ export const ssrBridgePlugin = ({ clientFiles, serverFiles, }) => {
                     }
                     log("Fetched SSR module code length: %d", code?.length || 0);
                     const { imports, dynamicImports } = findSsrImportSpecifiers(idForFetch, code || "", log);
-                    const allSpecifiers = [
-                        ...new Set([...imports, ...dynamicImports]),
-                    ].map((id) => id.startsWith("/@id/") ? id.slice("/@id/".length) : id);
+                    const allSpecifiers = [...new Set([...imports, ...dynamicImports])]
+                        .filter((id) => !id.includes("node_modules"))
+                        .map((id) => id.startsWith("/@id/") ? id.slice("/@id/".length) : id);
                     const switchCases = allSpecifiers
                         .map((specifier) => `    case "${specifier}": void import("${VIRTUAL_SSR_PREFIX}${specifier}");`)
                         .join("\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "0.2.0-alpha.6-test.20250806100800",
+  "version": "0.2.0-alpha.6-test.20250806132021",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {