vite-plugin-react-server 0.3.7 → 0.3.8

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "vite-plugin-react-server",
-    "version": "0.3.7",
+    "version": "0.3.8",
     "description": "Vite plugin for React Server Components (RSC)",
     "type": "module",
     "main": "./dist/plugin/index.js",

package/dist/plugin/components.d.ts

@@ -2,8 +2,9 @@
  * A component that emits <link> tags for CSS files during streaming.
  * The high precedence ensures they bubble up to the document head.
  */
-export declare function CssCollector({ url }: {
+export declare function CssCollector({ url, moduleBasePath }: {
     url: string;
+    moduleBasePath: string;
 }): import("react").DetailedReactHTMLElement<{
     key: string;
     rel: string;

package/dist/plugin/components.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"components.d.ts","sourceRoot":"","sources":["../../plugin/components.tsx"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wBAAgB,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE;;;;;gBAOpD"}
+{"version":3,"file":"components.d.ts","sourceRoot":"","sources":["../../plugin/components.tsx"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wBAAgB,YAAY,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE;;;;;gBAO5F"}

package/dist/plugin/components.js

@@ -5,11 +5,11 @@
  */
 import { createElement } from 'react';
 
-function CssCollector({ url }) {
+function CssCollector({ url, moduleBasePath }) {
   return createElement("link", {
     key: url,
     rel: "stylesheet",
-    href: url,
+    href: url.replace(moduleBasePath, ""),
     precedence: "high"
   });
 }

package/dist/plugin/components.js.map

@@ -1 +1 @@
-{"version":3,"file":"components.js","sources":["../../plugin/components.tsx"],"sourcesContent":["import { createElement } from 'react';\n\n/**\n * A component that emits <link> tags for CSS files during streaming.\n * The high precedence ensures they bubble up to the document head.\n */\nexport function CssCollector({ url }: { url: string }) {\n  return createElement('link', {\n    key: url,\n    rel: 'stylesheet',\n    href: url,\n    precedence: 'high'\n  });\n} "],"names":[],"mappings":";;;;;;;AAMgB,SAAA,YAAA,CAAa,EAAE,GAAA,EAAwB,EAAA;AACrD,EAAA,OAAO,cAAc,MAAQ,EAAA;AAAA,IAC3B,GAAK,EAAA,GAAA;AAAA,IACL,GAAK,EAAA,YAAA;AAAA,IACL,IAAM,EAAA,GAAA;AAAA,IACN,UAAY,EAAA;AAAA,GACb,CAAA;AACH;;;;"}
+{"version":3,"file":"components.js","sources":["../../plugin/components.tsx"],"sourcesContent":["import { createElement } from 'react';\n\n/**\n * A component that emits <link> tags for CSS files during streaming.\n * The high precedence ensures they bubble up to the document head.\n */\nexport function CssCollector({ url, moduleBasePath }: { url: string, moduleBasePath: string }) {\n  return createElement('link', {\n    key: url,\n    rel: 'stylesheet',\n    href: url.replace(moduleBasePath, \"\"),\n    precedence: 'high'\n  });\n} "],"names":[],"mappings":";;;;;;;AAMO,SAAS,YAAa,CAAA,EAAE,GAAK,EAAA,cAAA,EAA2D,EAAA;AAC7F,EAAA,OAAO,cAAc,MAAQ,EAAA;AAAA,IAC3B,GAAK,EAAA,GAAA;AAAA,IACL,GAAK,EAAA,YAAA;AAAA,IACL,IAAM,EAAA,GAAA,CAAI,OAAQ,CAAA,cAAA,EAAgB,EAAE,CAAA;AAAA,IACpC,UAAY,EAAA;AAAA,GACb,CAAA;AACH;;;;"}

package/dist/plugin/config/defaults.d.ts

@@ -5,14 +5,14 @@ export declare const DEFAULT_CONFIG: {
     readonly MODULE_BASE: "src";
     readonly MODULE_BASE_PATH: "/src";
     readonly MODULE_BASE_URL: "/src";
-    readonly PAGE: "src/page/page.tsx";
-    readonly PROPS: "src/page/props.ts";
+    readonly PAGE: "/src/page/page.tsx";
+    readonly PROPS: "/src/page/props.ts";
     readonly CLIENT_ENTRY: "/src/client.tsx";
     readonly SERVER_ENTRY: "/src/server.tsx";
     readonly PAGE_EXPORT: "Page";
     readonly PROPS_EXPORT: "props";
-    readonly HTML_WORKER_PATH: "worker/html/index.js";
-    readonly RSC_WORKER_PATH: "worker/rsc/index.js";
+    readonly HTML_WORKER_PATH: "worker/html/html-worker.js";
+    readonly RSC_WORKER_PATH: "worker/rsc/rsc-worker.js";
     readonly LOADER_PATH: "worker/loader.js";
     readonly RSC_EXTENSION: ".rsc";
     readonly HTML: ({ children }: {

package/dist/plugin/config/defaults.js

@@ -12,14 +12,14 @@ const DEFAULT_CONFIG = {
   MODULE_BASE: "src",
   MODULE_BASE_PATH: "/src",
   MODULE_BASE_URL: "/src",
-  PAGE: "src/page/page.tsx",
-  PROPS: "src/page/props.ts",
+  PAGE: "/src/page/page.tsx",
+  PROPS: "/src/page/props.ts",
   CLIENT_ENTRY: "/src/client.tsx",
   SERVER_ENTRY: "/src/server.tsx",
   PAGE_EXPORT: "Page",
   PROPS_EXPORT: "props",
-  HTML_WORKER_PATH: "worker/html/index.js",
-  RSC_WORKER_PATH: "worker/rsc/index.js",
+  HTML_WORKER_PATH: "worker/html/html-worker.js",
+  RSC_WORKER_PATH: "worker/rsc/rsc-worker.js",
   LOADER_PATH: "worker/loader.js",
   RSC_EXTENSION: ".rsc",
   HTML: ({ children }) => children,

package/dist/plugin/config/defaults.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaults.js","sources":["../../../plugin/config/defaults.ts"],"sourcesContent":["import { moduleIdDefault } from \"./moduleIdDefault.js\";\n\nexport const DEFAULT_CONFIG = {\n  FILE_REGEX: /\\.(m|c)?(j|t)sx?$/,\n  CLIENT_ASSETS_DIR: \"assets\",\n  RSC_DIR: \"rsc\",\n  MODULE_BASE: \"src\",\n  MODULE_BASE_PATH: \"/src\",\n  MODULE_BASE_URL: \"/src\",\n  PAGE: \"src/page/page.tsx\",\n  PROPS: \"src/page/props.ts\",\n  CLIENT_ENTRY: \"/src/client.tsx\",\n  SERVER_ENTRY: \"/src/server.tsx\",\n  PAGE_EXPORT: \"Page\",\n  PROPS_EXPORT: \"props\",\n  HTML_WORKER_PATH: 'worker/html/index.js',\n  RSC_WORKER_PATH: 'worker/rsc/index.js',\n  LOADER_PATH: 'worker/loader.js',\n  RSC_EXTENSION: \".rsc\",\n  HTML: ({ children }: { children: any }) => children,\n  COLLECT_CSS: true,\n  COLLECT_ASSETS: true,\n  PAGE_PATTERN: \"/src/page/**/*.page.tsx\",\n  PROPS_PATTERN: \"/src/page/**/*.props.ts\",\n  DEV_PORT: 5173,\n  PREVIEW_PORT: 4173,\n  DEV_HOST: \"localhost\",\n  PREVIEW_HOST: \"localhost\",\n  ENV_PREFIX: \"VITE_\",\n  BUILD: {\n    pages: () => [\"/\"],\n    client: \"dist/client\",\n    server: \"dist/server\",\n    static: \"dist/static\",\n  },\n  MODULE_BASE_EXCEPTIONS: [] as string[],\n  AUTO_DISCOVER: {\n    pagePattern: /page\\.(m|c)?(j|t)sx?/,\n    propsPattern: /props\\.(m|c)?(j|t)sx?/,\n    clientComponents: /client\\.(m|c)?(j|t)sx?/,\n    serverFunctions: /server\\.(m|c)?(j|t)sx?/,\n  },\n  MODULE_ID: moduleIdDefault\n} as const; "],"names":[],"mappings":";;;;;;;AAEO,MAAM,cAAiB,GAAA;AAAA,EAC5B,UAAY,EAAA,mBAAA;AAAA,EACZ,iBAAmB,EAAA,QAAA;AAAA,EACnB,OAAS,EAAA,KAAA;AAAA,EACT,WAAa,EAAA,KAAA;AAAA,EACb,gBAAkB,EAAA,MAAA;AAAA,EAClB,eAAiB,EAAA,MAAA;AAAA,EACjB,IAAM,EAAA,mBAAA;AAAA,EACN,KAAO,EAAA,mBAAA;AAAA,EACP,YAAc,EAAA,iBAAA;AAAA,EACd,YAAc,EAAA,iBAAA;AAAA,EACd,WAAa,EAAA,MAAA;AAAA,EACb,YAAc,EAAA,OAAA;AAAA,EACd,gBAAkB,EAAA,sBAAA;AAAA,EAClB,eAAiB,EAAA,qBAAA;AAAA,EACjB,WAAa,EAAA,kBAAA;AAAA,EACb,aAAe,EAAA,MAAA;AAAA,EACf,IAAM,EAAA,CAAC,EAAE,QAAA,EAAkC,KAAA,QAAA;AAAA,EAC3C,WAAa,EAAA,IAAA;AAAA,EACb,cAAgB,EAAA,IAAA;AAAA,EAChB,YAAc,EAAA,yBAAA;AAAA,EACd,aAAe,EAAA,yBAAA;AAAA,EACf,QAAU,EAAA,IAAA;AAAA,EACV,YAAc,EAAA,IAAA;AAAA,EACd,QAAU,EAAA,WAAA;AAAA,EACV,YAAc,EAAA,WAAA;AAAA,EACd,UAAY,EAAA,OAAA;AAAA,EACZ,KAAO,EAAA;AAAA,IACL,KAAA,EAAO,MAAM,CAAC,GAAG,CAAA;AAAA,IACjB,MAAQ,EAAA,aAAA;AAAA,IACR,MAAQ,EAAA,aAAA;AAAA,IACR,MAAQ,EAAA;AAAA,GACV;AAAA,EACA,wBAAwB,EAAC;AAAA,EACzB,aAAe,EAAA;AAAA,IACb,WAAa,EAAA,sBAAA;AAAA,IACb,YAAc,EAAA,uBAAA;AAAA,IACd,gBAAkB,EAAA,wBAAA;AAAA,IAClB,eAAiB,EAAA;AAAA,GACnB;AAAA,EACA,SAAW,EAAA;AACb;;;;"}
+{"version":3,"file":"defaults.js","sources":["../../../plugin/config/defaults.ts"],"sourcesContent":["import { moduleIdDefault } from \"./moduleIdDefault.js\";\n\nexport const DEFAULT_CONFIG = {\n  FILE_REGEX: /\\.(m|c)?(j|t)sx?$/,\n  CLIENT_ASSETS_DIR: \"assets\",\n  RSC_DIR: \"rsc\",\n  MODULE_BASE: \"src\",\n  MODULE_BASE_PATH: \"/src\",\n  MODULE_BASE_URL: \"/src\",\n  PAGE: \"/src/page/page.tsx\",\n  PROPS: \"/src/page/props.ts\",\n  CLIENT_ENTRY: \"/src/client.tsx\",\n  SERVER_ENTRY: \"/src/server.tsx\",\n  PAGE_EXPORT: \"Page\",\n  PROPS_EXPORT: \"props\",\n  HTML_WORKER_PATH: 'worker/html/html-worker.js',\n  RSC_WORKER_PATH: 'worker/rsc/rsc-worker.js',\n  LOADER_PATH: 'worker/loader.js',\n  RSC_EXTENSION: \".rsc\",\n  HTML: ({ children }: { children: any }) => children,\n  COLLECT_CSS: true,\n  COLLECT_ASSETS: true,\n  PAGE_PATTERN: \"/src/page/**/*.page.tsx\",\n  PROPS_PATTERN: \"/src/page/**/*.props.ts\",\n  DEV_PORT: 5173,\n  PREVIEW_PORT: 4173,\n  DEV_HOST: \"localhost\",\n  PREVIEW_HOST: \"localhost\",\n  ENV_PREFIX: \"VITE_\",\n  BUILD: {\n    pages: () => [\"/\"],\n    client: \"dist/client\",\n    server: \"dist/server\",\n    static: \"dist/static\",\n  },\n  MODULE_BASE_EXCEPTIONS: [] as string[],\n  AUTO_DISCOVER: {\n    pagePattern: /page\\.(m|c)?(j|t)sx?/,\n    propsPattern: /props\\.(m|c)?(j|t)sx?/,\n    clientComponents: /client\\.(m|c)?(j|t)sx?/,\n    serverFunctions: /server\\.(m|c)?(j|t)sx?/,\n  },\n  MODULE_ID: moduleIdDefault\n} as const; "],"names":[],"mappings":";;;;;;;AAEO,MAAM,cAAiB,GAAA;AAAA,EAC5B,UAAY,EAAA,mBAAA;AAAA,EACZ,iBAAmB,EAAA,QAAA;AAAA,EACnB,OAAS,EAAA,KAAA;AAAA,EACT,WAAa,EAAA,KAAA;AAAA,EACb,gBAAkB,EAAA,MAAA;AAAA,EAClB,eAAiB,EAAA,MAAA;AAAA,EACjB,IAAM,EAAA,oBAAA;AAAA,EACN,KAAO,EAAA,oBAAA;AAAA,EACP,YAAc,EAAA,iBAAA;AAAA,EACd,YAAc,EAAA,iBAAA;AAAA,EACd,WAAa,EAAA,MAAA;AAAA,EACb,YAAc,EAAA,OAAA;AAAA,EACd,gBAAkB,EAAA,4BAAA;AAAA,EAClB,eAAiB,EAAA,0BAAA;AAAA,EACjB,WAAa,EAAA,kBAAA;AAAA,EACb,aAAe,EAAA,MAAA;AAAA,EACf,IAAM,EAAA,CAAC,EAAE,QAAA,EAAkC,KAAA,QAAA;AAAA,EAC3C,WAAa,EAAA,IAAA;AAAA,EACb,cAAgB,EAAA,IAAA;AAAA,EAChB,YAAc,EAAA,yBAAA;AAAA,EACd,aAAe,EAAA,yBAAA;AAAA,EACf,QAAU,EAAA,IAAA;AAAA,EACV,YAAc,EAAA,IAAA;AAAA,EACd,QAAU,EAAA,WAAA;AAAA,EACV,YAAc,EAAA,WAAA;AAAA,EACd,UAAY,EAAA,OAAA;AAAA,EACZ,KAAO,EAAA;AAAA,IACL,KAAA,EAAO,MAAM,CAAC,GAAG,CAAA;AAAA,IACjB,MAAQ,EAAA,aAAA;AAAA,IACR,MAAQ,EAAA,aAAA;AAAA,IACR,MAAQ,EAAA;AAAA,GACV;AAAA,EACA,wBAAwB,EAAC;AAAA,EACzB,aAAe,EAAA;AAAA,IACb,WAAa,EAAA,sBAAA;AAAA,IACb,YAAc,EAAA,uBAAA;AAAA,IACd,gBAAkB,EAAA,wBAAA;AAAA,IAClB,eAAiB,EAAA;AAAA,GACnB;AAAA,EACA,SAAW,EAAA;AACb;;;;"}

package/dist/plugin/config/resolveOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveOptions.d.ts","sourceRoot":"","sources":["../../../plugin/config/resolveOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAG5E,eAAO,MAAM,cAAc,YAChB,mBAAmB,KAC3B;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,WAAW,EAAE,mBAAmB,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CA+CvF,CAAC"}
+{"version":3,"file":"resolveOptions.d.ts","sourceRoot":"","sources":["../../../plugin/config/resolveOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAG5E,eAAO,MAAM,cAAc,YAChB,mBAAmB,KAE1B;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,WAAW,EAAE,mBAAmB,CAAA;CAAE,GACrD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAoEhC,CAAC"}

package/dist/plugin/config/resolveOptions.js

@@ -8,14 +8,17 @@ import { DEFAULT_CONFIG } from './defaults.js';
 const resolveOptions = (options) => {
   const projectRoot = options.projectRoot ?? process.cwd();
   const build = options.build ?? DEFAULT_CONFIG.BUILD;
+  const moduleBase = typeof options.moduleBase === "string" ? options.moduleBase : DEFAULT_CONFIG.MODULE_BASE;
+  const moduleBasePath = typeof options.moduleBasePath === "string" ? options.moduleBasePath : options.moduleBase.startsWith("/") ? options.moduleBase : "/" + options.moduleBase;
+  const moduleBaseURL = typeof options.moduleBaseURL === "string" ? options.moduleBaseURL : moduleBasePath ?? DEFAULT_CONFIG.MODULE_BASE_URL;
   try {
     return {
       type: "success",
       userOptions: {
         projectRoot,
-        moduleBase: options.moduleBase ?? DEFAULT_CONFIG.MODULE_BASE,
-        moduleBasePath: options.moduleBasePath ?? DEFAULT_CONFIG.MODULE_BASE_PATH,
-        moduleBaseURL: options.moduleBaseURL ?? DEFAULT_CONFIG.MODULE_BASE_URL,
+        moduleBase,
+        moduleBasePath,
+        moduleBaseURL,
         build: {
           pages: build.pages ?? DEFAULT_CONFIG.BUILD.pages,
           client: build.client ?? DEFAULT_CONFIG.BUILD.client,

package/dist/plugin/config/resolveOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveOptions.js","sources":["../../../plugin/config/resolveOptions.ts"],"sourcesContent":["import type { StreamPluginOptions, ResolvedUserOptions } from \"../types.js\";\nimport { DEFAULT_CONFIG } from \"./defaults.js\";\n\nexport const resolveOptions = (\n  options: StreamPluginOptions\n): { type: \"success\"; userOptions: ResolvedUserOptions } | { type: \"error\"; error: Error } => {\n  const projectRoot = options.projectRoot ?? process.cwd();\n\n  const build = options.build ?? DEFAULT_CONFIG.BUILD;\n\n  try {\n    return {\n      type: \"success\",\n      userOptions: {\n        projectRoot,\n        moduleBase: options.moduleBase ?? DEFAULT_CONFIG.MODULE_BASE,\n        moduleBasePath: options.moduleBasePath ?? DEFAULT_CONFIG.MODULE_BASE_PATH,\n        moduleBaseURL: options.moduleBaseURL ?? DEFAULT_CONFIG.MODULE_BASE_URL,\n        build: {\n          pages: build.pages ?? DEFAULT_CONFIG.BUILD.pages,\n          client: build.client ?? DEFAULT_CONFIG.BUILD.client,\n          server: build.server ?? DEFAULT_CONFIG.BUILD.server,\n          static: build.static ?? DEFAULT_CONFIG.BUILD.static,\n        },\n        Page: options.Page ?? DEFAULT_CONFIG.PAGE,\n        props: options.props ?? DEFAULT_CONFIG.PROPS,\n        Html: options.Html ?? DEFAULT_CONFIG.HTML,\n        pageExportName: options.pageExportName ?? DEFAULT_CONFIG.PAGE_EXPORT,\n        propsExportName: options.propsExportName ?? DEFAULT_CONFIG.PROPS_EXPORT,\n        collectCss: options.collectCss ?? DEFAULT_CONFIG.COLLECT_CSS,\n        collectAssets: options.collectAssets ?? DEFAULT_CONFIG.COLLECT_ASSETS,\n        assetsDir: options.assetsDir ?? DEFAULT_CONFIG.CLIENT_ASSETS_DIR,\n        htmlWorkerPath: options.htmlWorkerPath ?? DEFAULT_CONFIG.HTML_WORKER_PATH,\n        rscWorkerPath: options.rscWorkerPath ?? DEFAULT_CONFIG.RSC_WORKER_PATH,\n        loaderPath: options.loaderPath ?? DEFAULT_CONFIG.LOADER_PATH,\n        clientEntry: options.clientEntry ?? DEFAULT_CONFIG.CLIENT_ENTRY,\n        serverEntry: options.serverEntry ?? DEFAULT_CONFIG.SERVER_ENTRY,\n        moduleBaseExceptions: options.moduleBaseExceptions ?? [],\n        autoDiscover: {\n            pagePattern: options.autoDiscover?.pagePattern ?? DEFAULT_CONFIG.AUTO_DISCOVER.pagePattern,\n            propsPattern: options.autoDiscover?.propsPattern ?? DEFAULT_CONFIG.AUTO_DISCOVER.propsPattern,\n            clientComponents: options.autoDiscover?.clientComponents ?? DEFAULT_CONFIG.AUTO_DISCOVER.clientComponents,\n            serverFunctions: options.autoDiscover?.serverFunctions ?? DEFAULT_CONFIG.AUTO_DISCOVER.serverFunctions,\n        },\n      }\n    };\n  } catch (error) {\n    return {\n      type: \"error\",\n      error: error instanceof Error ? error : new Error('Failed to resolve options')\n    };\n  }\n}; "],"names":[],"mappings":";;;;;;;AAGa,MAAA,cAAA,GAAiB,CAC5B,OAC4F,KAAA;AAC5F,EAAA,MAAM,WAAc,GAAA,OAAA,CAAQ,WAAe,IAAA,OAAA,CAAQ,GAAI,EAAA;AAEvD,EAAM,MAAA,KAAA,GAAQ,OAAQ,CAAA,KAAA,IAAS,cAAe,CAAA,KAAA;AAE9C,EAAI,IAAA;AACF,IAAO,OAAA;AAAA,MACL,IAAM,EAAA,SAAA;AAAA,MACN,WAAa,EAAA;AAAA,QACX,WAAA;AAAA,QACA,UAAA,EAAY,OAAQ,CAAA,UAAA,IAAc,cAAe,CAAA,WAAA;AAAA,QACjD,cAAA,EAAgB,OAAQ,CAAA,cAAA,IAAkB,cAAe,CAAA,gBAAA;AAAA,QACzD,aAAA,EAAe,OAAQ,CAAA,aAAA,IAAiB,cAAe,CAAA,eAAA;AAAA,QACvD,KAAO,EAAA;AAAA,UACL,KAAO,EAAA,KAAA,CAAM,KAAS,IAAA,cAAA,CAAe,KAAM,CAAA,KAAA;AAAA,UAC3C,MAAQ,EAAA,KAAA,CAAM,MAAU,IAAA,cAAA,CAAe,KAAM,CAAA,MAAA;AAAA,UAC7C,MAAQ,EAAA,KAAA,CAAM,MAAU,IAAA,cAAA,CAAe,KAAM,CAAA,MAAA;AAAA,UAC7C,MAAQ,EAAA,KAAA,CAAM,MAAU,IAAA,cAAA,CAAe,KAAM,CAAA;AAAA,SAC/C;AAAA,QACA,IAAA,EAAM,OAAQ,CAAA,IAAA,IAAQ,cAAe,CAAA,IAAA;AAAA,QACrC,KAAA,EAAO,OAAQ,CAAA,KAAA,IAAS,cAAe,CAAA,KAAA;AAAA,QACvC,IAAA,EAAM,OAAQ,CAAA,IAAA,IAAQ,cAAe,CAAA,IAAA;AAAA,QACrC,cAAA,EAAgB,OAAQ,CAAA,cAAA,IAAkB,cAAe,CAAA,WAAA;AAAA,QACzD,eAAA,EAAiB,OAAQ,CAAA,eAAA,IAAmB,cAAe,CAAA,YAAA;AAAA,QAC3D,UAAA,EAAY,OAAQ,CAAA,UAAA,IAAc,cAAe,CAAA,WAAA;AAAA,QACjD,aAAA,EAAe,OAAQ,CAAA,aAAA,IAAiB,cAAe,CAAA,cAAA;AAAA,QACvD,SAAA,EAAW,OAAQ,CAAA,SAAA,IAAa,cAAe,CAAA,iBAAA;AAAA,QAC/C,cAAA,EAAgB,OAAQ,CAAA,cAAA,IAAkB,cAAe,CAAA,gBAAA;AAAA,QACzD,aAAA,EAAe,OAAQ,CAAA,aAAA,IAAiB,cAAe,CAAA,eAAA;AAAA,QACvD,UAAA,EAAY,OAAQ,CAAA,UAAA,IAAc,cAAe,CAAA,WAAA;AAAA,QACjD,WAAA,EAAa,OAAQ,CAAA,WAAA,IAAe,cAAe,CAAA,YAAA;AAAA,QACnD,WAAA,EAAa,OAAQ,CAAA,WAAA,IAAe,cAAe,CAAA,YAAA;AAAA,QACnD,oBAAA,EAAsB,OAAQ,CAAA,oBAAA,IAAwB,EAAC;AAAA,QACvD,YAAc,EAAA;AAAA,UACV,WAAa,EAAA,OAAA,CAAQ,YAAc,EAAA,WAAA,IAAe,eAAe,aAAc,CAAA,WAAA;AAAA,UAC/E,YAAc,EAAA,OAAA,CAAQ,YAAc,EAAA,YAAA,IAAgB,eAAe,aAAc,CAAA,YAAA;AAAA,UACjF,gBAAkB,EAAA,OAAA,CAAQ,YAAc,EAAA,gBAAA,IAAoB,eAAe,aAAc,CAAA,gBAAA;AAAA,UACzF,eAAiB,EAAA,OAAA,CAAQ,YAAc,EAAA,eAAA,IAAmB,eAAe,aAAc,CAAA;AAAA;AAC3F;AACF,KACF;AAAA,WACO,KAAO,EAAA;AACd,IAAO,OAAA;AAAA,MACL,IAAM,EAAA,OAAA;AAAA,MACN,OAAO,KAAiB,YAAA,KAAA,GAAQ,KAAQ,GAAA,IAAI,MAAM,2BAA2B;AAAA,KAC/E;AAAA;AAEJ;;;;"}
+{"version":3,"file":"resolveOptions.js","sources":["../../../plugin/config/resolveOptions.ts"],"sourcesContent":["import type { StreamPluginOptions, ResolvedUserOptions } from \"../types.js\";\nimport { DEFAULT_CONFIG } from \"./defaults.js\";\n\nexport const resolveOptions = (\n  options: StreamPluginOptions\n):\n  | { type: \"success\"; userOptions: ResolvedUserOptions }\n  | { type: \"error\"; error: Error } => {\n  const projectRoot = options.projectRoot ?? process.cwd();\n\n  const build = options.build ?? DEFAULT_CONFIG.BUILD;\n\n  const moduleBase = typeof options.moduleBase === \"string\" ? options.moduleBase : DEFAULT_CONFIG.MODULE_BASE;\n  const moduleBasePath =\n    typeof options.moduleBasePath === \"string\"\n      ? options.moduleBasePath\n      : options.moduleBase.startsWith(\"/\")\n      ? options.moduleBase\n      : \"/\" + options.moduleBase;\n  const moduleBaseURL =\n    typeof options.moduleBaseURL === \"string\"\n      ? options.moduleBaseURL\n      : moduleBasePath ?? DEFAULT_CONFIG.MODULE_BASE_URL;\n  try {\n    return {\n      type: \"success\",\n      userOptions: {\n        projectRoot,\n        moduleBase,\n        moduleBasePath,\n        moduleBaseURL,\n        build: {\n          pages: build.pages ?? DEFAULT_CONFIG.BUILD.pages,\n          client: build.client ?? DEFAULT_CONFIG.BUILD.client,\n          server: build.server ?? DEFAULT_CONFIG.BUILD.server,\n          static: build.static ?? DEFAULT_CONFIG.BUILD.static,\n        },\n        Page: options.Page ?? DEFAULT_CONFIG.PAGE,\n        props: options.props ?? DEFAULT_CONFIG.PROPS,\n        Html: options.Html ?? DEFAULT_CONFIG.HTML,\n        pageExportName: options.pageExportName ?? DEFAULT_CONFIG.PAGE_EXPORT,\n        propsExportName: options.propsExportName ?? DEFAULT_CONFIG.PROPS_EXPORT,\n        collectCss: options.collectCss ?? DEFAULT_CONFIG.COLLECT_CSS,\n        collectAssets: options.collectAssets ?? DEFAULT_CONFIG.COLLECT_ASSETS,\n        assetsDir: options.assetsDir ?? DEFAULT_CONFIG.CLIENT_ASSETS_DIR,\n        htmlWorkerPath:\n          options.htmlWorkerPath ?? DEFAULT_CONFIG.HTML_WORKER_PATH,\n        rscWorkerPath: options.rscWorkerPath ?? DEFAULT_CONFIG.RSC_WORKER_PATH,\n        loaderPath: options.loaderPath ?? DEFAULT_CONFIG.LOADER_PATH,\n        clientEntry: options.clientEntry ?? DEFAULT_CONFIG.CLIENT_ENTRY,\n        serverEntry: options.serverEntry ?? DEFAULT_CONFIG.SERVER_ENTRY,\n        moduleBaseExceptions: options.moduleBaseExceptions ?? [],\n        autoDiscover: {\n          pagePattern:\n            options.autoDiscover?.pagePattern ??\n            DEFAULT_CONFIG.AUTO_DISCOVER.pagePattern,\n          propsPattern:\n            options.autoDiscover?.propsPattern ??\n            DEFAULT_CONFIG.AUTO_DISCOVER.propsPattern,\n          clientComponents:\n            options.autoDiscover?.clientComponents ??\n            DEFAULT_CONFIG.AUTO_DISCOVER.clientComponents,\n          serverFunctions:\n            options.autoDiscover?.serverFunctions ??\n            DEFAULT_CONFIG.AUTO_DISCOVER.serverFunctions,\n        },\n      },\n    };\n  } catch (error) {\n    return {\n      type: \"error\",\n      error:\n        error instanceof Error ? error : new Error(\"Failed to resolve options\"),\n    };\n  }\n};\n"],"names":[],"mappings":";;;;;;;AAGa,MAAA,cAAA,GAAiB,CAC5B,OAGqC,KAAA;AACrC,EAAA,MAAM,WAAc,GAAA,OAAA,CAAQ,WAAe,IAAA,OAAA,CAAQ,GAAI,EAAA;AAEvD,EAAM,MAAA,KAAA,GAAQ,OAAQ,CAAA,KAAA,IAAS,cAAe,CAAA,KAAA;AAE9C,EAAA,MAAM,aAAa,OAAO,OAAA,CAAQ,eAAe,QAAW,GAAA,OAAA,CAAQ,aAAa,cAAe,CAAA,WAAA;AAChG,EAAA,MAAM,cACJ,GAAA,OAAO,OAAQ,CAAA,cAAA,KAAmB,WAC9B,OAAQ,CAAA,cAAA,GACR,OAAQ,CAAA,UAAA,CAAW,WAAW,GAAG,CAAA,GACjC,OAAQ,CAAA,UAAA,GACR,MAAM,OAAQ,CAAA,UAAA;AACpB,EAAM,MAAA,aAAA,GACJ,OAAO,OAAQ,CAAA,aAAA,KAAkB,WAC7B,OAAQ,CAAA,aAAA,GACR,kBAAkB,cAAe,CAAA,eAAA;AACvC,EAAI,IAAA;AACF,IAAO,OAAA;AAAA,MACL,IAAM,EAAA,SAAA;AAAA,MACN,WAAa,EAAA;AAAA,QACX,WAAA;AAAA,QACA,UAAA;AAAA,QACA,cAAA;AAAA,QACA,aAAA;AAAA,QACA,KAAO,EAAA;AAAA,UACL,KAAO,EAAA,KAAA,CAAM,KAAS,IAAA,cAAA,CAAe,KAAM,CAAA,KAAA;AAAA,UAC3C,MAAQ,EAAA,KAAA,CAAM,MAAU,IAAA,cAAA,CAAe,KAAM,CAAA,MAAA;AAAA,UAC7C,MAAQ,EAAA,KAAA,CAAM,MAAU,IAAA,cAAA,CAAe,KAAM,CAAA,MAAA;AAAA,UAC7C,MAAQ,EAAA,KAAA,CAAM,MAAU,IAAA,cAAA,CAAe,KAAM,CAAA;AAAA,SAC/C;AAAA,QACA,IAAA,EAAM,OAAQ,CAAA,IAAA,IAAQ,cAAe,CAAA,IAAA;AAAA,QACrC,KAAA,EAAO,OAAQ,CAAA,KAAA,IAAS,cAAe,CAAA,KAAA;AAAA,QACvC,IAAA,EAAM,OAAQ,CAAA,IAAA,IAAQ,cAAe,CAAA,IAAA;AAAA,QACrC,cAAA,EAAgB,OAAQ,CAAA,cAAA,IAAkB,cAAe,CAAA,WAAA;AAAA,QACzD,eAAA,EAAiB,OAAQ,CAAA,eAAA,IAAmB,cAAe,CAAA,YAAA;AAAA,QAC3D,UAAA,EAAY,OAAQ,CAAA,UAAA,IAAc,cAAe,CAAA,WAAA;AAAA,QACjD,aAAA,EAAe,OAAQ,CAAA,aAAA,IAAiB,cAAe,CAAA,cAAA;AAAA,QACvD,SAAA,EAAW,OAAQ,CAAA,SAAA,IAAa,cAAe,CAAA,iBAAA;AAAA,QAC/C,cAAA,EACE,OAAQ,CAAA,cAAA,IAAkB,cAAe,CAAA,gBAAA;AAAA,QAC3C,aAAA,EAAe,OAAQ,CAAA,aAAA,IAAiB,cAAe,CAAA,eAAA;AAAA,QACvD,UAAA,EAAY,OAAQ,CAAA,UAAA,IAAc,cAAe,CAAA,WAAA;AAAA,QACjD,WAAA,EAAa,OAAQ,CAAA,WAAA,IAAe,cAAe,CAAA,YAAA;AAAA,QACnD,WAAA,EAAa,OAAQ,CAAA,WAAA,IAAe,cAAe,CAAA,YAAA;AAAA,QACnD,oBAAA,EAAsB,OAAQ,CAAA,oBAAA,IAAwB,EAAC;AAAA,QACvD,YAAc,EAAA;AAAA,UACZ,WACE,EAAA,OAAA,CAAQ,YAAc,EAAA,WAAA,IACtB,eAAe,aAAc,CAAA,WAAA;AAAA,UAC/B,YACE,EAAA,OAAA,CAAQ,YAAc,EAAA,YAAA,IACtB,eAAe,aAAc,CAAA,YAAA;AAAA,UAC/B,gBACE,EAAA,OAAA,CAAQ,YAAc,EAAA,gBAAA,IACtB,eAAe,aAAc,CAAA,gBAAA;AAAA,UAC/B,eACE,EAAA,OAAA,CAAQ,YAAc,EAAA,eAAA,IACtB,eAAe,aAAc,CAAA;AAAA;AACjC;AACF,KACF;AAAA,WACO,KAAO,EAAA;AACd,IAAO,OAAA;AAAA,MACL,IAAM,EAAA,OAAA;AAAA,MACN,OACE,KAAiB,YAAA,KAAA,GAAQ,KAAQ,GAAA,IAAI,MAAM,2BAA2B;AAAA,KAC1E;AAAA;AAEJ;;;;"}

package/dist/plugin/config/resolveUserConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveUserConfig.d.ts","sourceRoot":"","sources":["../../../plugin/config/resolveUserConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,KAAK,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAIlG,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,cAAc,GAAG,cAAc,GAAG,EAAE,CAAC;IAChD,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,mBAAmB,CAAC;IACjC,KAAK,CAAC,EAAE,qBAAqB,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAC/B;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,kBAAkB,CAAA;CAAE,GACnD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,CAAC;AAEpC,wBAAgB,iBAAiB,CAAC,EAChC,SAAS,EACT,MAAM,EACN,SAAS,EACT,WAAW,EACX,KAAK,EACN,EAAE,sBAAsB,GAAG,uBAAuB,CAyElD"}
+{"version":3,"file":"resolveUserConfig.d.ts","sourceRoot":"","sources":["../../../plugin/config/resolveUserConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,KAAK,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAIlG,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,cAAc,GAAG,cAAc,GAAG,EAAE,CAAC;IAChD,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,mBAAmB,CAAC;IACjC,KAAK,CAAC,EAAE,qBAAqB,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAC/B;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,kBAAkB,CAAA;CAAE,GACnD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,CAAC;AAEpC,wBAAgB,iBAAiB,CAAC,EAChC,SAAS,EACT,MAAM,EACN,SAAS,EACT,WAAW,EACX,KAAK,EACN,EAAE,sBAAsB,GAAG,uBAAuB,CAwElD"}

package/dist/plugin/config/resolveUserConfig.js

@@ -57,7 +57,6 @@ function resolveUserConfig({
             chunkFileNames: "[name].[ext]",
             format: "esm",
             exports: "named",
-            preserveModulesRoot: userOptions.moduleBase,
             hoistTransitiveImports: false,
             generatedCode: {
               constBindings: true,

package/dist/plugin/config/resolveUserConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveUserConfig.js","sources":["../../../plugin/config/resolveUserConfig.ts"],"sourcesContent":["import type { ConfigEnv, UserConfig } from \"vite\";\nimport type { CheckFilesExistReturn, ResolvedUserConfig, ResolvedUserOptions } from \"../types.js\";\nimport { DEFAULT_CONFIG } from \"./defaults.js\";\nimport { createInputNormalizer } from \"../helpers/inputNormalizer.js\";\n\nexport type ResolveUserConfigProps = {\n  condition: \"react-client\" | \"react-server\" | \"\";\n  config: UserConfig;\n  configEnv: ConfigEnv;\n  userOptions: ResolvedUserOptions;\n  files?: CheckFilesExistReturn;\n};\n\nexport type ResolveUserConfigReturn = \n  | { type: \"success\"; userConfig: ResolvedUserConfig }\n  | { type: \"error\"; error: Error };\n\nexport function resolveUserConfig({\n  condition,\n  config,\n  configEnv,\n  userOptions,\n  files\n}: ResolveUserConfigProps): ResolveUserConfigReturn {\n\n\n  try {\n    // Get existing inputs\n    const root = config.root ?? userOptions.projectRoot ?? process.cwd();\n    const existingInput = config.build?.rollupOptions?.input || {};\n    const currentInputs = typeof existingInput === 'string' ? { default: existingInput } : existingInput;\n    const normalizer = createInputNormalizer(root);\n\n    const serverEntry = userOptions.serverEntry ? [userOptions.serverEntry, userOptions.serverEntry] : [];\n    // Add inputs based on condition\n    const inputs = {\n      ...currentInputs,\n      ...(condition === 'react-server' && files ? {\n        'index.html': '/index.html',\n        ...Object.fromEntries([\n          ...serverEntry,\n          ...Array.from(files.pageMap.entries()),\n          ...Array.from(files.propsMap.entries())\n        ].map(normalizer))\n      } : {\n        client: userOptions.clientEntry\n      })\n    };\n\n    const userConfig = {\n      ...config,\n      root: root,\n      mode: configEnv.command === 'build' ? 'production' : 'development',\n      build: {\n        ...config.build,\n        outDir: condition === 'react-server' ? userOptions.build.server : userOptions.build.client,\n        assetsDir: condition === 'react-server' ? \"\" : DEFAULT_CONFIG.CLIENT_ASSETS_DIR,\n        ssr: condition === 'react-server',\n        target: condition === 'react-server' ? 'node18' : 'es2020',\n        minify: condition === 'react-server' ? false : true,\n        manifest: true,\n        ssrManifest: false,\n        ssrEmitAssets: true,\n        rollupOptions: {\n          ...config.build?.rollupOptions,\n          input: inputs,\n          preserveEntrySignatures: 'strict',\n          output: condition === 'react-server' ? {\n            preserveModules: true,\n            entryFileNames: '[name].js',\n            assetFileNames: '[name].[ext]',\n            chunkFileNames: '[name].[ext]',\n            format: 'esm',\n            exports: 'named',\n            preserveModulesRoot: userOptions.moduleBase,\n            hoistTransitiveImports: false,\n            generatedCode: {\n              constBindings: true,\n              objectShorthand: true\n            },\n            interop: 'auto'\n          } : undefined\n        }\n      }\n    };\n\n    return {\n      type: \"success\",\n      userConfig: userConfig as ResolvedUserConfig\n    };\n  } catch (error) {\n    return {\n      type: \"error\",\n      error: error instanceof Error ? error : new Error(\"Failed to resolve config\")\n    };\n  }\n} "],"names":[],"mappings":"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"}
+{"version":3,"file":"resolveUserConfig.js","sources":["../../../plugin/config/resolveUserConfig.ts"],"sourcesContent":["import type { ConfigEnv, UserConfig } from \"vite\";\nimport type { CheckFilesExistReturn, ResolvedUserConfig, ResolvedUserOptions } from \"../types.js\";\nimport { DEFAULT_CONFIG } from \"./defaults.js\";\nimport { createInputNormalizer } from \"../helpers/inputNormalizer.js\";\n\nexport type ResolveUserConfigProps = {\n  condition: \"react-client\" | \"react-server\" | \"\";\n  config: UserConfig;\n  configEnv: ConfigEnv;\n  userOptions: ResolvedUserOptions;\n  files?: CheckFilesExistReturn;\n};\n\nexport type ResolveUserConfigReturn = \n  | { type: \"success\"; userConfig: ResolvedUserConfig }\n  | { type: \"error\"; error: Error };\n\nexport function resolveUserConfig({\n  condition,\n  config,\n  configEnv,\n  userOptions,\n  files\n}: ResolveUserConfigProps): ResolveUserConfigReturn {\n\n\n  try {\n    // Get existing inputs\n    const root = config.root ?? userOptions.projectRoot ?? process.cwd();\n    const existingInput = config.build?.rollupOptions?.input || {};\n    const currentInputs = typeof existingInput === 'string' ? { default: existingInput } : existingInput;\n    const normalizer = createInputNormalizer(root);\n\n    const serverEntry = userOptions.serverEntry ? [userOptions.serverEntry, userOptions.serverEntry] : [];\n    // Add inputs based on condition\n    const inputs = {\n      ...currentInputs,\n      ...(condition === 'react-server' && files ? {\n        'index.html': '/index.html',\n        ...Object.fromEntries([\n          ...serverEntry,\n          ...Array.from(files.pageMap.entries()),\n          ...Array.from(files.propsMap.entries())\n        ].map(normalizer))\n      } : {\n        client: userOptions.clientEntry\n      })\n    };\n\n    const userConfig = {\n      ...config,\n      root: root,\n      mode: configEnv.command === 'build' ? 'production' : 'development',\n      build: {\n        ...config.build,\n        outDir: condition === 'react-server' ? userOptions.build.server : userOptions.build.client,\n        assetsDir: condition === 'react-server' ? \"\" : DEFAULT_CONFIG.CLIENT_ASSETS_DIR,\n        ssr: condition === 'react-server',\n        target: condition === 'react-server' ? 'node18' : 'es2020',\n        minify: condition === 'react-server' ? false : true,\n        manifest: true,\n        ssrManifest: false,\n        ssrEmitAssets: true,\n        rollupOptions: {\n          ...config.build?.rollupOptions,\n          input: inputs,\n          preserveEntrySignatures: 'strict',\n          output: condition === 'react-server' ? {\n            preserveModules: true,\n            entryFileNames: '[name].js',\n            assetFileNames: '[name].[ext]',\n            chunkFileNames: '[name].[ext]',\n            format: 'esm',\n            exports: 'named',\n            hoistTransitiveImports: false,\n            generatedCode: {\n              constBindings: true,\n              objectShorthand: true\n            },\n            interop: 'auto'\n          } : undefined\n        }\n      }\n    };\n\n    return {\n      type: \"success\",\n      userConfig: userConfig as ResolvedUserConfig\n    };\n  } catch (error) {\n    return {\n      type: \"error\",\n      error: error instanceof Error ? error : new Error(\"Failed to resolve config\")\n    };\n  }\n} "],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"inputNormalizer.d.ts","sourceRoot":"","sources":["../../../plugin/helpers/inputNormalizer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,aAAa,CAAC;AAKpE,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAiCnE"}
+{"version":3,"file":"inputNormalizer.d.ts","sourceRoot":"","sources":["../../../plugin/helpers/inputNormalizer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,aAAa,CAAC;AAEpE,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CA+BnE"}

package/dist/plugin/helpers/inputNormalizer.js

@@ -3,9 +3,9 @@
  * Copyright (c) Nico Brinkkemper
  * MIT License
  */
-import { DEFAULT_CONFIG } from '../config/defaults.js';
-import { normalizePath } from 'vite';
 import { join } from 'path';
+import { normalizePath } from 'vite';
+import { DEFAULT_CONFIG } from '../config/defaults.js';
 
 function createInputNormalizer(root) {
   const normalizeKey = (key) => {
@@ -18,13 +18,11 @@ function createInputNormalizer(root) {
         normalizeKey(key),
         normalizePath(join(root, path))
       ];
-      console.log("[inputNormalizer] Normalized input:", normalized, input);
       return normalized;
     }
     if (typeof input === "string") {
       const key = normalizeKey(input);
       const path = normalizePath(join(root, input));
-      console.log("[inputNormalizer] Normalized input:", [key, path], input);
       return [key, path];
     }
     throw new Error(`Invalid input type: ${typeof input}`);

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

@@ -1 +1 @@
-{"version":3,"file":"inputNormalizer.js","sources":["../../../plugin/helpers/inputNormalizer.ts"],"sourcesContent":["import type { InputNormalizer, NormalizerInput } from \"../types.js\";\nimport { DEFAULT_CONFIG } from \"../config/defaults.js\";\nimport { normalizePath } from \"vite\";\nimport { join } from \"path\";\n\nexport function createInputNormalizer(root: string): InputNormalizer {\n\n  // Normalize a key by removing file extensions and leading slashes\n  const normalizeKey = (key: string): string => {\n    return key\n      .replace(DEFAULT_CONFIG.FILE_REGEX, \"\") // Remove TypeScript/JavaScript extensions\n      .replace(/^\\/+/, \"\"); // Remove leading slashes\n  };\n\n  // Main normalize function\n  return (input: NormalizerInput): [string, string] => {\n    \n    // Handle tuple input [key, path]\n    if (Array.isArray(input)) {\n      const [key, path] = input;\n      const normalized: [string, string] = [\n        normalizeKey(key),\n        normalizePath(join(root, path))\n      ] \n      console.log(\"[inputNormalizer] Normalized input:\", normalized, input);\n      return normalized;\n    }\n\n    // Handle string input\n    if (typeof input === \"string\") {\n      const key = normalizeKey(input);\n      const path = normalizePath( join(root, input));\n      console.log(\"[inputNormalizer] Normalized input:\", [key, path], input);\n      return [key, path];\n    }\n\n    throw new Error(`Invalid input type: ${typeof input}`);\n  };\n}\n"],"names":[],"mappings":";;;;;;;;;AAKO,SAAS,sBAAsB,IAA+B,EAAA;AAGnE,EAAM,MAAA,YAAA,GAAe,CAAC,GAAwB,KAAA;AAC5C,IAAO,OAAA,GAAA,CACJ,QAAQ,cAAe,CAAA,UAAA,EAAY,EAAE,CACrC,CAAA,OAAA,CAAQ,QAAQ,EAAE,CAAA;AAAA,GACvB;AAGA,EAAA,OAAO,CAAC,KAA6C,KAAA;AAGnD,IAAI,IAAA,KAAA,CAAM,OAAQ,CAAA,KAAK,CAAG,EAAA;AACxB,MAAM,MAAA,CAAC,GAAK,EAAA,IAAI,CAAI,GAAA,KAAA;AACpB,MAAA,MAAM,UAA+B,GAAA;AAAA,QACnC,aAAa,GAAG,CAAA;AAAA,QAChB,aAAc,CAAA,IAAA,CAAK,IAAM,EAAA,IAAI,CAAC;AAAA,OAChC;AACA,MAAQ,OAAA,CAAA,GAAA,CAAI,qCAAuC,EAAA,UAAA,EAAY,KAAK,CAAA;AACpE,MAAO,OAAA,UAAA;AAAA;AAIT,IAAI,IAAA,OAAO,UAAU,QAAU,EAAA;AAC7B,MAAM,MAAA,GAAA,GAAM,aAAa,KAAK,CAAA;AAC9B,MAAA,MAAM,IAAO,GAAA,aAAA,CAAe,IAAK,CAAA,IAAA,EAAM,KAAK,CAAC,CAAA;AAC7C,MAAA,OAAA,CAAQ,IAAI,qCAAuC,EAAA,CAAC,GAAK,EAAA,IAAI,GAAG,KAAK,CAAA;AACrE,MAAO,OAAA,CAAC,KAAK,IAAI,CAAA;AAAA;AAGnB,IAAA,MAAM,IAAI,KAAA,CAAM,CAAuB,oBAAA,EAAA,OAAO,KAAK,CAAE,CAAA,CAAA;AAAA,GACvD;AACF;;;;"}
+{"version":3,"file":"inputNormalizer.js","sources":["../../../plugin/helpers/inputNormalizer.ts"],"sourcesContent":["import { join } from \"path\";\nimport { normalizePath } from \"vite\";\nimport { DEFAULT_CONFIG } from \"../config/defaults.js\";\nimport type { InputNormalizer, NormalizerInput } from \"../types.js\";\n\nexport function createInputNormalizer(root: string): InputNormalizer {\n\n  // Normalize a key by removing file extensions and leading slashes\n  const normalizeKey = (key: string): string => {\n    return key\n      .replace(DEFAULT_CONFIG.FILE_REGEX, \"\") // Remove TypeScript/JavaScript extensions\n      .replace(/^\\/+/, \"\"); // Remove leading slashes\n  };\n\n  // Main normalize function\n  return (input: NormalizerInput): [string, string] => {\n    \n    // Handle tuple input [key, path]\n    if (Array.isArray(input)) {\n      const [key, path] = input;\n      const normalized: [string, string] = [\n        normalizeKey(key),\n        normalizePath(join(root, path))\n      ] \n      return normalized;\n    }\n\n    // Handle string input\n    if (typeof input === \"string\") {\n      const key = normalizeKey(input);\n      const path = normalizePath(join(root, input));  \n      return [key, path];\n    }\n\n    throw new Error(`Invalid input type: ${typeof input}`);\n  };\n}\n"],"names":[],"mappings":";;;;;;;;;AAKO,SAAS,sBAAsB,IAA+B,EAAA;AAGnE,EAAM,MAAA,YAAA,GAAe,CAAC,GAAwB,KAAA;AAC5C,IAAO,OAAA,GAAA,CACJ,QAAQ,cAAe,CAAA,UAAA,EAAY,EAAE,CACrC,CAAA,OAAA,CAAQ,QAAQ,EAAE,CAAA;AAAA,GACvB;AAGA,EAAA,OAAO,CAAC,KAA6C,KAAA;AAGnD,IAAI,IAAA,KAAA,CAAM,OAAQ,CAAA,KAAK,CAAG,EAAA;AACxB,MAAM,MAAA,CAAC,GAAK,EAAA,IAAI,CAAI,GAAA,KAAA;AACpB,MAAA,MAAM,UAA+B,GAAA;AAAA,QACnC,aAAa,GAAG,CAAA;AAAA,QAChB,aAAc,CAAA,IAAA,CAAK,IAAM,EAAA,IAAI,CAAC;AAAA,OAChC;AACA,MAAO,OAAA,UAAA;AAAA;AAIT,IAAI,IAAA,OAAO,UAAU,QAAU,EAAA;AAC7B,MAAM,MAAA,GAAA,GAAM,aAAa,KAAK,CAAA;AAC9B,MAAA,MAAM,IAAO,GAAA,aAAA,CAAc,IAAK,CAAA,IAAA,EAAM,KAAK,CAAC,CAAA;AAC5C,MAAO,OAAA,CAAC,KAAK,IAAI,CAAA;AAAA;AAGnB,IAAA,MAAM,IAAI,KAAA,CAAM,CAAuB,oBAAA,EAAA,OAAO,KAAK,CAAE,CAAA,CAAA;AAAA,GACvD;AACF;;;;"}

package/dist/plugin/loader/createBuildLoader.d.ts

@@ -5,5 +5,5 @@ export interface BuildLoaderOptions {
     pluginContext: PluginContext;
     userConfig: ResolvedUserConfig;
 }
-export declare function createBuildLoader({ root, pluginContext, userConfig, }: BuildLoaderOptions): (id: string) => Promise<any>;
+export declare function createBuildLoader({ root, userConfig, }: BuildLoaderOptions): (id: string) => Promise<any>;
 //# sourceMappingURL=createBuildLoader.d.ts.map

package/dist/plugin/loader/createBuildLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createBuildLoader.d.ts","sourceRoot":"","sources":["../../../plugin/loader/createBuildLoader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAM1D,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,aAAa,CAAC;IAC7B,UAAU,EAAE,kBAAkB,CAAC;CAChC;AAED,wBAAgB,iBAAiB,CAAC,EAChC,IAAI,EACJ,aAAa,EACb,UAAU,GACX,EAAE,kBAAkB,QAED,MAAM,kBAuBzB"}
+{"version":3,"file":"createBuildLoader.d.ts","sourceRoot":"","sources":["../../../plugin/loader/createBuildLoader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAG1D,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,aAAa,CAAC;IAC7B,UAAU,EAAE,kBAAkB,CAAC;CAChC;AAED,wBAAgB,iBAAiB,CAAC,EAChC,IAAI,EACJ,UAAU,GACX,EAAE,kBAAkB,QACD,MAAM,kBAOzB"}

package/dist/plugin/loader/createBuildLoader.js

@@ -5,32 +5,17 @@
  */
 import { join } from 'path';
 import { DEFAULT_CONFIG } from '../config/defaults.js';
-import 'node:fs/promises';
-import 'node:path';
 
 function createBuildLoader({
   root,
-  pluginContext,
   userConfig
 }) {
   return async (id) => {
-    console.log("[createBuildLoader] Loading module:", id);
-    const moduleId = join(root, id);
-    const info = pluginContext.getModuleInfo(id);
-    if (info) {
-      return await import(id);
-    }
-    const result = await pluginContext.load({ id: moduleId });
-    if (!result) {
-      throw new Error(`Failed to load module: ${id}`);
-    }
-    let destination = id.replace(DEFAULT_CONFIG.FILE_REGEX, "") + ".js";
-    let fullDestination = join(root, userConfig.build.outDir, destination);
-    try {
-      return import(fullDestination);
-    } catch (error) {
-      import(id);
-    }
+    return import(join(
+      root,
+      userConfig.build.outDir,
+      id.replace(DEFAULT_CONFIG.FILE_REGEX, "") + ".js"
+    ));
   };
 }
 

package/dist/plugin/loader/createBuildLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"createBuildLoader.js","sources":["../../../plugin/loader/createBuildLoader.ts"],"sourcesContent":["import { join, relative } from \"path\";\nimport type { PluginContext } from \"rollup\";\nimport type { ResolvedUserConfig } from \"../../server.js\";\nimport { createInputNormalizer } from \"../helpers/inputNormalizer.js\";\nimport { DEFAULT_CONFIG } from \"../config/defaults.js\";\nimport { mkdir, stat, writeFile } from \"node:fs/promises\";\nimport { dirname } from \"node:path\";\n\nexport interface BuildLoaderOptions {\n  root: string;\n  pluginContext: PluginContext;\n  userConfig: ResolvedUserConfig;\n}\n\nexport function createBuildLoader({\n  root,\n  pluginContext,\n  userConfig,\n}: BuildLoaderOptions) {\n  const normalizer = createInputNormalizer(root);\n  return async (id: string) => {\n    console.log(\"[createBuildLoader] Loading module:\", id);\n    const moduleId = join(root, id);\n    const info = pluginContext.getModuleInfo(id)!;\n    if(info){\n      return await import(id);\n    }\n    // Load the module source\n    const result = await pluginContext.load({ id: moduleId });\n    if (!result) {\n      throw new Error(`Failed to load module: ${id}`);\n    }\n    let destination = id.replace(DEFAULT_CONFIG.FILE_REGEX, \"\") + \".js\";\n    let fullDestination = join(root, userConfig.build.outDir, destination);\n\n\n    // Import and evaluate the module\n    try {\n      return import(fullDestination);\n    } catch (error) {\n      import(id);\n    }\n  };\n}\n"],"names":[],"mappings":";;;;;;;;;;AAcO,SAAS,iBAAkB,CAAA;AAAA,EAChC,IAAA;AAAA,EACA,aAAA;AAAA,EACA;AACF,CAAuB,EAAA;AAErB,EAAA,OAAO,OAAO,EAAe,KAAA;AAC3B,IAAQ,OAAA,CAAA,GAAA,CAAI,uCAAuC,EAAE,CAAA;AACrD,IAAM,MAAA,QAAA,GAAW,IAAK,CAAA,IAAA,EAAM,EAAE,CAAA;AAC9B,IAAM,MAAA,IAAA,GAAO,aAAc,CAAA,aAAA,CAAc,EAAE,CAAA;AAC3C,IAAA,IAAG,IAAK,EAAA;AACN,MAAA,OAAO,MAAM,OAAO,EAAA,CAAA;AAAA;AAGtB,IAAA,MAAM,SAAS,MAAM,aAAA,CAAc,KAAK,EAAE,EAAA,EAAI,UAAU,CAAA;AACxD,IAAA,IAAI,CAAC,MAAQ,EAAA;AACX,MAAA,MAAM,IAAI,KAAA,CAAM,CAA0B,uBAAA,EAAA,EAAE,CAAE,CAAA,CAAA;AAAA;AAEhD,IAAA,IAAI,cAAc,EAAG,CAAA,OAAA,CAAQ,cAAe,CAAA,UAAA,EAAY,EAAE,CAAI,GAAA,KAAA;AAC9D,IAAA,IAAI,kBAAkB,IAAK,CAAA,IAAA,EAAM,UAAW,CAAA,KAAA,CAAM,QAAQ,WAAW,CAAA;AAIrE,IAAI,IAAA;AACF,MAAA,OAAO,OAAO,eAAA,CAAA;AAAA,aACP,KAAO,EAAA;AACd,MAAO,OAAA,EAAA,CAAA;AAAA;AACT,GACF;AACF;;;;"}
+{"version":3,"file":"createBuildLoader.js","sources":["../../../plugin/loader/createBuildLoader.ts"],"sourcesContent":["import { join } from \"path\";\nimport type { PluginContext } from \"rollup\";\nimport type { ResolvedUserConfig } from \"../../server.js\";\nimport { DEFAULT_CONFIG } from \"../config/defaults.js\";\n\nexport interface BuildLoaderOptions {\n  root: string;\n  pluginContext: PluginContext;\n  userConfig: ResolvedUserConfig;\n}\n\nexport function createBuildLoader({\n  root,\n  userConfig,\n}: BuildLoaderOptions) {\n  return async (id: string) => {\n    return import(join(\n      root,\n      userConfig.build.outDir,\n      id.replace(DEFAULT_CONFIG.FILE_REGEX, \"\") + \".js\"\n    ));\n  };\n}\n"],"names":[],"mappings":";;;;;;;;AAWO,SAAS,iBAAkB,CAAA;AAAA,EAChC,IAAA;AAAA,EACA;AACF,CAAuB,EAAA;AACrB,EAAA,OAAO,OAAO,EAAe,KAAA;AAC3B,IAAA,OAAO,OAAO,IAAA;AAAA,MACZ,IAAA;AAAA,MACA,WAAW,KAAM,CAAA,MAAA;AAAA,MACjB,EAAG,CAAA,OAAA,CAAQ,cAAe,CAAA,UAAA,EAAY,EAAE,CAAI,GAAA;AAAA,KAC9C,CAAA;AAAA,GACF;AACF;;;;"}

package/dist/plugin/react-server/createHandler.d.ts

@@ -1,5 +1,5 @@
-import type { CreateHandlerOptions, StreamPluginOptions } from "../types.js";
 import type { PipeableStream } from "react-dom/server";
+import type { CreateHandlerOptions, StreamPluginOptions } from "../types.js";
 type CreateHandlerResult = {
     type: "success";
     controller: AbortController;

package/dist/plugin/react-server/createHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createHandler.d.ts","sourceRoot":"","sources":["../../../plugin/react-server/createHandler.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAE7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,KAAK,mBAAmB,GACpB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,eAAe,CAAC;IAAC,MAAM,EAAE,cAAc,CAAC;IAAC,MAAM,EAAE,GAAG,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GACzG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,GAC/B;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAOrB,wBAAsB,aAAa,CAAC,CAAC,EACnC,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,IAAI,CACjB,mBAAmB,EACnB,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,gBAAgB,GAAG,iBAAiB,CAC3E,GACC,QAAQ,CACN,IAAI,CAAC,mBAAmB,EAAE,YAAY,GAAG,gBAAgB,GAAG,aAAa,CAAC,CAC3E,EACH,aAAa,EAAE,oBAAoB,CAAC,CAAC,CAAC,GACrC,OAAO,CAAC,mBAAmB,CAAC,CAoI9B"}
+{"version":3,"file":"createHandler.d.ts","sourceRoot":"","sources":["../../../plugin/react-server/createHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AASvD,OAAO,KAAK,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAG7E,KAAK,mBAAmB,GACpB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,eAAe,CAAC;IAAC,MAAM,EAAE,cAAc,CAAC;IAAC,MAAM,EAAE,GAAG,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GACzG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,GAC/B;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAOrB,wBAAsB,aAAa,CAAC,CAAC,EACnC,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,IAAI,CACjB,mBAAmB,EACnB,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,gBAAgB,GAAG,iBAAiB,CAC3E,GACC,QAAQ,CACN,IAAI,CAAC,mBAAmB,EAAE,YAAY,GAAG,gBAAgB,GAAG,aAAa,CAAC,CAC3E,EACH,aAAa,EAAE,oBAAoB,CAAC,CAAC,CAAC,GACrC,OAAO,CAAC,mBAAmB,CAAC,CAmI9B"}

package/dist/plugin/react-server/createHandler.js

@@ -29,11 +29,10 @@ async function createHandler(url, pluginOptions, streamOptions) {
     streamOptions.onCssFile
   ) : (id) => collectModuleGraphCss(streamOptions.moduleGraph, id);
   const loadWithCss = async (id) => {
-    console.log("[RSC] Loading module:", id);
     try {
       const mod = await streamOptions.loader(id);
       const pageCss = await Promise.resolve(getCss(id));
-      Array.from(pageCss.keys()).forEach((css) => cssModules.add(css));
+      Array.from(pageCss.keys()).forEach((css) => cssModules.add(css.replace(pluginOptions.moduleBasePath, "")));
       return mod;
     } catch (e) {
       if (e.message?.includes("module runner has been closed")) {

package/dist/plugin/react-server/createHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"createHandler.js","sources":["../../../plugin/react-server/createHandler.ts"],"sourcesContent":["import { createLogger } from \"vite\";\nimport {\n  collectManifestCss,\n  collectModuleGraphCss,\n} from \"../collect-css-manifest.js\";\nimport { DEFAULT_CONFIG } from \"../config/defaults.js\";\nimport { resolvePage } from \"../resolvePage.js\";\nimport { resolveProps } from \"../resolveProps.js\";\nimport type { CreateHandlerOptions, StreamPluginOptions } from \"../types.js\";\nimport { createRscStream } from \"./createRscStream.js\";\nimport type { PipeableStream } from \"react-dom/server\";\n\ntype CreateHandlerResult = \n  | { type: \"success\"; controller: AbortController; stream: PipeableStream; assets: any; clientPath: string }\n  | { type: \"error\"; error: Error }\n  | { type: \"skip\" };\n\ninterface HandlerAssets {\n  css: Set<string>;\n  clientPath: string;\n}\n\nexport async function createHandler<T>(\n  url: string,\n  pluginOptions: Pick<\n    StreamPluginOptions,\n    \"Page\" | \"props\" | \"build\" | \"Html\" | \"pageExportName\" | \"propsExportName\"\n  > &\n    Required<\n      Pick<StreamPluginOptions, \"moduleBase\" | \"moduleBasePath\" | \"projectRoot\">\n    >,\n  streamOptions: CreateHandlerOptions<T>\n): Promise<CreateHandlerResult> {\n  const root = pluginOptions.projectRoot ?? process.cwd();\n\n  const Html = pluginOptions.Html ?? DEFAULT_CONFIG.HTML;\n  const pageExportName =\n    pluginOptions.pageExportName ?? DEFAULT_CONFIG.PAGE_EXPORT;\n  const propsExportName =\n    pluginOptions.propsExportName ?? DEFAULT_CONFIG.PROPS_EXPORT;\n  const controller = new AbortController();\n\n  const cssFiles = streamOptions.cssFiles;\n  const propsPath =\n    typeof pluginOptions.props === \"function\"\n      ? pluginOptions.props(url)\n      : pluginOptions.props;\n  const pagePath =\n    typeof pluginOptions.Page === \"function\"\n      ? pluginOptions.Page(url)\n      : pluginOptions.Page;\n\n  const cssModules = new Set<string>();\n\n  if (!(streamOptions.manifest || streamOptions.moduleGraph))\n    throw new Error(\"Missing manifest or moduleGraph, pass it to options.\");\n\n  const getCss = streamOptions.manifest\n    ? (id: string) =>\n        collectManifestCss(\n          streamOptions.manifest!,\n          root,\n          id,\n          streamOptions.onCssFile\n        )\n    : (id: string) => collectModuleGraphCss(streamOptions.moduleGraph!, id);\n\n  const loadWithCss = async (id: string) => {\n    console.log('[RSC] Loading module:', id);\n    try {\n      const mod = await streamOptions.loader(id);\n      const pageCss = await Promise.resolve(getCss(id));\n      Array.from(pageCss.keys()).forEach((css) => cssModules.add(css));\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: await loadWithCss(propsPath ?? pagePath),\n    path: String(propsPath ?? pagePath),\n    exportName: propsExportName,\n    url,\n  });\n  if (PropsModule.type === \"error\")\n    return { type: PropsModule.type, error: PropsModule?.error };\n  if (PropsModule.type === \"skip\") return { type: PropsModule.type };\n  const props = PropsModule[propsExportName as keyof typeof PropsModule] as any;\n  if (props?.type === \"error\") return { type: props.type, error: props.error };\n  if (props?.type === \"skip\") return { type: props.type };\n\n  const PageModule = await resolvePage({\n    pageModule: await loadWithCss(pagePath),\n    path: pagePath,\n    exportName: pageExportName,\n    url,\n  });\n  if (PageModule.type === \"error\")\n    return { type: PageModule.type, error: PageModule.error };\n  if (PageModule.type === \"skip\") return { type: PageModule.type };\n  const Page = PageModule[pageExportName as keyof typeof PageModule] as any;\n  if (Page?.type === \"error\") return { type: Page.type, error: Page.error };\n  if (Page?.type === \"skip\") return { type: Page.type };\n  if (!(typeof Page === \"function\")) {\n    return {\n      type: \"error\",\n      error: new Error(\"Invalid Page component: \" + pagePath, {\n        cause: Page,\n      }),\n    };\n  }\n  if (!(typeof props === \"object\")) {\n    return {\n      type: \"error\",\n      error: new Error(\"Invalid props: \" + propsPath, {\n        cause: props,\n      }),\n    } \n  }\n\n  // Add any additional CSS files\n  if (streamOptions.cssFiles) {\n    streamOptions.cssFiles.forEach((css) => cssModules.add(css));\n  }\n\n  const stream = createRscStream({\n    Html: Html,\n    Page: Page,\n    props: props,\n    moduleBasePath: pluginOptions.moduleBasePath,\n    logger: streamOptions.logger ?? createLogger(),\n    cssFiles: Array.from(cssModules),\n    route: url,\n    url,\n    pipableStreamOptions: streamOptions.pipableStreamOptions,\n    htmlProps: {\n      pageProps: props,\n      route: url,\n      url: url,\n    },\n  });\n\n  if (!stream) {\n    console.log(\"[createHandler] No stream created for route:\", url);\n    return { type: \"skip\" as const };\n  }\n\n  const assets: HandlerAssets = {\n    css: new Set(cssFiles ?? []),\n    clientPath: pagePath ?? ''\n  };\n\n  return {\n    type: \"success\",\n    controller,\n    stream,\n    assets,\n    clientPath: assets.clientPath,\n  };\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"createHandler.js","sources":["../../../plugin/react-server/createHandler.ts"],"sourcesContent":["import type { PipeableStream } from \"react-dom/server\";\nimport { createLogger } from \"vite\";\nimport {\n  collectManifestCss,\n  collectModuleGraphCss,\n} from \"../collect-css-manifest.js\";\nimport { DEFAULT_CONFIG } from \"../config/defaults.js\";\nimport { resolvePage } from \"../resolvePage.js\";\nimport { resolveProps } from \"../resolveProps.js\";\nimport type { CreateHandlerOptions, StreamPluginOptions } from \"../types.js\";\nimport { createRscStream } from \"./createRscStream.js\";\n\ntype CreateHandlerResult = \n  | { type: \"success\"; controller: AbortController; stream: PipeableStream; assets: any; clientPath: string }\n  | { type: \"error\"; error: Error }\n  | { type: \"skip\" };\n\ninterface HandlerAssets {\n  css: Set<string>;\n  clientPath: string;\n}\n\nexport async function createHandler<T>(\n  url: string,\n  pluginOptions: Pick<\n    StreamPluginOptions,\n    \"Page\" | \"props\" | \"build\" | \"Html\" | \"pageExportName\" | \"propsExportName\"\n  > &\n    Required<\n      Pick<StreamPluginOptions, \"moduleBase\" | \"moduleBasePath\" | \"projectRoot\">\n    >,\n  streamOptions: CreateHandlerOptions<T>\n): Promise<CreateHandlerResult> {\n  const root = pluginOptions.projectRoot ?? process.cwd();\n\n  const Html = pluginOptions.Html ?? DEFAULT_CONFIG.HTML;\n  const pageExportName =\n    pluginOptions.pageExportName ?? DEFAULT_CONFIG.PAGE_EXPORT;\n  const propsExportName =\n    pluginOptions.propsExportName ?? DEFAULT_CONFIG.PROPS_EXPORT;\n  const controller = new AbortController();\n\n  const cssFiles = streamOptions.cssFiles;\n  const propsPath =\n    typeof pluginOptions.props === \"function\"\n      ? pluginOptions.props(url)\n      : pluginOptions.props;\n  const pagePath =\n    typeof pluginOptions.Page === \"function\"\n      ? pluginOptions.Page(url)\n      : pluginOptions.Page;\n\n  const cssModules = new Set<string>();\n\n  if (!(streamOptions.manifest || streamOptions.moduleGraph))\n    throw new Error(\"Missing manifest or moduleGraph, pass it to options.\");\n\n  const getCss = streamOptions.manifest\n    ? (id: string) =>\n        collectManifestCss(\n          streamOptions.manifest!,\n          root,\n          id,\n          streamOptions.onCssFile\n        )\n    : (id: string) => collectModuleGraphCss(streamOptions.moduleGraph!, id);\n\n  const loadWithCss = async (id: string) => {\n    try {\n      const mod = await streamOptions.loader(id);\n      const pageCss = await Promise.resolve(getCss(id));\n      Array.from(pageCss.keys()).forEach((css) => cssModules.add(css.replace(pluginOptions.moduleBasePath, \"\")));\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: await loadWithCss(propsPath ?? pagePath),\n    path: String(propsPath ?? pagePath),\n    exportName: propsExportName,\n    url,\n  });\n  if (PropsModule.type === \"error\")\n    return { type: PropsModule.type, error: PropsModule?.error };\n  if (PropsModule.type === \"skip\") return { type: PropsModule.type };\n  const props = PropsModule[propsExportName as keyof typeof PropsModule] as any;\n  if (props?.type === \"error\") return { type: props.type, error: props.error };\n  if (props?.type === \"skip\") return { type: props.type };\n\n  const PageModule = await resolvePage({\n    pageModule: await loadWithCss(pagePath),\n    path: pagePath,\n    exportName: pageExportName,\n    url,\n  });\n  if (PageModule.type === \"error\")\n    return { type: PageModule.type, error: PageModule.error };\n  if (PageModule.type === \"skip\") return { type: PageModule.type };\n  const Page = PageModule[pageExportName as keyof typeof PageModule] as any;\n  if (Page?.type === \"error\") return { type: Page.type, error: Page.error };\n  if (Page?.type === \"skip\") return { type: Page.type };\n  if (!(typeof Page === \"function\")) {\n    return {\n      type: \"error\",\n      error: new Error(\"Invalid Page component: \" + pagePath, {\n        cause: Page,\n      }),\n    };\n  }\n  if (!(typeof props === \"object\")) {\n    return {\n      type: \"error\",\n      error: new Error(\"Invalid props: \" + propsPath, {\n        cause: props,\n      }),\n    } \n  }\n\n  // Add any additional CSS files\n  if (streamOptions.cssFiles) {\n    streamOptions.cssFiles.forEach((css) => cssModules.add(css));\n  }\n\n  const stream = createRscStream({\n    Html: Html,\n    Page: Page,\n    props: props,\n    moduleBasePath: pluginOptions.moduleBasePath,\n    logger: streamOptions.logger ?? createLogger(),\n    cssFiles: Array.from(cssModules),\n    route: url,\n    url,\n    pipableStreamOptions: streamOptions.pipableStreamOptions,\n    htmlProps: {\n      pageProps: props,\n      route: url,\n      url: url,\n    },\n  });\n\n  if (!stream) {\n    console.log(\"[createHandler] No stream created for route:\", url);\n    return { type: \"skip\" as const };\n  }\n\n  const assets: HandlerAssets = {\n    css: new Set(cssFiles ?? []),\n    clientPath: pagePath ?? ''\n  };\n\n  return {\n    type: \"success\",\n    controller,\n    stream,\n    assets,\n    clientPath: assets.clientPath,\n  };\n}\n"],"names":[],"mappings":"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"}

package/dist/plugin/react-server/createRscStream.d.ts

@@ -1,4 +1,4 @@
-import type { RscStreamOptions } from "../types.js";
 import type { PipeableStream } from "react-dom/server";
+import type { RscStreamOptions } from "../types.js";
 export declare function createRscStream(streamOptions: RscStreamOptions): PipeableStream;
 //# sourceMappingURL=createRscStream.d.ts.map

package/dist/plugin/react-server/createRscStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createRscStream.d.ts","sourceRoot":"","sources":["../../../plugin/react-server/createRscStream.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,wBAAgB,eAAe,CAC7B,aAAa,EAAE,gBAAgB,GAC9B,cAAc,CAsChB"}
+{"version":3,"file":"createRscStream.d.ts","sourceRoot":"","sources":["../../../plugin/react-server/createRscStream.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,wBAAgB,eAAe,CAC7B,aAAa,EAAE,gBAAgB,GAC9B,cAAc,CAuChB"}

package/dist/plugin/react-server/createRscStream.js

@@ -21,7 +21,8 @@ function createRscStream(streamOptions) {
   const css = Array.isArray(cssFiles) ? cssFiles.map(
     (css2, index) => React.createElement(CssCollector, {
       key: `css-${index}`,
-      url: css2
+      url: css2.startsWith("/") ? css2 : `/${css2}`,
+      moduleBasePath
     })
   ) : [];
   return renderToPipeableStream(

package/dist/plugin/react-server/createRscStream.js.map

@@ -1 +1 @@
-{"version":3,"file":"createRscStream.js","sources":["../../../plugin/react-server/createRscStream.ts"],"sourcesContent":["import * as React from \"react\";\n// @ts-ignore\nimport { renderToPipeableStream } from \"react-server-dom-esm/server.node\";\nimport { CssCollector } from \"../components.js\";\nimport type { RscStreamOptions } from \"../types.js\";\nimport type { PipeableStream } from \"react-dom/server\";\n\nexport function createRscStream(\n  streamOptions: RscStreamOptions\n): PipeableStream {\n  const {\n    Html,\n    Page,\n    props,\n    logger,\n    cssFiles,\n    moduleBasePath,\n    pipableStreamOptions,\n    htmlProps,\n  } = streamOptions;\n\n  const css = Array.isArray(cssFiles)\n    ? cssFiles.map((css, index) =>\n        React.createElement(CssCollector, {\n          key: `css-${index}`,\n          url: css,\n        })\n      )\n    : [];\n  return renderToPipeableStream(\n    React.createElement(\n      Html,\n      {\n        key: \"html\",\n        ...htmlProps\n      },\n      React.createElement(Page, { key: \"page\", ...props }),\n      ...css\n    ),\n    moduleBasePath,\n    {\n      onError: logger?.error ?? console.error,\n      onPostpone: logger?.info ?? console.info,\n      environmentName: \"Server\",\n      ...pipableStreamOptions\n    }\n  );\n}\n"],"names":["css"],"mappings":";;;;;;;;;AAOO,SAAS,gBACd,aACgB,EAAA;AAChB,EAAM,MAAA;AAAA,IACJ,IAAA;AAAA,IACA,IAAA;AAAA,IACA,KAAA;AAAA,IACA,MAAA;AAAA,IACA,QAAA;AAAA,IACA,cAAA;AAAA,IACA,oBAAA;AAAA,IACA;AAAA,GACE,GAAA,aAAA;AAEJ,EAAA,MAAM,GAAM,GAAA,KAAA,CAAM,OAAQ,CAAA,QAAQ,IAC9B,QAAS,CAAA,GAAA;AAAA,IAAI,CAACA,IAAAA,EAAK,KACjB,KAAA,KAAA,CAAM,cAAc,YAAc,EAAA;AAAA,MAChC,GAAA,EAAK,OAAO,KAAK,CAAA,CAAA;AAAA,MACjB,GAAKA,EAAAA;AAAA,KACN;AAAA,MAEH,EAAC;AACL,EAAO,OAAA,sBAAA;AAAA,IACL,KAAM,CAAA,aAAA;AAAA,MACJ,IAAA;AAAA,MACA;AAAA,QACE,GAAK,EAAA,MAAA;AAAA,QACL,GAAG;AAAA,OACL;AAAA,MACA,KAAA,CAAM,cAAc,IAAM,EAAA,EAAE,KAAK,MAAQ,EAAA,GAAG,OAAO,CAAA;AAAA,MACnD,GAAG;AAAA,KACL;AAAA,IACA,cAAA;AAAA,IACA;AAAA,MACE,OAAA,EAAS,MAAQ,EAAA,KAAA,IAAS,OAAQ,CAAA,KAAA;AAAA,MAClC,UAAA,EAAY,MAAQ,EAAA,IAAA,IAAQ,OAAQ,CAAA,IAAA;AAAA,MACpC,eAAiB,EAAA,QAAA;AAAA,MACjB,GAAG;AAAA;AACL,GACF;AACF;;;;"}
+{"version":3,"file":"createRscStream.js","sources":["../../../plugin/react-server/createRscStream.ts"],"sourcesContent":["import * as React from \"react\";\nimport type { PipeableStream } from \"react-dom/server\";\n// @ts-ignore\nimport { renderToPipeableStream } from \"react-server-dom-esm/server.node\";\nimport { CssCollector } from \"../components.js\";\nimport type { RscStreamOptions } from \"../types.js\";\n\nexport function createRscStream(\n  streamOptions: RscStreamOptions\n): PipeableStream {\n  const {\n    Html,\n    Page,\n    props,\n    logger,\n    cssFiles,\n    moduleBasePath,\n    pipableStreamOptions,\n    htmlProps,\n  } = streamOptions;\n\n  const css = Array.isArray(cssFiles)\n    ? cssFiles.map((css, index) =>\n        React.createElement(CssCollector, {\n          key: `css-${index}`,\n          url: css.startsWith(\"/\") ? css : `/${css}`,\n          moduleBasePath,\n        })\n      )\n    : [];\n  return renderToPipeableStream(\n    React.createElement(\n      Html,\n      {\n        key: \"html\",\n        ...htmlProps\n      },\n      React.createElement(Page, { key: \"page\", ...props }),\n      ...css\n    ),\n    moduleBasePath,\n    {\n      onError: logger?.error ?? console.error,\n      onPostpone: logger?.info ?? console.info,\n      environmentName: \"Server\",\n      ...pipableStreamOptions\n    }\n  );\n}\n"],"names":["css"],"mappings":";;;;;;;;;AAOO,SAAS,gBACd,aACgB,EAAA;AAChB,EAAM,MAAA;AAAA,IACJ,IAAA;AAAA,IACA,IAAA;AAAA,IACA,KAAA;AAAA,IACA,MAAA;AAAA,IACA,QAAA;AAAA,IACA,cAAA;AAAA,IACA,oBAAA;AAAA,IACA;AAAA,GACE,GAAA,aAAA;AAEJ,EAAA,MAAM,GAAM,GAAA,KAAA,CAAM,OAAQ,CAAA,QAAQ,IAC9B,QAAS,CAAA,GAAA;AAAA,IAAI,CAACA,IAAAA,EAAK,KACjB,KAAA,KAAA,CAAM,cAAc,YAAc,EAAA;AAAA,MAChC,GAAA,EAAK,OAAO,KAAK,CAAA,CAAA;AAAA,MACjB,KAAKA,IAAI,CAAA,UAAA,CAAW,GAAG,CAAIA,GAAAA,IAAAA,GAAM,IAAIA,IAAG,CAAA,CAAA;AAAA,MACxC;AAAA,KACD;AAAA,MAEH,EAAC;AACL,EAAO,OAAA,sBAAA;AAAA,IACL,KAAM,CAAA,aAAA;AAAA,MACJ,IAAA;AAAA,MACA;AAAA,QACE,GAAK,EAAA,MAAA;AAAA,QACL,GAAG;AAAA,OACL;AAAA,MACA,KAAA,CAAM,cAAc,IAAM,EAAA,EAAE,KAAK,MAAQ,EAAA,GAAG,OAAO,CAAA;AAAA,MACnD,GAAG;AAAA,KACL;AAAA,IACA,cAAA;AAAA,IACA;AAAA,MACE,OAAA,EAAS,MAAQ,EAAA,KAAA,IAAS,OAAQ,CAAA,KAAA;AAAA,MAClC,UAAA,EAAY,MAAQ,EAAA,IAAA,IAAQ,OAAQ,CAAA,IAAA;AAAA,MACpC,eAAiB,EAAA,QAAA;AAAA,MACjB,GAAG;AAAA;AACL,GACF;AACF;;;;"}

package/dist/plugin/react-server/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../plugin/react-server/plugin.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAGV,qBAAqB,EAGtB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAKvD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,mBAAmB,GAC3B,OAAO,MAAM,EAAE,MAAM,CAAC;IAAE,IAAI,EAAE,qBAAqB,CAAC;IAAE,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;CAAE,CAAE,CA4a9F"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../plugin/react-server/plugin.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAGV,qBAAqB,EAGtB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAKvD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,mBAAmB,GAC3B,OAAO,MAAM,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,qBAAqB,CAAC;IAC5B,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC,CAAC,CAoZD"}

package/dist/plugin/react-server/plugin.js

@@ -3,7 +3,7 @@
  * Copyright (c) Nico Brinkkemper
  * MIT License
  */
-import { readdirSync } from 'fs';
+import 'fs';
 import { resolve, join } from 'node:path';
 import { performance } from 'node:perf_hooks';
 import 'node:worker_threads';
@@ -146,12 +146,7 @@ function reactServerPlugin(options) {
       });
     },
     async config(config, configEnv) {
-      if (typeof config.root === "string" && config.root !== root) {
-        console.log(
-          "[vite-plugin-react-server] Root dir changed",
-          config.root,
-          root
-        );
+      if (typeof config.root === "string" && config.root !== root && config.root !== process.cwd() && config.root !== "") {
         root = config.root;
       }
       const resolvedPages = await resolvePages(userOptions.build.pages);
@@ -191,21 +186,16 @@ function reactServerPlugin(options) {
         const serverManifest = resolvedServerManifest.type === "error" ? getModuleManifest.bind(this)() : resolvedServerManifest.manifest;
         let htmlWorkerPath = serverManifest["html-worker"]?.file;
         if (options.htmlWorkerPath) {
-          htmlWorkerPath = join(root, options.htmlWorkerPath);
+          htmlWorkerPath = options.htmlWorkerPath;
         } else {
           htmlWorkerPath = join(
             getPluginRoot(),
             DEFAULT_CONFIG.HTML_WORKER_PATH
           );
         }
-        const workerPath = resolve(
-          root,
-          userOptions.build.server,
-          htmlWorkerPath
-        );
         worker = await createWorker({
-          projectRoot: userOptions.projectRoot,
-          workerPath,
+          projectRoot: root,
+          workerPath: htmlWorkerPath,
           condition: "react-server",
           reverseCondition: true,
           mode: finalConfig.mode,
@@ -216,7 +206,6 @@ function reactServerPlugin(options) {
           throw resolvedPages.error;
         }
         const routes = resolvedPages.pages;
-        console.log("[plugin] Routes to render:", routes);
         const entries = Object.values(serverManifest).filter(
           (entry) => entry.isEntry
         );
@@ -228,11 +217,13 @@ function reactServerPlugin(options) {
         });
         const { failedRoutes, completedRoutes } = await renderPages(routes, {
           pipableStreamOptions: {
-            bootstrapModules: entries.map((entry) => "/" + entry.file)
+            bootstrapModules: entries.filter(
+              (entry) => userOptions.autoDiscover.clientComponents.test(entry.file)
+            ).filter((t) => typeof t === "object" && t != null && "file" in t).map((entry) => "/" + entry.file.replace(userOptions.moduleBasePath, ""))
           },
           moduleBasePath: userOptions.moduleBasePath,
           moduleBaseURL: userOptions.moduleBaseURL,
-          clientCss: css?.map((css2) => "/" + css2) ?? [],
+          clientCss: css?.filter((css2) => typeof css2 === "string").map((css2) => "/" + css2.replace(userOptions.moduleBasePath, "")) ?? [],
           userConfig,
           pluginOptions: userOptions,
           worker,
@@ -240,22 +231,16 @@ function reactServerPlugin(options) {
           loader,
           onCssFile: (path) => {
             if (buildCssFiles && path.endsWith(".css")) {
-              buildCssFiles.add(path);
+              buildCssFiles.add(path.replace(userOptions.moduleBasePath, ""));
             }
           }
         });
-        console.log("[vite-plugin-react-server] Render results:", {
-          failedRoutes,
-          completedRoutes
-        });
         if (failedRoutes.size) {
           console.error(
             "[vite-plugin-react-server] Failed to render routes:",
             failedRoutes
           );
         }
-        console.log("[vite-plugin-react-server] Render complete");
-        console.log("[vite-plugin-react-server] Terminating worker");
         if (worker) await worker.terminate();
         timing.renderEnd = performance.now();
         timing.total = (timing.renderEnd - timing.start) / 1e3;
@@ -351,15 +336,7 @@ function reactServerPlugin(options) {
         ...fallbackManifestEntries
       };
       if (chunk.fileName.includes("html-worker")) {
-        const workerPath = resolve(
-          root,
-          userOptions.build.server,
-          chunk.fileName
-        );
-        console.log("Files in output dir:", {
-          files: readdirSync(resolve(root, userOptions.build.server)),
-          workerPath
-        });
+        const workerPath = resolve(root, chunk.fileName);
         if (finalConfig.command === "build") {
           return null;
         }