wxt 0.5.2 → 0.5.3

package/dist/index.js

@@ -1,10 +1,46 @@
 // src/core/utils/getInternalConfig.ts
-import path2, { resolve as resolve6 } from "node:path";
+import { loadConfig } from "c12";
+import path2 from "node:path";
 import * as vite2 from "vite";
-import { LogLevels, consola } from "consola";
+
+// src/core/utils/createFsCache.ts
+import fs2, { ensureDir } from "fs-extra";
+import { dirname, resolve } from "path";
+
+// src/core/utils/fs.ts
+import fs from "fs-extra";
+async function writeFileIfDifferent(file, newContents) {
+  const existingContents = await fs.readFile(file, "utf-8").catch(() => void 0);
+  if (existingContents !== newContents) {
+    await fs.writeFile(file, newContents);
+  }
+}
+
+// src/core/utils/createFsCache.ts
+function createFsCache(wxtDir) {
+  const getPath = (key) => resolve(wxtDir, "cache", encodeURIComponent(key));
+  return {
+    async set(key, value) {
+      const path7 = getPath(key);
+      await ensureDir(dirname(path7));
+      await writeFileIfDifferent(path7, value);
+    },
+    async get(key) {
+      const path7 = getPath(key);
+      try {
+        return await fs2.readFile(path7, "utf-8");
+      } catch {
+        return void 0;
+      }
+    }
+  };
+}
+
+// src/core/utils/getInternalConfig.ts
+import consola, { LogLevels } from "consola";
 
 // src/core/utils/entrypoints.ts
-import path, { relative, resolve } from "node:path";
+import path, { relative, resolve as resolve2 } from "node:path";
 
 // src/core/utils/paths.ts
 import nodePath from "node:path";
@@ -25,7 +61,7 @@ function getEntrypointName(entrypointsDir, inputPath) {
   return name;
 }
 function getEntrypointOutputFile(entrypoint, ext) {
-  return resolve(entrypoint.outputDir, `${entrypoint.name}${ext}`);
+  return resolve2(entrypoint.outputDir, `${entrypoint.name}${ext}`);
 }
 function getEntrypointBundlePath(entrypoint, outDir, ext) {
   return normalizePath2(
@@ -35,7 +71,7 @@ function getEntrypointBundlePath(entrypoint, outDir, ext) {
 
 // src/core/vite-plugins/devHtmlPrerender.ts
 import { parseHTML } from "linkedom";
-import { dirname, isAbsolute, relative as relative2, resolve as resolve2 } from "path";
+import { dirname as dirname2, isAbsolute, relative as relative2, resolve as resolve3 } from "path";
 function devHtmlPrerender(config) {
   return {
     apply: "build",
@@ -44,7 +80,7 @@ function devHtmlPrerender(config) {
       return {
         resolve: {
           alias: {
-            "@wxt/reload-html": resolve2(
+            "@wxt/reload-html": resolve3(
               config.root,
               "node_modules/wxt/dist/virtual-modules/reload-html.js"
             )
@@ -73,7 +109,7 @@ function devHtmlPrerender(config) {
           if (isAbsolute(src)) {
             element.setAttribute(attr, server.origin + src);
           } else if (src.startsWith(".")) {
-            const abs = resolve2(dirname(id), src);
+            const abs = resolve3(dirname2(id), src);
             const pathname = relative2(config.root, abs);
             element.setAttribute(attr, `${server.origin}/${pathname}`);
           }
@@ -184,8 +220,8 @@ function download(config) {
 }
 
 // src/core/vite-plugins/multipageMove.ts
-import { dirname as dirname2, extname, resolve as resolve3 } from "node:path";
-import fs, { ensureDir } from "fs-extra";
+import { dirname as dirname3, extname, resolve as resolve4 } from "node:path";
+import fs3, { ensureDir as ensureDir2 } from "fs-extra";
 function multipageMove(entrypoints, config) {
   return {
     name: "wxt:multipage-move",
@@ -212,10 +248,10 @@ function multipageMove(entrypoints, config) {
           );
           continue;
         }
-        const oldAbsPath = resolve3(config.outDir, oldBundlePath);
-        const newAbsPath = resolve3(config.outDir, newBundlePath);
-        await ensureDir(dirname2(newAbsPath));
-        await fs.move(oldAbsPath, newAbsPath, { overwrite: true });
+        const oldAbsPath = resolve4(config.outDir, oldBundlePath);
+        const newAbsPath = resolve4(config.outDir, newBundlePath);
+        await ensureDir2(dirname3(newAbsPath));
+        await fs3.move(oldAbsPath, newAbsPath, { overwrite: true });
         const renamedChunk = {
           ...bundle[oldBundlePath],
           fileName: newBundlePath
@@ -277,8 +313,8 @@ function unimport(config) {
 }
 
 // src/core/vite-plugins/virtualEntrypoint.ts
-import fs2 from "fs-extra";
-import { resolve as resolve4 } from "path";
+import fs4 from "fs-extra";
+import { resolve as resolve5 } from "path";
 function virtualEntrypoin(type, config) {
   const virtualId = `virtual:wxt-${type}?`;
   const resolvedVirtualId = `\0${virtualId}`;
@@ -295,8 +331,8 @@ function virtualEntrypoin(type, config) {
       if (!id.startsWith(resolvedVirtualId))
         return;
       const inputPath = id.replace(resolvedVirtualId, "");
-      const template = await fs2.readFile(
-        resolve4(
+      const template = await fs4.readFile(
+        resolve5(
           config.root,
           `node_modules/wxt/dist/virtual-modules/${type}-entrypoint.js`
         ),
@@ -370,39 +406,6 @@ function cssEntrypoints(entrypoint, config) {
   };
 }
 
-// src/core/utils/createFsCache.ts
-import fs4, { ensureDir as ensureDir2 } from "fs-extra";
-import { dirname as dirname3, resolve as resolve5 } from "path";
-
-// src/core/utils/fs.ts
-import fs3 from "fs-extra";
-async function writeFileIfDifferent(file, newContents) {
-  const existingContents = await fs3.readFile(file, "utf-8").catch(() => void 0);
-  if (existingContents !== newContents) {
-    await fs3.writeFile(file, newContents);
-  }
-}
-
-// src/core/utils/createFsCache.ts
-function createFsCache(wxtDir) {
-  const getPath = (key) => resolve5(wxtDir, "cache", encodeURIComponent(key));
-  return {
-    async set(key, value) {
-      const path7 = getPath(key);
-      await ensureDir2(dirname3(path7));
-      await writeFileIfDifferent(path7, value);
-    },
-    async get(key) {
-      const path7 = getPath(key);
-      try {
-        return await fs4.readFile(path7, "utf-8");
-      } catch {
-        return void 0;
-      }
-    }
-  };
-}
-
 // src/core/utils/globals.ts
 function getGlobals(config) {
   return [
@@ -450,128 +453,182 @@ function getGlobals(config) {
 }
 
 // src/core/utils/getInternalConfig.ts
-import { loadConfig } from "c12";
-async function getInternalConfig(config, command) {
-  const root = config.root ? path2.resolve(config.root) : process.cwd();
-  const mode = config.mode ?? (command === "build" ? "production" : "development");
-  const browser = config.browser ?? "chrome";
-  const manifestVersion = config.manifestVersion ?? (browser == "firefox" ? 2 : 3);
-  const outBaseDir = path2.resolve(root, ".output");
-  const outDir = path2.resolve(outBaseDir, `${browser}-mv${manifestVersion}`);
-  const logger = config.logger ?? consola;
-  const debug = !!config.debug;
-  if (debug)
-    logger.level = LogLevels.debug;
-  const baseConfig = {
-    root,
-    outDir,
-    outBaseDir,
-    storeIds: config.storeIds ?? {},
-    browser,
-    manifestVersion,
-    mode,
-    command,
-    debug,
-    logger,
-    vite: config.vite ?? {},
-    imports: config.imports ?? {},
-    runnerConfig: await loadConfig({
-      name: "web-ext",
-      cwd: root,
-      globalRc: true,
-      rcFile: ".webextrc",
-      overrides: config.runner
-    })
-  };
-  let userConfig = {
-    mode
-  };
-  if (config.configFile !== false) {
+async function getInternalConfig(inlineConfig, command) {
+  let userConfig = {};
+  if (inlineConfig.configFile !== false) {
     const loaded = await loadConfig({
       name: "wxt",
-      cwd: root,
+      cwd: inlineConfig.root ?? process.cwd(),
       rcFile: false
     });
     userConfig = loaded.config ?? {};
   }
-  const merged = vite2.mergeConfig(
-    baseConfig,
-    userConfig
+  const mergedConfig = mergeInlineConfig(inlineConfig, userConfig);
+  const debug = mergedConfig.debug ?? false;
+  const logger = mergedConfig.logger ?? consola;
+  if (debug)
+    logger.level = LogLevels.debug;
+  const browser = mergedConfig.browser ?? "chrome";
+  const manifestVersion = mergedConfig.manifestVersion ?? (browser == "firefox" ? 2 : 3);
+  const mode = mergedConfig.mode ?? (command === "build" ? "production" : "development");
+  const env = { browser, command, manifestVersion, mode };
+  const root = path2.resolve(
+    inlineConfig.root ?? userConfig.root ?? process.cwd()
   );
-  const srcDir = userConfig.srcDir ? resolve6(root, userConfig.srcDir) : root;
-  const entrypointsDir = resolve6(
+  const wxtDir = path2.resolve(root, ".wxt");
+  const srcDir = path2.resolve(root, mergedConfig.srcDir ?? root);
+  const entrypointsDir = path2.resolve(
     srcDir,
-    userConfig.entrypointsDir ?? "entrypoints"
+    mergedConfig.entrypointsDir ?? "entrypoints"
   );
-  const publicDir = resolve6(srcDir, userConfig.publicDir ?? "public");
-  const wxtDir = resolve6(root, ".wxt");
-  const typesDir = resolve6(wxtDir, "types");
-  const env = { mode, browser, manifestVersion, command };
-  const userManifest = await resolveManifestConfig(env, userConfig.manifest);
-  const inlineManifest = await resolveManifestConfig(env, config.manifest);
-  const manifest = vite2.mergeConfig(userManifest, inlineManifest);
+  const publicDir = path2.resolve(srcDir, mergedConfig.publicDir ?? "public");
+  const typesDir = path2.resolve(wxtDir, "types");
+  const outBaseDir = path2.resolve(root, ".output");
+  const outDir = path2.resolve(outBaseDir, `${browser}-mv${manifestVersion}`);
+  const runnerConfig = await loadConfig({
+    name: "web-ext",
+    cwd: root,
+    globalRc: true,
+    rcFile: ".webextrc",
+    overrides: mergedConfig.runner
+  });
   const finalConfig = {
-    ...merged,
-    srcDir,
+    browser,
+    command,
+    debug,
     entrypointsDir,
+    fsCache: createFsCache(wxtDir),
+    imports: mergedConfig.imports ?? {},
+    logger,
+    manifest: await resolveManifestConfig(env, mergedConfig.manifest),
+    manifestVersion,
+    mode,
+    outBaseDir,
+    outDir,
     publicDir,
-    wxtDir,
+    root,
+    runnerConfig,
+    srcDir,
     typesDir,
-    fsCache: createFsCache(wxtDir),
-    manifest,
-    zip: {
-      sourcesTemplate: "{{name}}-{{version}}-sources.zip",
-      artifactTemplate: "{{name}}-{{version}}-{{browser}}.zip",
-      sourcesRoot: root,
-      ...userConfig.zip,
-      ...config.zip,
-      ignoredSources: [
-        "**/node_modules",
-        // WXT files
-        "**/web-ext.config.ts",
-        // Hidden files
-        "**/.*",
-        // Tests
-        "**/__tests__/**",
-        "**/*.+(test|spec).?(c|m)+(j|t)s?(x)",
-        // User config
-        ...userConfig.zip?.ignoredSources ?? [],
-        ...config.zip?.ignoredSources ?? []
-      ]
-    }
+    vite: {},
+    // Real value added after this object is initialized.
+    wxtDir,
+    zip: resolveInternalZipConfig(root, mergedConfig)
   };
-  finalConfig.vite.root = root;
-  finalConfig.vite.configFile = false;
-  finalConfig.vite.logLevel = "warn";
-  finalConfig.vite.build ??= {};
-  finalConfig.vite.build.outDir = outDir;
-  finalConfig.vite.build.emptyOutDir = false;
-  finalConfig.vite.plugins ??= [];
-  finalConfig.vite.plugins.push(download(finalConfig));
-  finalConfig.vite.plugins.push(devHtmlPrerender(finalConfig));
-  finalConfig.vite.plugins.push(unimport(finalConfig));
-  finalConfig.vite.plugins.push(
-    virtualEntrypoin("background", finalConfig)
-  );
-  finalConfig.vite.plugins.push(
-    virtualEntrypoin("content-script", finalConfig)
+  finalConfig.vite = await resolveInternalViteConfig(
+    env,
+    mergedConfig,
+    finalConfig
   );
-  finalConfig.vite.plugins.push(devServerGlobals(finalConfig));
-  finalConfig.vite.plugins.push(tsconfigPaths(finalConfig));
-  finalConfig.vite.plugins.push(noopBackground());
-  finalConfig.vite.define ??= {};
-  getGlobals(finalConfig).forEach((global) => {
-    finalConfig.vite.define[global.name] = JSON.stringify(global.value);
-  });
   return finalConfig;
 }
 async function resolveManifestConfig(env, manifest) {
   return await (typeof manifest === "function" ? manifest(env) : manifest ?? {});
 }
+function mergeInlineConfig(inlineConfig, userConfig) {
+  let imports;
+  if (inlineConfig.imports === false || userConfig.imports === false) {
+    imports = false;
+  } else if (userConfig.imports == null && inlineConfig.imports == null) {
+    imports = void 0;
+  } else {
+    imports = vite2.mergeConfig(
+      userConfig.imports ?? {},
+      inlineConfig.imports ?? {}
+    );
+  }
+  const manifest = async (env) => {
+    const user = await resolveManifestConfig(env, userConfig.manifest);
+    const inline = await resolveManifestConfig(env, inlineConfig.manifest);
+    return vite2.mergeConfig(user, inline);
+  };
+  const viteConfig = async (env) => {
+    const user = await resolveViteConfig(env, userConfig.vite);
+    const inline = await resolveViteConfig(env, inlineConfig.vite);
+    return vite2.mergeConfig(user, inline);
+  };
+  const runner = vite2.mergeConfig(
+    userConfig.runner ?? {},
+    inlineConfig.runner ?? {}
+  );
+  const zip = vite2.mergeConfig(
+    userConfig.zip ?? {},
+    inlineConfig.zip ?? {}
+  );
+  return {
+    root: inlineConfig.root ?? userConfig.root,
+    browser: inlineConfig.browser ?? userConfig.browser,
+    manifestVersion: inlineConfig.manifestVersion ?? userConfig.manifestVersion,
+    configFile: inlineConfig.configFile,
+    debug: inlineConfig.debug ?? userConfig.debug,
+    entrypointsDir: inlineConfig.entrypointsDir ?? userConfig.entrypointsDir,
+    imports,
+    logger: inlineConfig.logger ?? userConfig.logger,
+    manifest,
+    mode: inlineConfig.mode ?? userConfig.mode,
+    publicDir: inlineConfig.publicDir ?? userConfig.publicDir,
+    runner,
+    srcDir: inlineConfig.srcDir ?? userConfig.srcDir,
+    vite: viteConfig,
+    zip
+  };
+}
+async function resolveViteConfig(env, vite6) {
+  return await (typeof vite6 === "function" ? vite6(env) : vite6 ?? {});
+}
+function resolveInternalZipConfig(root, mergedConfig) {
+  return {
+    sourcesTemplate: "{{name}}-{{version}}-sources.zip",
+    artifactTemplate: "{{name}}-{{version}}-{{browser}}.zip",
+    sourcesRoot: root,
+    ...mergedConfig.zip,
+    ignoredSources: [
+      "**/node_modules",
+      // WXT files
+      "**/web-ext.config.ts",
+      // Hidden files
+      "**/.*",
+      // Tests
+      "**/__tests__/**",
+      "**/*.+(test|spec).?(c|m)+(j|t)s?(x)",
+      // From user
+      ...mergedConfig.zip?.ignoredSources ?? []
+    ]
+  };
+}
+async function resolveInternalViteConfig(env, mergedConfig, finalConfig) {
+  const internalVite = await resolveViteConfig(
+    env,
+    mergedConfig.vite
+  );
+  internalVite.root = finalConfig.root;
+  internalVite.configFile = false;
+  internalVite.logLevel = "warn";
+  internalVite.build ??= {};
+  internalVite.build.outDir = finalConfig.outDir;
+  internalVite.build.emptyOutDir = false;
+  internalVite.plugins ??= [];
+  internalVite.plugins.push(download(finalConfig));
+  internalVite.plugins.push(devHtmlPrerender(finalConfig));
+  internalVite.plugins.push(unimport(finalConfig));
+  internalVite.plugins.push(
+    virtualEntrypoin("background", finalConfig)
+  );
+  internalVite.plugins.push(
+    virtualEntrypoin("content-script", finalConfig)
+  );
+  internalVite.plugins.push(devServerGlobals(finalConfig));
+  internalVite.plugins.push(tsconfigPaths(finalConfig));
+  internalVite.plugins.push(noopBackground());
+  internalVite.define ??= {};
+  for (const global of getGlobals(finalConfig)) {
+    internalVite.define[global.name] = JSON.stringify(global.value);
+  }
+  return internalVite;
+}
 
 // src/index.ts
 import pc4 from "picocolors";
-import * as vite6 from "vite";
 
 // src/core/utils/arrays.ts
 function every(array, predicate) {
@@ -693,7 +750,7 @@ async function removeEmptyDirs(dir) {
 
 // src/core/build/buildEntrypoints.ts
 import fs7 from "fs-extra";
-import { dirname as dirname4, resolve as resolve7 } from "path";
+import { dirname as dirname4, resolve as resolve6 } from "path";
 
 // src/core/utils/public.ts
 import fs6 from "fs-extra";
@@ -802,8 +859,8 @@ async function copyPublicDirectory(config) {
     return [];
   const publicAssets = [];
   for (const file of files) {
-    const srcPath = resolve7(config.publicDir, file);
-    const outPath = resolve7(config.outDir, file);
+    const srcPath = resolve6(config.publicDir, file);
+    const outPath = resolve6(config.outDir, file);
     await fs7.ensureDir(dirname4(outPath));
     await fs7.copyFile(srcPath, outPath);
     publicAssets.push({
@@ -818,7 +875,7 @@ async function copyPublicDirectory(config) {
 }
 
 // src/core/build/findEntrypoints.ts
-import { relative as relative3, resolve as resolve9 } from "path";
+import { relative as relative3, resolve as resolve8 } from "path";
 import fs9 from "fs-extra";
 import { minimatch } from "minimatch";
 import { parseHTML as parseHTML2 } from "linkedom";
@@ -828,7 +885,7 @@ import JSON5 from "json5";
 import createJITI from "jiti";
 import { createUnimport as createUnimport2 } from "unimport";
 import fs8 from "fs-extra";
-import { resolve as resolve8 } from "path";
+import { resolve as resolve7 } from "path";
 import transform from "jiti/dist/babel";
 
 // src/core/utils/strings.ts
@@ -866,7 +923,7 @@ async function importEntrypointFile(path7, config) {
     esmResolve: true,
     interopDefault: true,
     alias: {
-      "webextension-polyfill": resolve8(
+      "webextension-polyfill": resolve7(
         config.root,
         "node_modules/wxt/dist/virtual-modules/fake-browser.js"
       )
@@ -899,7 +956,7 @@ async function findEntrypoints(config) {
   let hasBackground = false;
   await Promise.all(
     relativePaths.map(async (relativePath) => {
-      const path7 = resolve9(config.entrypointsDir, relativePath);
+      const path7 = resolve8(config.entrypointsDir, relativePath);
       const matchingGlob = pathGlobs.find(
         (glob4) => minimatch(relativePath, glob4)
       );
@@ -943,7 +1000,7 @@ ${JSON.stringify(
             type,
             name: getEntrypointName(config.entrypointsDir, path7),
             inputPath: path7,
-            outputDir: resolve9(config.outDir, CONTENT_SCRIPT_OUT_DIR),
+            outputDir: resolve8(config.outDir, CONTENT_SCRIPT_OUT_DIR),
             options: {
               include: void 0,
               exclude: void 0
@@ -1104,7 +1161,7 @@ async function getContentScriptEntrypoint(config, name, path7) {
     type: "content-script",
     name: getEntrypointName(config.entrypointsDir, path7),
     inputPath: path7,
-    outputDir: resolve9(config.outDir, CONTENT_SCRIPT_OUT_DIR),
+    outputDir: resolve8(config.outDir, CONTENT_SCRIPT_OUT_DIR),
     options
   };
 }
@@ -1153,7 +1210,7 @@ var CONTENT_SCRIPT_OUT_DIR = "content-scripts";
 // src/core/build/generateTypesDir.ts
 import { createUnimport as createUnimport3 } from "unimport";
 import fs10 from "fs-extra";
-import { relative as relative4, resolve as resolve10 } from "path";
+import { relative as relative4, resolve as resolve9 } from "path";
 import path4 from "node:path";
 
 // src/core/utils/i18n.ts
@@ -1208,7 +1265,7 @@ async function generateTypesDir(entrypoints, config) {
   await writeTsConfigFile(mainReference, config);
 }
 async function writeImportsDeclarationFile(config, unimportOptions) {
-  const filePath = resolve10(config.typesDir, "imports.d.ts");
+  const filePath = resolve9(config.typesDir, "imports.d.ts");
   const unimport2 = createUnimport3(unimportOptions);
   await unimport2.scanImportsFromDir(void 0, { cwd: config.srcDir });
   await writeFileIfDifferent(
@@ -1220,7 +1277,7 @@ async function writeImportsDeclarationFile(config, unimportOptions) {
   return filePath;
 }
 async function writePathsDeclarationFile(entrypoints, config) {
-  const filePath = resolve10(config.typesDir, "paths.d.ts");
+  const filePath = resolve9(config.typesDir, "paths.d.ts");
   const unions = entrypoints.map(
     (entry) => getEntrypointBundlePath(
       entry,
@@ -1246,7 +1303,7 @@ declare module "wxt/browser" {
   return filePath;
 }
 async function writeI18nDeclarationFile(config) {
-  const filePath = resolve10(config.typesDir, "i18n.d.ts");
+  const filePath = resolve9(config.typesDir, "i18n.d.ts");
   const defaultLocale = config.manifest.default_locale;
   const template = `// Generated by wxt
 import "wxt/browser";
@@ -1299,7 +1356,7 @@ declare module "wxt/browser" {
   return filePath;
 }
 async function writeGlobalsDeclarationFile(config) {
-  const filePath = resolve10(config.typesDir, "globals.d.ts");
+  const filePath = resolve9(config.typesDir, "globals.d.ts");
   const globals = getGlobals(config);
   await writeFileIfDifferent(
     filePath,
@@ -1315,7 +1372,7 @@ async function writeGlobalsDeclarationFile(config) {
 }
 async function writeMainDeclarationFile(references, config) {
   const dir = config.wxtDir;
-  const filePath = resolve10(dir, "wxt.d.ts");
+  const filePath = resolve9(dir, "wxt.d.ts");
   await writeFileIfDifferent(
     filePath,
     [
@@ -1333,7 +1390,7 @@ async function writeTsConfigFile(mainReference, config) {
   const rootPath = normalizePath2(relative4(dir, config.root));
   const srcPath = normalizePath2(relative4(dir, config.srcDir));
   await writeFileIfDifferent(
-    resolve10(dir, "tsconfig.json"),
+    resolve9(dir, "tsconfig.json"),
     `{
   "compilerOptions": {
     "target": "ESNext",
@@ -1368,7 +1425,7 @@ async function writeTsConfigFile(mainReference, config) {
 
 // src/core/utils/manifest.ts
 import fs12 from "fs-extra";
-import { resolve as resolve12 } from "path";
+import { resolve as resolve11 } from "path";
 
 // src/core/utils/ContentSecurityPolicy.ts
 var ContentSecurityPolicy = class _ContentSecurityPolicy {
@@ -1452,10 +1509,10 @@ function mapWxtOptionsToContentScript(options) {
 }
 
 // src/core/utils/package.ts
-import { resolve as resolve11 } from "node:path";
+import { resolve as resolve10 } from "node:path";
 import fs11 from "fs-extra";
 async function getPackageJson(config) {
-  const file = resolve11(config.root, "package.json");
+  const file = resolve10(config.root, "package.json");
   try {
     return await fs11.readJson(file);
   } catch (err) {
@@ -1470,7 +1527,7 @@ async function getPackageJson(config) {
 async function writeManifest(manifest, output, config) {
   const str = config.mode === "production" ? JSON.stringify(manifest) : JSON.stringify(manifest, null, 2);
   await fs12.ensureDir(config.outDir);
-  await writeFileIfDifferent(resolve12(config.outDir, "manifest.json"), str);
+  await writeFileIfDifferent(resolve11(config.outDir, "manifest.json"), str);
   output.publicAssets.unshift({
     type: "asset",
     fileName: "manifest.json",
@@ -1840,7 +1897,7 @@ function formatDuration(duration) {
 }
 
 // src/core/log/printBuildSummary.ts
-import { resolve as resolve13 } from "path";
+import { resolve as resolve12 } from "path";
 
 // src/core/log/printFileList.ts
 import path5 from "node:path";
@@ -1923,7 +1980,7 @@ async function printBuildSummary(log, header, output, config) {
       return diff;
     return l.fileName.localeCompare(r.fileName);
   });
-  const files = chunks.map((chunk) => resolve13(config.outDir, chunk.fileName));
+  const files = chunks.map((chunk) => resolve12(config.outDir, chunk.fileName));
   await printFileList(log, header, config.outDir, files);
 }
 var DEFAULT_SORT_WEIGHT = 100;
@@ -2184,7 +2241,7 @@ async function clean(root = process.cwd()) {
 }
 
 // package.json
-var version2 = "0.5.2";
+var version2 = "0.5.3";
 
 // src/core/utils/defineConfig.ts
 function defineConfig(config) {
@@ -2203,12 +2260,14 @@ async function build2(config) {
 }
 async function createServer2(config) {
   const serverInfo = await getServerInfo();
-  const getLatestInternalConfig = () => {
-    const viteConfig = vite6.mergeConfig(
-      serverInfo.viteServerConfig,
-      config?.vite ?? {}
+  const getLatestInternalConfig = async () => {
+    return getInternalConfig(
+      {
+        ...config,
+        vite: serverInfo.viteServerConfig
+      },
+      "serve"
     );
-    return getInternalConfig({ ...config, vite: viteConfig }, "serve");
   };
   let internalConfig = await getLatestInternalConfig();
   const server = await setupServer(serverInfo, internalConfig);