vite-plugin-react-server 1.4.2 → 1.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-react-server",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "Vite plugin for React Server Components (RSC)",
   "type": "module",
   "main": "./dist/plugin/index.js",
@@ -40,7 +40,10 @@
       "default": "./dist/plugin/utils/index.server.js"
     },
     "./metrics": "./dist/plugin/metrics/index.js",
-    "./stream": "./dist/plugin/stream/index.js",
+    "./stream": {
+      "react-server": "./dist/plugin/stream/index.server.js",
+      "default": "./dist/plugin/stream/index.client.js"
+    },
     "./stream/client": "./dist/plugin/stream/index.client.js",
     "./stream/server": "./dist/plugin/stream/index.server.js",
     "./env": {
@@ -48,25 +51,128 @@
     },
     "./config": "./dist/plugin/config/index.js",
     "./error": "./dist/plugin/error/index.js",
-    "./vendor": "./dist/plugin/vendor/index.js",
+    "./vendor": {
+      "react-server": "./dist/plugin/vendor/vendor.server.js",
+      "default": "./dist/plugin/vendor/vendor.client.js"
+    },
     "./vendor.server": "./dist/plugin/vendor/vendor.server.js",
     "./vendor.client": "./dist/plugin/vendor/vendor.client.js",
     "./vendor.static": "./dist/plugin/vendor/vendor.static.js",
     "./file-preserver": "./dist/plugin/file-preserver/plugin.js",
     "./loader": "./dist/plugin/loader/index.js",
     "./helpers": "./dist/plugin/helpers/index.js",
-    "./helpers/resolveStreamElements": "./dist/plugin/helpers/resolveStreamElements.js",
-    "./dev-server": "./dist/plugin/dev-server/index.js",
-    "./dev-server/configureReactServer": "./dist/plugin/dev-server/configureReactServer.js",
-    "./dev-server/handleServerAction": "./dist/plugin/dev-server/handleServerAction.js",
-    "./stream/handleRscStream": "./dist/plugin/stream/handleRscStream.js",
-    "./stream/createRscStream": "./dist/plugin/stream/createRscStream.js",
-    "./dev-server/restartWorker": "./dist/plugin/dev-server/restartWorker.js",
-    "./dev-server/cleanupServerAction": "./dist/plugin/dev-server/cleanupServerAction.js",
+    "./helpers/resolveStreamElements": {
+      "react-server": "./dist/plugin/helpers/resolveStreamElements.server.js",
+      "default": "./dist/plugin/helpers/resolveStreamElements.client.js"
+    },
+    "./dev-server": {
+      "react-server": "./dist/plugin/dev-server/index.server.js",
+      "default": "./dist/plugin/dev-server/index.client.js"
+    },
+    "./dev-server/configureReactServer": {
+      "react-server": "./dist/plugin/dev-server/configureReactServer.server.js",
+      "default": "./dist/plugin/dev-server/configureReactServer.client.js"
+    },
+    "./dev-server/handleServerAction": {
+      "react-server": "./dist/plugin/dev-server/handleServerAction.server.js",
+      "default": "./dist/plugin/dev-server/handleServerAction.client.js"
+    },
+    "./stream/handleRscStream": {
+      "react-server": "./dist/plugin/stream/handleRscStream.server.js",
+      "default": "./dist/plugin/stream/handleRscStream.client.js"
+    },
+    "./stream/createRscStream": {
+      "react-server": "./dist/plugin/stream/createRscStream.server.js",
+      "default": "./dist/plugin/stream/createRscStream.client.js"
+    },
+    "./dev-server/restartWorker": {
+      "react-server": "./dist/plugin/dev-server/restartWorker.server.js",
+      "default": "./dist/plugin/dev-server/restartWorker.client.js"
+    },
+    "./dev-server/cleanupServerAction": {
+      "react-server": "./dist/plugin/dev-server/cleanupServerAction.server.js",
+      "default": "./dist/plugin/dev-server/cleanupServerAction.client.js"
+    },
     "./env-loader": "./dist/plugin/loader/env-loader.js",
     "./css-loader": "./dist/plugin/loader/css-loader.js",
     "./directives": "./dist/plugin/loader/directives/index.js",
-    "./register": "./dist/plugin/vendor/register-vendor.js"
+    "./register": "./dist/plugin/vendor/register-vendor.js",
+    "./config/createHandlerOptions": {
+      "react-server": "./dist/plugin/config/createHandlerOptions.server.js",
+      "default": "./dist/plugin/config/createHandlerOptions.client.js"
+    },
+    "./dev-server/configureRequestHandler": {
+      "react-server": "./dist/plugin/dev-server/configureRequestHandler.server.js",
+      "default": "./dist/plugin/dev-server/configureRequestHandler.client.js"
+    },
+    "./env/plugin": {
+      "react-server": "./dist/plugin/env/plugin.server.js",
+      "default": "./dist/plugin/env/plugin.client.js"
+    },
+    "./helpers/handleServerAction": {
+      "react-server": "./dist/plugin/helpers/handleServerAction.server.js",
+      "default": "./dist/plugin/helpers/handleServerAction.client.js"
+    },
+    "./orchestrator/createPluginOrchestrator": {
+      "react-server": "./dist/plugin/orchestrator/createPluginOrchestrator.server.js",
+      "default": "./dist/plugin/orchestrator/createPluginOrchestrator.client.js"
+    },
+    "./plugin": {
+      "react-server": "./dist/plugin/plugin.server.js",
+      "default": "./dist/plugin/plugin.client.js"
+    },
+    "./react-client": {
+      "react-server": "./dist/plugin/react-client/index.server.js",
+      "default": "./dist/plugin/react-client/index.client.js"
+    },
+    "./react-client/plugin": {
+      "react-server": "./dist/plugin/react-client/plugin.server.js",
+      "default": "./dist/plugin/react-client/plugin.client.js"
+    },
+    "./react-server/plugin": {
+      "react-server": "./dist/plugin/react-server/plugin.server.js",
+      "default": "./dist/plugin/react-server/plugin.client.js"
+    },
+    "./react-static/createBuildLoader": {
+      "react-server": "./dist/plugin/react-static/createBuildLoader.server.js",
+      "default": "./dist/plugin/react-static/createBuildLoader.client.js"
+    },
+    "./react-static": {
+      "react-server": "./dist/plugin/react-static/index.server.js",
+      "default": "./dist/plugin/react-static/index.client.js"
+    },
+    "./react-static/plugin": {
+      "react-server": "./dist/plugin/react-static/plugin.server.js",
+      "default": "./dist/plugin/react-static/plugin.client.js"
+    },
+    "./react-static/renderPage": {
+      "react-server": "./dist/plugin/react-static/renderPage.server.js",
+      "default": "./dist/plugin/react-static/renderPage.client.js"
+    },
+    "./react-static/rscToHtmlStream": {
+      "react-server": "./dist/plugin/react-static/rscToHtmlStream.server.js",
+      "default": "./dist/plugin/react-static/rscToHtmlStream.client.js"
+    },
+    "./react-static/temporaryReferences": {
+      "react-server": "./dist/plugin/react-static/temporaryReferences.server.js",
+      "default": "./dist/plugin/react-static/temporaryReferences.client.js"
+    },
+    "./stream/createFromNodeStream": {
+      "react-server": "./dist/plugin/stream/createFromNodeStream.server.js",
+      "default": "./dist/plugin/stream/createFromNodeStream.client.js"
+    },
+    "./stream/createHtmlStream": {
+      "react-server": "./dist/plugin/stream/createHtmlStream.server.js",
+      "default": "./dist/plugin/stream/createHtmlStream.client.js"
+    },
+    "./stream/createRenderToPipeableStreamHandler": {
+      "react-server": "./dist/plugin/stream/createRenderToPipeableStreamHandler.server.js",
+      "default": "./dist/plugin/stream/createRenderToPipeableStreamHandler.client.js"
+    },
+    "./transformer/plugin": {
+      "react-server": "./dist/plugin/transformer/plugin.server.js",
+      "default": "./dist/plugin/transformer/plugin.client.js"
+    }
   },
   "typesVersions": {
     "*": {
@@ -288,7 +394,6 @@
     "supports-color": "^10.0.0",
     "ts-node": "^10.9.2",
     "tslib": "^2.8.1",
-    "tsx": "^4.19.2",
     "typescript": "^5.7.3",
     "typescript-eslint": "^8.33.1",
     "vite": "^6.3.5",
@@ -298,5 +403,10 @@
   "bin": {
     "check-react-version": "./scripts/check-react-version.mjs",
     "patch": "./bin/patch.mjs"
+  },
+  "dependencies": {
+    "acorn": "^8.16.0",
+    "picocolors": "^1.1.1",
+    "tsx": "^4.21.0"
   }
 }

package/plugin/config/autoDiscover/resolveAutoDiscover.ts

@@ -177,6 +177,10 @@ export const resolveAutoDiscover: ResolveAutoDiscoverFn =
       ...clientEntry,
       ...cssInputs,
     };
+    // If no client entries found, fall back to index.html so SSR environment has inputs
+    if (Object.keys(clientInputsCollection).length === 0) {
+      Object.assign(clientInputsCollection, indexHtmlInputs);
+    }
     
     const serverInputsCollection = {
       ...clientInputsCollection,

package/plugin/config/getCondition.ts

@@ -203,9 +203,10 @@ export function assertReactServer(): asserts this is {
   const currentCondition = getCurrentCondition();
   if (currentCondition !== "react-server") {
     // Debug-only: avoid Node-only APIs to keep this file browser-safe
-    throw new Error(
-      `Condition mismatch, should be react-server. Set NODE_OPTIONS="--conditions=react-server" or --conditions=react-server`
+    console.warn(
+      `[vite-plugin-react-server] Condition mismatch: expected react-server. Set NODE_OPTIONS="--conditions=react-server"`
     );
+    return; // Don't throw — Vite 7 may load both condition variants during config bundling
   }
 }
 
@@ -215,9 +216,10 @@ export function assertNonReactServer(): asserts this is {
   const currentCondition = getCurrentCondition();
   if (currentCondition === "react-server") {
     // Debug-only: avoid Node-only APIs to keep this file browser-safe
-    throw new Error(
-      `Condition mismatch, should not be react-server. Remove NODE_OPTIONS="--conditions=react-server" or --conditions=react-server`
+    console.warn(
+      `[vite-plugin-react-server] Condition mismatch: unexpected react-server condition on this module.`
     );
+    return; // Don't throw — Vite 7 may load both condition variants during config bundling
   }
 }
 

package/plugin/helpers/createRscRenderHelpers.ts

@@ -38,7 +38,7 @@ export function createReactElement(
 
   return createElementWithReact(React, {
     ...finalOptions,
-    Html: isHeadless ? React.Fragment : finalOptions.HtmlComponent,
+    HtmlComponent: isHeadless ? React.Fragment : finalOptions.HtmlComponent,
     as: isHeadless ? React.Fragment : "div",
   });
 }

package/plugin/helpers/createSharedLoader.ts

@@ -146,7 +146,12 @@ export async function createSharedLoader({
     throw new Error(`Module "${moduleId}" has no exports, can't find ${exportName}`);
   }
   if (exportName && !(exportName in result)) {
-    throw new Error(`Module "${moduleId}" does not export "${exportName}"`);
+    throw new Error(
+      `Module "${moduleId}" does not export "${exportName}". ` +
+      (exportName !== 'default'
+        ? `Did you use \`export default\`? Use \`export function ${exportName}(...)\` or set pageExportName: "default" in your plugin config.`
+        : `The module does not have a default export.`)
+    );
   }
 
   return result;

package/plugin/helpers/resolveComponent.ts

@@ -77,7 +77,12 @@ export async function resolveComponent<T = RootComponentType | HtmlComponentType
       }
       return {
         type: "error",
-        error: new Error(`Export "${moduleExportName}" not found in module ${modulePath}.`),
+        error: new Error(
+          `Export "${moduleExportName}" not found in module ${modulePath}. ` +
+          (moduleExportName !== "default"
+            ? `Did you use \`export default\`? Use \`export function ${moduleExportName}(...)\` or set pageExportName: "default" in your plugin config.`
+            : `The module does not have a default export.`)
+        ),
       };
     }
 

package/plugin/index.client.ts

@@ -0,0 +1,4 @@
+export { vitePluginReactServer } from './plugin.client.js';
+export { vitePluginReactServer as vitePluginReactClient } from './plugin.client.js';
+export { createPluginOrchestrator } from './orchestrator/createPluginOrchestrator.client.js';
+export { getCondition } from './config/getCondition.js';

package/plugin/index.server.ts

@@ -0,0 +1,4 @@
+export { vitePluginReactServer } from './plugin.server.js';
+export { vitePluginReactServer as vitePluginReactClient } from './plugin.server.js';
+export { createPluginOrchestrator } from './orchestrator/createPluginOrchestrator.server.js';
+export { getCondition } from './config/getCondition.js';

package/plugin/index.ts

@@ -1,9 +1,16 @@
+// Conditional exports in package.json resolve to index.server.js or index.client.js.
+// This barrel file is kept for backward compat with tools that don't support conditions.
 import { getCondition } from './config/getCondition.js';
-import { pluginRoot } from './root.js';
 import type { VitePluginMainFn } from './types.js';
 
-export const condition = getCondition('');
-export const { vitePluginReactServer, vitePluginReactClient } = (await import(`${pluginRoot}/plugin.${condition}.js`)) as { vitePluginReactServer: VitePluginMainFn, vitePluginReactClient: VitePluginMainFn };
+const condition = getCondition('');
+const dir = new URL('./', import.meta.url).pathname.replace(/\/$/, '');
 
-// Export the orchestrator for direct use
-export { createPluginOrchestrator } from './orchestrator/createPluginOrchestrator.js';
+const mod = await import(`${dir}/plugin.${condition}.js`);
+export const vitePluginReactServer: VitePluginMainFn = mod.vitePluginReactServer;
+export const vitePluginReactClient: VitePluginMainFn = mod.vitePluginReactServer;
+
+const orch = await import(`${dir}/orchestrator/createPluginOrchestrator.${condition === 'server' ? 'server' : 'client'}.js`);
+export const createPluginOrchestrator = orch.createPluginOrchestrator;
+
+export { getCondition } from './config/getCondition.js';

package/plugin/plugin.client.ts

@@ -1,5 +1,5 @@
 import type { VitePluginMainFn } from "./types.js";
-import { createPluginOrchestrator } from "./orchestrator/createPluginOrchestrator.js";
+import { createPluginOrchestrator } from "./orchestrator/createPluginOrchestrator.client.js";
 import type { UserOptions, Strategy } from "./orchestrator/types.js";
 import { assertNonReactServer } from "./config/getCondition.js";
 

package/plugin/plugin.server.ts

@@ -2,7 +2,7 @@ import type { VitePluginMainFn } from "./types.js";
 import type { UserOptions, Strategy } from "./orchestrator/types.js";
 
 import { assertReactServer } from "./config/getCondition.js";
-import { createPluginOrchestrator } from "./orchestrator/createPluginOrchestrator.js";
+import { createPluginOrchestrator } from "./orchestrator/createPluginOrchestrator.server.js";
 
 assertReactServer();
 

package/plugin/stream/renderRscStream.server.ts

@@ -3,6 +3,7 @@ import type { CreateHandlerOptions } from "../types.js";
 import type { RscRenderResult } from "./renderRscStream.types.js";
 import { createStreamMetrics } from "../metrics/createStreamMetrics.js";
 import { createReactElement } from "../helpers/createRscRenderHelpers.js";
+import { checkReactExperimental } from "../utils/checkReactVersion.js";
 import { ReactDOMServer } from "../vendor/vendor.server.js";
 import type { StreamHandlers } from "../worker/types.js";
 
@@ -78,6 +79,8 @@ export function renderRscStream(
       logger?.info(`[renderRscStream:${route}] Creating React stream for element`);
     }
     
+    checkReactExperimental();
+
     // Render React to stream - let it flow naturally like the RSC worker
     const reactStream = ReactDOMServer.renderToPipeableStream(
       reactElement,

package/plugin/utils/checkReactVersion.ts

@@ -0,0 +1,28 @@
+let checked = false;
+
+/**
+ * Verify React experimental is available. The vendored react-server-dom-esm
+ * transport requires Taint APIs that only exist in React experimental builds.
+ * Stable React 19.x causes: "Cannot read properties of undefined (reading 'add')"
+ */
+export function checkReactExperimental() {
+  if (checked) return;
+  checked = true;
+  
+  try {
+    // Use require for sync access — React is always available at this point
+    const version: string = globalThis.process?.versions
+      ? require("react").version
+      : "";
+    
+    if (version && !version.includes("experimental")) {
+      throw new Error(
+        `[vite-plugin-react-server] React ${version} is not supported. ` +
+        `This plugin requires React experimental builds. ` +
+        `Install with: npm install react@experimental react-dom@experimental`
+      );
+    }
+  } catch (e: unknown) {
+    if (e instanceof Error && e.message.includes("not supported")) throw e;
+  }
+}

package/plugin/vendor/vendor.client.ts

@@ -2,9 +2,7 @@ import { createRequire } from "node:module";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { existsSync } from "node:fs";
-import { assertNonReactServer } from "../config/getCondition.js";
 
-assertNonReactServer();
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 function findPkgRoot(): string {

package/plugin/worker/rsc/handleRscRender.ts

@@ -9,6 +9,7 @@ import {
   type RenderToPipeableStreamOptions,
 } from "../../vendor/vendor.server.js";
 import { createElementWithReact } from "../../helpers/createElementWithReact.js";
+import { checkReactExperimental } from "../../utils/checkReactVersion.js";
 /**
  * Handles the rendering of React Server Component streams in the RSC worker thread.
  *
@@ -261,6 +262,7 @@ export const handleRscRender: HandleRscRenderFn = function _handleRscRender(
       );
     }
 
+    checkReactExperimental();
     const { pipe } = ReactDOMServer.renderToPipeableStream(
       element,
       finalHandlerOptions.moduleBasePath,