rwsdk 0.2.0-alpha.15 → 0.2.0-alpha.16

package/dist/vite/hasOwnReactVitePlugin.d.mts

@@ -0,0 +1,3 @@
+export declare function hasOwnReactVitePlugin({ rootProjectDir, }: {
+    rootProjectDir: string;
+}): Promise<boolean>;

package/dist/vite/hasOwnReactVitePlugin.mjs

@@ -0,0 +1,14 @@
+import { readFile } from "fs/promises";
+import path from "path";
+export async function hasOwnReactVitePlugin({ rootProjectDir, }) {
+    const packageJsonPath = path.join(rootProjectDir, "package.json");
+    try {
+        const packageJson = JSON.parse(await readFile(packageJsonPath, "utf-8"));
+        return !!(packageJson.dependencies?.["@vitejs/plugin-react"] ||
+            packageJson.devDependencies?.["@vitejs/plugin-react"]);
+    }
+    catch (error) {
+        console.error("Error reading package.json:", error);
+        return false;
+    }
+}

package/dist/vite/reactConditionsResolverPlugin.d.mts

@@ -10,7 +10,6 @@ export declare const ENV_RESOLVERS: {
     worker: enhancedResolve.ResolveFunction;
     client: enhancedResolve.ResolveFunction;
 };
-export declare const ENV_IMPORT_MAPPINGS: {
-    [k: string]: Map<string, string>;
-};
-export declare const reactConditionsResolverPlugin: () => Plugin[];
+export declare const reactConditionsResolverPlugin: ({ projectRootDir, }: {
+    projectRootDir: string;
+}) => Plugin[];

package/dist/vite/reactConditionsResolverPlugin.mjs

@@ -3,6 +3,7 @@ import { ROOT_DIR } from "../lib/constants.mjs";
 import enhancedResolve from "enhanced-resolve";
 import { ensureAliasArray } from "./ensureAliasArray.mjs";
 const log = debug("rwsdk:vite:react-conditions-resolver-plugin");
+const REACT_PREFIXES = ["react", "react-dom", "react-server-dom-webpack"];
 export const ENV_REACT_IMPORTS = {
     worker: [
         "react",
@@ -41,28 +42,41 @@ export const ENV_RESOLVERS = {
         conditionNames: ["browser", "default"],
     }),
 };
-export const ENV_IMPORT_MAPPINGS = Object.fromEntries(Object.keys(ENV_RESOLVERS).map((env) => [
-    env,
-    resolveEnvImportMappings(env),
-]));
-function resolveEnvImportMappings(env) {
-    process.env.VERBOSE &&
-        log("Resolving environment import mappings for env=%s", env);
-    const mappings = new Map();
-    const reactImports = ENV_REACT_IMPORTS[env];
-    for (const importRequest of reactImports) {
+function resolveReactImport(id, envName, projectRootDir, isReactImportKnown = false) {
+    if (!isReactImportKnown) {
+        const isReactImport = REACT_PREFIXES.some((prefix) => id === prefix || id.startsWith(`${prefix}/`));
+        if (!isReactImport) {
+            return undefined;
+        }
+    }
+    let resolved;
+    try {
+        resolved = ENV_RESOLVERS[envName](projectRootDir, id) || undefined;
+        process.env.VERBOSE &&
+            log("Successfully resolved %s to %s for env=%s from project root", id, resolved, envName);
+    }
+    catch {
         process.env.VERBOSE &&
-            log("Resolving import request=%s for env=%s", importRequest, env);
-        let resolved = false;
+            log("Failed to resolve %s for env=%s from project root, trying ROOT_DIR", id, envName);
         try {
-            resolved = ENV_RESOLVERS[env](ROOT_DIR, importRequest);
+            resolved = ENV_RESOLVERS[envName](ROOT_DIR, id) || undefined;
             process.env.VERBOSE &&
-                log("Successfully resolved %s to %s for env=%s", importRequest, resolved, env);
+                log("Successfully resolved %s to %s for env=%s from rwsdk root", id, resolved, envName);
         }
         catch {
             process.env.VERBOSE &&
-                log("Failed to resolve %s for env=%s", importRequest, env);
+                log("Failed to resolve %s for env=%s", id, envName);
         }
+    }
+    return resolved;
+}
+function resolveEnvImportMappings(env, projectRootDir) {
+    process.env.VERBOSE &&
+        log("Resolving environment import mappings for env=%s", env);
+    const mappings = new Map();
+    const reactImports = ENV_REACT_IMPORTS[env];
+    for (const importRequest of reactImports) {
+        const resolved = resolveReactImport(importRequest, env, projectRootDir, true);
         if (resolved) {
             mappings.set(importRequest, resolved);
             log("Added mapping for %s -> %s in env=%s", importRequest, resolved, env);
@@ -71,39 +85,45 @@ function resolveEnvImportMappings(env) {
     log("Environment import mappings complete for env=%s: %d mappings", env, mappings.size);
     return mappings;
 }
-function createEsbuildResolverPlugin(envName) {
-    const mappings = ENV_IMPORT_MAPPINGS[envName];
-    if (!mappings) {
-        return null;
-    }
-    return {
-        name: `rwsdk:react-conditions-resolver-esbuild-${envName}`,
-        setup(build) {
-            build.onResolve({ filter: /.*/ }, (args) => {
-                process.env.VERBOSE &&
-                    log("ESBuild resolving %s for env=%s, args=%O", args.path, envName, args);
-                const resolved = mappings.get(args.path);
-                if (resolved && args.importer !== "") {
-                    process.env.VERBOSE &&
-                        log("ESBuild resolving %s -> %s for env=%s", args.path, resolved, envName);
-                    if (args.path === "react-server-dom-webpack/client.edge") {
-                        return;
-                    }
-                    return {
-                        path: resolved,
-                    };
-                }
-                else {
-                    process.env.VERBOSE &&
-                        log("ESBuild no resolution found for %s for env=%s", args.path, envName);
-                }
-            });
-        },
-    };
-}
-export const reactConditionsResolverPlugin = () => {
+export const reactConditionsResolverPlugin = ({ projectRootDir, }) => {
     log("Initializing react conditions resolver plugin");
     let isBuild = false;
+    const ENV_IMPORT_MAPPINGS = Object.fromEntries(Object.keys(ENV_RESOLVERS).map((env) => [
+        env,
+        resolveEnvImportMappings(env, projectRootDir),
+    ]));
+    function createEsbuildResolverPlugin(envName, mappings) {
+        if (!mappings) {
+            return null;
+        }
+        return {
+            name: `rwsdk:react-conditions-resolver-esbuild-${envName}`,
+            setup(build) {
+                build.onResolve({ filter: /.*/ }, (args) => {
+                    process.env.VERBOSE &&
+                        log("ESBuild resolving %s for env=%s, args=%O", args.path, envName, args);
+                    let resolved = mappings.get(args.path);
+                    if (!resolved) {
+                        resolved = resolveReactImport(args.path, envName, projectRootDir);
+                    }
+                    if (resolved && args.importer !== "") {
+                        process.env.VERBOSE &&
+                            log("ESBuild resolving %s -> %s for env=%s", args.path, resolved, envName);
+                        if (args.path === "react-server-dom-webpack/client.edge") {
+                            return;
+                        }
+                        return {
+                            path: resolved,
+                        };
+                    }
+                    else {
+                        process.env.VERBOSE &&
+                            log("ESBuild no resolution found for %s for env=%s", args.path, envName);
+                    }
+                });
+            },
+        };
+    }
     return [
         {
             name: "rwsdk:react-conditions-resolver:config",
@@ -125,7 +145,7 @@ export const reactConditionsResolverPlugin = () => {
                         config.environments[envName] = {};
                     }
                     const envConfig = config.environments[envName];
-                    const esbuildPlugin = createEsbuildResolverPlugin(envName);
+                    const esbuildPlugin = createEsbuildResolverPlugin(envName, mappings);
                     if (esbuildPlugin && mappings) {
                         envConfig.optimizeDeps ??= {};
                         envConfig.optimizeDeps.esbuildOptions ??= {};
@@ -166,7 +186,10 @@ export const reactConditionsResolverPlugin = () => {
                         log("No mappings found for environment: %s", envName);
                     return;
                 }
-                const resolved = mappings.get(id);
+                let resolved = mappings.get(id);
+                if (!resolved) {
+                    resolved = resolveReactImport(id, envName, projectRootDir);
+                }
                 if (resolved) {
                     log("Resolved %s -> %s for env=%s", id, resolved, envName);
                     return resolved;

package/dist/vite/redwoodPlugin.d.mts

@@ -3,6 +3,7 @@ export type RedwoodPluginOptions = {
     silent?: boolean;
     rootDir?: string;
     includeCloudflarePlugin?: boolean;
+    includeReactPlugin?: boolean;
     configPath?: string;
     entry?: {
         client?: string | string[];

package/dist/vite/redwoodPlugin.mjs

@@ -3,6 +3,7 @@ import { unstable_readConfig } from "wrangler";
 import { cloudflare } from "@cloudflare/vite-plugin";
 import { devServerConstantPlugin } from "./devServerConstant.mjs";
 import { hasOwnCloudflareVitePlugin } from "./hasOwnCloudflareVitePlugin.mjs";
+import { hasOwnReactVitePlugin } from "./hasOwnReactVitePlugin.mjs";
 import reactPlugin from "@vitejs/plugin-react";
 import tsconfigPaths from "vite-tsconfig-paths";
 import { transformJsxScriptTagsPlugin } from "./transformJsxScriptTagsPlugin.mjs";
@@ -41,6 +42,8 @@ export const redwoodPlugin = async (options = {}) => {
     const serverFiles = new Set();
     const shouldIncludeCloudflarePlugin = options.includeCloudflarePlugin ??
         !(await hasOwnCloudflareVitePlugin({ rootProjectDir: projectRootDir }));
+    const shouldIncludeReactPlugin = options.includeReactPlugin ??
+        !(await hasOwnReactVitePlugin({ rootProjectDir: projectRootDir }));
     // context(justinvdm, 31 Mar 2025): We assume that if there is no .wrangler directory,
     // then this is fresh install, and we run `npm run dev:init` here.
     if (process.env.RWSDK_WORKER_RUN !== "1" &&
@@ -68,7 +71,7 @@ export const redwoodPlugin = async (options = {}) => {
             serverFiles,
             projectRootDir,
         }),
-        reactConditionsResolverPlugin(),
+        reactConditionsResolverPlugin({ projectRootDir }),
         tsconfigPaths({ root: projectRootDir }),
         shouldIncludeCloudflarePlugin
             ? cloudflare({
@@ -83,7 +86,7 @@ export const redwoodPlugin = async (options = {}) => {
             viteEnvironment: { name: "worker" },
             workerEntryPathname,
         }),
-        reactPlugin(),
+        shouldIncludeReactPlugin ? reactPlugin() : [],
         directivesPlugin({
             projectRootDir,
             clientFiles,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "0.2.0-alpha.15",
+  "version": "0.2.0-alpha.16",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {
@@ -144,10 +144,7 @@
     "picocolors": "^1.1.1",
     "proper-lockfile": "^4.1.2",
     "puppeteer-core": "^22.8.1",
-    "react": "19.2.0-canary-39cad7af-20250411",
-    "react-dom": "19.2.0-canary-39cad7af-20250411",
     "react-is": "^19.0.0",
-    "react-server-dom-webpack": "19.2.0-canary-39cad7af-20250411",
     "rsc-html-stream": "^0.0.6",
     "tmp-promise": "^3.0.3",
     "ts-morph": "^25.0.1",
@@ -157,7 +154,26 @@
     "wrangler": "^4.20.5"
   },
   "peerDependencies": {
-    "vite": "^6.2.6"
+    "vite": "^6.2.6",
+    "react": ">=19.2.0-0 <20",
+    "react-dom": ">=19.2.0-0 <20",
+    "react-server-dom-webpack": ">=19.2.0-0 <20"
+  },
+  "optionalDependencies": {
+    "react": "19.2.0-canary-39cad7af-20250411",
+    "react-dom": "19.2.0-canary-39cad7af-20250411",
+    "react-server-dom-webpack": "19.2.0-canary-39cad7af-20250411"
+  },
+  "peerDependenciesMeta": {
+    "react": {
+      "optional": true
+    },
+    "react-dom": {
+      "optional": true
+    },
+    "react-server-dom-webpack": {
+      "optional": true
+    }
   },
   "packageManager": "pnpm@9.14.4+sha512.c8180b3fbe4e4bca02c94234717896b5529740a6cbadf19fa78254270403ea2f27d4e1d46a08a0f56c89b63dc8ebfd3ee53326da720273794e6200fcf0d184ab",
   "devDependencies": {