wxt 0.18.9 → 0.18.10

package/dist/cli.js

@@ -12,7 +12,7 @@ import cac from "cac";
 
 // src/core/utils/fs.ts
 import fs3 from "fs-extra";
-import glob from "fast-glob";
+import glob2 from "fast-glob";
 
 // src/core/utils/paths.ts
 import systemPath from "node:path";
@@ -548,38 +548,6 @@ async function removeEmptyDirs(dir) {
   }
 }
 
-// src/core/builders/vite/plugins/unimport.ts
-import { createUnimport } from "unimport";
-import { extname as extname2 } from "path";
-var ENABLED_EXTENSIONS = /* @__PURE__ */ new Set([
-  ".js",
-  ".jsx",
-  ".ts",
-  ".tsx",
-  ".vue",
-  ".svelte"
-]);
-function unimport(config) {
-  const options = config.imports;
-  if (options === false) return [];
-  const unimport2 = createUnimport(options);
-  return {
-    name: "wxt:unimport",
-    async config() {
-      await unimport2.scanImportsFromDir(void 0, { cwd: config.srcDir });
-    },
-    async transform(code, id) {
-      if (id.includes("node_modules")) return;
-      if (!ENABLED_EXTENSIONS.has(extname2(id))) return;
-      const injected = await unimport2.injectImports(code, id);
-      return {
-        code: injected.code,
-        map: injected.s.generateMap({ hires: "boundary", source: id })
-      };
-    }
-  };
-}
-
 // src/core/utils/virtual-modules.ts
 var virtualEntrypointTypes = [
   "content-script-main-world",
@@ -978,7 +946,7 @@ import { ViteNodeServer } from "vite-node/server";
 import { ViteNodeRunner } from "vite-node/client";
 import { installSourcemapsSupport } from "vite-node/source-map";
 async function createViteBuilder(wxtConfig, hooks, server) {
-  const vite = await import("vite");
+  const vite2 = await import("vite");
   const getBaseConfig = async () => {
     const config = await wxtConfig.vite(wxtConfig.env);
     config.root = wxtConfig.root;
@@ -1000,7 +968,6 @@ async function createViteBuilder(wxtConfig, hooks, server) {
     config.plugins.push(
       download(wxtConfig),
       devHtmlPrerender(wxtConfig, server),
-      unimport(wxtConfig),
       resolveVirtualModules(wxtConfig),
       devServerGlobals(wxtConfig, server),
       tsconfigPaths(wxtConfig),
@@ -1123,7 +1090,7 @@ async function createViteBuilder(wxtConfig, hooks, server) {
   };
   return {
     name: "Vite",
-    version: vite.version,
+    version: vite2.version,
     async importEntrypoint(path11) {
       switch (wxtConfig.experimental.entrypointImporter) {
         default:
@@ -1138,10 +1105,10 @@ async function createViteBuilder(wxtConfig, hooks, server) {
               removeEntrypointMainFunction(wxtConfig, path11)
             ]
           };
-          const config = vite.mergeConfig(baseConfig, envConfig);
-          const server2 = await vite.createServer(config);
+          const config = vite2.mergeConfig(baseConfig, envConfig);
+          const server2 = await vite2.createServer(config);
           await server2.listen();
-          const runtime = await vite.createViteRuntime(server2, { hmr: false });
+          const runtime = await vite2.createViteRuntime(server2, { hmr: false });
           const module = await runtime.executeUrl(path11);
           await server2.close();
           return module.default;
@@ -1157,8 +1124,8 @@ async function createViteBuilder(wxtConfig, hooks, server) {
               removeEntrypointMainFunction(wxtConfig, path11)
             ]
           };
-          const config = vite.mergeConfig(baseConfig, envConfig);
-          const server2 = await vite.createServer(config);
+          const config = vite2.mergeConfig(baseConfig, envConfig);
+          const server2 = await vite2.createServer(config);
           await server2.pluginContainer.buildStart({});
           const node = new ViteNodeServer(server2);
           installSourcemapsSupport({
@@ -1189,13 +1156,13 @@ async function createViteBuilder(wxtConfig, hooks, server) {
       else if (group.inputPath.endsWith(".css"))
         entryConfig = getCssConfig(group);
       else entryConfig = getLibModeConfig(group);
-      const buildConfig = vite.mergeConfig(await getBaseConfig(), entryConfig);
+      const buildConfig = vite2.mergeConfig(await getBaseConfig(), entryConfig);
       await hooks.callHook(
         "vite:build:extendConfig",
         toArray(group),
         buildConfig
       );
-      const result = await vite.build(buildConfig);
+      const result = await vite2.build(buildConfig);
       return {
         entrypoints: group,
         chunks: getBuildOutputChunks(result)
@@ -1211,9 +1178,9 @@ async function createViteBuilder(wxtConfig, hooks, server) {
         }
       };
       const baseConfig = await getBaseConfig();
-      const finalConfig = vite.mergeConfig(baseConfig, serverConfig);
+      const finalConfig = vite2.mergeConfig(baseConfig, serverConfig);
       await hooks.callHook("vite:devServer:extendConfig", finalConfig);
-      const viteServer = await vite.createServer(finalConfig);
+      const viteServer = await vite2.createServer(finalConfig);
       const server2 = {
         async listen() {
           await viteServer.listen(info.port);
@@ -1261,6 +1228,107 @@ function getRollupEntry(entrypoint) {
   return entrypoint.inputPath;
 }
 
+// src/modules.ts
+import * as vite from "vite";
+import glob from "fast-glob";
+function defineWxtModule(module) {
+  if (typeof module === "function") return { setup: module };
+  return module;
+}
+function addViteConfig(wxt2, viteConfig) {
+  wxt2.hooks.hook("ready", (wxt3) => {
+    const userVite = wxt3.config.vite;
+    wxt3.config.vite = async (env) => {
+      const fromUser = await userVite(env);
+      const fromModule = viteConfig(env) ?? {};
+      return vite.mergeConfig(fromModule, fromUser);
+    };
+  });
+}
+
+// src/builtin-modules/unimport.ts
+import { createUnimport } from "unimport";
+import { extname as extname2 } from "node:path";
+var unimport_default = defineWxtModule({
+  name: "wxt:built-in:unimport",
+  setup(wxt2) {
+    const options = wxt2.config.imports;
+    if (options === false) return;
+    let unimport;
+    wxt2.hooks.hook("ready", () => {
+      const addModuleImports = (module) => {
+        if (!module.imports) return;
+        options.imports ??= [];
+        options.imports.push(...module.imports);
+      };
+      wxt2.config.builtinModules.forEach(addModuleImports);
+      wxt2.config.userModules.forEach(addModuleImports);
+    });
+    wxt2.hooks.afterEach((event) => {
+      if (event.name === "ready") {
+        unimport = createUnimport(options);
+      }
+    });
+    wxt2.hooks.hook("prepare:types", async (_, entries) => {
+      await unimport.init();
+      entries.push(await getImportsDeclarationEntry(unimport));
+      if (!options.eslintrc.enabled) return;
+      entries.push(await getImportsEslintEntry(unimport, options));
+    });
+    addViteConfig(wxt2, () => ({
+      plugins: [vitePlugin(unimport)]
+    }));
+  }
+});
+function vitePlugin(unimport) {
+  const ENABLED_EXTENSIONS = /* @__PURE__ */ new Set([
+    ".js",
+    ".jsx",
+    ".ts",
+    ".tsx",
+    ".vue",
+    ".svelte"
+  ]);
+  return {
+    name: "wxt:unimport",
+    async transform(code, id) {
+      if (id.includes("node_modules")) return;
+      if (!ENABLED_EXTENSIONS.has(extname2(id))) return;
+      const injected = await unimport.injectImports(code, id);
+      return {
+        code: injected.code,
+        map: injected.s.generateMap({ hires: "boundary", source: id })
+      };
+    }
+  };
+}
+async function getImportsDeclarationEntry(unimport) {
+  await unimport.init();
+  return {
+    path: "types/imports.d.ts",
+    text: [
+      "// Generated by wxt",
+      await unimport.generateTypeDeclarations(),
+      ""
+    ].join("\n"),
+    tsReference: true
+  };
+}
+async function getImportsEslintEntry(unimport, options) {
+  const globals2 = {};
+  const eslintrc = { globals: globals2 };
+  (await unimport.getImports()).map((i) => i.as ?? i.name).filter(Boolean).sort().forEach((name) => {
+    eslintrc.globals[name] = options.eslintrc.globalsPropValue;
+  });
+  return {
+    path: options.eslintrc.filePath,
+    text: JSON.stringify(eslintrc, null, 2) + "\n"
+  };
+}
+
+// src/builtin-modules/index.ts
+var builtinModules = [unimport_default];
+
 // src/core/wxt.ts
 var wxt;
 async function registerWxt(command, inlineConfig = {}, getServer) {
@@ -1282,18 +1350,16 @@ async function registerWxt(command, inlineConfig = {}, getServer) {
     builder,
     server
   };
-  for (const module of config.modules) {
+  const initModule = async (module) => {
     if (module.hooks) wxt.hooks.addHooks(module.hooks);
-    if (wxt.config.imports !== false && module.imports) {
-      wxt.config.imports.imports ??= [];
-      wxt.config.imports.imports.push(...module.imports);
-    }
     await module.setup?.(
       wxt,
       // @ts-expect-error: Untyped configKey field
       module.configKey ? config[module.configKey] : void 0
     );
-  }
+  };
+  for (const builtinModule of builtinModules) await initModule(builtinModule);
+  for (const userModule of config.userModules) await initModule(userModule);
   wxt.hooks.addHooks(config.hooks);
   await wxt.hooks.callHook("ready", wxt);
 }
@@ -1307,7 +1373,7 @@ async function writeFileIfDifferent(file, newContents) {
 }
 async function getPublicFiles() {
   if (!await fs3.exists(wxt.config.publicDir)) return [];
-  const files = await glob("**/*", { cwd: wxt.config.publicDir });
+  const files = await glob2("**/*", { cwd: wxt.config.publicDir });
   return files.map(unnormalizePath);
 }
 
@@ -1341,13 +1407,17 @@ async function copyPublicDirectory() {
   await wxt.hooks.callHook("build:publicAssets", wxt, files);
   if (files.length === 0) return [];
   const publicAssets = [];
-  for (const { absoluteSrc, relativeDest } of files) {
-    const absoluteDest = resolve6(wxt.config.outDir, relativeDest);
+  for (const file of files) {
+    const absoluteDest = resolve6(wxt.config.outDir, file.relativeDest);
     await fs4.ensureDir(dirname3(absoluteDest));
-    await fs4.copyFile(absoluteSrc, absoluteDest);
+    if ("absoluteSrc" in file) {
+      await fs4.copyFile(file.absoluteSrc, absoluteDest);
+    } else {
+      await fs4.writeFile(absoluteDest, file.contents, "utf8");
+    }
     publicAssets.push({
       type: "asset",
-      fileName: relativeDest
+      fileName: file.relativeDest
     });
   }
   return publicAssets;
@@ -1451,12 +1521,12 @@ import fs5 from "fs-extra";
 import { minimatch } from "minimatch";
 import { parseHTML as parseHTML3 } from "linkedom";
 import JSON5 from "json5";
-import glob2 from "fast-glob";
+import glob3 from "fast-glob";
 import pc2 from "picocolors";
 async function findEntrypoints() {
   await fs5.mkdir(wxt.config.wxtDir, { recursive: true });
   await fs5.writeJson(resolve7(wxt.config.wxtDir, "tsconfig.json"), {});
-  const relativePaths = await glob2(Object.keys(PATH_GLOB_TO_TYPE_MAP), {
+  const relativePaths = await glob3(Object.keys(PATH_GLOB_TO_TYPE_MAP), {
     cwd: wxt.config.entrypointsDir
   });
   relativePaths.sort();
@@ -1465,7 +1535,7 @@ async function findEntrypoints() {
     const inputPath = resolve7(wxt.config.entrypointsDir, relativePath);
     const name = getEntrypointName(wxt.config.entrypointsDir, inputPath);
     const matchingGlob = pathGlobs.find(
-      (glob7) => minimatch(relativePath, glob7)
+      (glob8) => minimatch(relativePath, glob8)
     );
     if (matchingGlob) {
       const type = PATH_GLOB_TO_TYPE_MAP[matchingGlob];
@@ -1826,9 +1896,8 @@ var PATH_GLOB_TO_TYPE_MAP = {
 var CONTENT_SCRIPT_OUT_DIR = "content-scripts";
 
 // src/core/utils/building/generate-wxt-dir.ts
-import { createUnimport as createUnimport2 } from "unimport";
 import fs6 from "fs-extra";
-import { relative as relative4, resolve as resolve8 } from "path";
+import { dirname as dirname4, relative as relative4, resolve as resolve8 } from "node:path";
 import path5 from "node:path";
 
 // src/core/utils/i18n.ts
@@ -1871,41 +1940,32 @@ function parseI18nMessages(messagesJson) {
 // src/core/utils/building/generate-wxt-dir.ts
 async function generateTypesDir(entrypoints) {
   await fs6.ensureDir(wxt.config.typesDir);
-  const references = [];
-  if (wxt.config.imports !== false) {
-    const unimport2 = createUnimport2(wxt.config.imports);
-    references.push(await writeImportsDeclarationFile(unimport2));
-    if (wxt.config.imports.eslintrc.enabled) {
-      await writeImportsEslintFile(unimport2, wxt.config.imports);
-    }
-  }
-  references.push(await writePathsDeclarationFile(entrypoints));
-  references.push(await writeI18nDeclarationFile());
-  references.push(await writeGlobalsDeclarationFile());
-  const mainReference = await writeMainDeclarationFile(references);
-  await writeTsConfigFile(mainReference);
-}
-async function writeImportsDeclarationFile(unimport2) {
-  const filePath = resolve8(wxt.config.typesDir, "imports.d.ts");
-  await unimport2.scanImportsFromDir(void 0, { cwd: wxt.config.srcDir });
-  await writeFileIfDifferent(
-    filePath,
-    ["// Generated by wxt", await unimport2.generateTypeDeclarations()].join(
-      "\n"
-    ) + "\n"
-  );
-  return filePath;
-}
-async function writeImportsEslintFile(unimport2, options) {
-  const globals2 = {};
-  const eslintrc = { globals: globals2 };
-  (await unimport2.getImports()).map((i) => i.as ?? i.name).filter(Boolean).sort().forEach((name) => {
-    eslintrc.globals[name] = options.eslintrc.globalsPropValue;
+  const entries = [
+    // Hard-coded entries
+    { module: "wxt/vite-builder-env" }
+  ];
+  wxt.config.userModules.forEach((module) => {
+    if (module.type === "node_module" && module.configKey != null)
+      entries.push({ module: module.id });
   });
-  await fs6.writeJson(options.eslintrc.filePath, eslintrc, { spaces: 2 });
+  entries.push(await getPathsDeclarationEntry(entrypoints));
+  entries.push(await getI18nDeclarationEntry());
+  entries.push(await getGlobalsDeclarationEntry());
+  entries.push(await getTsConfigEntry());
+  await wxt.hooks.callHook("prepare:types", wxt, entries);
+  entries.push(getMainDeclarationEntry(entries));
+  const absoluteFileEntries = entries.filter((entry) => "path" in entry).map((entry) => ({
+    ...entry,
+    path: resolve8(wxt.config.wxtDir, entry.path)
+  }));
+  await Promise.all(
+    absoluteFileEntries.map(async (file) => {
+      await fs6.ensureDir(dirname4(file.path));
+      await writeFileIfDifferent(file.path, file.text);
+    })
+  );
 }
-async function writePathsDeclarationFile(entrypoints) {
-  const filePath = resolve8(wxt.config.typesDir, "paths.d.ts");
+async function getPathsDeclarationEntry(entrypoints) {
   const unions = entrypoints.map(
     (entry) => getEntrypointBundlePath(
       entry,
@@ -1926,14 +1986,13 @@ declare module "wxt/browser" {
   }
 }
 `;
-  await writeFileIfDifferent(
-    filePath,
-    template.replace("{{ union }}", unions || "    | never")
-  );
-  return filePath;
+  return {
+    path: "types/paths.d.ts",
+    text: template.replace("{{ union }}", unions || "    | never"),
+    tsReference: true
+  };
 }
-async function writeI18nDeclarationFile() {
-  const filePath = resolve8(wxt.config.typesDir, "i18n.d.ts");
+async function getI18nDeclarationEntry() {
   const defaultLocale = wxt.config.manifest.default_locale;
   const template = `// Generated by wxt
 import "wxt/browser";
@@ -1979,18 +2038,17 @@ declare module "wxt/browser" {
       options?: GetMessageOptions,
     ): string;`;
   });
-  await writeFileIfDifferent(
-    filePath,
-    template.replace("{{ overrides }}", overrides.join("\n"))
-  );
-  return filePath;
+  return {
+    path: "types/i18n.d.ts",
+    text: template.replace("{{ overrides }}", overrides.join("\n")),
+    tsReference: true
+  };
 }
-async function writeGlobalsDeclarationFile() {
-  const filePath = resolve8(wxt.config.typesDir, "globals.d.ts");
+async function getGlobalsDeclarationEntry() {
   const globals2 = [...getGlobals(wxt.config), ...getEntrypointGlobals("")];
-  await writeFileIfDifferent(
-    filePath,
-    [
+  return {
+    path: "types/globals.d.ts",
+    text: [
       "// Generated by wxt",
       "export {}",
       "interface ImportMetaEnv {",
@@ -1998,34 +2056,29 @@ async function writeGlobalsDeclarationFile() {
       "}",
       "interface ImportMeta {",
       "  readonly env: ImportMetaEnv",
-      "}"
-    ].join("\n") + "\n"
-  );
-  return filePath;
+      "}",
+      ""
+    ].join("\n"),
+    tsReference: true
+  };
 }
-async function writeMainDeclarationFile(references) {
-  const dir = wxt.config.wxtDir;
-  const filePath = resolve8(dir, "wxt.d.ts");
-  await writeFileIfDifferent(
-    filePath,
-    [
-      "// Generated by wxt",
-      `/// <reference types="wxt/vite-builder-env" />`,
-      ...references.map(
-        (ref) => `/// <reference types="./${normalizePath(relative4(dir, ref))}" />`
-      ),
-      // Add references to modules installed from NPM to the TS project so
-      // their type augmentation can update InlineConfig correctly. Local
-      // modules defined in <root>/modules are already apart of the project, so
-      // we don't need to add them.
-      ...wxt.config.modules.filter(
-        (module) => module.type === "node_module" && module.configKey != null
-      ).map((module) => `/// <reference types="${module.id}" />`)
-    ].join("\n") + "\n"
-  );
-  return filePath;
+function getMainDeclarationEntry(references) {
+  const lines = ["// Generated by wxt"];
+  references.forEach((ref) => {
+    if ("module" in ref) {
+      return lines.push(`/// <reference types="${ref.module}" />`);
+    } else if (ref.tsReference) {
+      const absolutePath = resolve8(wxt.config.wxtDir, ref.path);
+      const relativePath = relative4(wxt.config.wxtDir, absolutePath);
+      lines.push(`/// <reference types="./${normalizePath(relativePath)}" />`);
+    }
+  });
+  return {
+    path: "wxt.d.ts",
+    text: lines.join("\n") + "\n"
+  };
 }
-async function writeTsConfigFile(mainReference) {
+async function getTsConfigEntry() {
   const dir = wxt.config.wxtDir;
   const getTsconfigPath = (path11) => normalizePath(relative4(dir, path11));
   const paths = Object.entries(wxt.config.alias).flatMap(([alias, absolutePath]) => {
@@ -2035,9 +2088,7 @@ async function writeTsConfigFile(mainReference) {
       `      "${alias}/*": ["${aliasPath}/*"]`
     ];
   }).join(",\n");
-  await writeFileIfDifferent(
-    resolve8(dir, "tsconfig.json"),
-    `{
+  const text = `{
   "compilerOptions": {
     "target": "ESNext",
     "module": "ESNext",
@@ -2054,11 +2105,14 @@ ${paths}
   },
   "include": [
     "${getTsconfigPath(wxt.config.root)}/**/*",
-    "./${getTsconfigPath(mainReference)}"
+    "./wxt.d.ts"
   ],
   "exclude": ["${getTsconfigPath(wxt.config.outBaseDir)}"]
-}`
-  );
+}`;
+  return {
+    path: "tsconfig.json",
+    text
+  };
 }
 
 // src/core/utils/building/resolve-config.ts
@@ -2067,13 +2121,13 @@ import path6 from "node:path";
 
 // src/core/utils/cache.ts
 import fs7, { ensureDir as ensureDir3 } from "fs-extra";
-import { dirname as dirname4, resolve as resolve9 } from "path";
+import { dirname as dirname5, resolve as resolve9 } from "path";
 function createFsCache(wxtDir) {
   const getPath = (key) => resolve9(wxtDir, "cache", encodeURIComponent(key));
   return {
     async set(key, value) {
       const path11 = getPath(key);
-      await ensureDir3(dirname4(path11));
+      await ensureDir3(dirname5(path11));
       await writeFileIfDifferent(path11, value);
     },
     async get(key) {
@@ -2113,7 +2167,7 @@ function isModuleInstalled(name) {
 
 // src/core/utils/building/resolve-config.ts
 import fs9 from "fs-extra";
-import glob3 from "fast-glob";
+import glob4 from "fast-glob";
 async function resolveConfig(inlineConfig, command) {
   let userConfig = {};
   let userConfigMetadata;
@@ -2190,14 +2244,20 @@ async function resolveConfig(inlineConfig, command) {
       hostname: "localhost"
     };
   }
-  const modules = await resolveWxtModules(modulesDir, mergedConfig.modules);
-  const moduleOptions = modules.reduce((map, module) => {
-    if (module.configKey) {
-      map[module.configKey] = // @ts-expect-error
-      mergedConfig[module.configKey];
-    }
-    return map;
-  }, {});
+  const userModules = await resolveWxtUserModules(
+    modulesDir,
+    mergedConfig.modules
+  );
+  const moduleOptions = userModules.reduce(
+    (map, module) => {
+      if (module.configKey) {
+        map[module.configKey] = // @ts-expect-error
+        mergedConfig[module.configKey];
+      }
+      return map;
+    },
+    {}
+  );
   return {
     browser,
     command,
@@ -2207,7 +2267,7 @@ async function resolveConfig(inlineConfig, command) {
     filterEntrypoints,
     env,
     fsCache: createFsCache(wxtDir),
-    imports: await getUnimportOptions(wxtDir, logger, mergedConfig),
+    imports: await getUnimportOptions(wxtDir, srcDir, logger, mergedConfig),
     logger,
     manifest: await resolveManifestConfig(env, mergedConfig.manifest),
     manifestVersion,
@@ -2236,7 +2296,8 @@ async function resolveConfig(inlineConfig, command) {
     },
     hooks: mergedConfig.hooks ?? {},
     vite: mergedConfig.vite ?? (() => ({})),
-    modules,
+    builtinModules,
+    userModules,
     plugins: [],
     ...moduleOptions
   };
@@ -2308,17 +2369,17 @@ function resolveAnalysisConfig(root, mergedConfig) {
     keepArtifacts: mergedConfig.analysis?.keepArtifacts ?? false
   };
 }
-async function getUnimportOptions(wxtDir, logger, config) {
+async function getUnimportOptions(wxtDir, srcDir, logger, config) {
   if (config.imports === false) return false;
-  const enabledConfig = config.imports?.eslintrc?.enabled;
-  let enabled;
-  switch (enabledConfig) {
+  const rawEslintEnabled = config.imports?.eslintrc?.enabled;
+  let eslintEnabled;
+  switch (rawEslintEnabled) {
     case void 0:
     case "auto":
-      enabled = await isModuleInstalled("eslint");
+      eslintEnabled = await isModuleInstalled("eslint");
       break;
     default:
-      enabled = enabledConfig;
+      eslintEnabled = rawEslintEnabled;
   }
   const defaultOptions = {
     debugLog: logger.debug,
@@ -2334,8 +2395,11 @@ async function getUnimportOptions(wxtDir, logger, config) {
     ],
     warn: logger.warn,
     dirs: ["components", "composables", "hooks", "utils"],
+    dirsScanOptions: {
+      cwd: srcDir
+    },
     eslintrc: {
-      enabled,
+      enabled: eslintEnabled,
       filePath: path6.resolve(wxtDir, "eslintrc-auto-import.json"),
       globalsPropValue: true
     }
@@ -2364,19 +2428,19 @@ var COMMAND_MODES = {
   serve: "development"
 };
 async function mergeBuilderConfig(inlineConfig, userConfig) {
-  const vite = await import("vite").catch(() => void 0);
-  if (vite) {
+  const vite2 = await import("vite").catch(() => void 0);
+  if (vite2) {
     return {
       vite: async (env) => {
         const resolvedInlineConfig = await inlineConfig.vite?.(env) ?? {};
         const resolvedUserConfig = await userConfig.vite?.(env) ?? {};
-        return vite.mergeConfig(resolvedUserConfig, resolvedInlineConfig);
+        return vite2.mergeConfig(resolvedUserConfig, resolvedInlineConfig);
       }
     };
   }
   throw Error("Builder not found. Make sure vite is installed.");
 }
-async function resolveWxtModules(modulesDir, modules = []) {
+async function resolveWxtUserModules(modulesDir, modules = []) {
   const npmModules = await Promise.all(
     modules.map(async (moduleId) => {
       const mod = await import(
@@ -2393,7 +2457,7 @@ async function resolveWxtModules(modulesDir, modules = []) {
       };
     })
   );
-  const localModulePaths = await glob3(["*.[tj]s", "*/index.[tj]s"], {
+  const localModulePaths = await glob4(["*.[tj]s", "*/index.[tj]s"], {
     cwd: modulesDir,
     onlyFiles: true
   }).catch(() => []);
@@ -2464,7 +2528,7 @@ var ENTRY_TYPE_TO_GROUP_MAP = {
 
 // src/core/utils/building/import-entrypoint.ts
 import createJITI from "jiti";
-import { createUnimport as createUnimport3 } from "unimport";
+import { createUnimport as createUnimport2 } from "unimport";
 import fs10 from "fs-extra";
 import { relative as relative5, resolve as resolve11 } from "node:path";
 import { transformSync } from "esbuild";
@@ -2472,15 +2536,15 @@ import { fileURLToPath } from "node:url";
 async function importEntrypointFile(path11) {
   wxt.logger.debug("Loading file metadata:", path11);
   const normalPath = normalizePath(path11);
-  const unimport2 = createUnimport3({
+  const unimport = createUnimport2({
     ...wxt.config.imports,
     // Only allow specific imports, not all from the project
     dirs: []
   });
-  await unimport2.init();
+  await unimport.init();
   const text = await fs10.readFile(path11, "utf-8");
   const textNoImports = removeProjectImportStatements(text);
-  const { code } = await unimport2.injectImports(textNoImports);
+  const { code } = await unimport.injectImports(textNoImports);
   wxt.logger.debug(
     ["Text:", text, "No imports:", textNoImports, "Code:", code].join("\n")
   );
@@ -2662,7 +2726,7 @@ function getChunkSortWeight(filename) {
 import pc4 from "picocolors";
 
 // package.json
-var version = "0.18.8";
+var version = "0.18.9";
 
 // src/core/utils/log/printHeader.ts
 function printHeader() {
@@ -2671,7 +2735,7 @@ function printHeader() {
 }
 
 // src/core/utils/building/internal-build.ts
-import glob4 from "fast-glob";
+import glob5 from "fast-glob";
 
 // src/core/utils/manifest.ts
 import fs12 from "fs-extra";
@@ -3436,7 +3500,7 @@ async function internalBuild() {
   return output;
 }
 async function combineAnalysisStats() {
-  const unixFiles = await glob4(`${wxt.config.analysis.outputName}-*.json`, {
+  const unixFiles = await glob5(`${wxt.config.analysis.outputName}-*.json`, {
     cwd: wxt.config.analysis.outputDir,
     absolute: true
   });
@@ -3485,7 +3549,7 @@ async function build(config) {
 
 // src/core/clean.ts
 import path8 from "node:path";
-import glob5 from "fast-glob";
+import glob6 from "fast-glob";
 import fs14 from "fs-extra";
 import pc6 from "picocolors";
 async function clean(root = process.cwd()) {
@@ -3497,7 +3561,7 @@ async function clean(root = process.cwd()) {
     ".output/*"
   ];
   consola.debug("Looking for:", tempDirs.map(pc6.cyan).join(", "));
-  const directories = await glob5(tempDirs, {
+  const directories = await glob6(tempDirs, {
     cwd: path8.resolve(root),
     absolute: true,
     onlyDirectories: true,
@@ -3989,7 +4053,7 @@ import path10 from "node:path";
 import fs16 from "fs-extra";
 import { minimatch as minimatch2 } from "minimatch";
 import JSZip from "jszip";
-import glob6 from "fast-glob";
+import glob7 from "fast-glob";
 async function zip(config) {
   await registerWxt("build", config);
   const output = await internalBuild();
@@ -4037,7 +4101,7 @@ async function zip(config) {
 }
 async function zipDir(directory, outputPath, options) {
   const archive = new JSZip();
-  const files = (await glob6("**/*", {
+  const files = (await glob7("**/*", {
     cwd: directory,
     // Ignore node_modules, otherwise this glob step takes forever
     ignore: ["**/node_modules"],