vite-plugin-react-server 0.3.10 → 0.3.12

package/plugin/worker/types.ts

@@ -1,4 +1,12 @@
-interface PipeableStreamOptions {
+import type { Manifest } from "vite";
+
+// Base message types
+export interface WorkerMessage {
+  type: string;
+  id: string;
+}
+
+export interface PipeableStreamOptions {
   bootstrapModules?: string[];
   bootstrapScripts?: string[];
   bootstrapScriptContent?: string;
@@ -15,6 +23,7 @@ interface PipeableStreamOptions {
   };
 }
 
+// Worker States
 export interface HtmlRenderState {
   chunks: string[];
   complete: boolean;
@@ -29,96 +38,132 @@ export interface HtmlRenderState {
 
 export interface RscRenderState {
   id: string;
-  pipableStreamOptions: PipeableStreamOptions;
   outDir: string;
   moduleRootPath: string;
   moduleBaseURL: string;
   rscOutputPath: string;
   componentImport: string;
   propsImport: string;
-}
-
-export interface WorkerRscChunkMessage {
-  type: "RSC_CHUNK";
-  id: string;
-  chunk: string;
-  moduleRootPath: string;
-  moduleBaseURL: string;
-  outDir: string;
-  htmlOutputPath: string;
   pipableStreamOptions: PipeableStreamOptions;
 }
 
-export interface ShutdownMessage {
+// Common Messages
+export interface ShutdownMessage extends WorkerMessage {
   type: "SHUTDOWN";
-  id: string;
 }
 
-export interface RscRenderMessage {
+// RSC Messages
+export interface RscRenderMessage extends WorkerMessage {
   type: "RSC_RENDER";
-  id: string;
   pageImport: string;
   propsImport: string;
+  pageExportName: string;
+  propsExportName: string;
+  url: string;
   outDir: string;
+  projectRoot: string;
   moduleRootPath: string;
   moduleBaseURL: string;
+  moduleBasePath: string;
   pipableStreamOptions: PipeableStreamOptions;
+  cssFiles: string[];
 }
 
-export interface RscCompleteMessage {
-  type: "RSC_COMPLETE";
-  id: string;
-  outputPath: string;
+export interface RscChunkMessage extends WorkerMessage {
+  type: "RSC_CHUNK";
+  chunk: string;
+  moduleRootPath: string;
+  moduleBaseURL: string;
+  outDir: string;
+  rscOutputPath: string;
+  cssFiles: Array<[string, string]>;
 }
 
-export interface RscErrorMessage {
-  type: "ERROR";
-  id: string;
-  error: string;
+export interface RscShellReadyMessage extends WorkerMessage {
+  type: "SHELL_READY";
 }
 
-export interface RscWroteFileMessage {
-  type: "WROTE_FILE";
-  id: string;
+export interface RscAllReadyMessage extends WorkerMessage {
+  type: "ALL_READY";
   outputPath: string;
+  contents: string;
 }
 
-export interface RscEndMessage {
+export interface RscEndMessage extends WorkerMessage {
   type: "RSC_END";
-  id: string;
 }
 
-export interface ClientReferenceMessage {
+export interface RscErrorMessage extends WorkerMessage {
+  type: "ERROR";
+  error: string;
+}
+
+export interface ClientReferenceMessage extends WorkerMessage {
   type: "CLIENT_REFERENCE";
-  id: string;
   location: string;
   key: string;
   ref: unknown;
 }
 
-export interface ServerReferenceMessage {
+export interface ServerReferenceMessage extends WorkerMessage {
   type: "SERVER_REFERENCE";
-  id: string;
   location: string;
   key: string;
   ref: unknown;
 }
 
+// HTML Messages
+export interface WorkerRscChunkMessage extends WorkerMessage {
+  type: "RSC_CHUNK";
+  chunk: string;
+  moduleRootPath: string;
+  moduleBaseURL: string;
+  outDir: string;
+  htmlOutputPath: string;
+  pipableStreamOptions: PipeableStreamOptions;
+  clientManifest: Manifest;
+  serverManifest: Manifest;
+}
+
+export interface ShellReadyMessage extends WorkerMessage {
+  type: "SHELL_READY";
+}
+
+export interface AllReadyMessage extends WorkerMessage {
+  type: "ALL_READY";
+  outputPath: string;
+  html: string;
+}
+
+export interface CssFileMessage extends WorkerMessage {
+  type: "CSS_FILE";
+  id: string;
+  cssFile: string;
+  moduleClasses?: Record<string, string>;
+}
+
+// Message Unions
 export type HtmlWorkerMessage =
   | WorkerRscChunkMessage
   | RscEndMessage
   | ShutdownMessage;
 
+export type HtmlWorkerResponse =
+  | ShellReadyMessage
+  | AllReadyMessage
+  | RscErrorMessage;
+
 export type RscWorkerMessage =
   | RscRenderMessage
+  | RscChunkMessage
   | RscEndMessage
   | ShutdownMessage
   | ClientReferenceMessage
-  | ServerReferenceMessage;
+  | ServerReferenceMessage
+  | CssFileMessage;
 
 export type RscWorkerResponse = 
-  | RscCompleteMessage
+  | RscShellReadyMessage
+  | RscAllReadyMessage
   | RscErrorMessage
-  | RscWroteFileMessage
-  | ClientReferenceMessage
-  | ServerReferenceMessage;
+  | CssFileMessage;

package/scripts/check-react-version.mjs

@@ -2,10 +2,14 @@
 import fs from 'node:fs/promises'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
+import React from 'react'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
 const TEMPLATE_VERSION = '0.0.0-experimental-b3a95caf-20250113'
+const ACTUAL_TEMPLATE_VERSION = '19.1.0-experimental-b3a95caf-20250113'
+const TARGET_VERSION = '0.0.0-experimental-e670e72f-20250214'
+const ACTUAL_TARGET_VERSION = '19.1.0-experimental-e670e72f-20250214'
 const STUB_VERSION = '0.0.1'
 
 async function main() {
@@ -13,13 +17,17 @@ async function main() {
     const reactPkgPath = path.resolve(process.cwd(), 'node_modules/react/package.json')
     const reactPkg = JSON.parse(await fs.readFile(reactPkgPath, 'utf-8'))
     const userPkg = JSON.parse(await fs.readFile(path.resolve(process.cwd(), 'package.json'), 'utf-8'))
-    const patchVersion = reactPkg.version
+    const patchVersion = React.version
+    
     let userVersion = userPkg.dependencies?.react ?? userPkg.devDependencies?.react ?? userPkg.peerDependencies?.react
     if(!userVersion) {
         throw new Error('React version not found in package.json')
     } else {
       userVersion = userVersion.replace('^', '')
     }
+    if(userVersion !== TARGET_VERSION) {
+      throw new Error(`React patch was made for version ${ACTUAL_TARGET_VERSION}, but you installed version ${userVersion}`)
+    }
     // Define patches to process
     const patches = [
       {
@@ -43,18 +51,20 @@ async function main() {
     // Process each patch
     for (const {template, output} of patches) {
       let patchContent = await fs.readFile(template, 'utf-8')
-      
-      // Replace versions
-      patchContent = patchContent
-        .replace(new RegExp(TEMPLATE_VERSION, 'g'), patchVersion)
-
       // Write patched file
       const outputPath = path.resolve(userPatchesDir, output)
       await fs.writeFile(outputPath, patchContent)
       console.log(`Wrote patch file to ${outputPath}`)
     }
 
-    console.log(`Updated patches to match React version ${userVersion} (actual version: ${patchVersion})`)
+    console.log(`React version check result: 
+      userVersion: ${userVersion}
+      patchVersion: ${patchVersion}
+      ACTUAL_TARGET_VERSION: ${ACTUAL_TARGET_VERSION}
+      ACTUAL_TEMPLATE_VERSION: ${ACTUAL_TEMPLATE_VERSION}
+      TARGET_VERSION: ${TARGET_VERSION}
+      TEMPLATE_VERSION: ${TEMPLATE_VERSION}
+`)
 }
 
 const PATCH = ``