rwsdk 0.1.0 → 0.1.1

package/dist/runtime/lib/db/SqliteDurableObject.d.ts

@@ -6,7 +6,7 @@ export declare class SqliteDurableObject<T = any> extends DurableObject {
     private initialized;
     private migrationTableName;
     constructor(ctx: DurableObjectState, env: any, migrations: Record<string, any>, migrationTableName?: string);
-    private initialize;
+    initialize(): Promise<void>;
     kyselyExecuteQuery<R>(compiledQuery: {
         sql: string;
         parameters: readonly unknown[];

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

@@ -4,19 +4,25 @@ import { DOWorkerDialect } from "./DOWorkerDialect.js";
 const createDurableObjectDb = (durableObjectBinding, name = "main") => {
     const durableObjectId = durableObjectBinding.idFromName(name);
     const stub = durableObjectBinding.get(durableObjectId);
+    stub.initialize();
     return new Kysely({
         dialect: new DOWorkerDialect({ stub }),
     });
 };
 export function createDb(durableObjectBinding, name = "main") {
     const cacheKey = `${durableObjectBinding}_${name}`;
+    const doCreateDb = () => {
+        let db = requestInfo.rw.databases.get(cacheKey);
+        if (!db) {
+            db = createDurableObjectDb(durableObjectBinding, name);
+            requestInfo.rw.databases.set(cacheKey, db);
+        }
+        return db;
+    };
+    doCreateDb();
     return new Proxy({}, {
         get(target, prop, receiver) {
-            let db = requestInfo.rw.databases.get(cacheKey);
-            if (!db) {
-                db = createDurableObjectDb(durableObjectBinding, name);
-                requestInfo.rw.databases.set(cacheKey, db);
-            }
+            const db = doCreateDb();
             const value = db[prop];
             if (typeof value === "function") {
                 return value.bind(db);

package/dist/vite/configPlugin.d.mts

@@ -1,10 +1,10 @@
 import { Plugin } from "vite";
 export declare const cloudflareBuiltInModules: string[];
 export declare const externalModules: string[];
-export declare const configPlugin: ({ mode, silent, projectRootDir, clientEntryPathname, workerEntryPathname, }: {
+export declare const configPlugin: ({ mode, silent, projectRootDir, clientEntryPathnames, workerEntryPathname, }: {
     mode: "development" | "production";
     silent: boolean;
     projectRootDir: string;
-    clientEntryPathname: string;
+    clientEntryPathnames: string[];
     workerEntryPathname: string;
 }) => Plugin;

package/dist/vite/configPlugin.mjs

@@ -15,7 +15,7 @@ export const externalModules = [
     ...builtinModules,
     ...builtinModules.map((m) => `node:${m}`),
 ];
-export const configPlugin = ({ mode, silent, projectRootDir, clientEntryPathname, workerEntryPathname, }) => ({
+export const configPlugin = ({ mode, silent, projectRootDir, clientEntryPathnames, workerEntryPathname, }) => ({
     name: "rwsdk:config",
     config: (_, { command }) => {
         const baseConfig = {
@@ -39,9 +39,7 @@ export const configPlugin = ({ mode, silent, projectRootDir, clientEntryPathname
                         outDir: resolve(projectRootDir, "dist", "client"),
                         manifest: true,
                         rollupOptions: {
-                            input: {
-                                client: clientEntryPathname,
-                            },
+                            input: clientEntryPathnames,
                         },
                     },
                     define: {

package/dist/vite/injectVitePreamblePlugin.d.mts

@@ -1,5 +1,5 @@
 import { type Plugin } from "vite";
-export declare const injectVitePreamble: ({ clientEntryPathname, mode, }: {
-    clientEntryPathname: string;
+export declare const injectVitePreamble: ({ clientEntryPathnames, mode, }: {
+    clientEntryPathnames: string[];
     mode: "development" | "production";
 }) => Plugin;

package/dist/vite/injectVitePreamblePlugin.mjs

@@ -1,9 +1,12 @@
 import MagicString from "magic-string";
-export const injectVitePreamble = ({ clientEntryPathname, mode, }) => ({
+export const injectVitePreamble = ({ clientEntryPathnames, mode, }) => ({
     name: "rwsdk:inject-vite-preamble",
     apply: "serve",
     transform(code, id) {
-        if (id !== clientEntryPathname) {
+        if (this.environment.name !== "client") {
+            return;
+        }
+        if (!clientEntryPathnames.includes(id)) {
             return;
         }
         // Only inject preamble in development mode

package/dist/vite/reactConditionsResolverPlugin.d.mts

@@ -13,4 +13,4 @@ export declare const ENV_RESOLVERS: {
 export declare const ENV_IMPORT_MAPPINGS: {
     [k: string]: Map<string, string>;
 };
-export declare const reactConditionsResolverPlugin: () => Promise<Plugin>;
+export declare const reactConditionsResolverPlugin: () => Plugin[];

package/dist/vite/reactConditionsResolverPlugin.mjs

@@ -95,71 +95,76 @@ function createEsbuildResolverPlugin(envName) {
         },
     };
 }
-export const reactConditionsResolverPlugin = async () => {
+export const reactConditionsResolverPlugin = () => {
     log("Initializing react conditions resolver plugin");
     let isBuild = false;
-    return {
-        name: "rwsdk:react-conditions-resolver",
-        enforce: "post",
-        config(config, { command }) {
-            isBuild = command === "build";
-            log("Configuring plugin for command=%s", command);
+    return [
+        {
+            name: "rwsdk:react-conditions-resolver:config",
+            enforce: "post",
+            config(config, { command }) {
+                isBuild = command === "build";
+                log("Configuring plugin for command=%s", command);
+            },
+            configResolved(config) {
+                log("Setting up resolve aliases and optimizeDeps for each environment");
+                // Set up aliases and optimizeDeps for each environment
+                for (const [envName, mappings] of Object.entries(ENV_IMPORT_MAPPINGS)) {
+                    const reactImports = ENV_REACT_IMPORTS[envName];
+                    // Ensure environment config exists
+                    if (!config.environments) {
+                        config.environments = {};
+                    }
+                    if (!config.environments[envName]) {
+                        config.environments[envName] = {};
+                    }
+                    const envConfig = config.environments[envName];
+                    const esbuildPlugin = createEsbuildResolverPlugin(envName);
+                    if (esbuildPlugin && mappings) {
+                        envConfig.optimizeDeps ??= {};
+                        envConfig.optimizeDeps.esbuildOptions ??= {};
+                        envConfig.optimizeDeps.esbuildOptions.define ??= {};
+                        envConfig.optimizeDeps.esbuildOptions.define["process.env.NODE_ENV"] = JSON.stringify(process.env.NODE_ENV ?? "production");
+                        envConfig.optimizeDeps.esbuildOptions.plugins ??= [];
+                        envConfig.optimizeDeps.esbuildOptions.plugins.push(esbuildPlugin);
+                        envConfig.optimizeDeps.include ??= [];
+                        envConfig.optimizeDeps.include.push(...reactImports);
+                        log("Added esbuild plugin and optimizeDeps includes for environment: %s", envName);
+                    }
+                    const aliases = ensureAliasArray(envConfig);
+                    for (const [find, replacement] of mappings) {
+                        const findRegex = new RegExp(`^${find.replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&")}$`);
+                        aliases.push({ find: findRegex, replacement });
+                        log("Added alias for env=%s: %s -> %s", envName, find, replacement);
+                    }
+                    log("Environment %s configured with %d aliases and %d optimizeDeps includes", envName, mappings.size, reactImports.length);
+                }
+            },
         },
-        configResolved(config) {
-            log("Setting up resolve aliases and optimizeDeps for each environment");
-            // Set up aliases and optimizeDeps for each environment
-            for (const [envName, mappings] of Object.entries(ENV_IMPORT_MAPPINGS)) {
-                const reactImports = ENV_REACT_IMPORTS[envName];
-                // Ensure environment config exists
-                if (!config.environments) {
-                    config.environments = {};
+        {
+            name: "rwsdk:react-conditions-resolver:resolveId",
+            enforce: "pre",
+            async resolveId(id, importer) {
+                if (!isBuild) {
+                    return;
                 }
-                if (!config.environments[envName]) {
-                    config.environments[envName] = {};
+                const envName = this.environment?.name;
+                if (!envName) {
+                    return;
                 }
-                const envConfig = config.environments[envName];
-                const esbuildPlugin = createEsbuildResolverPlugin(envName);
-                if (esbuildPlugin && mappings) {
-                    envConfig.optimizeDeps ??= {};
-                    envConfig.optimizeDeps.esbuildOptions ??= {};
-                    envConfig.optimizeDeps.esbuildOptions.define ??= {};
-                    envConfig.optimizeDeps.esbuildOptions.define["process.env.NODE_ENV"] =
-                        JSON.stringify(process.env.NODE_ENV ?? "production");
-                    envConfig.optimizeDeps.esbuildOptions.plugins ??= [];
-                    envConfig.optimizeDeps.esbuildOptions.plugins.push(esbuildPlugin);
-                    envConfig.optimizeDeps.include ??= [];
-                    envConfig.optimizeDeps.include.push(...reactImports);
-                    log("Added esbuild plugin and optimizeDeps includes for environment: %s", envName);
+                verboseLog("Resolving id=%s, environment=%s, importer=%s", id, envName, importer);
+                const mappings = ENV_IMPORT_MAPPINGS[envName];
+                if (!mappings) {
+                    verboseLog("No mappings found for environment: %s", envName);
+                    return;
                 }
-                const aliases = ensureAliasArray(envConfig);
-                for (const [find, replacement] of mappings) {
-                    const findRegex = new RegExp(`^${find.replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&")}$`);
-                    aliases.push({ find: findRegex, replacement });
-                    log("Added alias for env=%s: %s -> %s", envName, find, replacement);
+                const resolved = mappings.get(id);
+                if (resolved) {
+                    log("Resolved %s -> %s for env=%s", id, resolved, envName);
+                    return resolved;
                 }
-                log("Environment %s configured with %d aliases and %d optimizeDeps includes", envName, mappings.size, reactImports.length);
-            }
+                verboseLog("No resolution found for id=%s in env=%s", id, envName);
+            },
         },
-        async resolveId(id, importer) {
-            if (!isBuild) {
-                return;
-            }
-            const envName = this.environment?.name;
-            if (!envName) {
-                return;
-            }
-            verboseLog("Resolving id=%s, environment=%s, importer=%s", id, envName, importer);
-            const mappings = ENV_IMPORT_MAPPINGS[envName];
-            if (!mappings) {
-                verboseLog("No mappings found for environment: %s", envName);
-                return;
-            }
-            const resolved = mappings.get(id);
-            if (resolved) {
-                log("Resolved %s -> %s for env=%s", id, resolved, envName);
-                return resolved;
-            }
-            verboseLog("No resolution found for id=%s in env=%s", id, envName);
-        },
-    };
+    ];
 };

package/dist/vite/redwoodPlugin.d.mts

@@ -6,7 +6,7 @@ export type RedwoodPluginOptions = {
     includeCloudflarePlugin?: boolean;
     configPath?: string;
     entry?: {
-        client?: string;
+        client?: string | string[];
         worker?: string;
     };
 };

package/dist/vite/redwoodPlugin.mjs

@@ -24,7 +24,9 @@ export const redwoodPlugin = async (options = {}) => {
     const projectRootDir = process.cwd();
     const mode = options.mode ??
         (process.env.NODE_ENV === "development" ? "development" : "production");
-    const clientEntryPathname = resolve(projectRootDir, options?.entry?.client ?? "src/client.tsx");
+    const clientEntryPathnames = (Array.isArray(options.entry?.client)
+        ? options.entry.client
+        : [options.entry?.client ?? "src/client.tsx"]).map((entry) => resolve(projectRootDir, entry));
     const workerEntryPathname = resolve(projectRootDir, options?.entry?.worker ?? "src/worker.tsx");
     const clientFiles = new Set();
     const serverFiles = new Set();
@@ -49,7 +51,7 @@ export const redwoodPlugin = async (options = {}) => {
             mode,
             silent: options.silent ?? false,
             projectRootDir,
-            clientEntryPathname,
+            clientEntryPathnames,
             workerEntryPathname,
         }),
         ssrBridgePlugin({
@@ -77,7 +79,7 @@ export const redwoodPlugin = async (options = {}) => {
             serverFiles,
         }),
         vitePreamblePlugin(),
-        injectVitePreamble({ clientEntryPathname, mode }),
+        injectVitePreamble({ clientEntryPathnames, mode }),
         useClientLookupPlugin({
             projectRootDir,
             clientFiles,

package/package.json

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