wxt 0.16.5 → 0.16.7

package/dist/{chunk-N5MSLHHE.js → chunk-KKL6XTRP.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "0.16.5";
+var version = "0.16.7";
 
 // src/core/utils/fs.ts
 import fs from "fs-extra";
@@ -573,29 +573,6 @@ import { createUnimport } from "unimport";
 import fs4 from "fs-extra";
 import { relative as relative3, resolve as resolve4 } from "path";
 
-// src/core/utils/unimport.ts
-import { defu } from "defu";
-function getUnimportOptions(config) {
-  if (config.imports === false)
-    return false;
-  const defaultOptions = {
-    debugLog: config.logger.debug,
-    imports: [
-      { name: "defineConfig", from: "wxt" },
-      { name: "fakeBrowser", from: "wxt/testing" }
-    ],
-    presets: [
-      { package: "wxt/client" },
-      { package: "wxt/browser" },
-      { package: "wxt/sandbox" },
-      { package: "wxt/storage" }
-    ],
-    warn: config.logger.warn,
-    dirs: ["components", "composables", "hooks", "utils"]
-  };
-  return defu(config.imports, defaultOptions);
-}
-
 // src/core/utils/globals.ts
 function getGlobals(config) {
   return [
@@ -695,9 +672,12 @@ function parseI18nMessages(messagesJson) {
 async function generateTypesDir(entrypoints) {
   await fs4.ensureDir(wxt.config.typesDir);
   const references = [];
-  const imports = getUnimportOptions(wxt.config);
-  if (imports !== false) {
-    references.push(await writeImportsDeclarationFile(imports));
+  if (wxt.config.imports !== false) {
+    const unimport2 = createUnimport(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());
@@ -705,9 +685,8 @@ async function generateTypesDir(entrypoints) {
   const mainReference = await writeMainDeclarationFile(references);
   await writeTsConfigFile(mainReference);
 }
-async function writeImportsDeclarationFile(unimportOptions) {
+async function writeImportsDeclarationFile(unimport2) {
   const filePath = resolve4(wxt.config.typesDir, "imports.d.ts");
-  const unimport2 = createUnimport(unimportOptions);
   await unimport2.scanImportsFromDir(void 0, { cwd: wxt.config.srcDir });
   await writeFileIfDifferent(
     filePath,
@@ -717,6 +696,14 @@ async function writeImportsDeclarationFile(unimportOptions) {
   );
   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;
+  });
+  await fs4.writeJson(options.eslintrc.filePath, eslintrc, { spaces: 2 });
+}
 async function writePathsDeclarationFile(entrypoints) {
   const filePath = resolve4(wxt.config.typesDir, "paths.d.ts");
   const unions = entrypoints.map(
@@ -1206,7 +1193,7 @@ var ENABLED_EXTENSIONS = /* @__PURE__ */ new Set([
   ".svelte"
 ]);
 function unimport(config) {
-  const options = getUnimportOptions(config);
+  const options = config.imports;
   if (options === false)
     return [];
   const unimport2 = createUnimport2(options);
@@ -1324,7 +1311,10 @@ var increment = 0;
 function bundleAnalysis(config) {
   return visualizer({
     template: "raw-data",
-    filename: path3.resolve(config.outDir, `stats-${increment++}.json`)
+    filename: path3.resolve(
+      config.analysis.outputDir,
+      `${config.analysis.outputName}-${increment++}.json`
+    )
   });
 }
 
@@ -1641,7 +1631,27 @@ function getRollupEntry(entrypoint) {
 }
 
 // src/core/utils/building/resolve-config.ts
-import defu2 from "defu";
+import defu from "defu";
+
+// src/core/utils/package.ts
+import { resolve as resolve9 } from "node:path";
+import fs8 from "fs-extra";
+async function getPackageJson() {
+  const file = resolve9(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(name).then(() => true).catch(() => false);
+}
+
+// src/core/utils/building/resolve-config.ts
 async function resolveConfig(inlineConfig, command, server) {
   let userConfig = {};
   let userConfigMetadata;
@@ -1698,6 +1708,12 @@ async function resolveConfig(inlineConfig, command, server) {
       "~~": root
     }).map(([key, value]) => [key, path5.resolve(root, value)])
   );
+  const analysisOutputFile = path5.resolve(
+    root,
+    mergedConfig.analysis?.outputFile ?? "stats.html"
+  );
+  const analysisOutputDir = path5.dirname(analysisOutputFile);
+  const analysisOutputName = path5.parse(analysisOutputFile).name;
   const finalConfig = {
     browser,
     command,
@@ -1706,7 +1722,7 @@ async function resolveConfig(inlineConfig, command, server) {
     filterEntrypoints,
     env,
     fsCache: createFsCache(wxtDir),
-    imports: mergedConfig.imports ?? {},
+    imports: await getUnimportOptions(wxtDir, logger, mergedConfig),
     logger,
     manifest: await resolveManifestConfig(env, mergedConfig.manifest),
     manifestVersion,
@@ -1727,10 +1743,10 @@ async function resolveConfig(inlineConfig, command, server) {
     analysis: {
       enabled: mergedConfig.analysis?.enabled ?? false,
       template: mergedConfig.analysis?.template ?? "treemap",
-      outputFile: path5.resolve(
-        root,
-        mergedConfig.analysis?.outputFile ?? "stats.html"
-      )
+      outputFile: analysisOutputFile,
+      outputDir: analysisOutputDir,
+      outputName: analysisOutputName,
+      keepArtifacts: mergedConfig.analysis?.keepArtifacts ?? false
     },
     userConfigMetadata: userConfigMetadata ?? {},
     alias,
@@ -1763,22 +1779,22 @@ function mergeInlineConfig(inlineConfig, userConfig) {
   } else if (userConfig.imports == null && inlineConfig.imports == null) {
     imports = void 0;
   } else {
-    imports = defu2(inlineConfig.imports ?? {}, userConfig.imports ?? {});
+    imports = defu(inlineConfig.imports ?? {}, userConfig.imports ?? {});
   }
   const manifest = async (env) => {
     const user = await resolveManifestConfig(env, userConfig.manifest);
     const inline = await resolveManifestConfig(env, inlineConfig.manifest);
-    return defu2(inline, user);
+    return defu(inline, user);
   };
-  const runner = defu2(
+  const runner = defu(
     inlineConfig.runner ?? {},
     userConfig.runner ?? {}
   );
-  const zip = defu2(
+  const zip = defu(
     inlineConfig.zip ?? {},
     userConfig.zip ?? {}
   );
-  const hooks = defu2(
+  const hooks = defu(
     inlineConfig.hooks ?? {},
     userConfig.hooks ?? {}
   );
@@ -1842,6 +1858,44 @@ function resolveInternalZipConfig(root, mergedConfig) {
     ]
   };
 }
+async function getUnimportOptions(wxtDir, logger, config) {
+  if (config.imports === false)
+    return false;
+  const enabledConfig = config.imports?.eslintrc?.enabled;
+  let enabled;
+  switch (enabledConfig) {
+    case void 0:
+    case "auto":
+      enabled = await isModuleInstalled("eslint");
+      break;
+    default:
+      enabled = enabledConfig;
+  }
+  const defaultOptions = {
+    debugLog: logger.debug,
+    imports: [
+      { name: "defineConfig", from: "wxt" },
+      { name: "fakeBrowser", from: "wxt/testing" }
+    ],
+    presets: [
+      { package: "wxt/client" },
+      { package: "wxt/browser" },
+      { package: "wxt/sandbox" },
+      { package: "wxt/storage" }
+    ],
+    warn: logger.warn,
+    dirs: ["components", "composables", "hooks", "utils"],
+    eslintrc: {
+      enabled,
+      filePath: path5.resolve(wxtDir, "eslintrc-auto-import.json"),
+      globalsPropValue: true
+    }
+  };
+  return defu(
+    config.imports ?? {},
+    defaultOptions
+  );
+}
 
 // src/core/utils/building/group-entrypoints.ts
 function groupEntrypoints(entrypoints) {
@@ -1885,8 +1939,8 @@ var ENTRY_TYPE_TO_GROUP_MAP = {
 // src/core/utils/building/import-entrypoint.ts
 import createJITI from "jiti";
 import { createUnimport as createUnimport3 } from "unimport";
-import fs8 from "fs-extra";
-import { relative as relative5, resolve as resolve9 } from "node:path";
+import fs9 from "fs-extra";
+import { relative as relative5, resolve as resolve10 } from "node:path";
 
 // src/core/utils/strings.ts
 function kebabCaseAlphanumeric(str) {
@@ -1912,12 +1966,12 @@ async function importEntrypointFile(path7) {
   wxt.logger.debug("Loading file metadata:", path7);
   const normalPath = normalizePath(path7);
   const unimport2 = createUnimport3({
-    ...getUnimportOptions(wxt.config),
+    ...wxt.config.imports,
     // Only allow specific imports, not all from the project
     dirs: []
   });
   await unimport2.init();
-  const text = await fs8.readFile(path7, "utf-8");
+  const text = await fs9.readFile(path7, "utf-8");
   const textNoImports = removeProjectImportStatements(text);
   const { code } = await unimport2.injectImports(textNoImports);
   wxt.logger.debug(
@@ -1930,7 +1984,7 @@ async function importEntrypointFile(path7) {
       debug: wxt.config.debug,
       esmResolve: true,
       alias: {
-        "webextension-polyfill": resolve9(
+        "webextension-polyfill": resolve10(
           wxt.config.root,
           "node_modules/wxt/dist/virtual/mock-browser.js"
         )
@@ -1990,12 +2044,12 @@ import pc5 from "picocolors";
 import fs12 from "fs-extra";
 
 // src/core/utils/log/printBuildSummary.ts
-import { resolve as resolve10 } from "path";
+import { resolve as resolve11 } from "path";
 
 // src/core/utils/log/printFileList.ts
 import path6 from "node:path";
 import pc3 from "picocolors";
-import fs9 from "fs-extra";
+import fs10 from "fs-extra";
 import { filesize } from "filesize";
 
 // src/core/utils/log/printTable.ts
@@ -2036,7 +2090,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 fs9.lstat(file);
+      const stats = await fs10.lstat(file);
       totalSize += stats.size;
       const size = String(filesize(stats.size));
       return [
@@ -2078,7 +2132,7 @@ async function printBuildSummary(log, header, output) {
     return l.fileName.localeCompare(r.fileName);
   });
   const files = chunks.map(
-    (chunk) => resolve10(wxt.config.outDir, chunk.fileName)
+    (chunk) => resolve11(wxt.config.outDir, chunk.fileName)
   );
   await printFileList(log, header, wxt.config.outDir, files);
 }
@@ -2208,23 +2262,8 @@ function mapWxtOptionsToContentScript(options) {
   };
 }
 
-// src/core/utils/package.ts
-import { resolve as resolve11 } from "node:path";
-import fs10 from "fs-extra";
-async function getPackageJson() {
-  const file = resolve11(wxt.config.root, "package.json");
-  try {
-    return await fs10.readJson(file);
-  } catch (err) {
-    wxt.logger.debug(
-      `Failed to read package.json at: ${file}. Returning undefined.`
-    );
-    return {};
-  }
-}
-
 // src/core/utils/manifest.ts
-import defu3 from "defu";
+import defu2 from "defu";
 async function writeManifest(manifest, output) {
   const str = wxt.config.mode === "production" ? JSON.stringify(manifest) : JSON.stringify(manifest, null, 2);
   await fs11.ensureDir(wxt.config.outDir);
@@ -2254,7 +2293,7 @@ async function generateManifest(entrypoints, buildOutput) {
     icons: discoverIcons(buildOutput)
   };
   const userManifest = wxt.config.manifest;
-  let manifest = defu3(
+  let manifest = defu2(
     userManifest,
     baseManifest
   );
@@ -2833,8 +2872,8 @@ async function internalBuild() {
   return output;
 }
 async function combineAnalysisStats() {
-  const unixFiles = await glob3(`stats-*.json`, {
-    cwd: wxt.config.outDir,
+  const unixFiles = await glob3(`${wxt.config.analysis.outputName}-*.json`, {
+    cwd: wxt.config.analysis.outputDir,
     absolute: true
   });
   const absolutePaths = unixFiles.map(unnormalizePath);
@@ -2849,7 +2888,9 @@ async function combineAnalysisStats() {
     ],
     { cwd: wxt.config.root, stdio: "inherit" }
   );
-  await Promise.all(absolutePaths.map((statsFile) => fs12.remove(statsFile)));
+  if (!wxt.config.analysis.keepArtifacts) {
+    await Promise.all(absolutePaths.map((statsFile) => fs12.remove(statsFile)));
+  }
 }
 function printValidationResults({
   errorCount,
@@ -2912,11 +2953,11 @@ export {
   tsconfigPaths,
   globals,
   webextensionPolyfillMock,
+  getPackageJson,
   resolveConfig,
   kebabCaseAlphanumeric,
   printFileList,
   version,
-  getPackageJson,
   getContentScriptCssFiles,
   getContentScriptsCssMap,
   rebuild,