wxt 0.18.10 → 0.18.11

package/dist/{chunk-2V7XZSZQ.js → chunk-XNTIBS6O.js}

@@ -16,7 +16,7 @@ import {
 } from "./chunk-QGM4M3NI.js";
 
 // package.json
-var version = "0.18.9";
+var version = "0.18.10";
 
 // src/core/utils/paths.ts
 import systemPath from "node:path";
@@ -749,8 +749,10 @@ var unimport_default = defineWxtModule({
     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));
+      if (options.eslintrc.enabled === false) return;
+      entries.push(
+        await getEslintConfigEntry(unimport, options.eslintrc.enabled, options)
+      );
     });
     addViteConfig(wxt2, () => ({
       plugins: [vitePlugin(unimport)]
@@ -791,15 +793,32 @@ async function getImportsDeclarationEntry(unimport) {
     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;
-  });
+async function getEslintConfigEntry(unimport, version2, options) {
+  const globals2 = (await unimport.getImports()).map((i) => i.as ?? i.name).filter(Boolean).sort().reduce((globals3, name) => {
+    globals3[name] = options.eslintrc.globalsPropValue;
+    return globals3;
+  }, {});
+  if (version2 <= 8) return getEslint8ConfigEntry(options, globals2);
+  else return getEslint9ConfigEntry(options, globals2);
+}
+function getEslint8ConfigEntry(options, globals2) {
   return {
     path: options.eslintrc.filePath,
-    text: JSON.stringify(eslintrc, null, 2) + "\n"
+    text: JSON.stringify({ globals: globals2 }, null, 2) + "\n"
+  };
+}
+function getEslint9ConfigEntry(options, globals2) {
+  return {
+    path: options.eslintrc.filePath,
+    text: `const globals = ${JSON.stringify(globals2, null, 2)}
+
+export default {
+  languageOptions: {
+    globals,
+    sourceType: "module",
+  },
+};
+`
   };
 }
 
@@ -1584,35 +1603,25 @@ function createFsCache(wxtDir) {
 
 // src/core/utils/building/resolve-config.ts
 import defu from "defu";
-
-// src/core/utils/package.ts
-import { resolve as resolve10 } from "node:path";
 import fs8 from "fs-extra";
-async function getPackageJson() {
-  const file = resolve10(wxt.config.root, "package.json");
-  try {
-    return await fs8.readJson(file);
-  } catch (err) {
-    wxt.logger.debug(
-      `Failed to read package.json at: ${file}. Returning undefined.`
-    );
-    return {};
-  }
-}
-function isModuleInstalled(name) {
-  return import(
-    /* @vite-ignore */
-    name
-  ).then(() => true).catch(() => false);
-}
-
-// src/core/utils/building/resolve-config.ts
-import fs9 from "fs-extra";
 import glob3 from "fast-glob";
 
 // src/builtin-modules/index.ts
 var builtinModules = [unimport_default];
 
+// src/core/utils/eslint.ts
+async function getEslintVersion() {
+  try {
+    const require2 = (await import("node:module")).default.createRequire(
+      import.meta.url
+    );
+    const { ESLint } = require2("eslint");
+    return ESLint.version?.split(".") ?? [];
+  } catch (error) {
+    return [];
+  }
+}
+
 // src/core/utils/building/resolve-config.ts
 async function resolveConfig(inlineConfig, command) {
   let userConfig = {};
@@ -1727,7 +1736,7 @@ async function resolveConfig(inlineConfig, command) {
     srcDir,
     typesDir,
     wxtDir,
-    zip: resolveZipConfig(root, mergedConfig),
+    zip: resolveZipConfig(root, outBaseDir, mergedConfig),
     transformManifest: mergedConfig.transformManifest,
     analysis: resolveAnalysisConfig(root, mergedConfig),
     userConfigMetadata: userConfigMetadata ?? {},
@@ -1772,7 +1781,7 @@ async function mergeInlineConfig(inlineConfig, userConfig) {
     ...builderConfig
   };
 }
-function resolveZipConfig(root, mergedConfig) {
+function resolveZipConfig(root, outBaseDir, mergedConfig) {
   const downloadedPackagesDir = path5.resolve(root, ".wxt/local_modules");
   return {
     name: void 0,
@@ -1791,6 +1800,8 @@ function resolveZipConfig(root, mergedConfig) {
       // Tests
       "**/__tests__/**",
       "**/*.+(test|spec).?(c|m)+(j|t)s?(x)",
+      // Output directory
+      `${path5.relative(root, outBaseDir)}/**`,
       // From user
       ...mergedConfig.zip?.excludeSources ?? []
     ],
@@ -1817,16 +1828,6 @@ function resolveAnalysisConfig(root, mergedConfig) {
 }
 async function getUnimportOptions(wxtDir, srcDir, logger, config) {
   if (config.imports === false) return false;
-  const rawEslintEnabled = config.imports?.eslintrc?.enabled;
-  let eslintEnabled;
-  switch (rawEslintEnabled) {
-    case void 0:
-    case "auto":
-      eslintEnabled = await isModuleInstalled("eslint");
-      break;
-    default:
-      eslintEnabled = rawEslintEnabled;
-  }
   const defaultOptions = {
     debugLog: logger.debug,
     imports: [
@@ -1844,23 +1845,45 @@ async function getUnimportOptions(wxtDir, srcDir, logger, config) {
     dirsScanOptions: {
       cwd: srcDir
     },
-    eslintrc: {
-      enabled: eslintEnabled,
-      filePath: path5.resolve(wxtDir, "eslintrc-auto-import.json"),
-      globalsPropValue: true
-    }
+    eslintrc: await getUnimportEslintOptions(wxtDir, config.imports?.eslintrc)
   };
   return defu(
     config.imports ?? {},
     defaultOptions
   );
 }
+async function getUnimportEslintOptions(wxtDir, options) {
+  const rawEslintEnabled = options?.enabled ?? "auto";
+  let eslintEnabled;
+  switch (rawEslintEnabled) {
+    case "auto":
+      const version2 = await getEslintVersion();
+      let major = parseInt(version2[0]);
+      if (major <= 8) eslintEnabled = 8;
+      else if (major >= 9) eslintEnabled = 9;
+      else eslintEnabled = 8;
+      break;
+    case true:
+      eslintEnabled = 8;
+      break;
+    default:
+      eslintEnabled = rawEslintEnabled;
+  }
+  return {
+    enabled: eslintEnabled,
+    filePath: path5.resolve(
+      wxtDir,
+      eslintEnabled === 9 ? "eslint-auto-imports.mjs" : "eslintrc-auto-import.json"
+    ),
+    globalsPropValue: true
+  };
+}
 async function resolveWxtModuleDir() {
   const requireResolve = __require?.resolve ?? (await import("node:module")).default.createRequire(import.meta.url).resolve;
   return path5.resolve(requireResolve("wxt"), "../..");
 }
 async function isDirMissing(dir) {
-  return !await fs9.exists(dir);
+  return !await fs8.exists(dir);
 }
 function logMissingDir(logger, name, expected) {
   logger.warn(
@@ -1975,8 +1998,8 @@ var ENTRY_TYPE_TO_GROUP_MAP = {
 // src/core/utils/building/import-entrypoint.ts
 import createJITI from "jiti";
 import { createUnimport as createUnimport2 } from "unimport";
-import fs10 from "fs-extra";
-import { relative as relative5, resolve as resolve11 } from "node:path";
+import fs9 from "fs-extra";
+import { relative as relative5, resolve as resolve10 } from "node:path";
 import { transformSync } from "esbuild";
 import { fileURLToPath } from "node:url";
 async function importEntrypointFile(path8) {
@@ -1988,7 +2011,7 @@ async function importEntrypointFile(path8) {
     dirs: []
   });
   await unimport.init();
-  const text = await fs10.readFile(path8, "utf-8");
+  const text = await fs9.readFile(path8, "utf-8");
   const textNoImports = removeProjectImportStatements(text);
   const { code } = await unimport.injectImports(textNoImports);
   wxt.logger.debug(
@@ -2001,7 +2024,7 @@ async function importEntrypointFile(path8) {
       debug: wxt.config.debug,
       esmResolve: true,
       alias: {
-        "webextension-polyfill": resolve11(
+        "webextension-polyfill": resolve10(
           wxt.config.wxtModuleDir,
           "dist/virtual/mock-browser.js"
         )
@@ -2066,12 +2089,12 @@ import pc5 from "picocolors";
 import fs13 from "fs-extra";
 
 // src/core/utils/log/printBuildSummary.ts
-import { resolve as resolve12 } from "path";
+import { resolve as resolve11 } from "path";
 
 // src/core/utils/log/printFileList.ts
 import path6 from "node:path";
 import pc3 from "picocolors";
-import fs11 from "fs-extra";
+import fs10 from "fs-extra";
 import { filesize } from "filesize";
 
 // src/core/utils/log/printTable.ts
@@ -2109,7 +2132,7 @@ async function printFileList(log, header, baseDir, files) {
       ];
       const prefix = i === files.length - 1 ? "  \u2514\u2500" : "  \u251C\u2500";
       const color = getChunkColor(file);
-      const stats = await fs11.lstat(file);
+      const stats = await fs10.lstat(file);
       totalSize += stats.size;
       const size = String(filesize(stats.size));
       return [
@@ -2150,7 +2173,7 @@ async function printBuildSummary(log, header, output) {
     return l.fileName.localeCompare(r.fileName);
   });
   const files = chunks.map(
-    (chunk) => resolve12(wxt.config.outDir, chunk.fileName)
+    (chunk) => resolve11(wxt.config.outDir, chunk.fileName)
   );
   await printFileList(log, header, wxt.config.outDir, files);
 }
@@ -2280,6 +2303,21 @@ function getContentScriptJs(config, entrypoint) {
   return [getEntrypointBundlePath(entrypoint, config.outDir, ".js")];
 }
 
+// src/core/utils/package.ts
+import { resolve as resolve12 } from "node:path";
+import fs11 from "fs-extra";
+async function getPackageJson() {
+  const file = resolve12(wxt.config.root, "package.json");
+  try {
+    return await fs11.readJson(file);
+  } catch (err) {
+    wxt.logger.debug(
+      `Failed to read package.json at: ${file}. Returning undefined.`
+    );
+    return {};
+  }
+}
+
 // src/core/utils/manifest.ts
 import defu2 from "defu";
 async function writeManifest(manifest, output) {
@@ -2967,12 +3005,12 @@ function printValidationResults({
     return map;
   }, /* @__PURE__ */ new Map());
   Array.from(entrypointErrors.entries()).forEach(([entrypoint, errors2]) => {
-    consola.log(relative6(cwd, entrypoint.inputPath));
+    wxt.logger.log(relative6(cwd, entrypoint.inputPath));
     console.log();
     errors2.forEach((err) => {
       const type = err.type === "error" ? pc5.red("ERROR") : pc5.yellow("WARN");
       const recieved = pc5.dim(`(recieved: ${JSON.stringify(err.value)})`);
-      consola.log(`  - ${type} ${err.message} ${recieved}`);
+      wxt.logger.log(`  - ${type} ${err.message} ${recieved}`);
     });
     console.log();
   });
@@ -2998,7 +3036,7 @@ var npm = {
   overridesKey: "overrides",
   async downloadDependency(id, downloadDir) {
     await ensureDir3(downloadDir);
-    const { execa } = await import("./execa-D7CMCKO2.js");
+    const { execa } = await import("./execa-4UBDUBJZ.js");
     const res = await execa("npm", ["pack", id, "--json"], {
       cwd: downloadDir
     });
@@ -3010,7 +3048,7 @@ var npm = {
     if (options?.all) {
       args.push("--depth", "Infinity");
     }
-    const { execa } = await import("./execa-D7CMCKO2.js");
+    const { execa } = await import("./execa-4UBDUBJZ.js");
     const res = await execa("npm", args, { cwd: options?.cwd });
     const project = JSON.parse(res.stdout);
     return flattenNpmListOutput([project]);
@@ -3063,7 +3101,7 @@ var bun = {
     if (options?.all) {
       args.push("--all");
     }
-    const { execa } = await import("./execa-D7CMCKO2.js");
+    const { execa } = await import("./execa-4UBDUBJZ.js");
     const res = await execa("bun", args, { cwd: options?.cwd });
     return dedupeDependencies(
       res.stdout.split("\n").slice(1).map((line) => line.trim()).map((line) => /.* (@?\S+)@(\S+)$/.exec(line)).filter((match) => !!match).map(([_, name, version2]) => ({ name, version: version2 }))
@@ -3082,7 +3120,7 @@ var yarn = {
     if (options?.all) {
       args.push("--depth", "Infinity");
     }
-    const { execa } = await import("./execa-D7CMCKO2.js");
+    const { execa } = await import("./execa-4UBDUBJZ.js");
     const res = await execa("yarn", args, { cwd: options?.cwd });
     const tree = res.stdout.split("\n").map((line) => JSON.parse(line)).find((line) => line.type === "tree")?.data;
     if (tree == null) throw Error("'yarn list --json' did not output a tree");
@@ -3118,7 +3156,7 @@ var pnpm = {
     if (typeof process !== "undefined" && process.env.WXT_PNPM_IGNORE_WORKSPACE === "true") {
       args.push("--ignore-workspace");
     }
-    const { execa } = await import("./execa-D7CMCKO2.js");
+    const { execa } = await import("./execa-4UBDUBJZ.js");
     const res = await execa("pnpm", args, { cwd: options?.cwd });
     const projects = JSON.parse(res.stdout);
     return flattenNpmListOutput(projects);
@@ -3366,7 +3404,10 @@ async function createViteBuilder(wxtConfig, hooks, server) {
           const config = vite.mergeConfig(baseConfig, envConfig);
           const server2 = await vite.createServer(config);
           await server2.pluginContainer.buildStart({});
-          const node = new ViteNodeServer(server2);
+          const node = new ViteNodeServer(
+            // @ts-ignore: Some weird type error...
+            server2
+          );
           installSourcemapsSupport({
             getSourceMap: (source) => node.getSourceMap(source)
           });
@@ -3519,12 +3560,12 @@ export {
   detectDevChanges,
   findEntrypoints,
   generateTypesDir,
-  getPackageJson,
   resolveConfig,
   printFileList,
   version,
   mapWxtOptionsToRegisteredContentScript,
   getContentScriptJs,
+  getPackageJson,
   getContentScriptCssFiles,
   getContentScriptsCssMap,
   rebuild,