vite-plugin-react-server 0.3.10 → 0.3.12

package/plugin/config/resolveOptions.ts

@@ -1,16 +1,288 @@
+import type { PreRenderedAsset } from "rollup";
+import type { PreRenderedChunk } from "rollup";
 import type { StreamPluginOptions, ResolvedUserOptions } from "../types.js";
 import { DEFAULT_CONFIG } from "./defaults.js";
+import { createModuleIdGenerator } from "./createModuleIdGenerator.js";
+import { normalizePath } from "vite";
+
+const resolveAutoDiscoverMatcher = (
+  options: undefined | string | RegExp | ((path: string) => boolean),
+  fallback: RegExp | ((path: string) => boolean)
+) => {
+  if (!options) {
+    if (typeof fallback === "function") {
+      return fallback;
+    } else {
+      return (path: string) => fallback.test(path);
+    }
+  }
+  if (typeof options === "string") {
+    const matcher = new RegExp(options);
+    return (path: string) => matcher.test(path);
+  } else if (typeof options === "function") {
+    return options;
+  } else {
+    return (path: string) => options.test(path);
+  }
+};
+
+const addJS = (path: string) => {
+  if (path.endsWith(".js")) return path;
+  if (path.endsWith("/.")) return path.slice(0, -2) + ".js";
+  if (path.endsWith(".")) return path + "js";
+  return path + ".js";
+};
+
+const handleSearchQuery = (path: string) => {
+  // make the query part of the name of the file so it's not ending up like index1, index2, etc.
+  const searchQuery = path.split("?")[1];
+  if (!searchQuery) return path;
+  // add the folder before the filename
+  const folder = path.split("/").slice(0, -1).join("/");
+  const filename = path.split("/").pop();
+  return `${folder}/${filename}?${searchQuery}`;
+};
+
+const applyPattern = (
+  path: string,
+  pattern?: string | RegExp | ((path: string) => boolean) | undefined,
+  fallback?: string | undefined
+) => {
+  // TODO: What to actually do here? I guess we could replace the extension, but it's not needed since we map them from the manifest anyway.
+  return path;
+};
 
 export const resolveOptions = (
-  options: StreamPluginOptions
+  options: StreamPluginOptions,
+  isClient: boolean = false
 ):
   | { type: "success"; userOptions: ResolvedUserOptions }
   | { type: "error"; error: Error } => {
   const projectRoot = options.projectRoot ?? process.cwd();
+  const {
+    pageExportName = DEFAULT_CONFIG.PAGE_EXPORT_NAME,
+    propsExportName = DEFAULT_CONFIG.PROPS_EXPORT_NAME,
+  } = options;
+  const pages =
+    typeof options.build?.pages === "function"
+      ? options.build.pages
+      : Array.isArray(options.build?.pages)
+      ? options.build.pages
+      : DEFAULT_CONFIG.BUILD.pages;
+  let client = options.build?.client ?? DEFAULT_CONFIG.BUILD.client;
+  let server = options.build?.server ?? DEFAULT_CONFIG.BUILD.server;
+
+  const api = options.build?.api ?? DEFAULT_CONFIG.BUILD.api;
+  const staticBuild = options.build?.static ?? DEFAULT_CONFIG.BUILD.static;
+  const outDir = options.build?.outDir ?? DEFAULT_CONFIG.BUILD.outDir;
+  const assetsDir =
+    options.build?.assetsDir ?? `${DEFAULT_CONFIG.CLIENT_ASSETS_DIR}`;
+
+  const ensureModuleBase = (n: string | null) => {
+    if (!n) return "";
+    return n.startsWith(moduleBase + "/") ? n.slice(moduleBase.length + 1) : n;
+  };
+  const hasWrongRoot = !projectRoot.startsWith("/");
+  if (hasWrongRoot) {
+    console.warn("projectRoot is not a full path", projectRoot);
+  }
+  const wrongRoot = !hasWrongRoot ? projectRoot.slice(1) : projectRoot;
+  const ensureNoRoot = (n: string | null) => {
+    if (!n) return "";
+    if (n.startsWith(wrongRoot)) {
+      return n.slice(wrongRoot.length + 1);
+    }
+    return n.startsWith(projectRoot + "/")
+      ? n.slice(projectRoot.length + 1)
+      : n;
+  };
+
+  const testModulePattern = resolveAutoDiscoverMatcher(
+    options.autoDiscover?.modulePattern,
+    DEFAULT_CONFIG.AUTO_DISCOVER.modulePattern
+  );
 
-  const build = options.build ?? DEFAULT_CONFIG.BUILD;
+  const testJson = resolveAutoDiscoverMatcher(
+    options.autoDiscover?.jsonPattern,
+    DEFAULT_CONFIG.AUTO_DISCOVER.jsonPattern
+  );
 
-  const moduleBase = typeof options.moduleBase === "string" ? options.moduleBase : DEFAULT_CONFIG.MODULE_BASE;
+  const testCss = resolveAutoDiscoverMatcher(
+    options.autoDiscover?.cssPattern,
+    DEFAULT_CONFIG.AUTO_DISCOVER.cssPattern
+  );
+  const testHtml = resolveAutoDiscoverMatcher(
+    options.autoDiscover?.htmlPattern,
+    DEFAULT_CONFIG.AUTO_DISCOVER.htmlPattern
+  );
+  const testClientComponents = resolveAutoDiscoverMatcher(
+    options.autoDiscover?.clientComponents,
+    DEFAULT_CONFIG.AUTO_DISCOVER.clientComponents
+  );
+  const testServerFunctions = resolveAutoDiscoverMatcher(
+    options.autoDiscover?.serverFunctions,
+    DEFAULT_CONFIG.AUTO_DISCOVER.serverFunctions
+  );
+  const testPropsPattern = resolveAutoDiscoverMatcher(
+    options.autoDiscover?.propsPattern,
+    DEFAULT_CONFIG.AUTO_DISCOVER.propsPattern
+  );
+  const testPagePattern = resolveAutoDiscoverMatcher(
+    options.autoDiscover?.pagePattern,
+    DEFAULT_CONFIG.AUTO_DISCOVER.pagePattern
+  );
+  const testCssModule = resolveAutoDiscoverMatcher(
+    options.autoDiscover?.cssModulePattern,
+    DEFAULT_CONFIG.AUTO_DISCOVER.cssModulePattern
+  );
+  const testVendor = resolveAutoDiscoverMatcher(
+    options.autoDiscover?.vendorPattern,
+    DEFAULT_CONFIG.AUTO_DISCOVER.vendorPattern
+  );
+  const preserveModulesRoot =
+    options.build?.preserveModulesRoot ??
+    DEFAULT_CONFIG.BUILD.preserveModulesRoot;
+  const hashOption =
+    typeof options.build?.hash === "string"
+      ? options.build.hash
+      : DEFAULT_CONFIG.BUILD.hash;
+  const hashString = hashOption === "" ? "" : `-[${hashOption}]`;
+  const hash = (n: string | null) => {
+    if (!n) return "";
+    if (hashString === "") return n;
+    const extensionIndex = n.lastIndexOf(".");
+    if (extensionIndex !== -1) {
+      // put hash between extension and filename
+      const extension = n.slice(extensionIndex);
+      const filename = n.slice(0, extensionIndex);
+      return filename + hashString + extension;
+    } else {
+      return n + hashString;
+    }
+  };
+
+  const getOutputPath = (n: string | null) => {
+    if (!n) return "";
+    let path = handleSearchQuery(n);
+    // Remove src/ prefix if present
+    path = path.startsWith(moduleBase + "/")
+      ? path.slice(moduleBase.length + 1)
+      : path;
+
+    if (testVendor(path)) {
+      return path;
+    }
+    
+    if (testCssModule(path)) {
+      // For CSS modules, keep the .css.js extension
+      return applyPattern(path, options.autoDiscover?.cssModulePattern, ".css.js");
+    }
+    
+    if (testCss(path)) {
+      // For regular CSS files, keep the .css extension
+      return applyPattern(path, options.autoDiscover?.cssPattern, ".css");
+    }
+
+    if (testClientComponents(path)) {
+      return applyPattern(path, options.autoDiscover?.clientComponents, "client");
+    }
+    if (testHtml(path)) {
+      return applyPattern(path, options.autoDiscover?.htmlPattern, ".html");
+    }
+    if (testJson(path)) {
+      return applyPattern(path, options.autoDiscover?.jsonPattern, ".json");
+    }
+    if (testPropsPattern(path)) {
+      return applyPattern(
+        path,
+        options.autoDiscover?.propsPattern,
+        options.propsExportName?.toLowerCase() ??
+          DEFAULT_CONFIG.PROPS_EXPORT_NAME.toLowerCase()
+      );
+    }
+    if (testPagePattern(path)) {
+      return applyPattern(
+        path,
+        options.autoDiscover?.pagePattern,
+        options.pageExportName?.toLowerCase() ??
+          DEFAULT_CONFIG.PAGE_EXPORT_NAME.toLowerCase()
+      );
+    }
+    if (testServerFunctions(path)) {
+      return applyPattern(path, options.autoDiscover?.serverFunctions, "server");
+    }
+    if (testModulePattern(path)) {
+      return path;
+    }
+    return path;
+  };
+
+  const entryFile = (n: PreRenderedChunk) => {
+    if (testVendor(n.name)) {
+      const search = n.facadeModuleId?.split("?")[1];
+      if(search) {
+        return `${n.name}.${search}.js`;
+      } else {
+        return n.name + ".js";
+      }
+    }
+    return addJS(getOutputPath(ensureModuleBase(ensureNoRoot(n.name))));
+  };
+
+  const chunkFile = (n: PreRenderedChunk) => {
+    // For chunks, we always want .js
+    return addJS(getOutputPath(ensureModuleBase(ensureNoRoot('_'+n.name))));
+  };
+
+  const assetFile = (n: PreRenderedAsset) => {
+    // For assets, keep the original extension
+    return getOutputPath(ensureModuleBase(ensureNoRoot(n.names[0])));
+  };
+
+  const build =
+    typeof options.build === "object" && options.build !== null
+      ? {
+          pages,
+          client,
+          server,
+          static: staticBuild,
+          outDir,
+          assetsDir,
+          api,
+          hash: hashOption,
+          preserveModulesRoot,
+          entryFile:
+            typeof options.build?.entryFile === "function"
+              ? options.build.entryFile
+              : entryFile,
+          chunkFile:
+            typeof options.build?.chunkFile === "function"
+              ? options.build.chunkFile
+              : chunkFile,
+          assetFile:
+            typeof options.build?.assetFile === "function"
+              ? options.build.assetFile
+              : assetFile,
+        }
+      : {
+          pages,
+          client,
+          server,
+          static: staticBuild,
+          outDir,
+          assetsDir,
+          api,
+          hash: hashOption,
+          preserveModulesRoot,
+          entryFile,
+          chunkFile,
+          assetFile,
+        };
+
+  const moduleBase =
+    typeof options.moduleBase === "string"
+      ? options.moduleBase
+      : DEFAULT_CONFIG.MODULE_BASE;
   const moduleBasePath =
     typeof options.moduleBasePath === "string"
       ? options.moduleBasePath
@@ -21,28 +293,50 @@ export const resolveOptions = (
     typeof options.moduleBaseURL === "string"
       ? options.moduleBaseURL
       : moduleBasePath ?? DEFAULT_CONFIG.MODULE_BASE_URL;
+
+  const autoDiscover = {
+    modulePattern: testModulePattern,
+    cssPattern: testCss,
+    jsonPattern: testJson,
+    clientComponents: testClientComponents,
+    serverFunctions: testServerFunctions,
+    propsPattern: testPropsPattern,
+    pagePattern: testPagePattern,
+    cssModulePattern: testCssModule,
+    vendorPattern: testVendor,
+  };
+
+  const moduleId =
+    typeof options.moduleId === "function"
+      ? options.moduleId
+      : createModuleIdGenerator({
+          isProduction: process.env["NODE_ENV"] === "production",
+          inputRoot: projectRoot,
+          client: client,
+          server: server,
+          moduleBase: moduleBase,
+          preserveModulesRoot: preserveModulesRoot,
+          removeExtension: DEFAULT_CONFIG.FILE_REGEX,
+          imports: {},
+        });
+
   try {
     return {
       type: "success",
       userOptions: {
         projectRoot,
+        moduleId: moduleId,
         moduleBase,
         moduleBasePath,
         moduleBaseURL,
-        build: {
-          pages: build.pages ?? DEFAULT_CONFIG.BUILD.pages,
-          client: build.client ?? DEFAULT_CONFIG.BUILD.client,
-          server: build.server ?? DEFAULT_CONFIG.BUILD.server,
-          static: build.static ?? DEFAULT_CONFIG.BUILD.static,
-        },
+        build: build,
         Page: options.Page ?? DEFAULT_CONFIG.PAGE,
         props: options.props ?? DEFAULT_CONFIG.PROPS,
         Html: options.Html ?? DEFAULT_CONFIG.HTML,
-        pageExportName: options.pageExportName ?? DEFAULT_CONFIG.PAGE_EXPORT,
-        propsExportName: options.propsExportName ?? DEFAULT_CONFIG.PROPS_EXPORT,
+        pageExportName: pageExportName,
+        propsExportName: propsExportName,
         collectCss: options.collectCss ?? DEFAULT_CONFIG.COLLECT_CSS,
         collectAssets: options.collectAssets ?? DEFAULT_CONFIG.COLLECT_ASSETS,
-        assetsDir: options.assetsDir ?? DEFAULT_CONFIG.CLIENT_ASSETS_DIR,
         htmlWorkerPath:
           options.htmlWorkerPath ?? DEFAULT_CONFIG.HTML_WORKER_PATH,
         rscWorkerPath: options.rscWorkerPath ?? DEFAULT_CONFIG.RSC_WORKER_PATH,
@@ -50,19 +344,11 @@ export const resolveOptions = (
         clientEntry: options.clientEntry ?? DEFAULT_CONFIG.CLIENT_ENTRY,
         serverEntry: options.serverEntry ?? DEFAULT_CONFIG.SERVER_ENTRY,
         moduleBaseExceptions: options.moduleBaseExceptions ?? [],
-        autoDiscover: {
-          pagePattern:
-            options.autoDiscover?.pagePattern ??
-            DEFAULT_CONFIG.AUTO_DISCOVER.pagePattern,
-          propsPattern:
-            options.autoDiscover?.propsPattern ??
-            DEFAULT_CONFIG.AUTO_DISCOVER.propsPattern,
-          clientComponents:
-            options.autoDiscover?.clientComponents ??
-            DEFAULT_CONFIG.AUTO_DISCOVER.clientComponents,
-          serverFunctions:
-            options.autoDiscover?.serverFunctions ??
-            DEFAULT_CONFIG.AUTO_DISCOVER.serverFunctions,
+        autoDiscover: autoDiscover,
+        pipableStreamOptions: options.pipableStreamOptions ?? {
+          bootstrapModules: [
+            options.clientEntry ?? DEFAULT_CONFIG.CLIENT_ENTRY,
+          ],
         },
       },
     };

package/plugin/config/resolvePages.ts

@@ -2,7 +2,7 @@ import type { ResolvedUserOptions } from '../types.js';
 
 export async function resolvePages(
   pages: ResolvedUserOptions["build"]["pages"]
-): Promise<{ type: "success"; pages: string[] } | { type: "error"; error: Error }> {
+): Promise<{ type: "success"; error?:never; pages: string[] } | { type: "error"; error: Error; pages?:never }> {
   if (!pages) {
     return { type: "success", pages: [] };
   }

package/plugin/config/resolveUserConfig.ts

@@ -1,96 +1,230 @@
 import type { ConfigEnv, UserConfig } from "vite";
-import type { CheckFilesExistReturn, ResolvedUserConfig, ResolvedUserOptions } from "../types.js";
-import { DEFAULT_CONFIG } from "./defaults.js";
+import type {
+  CheckFilesExistReturn,
+  ResolvedUserConfig,
+  ResolvedUserOptions,
+} from "../types.js";
 import { createInputNormalizer } from "../helpers/inputNormalizer.js";
-
+import { join } from "path";
+// @ts-ignore
+import { globSync } from "fs";
+import type { OutputOptions } from "rollup";
 export type ResolveUserConfigProps = {
-  condition: "react-client" | "react-server" | "";
+  isClient?: boolean;
   config: UserConfig;
   configEnv: ConfigEnv;
   userOptions: ResolvedUserOptions;
   files?: CheckFilesExistReturn;
 };
 
-export type ResolveUserConfigReturn = 
+export type ResolveUserConfigReturn =
   | { type: "success"; userConfig: ResolvedUserConfig }
   | { type: "error"; error: Error };
 
 export function resolveUserConfig({
-  condition,
+  isClient = false,
   config,
   configEnv,
   userOptions,
-  files
+  files,
 }: ResolveUserConfigProps): ResolveUserConfigReturn {
-
-
   try {
     // Get existing inputs
     const root = config.root ?? userOptions.projectRoot ?? process.cwd();
-    const existingInput = config.build?.rollupOptions?.input || {};
-    const currentInputs = typeof existingInput === 'string' ? { default: existingInput } : existingInput;
-    const normalizer = createInputNormalizer(root);
 
-    const serverEntry = userOptions.serverEntry ? [userOptions.serverEntry, userOptions.serverEntry] : [];
-    // Add inputs based on condition
-    const inputs = {
-      ...currentInputs,
-      ...(condition === 'react-server' && files ? {
-        'index.html': '/index.html',
-        ...Object.fromEntries([
-          ...serverEntry,
-          ...Array.from(files.pageMap.entries()),
-          ...Array.from(files.propsMap.entries())
-        ].map(normalizer))
-      } : {
-        client: userOptions.clientEntry
-      })
+    const normalizer = createInputNormalizer({
+      root,
+      preserveModulesRoot: userOptions.build.preserveModulesRoot
+        ? userOptions.moduleBase
+        : undefined,
+      removeExtension: true,
+    });
+
+    const serverEntry = userOptions.serverEntry
+      ? Object.fromEntries([
+          normalizer([userOptions.serverEntry, userOptions.serverEntry]),
+        ])
+      : null;
+    const clientEntry = userOptions.clientEntry
+      ? Object.fromEntries(
+          [
+            [userOptions.clientEntry, userOptions.clientEntry],
+            ["index.html", "index.html"],
+          ].map(normalizer)
+        )
+      : { "index.html": "index.html" };
+
+    const autoDiscoveredClientFiles = (inputs: Record<string, string>) => {
+      const allFiles = globSync(`**/*.client.*`, {
+        cwd: join(root, userOptions.moduleBase),
+      });
+
+      for (const file of allFiles) {
+        const [key, value] = normalizer(join(userOptions.moduleBase, file));
+        if (!inputs[key]) {
+          inputs[key] = value;
+        } else {
+          console.warn(`[RSC] Client file already exists: ${key}`);
+        }
+      }
+      return inputs;
     };
+    const autoDiscoveredServerFiles = (inputs: Record<string, string>) => {
+      const allFiles = globSync(`${userOptions.moduleBase}/**/*.server.*`, {
+        cwd: join(root, userOptions.moduleBase),
+      });
+      for (const file of allFiles) {
+        const [key, value] = normalizer(join(userOptions.moduleBase, file));
+        if (!inputs[key]) {
+          inputs[key] = value;
+        } else {
+          console.warn(`[RSC] Server file already exists: ${key}`);
+        }
+      }
+      return inputs;
+    };
+    const autoDiscoveredFiles = (inputs: Record<string, string>) => {
+      if (!files) return inputs;
 
-    const userConfig = {
-      ...config,
-      root: root,
-      mode: configEnv.command === 'build' ? 'production' : 'development',
-      build: {
-        ...config.build,
-        outDir: condition === 'react-server' ? userOptions.build.server : userOptions.build.client,
-        assetsDir: condition === 'react-server' ? "" : DEFAULT_CONFIG.CLIENT_ASSETS_DIR,
-        ssr: condition === 'react-server',
-        target: condition === 'react-server' ? 'node18' : 'es2020',
-        minify: condition === 'react-server' ? false : true,
-        manifest: true,
-        ssrManifest: false,
-        ssrEmitAssets: true,
-        rollupOptions: {
-          ...config.build?.rollupOptions,
-          input: inputs,
-          preserveEntrySignatures: 'strict',
-          output: condition === 'react-server' ? {
-            preserveModules: true,
-            entryFileNames: '[name].js',
-            assetFileNames: '[name].[ext]',
-            chunkFileNames: '[name].[ext]',
-            format: 'esm',
-            exports: 'named',
-            hoistTransitiveImports: false,
-            generatedCode: {
-              constBindings: true,
-              objectShorthand: true
-            },
-            interop: 'auto'
-          } : undefined
+      // Add page files without extra prefix
+      for (const [key, value] of files.pageMap) {
+        if (!inputs[key]) {
+          inputs[key] = value;
+        } else {
+          console.warn(`[RSC] Page file already exists: ${key}`);
         }
       }
+      // Add props files without extra prefix
+      for (const [key, value] of files.propsMap) {
+        if (!inputs[key]) {
+          inputs[key] = value;
+        } else {
+          console.warn(`[RSC] Props file already exists: ${key}`);
+        }
+      }
+      return inputs;
     };
 
+    // Add inputs based on condition
+    let inputs = isClient
+      ? autoDiscoveredClientFiles(clientEntry)
+      : autoDiscoveredServerFiles(autoDiscoveredFiles(serverEntry ?? {}));
+
+    const envDir = isClient
+      ? userOptions.build.client
+      : userOptions.build.server;
+
+    const pluginOutput = {
+      preserveModules: !isClient,
+      preserveModulesRoot: userOptions.build.preserveModulesRoot
+        ? userOptions.moduleBase
+        : undefined,
+      entryFileNames: userOptions.build.entryFile,
+      assetFileNames: userOptions.build.assetFile,
+      chunkFileNames: userOptions.build.chunkFile,
+      format: "esm",
+      exports: "named",
+      hoistTransitiveImports: false,
+      generatedCode: {
+        constBindings: true,
+        objectShorthand: true,
+      },
+      interop: "auto",
+    } satisfies OutputOptions;
+    
+    const newOutput = Array.isArray(config.build?.rollupOptions?.output)
+      ? [...config.build?.rollupOptions?.output, pluginOutput]
+      : typeof config.build?.rollupOptions?.output === "object" &&
+        config.build?.rollupOptions?.output !== null
+      ? [config.build?.rollupOptions?.output, pluginOutput]
+      : pluginOutput;
+
+    if (isClient) {
+      // client build options
+      return {
+        type: "success",
+        userConfig: {
+          ...config,
+          root: root,
+          mode: configEnv.command === "build" ? "production" : "development",
+          resolve: {
+            external: ["react", "react-dom"],
+            alias: {},
+          },
+          ssr: {
+            target: "node",
+            external: [
+              "react",
+              "react-dom",
+              "react-server-dom-esm/client.browser",
+            ],
+            resolve: {
+              externalConditions: ["react-server"],
+            },
+          },
+          // client build options
+          build: {
+            ...config.build,
+            emptyOutDir: config.build?.emptyOutDir ?? true,
+            outDir: join(userOptions.build.outDir, envDir),
+            assetsDir: config.build?.assetsDir ?? userOptions.build.assetsDir,
+            // modern browsers
+            target: ["esnext"],
+            minify: true,
+            ssr:
+              typeof configEnv.isSsrBuild === "boolean"
+                ? configEnv.isSsrBuild
+                : true,
+            manifest: config.build?.manifest ?? `.vite/manifest.json`,
+            ssrManifest: config.build?.ssrManifest ?? `.vite/ssr-manifest.json`,
+            ssrEmitAssets: config.build?.ssrEmitAssets ?? true,
+            rollupOptions: {
+              ...config.build?.rollupOptions,
+              input: inputs,
+              output: newOutput,
+              preserveEntrySignatures: "exports-only",
+            },
+          },
+        },
+      };
+    }
+    // server build options
     return {
       type: "success",
-      userConfig: userConfig as ResolvedUserConfig
+      userConfig: {
+        ...config,
+        root: root,
+        mode: configEnv.command === "build" ? "production" : "development",
+        resolve: {
+          alias: {},
+          externalConditions: ["react-server"],
+        },
+        // server build options
+        build: {
+          ...config.build,
+          emptyOutDir: config.build?.emptyOutDir ?? true,
+          outDir: join(userOptions.build.outDir, envDir),
+          target: config.build?.target ?? "node18",
+          minify: config.build?.minify ?? true,
+          ssr: config.build?.ssr ?? configEnv.isSsrBuild ?? true,
+          manifest: config.build?.manifest ?? `.vite/manifest.json`,
+          ssrManifest: config.build?.ssrManifest ?? `.vite/ssr-manifest.json`,
+          ssrEmitAssets: config.build?.ssrEmitAssets ?? true,
+          assetsDir: config.build?.assetsDir ?? userOptions.build.assetsDir,
+          rollupOptions: {
+            ...config.build?.rollupOptions,
+            input: inputs,
+            preserveEntrySignatures: config.build?.rollupOptions?.preserveEntrySignatures ?? "strict",
+            output: newOutput,
+          },
+        },
+      },
     };
   } catch (error) {
     return {
       type: "error",
-      error: error instanceof Error ? error : new Error("Failed to resolve config")
+      error:
+        error instanceof Error ? error : new Error("Failed to resolve config"),
     };
   }
-} 
+}