vite-plugin-react-server 1.3.0 → 1.3.2

package/oss-experimental/react-server-dom-esm/esm/react-server-dom-esm-server.js

@@ -0,0 +1,13 @@
+import mod from "../server.node.js";
+export const {
+  createTemporaryReferenceSet,
+  decodeAction,
+  decodeFormState,
+  decodeReply,
+  decodeReplyFromBusboy,
+  registerClientReference,
+  registerServerReference,
+  renderToPipeableStream,
+  unstable_prerenderToNodeStream,
+} = mod;
+export default mod;

package/oss-experimental/react-server-dom-esm/esm/react-server-dom-esm-server.node.js

@@ -0,0 +1,13 @@
+import mod from "../server.node.js";
+export const {
+  createTemporaryReferenceSet,
+  decodeAction,
+  decodeFormState,
+  decodeReply,
+  decodeReplyFromBusboy,
+  registerClientReference,
+  registerServerReference,
+  renderToPipeableStream,
+  unstable_prerenderToNodeStream,
+} = mod;
+export default mod;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-react-server",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Vite plugin for React Server Components (RSC)",
   "type": "module",
   "main": "./dist/plugin/index.js",
@@ -223,7 +223,6 @@
     "experimental:build-oss-full": "bash scripts/build-oss-experimental.sh --full",
     "experimental:setup": "rm -rf patches/* && npm run experimental:clean-install && npm run experimental:copy && npm run experimental:patch && npm run experimental:move-patches",
     "experimental:patch-react": "npm run experimental:clean-install && node scripts/check-react-version.mjs && node bin/patch.mjs",
-    "postinstall": "patch-package",
     "test-parse": "node -e \"const acorn = require('acorn'); const ast = acorn.parse('export async function test() {}', { sourceType: 'module', ecmaVersion: 'latest' }); console.log(JSON.stringify(ast, null, 2));\"",
     "precoverage": "npm run build",
     "coverage": "npm run test:coverage"

package/plugin/vendor/register-vendor.ts

@@ -0,0 +1,51 @@
+/**
+ * Node.js module resolution hook that redirects `react-server-dom-esm/*`
+ * to the vendored copy at runtime. Used by the RSC worker via --import.
+ * 
+ * Server entries use ESM wrappers (in esm/) that re-export from CJS
+ * so Node's ESM loader can provide named exports.
+ */
+import { register } from "node:module";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { existsSync } from "node:fs";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+function findPkgRoot(): string {
+  let dir = __dirname;
+  for (let i = 0; i < 5; i++) {
+    if (existsSync(join(dir, "oss-experimental", "react-server-dom-esm"))) return dir;
+    dir = dirname(dir);
+  }
+  return dirname(dirname(__dirname));
+}
+const ossDir = join(findPkgRoot(), "oss-experimental", "react-server-dom-esm");
+
+register("data:text/javascript," + encodeURIComponent(`
+  const ossDir = ${JSON.stringify(ossDir)};
+  const { join } = await import("node:path");
+  const { pathToFileURL } = await import("node:url");
+  
+  // Map bare specifiers to vendored files. Server entries use ESM wrappers
+  // that re-export from CJS for proper named export support.
+  const subpathMap = {
+    "react-server-dom-esm":                join(ossDir, "index.js"),
+    "react-server-dom-esm/client":         join(ossDir, "client.js"),
+    "react-server-dom-esm/client.browser": join(ossDir, "esm", "react-server-dom-esm-client.browser.production.js"),
+    "react-server-dom-esm/client.node":    join(ossDir, "client.node.js"),
+    "react-server-dom-esm/server":         join(ossDir, "esm", "react-server-dom-esm-server.node.js"),
+    "react-server-dom-esm/server.node":    join(ossDir, "esm", "react-server-dom-esm-server.node.js"),
+    "react-server-dom-esm/static":         join(ossDir, "static.js"),
+    "react-server-dom-esm/static.node":    join(ossDir, "static.node.js"),
+  };
+
+  export async function resolve(specifier, context, nextResolve) {
+    if (specifier in subpathMap) {
+      return {
+        shortCircuit: true,
+        url: pathToFileURL(subpathMap[specifier]).href,
+      };
+    }
+    return nextResolve(specifier, context);
+  }
+`), import.meta.url);

package/plugin/vendor/vendor-alias.ts

@@ -1,5 +1,4 @@
 import type { Plugin } from "vite";
-import { createRequire } from "node:module";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { existsSync } from "node:fs";
@@ -89,14 +88,25 @@ function isServerEntry(source: string): boolean {
   );
 }
 
+// Explicit subpath → file mapping. Server entries always resolve to .node
+// variants to bypass the react-server condition guard in server.js.
+const subpathMap: Record<string, string> = {
+  "react-server-dom-esm":                "index.js",
+  "react-server-dom-esm/client":         "client.js",
+  "react-server-dom-esm/client.browser": "client.browser.js",
+  "react-server-dom-esm/client.node":    "client.node.js",
+  "react-server-dom-esm/server":         "server.node.js",
+  "react-server-dom-esm/server.node":    "server.node.js",
+  "react-server-dom-esm/static":         "static.node.js",
+  "react-server-dom-esm/static.node":    "static.node.js",
+};
+
 function resolveVendored(source: string): string {
-  const vendorRequire = createRequire(
-    join(ossDir, "react-server-dom-esm", "package.json")
-  );
-  try {
-    return vendorRequire.resolve(source);
-  } catch {
-    const subpath = source.replace("react-server-dom-esm", "");
-    return join(ossDir, "react-server-dom-esm", subpath || "index.js");
+  const file = subpathMap[source];
+  if (file) {
+    return join(ossDir, "react-server-dom-esm", file);
   }
+  // Fallback for unknown subpaths
+  const subpath = source.replace("react-server-dom-esm", "");
+  return join(ossDir, "react-server-dom-esm", subpath || "index.js");
 }

package/plugin/vendor/vendor.client.ts

@@ -17,9 +17,9 @@ function findPkgRoot(): string {
 }
 const ossDir = join(findPkgRoot(), "oss-experimental");
 
-// Resolve react-server-dom-esm from our vendored copy
+// Load react-server-dom-esm/client.node directly from vendored copy
 const vendorRequire = createRequire(join(ossDir, "react-server-dom-esm", "package.json"));
-const ReactDOMClient = vendorRequire("react-server-dom-esm/client.node") as typeof import("react-server-dom-esm/client.node");
+const ReactDOMClient = vendorRequire(join(ossDir, "react-server-dom-esm", "client.node.js")) as typeof import("react-server-dom-esm/client.node");
 
 // React and react-dom still come from the consumer's project
 const projectRoot = process.env["npm_config_local_prefix"] || process.cwd();

package/plugin/vendor/vendor.server.ts

@@ -14,9 +14,10 @@ function findPkgRoot(): string {
 }
 const ossDir = join(findPkgRoot(), "oss-experimental");
 
-// Resolve react-server-dom-esm from our vendored copy
+// Load react-server-dom-esm/server.node directly from vendored copy
+// Use server.node.js (not server.js which is a react-server condition guard)
 const vendorRequire = createRequire(join(ossDir, "react-server-dom-esm", "package.json"));
-const ReactDOMServer = vendorRequire("react-server-dom-esm/server.node") as typeof import("react-server-dom-esm/server.node");
+const ReactDOMServer = vendorRequire(join(ossDir, "react-server-dom-esm", "server.node.js")) as typeof import("react-server-dom-esm/server.node");
 
 // React still comes from the consumer's project
 const projectRoot = process.env["npm_config_local_prefix"] || process.cwd();

package/plugin/vendor/vendor.static.ts

@@ -14,9 +14,9 @@ function findPkgRoot(): string {
 }
 const ossDir = join(findPkgRoot(), "oss-experimental");
 
-// Resolve react-server-dom-esm from our vendored copy
+// Load react-server-dom-esm/static.node directly from vendored copy
 const vendorRequire = createRequire(join(ossDir, "react-server-dom-esm", "package.json"));
-const ReactDOMServer = vendorRequire("react-server-dom-esm/static.node") as typeof import("react-server-dom-esm/static.node");
+const ReactDOMServer = vendorRequire(join(ossDir, "react-server-dom-esm", "static.node.js")) as typeof import("react-server-dom-esm/static.node");
 
 // React still comes from the consumer's project
 const projectRoot = process.env["npm_config_local_prefix"] || process.cwd();

package/plugin/worker/createWorker.ts

@@ -255,10 +255,14 @@ Current condition: ${currentCondition}, Reverse condition: ${reverseCondition}`
       }
       return out;
     };
+    // Register vendor resolution hook so the worker can find react-server-dom-esm
+    const vendorRegisterPath = new URL("../vendor/register-vendor.js", import.meta.url).href;
     const computedExecArgv = [
       ...stripConditionsFromArgv(process.execArgv || []),
       "--conditions",
       reverseCondition,
+      "--import",
+      vendorRegisterPath,
     ];
 
     // Always log the condition setup for debugging