vite-plugin-react-server 1.1.14 → 1.1.15

package/plugin/loader/sourceMap.ts

@@ -1,5 +1,5 @@
+import { createMappingsSerializer } from "../source-map/createMappingsSerializer.js";
 import type { SourceMap } from "../types/sourceMap.js";
-import createMappingsSerializer from 'webpack-sources/lib/helpers/createMappingsSerializer.js';
 import { basename } from "path";
 
 /**

package/plugin/react-client/configureWorkerRequestHandler.ts

@@ -52,9 +52,6 @@ export async function configureWorkerRequestHandler<
     moduleBaseURL: server.config.base,
     moduleBasePath: server.config.base,
     projectRoot: server.config.root,
-    moduleID: (id: string) => {
-      return id
-    }
   });
 
   // Start the worker

package/plugin/types.ts

@@ -22,6 +22,12 @@ import type { ReactServerDomEsmOptions } from "./worker/types.js";
 
 export type OnEvent = (event: PluginEvent) => void;
 
+export type CreateInputNormalizerProps = {
+  root: string;
+  preserveModulesRoot?: string | undefined;
+  removeExtension?: boolean | RegExp | string | ((path: string) => boolean);
+  moduleBasePath: string | undefined;
+};
 export type Serializable =
   | string
   | number

package/plugin/worker/rsc/handlers.ts

@@ -8,66 +8,136 @@ import { ReactDOMServer } from "../../vendor/vendor.server.js";
 import { PassThrough } from "node:stream";
 
 export const handlers: Required<StreamHandlers> = {
-    onError: (id, error, errorInfo) => {
-      sendRscWorkerMessage({
-        type: "ERROR",
-        id: id,
-        errorInfo,
-        error: toError(error),
-      });
-      sendRscWorkerMessage({
-        type: "RSC_END",
-        id: id,
-      });
-    },
-    onData: (id, data: any) => {
+  onError: (id, error, errorInfo) => {
+    sendRscWorkerMessage({
+      type: "ERROR",
+      id: id,
+      errorInfo,
+      error: toError(error),
+    });
+    sendRscWorkerMessage({
+      type: "RSC_END",
+      id: id,
+    });
+  },
+  onData: (id, data: any) => {
+    sendRscWorkerMessage({
+      type: "RSC_CHUNK",
+      id: id,
+      chunk: data,
+    });
+  },
+  onEnd: (id: string) => {
+    sendRscWorkerMessage({
+      type: "RSC_END",
+      id: id,
+    });
+  },
+  onMetrics: (id: string, metrics: any) => {
+    sendRscWorkerMessage({
+      type: "RSC_METRICS",
+      id: id,
+      metrics,
+    });
+  },
+  onHmrAccept: (id, routes) => {
+    sendRscWorkerMessage({
+      type: "HMR_ACCEPT",
+      id: id,
+      routes: routes,
+    });
+  },
+  onHmrUpdate: (id, routes) => {
+    sendRscWorkerMessage({
+      type: "HMR_UPDATE",
+      id: id,
+      routes: routes,
+    });
+  },
+  onServerModule: (id, url, source) => {
+    addModuleId(id, url);
+    sendRscWorkerMessage({
+      type: "SERVER_MODULE",
+      id,
+      url,
+      source,
+    });
+  },
+  onServerActionResponse: (id, result) => {
+    const stream = ReactDOMServer.renderToPipeableStream(
+      {
+        type: "server-action-response",
+        returnValue: result,
+      },
+      userOptions.moduleBasePath,
+      {
+        onError(error: Error) {
+          sendRscWorkerMessage({
+            type: "ERROR",
+            id,
+            error: toError(error),
+          });
+        },
+      }
+    );
+
+    const passThrough = new PassThrough();
+    stream.pipe(passThrough);
+
+    passThrough.on("data", (chunk) => {
       sendRscWorkerMessage({
         type: "RSC_CHUNK",
-        id: id,
-        chunk: data,
+        id,
+        chunk,
       });
-    },
-    onEnd: (id: string) => {
+    });
+
+    passThrough.on("end", () => {
       sendRscWorkerMessage({
         type: "RSC_END",
-        id: id,
-      });
-    },
-    onMetrics: (id: string, metrics: any) => {
-      sendRscWorkerMessage  ({
-        type: "RSC_METRICS",
-        id: id,
-        metrics,
-      });
-    },
-    onHmrAccept: (id, routes) => {
-      sendRscWorkerMessage({
-        type: "HMR_ACCEPT",
-        id: id,
-        routes: routes,
-      });
-    },
-    onHmrUpdate: (id, routes) => {
-      sendRscWorkerMessage({
-        type: "HMR_UPDATE",
-        id: id,
-        routes: routes,
+        id,
       });
-    },
-    onServerModule: (id, url, source) => {
-      addModuleId(id, url);
+    });
+
+    passThrough.on("error", (error) => {
       sendRscWorkerMessage({
-        type: "SERVER_MODULE",
+        type: "ERROR",
         id,
-        url,
-        source,
+        error: toError(error),
       });
-    },
-    onServerActionResponse: (id, result) => {
+    });
+  },
+  onServerAction: async (id, args) => {
+    try {
+      // Parse the server action ID to get the file path and export name
+      const [filePath, exportName] = id.split("#");
+      if (!filePath || !exportName) {
+        throw new Error(
+          `Invalid server action ID format: ${id}. Expected format: "path/to/file.ts#exportName"`
+        );
+      }
+      // Convert the server action ID to a file path
+      const actionPath = filePath.startsWith(userOptions.moduleBasePath)
+        ? filePath.slice(userOptions.moduleBasePath.length)
+        : filePath;
+      const fullPath = join(userOptions.projectRoot, actionPath);
+
+      // Load the server action module
+      const module = await import(fullPath);
+      const action = module[exportName];
+
+      if (typeof action !== "function") {
+        throw new Error(`Server action not found: ${id}`);
+      }
+
+      // Execute the server action
+      const result = await action(...args);
+
+      // Send success response using RSC stream
       const stream = ReactDOMServer.renderToPipeableStream(
         {
           type: "server-action-response",
-          returnValue: result
+          returnValue: result,
         },
         userOptions.moduleBasePath,
         {
@@ -75,9 +145,9 @@ export const handlers: Required<StreamHandlers> = {
             sendRscWorkerMessage({
               type: "ERROR",
               id,
-              error: toError(error)
+              error: toError(error),
             });
-          }
+          },
         }
       );
 
@@ -88,14 +158,14 @@ export const handlers: Required<StreamHandlers> = {
         sendRscWorkerMessage({
           type: "RSC_CHUNK",
           id,
-          chunk
+          chunk,
         });
       });
 
       passThrough.on("end", () => {
         sendRscWorkerMessage({
           type: "RSC_END",
-          id
+          id,
         });
       });
 
@@ -103,141 +173,74 @@ export const handlers: Required<StreamHandlers> = {
         sendRscWorkerMessage({
           type: "ERROR",
           id,
-          error: toError(error)
+          error: toError(error),
         });
       });
-    },
-    onServerAction: async (id, args) => {
-      try {
-        // Parse the server action ID to get the file path and export name
-        const [filePath, exportName] = id.split("#");
-        if (!filePath || !exportName) {
-          throw new Error(`Invalid server action ID format: ${id}. Expected format: "path/to/file.ts#exportName"`);
-        }
-
-        // Convert the server action ID to a file path
-        const actionPath = filePath.startsWith("/") ? filePath.slice(1) : filePath;
-        const fullPath = join(userOptions.projectRoot, actionPath);
-
-        // Load the server action module
-        const module = await import(fullPath);
-        const action = module[exportName];
-
-        if (typeof action !== "function") {
-          throw new Error(`Server action not found: ${id}`);
-        }
-
-        // Execute the server action
-        const result = await action(...args);
-
-        // Send success response using RSC stream
-        const stream = ReactDOMServer.renderToPipeableStream(
-          {
-            type: "server-action-response",
-            returnValue: result
-          },
-          userOptions.moduleBasePath,
-          {
-            onError(error: Error) {
-              sendRscWorkerMessage({
-                type: "ERROR",
-                id,
-                error: toError(error)
-              });
-            }
-          }
-        );
-
-        const passThrough = new PassThrough();
-        stream.pipe(passThrough);
-
-        passThrough.on("data", (chunk) => {
-          sendRscWorkerMessage({
-            type: "RSC_CHUNK",
-            id,
-            chunk
-          });
-        });
-
-        passThrough.on("end", () => {
-          sendRscWorkerMessage({
-            type: "RSC_END",
-            id
-          });
-        });
-
-        passThrough.on("error", (error) => {
-          sendRscWorkerMessage({
-            type: "ERROR",
-            id,
-            error: toError(error)
-          });
-        });
-      } catch (error: unknown) {
-        const errorMessage = toError(error).message;
-        // Send error response using RSC stream
-        const stream = ReactDOMServer.renderToPipeableStream(
-          {
-            type: "server-action-response",
-            returnValue: { success: false, error: errorMessage }
+    } catch (error: unknown) {
+      const errorMessage = toError(error).message;
+      // Send error response using RSC stream
+      const stream = ReactDOMServer.renderToPipeableStream(
+        {
+          type: "server-action-response",
+          returnValue: { success: false, error: errorMessage },
+        },
+        userOptions.moduleBasePath,
+        {
+          onError(error: Error) {
+            sendRscWorkerMessage({
+              type: "ERROR",
+              id,
+              error: toError(error),
+            });
           },
-          userOptions.moduleBasePath,
-          {
-            onError(error: Error) {
-              sendRscWorkerMessage({
-                type: "ERROR",
-                id,
-                error: toError(error)
-              });
-            }
-          }
-        );
-
-        const passThrough = new PassThrough();
-        stream.pipe(passThrough);
+        }
+      );
 
-        passThrough.on("data", (chunk) => {
-          sendRscWorkerMessage({
-            type: "RSC_CHUNK",
-            id,
-            chunk
-          });
-        });
+      const passThrough = new PassThrough();
+      stream.pipe(passThrough);
 
-        passThrough.on("end", () => {
-          sendRscWorkerMessage({
-            type: "RSC_END",
-            id
-          });
+      passThrough.on("data", (chunk) => {
+        sendRscWorkerMessage({
+          type: "RSC_CHUNK",
+          id,
+          chunk,
         });
+      });
 
-        passThrough.on("error", (error) => {
-          sendRscWorkerMessage({
-            type: "ERROR",
-            id,
-            error: toError(error)
-          });
+      passThrough.on("end", () => {
+        sendRscWorkerMessage({
+          type: "RSC_END",
+          id,
         });
-      }
-    },
-    onShutdown: (id: string) => {
-      // Send SHUTDOWN_COMPLETE message to signal that shutdown is complete
-      sendRscWorkerMessage({
-        type: "SHUTDOWN_COMPLETE",
-        id: id,
       });
-    },
-    onCssFile: (id, code) => {
-      if (id) {
-        // Add to CSS registry
-        addCssFileContent(id, code, userOptions);
-        
-        // Send CSS file message
+
+      passThrough.on("error", (error) => {
         sendRscWorkerMessage({
-          type: "CSS_FILE",
+          type: "ERROR",
           id,
-          content: code
+          error: toError(error),
         });
-      }
-    },  
-  };
+      });
+    }
+  },
+  onShutdown: (id: string) => {
+    // Send SHUTDOWN_COMPLETE message to signal that shutdown is complete
+    sendRscWorkerMessage({
+      type: "SHUTDOWN_COMPLETE",
+      id: id,
+    });
+  },
+  onCssFile: (id, code) => {
+    if (id) {
+      // Add to CSS registry
+      addCssFileContent(id, code, userOptions);
+
+      // Send CSS file message
+      sendRscWorkerMessage({
+        type: "CSS_FILE",
+        id,
+        content: code,
+      });
+    }
+  },
+};

package/plugin/worker/rsc/messageHandler.tsx

@@ -31,7 +31,6 @@ export async function messageHandler(
       case "INITIALIZED_REACT_LOADER":
       case "INITIALIZED_CSS_LOADER":
       case "INITIALIZED_ENV_LOADER":
-        console.log("Initialized ", msg.id);
         return;
       case "HMR_UPDATE":
         // Mark the module as invalidated

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

@@ -101,6 +101,7 @@ try {
   register(envLoaderPath, {
     parentURL: pluginRoot,
     data: {
+      id: "env-loader",
       port: envLoaderChannel.port1,
       resolvedConfig: workerData.resolvedConfig,
     },