vite-plugin-react-server 1.4.0 → 1.4.1

package/package.json

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

package/plugin/dev-server/configureReactServer.client.ts

@@ -74,7 +74,7 @@ export const configureReactServer: CreateReactWorkerServerFn =
       },
     });
     
-    // Return object with restart function and HMR update sender for handleHotUpdate
+    // Return object with restart function and HMR update sender for hotUpdate
     return {
       restart: restartFn,
       sendHmrUpdate: (file: string, routes?: string[]) => {

package/plugin/dev-server/plugin.client.ts

@@ -35,8 +35,7 @@ export const vitePluginReactDevServer: VitePluginFn = function _vitePluginReactS
   return {
     name: "vite-plugin-react-server:dev-server-client",
     apply: "serve", // Only apply in dev server mode
-    // Note: Removed applyToEnvironment - handleHotUpdate needs to run regardless
-    // The plugin should apply to client environment, but handleHotUpdate is a dev server hook
+    // No applyToEnvironment — hotUpdate needs to run for all environments
     // that should work regardless of environment filtering
     config(_config, viteConfigEnv) {
       configEnv = viteConfigEnv;
@@ -73,7 +72,13 @@ export const vitePluginReactDevServer: VitePluginFn = function _vitePluginReactS
         resolvedConfig: server.config,
       });
     },
-    handleHotUpdate({ file, server }) {
+    hotUpdate(ctx: any) {
+      const { file, server } = ctx;
+      const envName = ctx.environment?.name ?? 'unknown';
+      
+      // Only run worker invalidation from the client environment (once per change)
+      if (envName !== 'client') return;
+      
       // Prevent recursive HMR updates
       if (isProcessingHmr) {
         return undefined;
@@ -98,9 +103,6 @@ export const vitePluginReactDevServer: VitePluginFn = function _vitePluginReactS
       
       const isServerFile = isSourceFile && !isClientFile;
       
-      // Always log for debugging
-      server.config.logger.info(`[vite-plugin-react-server] handleHotUpdate: file=${file}, normalized=${normalizedFile}, isServerFile=${isServerFile}, isClientFile=${isClientFile}, hasHandler=${!!hmrHandler}`);
-      
       if (isServerFile && hmrHandler) {
         isProcessingHmr = true;
         
@@ -111,17 +113,8 @@ export const vitePluginReactDevServer: VitePluginFn = function _vitePluginReactS
           // This clears component caches, but Node.js's ES module cache persists
           hmrHandler.sendHmrUpdate(file);
           
-          // CRITICAL: Send custom HMR message to client via WebSocket
-          // Server components aren't in the client bundle, so vite:beforeUpdate doesn't fire
-          // We need to manually notify the client to refetch the RSC stream
-          server.ws.send({
-            type: 'custom',
-            event: 'vite-plugin-react-server:server-component-update',
-            data: {
-              file: normalizedFile,
-              path: file,
-            },
-          });
+          // NOTE: The WS event to notify the client is sent by the hotUpdate hook
+          // in plugin.server.ts — don't duplicate it here.
           
           // CRITICAL: Node.js caches ES modules, so we need to restart the worker
           // to clear the module cache. Debounce restarts to prevent recursion.
@@ -150,7 +143,7 @@ export const vitePluginReactDevServer: VitePluginFn = function _vitePluginReactS
             }, 500); // 500ms debounce
           } else {
             // No restart function available yet - worker hasn't been created
-            // This is expected if handleHotUpdate fires before the first request
+            // This is expected if hotUpdate fires before the first request
             server.config.logger.warn(`[vite-plugin-react-server] Restart function not available yet - worker will be created on next request`);
             setTimeout(() => {
               isProcessingHmr = false;
@@ -164,8 +157,7 @@ export const vitePluginReactDevServer: VitePluginFn = function _vitePluginReactS
         server.config.logger.warn(`[vite-plugin-react-server] Server file changed but HMR handler not available yet: ${file}`);
       }
       
-      // Return undefined to allow other plugins to handle the update
-      return undefined;
+      // Don't suppress — plugin.server.ts hotUpdate handles page reload prevention
     },
   };
 };

package/plugin/helpers/requestInfo.ts

@@ -76,6 +76,8 @@ export function requestInfo(
   const hasJsonHeader = req.headers["accept"]?.includes("application/json");
   const hasHtmlHeader = req.headers.accept?.includes("text/html");
   const hasRscHeader = req.headers.accept?.includes("text/x-component");
+  // Support ?_rsc query param (e.g. /?_rsc for browser debugging) as alternative to Accept header (useful for browser debugging)
+  const hasRscQueryParam = /[?&]_rsc\b/.test(req.url || "");
   const hasCssHeader = req.headers.accept?.includes("text/css");
   const isFolder = !ext;
   const isFormContentType =
@@ -112,15 +114,16 @@ export function requestInfo(
   // Form action detection
 
   const isHtmlRequest =
-    isHtml ||
+    !hasRscQueryParam && (isHtml ||
     hasHtmlHeader ||
     (isFolder &&
       !hasRscHeader &&
+      !hasRscQueryParam &&
       !isRsc &&
       !isJsRequest &&
-      !isFormActionRequest);
+      !isFormActionRequest));
   const isRscRequest =
-    !isJsRequest && !isHtmlRequest && (isRsc || hasRscHeader);
+    hasRscQueryParam || (!isJsRequest && !isHtmlRequest && (isRsc || hasRscHeader));
   const isCssRequest =
     !isHtmlRequest &&
     !isRscRequest &&

package/plugin/helpers/requestToRoute.ts

@@ -7,8 +7,9 @@ export function requestToRoute(
     "moduleBasePath" | "moduleBaseURL" | "build"
   >
 ) {
-  let route = req.url
-    ?.replace(
+  // Strip query string before route matching
+  let route = req.url?.split("?")[0]
+    .replace(
       handlerOptions.moduleBaseURL + handlerOptions.build.rscOutputPath,
       ""
     )