vite-plugin-react-server 0.3.3 → 0.3.5

package/dist/types.d.ts

@@ -1,202 +1,2 @@
-import type { AliasOptions, BuildOptions, Connect, Logger, Manifest, ModuleGraph, UserConfig, ViteDevServer } from "vite";
-export interface StreamPluginOptionsClient {
-    outDir?: string;
-    build?: BuildConfig;
-    assetsDir?: string;
-    projectRoot?: string;
-    moduleBase?: string;
-    moduleBasePath?: string;
-    moduleBaseURL?: string;
-    clientComponents?: AliasOptions;
-    cssFiles?: AliasOptions;
-}
-export type ResolvedUserOptions = Required<Pick<StreamPluginOptions, "moduleBase" | "moduleBasePath" | "moduleBaseURL" | "projectRoot" | "build" | "Page" | "props" | "Html" | "pageExportName" | "propsExportName" | "collectCss" | "collectAssets" | "assetsDir" | "workerPath" | "loaderPath" | "clientEntry" | "serverOutDir" | "clientOutDir" | "moduleBaseExceptions">> & {
-    build: NonNullable<Required<StreamPluginOptions["build"]>>;
-    autoDiscover: NonNullable<Required<StreamPluginOptions["autoDiscover"]>>;
-};
-export type ResolvedUserConfig = Required<Pick<UserConfig, "root" | "mode">> & Omit<UserConfig, "root" | "mode" | "build"> & {
-    build: Required<Pick<BuildOptions, "target" | "outDir" | "assetsDir" | "ssr" | "ssrEmitAssets" | "ssrManifest" | "manifest">> & Partial<Omit<BuildOptions, "target" | "outDir" | "assetsDir" | "ssr" | "ssrEmitAssets" | "ssrManifest" | "manifest">>;
-};
-export interface StreamPluginOptions {
-    projectRoot?: string;
-    assetsDir?: string;
-    moduleBase?: string;
-    moduleBasePath?: string;
-    moduleBaseURL?: string;
-    clientEntry?: string;
-    serverOutDir?: string;
-    clientOutDir?: string;
-    autoDiscover?: {
-        pagePattern?: string;
-        propsPattern?: string;
-    };
-    Page: string | ((url: string) => string);
-    props?: undefined | string | ((url: string) => string);
-    workerPath?: string;
-    loaderPath?: string;
-    pageExportName?: string;
-    propsExportName?: string;
-    Html?: React.FC<{
-        manifest: Manifest;
-        pageProps: any;
-        route: string;
-        url: string;
-        children: React.ReactNode;
-    }>;
-    collectCss?: boolean;
-    collectAssets?: boolean;
-    build?: BuildConfig;
-    moduleBaseExceptions?: string[];
-}
-export interface CreateHandlerOptions<T = any> {
-    loader: (id: string) => Promise<T>;
-    manifest?: Manifest;
-    moduleGraph?: ModuleGraph;
-    cssFiles?: string[];
-    onCssFile?: (path: string) => void;
-    logger?: Logger;
-    pipableStreamOptions?: any;
-}
-export type ModuleLoader = (url: string, context?: any, defaultLoad?: any) => Promise<Record<string, any>>;
-export interface BaseProps {
-    manifest: Manifest;
-    children?: React.ReactNode;
-    assets?: {
-        css?: string[];
-    };
-}
-export type StreamResult = {
-    type: "success";
-    stream: any;
-    assets?: {
-        css?: string[];
-    };
-} | {
-    type: "error";
-    error: unknown;
-} | {
-    type: "skip";
-};
-export interface RscStreamOptions {
-    Page: React.ComponentType;
-    props: any;
-    Html: any;
-    logger?: Console | Logger;
-    cssFiles?: string[];
-    route: string;
-    url: string;
-    pipableStreamOptions?: any;
-    moduleBasePath: string;
-}
-export interface RouteConfig {
-    path: string;
-    pattern?: {
-        page?: string;
-        props?: string;
-    };
-    paths?: {
-        page: string;
-        props: string;
-    };
-}
-export interface BuildOutput {
-    dir?: string;
-    rsc?: string;
-    ext?: string;
-}
-export interface BuildConfig {
-    pages: string[] | (() => Promise<string[]> | string[]);
-    client?: string;
-    server?: string;
-}
-export interface RscResolver {
-    /**
-     * Get RSC data for static generation
-     * @param path - Route path (e.g. "/", "/about")
-     */
-    getRscData: (path: string) => Promise<{
-        Page: React.ComponentType;
-        props: any;
-    }>;
-}
-export interface Options {
-    include?: RegExp;
-    projectRoot?: string;
-    moduleBase: string;
-    moduleBasePath?: string;
-    Html?: React.ComponentType<React.PropsWithChildren<{
-        manifest: Manifest;
-    }>>;
-    Page: string | ((url: string) => string);
-    props?: string | ((url: string) => string);
-    pageExportName?: string;
-    propsExportName?: string;
-    collectCss?: boolean;
-    collectAssets?: boolean;
-    emitCss?: boolean;
-    moduleLoader?: (server: ViteDevServer) => ModuleLoader;
-    build?: BuildConfig;
-    outDir?: string;
-    /**
-     * Configure static asset copying
-     * - true: Copy all assets
-     * - false: Don't copy assets
-     * - Function: Custom filter for which files to copy
-     */
-    copyAssets?: boolean | ((file: string) => boolean);
-}
-export type RequestHandler = Connect.NextHandleFunction;
-export interface SsrStreamOptions {
-    url: string;
-    controller: AbortController;
-    loader: (id: string) => Promise<any>;
-    Html: any;
-    options: StreamPluginOptions;
-    pageExportName: string;
-    propsExportName: string;
-    moduleGraph: any;
-    bootstrapModules?: string[];
-    importMap?: Record<string, string[]>;
-    clientComponents?: boolean;
-    onlyClientComponents?: boolean;
-}
-export type RscServerConfig = {
-    /** How to get RSC data (e.g. HTTP, direct import, etc) */
-    getRscComponent: (url: string) => React.Usable<React.ReactNode>;
-    /** Base URL for client assets */
-    clientBase?: string;
-    /** SSR stream rendering options */
-    ssrOptions?: SsrStreamOptions;
-};
-export interface RscServerModule {
-    /**
-     * Get RSC data for a route
-     * @param path - Route path (e.g. "/", "/about")
-     * @returns Page component and props
-     */
-    getRscData: (path: string) => Promise<{
-        /** Page component to render */
-        Page: React.ComponentType;
-        /** Props to pass to the page */
-        props: any;
-    }>;
-}
-export interface RegisterComponentMessage {
-    type: "REGISTER_COMPONENT";
-    id: string;
-    code: string;
-}
-export type RscBuildResult = string[];
-export interface ReactStreamPluginMeta {
-    timing: BuildTiming;
-}
-export interface BuildTiming {
-    start: number;
-    configResolved?: number;
-    buildStart?: number;
-    buildEnd?: number;
-    renderStart?: number;
-    renderEnd?: number;
-    total?: number;
-}
+export type * from './plugin/types.js';
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,MAAM,EACN,QAAQ,EACR,WAAW,EACX,UAAU,EACV,aAAa,EACd,MAAM,MAAM,CAAC;AAEd,MAAM,WAAW,yBAAyB;IACxC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,YAAY,CAAC;IAChC,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB;AAED,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CACxC,IAAI,CACF,mBAAmB,EACjB,YAAY,GACZ,gBAAgB,GAChB,eAAe,GACf,aAAa,GACb,OAAO,GACP,MAAM,GACN,OAAO,GACP,MAAM,GACN,gBAAgB,GAChB,iBAAiB,GACjB,YAAY,GACZ,eAAe,GACf,WAAW,GACX,YAAY,GACZ,YAAY,GACZ,aAAa,GACb,cAAc,GACd,cAAc,GACd,sBAAsB,CACzB,CACF,GAAG;IACF,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC3D,YAAY,EAAE,WAAW,CAAC,QAAQ,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;CAC1E,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,GAC1E,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,GAAG;IAC9C,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,GAAG,QAAQ,GAAG,WAAW,GAAG,KAAK,GAAG,eAAe,GAAG,aAAa,GAAG,UAAU,CAAC,CAAC,GAC3H,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,GAAG,QAAQ,GAAG,WAAW,GAAG,KAAK,GAAG,eAAe,GAAG,aAAa,GAAG,UAAU,CAAC,CAAC,CAAC;CACzH,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,YAAY,CAAC,EAAE;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;IAEF,IAAI,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC;IACzC,KAAK,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC;IAEvD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC;QACd,QAAQ,EAAE,QAAQ,CAAC;QACnB,SAAS,EAAE,GAAG,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,CAAC;QACZ,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;KAC3B,CAAC,CAAC;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;CACjC;AAED,MAAM,WAAW,oBAAoB,CAAC,CAAC,GAAG,GAAG;IAC3C,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IACnC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oBAAoB,CAAC,EAAE,GAAG,CAAC;CAC5B;AAED,MAAM,MAAM,YAAY,GAAG,CACzB,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,GAAG,EACb,WAAW,CAAC,EAAE,GAAG,KACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;AAElC,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,MAAM,CAAC,EAAE;QACP,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;KAChB,CAAC;CACH;AAED,MAAM,MAAM,YAAY,GACpB;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,CAAC,EAAE;QACP,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;KAChB,CAAC;CACH,GACD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAErB,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC;IAC1B,KAAK,EAAE,GAAG,CAAC;IACX,IAAI,EAAE,GAAG,CAAC;IACV,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,oBAAoB,CAAC,EAAE,GAAG,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IAEb,OAAO,CAAC,EAAE;QACR,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IAEF,KAAK,CAAC,EAAE;QACN,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;CACH;AAED,MAAM,WAAW,WAAW;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,CAAC;IACvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;QACpC,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC;QAC1B,KAAK,EAAE,GAAG,CAAC;KACZ,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,OAAO;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IAEnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,iBAAiB,CAAC;QAAE,QAAQ,EAAE,QAAQ,CAAA;KAAE,CAAC,CAAC,CAAC;IAC5E,IAAI,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC;IACzC,KAAK,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC;IAC3C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,YAAY,CAAC;IACvD,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC;CACpD;AAED,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,kBAAkB,CAAC;AAExD,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,eAAe,CAAC;IAC5B,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACrC,IAAI,EAAE,GAAG,CAAC;IACV,OAAO,EAAE,mBAAmB,CAAC;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,GAAG,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACrC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,0DAA0D;IAC1D,eAAe,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAChE,iCAAiC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mCAAmC;IACnC,UAAU,CAAC,EAAE,gBAAgB,CAAC;CAC/B,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;QACpC,+BAA+B;QAC/B,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC;QAC1B,gCAAgC;QAChC,KAAK,EAAE,GAAG,CAAC;KACZ,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,oBAAoB,CAAC;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC;AAEtC,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,WAAW,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../types.ts"],"names":[],"mappings":"AACA,mBAAmB,mBAAmB,CAAC"}

package/dist/types.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,37 +1,47 @@
 {
   "name": "vite-plugin-react-server",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "Vite plugin for React Server Components (RSC)",
   "type": "module",
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "./dist/plugin/index.js",
+  "module": "./dist/plugin/index.js",
+  "types": "./dist/plugin/index.d.ts",
   "files": [
     "dist",
-    "src",
-    "patches",
+    "plugin",
+    "bin",
+    "scripts",
     "README.md",
     "LICENSE",
     "tsconfig.json"
   ],
   "exports": {
-    ".": "./dist/index.js",
+    ".": "./dist/plugin/index.js",
     "./client": "./dist/client.js",
     "./server": "./dist/server.js",
-    "./worker": "./dist/worker/worker.js",
-    "./loader": "./dist/worker/loader.js",
-    "./package.json": "./package.json"
+    "./html-worker": "./dist/plugin/worker/html-worker.js",
+    "./rsc-worker": "./dist/plugin/worker/rsc-worker.js",
+    "./loader": "./dist/plugin/worker/loader.js",
+    "./package.json": "./package.json",
+    "./patch": "./scripts/patch.mjs",
+    "./check-react-version": "./scripts/check-react-version.mjs"
   },
   "typesVersions": {
     "*": {
       ".": [
-        "./dist/index.d.ts"
+        "./dist/plugin/index.d.ts"
       ],
       "client": [
-        "./dist/react-client/plugin.d.ts"
+        "./dist/plugin/react-client/plugin.d.ts"
       ],
       "server": [
-        "./dist/react-server/plugin.d.ts"
+        "./dist/plugin/react-server/plugin.d.ts"
+      ],
+      "worker": [
+        "./dist/plugin/worker/worker.d.ts"
+      ],
+      "loader": [
+        "./dist/plugin/worker/loader.d.ts"
       ]
     }
   },
@@ -42,20 +52,23 @@
     "version:patch": "node scripts/bump-version.mjs patch",
     "build": "npm run clean && npm run build:types && npm run build:vite",
     "build:types": "tsc --build --force",
-    "build:vite": "vite build && chmod +x dist/bin/patch.js",
+    "build:vite": "vite build && chmod +x bin/patch.mjs",
     "clean": "rm -rf dist",
     "prepublishOnly": "npm run build",
     "lint": "eslint ./src --fix",
     "test:server": "NODE_OPTIONS='--conditions react-server' vitest run",
     "test:client": "vitest run",
-    "test": "npm run test:client && npm run test:server",
+    "test": "npm run build && npm run test:client && NODE_ENV=development npm run test:server",
     "test:coverage": "vitest run --coverage",
     "test:ui": "vitest --ui",
-    "experimental:copy": "cp -r ./oss-experimental/react-server-dom-esm ./node_modules/",
-    "experimental:patch": "npx patch-package react-server-dom-esm --exclude 'nothing'",
-    "experimental:setup": "npm run experimental:copy && npm run experimental:patch",
+    "experimental:copy": "cp -r ./oss-experimental/* ./node_modules/",
+    "experimental:patch": "npx patch-package react-server-dom-esm --exclude 'nothing' && npx patch-package react react-dom",
+    "experimental:move-patches": "mv patches/* ./scripts/",
+    "experimental:setup": "rm -rf patches/* && npm install react-server-dom-esm react@canary react-dom@canary && npm run experimental:copy && npm run experimental:patch && npm run experimental:move-patches && node scripts/check-react-version.mjs",
     "experimental:check": "node scripts/check-react-version.mjs",
-    "postinstall": "npm run experimental:check && patch-package"
+    "postinstall": "npm install react-server-dom-esm && node scripts/check-react-version.mjs &&  patch-package",
+    "start": "cd template; NODE_OPTIONS='--conditions react-server' npx vite",
+    "template:build": "cd template && NODE_OPTIONS='--conditions react-server' npx vite build"
   },
   "keywords": [
     "vite",
@@ -84,10 +97,13 @@
   },
   "peerDependenciesMeta": {
     "react": {
-      "optional": true
+      "optional": false
     },
     "react-dom": {
-      "optional": true
+      "optional": false
+    },
+    "vite": {
+      "optional": false
     }
   },
   "devDependencies": {
@@ -96,17 +112,20 @@
     "@types/react-dom": "^19.0.3",
     "acorn-loose": "^8.3.0",
     "patch-package": "^8.0.0",
-    "react": "^19.1.0-canary-bb9a24d9-20250130",
-    "react-dom": "^19.1.0-canary-bb9a24d9-20250130",
+    "react": "^19.1.0-canary-8759c5c8-20250207",
+    "react-dom": "^19.1.0-canary-8759c5c8-20250207",
     "react-server-dom-esm": "^0.0.1",
+    "rollup": "^4.34.0",
+    "rollup-plugin-dts": "^6.1.1",
     "source-map": "^0.7.4",
     "ts-node": "^10.9.2",
+    "tslib": "^2.8.1",
     "typescript": "^5.7.3",
-    "vite": "^5.4.14",
+    "vite": "^6.0.11",
     "vitest": "^3.0.4",
     "webpack-sources": "^3.2.0"
   },
   "bin": {
-    "vite-react-stream-patch": "./dist/bin/patch.js"
+    "vite-plugin-react-server-patch": "./dist/scripts/check-react-version.mjs"
   }
 }

package/plugin/build/createClientBuildConfig.ts

@@ -0,0 +1,21 @@
+import { mergeInputsAsync } from "./mergeInputs.js";
+import type { createBuildConfigFn } from "../types.js";
+
+
+export const createClientBuildConfig: createBuildConfigFn<'react-client'> = async ({
+  userConfig,
+  inputNormalizer
+}) => {
+  const { input: inputConfig, ...restRollupOptions } = userConfig.build.rollupOptions ?? {};
+  
+  return {
+    ...userConfig,
+    build: {
+      ...userConfig.build,
+      rollupOptions: {
+        ...restRollupOptions,
+        input: await mergeInputsAsync({}, inputConfig, inputNormalizer),
+      }
+    }
+  };
+};

package/plugin/build/createServerBuildConfig.ts

@@ -0,0 +1,66 @@
+import { join } from "node:path";
+import type { ResolvedUserConfig, ResolvedUserOptions } from "../types.js";
+import type { UserConfig } from "vite";
+
+interface CreateServerBuildConfigProps {
+  condition: string;
+  userConfig: ResolvedUserConfig;
+  userOptions: ResolvedUserOptions;
+  mode: string;
+  inputNormalizer: any;
+}
+
+export async function createServerBuildConfig({
+  userConfig,
+  userOptions,
+  mode,
+}: CreateServerBuildConfigProps): Promise<UserConfig> {
+  const { build, appType, mode: configMode, ...restUserConfig } = userConfig;
+  const { outDir, ssr, target, assetsDir, manifest, ssrManifest, ssrEmitAssets, rollupOptions, ...restBuildOptions } = build ?? {}; 
+  const { input, output, ...restRollupOptions } = rollupOptions ?? {};
+  const {
+    format,
+    preserveModules,
+    hoistTransitiveImports,
+    esModule,
+    entryFileNames,
+    chunkFileNames,
+    assetFileNames,
+    ...restOutputOptions
+  } = output && !Array.isArray(output) ? output : {};
+
+  const resolvedBuildConfig = {
+    build: {
+      ssr: ssr ?? true,
+      target: target ?? 'es2020',
+      outDir: outDir ?? userOptions.build.server,
+      assetsDir: assetsDir ?? '',
+      manifest: manifest ?? true,
+      ssrManifest: ssrManifest ?? true,
+      ssrEmitAssets: ssrEmitAssets ?? true,
+      rollupOptions: {
+        input: {
+          'client': join(userOptions.projectRoot, userOptions.clientEntry)
+        },
+        output: {
+          format: format ?? 'esm',
+          preserveModules: preserveModules ?? true,
+          hoistTransitiveImports: hoistTransitiveImports ?? false,
+          esModule: esModule ?? true,
+          entryFileNames: entryFileNames ?? '[name].js',
+          chunkFileNames: chunkFileNames ?? '[name].js',
+          assetFileNames: assetFileNames ?? '[name][extname]',
+          ...restOutputOptions
+        },
+        ...restRollupOptions
+      },
+      ...restBuildOptions
+    },
+    appType: appType ?? 'mpa',
+    mode: mode ?? 'production',
+    ...restUserConfig
+  };
+
+  console.log('resolvedBuildConfig', resolvedBuildConfig);
+  return resolvedBuildConfig;
+}

package/plugin/build/createSharedBuildConfig.ts

@@ -0,0 +1,35 @@
+import type { InputOption } from "rollup";
+import type { UserConfig } from "vite";
+
+export function validateModuleBase(
+  input: InputOption,
+  moduleBase: string,
+  moduleBaseExceptions: string[]
+) {
+  for (const [key, value] of Object.entries(input)) {
+    const isException = moduleBaseExceptions.includes(key) || ["/index", "index"].includes(key);
+    if (!key.includes("/")) return;
+    if (value.startsWith("//")) {
+      throw new Error(`Path shouldn't start with //`);
+    }
+    if (!key.startsWith(moduleBase) && !isException) {
+      throw new Error(`Invalid input: ${key} does not start with ${moduleBase}`);
+    }
+    if (!value.startsWith("/" + moduleBase) && !isException) {
+      throw new Error(`Invalid value: ${value} does not start with ${moduleBase}`);
+    }
+  }
+}
+
+export function createSharedBuildConfig(config: UserConfig, rollupOptions: any): UserConfig {
+  return {
+    ...config,
+    build: {
+      ...config.build,
+      rollupOptions: {
+        ...config.build?.rollupOptions,
+        ...rollupOptions
+      }
+    }
+  };
+} 

package/plugin/build/mergeInputs.ts

@@ -0,0 +1,58 @@
+import type { InputOption } from "rollup";
+import type { InputNormalizer, InputNormalizerWorker } from "../types.js";
+
+export const mergeInputsAsync = async (
+  input: { [key: string]: string },
+  input2: InputOption | undefined,
+  inputNormalizer: InputNormalizerWorker
+): Promise<Record<string, string>> => {
+  if(typeof input === "undefined"){
+    throw new Error("The first input can not be undefined");
+  } else if(typeof input2 === "undefined") {
+    return input;
+  } else if(Array.isArray(input2)) {
+    const inputsFromArray = Object.fromEntries(await Promise.all(input2.map(async (input)=>inputNormalizer(input))))
+    return {  
+      ...input,
+      ...inputsFromArray,
+    }
+  } else if(typeof input2 === "object" && input2 != null) {
+    return { ...input, ...input2 };
+  } else if (typeof input2 === "string") {
+    const [key, value] = await inputNormalizer(input2)
+    return {
+      ...input,
+      [key]: value,
+    }
+  } else {
+    throw new Error(`Invalid input: ${input2}`);
+  }
+}
+
+export const mergeInputs = (
+  input: { [key: string]: string },
+  input2: InputOption | undefined,
+  inputNormalizer: InputNormalizer
+): Record<string, string> => {
+  if(typeof input === "undefined"){
+    throw new Error("The first input can not be undefined");
+  } else if(typeof input2 === "undefined") {
+    return input;
+  } else if(Array.isArray(input2)) {
+    const inputsFromArray = Object.fromEntries(input2.map(inputNormalizer))
+    return {
+      ...input,
+      ...inputsFromArray,
+    }
+  } else if(typeof input2 === "object" && input2 != null) {
+    return { ...input, ...input2 };
+  } else if (typeof input2 === "string") {
+    const [key, value] = inputNormalizer(input2)
+    return {
+      ...input,
+      [key]: value,
+    }
+  } else {
+    throw new Error(`Invalid input: ${input2}`);
+  }
+};

package/plugin/checkFilesExist.ts

@@ -0,0 +1,82 @@
+import { existsSync } from "node:fs";
+import { resolve, relative } from "node:path";
+import type { CheckFilesExistReturn, StreamPluginOptions } from "./types.js";
+import { DEFAULT_CONFIG } from "./config/defaults.js";
+
+export async function checkFilesExist(
+  pages: string[],
+  options: Pick<StreamPluginOptions, "Page" | "props">,
+  root: string
+): Promise<CheckFilesExistReturn> {
+  const errors: string[] = [];
+  const pageSet = new Set<string>();
+  const pageMap = new Map<string, string>();
+  
+  const toKey = (path: string) => {
+    return relative(root, resolve(root, path))
+      .replace(/\\/g, '/')
+      .replace(DEFAULT_CONFIG.FILE_REGEX, '')
+      .replace(/^\.\//, '');
+  }
+  // Check if files exist when string paths are provided
+  if (typeof options.Page === "string") {
+    const pagePath = options.Page;
+    const fullPagePath = resolve(root, pagePath);
+    const key = toKey(pagePath);
+    pageMap.set(key, pagePath);
+    if (!pageSet.has(key)) {
+      if (!existsSync(fullPagePath)) {
+        errors.push(`Page file not found: ${pagePath}, ${fullPagePath}`);
+      }
+      pageSet.add(pagePath.replace(/^\//, ''));
+    }
+  } else if (typeof options.Page === "function" && pages) {
+    for (const page of pages) {
+      const pagePath = options.Page(page);
+      const fullPagePath = resolve(root, pagePath);
+      const key = toKey(pagePath);
+      pageMap.set(key, pagePath);
+      if (pageSet.has(key)) {
+        continue;
+      }
+      if (!existsSync(fullPagePath)) {
+        errors.push(`Page file not found: ${pagePath}, ${fullPagePath}`);
+      }
+      pageSet.add(pagePath);
+    }
+  }
+
+  const propsSet = new Set<string>();
+  const propsMap = new Map<string, string>();
+  if (typeof options.props === "string") {
+    const propsPath = options.props;
+    const fullPropsPath = resolve(root, propsPath);
+    const key = toKey(propsPath);
+    propsMap.set(key, propsPath);
+    if (!propsSet.has(key)) {
+      if (!existsSync(fullPropsPath)) {
+        errors.push(`Props file not found: ${propsPath}, ${fullPropsPath}`);
+      }
+      propsSet.add(propsPath);
+    }
+  } else if (typeof options.props === "function" && pages) {
+    for (const page of pages) {
+      const propsPath = options.props(page);
+      const fullPropsPath = resolve(root, propsPath);
+      const key = toKey(propsPath);
+      propsMap.set(key, propsPath);
+      if (propsSet.has(key)) {
+        continue;
+      }
+      if (!existsSync(fullPropsPath)) {
+        errors.push(`Props file not found: ${propsPath}, ${fullPropsPath}`);
+      }
+      propsSet.add(propsPath);
+    }
+  }
+
+  if (errors.length) {
+    console.warn("React Stream Plugin Validation:\n" + errors.join("\n"));
+  }
+  return { pageMap, pageSet, propsMap, propsSet };
+}

package/{src → plugin}/collect-css-manifest.ts

@@ -1,8 +1,9 @@
-import type { Manifest, ModuleGraph } from "vite";
+import type { Manifest, ModuleGraph } from 'vite';
 
 export async function collectModuleGraphCss(
   moduleGraph: ModuleGraph,
-  pagePath: string
+  pagePath: string,
+  onCss?: (path: string) => void
 ) {
   if (!pagePath) return new Map<string, string>();
 
@@ -17,6 +18,7 @@ export async function collectModuleGraphCss(
     seen.add(mod.id);
     if (mod?.id?.endsWith(".css")) {
       cssFiles.set(mod?.url, mod?.id);
+      onCss?.(mod?.url);
     }
     mod?.importedModules?.forEach((imp: any) => walkModule(imp));
   };