vite-plugin-react-server 1.1.20 → 1.2.0-alpha.1

package/plugin/worker/types.ts

@@ -1,439 +1,184 @@
-import type { RenderToPipeableStreamOptions } from "react-dom/server";
-import type {
-  CreateHandlerOptions,
-  CssContent,
-  InlineCssOpt,
-  PagePropOpt,
-  StreamMetrics,
-} from "../types.js";
-import type { MessagePort } from "node:worker_threads";
+import type { CssContent, StreamMetrics } from "../types.js";
 
 // Base message types
-export interface WorkerMessage {
+export type WorkerMessage = {
   type: string;
   id: string;
 }
 
-// React Server DOM ESM specific options
-export interface ReactServerDomEsmOptions {
-  identifierPrefix?: string;
-  namespaceURI?: string;
-  nonce?: string;
-  bootstrapScriptContent?: string;
-  bootstrapScripts?: string[];
-  bootstrapModules?: string[];
-  progressiveChunkSize?: number;
-  temporaryReferences?: WeakMap<any, any>;
-  moduleBaseURL?: string;
-  importMap?: {
-    imports?: Record<string, string>;
-  };
-  onError?: (error: Error, errorInfo?: any) => void;
-  onPostpone?: (reason: string) => void;
-}
-
-// Combined options type that includes both React DOM and React Server DOM ESM options
-export type SerializeableRenderToPipeableStreamOptions = Omit<RenderToPipeableStreamOptions, "onShellReady" | "onShellError" | "onAllReady" | "onError" | "onPostpone">;
-
-export interface RscRenderState {
-  id: string;
-  outDir: string;
-  moduleRootPath: string;
-  moduleBaseURL: string;
-  rscOutputPath: string;
-  componentImport: string;
-  propsImport: string;
-  pipeableStreamOptions: ReactServerDomEsmOptions;
-}
-
-// Common Messages
-export interface ShutdownMessage extends WorkerMessage {
-  type: "SHUTDOWN";
-}
-
-export interface ErrorMessage extends WorkerMessage {
+// Common message types used across workers
+export type ErrorMessage = {
   type: "ERROR";
-  errorInfo?: any;
-  error: string | {
-    message: string;
-    stack?: string |  undefined;
-    name: string;
-    cause?: any;
-  };
-  id: string;
-}
-
-export interface ChunkProcessedMessage extends WorkerMessage {
-  type: "CHUNK_PROCESSED";
-  success: boolean;
-  sequence?: number;
-}
-
-export interface ChunkErrorMessage extends WorkerMessage {
-  type: "CHUNK_ERROR";
-  error: string;
-  sequence?: number;
-}
-
-export type StreamHandlers =  {
-  onError: (id: string, error: any, errorInfo?: any) => void;
-  onData: (id: string, data: any) => void;
-  onEnd: (id: string) => void;
-  onMetrics: (id: string, metrics: any) => void;
-  onHmrAccept: (id: string, routes?: string[]) => void;
-  onHmrUpdate: (id: string, routes?: string[]) => void;
-  onServerAction?: (id: string, args: unknown[]) => void;
-  onServerActionResponse?: (id: string, result?: unknown, error?: string) => void;
-  onServerModule?: (id: string, url: string, source: string) => void;
-  onShutdown?: (id: string) => void;
-  onCssFile?: (id: string, code: string) => void;
-};
-
-// RSC Messages
-export type RscRenderMessage<T extends PagePropOpt = PagePropOpt> = WorkerMessage & {
-  type: "RSC_RENDER";
-} & Omit<
-    CreateHandlerOptions,
-    | "onEvent"
-    | "onMetrics"
-    | "loader"
-    | "Html"
-    | "CssCollector"
-    | "logger"
-    | "build"
-    | "autoDiscover"
-  > & {
-    build: Omit<
-      CreateHandlerOptions<T>,
-      "entryFileNames" | "chunkFileNames" | "assetFileNames" | "pages"
-    > & {pages: string[]};
-  };
-
-export type RscChunkInputMessage = WorkerMessage &{
-    type: "RSC_CHUNK";
-    chunk: Buffer;
-    sequence: number;
+  errorInfo?: {
+    componentStack?: string | null;
+    digest?: string | null;
   };
-
-export type RscChunkOutputMessage = WorkerMessage & {
-  type: "RSC_CHUNK";
+  error:
+    | string
+    | {
+        message: string;
+        stack?: string | undefined;
+        name: string;
+        cause?: unknown;
+      };
   id: string;
-  chunk: Buffer;
-};
+} & WorkerMessage
 
-export interface RscEndMessage extends WorkerMessage {
-  type: "RSC_END";
+export type ReadyMessage = {
+  type: "READY";
   id: string;
+  env?: string;
+  pid?: number;
 }
 
-export interface RscMetricsMessage extends WorkerMessage {
-  type: "RSC_METRICS";
+export type ShutdownMessage = {
+  type: "SHUTDOWN";
+} & WorkerMessage
+
+export type ShutdownCompleteMessage = {
+  type: "SHUTDOWN_COMPLETE";
   id: string;
-  metrics: StreamMetrics;
 }
 
-export interface ShellReadyMessage extends WorkerMessage {
+export type ShellReadyMessage = {
   type: "SHELL_READY";
-}
+} & WorkerMessage
 
-export interface AllReadyMessage extends WorkerMessage {
+export type AllReadyMessage = {
   type: "ALL_READY";
   id: string;
-}
+} & WorkerMessage
 
-export interface ShellErrorMessage extends WorkerMessage {
+export type ShellErrorMessage = {
   type: "SHELL_ERROR";
   id: string;
   error: {
     message: string;
     stack?: string | undefined;
     name: string;
-    cause?: any;
+    cause?: unknown;
   };
-}
-
-export interface CssFileMessage {
-  type: "CSS_FILE";
-  id: string;
-  content: string;
-  moduleClasses?: Record<string, string>;
-  originalClasses?: Record<string, string>;
-  usedClasses?: string[];
-}
+} & WorkerMessage
 
-// Extend the imported CssContent type
-export type ExtendedCssContent = CssContent & {
-  usedClasses?: string[];
-};
+export type ChunkProcessedMessage = {
+  type: "CHUNK_PROCESSED";
+  success: boolean;
+  sequence?: number;
+} & WorkerMessage
 
-export type CleanupMessage = {
-  type: "CLEANUP";
-  id: string;
-}
+export type ChunkErrorMessage = {
+  type: "CHUNK_ERROR";
+  error: string;
+  sequence?: number;
+} & WorkerMessage
 
 export type CleanupCompleteMessage = {
   type: "CLEANUP_COMPLETE";
   id: string;
-}
-
-export type RouteReadyMessage<InlineCss extends InlineCssOpt = InlineCssOpt> = {
-  type: "ROUTE_READY";
-  id: string;
-  moduleRootPath: string;
-  moduleBaseURL: string;
-  projectRoot: string;
-  cssFiles:  Map<string, CssContent<InlineCss>>;
-  pipeableStreamOptions: Omit<ReactServerDomEsmOptions, "onError" | "onPostpone">;
-}
-
-// HTML Worker Messages
-export type HtmlWorkerInputMessage =
-  | RscChunkInputMessage
-  | RscEndMessage
-  | ShutdownMessage
-  | CleanupMessage
-  | CleanupCompleteMessage
-  | InitializedReactLoaderMessage
-  | InitializedCssLoaderMessage
-  | RouteReadyMessage
-
-export type HtmlChunkMessage = {
-  type: "HTML_CHUNK";
-  id: string;
-  chunk: string;
-  encoding: string;
-}
-
-export type HtmlCompleteMessage = {
-  type: "HTML_COMPLETE";
-  id: string;
-  success: boolean;
-  html?: string;
-  chunks?: string[];
-  metrics?: StreamMetrics;
-}
-
-export type HtmlWorkerOutputMessage =
-  | HtmlCompleteMessage
-  | ErrorMessage
-  | ShellReadyMessage
-  | ChunkProcessedMessage
-  | ChunkErrorMessage
-  | AllReadyMessage
-  | ShellErrorMessage
-  | HtmlChunkMessage
-  | ShutdownCompleteMessage
-  | HmrAcceptMessage
-  | ReadyMessage
-  | ServerActionMessage
-  | ServerActionResponseMessage
-  | ErrorMessage
-  | CleanupCompleteMessage
-
-export type InitializedReactLoaderMessage = {
-  type: "INITIALIZED_REACT_LOADER";
-  id: string;
-}
-export type InitializedCssLoaderMessage = {
-  type: "INITIALIZED_CSS_LOADER";
-  id: string;
-}
-
-export type InitializedRscWorkerLoaderMessage = {
-  type: "INITIALIZED_RSC_WORKER_LOADER";
-  id: string;
-}
-
-export type InitializedEnvLoaderMessage = {
-  type: "INITIALIZED_ENV_LOADER";
-  id: string;
-  env: Record<string, string>;
-}
-
-// HMR Messages
-export type HmrMessage = {
-  id: string;
-}
-
-export type HmrUpdateMessage = HmrMessage & {
-  type: "HMR_UPDATE";
-  routes?: string[];
-  timestamp?: number;
-}
-
-export type HmrCleanupMessage = HmrMessage & {
-  type: "HMR_CLEANUP";
-  routes?: string[];
-  timestamp?: number;
-}
-
-export type HmrAcceptMessage = HmrMessage & {
-  type: "HMR_ACCEPT";
-  routes?: string[];
-}
-
-// RSC Worker Messages
-export type RscWorkerInputMessage =
-  | RscRenderMessage
-  | CssFileMessage
-  | ShutdownMessage
-  | ChunkProcessedMessage
-  | ClientComponentMessage
-  | InitializedReactLoaderMessage
-  | InitializedCssLoaderMessage
-  | ModuleRequestMessage  
-  | InitializedRscWorkerLoaderMessage
-  | InitializedEnvLoaderMessage
-  | HmrUpdateMessage
-  | HmrAcceptMessage
-  | HmrCleanupMessage
-  | CleanupCompleteMessage
-  | ServerActionMessage
-  | ServerActionResponseMessage
-  | ServerModuleMessage;
-
-export interface CssFileRequestMessage extends WorkerMessage {
-  type: "CSS_FILE_REQUEST";
-  id: string;
-  path: string;
-}
-
-export interface ClientComponentMessage extends WorkerMessage {
-  type: "CLIENT_COMPONENT";
-  url: string;
-  source: string;
-}
-
-export interface ModuleRequestMessage extends WorkerMessage {
-  type: "MODULE_REQUEST";
-  id: string;
-  path: string;
-}
-
-export interface ModuleResponseMessage extends WorkerMessage {
-  type: "MODULE_RESPONSE";
-  id: string;
-  module: any;
-}
-
-export interface CssProcessedMessage extends WorkerMessage {
-  type: "CSS_PROCESSED";
-  id: string;
-}
-
-export type ReadyMessage = {
-  type: "READY";
-  id: string;
-  env?: string;
-  pid?: number;
-}
-
-export type ShutdownCompleteMessage = {
-  type: "SHUTDOWN_COMPLETE";
-  id: string;
-}
+} & WorkerMessage
 
-export interface ServerActionMessage extends WorkerMessage {
+export type ServerActionMessage = {
   type: "SERVER_ACTION";
   args: unknown[];
-}
+} & WorkerMessage
 
-export interface ServerActionResponseMessage extends WorkerMessage {
+export type ServerActionResponseMessage = {
   type: "SERVER_ACTION_RESPONSE";
   id: string;
   result?: unknown;
   error?: string;
-}
+} & WorkerMessage
 
-export type RscWorkerOutputMessage =
-  | RscChunkOutputMessage
-  | RscEndMessage
-  | ShellReadyMessage
-  | AllReadyMessage
-  | ErrorMessage
-  | CssFileMessage
-  | CssFileRequestMessage
-  | ClientComponentMessage
-  | ModuleRequestMessage
-  | ModuleResponseMessage
-  | CssProcessedMessage
-  | RscMetricsMessage
-  | HmrAcceptMessage
-  | HmrUpdateMessage
-  | ReadyMessage
-  | ServerActionMessage
-  | ServerActionResponseMessage
-  | ShutdownCompleteMessage
-  | ServerModuleMessage;
+export type HmrAcceptMessage = {
+  type: "HMR_ACCEPT";
+  routes?: string[];
+} & WorkerMessage
 
-export interface ClientReferenceMessage extends WorkerMessage {
-  type: "CLIENT_REFERENCE";
-  location: string;
-  key: string;
-  ref: unknown;
-}
+export type RscChunkMessage = {
+  type: "RSC_CHUNK";
+  chunk: Uint8Array;
+  sequence?: number;
+} & WorkerMessage
 
-export interface ServerReferenceMessage extends WorkerMessage {
-  type: "SERVER_REFERENCE";
-  location: string;
-  key: string;
-  ref: unknown;
-}
+export type RscEndMessage = {
+  type: "RSC_END";
+} & WorkerMessage
 
-// HTML Messages
-export interface WorkerRscChunkMessage extends WorkerMessage {
-  type: "RSC_CHUNK";
-  chunk: ArrayBufferLike;
+export type RouteReadyMessage = {
+  type: "ROUTE_READY";
   moduleRootPath: string;
   moduleBaseURL: string;
-  pipeableStreamOptions: Omit<ReactServerDomEsmOptions, "onError" | "onPostpone">;
-}
-
-export type BuildWorkerMessage =
-  | {
-      type: "RUN_BUILD";
-      id: string;
-      options: {
-        root: string;
-        outDir: string;
-        condition: "react-client" | "react-server";
-      };
-    }
-  | {
-      type: "BUILD_RESULT";
-      id: string;
-      result:
-        | {
-            type: "success";
-            manifest: string | undefined;
-          }
-        | {
-            type: "error";
-            error: Error;
-          };
-    };
-
-export interface TransformResult {
-  code: string;
-  map?: any;
-  modules?: {
-    [key: string]: {
-      locals: Record<string, string>;
-      exports: Record<string, string>;
-    };
+  cssFiles: Map<string, CssContent>;
+  pipeableStreamOptions: {
+    identifierPrefix?: string;
+    namespaceURI?: string;
+    nonce?: string;
+    bootstrapScriptContent?: string;
+    bootstrapScripts?: Array<
+      | string
+      | {
+          src: string;
+          integrity?: string | undefined;
+          crossOrigin?: string | undefined;
+        }
+    >;
+    bootstrapModules?: Array<
+      | string
+      | {
+          src: string;
+          integrity?: string | undefined;
+          crossOrigin?: string | undefined;
+        }
+    >;
+    progressiveChunkSize?: number;
   };
-}
+  projectRoot: string;
+} & WorkerMessage
 
-export type LoaderMessage = {
-  type: "LOADER_PORTS" | "REGISTER_LOADER";
-  ports?: Record<string, MessagePort>;
-  key?: string;
-  port?: MessagePort;
-  importMap?: string;
+export type CleanupMessage = {
+  type: "CLEANUP";
+} & WorkerMessage
+
+// Common handlers
+export type StreamHandlers = {
+  onError: (id: string, error: unknown, errorInfo?: {
+    componentStack?: string | null;
+    digest?: string | null;
+  } | Record<string, unknown>) => void;
+  onData: (id: string, data: Uint8Array) => void;
+  onEnd: (id: string) => void;
+  onMetrics: (id: string, metrics: StreamMetrics) => void;
+  onHmrAccept: (id: string, routes?: string[]) => void;
+  onHmrUpdate: (id: string, routes?: string[]) => void;
+  onServerAction?: (id: string, args: unknown[]) => void;
+  onServerActionResponse?: (
+    id: string,
+    result?: unknown,
+    error?: string
+  ) => void;
+  onServerModule?: (id: string, url: string, source: string) => void;
+  onShutdown?: (id: string) => void;
+  onCssFile?: (id: string, code: string) => void;
 };
 
-export interface ServerModuleMessage extends WorkerMessage {
-  type: "SERVER_MODULE";
-  url: string;
-  source: string;
+// Common options
+export type ReactServerDomEsmOptions = {
+  identifierPrefix?: string;
+  namespaceURI?: string;
+  nonce?: string;
+  bootstrapScriptContent?: string;
+  bootstrapScripts?: string[];
+  bootstrapModules?: string[];
+  progressiveChunkSize?: number;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  temporaryReferences?: WeakMap<any, any>;
+  moduleBaseURL?: string;
+  importMap?: {
+    imports?: Record<string, string>;
+  };
+  onError?: (error: Error, errorInfo?: {
+    componentStack?: string | null;
+    digest?: string | null;
+  }) => void;
+  onPostpone?: (reason: string) => void;
 }

package/scripts/check-react-version.mjs

@@ -8,11 +8,11 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 // Hardcoded template version from our last successful patch
 const TEMPLATE_VERSION = "0.0.0-experimental-0ca8420f-20250504";
-const [templateVersionNumber, templateVersionSuffix] = TEMPLATE_VERSION.split("-");
+const [_templateVersionNumber, templateVersionSuffix] = TEMPLATE_VERSION.split("-experimental-");
 
 // Get installed version
 const installedVersion = React.version;
-const [installedVersionNumber, installedVersionSuffix] = installedVersion.split("-");
+const [_installedVersionNumber, installedVersionSuffix] = installedVersion.split("-experimental-");
 
 // Get peer dependency versions
 const peerReactVersion = packageJSON.peerDependencies.react.replace("^", "");
@@ -55,7 +55,7 @@ async function main() {
 
   // Process each patch
   for (const { template, output } of patches) {
-    let patchContent = await fs.readFile(template, "utf-8");
+    const patchContent = await fs.readFile(template, "utf-8");
     // Write patched file
     const outputPath = path.resolve(userPatchesDir, output);
     await fs.writeFile(outputPath, patchContent);

package/scripts/fix-unused-imports.mjs

@@ -0,0 +1,77 @@
+#!/usr/bin/env node
+
+import { readFileSync, writeFileSync } from 'fs';
+import { execSync } from 'child_process';
+
+// Get ESLint output
+const eslintOutput = execSync('npx eslint plugin --format json', { encoding: 'utf8' });
+const results = JSON.parse(eslintOutput);
+
+const filesToFix = new Map();
+
+// Process ESLint results
+results.forEach(result => {
+  if (result.messages.length > 0) {
+    const unusedImports = result.messages
+      .filter(msg => 
+        msg.ruleId === '@typescript-eslint/no-unused-vars' && 
+        msg.message.includes('is defined but never used')
+      )
+      .map(msg => {
+        const match = msg.message.match(/'([^']+)'/);
+        return match ? match[1] : null;
+      })
+      .filter(Boolean);
+    
+    if (unusedImports.length > 0) {
+      filesToFix.set(result.filePath, unusedImports);
+    }
+  }
+});
+
+// Fix files
+filesToFix.forEach((unusedImports, filePath) => {
+  console.log(`Fixing ${filePath.replace(process.cwd() + '/', '')}`);
+  console.log(`  Removing: ${unusedImports.join(', ')}`);
+  
+  const content = readFileSync(filePath, 'utf8');
+  const lines = content.split('\n');
+  
+  // Remove import lines that only contain unused imports
+  const newLines = lines.filter(line => {
+    if (!line.trim().startsWith('import ')) return true;
+    
+    // Check if this import line only contains unused imports
+    const hasUsedImports = !unusedImports.every(unused => {
+      return line.includes(unused) && 
+        !line.replace(new RegExp(`\\b${unused}\\b`, 'g'), '').match(/[a-zA-Z_$][a-zA-Z0-9_$]*/);
+    });
+    
+    return hasUsedImports;
+  });
+  
+  // Also remove individual unused imports from mixed import lines
+  const finalLines = newLines.map(line => {
+    if (!line.trim().startsWith('import ')) return line;
+    
+    let modifiedLine = line;
+    unusedImports.forEach(unused => {
+      // Remove from destructured imports
+      modifiedLine = modifiedLine.replace(new RegExp(`\\b${unused}\\b,?\\s*`, 'g'), '');
+      modifiedLine = modifiedLine.replace(/,\s*}/, ' }');
+      modifiedLine = modifiedLine.replace(/{\s*,/, '{ ');
+      modifiedLine = modifiedLine.replace(/{\s*}/, '{}');
+    });
+    
+    // Remove empty import statements
+    if (modifiedLine.match(/import\s*{\s*}\s*from/)) {
+      return '';
+    }
+    
+    return modifiedLine;
+  }).filter(line => line !== '');
+  
+  writeFileSync(filePath, finalLines.join('\n'));
+});
+
+console.log(`Fixed ${filesToFix.size} files`); 

package/tsconfig.json

@@ -79,7 +79,7 @@
     "index.ts",
     "server.ts",
     "client.ts",
-    "types.ts",
+    "types.ts"
   ],
   "exclude": [
     "dist",

package/dist/_virtual/dynamic-import-helper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"dynamic-import-helper.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/client.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"client.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;"}

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sources":["../index.ts"],"sourcesContent":["\"use strict\";\n\nconst condition = process.env['NODE_OPTIONS']?.match(/--conditions[= ]react-server/) ? 'server' : 'client'\n\nexport const vitePluginReactServer = await import(`./plugin/react-server/plugin.${condition}.js`).then(m => {\n  if(!('vitePluginReactServer' in m)){\n    throw new Error(`Could not find vitePluginReactServer in ./plugin/react-server/plugin.${condition}.js`);\n  }\n  return m['vitePluginReactServer']\n})\n\n// types\nexport type * from './plugin/types.js'"],"names":[],"mappings":";;;;;;;AAEA,MAAM,SAAA,GAAY,QAAQ,GAAI,CAAA,cAAc,GAAG,KAAM,CAAA,8BAA8B,IAAI,QAAW,GAAA,QAAA;AAE3F,MAAM,wBAAwB,MAAM,oCAAA,mCAAA,GAAA,CAAA,6BAAA,EAAA,SAAA,CAAA,GAAA,CAAA,EAAA,CAAA,CAAgD,CAAO,KAAK,CAAK,CAAA,KAAA;AAC1G,EAAG,IAAA,EAAE,2BAA2B,CAAG,CAAA,EAAA;AACjC,IAAA,MAAM,IAAI,KAAA,CAAM,CAAwE,qEAAA,EAAA,SAAS,CAAK,GAAA,CAAA,CAAA;AAAA;AAExG,EAAA,OAAO,EAAE,uBAAuB,CAAA;AAClC,CAAC;;;;"}

package/dist/plugin/components/css-collector-elements.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"css-collector-elements.d.ts","sourceRoot":"","sources":["../../../plugin/components/css-collector-elements.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9C,eAAO,MAAM,oBAAoB,GAAI,eAElC;IACD,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,UAAU,EAAE,CAAC;CAClD,+BAiCA,CAAC"}