vite-plugin-react-server 1.0.2 → 1.1.0

package/dist/plugin/helpers/createHandler.js

@@ -3,108 +3,66 @@
  * Copyright (c) Nico Brinkkemper
  * MIT License
  */
-import { resolvePage } from '../resolvePage.js';
-import { resolveProps } from '../resolveProps.js';
 import { createRscStream } from './createRscStream.js';
 
-async function createHandler({
-  getCss,
-  root,
-  cssFiles = [],
-  cssModules = /* @__PURE__ */ new Map(),
-  onCssFile,
-  logger,
-  loader,
-  Html,
-  CssCollector,
-  pagePath,
-  propsPath,
-  pageExportName,
-  propsExportName,
-  inlineCss,
-  moduleBase,
-  preserveModulesRoot: _preserveModulesRoot,
-  moduleBasePath,
-  moduleRootPath,
-  moduleBaseURL,
-  route,
-  pipableStreamOptions
-}) {
-  const controller = new AbortController();
-  const loadWithCss = async (id) => {
-    try {
-      const mod = await loader(id);
-      const pageCss = await Promise.resolve(getCss(id));
-      Array.from(pageCss.entries()).forEach(([css, linkOrContent]) => {
-        cssModules.set(css, linkOrContent);
-        if (typeof onCssFile === "function") {
-          onCssFile(css, id);
+async function createHandler(handlerOptions) {
+  if (!handlerOptions.PageComponent) {
+    throw new Error("PageComponent is required");
+  }
+  try {
+    const adaptedOnEvent = (event, data) => {
+      if (event === "error") {
+        handlerOptions.onEvent?.({
+          type: "route.error",
+          data: {
+            route: handlerOptions.route,
+            ...data
+          }
+        });
+      } else if (event === "postpone") {
+        handlerOptions.onEvent?.({
+          type: "route.postpone",
+          data: {
+            route: handlerOptions.route,
+            ...data
+          }
+        });
+      }
+    };
+    const streamResult = createRscStream({
+      ...handlerOptions,
+      onEvent: adaptedOnEvent,
+      cssFiles: handlerOptions.cssFiles,
+      PageComponent: handlerOptions.PageComponent,
+      pageProps: handlerOptions.pageProps
+    });
+    if (streamResult.type === "error") {
+      handlerOptions.onEvent?.({
+        type: "route.error",
+        data: {
+          route: handlerOptions.route,
+          error: streamResult.error
         }
       });
-      return mod;
-    } catch (e) {
-      if (e.message?.includes("module runner has been closed")) {
-        return { type: "skip" };
-      } else {
-        return { type: "error", error: e };
-      }
+      throw streamResult.error;
     }
-  };
-  const PropsModule = await resolveProps({
-    propsModule: propsPath ? await loadWithCss(propsPath) : { [propsExportName]: (url2) => ({ url: url2 }) },
-    path: String(propsPath),
-    exportName: propsExportName,
-    url: route
-  });
-  if (PropsModule.type !== "success") {
-    return PropsModule;
-  }
-  const PageModule = await resolvePage({
-    pageModule: pagePath ? await loadWithCss(pagePath) : { [pageExportName]: () => null },
-    path: String(pagePath),
-    exportName: pageExportName,
-    url: route
-  });
-  if (PageModule.type !== "success") {
-    return PageModule;
-  }
-  if (cssFiles) {
-    cssFiles.forEach((css) => cssModules.set(typeof css === "string" ? css : css.path, css));
-    cssFiles = Array.from(cssModules.values());
-  }
-  const url = typeof moduleBaseURL === "string" && moduleBaseURL !== "" ? new URL(route, moduleBaseURL).href : route;
-  const stream = createRscStream({
-    Html,
-    CssCollector,
-    Page: PageModule[pageExportName],
-    props: PropsModule[propsExportName],
-    moduleRootPath,
-    moduleBasePath,
-    moduleBaseURL,
-    logger,
-    cssFiles: Array.from(cssModules.values()),
-    route,
-    url,
-    pipableStreamOptions,
-    htmlProps: {},
-    root,
-    loader,
-    inlineCss
-  });
-  if (!stream) {
-    return { type: "skip" };
+    return {
+      type: "success",
+      stream: streamResult.stream
+    };
+  } catch (error) {
+    handlerOptions.onEvent?.({
+      type: "route.error",
+      data: {
+        route: handlerOptions.route,
+        error
+      }
+    });
+    return {
+      type: "error",
+      error
+    };
   }
-  const assets = {
-    css: cssFiles,
-    bootstrapModules: pipableStreamOptions?.bootstrapModules ?? []
-  };
-  return {
-    type: "success",
-    controller,
-    stream,
-    assets,
-    route
-  };
 }
 
 export { createHandler };

package/dist/plugin/helpers/createHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"createHandler.js","sources":["../../../plugin/helpers/createHandler.ts"],"sourcesContent":["import type { PipeableStream } from \"react-dom/server\";\nimport { resolvePage } from \"../resolvePage.js\";\nimport { resolveProps } from \"../resolveProps.js\";\nimport type { CreateHandlerOptions, CssContent } from \"../types.js\";\nimport { createRscStream } from \"./createRscStream.js\";\ntype CreateHandlerResult =\n  | {\n      type: \"success\";\n      controller: AbortController;\n      stream: PipeableStream;\n      assets: any;\n      route: string;\n    }\n  | { type: \"error\"; error: Error }\n  | { type: \"skip\" };\n\ninterface HandlerAssets {\n  css: (string | CssContent)[];\n  bootstrapModules: string[];\n}\n\nexport async function createHandler<T>({\n  getCss,\n  root,\n  cssFiles = [],\n  cssModules = new Map<string, string | CssContent>(),\n  onCssFile,\n  logger,\n  loader,\n  Html,\n  CssCollector,\n  pagePath,\n  propsPath,\n  pageExportName,\n  propsExportName,\n  inlineCss,\n  moduleBase,\n  preserveModulesRoot: _preserveModulesRoot,\n  moduleBasePath,\n  moduleRootPath,\n  moduleBaseURL,\n  route,\n  pipableStreamOptions,\n}: CreateHandlerOptions<T>): Promise<CreateHandlerResult> {\n  const controller = new AbortController();\n\n  const loadWithCss = async (id: string) => {\n    try {\n      const mod = await loader(id);\n      const pageCss = await Promise.resolve(getCss(id));\n      Array.from(pageCss.entries()).forEach(([css, linkOrContent]) => {\n        cssModules.set(css, linkOrContent);\n        // Notify about new CSS file if callback exists\n        if (typeof onCssFile === \"function\") {\n          onCssFile(css, id);\n        }\n      });\n      return mod as Record<string, any>;\n    } catch (e: any) {\n      if (e.message?.includes(\"module runner has been closed\")) {\n        return { type: \"skip\" } as Record<string, any>;\n      } else {\n        return { type: \"error\", error: e } as Record<string, any>;\n      }\n    }\n  };\n\n  const PropsModule = await resolveProps({\n    propsModule: propsPath\n      ? await loadWithCss(propsPath)\n      : { [propsExportName]: (url: string) => ({url}) },\n    path: String(propsPath),\n    exportName: propsExportName,\n    url: route,\n  });\n  if (PropsModule.type !== \"success\") {\n    return PropsModule;\n  }\n  const PageModule = await resolvePage({\n    pageModule: pagePath\n      ? await loadWithCss(pagePath)\n      : { [pageExportName]: () => null },\n    path: String(pagePath),\n    exportName: pageExportName,\n    url: route,\n  });\n  if (PageModule.type !== \"success\") {\n    return PageModule;\n  }\n\n  // Add any additional CSS files\n  if (cssFiles) {\n    cssFiles.forEach((css) => cssModules.set(typeof css === \"string\" ? css : css.path, css));\n    cssFiles = Array.from(cssModules.values());\n  }\n  const url =\n    typeof moduleBaseURL === \"string\" && moduleBaseURL !== \"\"\n      ? new URL(route, moduleBaseURL).href\n      : route;\n  const stream = createRscStream({\n    Html: Html,\n    CssCollector: CssCollector,\n    Page: PageModule[pageExportName as keyof typeof PageModule],\n    props: PropsModule[propsExportName as keyof typeof PropsModule],\n    moduleBase: moduleBase,\n    moduleRootPath: moduleRootPath,\n    moduleBasePath: moduleBasePath,\n    moduleBaseURL: moduleBaseURL,\n    logger: logger,\n    cssFiles: Array.from(cssModules.values()),\n    route,\n    url,\n    pipableStreamOptions: pipableStreamOptions,\n    htmlProps: {},\n    root: root,\n    loader: loader,\n    inlineCss: inlineCss,\n  });\n\n  if (!stream) {\n    return { type: \"skip\" as const };\n  }\n\n  const assets: HandlerAssets = {\n    css: cssFiles,\n    bootstrapModules: pipableStreamOptions?.bootstrapModules ?? [],\n  };\n  return {\n    type: \"success\",\n    controller,\n    stream,\n    assets,\n    route: route,\n  };\n}\n"],"names":["url"],"mappings":"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"}
+{"version":3,"file":"createHandler.js","sources":["../../../plugin/helpers/createHandler.ts"],"sourcesContent":["import type { CreateHandlerOptions } from \"../types.js\";\nimport { createRscStream } from \"./createRscStream.js\";\n\n\nexport async function createHandler(handlerOptions: CreateHandlerOptions) {\n  if(!handlerOptions.PageComponent) {\n    throw new Error(\"PageComponent is required\");\n  }\n  try {\n    const adaptedOnEvent = (event: \"error\" | \"postpone\", data: any) => {\n      if (event === \"error\") {\n        handlerOptions.onEvent?.({\n          type: \"route.error\",\n          data: {\n            route: handlerOptions.route,\n            ...data,\n          },\n        });\n      } else if (event === \"postpone\") {\n        handlerOptions.onEvent?.({\n          type: \"route.postpone\",\n          data: {\n            route: handlerOptions.route,\n            ...data,\n          },\n        });\n      }\n    };\n\n    const streamResult = createRscStream({\n      ...handlerOptions,\n      onEvent: adaptedOnEvent,\n      cssFiles: handlerOptions.cssFiles,\n      PageComponent: handlerOptions.PageComponent as any,\n      pageProps: handlerOptions.pageProps,\n    });\n\n    if (streamResult.type === \"error\") {\n      handlerOptions.onEvent?.({\n        type: \"route.error\",\n        data: {\n          route: handlerOptions.route,\n          error: streamResult.error,\n        },\n      });\n      throw streamResult.error;\n    }\n\n    return {\n      type: \"success\",\n      stream: streamResult.stream,\n    };\n  } catch (error) {\n    handlerOptions.onEvent?.({\n      type: \"route.error\",\n      data: {\n        route: handlerOptions.route,\n        error,\n      },\n    });\n    return {\n      type: \"error\",\n      error: error as Error,\n    };\n  }\n}\n"],"names":[],"mappings":";;;;;;;AAIA,eAAsB,cAAc,cAAsC,EAAA;AACxE,EAAG,IAAA,CAAC,eAAe,aAAe,EAAA;AAChC,IAAM,MAAA,IAAI,MAAM,2BAA2B,CAAA;AAAA;AAE7C,EAAI,IAAA;AACF,IAAM,MAAA,cAAA,GAAiB,CAAC,KAAA,EAA6B,IAAc,KAAA;AACjE,MAAA,IAAI,UAAU,OAAS,EAAA;AACrB,QAAA,cAAA,CAAe,OAAU,GAAA;AAAA,UACvB,IAAM,EAAA,aAAA;AAAA,UACN,IAAM,EAAA;AAAA,YACJ,OAAO,cAAe,CAAA,KAAA;AAAA,YACtB,GAAG;AAAA;AACL,SACD,CAAA;AAAA,OACH,MAAA,IAAW,UAAU,UAAY,EAAA;AAC/B,QAAA,cAAA,CAAe,OAAU,GAAA;AAAA,UACvB,IAAM,EAAA,gBAAA;AAAA,UACN,IAAM,EAAA;AAAA,YACJ,OAAO,cAAe,CAAA,KAAA;AAAA,YACtB,GAAG;AAAA;AACL,SACD,CAAA;AAAA;AACH,KACF;AAEA,IAAA,MAAM,eAAe,eAAgB,CAAA;AAAA,MACnC,GAAG,cAAA;AAAA,MACH,OAAS,EAAA,cAAA;AAAA,MACT,UAAU,cAAe,CAAA,QAAA;AAAA,MACzB,eAAe,cAAe,CAAA,aAAA;AAAA,MAC9B,WAAW,cAAe,CAAA;AAAA,KAC3B,CAAA;AAED,IAAI,IAAA,YAAA,CAAa,SAAS,OAAS,EAAA;AACjC,MAAA,cAAA,CAAe,OAAU,GAAA;AAAA,QACvB,IAAM,EAAA,aAAA;AAAA,QACN,IAAM,EAAA;AAAA,UACJ,OAAO,cAAe,CAAA,KAAA;AAAA,UACtB,OAAO,YAAa,CAAA;AAAA;AACtB,OACD,CAAA;AACD,MAAA,MAAM,YAAa,CAAA,KAAA;AAAA;AAGrB,IAAO,OAAA;AAAA,MACL,IAAM,EAAA,SAAA;AAAA,MACN,QAAQ,YAAa,CAAA;AAAA,KACvB;AAAA,WACO,KAAO,EAAA;AACd,IAAA,cAAA,CAAe,OAAU,GAAA;AAAA,MACvB,IAAM,EAAA,aAAA;AAAA,MACN,IAAM,EAAA;AAAA,QACJ,OAAO,cAAe,CAAA,KAAA;AAAA,QACtB;AAAA;AACF,KACD,CAAA;AACD,IAAO,OAAA;AAAA,MACL,IAAM,EAAA,OAAA;AAAA,MACN;AAAA,KACF;AAAA;AAEJ;;;;"}

package/dist/plugin/helpers/createRscStream.d.ts

@@ -1,27 +1,13 @@
-import * as React from "react";
-import type { PipeableStreamOptions } from "../worker/types.js";
-import type { Logger } from "vite";
-import type { CreateHandlerOptions, CssCollectorProps, CssContent, InlineCssCollectorProps } from "../types.js";
-export declare function createRscStream<InlineCSS extends boolean = true>({ Html, Page, props, loader, moduleRootPath, moduleBasePath, moduleBaseURL, logger, cssFiles, route, url, pipableStreamOptions, htmlProps, inlineCss, CssCollector, root, }: {
-    Html: CreateHandlerOptions["Html"];
-    Page: React.ComponentType<any>;
-    loader: (id: string) => Promise<any>;
-    props: any;
-    moduleBase: string;
-    moduleRootPath: string;
-    moduleBasePath: string;
-    moduleBaseURL: string;
-    logger: Logger;
-    route: string;
-    url: string;
-    pipableStreamOptions?: PipeableStreamOptions;
-    htmlProps?: any;
-    root: string;
-    inlineCss?: InlineCSS;
-    cssFiles?: (string | CssContent)[];
-} & (InlineCSS extends true ? {
-    CssCollector: React.FC<InlineCssCollectorProps>;
-} : {
-    CssCollector: React.FC<CssCollectorProps>;
-})): any;
+import type { CreateHandlerOptions, StreamMetrics } from "../types.js";
+export declare function createRscStream<T, C extends React.ComponentType<T>, InlineCSS extends boolean = true>({ Html, PageComponent, pageProps, moduleBase, moduleRootPath, moduleBasePath, moduleBaseURL, cssFiles, globalCss, route, pipeableStreamOptions, CssCollector, manifest, onEvent, projectRoot, }: Pick<CreateHandlerOptions<T, C, InlineCSS>, "Html" | "PageComponent" | "pageProps" | "moduleBase" | "moduleRootPath" | "moduleBasePath" | "moduleBaseURL" | "cssFiles" | "route" | "pipeableStreamOptions" | "CssCollector" | "globalCss" | "manifest" | "projectRoot"> & {
+    onEvent?: (event: "error" | "postpone", data: any) => void;
+}): {
+    type: "success";
+    stream: any;
+    metrics: StreamMetrics;
+} | {
+    type: "error";
+    error: Error;
+    metrics: StreamMetrics;
+};
 //# sourceMappingURL=createRscStream.d.ts.map

package/dist/plugin/helpers/createRscStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createRscStream.d.ts","sourceRoot":"","sources":["../../../plugin/helpers/createRscStream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,KAAK,EACV,oBAAoB,EACpB,iBAAiB,EACjB,UAAU,EACV,uBAAuB,EACxB,MAAM,aAAa,CAAC;AAErB,wBAAgB,eAAe,CAAC,SAAS,SAAS,OAAO,GAAG,IAAI,EAAE,EAChE,IAAI,EACJ,IAAI,EACJ,KAAK,EACL,MAAkD,EAClD,cAAc,EACd,cAAc,EACd,aAAa,EACb,MAAM,EACN,QAAa,EACb,KAAK,EACL,GAAG,EACH,oBAAoB,EACpB,SAAS,EACT,SAA6B,EAC7B,YAAY,EACZ,IAAI,GACL,EAAE;IACD,IAAI,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACnC,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC/B,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACrC,KAAK,EAAE,GAAG,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,oBAAoB,CAAC,EAAE,qBAAqB,CAAC;IAC7C,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,MAAM,GAAG,UAAU,CAAC,EAAE,CAAC;CACpC,GAAG,CAAC,SAAS,SAAS,IAAI,GACvB;IACE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC;CACjD,GACD;IACE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC;CAC3C,CAAC,OAwDL"}
+{"version":3,"file":"createRscStream.d.ts","sourceRoot":"","sources":["../../../plugin/helpers/createRscStream.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEvE,wBAAgB,eAAe,CAC7B,CAAC,EACD,CAAC,SAAS,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,EAChC,SAAS,SAAS,OAAO,GAAG,IAAI,EAChC,EACA,IAAqB,EACrB,aAAa,EACb,SAAS,EACT,UAAU,EACV,cAAc,EACd,cAAc,EACd,aAAa,EACb,QAAoB,EACpB,SAAqB,EACrB,KAAK,EACL,qBAAqB,EACrB,YAAY,EACZ,QAAQ,EACR,OAAO,EACP,WAAW,GACZ,EAAE,IAAI,CACL,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,EACnC,MAAM,GACN,eAAe,GACf,WAAW,GACX,YAAY,GACZ,gBAAgB,GAChB,gBAAgB,GAChB,eAAe,GACf,UAAU,GACV,OAAO,GACP,uBAAuB,GACvB,cAAc,GACd,WAAW,GACX,UAAU,GACV,aAAa,CAChB,GAAG;IACF,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,GAAG,UAAU,EAAE,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;CAC5D,GACG;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,GAAG,CAAC;IAAC,OAAO,EAAE,aAAa,CAAA;CAAE,GACxD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,aAAa,CAAA;CAAE,CAgH1D"}

package/dist/plugin/helpers/createRscStream.js

@@ -3,76 +3,130 @@
  * Copyright (c) Nico Brinkkemper
  * MIT License
  */
-import * as React from 'react';
-import { renderToPipeableStream } from 'react-server-dom-esm/server.node';
+import { React, ReactDOMServer } from '../vendor.server.js';
 
 function createRscStream({
-  Html,
-  Page,
-  props,
-  loader = (id) => import(id).then((m) => m.default),
+  Html = React.Fragment,
+  PageComponent,
+  pageProps,
+  moduleBase,
   moduleRootPath,
   moduleBasePath,
   moduleBaseURL,
-  logger,
-  cssFiles = [],
+  cssFiles = /* @__PURE__ */ new Map(),
+  globalCss = /* @__PURE__ */ new Map(),
   route,
-  url,
-  pipableStreamOptions,
-  htmlProps,
-  inlineCss = true,
+  pipeableStreamOptions,
   CssCollector,
-  root
+  manifest,
+  onEvent,
+  projectRoot
 }) {
+  const startTime = performance.now();
   const htmlIsFragment = Html == React.Fragment;
-  if (!htmlIsFragment) {
-    if (!htmlProps) {
-      htmlProps = {};
-    }
-    if (!("moduleBaseURL" in htmlProps)) {
-      htmlProps["moduleBaseURL"] = moduleBaseURL;
-    }
-    if (!("moduleBasePath" in htmlProps)) {
-      htmlProps["moduleBasePath"] = moduleBasePath;
-    }
-    if (!("moduleRootPath" in htmlProps)) {
-      htmlProps["moduleRootPath"] = moduleRootPath;
-    }
-    if (!("url" in htmlProps)) {
-      htmlProps["url"] = url;
-    }
-    if (!("route" in htmlProps)) {
-      htmlProps["route"] = route;
-    }
-    if (!("pageProps" in htmlProps)) {
-      htmlProps["pageProps"] = props;
-    }
+  const url = moduleBaseURL !== "" ? new URL(route, moduleBaseURL).toString() : route;
+  let errorCount = 0;
+  let streamError = null;
+  if (!PageComponent) {
+    return {
+      type: "error",
+      error: new Error("PageComponent is required"),
+      metrics: {
+        chunks: 0,
+        bytes: 0,
+        backpressureCount: 0,
+        drainCount: 0,
+        errorCount: 0,
+        duration: 0,
+        startTime: 0
+      }
+    };
   }
-  const withCss = React.createElement(
+  const elements = htmlIsFragment ? /* @__PURE__ */ React.createElement(
     CssCollector,
-    inlineCss === true ? {
-      cssFiles,
-      route,
+    {
+      cssFiles
+    },
+    /* @__PURE__ */ React.createElement(PageComponent, { ...pageProps })
+  ) : /* @__PURE__ */ React.createElement(
+    Html,
+    {
+      moduleBase,
       moduleBaseURL,
       moduleBasePath,
       moduleRootPath,
-      root,
-      loader
-    } : { cssFiles, route, moduleBaseURL },
-    React.createElement(Page, props)
+      projectRoot,
+      url,
+      route,
+      pageProps,
+      cssFiles,
+      globalCss,
+      CssCollector,
+      manifest
+    },
+    /* @__PURE__ */ React.createElement(PageComponent, { ...pageProps })
   );
-  const content = htmlIsFragment ? withCss : React.createElement(Html, htmlProps, withCss);
   try {
-    return renderToPipeableStream(
-      content,
+    const stream = ReactDOMServer.renderToPipeableStream(
+      elements,
       moduleBasePath,
-      pipableStreamOptions
+      {
+        ...pipeableStreamOptions,
+        onError(error, errorInfo) {
+          const err = error instanceof Error ? error : new Error(String(error));
+          streamError = err;
+          onEvent?.("error", { route, error: err, errorInfo });
+          errorCount++;
+        },
+        onPostpone(reason) {
+          onEvent?.("postpone", { route, reason });
+        }
+      }
     );
+    if (streamError) {
+      return {
+        type: "error",
+        error: streamError,
+        metrics: {
+          chunks: 0,
+          bytes: 0,
+          backpressureCount: 0,
+          drainCount: 0,
+          errorCount,
+          duration: Date.now() - startTime,
+          startTime
+        }
+      };
+    }
+    return {
+      type: "success",
+      stream,
+      metrics: {
+        chunks: 0,
+        bytes: 0,
+        backpressureCount: 0,
+        drainCount: 0,
+        errorCount,
+        duration: Date.now() - startTime,
+        startTime
+      }
+    };
   } catch (error) {
-    logger.error(`Failed to create stream for ${route}.`, {
-      error
-    });
-    return null;
+    const err = error instanceof Error ? error : new Error(String(error));
+    onEvent?.("error", { route, error: err });
+    return {
+      type: "error",
+      error: err,
+      metrics: {
+        chunks: 0,
+        bytes: 0,
+        backpressureCount: 0,
+        drainCount: 0,
+        errorCount: errorCount + 1,
+        duration: Date.now() - startTime,
+        startTime
+      }
+    };
   }
 }
 

package/dist/plugin/helpers/createRscStream.js.map

@@ -1 +1 @@
-{"version":3,"file":"createRscStream.js","sources":["../../../plugin/helpers/createRscStream.ts"],"sourcesContent":["import * as React from \"react\";\n// @ts-ignore\nimport { renderToPipeableStream } from \"react-server-dom-esm/server.node\";\nimport type { PipeableStreamOptions } from \"../worker/types.js\";\nimport type { Logger } from \"vite\";\nimport type {\n  CreateHandlerOptions,\n  CssCollectorProps,\n  CssContent,\n  InlineCssCollectorProps,\n} from \"../types.js\";\n\nexport function createRscStream<InlineCSS extends boolean = true>({\n  Html,\n  Page,\n  props,\n  loader = (id) => import(id).then((m) => m.default),\n  moduleRootPath,\n  moduleBasePath,\n  moduleBaseURL,\n  logger,\n  cssFiles = [],\n  route,\n  url,\n  pipableStreamOptions,\n  htmlProps,\n  inlineCss = true as InlineCSS,\n  CssCollector,\n  root,\n}: {\n  Html: CreateHandlerOptions[\"Html\"];\n  Page: React.ComponentType<any>;\n  loader: (id: string) => Promise<any>;\n  props: any;\n  moduleBase: string;\n  moduleRootPath: string;\n  moduleBasePath: string;\n  moduleBaseURL: string;\n  logger: Logger;\n  route: string;\n  url: string;\n  pipableStreamOptions?: PipeableStreamOptions;\n  htmlProps?: any;\n  root: string;\n  inlineCss?: InlineCSS;\n  cssFiles?: (string | CssContent)[];\n} & (InlineCSS extends true\n  ? {\n      CssCollector: React.FC<InlineCssCollectorProps>;\n    }\n  : {\n      CssCollector: React.FC<CssCollectorProps>;\n    })) {\n  const htmlIsFragment = Html == React.Fragment;\n  if (!htmlIsFragment) {\n    if (!htmlProps) {\n      htmlProps = {};\n    }\n    if (!(\"moduleBaseURL\" in htmlProps)) {\n      htmlProps[\"moduleBaseURL\"] = moduleBaseURL;\n    }\n    if (!(\"moduleBasePath\" in htmlProps)) {\n      htmlProps[\"moduleBasePath\"] = moduleBasePath;\n    }\n    if (!(\"moduleRootPath\" in htmlProps)) {\n      htmlProps[\"moduleRootPath\"] = moduleRootPath;\n    }\n    if (!(\"url\" in htmlProps)) {\n      htmlProps[\"url\"] = url;\n    }\n    if (!(\"route\" in htmlProps)) {\n      htmlProps[\"route\"] = route;\n    }\n    if (!(\"pageProps\" in htmlProps)) {\n      htmlProps[\"pageProps\"] = props;\n    }\n  }\n  const withCss = React.createElement(\n    CssCollector as any,\n    (inlineCss === true\n      ? {\n          cssFiles: cssFiles,\n          route,\n          moduleBaseURL,\n          moduleBasePath,\n          moduleRootPath,\n          root,\n          loader,\n        }\n      : { cssFiles: cssFiles, route, moduleBaseURL }) as any,\n    React.createElement(Page, props)\n  );\n  // Otherwise wrap with Html component\n  const content = htmlIsFragment\n    ? withCss\n    : React.createElement(Html, htmlProps, withCss);\n  try {\n    return renderToPipeableStream(\n      content,\n      moduleBasePath,\n      pipableStreamOptions\n    );\n  } catch (error) {\n    logger.error(`Failed to create stream for ${route}.`, {\n      error: error as Error,\n    });\n    return null;\n  }\n}\n"],"names":[],"mappings":";;;;;;;;AAYO,SAAS,eAAkD,CAAA;AAAA,EAChE,IAAA;AAAA,EACA,IAAA;AAAA,EACA,KAAA;AAAA,EACA,MAAA,GAAS,CAAC,EAAO,KAAA,OAAO,IAAI,IAAK,CAAA,CAAC,CAAM,KAAA,CAAA,CAAE,OAAO,CAAA;AAAA,EACjD,cAAA;AAAA,EACA,cAAA;AAAA,EACA,aAAA;AAAA,EACA,MAAA;AAAA,EACA,WAAW,EAAC;AAAA,EACZ,KAAA;AAAA,EACA,GAAA;AAAA,EACA,oBAAA;AAAA,EACA,SAAA;AAAA,EACA,SAAY,GAAA,IAAA;AAAA,EACZ,YAAA;AAAA,EACA;AACF,CAuBQ,EAAA;AACN,EAAM,MAAA,cAAA,GAAiB,QAAQ,KAAM,CAAA,QAAA;AACrC,EAAA,IAAI,CAAC,cAAgB,EAAA;AACnB,IAAA,IAAI,CAAC,SAAW,EAAA;AACd,MAAA,SAAA,GAAY,EAAC;AAAA;AAEf,IAAI,IAAA,EAAE,mBAAmB,SAAY,CAAA,EAAA;AACnC,MAAA,SAAA,CAAU,eAAe,CAAI,GAAA,aAAA;AAAA;AAE/B,IAAI,IAAA,EAAE,oBAAoB,SAAY,CAAA,EAAA;AACpC,MAAA,SAAA,CAAU,gBAAgB,CAAI,GAAA,cAAA;AAAA;AAEhC,IAAI,IAAA,EAAE,oBAAoB,SAAY,CAAA,EAAA;AACpC,MAAA,SAAA,CAAU,gBAAgB,CAAI,GAAA,cAAA;AAAA;AAEhC,IAAI,IAAA,EAAE,SAAS,SAAY,CAAA,EAAA;AACzB,MAAA,SAAA,CAAU,KAAK,CAAI,GAAA,GAAA;AAAA;AAErB,IAAI,IAAA,EAAE,WAAW,SAAY,CAAA,EAAA;AAC3B,MAAA,SAAA,CAAU,OAAO,CAAI,GAAA,KAAA;AAAA;AAEvB,IAAI,IAAA,EAAE,eAAe,SAAY,CAAA,EAAA;AAC/B,MAAA,SAAA,CAAU,WAAW,CAAI,GAAA,KAAA;AAAA;AAC3B;AAEF,EAAA,MAAM,UAAU,KAAM,CAAA,aAAA;AAAA,IACpB,YAAA;AAAA,IACC,cAAc,IACX,GAAA;AAAA,MACE,QAAA;AAAA,MACA,KAAA;AAAA,MACA,aAAA;AAAA,MACA,cAAA;AAAA,MACA,cAAA;AAAA,MACA,IAAA;AAAA,MACA;AAAA,KAEF,GAAA,EAAE,QAAoB,EAAA,KAAA,EAAO,aAAc,EAAA;AAAA,IAC/C,KAAA,CAAM,aAAc,CAAA,IAAA,EAAM,KAAK;AAAA,GACjC;AAEA,EAAA,MAAM,UAAU,cACZ,GAAA,OAAA,GACA,MAAM,aAAc,CAAA,IAAA,EAAM,WAAW,OAAO,CAAA;AAChD,EAAI,IAAA;AACF,IAAO,OAAA,sBAAA;AAAA,MACL,OAAA;AAAA,MACA,cAAA;AAAA,MACA;AAAA,KACF;AAAA,WACO,KAAO,EAAA;AACd,IAAO,MAAA,CAAA,KAAA,CAAM,CAA+B,4BAAA,EAAA,KAAK,CAAK,CAAA,CAAA,EAAA;AAAA,MACpD;AAAA,KACD,CAAA;AACD,IAAO,OAAA,IAAA;AAAA;AAEX;;;;"}
+{"version":3,"file":"createRscStream.js","sources":["../../../plugin/helpers/createRscStream.tsx"],"sourcesContent":["import { React, ReactDOMServer } from \"../vendor.server.js\";\nimport type { CreateHandlerOptions, StreamMetrics } from \"../types.js\";\n\nexport function createRscStream<\n  T,\n  C extends React.ComponentType<T>,\n  InlineCSS extends boolean = true\n>({\n  Html = React.Fragment,\n  PageComponent,\n  pageProps,\n  moduleBase,\n  moduleRootPath,\n  moduleBasePath,\n  moduleBaseURL,\n  cssFiles = new Map(),\n  globalCss = new Map(),\n  route,\n  pipeableStreamOptions,\n  CssCollector,\n  manifest,\n  onEvent,\n  projectRoot,\n}: Pick<\n  CreateHandlerOptions<T, C, InlineCSS>,\n  | \"Html\"\n  | \"PageComponent\"\n  | \"pageProps\"\n  | \"moduleBase\"\n  | \"moduleRootPath\"\n  | \"moduleBasePath\"\n  | \"moduleBaseURL\"\n  | \"cssFiles\"\n  | \"route\"\n  | \"pipeableStreamOptions\"\n  | \"CssCollector\"\n  | \"globalCss\"\n  | \"manifest\"\n  | \"projectRoot\"\n> & {\n  onEvent?: (event: \"error\" | \"postpone\", data: any) => void;\n}):\n  | { type: \"success\"; stream: any; metrics: StreamMetrics }\n  | { type: \"error\"; error: Error; metrics: StreamMetrics } {\n  const startTime = performance.now()\n  const htmlIsFragment = Html == React.Fragment;\n  const url =\n    moduleBaseURL !== \"\" ? new URL(route, moduleBaseURL).toString() : route;\n  let errorCount = 0;\n  let streamError: Error | null = null;\n\n  if (!PageComponent) {\n    return {\n      type: \"error\",\n      error: new Error(\"PageComponent is required\"),\n      metrics: {\n        chunks: 0,\n        bytes: 0,\n        backpressureCount: 0,\n        drainCount: 0,\n        errorCount: 0,\n        duration: 0,\n        startTime: 0,\n      },\n    };\n  }\n  const elements = htmlIsFragment ? (\n    <CssCollector\n      cssFiles={cssFiles}\n    >\n      <PageComponent {...(pageProps as any)} />\n    </CssCollector>\n  ) : (\n    <Html\n      moduleBase={moduleBase}\n      moduleBaseURL={moduleBaseURL}\n      moduleBasePath={moduleBasePath}\n      moduleRootPath={moduleRootPath}\n      projectRoot={projectRoot}\n      url={url}\n      route={route}\n      pageProps={pageProps}\n      cssFiles={cssFiles}\n      globalCss={globalCss}\n      CssCollector={CssCollector}\n      manifest={manifest}\n    >\n      <PageComponent {...(pageProps as any)} />\n    </Html>\n  );\n  try {\n    const stream = ReactDOMServer.renderToPipeableStream(\n      elements,\n      moduleBasePath,\n      {\n        ...pipeableStreamOptions,\n        onError(error: Error, errorInfo: any) {\n          const err = error instanceof Error ? error : new Error(String(error));\n          streamError = err;\n          onEvent?.(\"error\", { route, error: err, errorInfo });\n          errorCount++;\n        },\n        onPostpone(reason: string) {\n          onEvent?.(\"postpone\", { route, reason });\n        },\n      }\n    );\n\n    // If we have a stream error, return it immediately\n    if (streamError) {\n      return {\n        type: \"error\",\n        error: streamError,\n        metrics: {\n          chunks: 0,\n          bytes: 0,\n          backpressureCount: 0,\n          drainCount: 0,\n          errorCount,\n          duration: Date.now() - startTime,\n          startTime: startTime,\n        },\n      };\n    }\n\n    return {\n      type: \"success\",\n      stream,\n      metrics: {\n        chunks: 0,\n        bytes: 0,\n        backpressureCount: 0,\n        drainCount: 0,\n        errorCount,\n        duration: Date.now() - startTime,\n        startTime: startTime,\n      },\n    };\n  } catch (error) {\n    const err = error instanceof Error ? error : new Error(String(error));\n    onEvent?.(\"error\", { route, error: err });\n    return {\n      type: \"error\",\n      error: err,\n      metrics: {\n        chunks: 0,\n        bytes: 0,\n        backpressureCount: 0,\n        drainCount: 0,\n        errorCount: errorCount + 1,\n        duration: Date.now() - startTime,\n        startTime: startTime,\n      },\n    };\n  }\n}\n"],"names":[],"mappings":"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"}

package/dist/plugin/helpers/defaultFileWriter.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=defaultFileWriter.d.ts.map

package/dist/plugin/helpers/defaultFileWriter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defaultFileWriter.d.ts","sourceRoot":"","sources":["../../../plugin/helpers/defaultFileWriter.ts"],"names":[],"mappings":""}

package/dist/plugin/helpers/defaultFileWriter.js

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

package/dist/plugin/helpers/getBundleManifest.d.ts

@@ -1,13 +1,6 @@
-import type { OutputBundle, PluginContext } from "rollup";
-interface BundleManifestEntry {
-    file: string;
-    name: string;
-    src?: string;
-    isEntry?: boolean;
-    imports?: string[];
-    dynamicImports?: string[];
-    css?: string[];
-}
+import type { OutputBundle } from "rollup";
+import type { ManifestChunk } from "vite";
+import type { InputNormalizer } from "../types.js";
 /**
  * Get the bundle manifest from the plugin context. Will only work during production build
  * @param pluginContext - The plugin context
@@ -15,11 +8,12 @@ interface BundleManifestEntry {
  * @param preserveModulesRoot - The preserve modules root
  * @returns The bundle manifest
  */
-export declare function getBundleManifest({ pluginContext, bundle, moduleBase, preserveModulesRoot, }: {
-    pluginContext: PluginContext;
+export declare function getBundleManifest<SSR extends boolean>({ bundle, normalizer, }: {
     bundle: OutputBundle;
-    moduleBase?: string;
-    preserveModulesRoot?: boolean;
-}): Record<string, BundleManifestEntry>;
-export {};
+    normalizer: InputNormalizer;
+}): SSR extends true ? Record<string, string[]> : {
+    [key: string]: ManifestChunk & {
+        source: string;
+    };
+};
 //# sourceMappingURL=getBundleManifest.d.ts.map

package/dist/plugin/helpers/getBundleManifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getBundleManifest.d.ts","sourceRoot":"","sources":["../../../plugin/helpers/getBundleManifest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EAEd,MAAM,QAAQ,CAAC;AAIhB,UAAU,mBAAmB;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;CAChB;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,EAChC,aAAa,EACb,MAAM,EACN,UAAU,EACV,mBAAmB,GACpB,EAAE;IACD,aAAa,EAAE,aAAa,CAAC;IAC7B,MAAM,EAAE,YAAY,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B,GAAG,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAsFtC"}
+{"version":3,"file":"getBundleManifest.d.ts","sourceRoot":"","sources":["../../../plugin/helpers/getBundleManifest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EAEb,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,EAAG,aAAa,EAAE,MAAM,MAAM,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAGnD;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,SAAS,OAAO,EAAE,EACrD,MAAM,EACN,UAAU,GACX,EAAE;IACD,MAAM,EAAE,YAAY,CAAC;IACrB,UAAU,EAAE,eAAe,CAAC;CAC7B,GAAG,GAAG,SAAS,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG;IAChD,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,GAAG;QAC7B,MAAM,EAAE,MAAM,CAAC;KAChB,CAAA;CACF,CAqGA"}

package/dist/plugin/helpers/getBundleManifest.js

@@ -3,27 +3,37 @@
  * Copyright (c) Nico Brinkkemper
  * MIT License
  */
-import { createInputNormalizer } from './inputNormalizer.js';
-import { DEFAULT_CONFIG } from '../config/defaults.js';
-
 function getBundleManifest({
-  pluginContext,
   bundle,
-  moduleBase,
-  preserveModulesRoot
+  normalizer
 }) {
-  const normalizer = createInputNormalizer({
-    root: pluginContext.environment.config.root,
-    removeExtension: DEFAULT_CONFIG.FILE_REGEX,
-    preserveModulesRoot: preserveModulesRoot === true ? moduleBase : undefined
-  });
   if (!bundle) return {};
   const virtualModules = /* @__PURE__ */ new Map();
   const bundleManifest = Object.fromEntries(
-    Object.entries(bundle).map(([fileName, chunk]) => {
-      if (chunk.type !== "chunk") return null;
+    Object.entries(bundle).map(([originalFileName, chunk]) => {
+      if (!originalFileName && "file" in chunk) {
+        return [
+          chunk.file,
+          {
+            file: chunk.file,
+            source: "source" in chunk ? chunk.source : undefined
+          }
+        ];
+      }
+      if (chunk.type === "asset") {
+        return [
+          originalFileName,
+          {
+            file: chunk.fileName,
+            name: chunk.names[0],
+            src: originalFileName,
+            source: chunk.source,
+            isEntry: chunk.needsCodeReference
+          }
+        ];
+      }
       const chunkWithFacade = chunk;
-      const moduleId = chunkWithFacade.facadeModuleId || chunkWithFacade.moduleIds[0] || fileName;
+      const moduleId = chunkWithFacade.facadeModuleId || chunkWithFacade.moduleIds[0] || originalFileName;
       if (moduleId.includes("commonjsHelpers")) {
         return [
           moduleId,
@@ -36,13 +46,13 @@ function getBundleManifest({
         ];
       }
       let [normalizedId, sourcePath] = normalizer(moduleId);
-      let finalFileName = fileName;
+      let finalFileName = originalFileName;
       if (moduleId.includes("?")) {
         const [basePath, query] = moduleId.split("?");
         const virtualPath = basePath.includes("node_modules") ? basePath.split("node_modules/")[1] : basePath;
         const virtualKey = `${virtualPath}?${query}`;
         if (!virtualModules.has(virtualKey)) {
-          const virtualFileName = `${virtualPath.replace(/\.js$/, "")}.${query}.js`;
+          const virtualFileName = query === "inline" ? virtualPath : `${virtualPath}.${query}.js`;
           virtualModules.set(virtualKey, virtualFileName);
         }
         finalFileName = virtualModules.get(virtualKey);
@@ -53,9 +63,9 @@ function getBundleManifest({
       if (sourcePath.startsWith("/")) {
         sourcePath = sourcePath.slice(1);
       }
-      if (moduleBase && preserveModulesRoot && normalizedId?.startsWith(moduleBase + "/")) {
-        normalizedId = normalizedId.slice(moduleBase.length + 1);
-      }
+      const withCss = chunk.viteMetadata?.importedCss?.size ? {
+        css: Array.from(chunk.viteMetadata.importedCss)
+      } : {};
       const bundleManifestEntry = [
         sourcePath,
         {
@@ -65,9 +75,7 @@ function getBundleManifest({
           isEntry: chunk.isEntry,
           ...chunk.imports?.length > 0 ? { imports: chunk.imports } : {},
           ...chunk.dynamicImports?.length > 0 ? { dynamicImports: chunk.dynamicImports } : {},
-          ...chunk.viteMetadata?.importedCss?.size ? {
-            css: Array.from(chunk.viteMetadata.importedCss)
-          } : {}
+          ...withCss
         }
       ];
       return bundleManifestEntry;