vite-plugin-react-server 0.3.17 → 0.3.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-react-server",
-  "version": "0.3.17",
+  "version": "0.3.18",
   "description": "Vite plugin for React Server Components (RSC)",
   "type": "module",
   "main": "./dist/plugin/index.js",

package/plugin/collect-css-manifest.ts

@@ -59,7 +59,6 @@ export function collectManifestCss(
     // Add direct CSS
     if (entry.css) {
       entry.css.forEach((css: string) => {
-        console.log('collectManifestCss', css, entry.src ?? entry.file ?? '');
         cssFiles.set(entry.src ?? entry.file ?? '', css);
         onCss?.(css, parentUrl ?? pagePath);
       });

package/plugin/config/resolveUserConfig.ts

@@ -146,7 +146,7 @@ export function resolveUserConfig({
         userConfig: {
           ...config,
           root: root,
-          mode: configEnv.command === "build" ? "production" : "development",
+          mode: configEnv.mode ?? configEnv.command === "build" ? "production" : "development",
           resolve: {
             external: ["react", "react-dom"],
             alias: {},
@@ -194,7 +194,7 @@ export function resolveUserConfig({
       userConfig: {
         ...config,
         root: root,
-        mode: configEnv.command === "build" ? "production" : "development",
+        mode: configEnv.mode ?? configEnv.command === "build" ? "production" : "development",
         resolve: {
           alias: {},
           externalConditions: ["react-server"],

package/plugin/react-client/plugin.ts

@@ -24,6 +24,7 @@ import type {
   RscWorkerResponse,
 } from "../worker/types.js";
 import { createLogger } from "../utils/logger.js";
+import { readFileSync } from "node:fs";
 
 const log = createLogger("react-client");
 let userOptions: ResolvedUserOptions;
@@ -188,6 +189,7 @@ export function reactClientPlugin(options: StreamPluginOptions): Plugin {
             if (foundClient) {
               res.setHeader("Content-Type", "application/javascript");
               res.end(foundClient);
+              return;
             }
             const foundServer =
               serverManifest &&
@@ -207,6 +209,21 @@ export function reactClientPlugin(options: StreamPluginOptions): Plugin {
             next();
           }
         } else {
+          let html = '';
+          try {
+            const last = value.split('/').pop();
+            if(!last?.includes('.')) {
+              const isDir = await stat(join(fileRoot, value));
+              if (isDir.isDirectory()) {
+                html = readFileSync(join(fileRoot, value, 'index.html'), 'utf-8');
+                res.setHeader("Content-Type", "text/html");
+                res.end(html);
+                return;
+              }
+            }
+          } catch (error) {
+            
+          }
           next();
         }
       });

package/plugin/react-server/createRscStream.ts

@@ -21,7 +21,8 @@ function CssCollector({
       return React.createElement('link', {
         key: css,
         rel: 'stylesheet',
-        href: url
+        href: url,
+        precedence: 'high'
       })
     }),
     children
@@ -68,6 +69,9 @@ export function createRscStream({
       moduleBasePath,
       {
         onError: (error: Error) => {
+          if(process.env['NODE_ENV'] === 'development') {
+            console.trace(error);
+          }
           logger.error(`Stream error at ${route}.`, {error});
         },
         onPostpone: logger.info ?? console.info,  

package/plugin/react-server/plugin.ts

@@ -33,6 +33,7 @@ import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { getBundleManifest } from "../helpers/getBundleManifest.js";
 import type { ServerResponse } from "node:http";
 import { collectManifestCss } from "../collect-css-manifest.js";
+import { cssFiles } from "../worker/rsc/state.js";
 
 let resolvedConfig: ResolvedConfig | null = null;
 let serverManifestPath: string | null = null;
@@ -428,14 +429,10 @@ export function reactServerPlugin(
 
         // Update stats to include CSS and client components
         const stats: BuildStats = {
-          htmlFiles: userOptions.build.pages.length,
-          clientComponents: Object.keys(clientManifest).filter(
-            userOptions.autoDiscover.clientComponents
-          ).length,
-          cssFiles: Object.keys(clientManifest)
-            .flatMap(userOptions.autoDiscover.cssPattern)
-            .filter(Boolean).length,
-          totalRoutes: userOptions.build.pages.length,
+          htmlFiles: files.urlMap.size,
+          clientComponents: clientComponents.size,
+          cssFiles: cssFiles.size,
+          totalRoutes: files.urlMap.size,
           timing: {
             config: ((timing.configResolved ?? 0) - timing.start) / 1000,
             build:
@@ -459,10 +456,8 @@ export function reactServerPlugin(
 
         console.log("\n[vite-plugin-react-server] Build Summary:");
         console.log("─".repeat(50));
-        console.log(`�� Generated ${stats.htmlFiles} HTML files`);
-        console.log(`🎯 Processed ${stats.clientComponents} client components`);
-        console.log(`🎨 Included ${stats.cssFiles} CSS files`);
-        console.log(`🛣️  Total routes: ${stats.totalRoutes}`);
+        console.log(`🎨 Included ${buildCssFiles.size} CSS files`);
+        console.log(`🛣️  Total routes: ${files.urlMap.size}`);
         console.log("─".repeat(50));
         console.log("⏱️  Timing:");
         console.log(`  Config:  ${formatDuration(stats.timing.config)}`);

package/plugin/worker/rsc/messageHandler.tsx

@@ -1,27 +1,21 @@
-import { createWriteStream } from "node:fs";
-import { mkdir } from "node:fs/promises";
-import { dirname, join } from "node:path";
-import { parentPort } from "node:worker_threads";
+import { join } from "node:path";
 import { PassThrough } from "node:stream";
+import { parentPort } from "node:worker_threads";
+import React from "react";
 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 { createLogger } from "../../utils/logger.js";
 import {
-  cssFiles,
-  clientFiles,
-  serverActionFiles,
   addCssFile,
-  clearCssFiles,
+  cssFiles
 } from "./state.js";
-import type { WriteStream } from "node:fs";
-import React from "react";
 
 const log = createLogger("rsc-worker");
 
@@ -85,6 +79,7 @@ export async function messageHandler(message: RscWorkerMessage) {
         moduleBaseURL,
         {
           onError: (error: Error) => {
+            console.log('onError', error);
             log.error(`Stream error at ${id}:`, error);
             parentPort?.postMessage({
               type: "ERROR",