rwsdk 0.0.84 → 0.0.85

package/dist/vite/checkIsUsingPrisma.d.mts

@@ -1,3 +1,6 @@
-export declare const checkIsUsingPrisma: ({ projectRootDir, }: {
+export type PrismaCheckResult = {
+    isUsingPrisma: boolean;
+};
+export declare const checkPrismaStatus: ({ projectRootDir, }: {
     projectRootDir: string;
-}) => boolean;
+}) => PrismaCheckResult;

package/dist/vite/checkIsUsingPrisma.mjs

@@ -1,9 +1,18 @@
 import enhancedResolve from "enhanced-resolve";
-export const checkIsUsingPrisma = ({ projectRootDir, }) => {
+const isUsingPrisma = ({ projectRootDir }) => {
     try {
-        return Boolean(enhancedResolve.sync(projectRootDir, "@prisma/client"));
+        const prismaClientPath = enhancedResolve.sync(projectRootDir, "@prisma/client");
+        if (!prismaClientPath) {
+            return false;
+        }
+        return true;
     }
     catch {
         return false;
     }
 };
+export const checkPrismaStatus = ({ projectRootDir, }) => {
+    return {
+        isUsingPrisma: isUsingPrisma({ projectRootDir }),
+    };
+};

package/dist/vite/configPlugin.d.mts

@@ -1,9 +1,8 @@
 import { Plugin } from "vite";
-export declare const configPlugin: ({ mode, silent, projectRootDir, clientEntryPathname, workerEntryPathname, isUsingPrisma, }: {
+export declare const configPlugin: ({ mode, silent, projectRootDir, clientEntryPathname, workerEntryPathname, }: {
     mode: "development" | "production";
     silent: boolean;
     projectRootDir: string;
     clientEntryPathname: string;
     workerEntryPathname: string;
-    isUsingPrisma: boolean;
 }) => Plugin;

package/dist/vite/configPlugin.mjs

@@ -8,7 +8,7 @@ const ignoreVirtualModules = {
         });
     },
 };
-export const configPlugin = ({ mode, silent, projectRootDir, clientEntryPathname, workerEntryPathname, isUsingPrisma, }) => ({
+export const configPlugin = ({ mode, silent, projectRootDir, clientEntryPathname, workerEntryPathname, }) => ({
     name: "rwsdk:config",
     config: (_, { command }) => {
         const baseConfig = {
@@ -50,23 +50,7 @@ export const configPlugin = ({ mode, silent, projectRootDir, clientEntryPathname
                         noDiscovery: false,
                         esbuildOptions: {
                             conditions: ["workerd", "react-server"],
-                            plugins: [
-                                ...(isUsingPrisma
-                                    ? [
-                                        {
-                                            name: "rwsdk:prisma-client-wasm",
-                                            setup(build) {
-                                                build.onResolve({ filter: /.prisma\/client\/default/ }, async (args) => {
-                                                    return {
-                                                        path: resolve(projectRootDir, "node_modules/.prisma/client/wasm.js"),
-                                                    };
-                                                });
-                                            },
-                                        },
-                                    ]
-                                    : []),
-                                ignoreVirtualModules,
-                            ],
+                            plugins: [ignoreVirtualModules],
                         },
                         include: [
                             "react/jsx-runtime",
@@ -95,13 +79,7 @@ export const configPlugin = ({ mode, silent, projectRootDir, clientEntryPathname
             },
             resolve: {
                 conditions: ["workerd"],
-                alias: {
-                    ...(isUsingPrisma
-                        ? {
-                            ".prisma/client/default": resolve(projectRootDir, "node_modules/.prisma/client/wasm.js"),
-                        }
-                        : {}),
-                },
+                alias: [],
             },
         };
         if (command === "build") {
@@ -110,7 +88,7 @@ export const configPlugin = ({ mode, silent, projectRootDir, clientEntryPathname
                     worker: {
                         build: {
                             rollupOptions: {
-                                external: ["cloudflare:workers", "node:stream", /\.wasm$/],
+                                external: ["cloudflare:workers", "node:stream"],
                             },
                         },
                     },

package/dist/vite/ensureAliasArray.d.mts

@@ -0,0 +1,2 @@
+import type { Alias, UserConfig } from "vite";
+export declare const ensureAliasArray: (config: UserConfig) => Alias[];

package/dist/vite/ensureAliasArray.mjs

@@ -0,0 +1,11 @@
+export const ensureAliasArray = (config) => {
+    config.resolve ??= {};
+    if (!config.resolve?.alias) {
+        config.resolve.alias = [];
+    }
+    else if (!Array.isArray(config.resolve.alias)) {
+        const existingAlias = config.resolve.alias;
+        config.resolve.alias = Object.entries(existingAlias).map(([find, replacement]) => ({ find, replacement }));
+    }
+    return config.resolve.alias;
+};

package/dist/vite/moveStaticAssetsPlugin.mjs

@@ -6,8 +6,7 @@ export const moveStaticAssetsPlugin = ({ rootDir, }) => ({
         if (this.environment.name === "worker") {
             await $sh({
                 cwd: rootDir,
-            }) `mv dist/worker/assets/* dist/client/assets || true`;
-            await $sh({ cwd: rootDir }) `rmdir dist/worker/assets || true`;
+            }) `mv dist/worker/assets/*.css dist/client/assets/ || true`;
         }
     },
 });

package/dist/vite/prismaPlugin.d.mts

@@ -0,0 +1,4 @@
+import { Plugin } from "vite";
+export declare const prismaPlugin: ({ projectRootDir, }: {
+    projectRootDir: string;
+}) => Promise<Plugin | undefined>;

package/dist/vite/prismaPlugin.mjs

@@ -0,0 +1,43 @@
+import { resolve } from "node:path";
+import { invalidateCacheIfPrismaClientChanged } from "./invalidateCacheIfPrismaClientChanged.mjs";
+import { checkPrismaStatus } from "./checkIsUsingPrisma.mjs";
+import { ensureAliasArray } from "./ensureAliasArray.mjs";
+export const prismaPlugin = async ({ projectRootDir, }) => {
+    if (!checkPrismaStatus({ projectRootDir }).isUsingPrisma) {
+        return;
+    }
+    // context(justinvdm, 10 Mar 2025): We need to use vite optimizeDeps for all deps to work with @cloudflare/vite-plugin.
+    // Thing is, @prisma/client has generated code. So users end up with a stale @prisma/client
+    // when they change their prisma schema and regenerate the client, until clearing out node_modules/.vite
+    // We can't exclude @prisma/client from optimizeDeps since we need it there for @cloudflare/vite-plugin to work.
+    // But we can manually invalidate the cache if the prisma schema changes.
+    await invalidateCacheIfPrismaClientChanged({
+        projectRootDir,
+    });
+    return {
+        name: "rwsdk:prisma",
+        configEnvironment(name, config) {
+            if (name !== "worker") {
+                return;
+            }
+            const wasmPath = resolve(projectRootDir, "node_modules/.prisma/client/wasm.js");
+            config.optimizeDeps ??= {};
+            config.optimizeDeps.esbuildOptions ??= {};
+            config.optimizeDeps.esbuildOptions.plugins ??= [];
+            config.optimizeDeps.esbuildOptions.plugins.push({
+                name: "rwsdk:prisma",
+                setup(build) {
+                    build.onResolve({ filter: /^.prisma\/client\/default/ }, async () => {
+                        return {
+                            path: wasmPath,
+                        };
+                    });
+                },
+            });
+            ensureAliasArray(config).push({
+                find: /^\.prisma\/client\/default/,
+                replacement: wasmPath,
+            });
+        },
+    };
+};

package/dist/vite/reactConditionsResolverPlugin.mjs

@@ -5,6 +5,7 @@ import { pathExists } from "fs-extra";
 import enhancedResolve from "enhanced-resolve";
 import { VENDOR_DIST_DIR } from "../lib/constants.mjs";
 import { createRequire } from "node:module";
+import { ensureAliasArray } from "./ensureAliasArray.mjs";
 const log = debug("rwsdk:vite:react-conditions");
 // Define package sets for each environment
 const WORKER_PACKAGES = [
@@ -127,11 +128,7 @@ export const reactConditionsResolverPlugin = async ({ mode = "development", comm
         config.optimizeDeps.include ??= [];
         config.optimizeDeps.include.push(...Object.keys(imports));
         config.resolve ??= {};
-        config.resolve.alias ??= [];
-        if (!Array.isArray(config.resolve.alias)) {
-            const existingAlias = config.resolve.alias;
-            config.resolve.alias = Object.entries(existingAlias).map(([find, replacement]) => ({ find, replacement }));
-        }
+        ensureAliasArray(config);
         Object.entries(imports).forEach(([id, resolvedPath]) => {
             const exactMatchRegex = new RegExp(`^${id.replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&")}$`);
             config.resolve.alias.push({

package/dist/vite/redwoodPlugin.mjs

@@ -6,17 +6,15 @@ import { useServerPlugin } from "./useServerPlugin.mjs";
 import { useClientPlugin } from "./useClientPlugin.mjs";
 import { useClientLookupPlugin } from "./useClientLookupPlugin.mjs";
 import { miniflarePlugin } from "./miniflarePlugin.mjs";
-import { copyPrismaWasmPlugin } from "./copyPrismaWasmPlugin.mjs";
 import { moveStaticAssetsPlugin } from "./moveStaticAssetsPlugin.mjs";
 import { configPlugin } from "./configPlugin.mjs";
 import { $ } from "../lib/$.mjs";
 import { reactConditionsResolverPlugin } from "./reactConditionsResolverPlugin.mjs";
-import { invalidateCacheIfPrismaClientChanged } from "./invalidateCacheIfPrismaClientChanged.mjs";
 import { findWranglerConfig } from "../lib/findWranglerConfig.mjs";
 import { pathExists } from "fs-extra";
 import { injectVitePreamble } from "./injectVitePreamblePlugin.mjs";
 import { vitePreamblePlugin } from "./vitePreamblePlugin.mjs";
-import { checkIsUsingPrisma } from "./checkIsUsingPrisma.mjs";
+import { prismaPlugin } from "./prismaPlugin.mjs";
 export const redwoodPlugin = async (options = {}) => {
     const projectRootDir = process.cwd();
     const mode = options.mode ??
@@ -35,15 +33,6 @@ export const redwoodPlugin = async (options = {}) => {
             stdio: ["ignore", "inherit", "inherit"],
         }) `npm run dev:init`;
     }
-    const isUsingPrisma = checkIsUsingPrisma({ projectRootDir });
-    // context(justinvdm, 10 Mar 2025): We need to use vite optimizeDeps for all deps to work with @cloudflare/vite-plugin.
-    // Thing is, @prisma/client has generated code. So users end up with a stale @prisma/client
-    // when they change their prisma schema and regenerate the client, until clearing out node_modules/.vite
-    // We can't exclude @prisma/client from optimizeDeps since we need it there for @cloudflare/vite-plugin to work.
-    // But we can manually invalidate the cache if the prisma schema changes.
-    await invalidateCacheIfPrismaClientChanged({
-        projectRootDir,
-    });
     return [
         configPlugin({
             mode,
@@ -51,7 +40,6 @@ export const redwoodPlugin = async (options = {}) => {
             projectRootDir,
             clientEntryPathname,
             workerEntryPathname,
-            isUsingPrisma,
         }),
         reactConditionsResolverPlugin({ projectRootDir, mode }),
         tsconfigPaths({ root: projectRootDir }),
@@ -73,9 +61,7 @@ export const redwoodPlugin = async (options = {}) => {
         transformJsxScriptTagsPlugin({
             manifestPath: resolve(projectRootDir, "dist", "client", ".vite", "manifest.json"),
         }),
-        ...(isUsingPrisma
-            ? [copyPrismaWasmPlugin({ rootDir: projectRootDir })]
-            : []),
         moveStaticAssetsPlugin({ rootDir: projectRootDir }),
+        prismaPlugin({ projectRootDir }),
     ];
 };

package/dist/vite/wasmPlugin.d.mts

@@ -0,0 +1,2 @@
+import type { Plugin } from "vite";
+export declare const wasmPlugin: () => Plugin;

package/dist/vite/wasmPlugin.mjs

@@ -0,0 +1,14 @@
+export const wasmPlugin = () => {
+    return {
+        name: "rwsdk:wasm",
+        resolveId(id) {
+            console.log("######", id);
+            if (id.startsWith("@id/__CLOUDFLARE_MODULE__CompiledWasm__") &&
+                id.endsWith(".wasm__")) {
+                const r = id.slice("@id/__CLOUDFLARE_MODULE__CompiledWasm__".length, id.length - "__".length);
+                console.log("##################33", r);
+                return r;
+            }
+        },
+    };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "0.0.84",
+  "version": "0.0.85",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {
@@ -89,7 +89,7 @@
   "author": "RedwoodSDK <peter@redwoodjs.com>",
   "license": "MIT",
   "dependencies": {
-    "@cloudflare/vite-plugin": "^1.1.0",
+    "@cloudflare/vite-plugin": "0.0.0-1bae8618b",
     "@cloudflare/workers-types": "^4.20250407.0",
     "@puppeteer/browsers": "^2.8.0",
     "@types/fs-extra": "^11.0.4",
@@ -120,7 +120,7 @@
     "unique-names-generator": "^4.7.1",
     "vibe-rules": "^0.2.31",
     "vite-tsconfig-paths": "^5.1.4",
-    "wrangler": "^4.14.1"
+    "wrangler": "^4.16.0"
   },
   "peerDependencies": {
     "vite": "^6.2.6"