vite-plugin-react-server 1.1.17 → 1.1.19

package/plugin/types.ts

@@ -1,6 +1,7 @@
 import type { Readable } from "node:stream";
 import type { Worker } from "node:worker_threads";
 import type React from "react";
+import type { ExoticComponent, FragmentProps } from "react";
 import type {
   NormalizedOutputOptions,
   OutputBundle,
@@ -444,7 +445,8 @@ export type PluginEventType = PluginEvent["type"];
 
 export interface StreamPluginOptions<
   T extends PagePropOpt = PagePropOpt,
-  InlineCSS extends InlineCssOpt = InlineCssOpt
+  InlineCSS extends InlineCssOpt = InlineCssOpt,
+  As extends AsOpt = AsOpt
 > {
   projectRoot?: string; // defaults to process.cwd()
   moduleBase: string; // defaults to 'src'
@@ -457,7 +459,7 @@ export interface StreamPluginOptions<
   // Auto-discovery (zero-config)
   autoDiscover?:
     | {
-      // default: /\.(m|c)?(j|t)sx?$/
+        // default: /\.(m|c)?(j|t)sx?$/
         moduleExtension?: RegExp;
         // default: /^"use server"[\s;]*\n?/m
         serverDirective?: RegExp;
@@ -502,9 +504,9 @@ export interface StreamPluginOptions<
         // default: /\.rsc$/
         rscPattern?: RegExpOpt;
         // default serverDirective regex
-        isServerFunction?: RegExpOpt;
+        isServerFunctionCode?: (code: string, moduleId?: string) => boolean;
         // default clientDirective regex
-        isClientComponent?: RegExpOpt;
+        isClientComponentCode?: (code: string, moduleId?: string) => boolean;
       }
     | undefined;
   // Manual configuration
@@ -520,7 +522,7 @@ export interface StreamPluginOptions<
   loaderPath?: string;
   pageExportName?: string;
   propsExportName?: string;
-  Html?: React.FC<HtmlProps<T, InlineCSS>>;
+  Html?: React.FC<HtmlProps<T, InlineCSS, As>> | typeof React.Fragment;
   CssCollector?: CssCollectorBoxedType<T, InlineCSS>;
   build?: BuildConfig;
   css?: CssCollectorOptions<InlineCSS>;
@@ -561,12 +563,13 @@ export type CreateHandlerOptions<
   | "moduleRootPath"
   | "moduleBasePath"
   | "moduleBaseURL"
+  | "publicOrigin"
   | "pipeableStreamOptions"
   | "onEvent"
   | "onMetrics"
   | "projectRoot"
   | "normalizer"
-  | "moduleID"  
+  | "moduleID"
 > & {
   logger: Logger;
   loader: ModuleLoader;
@@ -778,10 +781,9 @@ export type InlineCssOpt = undefined | boolean;
 export type PagePropOpt = Record<string, unknown> | undefined;
 export type RegExpOpt = RegExp | string | ((path: string) => boolean);
 
-export type AsOpt = Exclude<
-  keyof React.JSX.IntrinsicElements,
-  "symbol" | "object"
->;
+export type AsOpt =
+  | ExoticComponent<FragmentProps>
+  | Exclude<keyof React.JSX.IntrinsicElements, "symbol" | "object">;
 export type PageComponentType<T extends PagePropOpt = PagePropOpt> =
   React.ComponentType<T & React.PropsWithChildren<{}>>;
 
@@ -803,7 +805,6 @@ export type HtmlProps<
   manifest: Manifest;
   CssCollector: CssCollectorBoxedType<T, InlineCSS, As>;
   globalCss: Map<string, CssContent<InlineCSS>>;
-  children?: React.ReactNode;
   as: As;
 };
 

package/plugin/vendor/types.ts

@@ -0,0 +1 @@
+// 

package/plugin/worker/rsc/handleRender.ts

@@ -46,8 +46,6 @@ export async function handleRender<
           if (hmrState.get(id)?.invalidated) {
             // Clear the HMR state for this module
             hmrState.delete(id);
-            // Force a reload by using a unique query parameter
-            console.log("LOADING", id);
             return import(join(projectRoot, id) + `?t=${Date.now()}`);
           }
           return import(join(projectRoot, id));

package/plugin/worker/rsc/handlers.ts

@@ -67,7 +67,7 @@ export const handlers: Required<StreamHandlers> = {
     const stream = ReactDOMServer.renderToPipeableStream(
       {
         type: "server-action-response",
-        returnValue: result,
+        returnValue: result
       },
       userOptions.moduleBasePath,
       {
@@ -137,7 +137,7 @@ export const handlers: Required<StreamHandlers> = {
       const stream = ReactDOMServer.renderToPipeableStream(
         {
           type: "server-action-response",
-          returnValue: result,
+          returnValue: result
         },
         userOptions.moduleBasePath,
         {
@@ -182,7 +182,7 @@ export const handlers: Required<StreamHandlers> = {
       const stream = ReactDOMServer.renderToPipeableStream(
         {
           type: "server-action-response",
-          returnValue: { success: false, error: errorMessage },
+          returnValue: { success: false, error: errorMessage }
         },
         userOptions.moduleBasePath,
         {

package/plugin/worker/rsc/state.ts

@@ -4,7 +4,6 @@ import type { CssContent, ResolvedUserOptions, HmrState } from "../../types.js";
 import type { PassThrough } from "node:stream";
 import { relative } from "node:path";
 
-
 // Track active RSC streams
 export const activeStreams = new Map<string, PassThrough>();
 
@@ -16,40 +15,66 @@ export const moduleIds = new Map<string, string>();
 
 export const hmrState = new Map<string, HmrState>();
 
-if(workerData) {
-  if(workerData.hmrPort) {
-    workerData.hmrPort.on('message', (msg: { type: string; path: string; routes?: string[] }) => {
-      if(msg.type === 'HMR_UPDATE') {
-        // Normalize the path relative to project root
-        const normalizedPath = relative(workerData.userOptions.projectRoot, msg.path);
-        hmrState.set(normalizedPath, { 
-          timestamp: Date.now(), 
-          invalidated: true,
-          routes: msg.routes || []
-        });
-      } else if(msg.type === 'HMR_ACCEPT') {
-        // Normalize the path relative to project root
-        const normalizedPath = relative(workerData.userOptions.projectRoot, msg.path);
-        hmrState.delete(normalizedPath);
+if (workerData) {
+  if (workerData.hmrPort) {
+    workerData.hmrPort.on(
+      "message",
+      (msg: { type: string; path: string; routes?: string[] }) => {
+        if (msg.type === "HMR_UPDATE") {
+          // Normalize the path relative to project root
+          const normalizedPath = relative(
+            workerData.userOptions.projectRoot,
+            msg.path
+          );
+          hmrState.set(normalizedPath, {
+            timestamp: Date.now(),
+            invalidated: true,
+            routes: msg.routes || [],
+          });
+        } else if (msg.type === "HMR_ACCEPT") {
+          // Normalize the path relative to project root
+          const normalizedPath = relative(
+            workerData.userOptions.projectRoot,
+            msg.path
+          );
+          hmrState.delete(normalizedPath);
+        }
       }
-    });
+    );
   }
 } else {
   throw new Error("This module must be run with workerData");
 }
 
-
-export function addCssFileContent(id: string, code: string, userOptions: Pick<ResolvedUserOptions, "projectRoot" | "moduleBaseURL" | "moduleBasePath" | "moduleRootPath" | "css" | "normalizer" | "moduleID">) {
-  if(typeof code !== "string"){
-    throw new Error(`Expected css to be loaded as a string, but got ${typeof code}`);
+export function addCssFileContent(
+  id: string,
+  code: string,
+  userOptions: Pick<
+    ResolvedUserOptions,
+    | "projectRoot"
+    | "moduleBaseURL"
+    | "moduleBasePath"
+    | "moduleRootPath"
+    | "css"
+    | "normalizer"
+    | "moduleID"
+    | "publicOrigin"
+  >
+) {
+  if (typeof code !== "string") {
+    throw new Error(
+      `Expected css to be loaded as a string, but got ${typeof code}`
+    );
   }
-  cssFiles.set(id, createCssProps({
+  cssFiles.set(
     id,
-    code,
-    userOptions
-  }));
-} 
-
+    createCssProps({
+      id,
+      code,
+      userOptions,
+    })
+  );
+}
 
 // Helper to check if a module is invalidated
 export function isModuleInvalidated(path: string): boolean {
@@ -75,4 +100,4 @@ export function addModuleId(id: string, url: string) {
 
 export function getModuleId(id: string): string | undefined {
   return moduleIds.get(id);
-} 
+}