vite-plugin-react-server 0.3.18 → 0.3.19

package/plugin/worker/rsc/messageHandler.tsx

@@ -6,133 +6,117 @@ import {
   renderToPipeableStream,
   // @ts-ignore
 } from "react-server-dom-esm/server.node";
-import { createLogger } from "../../utils/logger.js";
 import type {
   RscChunkMessage,
   RscEndMessage,
   RscWorkerMessage,
 } from "../types.js";
-import {
-  addCssFile,
-  cssFiles
-} from "./state.js";
-
-const log = createLogger("rsc-worker");
-
-// CSS collector component
-function CssCollector({
-  children,
-  cssFiles,
-}: {
-  children: React.ReactNode;
-  cssFiles: Map<string, string>;
-}) {
-  return (
-    <>
-      {Array.from(cssFiles.entries()).map(([id, css]) => {
-        return (
-          <style key={id} data-source={id}>
-            {css}
-          </style>
-        );
-      })}
-      {children}
-    </>
-  );
-}
+import { addCssFile, cssFiles } from "./state.js";
+import { CssCollector } from "../../components.js";
 
 export async function messageHandler(message: RscWorkerMessage) {
+  switch (message.type) {
+    case "RSC_RENDER":
+      const {
+        id,
+        pageImport,
+        propsImport,
+        pageExportName,
+        propsExportName,
+        url,
+        outDir,
+        projectRoot,
+        moduleBaseURL,
+        moduleBasePath,
+        pipableStreamOptions,
+      } = message;
 
-  if (message.type === "RSC_RENDER") {
-    const {
-      id,
-      pageImport,
-      propsImport,
-      pageExportName,
-      propsExportName,
-      url,
-      outDir,
-      projectRoot,
-      moduleBaseURL,
-      moduleBasePath,
-      pipableStreamOptions,
-    } = message;
-
-    try {
-      // Load modules which will trigger CSS loading
-      const [Component, propsModule] = await Promise.all([
-        import(join(projectRoot, pageImport)),
-        import(join(projectRoot, propsImport)),
-      ]);
+      try {
+        // Load modules which will trigger CSS loading
+        const [Component, propsModule] = await Promise.all([
+          import(join(projectRoot, pageImport)),
+          import(join(projectRoot, propsImport)),
+        ]);
 
-      const propsAtExport = propsModule[propsExportName];
-      const props = await Promise.resolve(
-        typeof propsAtExport === "function" ? propsAtExport(url) : propsAtExport
-      );
+        const propsAtExport = propsModule[propsExportName];
+        const props = await Promise.resolve(
+          typeof propsAtExport === "function"
+            ? propsAtExport(url)
+            : propsAtExport
+        );
 
-      const PageComponent = Component[pageExportName];
-      // Now render with collected CSS
-      const stream = renderToPipeableStream(
-        <CssCollector cssFiles={cssFiles}>
-          <PageComponent {...props} />
-        </CssCollector>,
-        moduleBaseURL,
-        {
-          onError: (error: Error) => {
-            console.log('onError', error);
-            log.error(`Stream error at ${id}:`, error);
-            parentPort?.postMessage({
-              type: "ERROR",
-              id,
-              error: error instanceof Error ? error.message : String(error),
-            });
-          },
-          onPostpone: log?.info ?? console.info,
-          environmentName: "Server",
-          importMap: {
-            imports: {
-              ...pipableStreamOptions?.importMap?.imports,
-              "/": moduleBasePath,
+        const PageComponent = Component[pageExportName];
+        // Now render with collected CSS
+        const stream = renderToPipeableStream(
+          <CssCollector
+            cssFiles={Array.from(cssFiles.values())}
+            moduleBaseUrl={moduleBaseURL}
+          >
+            <PageComponent {...props} />
+          </CssCollector>,
+          moduleBaseURL,
+          {
+            onError: (error: Error) => {
+              parentPort?.postMessage({
+                type: "ERROR",
+                id,
+                error: error instanceof Error ? error.message : String(error),
+              });
+            },
+            onPostpone: (reason: string) => {
+              parentPort?.postMessage({
+                type: "POSTPONE",
+                id,
+                reason,
+              });
             },
-          },
-          ...pipableStreamOptions,
-        }
-      );
+            environmentName: "Server",
+            importMap: {
+              imports: {
+                ...pipableStreamOptions?.importMap?.imports,
+                "/": moduleBasePath,
+              },
+            },
+            ...pipableStreamOptions,
+          }
+        );
 
-      // Listen for data and end events
-      const passThrough = new PassThrough();
+        // Listen for data and end events
+        const passThrough = new PassThrough();
 
-      stream.pipe(passThrough);
+        stream.pipe(passThrough);
 
-      passThrough.on("data", (chunk) => {
-        // Send to parent
-        parentPort?.postMessage({
-          type: "RSC_CHUNK",
-          id,
-          chunk: chunk.toString(),
-          moduleRootPath: moduleBasePath,
-          moduleBaseURL,
-          outDir,
-          rscOutputPath: `${outDir}/${id}.rsc`,
-          cssFiles: Array.from(cssFiles.entries()),
-        } satisfies RscChunkMessage);
-      });
+        passThrough.on("data", (chunk) => {
+          // Send to parent
+          parentPort?.postMessage({
+            type: "RSC_CHUNK",
+            id,
+            chunk: chunk.toString(),
+            moduleRootPath: moduleBasePath,
+            moduleBaseURL,
+            outDir,
+            rscOutputPath: `${outDir}/${id}.rsc`,
+            cssFiles: Array.from(cssFiles.entries()),
+          } satisfies RscChunkMessage);
+        });
 
-      passThrough.on("end", () => {
+        passThrough.on("end", () => {
+          parentPort?.postMessage({
+            type: "RSC_END",
+            id,
+          } satisfies RscEndMessage);
+        });
+      } catch (error) {
+        console.trace(error);
         parentPort?.postMessage({
-          type: "RSC_END",
+          type: "ERROR",
           id,
-        } satisfies RscEndMessage);
-      });
-    } catch (error) {
-      console.trace(error);
-      parentPort?.postMessage({
-        type: "ERROR",
-        id,
-        error: error instanceof Error ? error.message : String(error),
-      });
-    }
-  } else if (message.type === "CSS_FILE") {
-    addCssFile(message.id, message.cssFile);
+          error: error instanceof Error ? error.message : String(error),
+        });
+      }
+      break;
+    case "CSS_FILE":
+      addCssFile(message.id, message.cssFile);
+      break;
   }
 }

package/plugin/worker/rsc/plugin.ts

@@ -3,14 +3,13 @@ import { resolve } from "path";
 import type { ModuleFormat } from "rollup";
 import type { StreamPluginOptions } from "../../types.js";
 import { DEFAULT_CONFIG } from "../../config/defaults.js";
-import { getPluginRoot } from "../../config/getPaths.js";
+import { pluginRoot } from "../../root.js";
 
 export function reactRscWorkerPlugin(options: StreamPluginOptions): Plugin {
   return {
     name: "vite:react-rsc-worker",
     config(config) {
       const root = config.root ?? process.cwd();
-      const pluginRoot = getPluginRoot();
       const rscWorkerPath =
         typeof options.rscWorkerPath === "string"
           ? resolve(root, options.rscWorkerPath)

package/plugin/worker/rsc/rsc-worker.development.ts

@@ -47,17 +47,13 @@ declare module 'node:module' {
 //
 import { parentPort, MessageChannel } from "node:worker_threads";
 import { messageHandler } from "./messageHandler.js";
-import { createLogger } from "../../utils/logger.js";
 import { 
-  registerHooks,
   register,
-  type ResolveHookContext,
 } from 'node:module';
 import { register as registerTsx } from "tsx/esm/api";
 import { join } from 'node:path';
-import { getPluginRoot } from "../../config/getPaths.js";
+import { pluginRoot } from "../../root.js";
 
-const ports = new MessageChannel();
 // Initialize worker
 if (!parentPort) {
   throw new Error("This module must be run as a worker");
@@ -68,26 +64,20 @@ const reactLoaderChannel = new MessageChannel();
 const cssLoaderChannel = new MessageChannel();
 
 // Listen for messages from loaders
-reactLoaderChannel.port2.on('message', (msg) => {
-  messageHandler(msg);
-});
-
-cssLoaderChannel.port2.on('message', (msg) => {
-  messageHandler(msg);
-});
+reactLoaderChannel.port2.on('message', messageHandler);
+cssLoaderChannel.port2.on('message', messageHandler);
 
-const loaderPath = 'file://' + join(getPluginRoot(), 'loader/react-loader.js');
-const cssLoaderPath = 'file://' + join(getPluginRoot(), 'loader/css-loader.js');
-console.log('[worker] Full loader path:', loaderPath);
+const loaderPath = 'file://' + join(pluginRoot, 'loader/react-loader.js');
+const cssLoaderPath = 'file://' + join(pluginRoot, 'loader/css-loader.js');
 
 // Register react-loader
 register(loaderPath, {
-  parentURL: getPluginRoot(),
+  parentURL: pluginRoot,
   data: { port: reactLoaderChannel.port1 },
   transferList: [reactLoaderChannel.port1]
 });
 register(cssLoaderPath, {
-  parentURL: getPluginRoot(),
+  parentURL: pluginRoot,
   data: { port: cssLoaderChannel.port1 },
   transferList: [cssLoaderChannel.port1]
 });
@@ -96,12 +86,12 @@ register(cssLoaderPath, {
 registerTsx();
 
 // Set up message handling
-parentPort.on("message", (message) => {
-  messageHandler(message);
-});
+parentPort.on("message", messageHandler);
 
 // Signal ready
-parentPort.postMessage({ type: "READY", env: "development" });
-
+parentPort.postMessage({ type: "READY", env: process.env["NODE_ENV"] });
 
+if (process.env["NODE_ENV"] !== "development") {
+  throw new Error("This module must be run in development mode");
+}
 

package/plugin/worker/rsc/rsc-worker.production.ts

@@ -10,4 +10,8 @@ if (!parentPort) {
 parentPort.on("message", messageHandler);
 
 // Signal ready
-parentPort.postMessage({ type: "READY", env: "production" });
+parentPort.postMessage({ type: "READY", env: process.env["NODE_ENV"] });
+
+if (process.env["NODE_ENV"] !== "production") {
+  throw new Error("This module must be run in production mode");
+}

package/plugin/worker/rsc/state.ts

@@ -1,6 +1,3 @@
-import { createLogger } from "../../utils/logger.js";
-
-
 // Create shared CSS registry
 export const cssFiles = new Map<string, string>();
 export const clientFiles = new Set<string>();

package/scripts/react+0.0.0-experimental-eda36a1c-20250228.patch

@@ -1,56 +1,158 @@
+diff --git a/node_modules/react/cjs/react-jsx-dev-runtime.development.js b/node_modules/react/cjs/react-jsx-dev-runtime.development.js
+index 585027f..aeca110 100644
+--- a/node_modules/react/cjs/react-jsx-dev-runtime.development.js
++++ b/node_modules/react/cjs/react-jsx-dev-runtime.development.js
+@@ -300,8 +300,9 @@
+       ReactSharedInternals =
+         React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE,
+       hasOwnProperty = Object.prototype.hasOwnProperty,
+-      isArrayImpl = Array.isArray,
+-      createTask = console.createTask
++      isArrayImpl = Array.isArray;
++    new ("function" === typeof WeakMap ? WeakMap : Map)();
++    var createTask = console.createTask
+         ? console.createTask
+         : function () {
+             return null;
+diff --git a/node_modules/react/cjs/react-jsx-dev-runtime.react-server.development.js b/node_modules/react/cjs/react-jsx-dev-runtime.react-server.development.js
+index 8d1141c..0d74219 100644
+--- a/node_modules/react/cjs/react-jsx-dev-runtime.react-server.development.js
++++ b/node_modules/react/cjs/react-jsx-dev-runtime.react-server.development.js
+@@ -304,8 +304,9 @@
+         'The "react" package in this environment is not configured correctly. The "react-server" condition must be enabled in any environment that runs React Server Components.'
+       );
+     var hasOwnProperty = Object.prototype.hasOwnProperty,
+-      isArrayImpl = Array.isArray,
+-      createTask = console.createTask
++      isArrayImpl = Array.isArray;
++    new ("function" === typeof WeakMap ? WeakMap : Map)();
++    var createTask = console.createTask
+         ? console.createTask
+         : function () {
+             return null;
+diff --git a/node_modules/react/cjs/react-jsx-runtime.development.js b/node_modules/react/cjs/react-jsx-runtime.development.js
+index 40bddcd..c18bba9 100644
+--- a/node_modules/react/cjs/react-jsx-runtime.development.js
++++ b/node_modules/react/cjs/react-jsx-runtime.development.js
+@@ -300,8 +300,9 @@
+       ReactSharedInternals =
+         React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE,
+       hasOwnProperty = Object.prototype.hasOwnProperty,
+-      isArrayImpl = Array.isArray,
+-      createTask = console.createTask
++      isArrayImpl = Array.isArray;
++    new ("function" === typeof WeakMap ? WeakMap : Map)();
++    var createTask = console.createTask
+         ? console.createTask
+         : function () {
+             return null;
+diff --git a/node_modules/react/cjs/react-jsx-runtime.react-server.development.js b/node_modules/react/cjs/react-jsx-runtime.react-server.development.js
+index dd07748..0b3aaf0 100644
+--- a/node_modules/react/cjs/react-jsx-runtime.react-server.development.js
++++ b/node_modules/react/cjs/react-jsx-runtime.react-server.development.js
+@@ -304,8 +304,9 @@
+         'The "react" package in this environment is not configured correctly. The "react-server" condition must be enabled in any environment that runs React Server Components.'
+       );
+     var hasOwnProperty = Object.prototype.hasOwnProperty,
+-      isArrayImpl = Array.isArray,
+-      createTask = console.createTask
++      isArrayImpl = Array.isArray;
++    new ("function" === typeof WeakMap ? WeakMap : Map)();
++    var createTask = console.createTask
+         ? console.createTask
+         : function () {
+             return null;
 diff --git a/node_modules/react/cjs/react.development.js b/node_modules/react/cjs/react.development.js
-index 9aa7fdf..2bc8270 100644
+index e3389a3..2bc8270 100644
 --- a/node_modules/react/cjs/react.development.js
 +++ b/node_modules/react/cjs/react.development.js
-@@ -1277,7 +1277,7 @@
+@@ -671,7 +671,9 @@
+         getCurrentStack: null
+       },
+       hasOwnProperty = Object.prototype.hasOwnProperty,
+-      createTask = console.createTask
++      REACT_CLIENT_REFERENCE = Symbol.for("react.client.reference");
++    new ("function" === typeof WeakMap ? WeakMap : Map)();
++    var createTask = console.createTask
+         ? console.createTask
+         : function () {
+             return null;
+@@ -681,7 +683,6 @@
+     var didWarnAboutElementRef = {};
+     var didWarnAboutMaps = !1,
+       userProvidedKeyEscapeRegex = /\/+/g,
+-      REACT_CLIENT_REFERENCE = Symbol.for("react.client.reference"),
+       reportGlobalError =
+         "function" === typeof reportError
+           ? reportError
+@@ -1276,7 +1277,7 @@
      exports.useTransition = function () {
        return resolveDispatcher().useTransition();
      };
--    exports.version = "19.1.0-experimental-d55cc79b-20250228";
+-    exports.version = "19.1.0-experimental-f9d78089-20250306";
 +    exports.version = "19.1.0-experimental-eda36a1c-20250228";
      "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
        "function" ===
          typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
 diff --git a/node_modules/react/cjs/react.production.js b/node_modules/react/cjs/react.production.js
-index 3678d50..24d6e95 100644
+index f357ca5..24d6e95 100644
 --- a/node_modules/react/cjs/react.production.js
 +++ b/node_modules/react/cjs/react.production.js
 @@ -576,4 +576,4 @@ exports.useSyncExternalStore = function (
  exports.useTransition = function () {
    return ReactSharedInternals.H.useTransition();
  };
--exports.version = "19.1.0-experimental-d55cc79b-20250228";
+-exports.version = "19.1.0-experimental-f9d78089-20250306";
 +exports.version = "19.1.0-experimental-eda36a1c-20250228";
 diff --git a/node_modules/react/cjs/react.react-server.development.js b/node_modules/react/cjs/react.react-server.development.js
-index 15d4371..8497113 100644
+index 3cbd7eb..8497113 100644
 --- a/node_modules/react/cjs/react.react-server.development.js
 +++ b/node_modules/react/cjs/react.react-server.development.js
-@@ -981,5 +981,5 @@
+@@ -507,7 +507,9 @@
+       REACT_CLIENT_REFERENCE$1 = Symbol.for("react.client.reference"),
+       hasOwnProperty = Object.prototype.hasOwnProperty,
+       assign = Object.assign,
+-      createTask = console.createTask
++      REACT_CLIENT_REFERENCE = Symbol.for("react.client.reference");
++    new ("function" === typeof WeakMap ? WeakMap : Map)();
++    var createTask = console.createTask
+         ? console.createTask
+         : function () {
+             return null;
+@@ -517,7 +519,6 @@
+     var didWarnAboutElementRef = {};
+     var didWarnAboutMaps = !1,
+       userProvidedKeyEscapeRegex = /\/+/g,
+-      REACT_CLIENT_REFERENCE = Symbol.for("react.client.reference"),
+       reportGlobalError =
+         "function" === typeof reportError
+           ? reportError
+@@ -980,5 +981,5 @@
      exports.useMemo = function (create, deps) {
        return resolveDispatcher().useMemo(create, deps);
      };
--    exports.version = "19.1.0-experimental-d55cc79b-20250228";
+-    exports.version = "19.1.0-experimental-f9d78089-20250306";
 +    exports.version = "19.1.0-experimental-eda36a1c-20250228";
    })();
 diff --git a/node_modules/react/cjs/react.react-server.production.js b/node_modules/react/cjs/react.react-server.production.js
-index 6c7c438..694169d 100644
+index 53a5ddf..694169d 100644
 --- a/node_modules/react/cjs/react.react-server.production.js
 +++ b/node_modules/react/cjs/react.react-server.production.js
 @@ -561,4 +561,4 @@ exports.useId = function () {
  exports.useMemo = function (create, deps) {
    return ReactSharedInternals.H.useMemo(create, deps);
  };
--exports.version = "19.1.0-experimental-d55cc79b-20250228";
+-exports.version = "19.1.0-experimental-f9d78089-20250306";
 +exports.version = "19.1.0-experimental-eda36a1c-20250228";
 diff --git a/node_modules/react/package.json b/node_modules/react/package.json
-index f7c9f76..b6e85b0 100644
+index 965519d..b6e85b0 100644
 --- a/node_modules/react/package.json
 +++ b/node_modules/react/package.json
 @@ -4,7 +4,7 @@
    "keywords": [
      "react"
    ],
--  "version": "0.0.0-experimental-d55cc79b-20250228",
+-  "version": "0.0.0-experimental-f9d78089-20250306",
 +  "version": "0.0.0-experimental-eda36a1c-20250228",
    "homepage": "https://react.dev/",
    "bugs": "https://github.com/facebook/react/issues",