wxt 0.16.5 → 0.16.7

package/dist/testing.cjs

@@ -356,31 +356,6 @@ async function removeEmptyDirs(dir) {
 
 // src/core/builders/vite/plugins/unimport.ts
 var import_unimport = require("unimport");
-
-// src/core/utils/unimport.ts
-var import_defu = require("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 (0, import_defu.defu)(config.imports, defaultOptions);
-}
-
-// src/core/builders/vite/plugins/unimport.ts
 var import_path = require("path");
 var ENABLED_EXTENSIONS = /* @__PURE__ */ new Set([
   ".js",
@@ -391,7 +366,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 = (0, import_unimport.createUnimport)(options);
@@ -512,7 +487,10 @@ var increment = 0;
 function bundleAnalysis(config) {
   return (0, import_rollup_plugin_visualizer.visualizer)({
     template: "raw-data",
-    filename: import_node_path5.default.resolve(config.outDir, `stats-${increment++}.json`)
+    filename: import_node_path5.default.resolve(
+      config.analysis.outputDir,
+      `${config.analysis.outputName}-${increment++}.json`
+    )
   });
 }
 
@@ -735,13 +713,13 @@ var PATH_GLOB_TO_TYPE_MAP = {
 };
 
 // src/core/utils/building/generate-wxt-dir.ts
-var import_unimport3 = require("unimport");
+var import_unimport2 = require("unimport");
 var import_fs_extra6 = __toESM(require("fs-extra"), 1);
 var import_node_path7 = __toESM(require("path"), 1);
 
 // src/core/utils/building/resolve-config.ts
 var import_c12 = require("c12");
-var import_node_path8 = __toESM(require("path"), 1);
+var import_node_path9 = __toESM(require("path"), 1);
 
 // src/core/utils/cache.ts
 var import_fs_extra7 = __toESM(require("fs-extra"), 1);
@@ -984,7 +962,16 @@ function getRollupEntry(entrypoint) {
 }
 
 // src/core/utils/building/resolve-config.ts
-var import_defu2 = __toESM(require("defu"), 1);
+var import_defu = __toESM(require("defu"), 1);
+
+// src/core/utils/package.ts
+var import_node_path8 = require("path");
+var import_fs_extra8 = __toESM(require("fs-extra"), 1);
+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;
@@ -1009,20 +996,20 @@ async function resolveConfig(inlineConfig, command, server) {
   const manifestVersion = mergedConfig.manifestVersion ?? (browser === "firefox" || browser === "safari" ? 2 : 3);
   const mode = mergedConfig.mode ?? (command === "build" ? "production" : "development");
   const env = { browser, command, manifestVersion, mode };
-  const root = import_node_path8.default.resolve(
+  const root = import_node_path9.default.resolve(
     inlineConfig.root ?? userConfig.root ?? process.cwd()
   );
-  const wxtDir = import_node_path8.default.resolve(root, ".wxt");
-  const srcDir = import_node_path8.default.resolve(root, mergedConfig.srcDir ?? root);
-  const entrypointsDir = import_node_path8.default.resolve(
+  const wxtDir = import_node_path9.default.resolve(root, ".wxt");
+  const srcDir = import_node_path9.default.resolve(root, mergedConfig.srcDir ?? root);
+  const entrypointsDir = import_node_path9.default.resolve(
     srcDir,
     mergedConfig.entrypointsDir ?? "entrypoints"
   );
   const filterEntrypoints = !!mergedConfig.filterEntrypoints?.length ? new Set(mergedConfig.filterEntrypoints) : void 0;
-  const publicDir = import_node_path8.default.resolve(srcDir, mergedConfig.publicDir ?? "public");
-  const typesDir = import_node_path8.default.resolve(wxtDir, "types");
-  const outBaseDir = import_node_path8.default.resolve(root, mergedConfig.outDir ?? ".output");
-  const outDir = import_node_path8.default.resolve(outBaseDir, `${browser}-mv${manifestVersion}`);
+  const publicDir = import_node_path9.default.resolve(srcDir, mergedConfig.publicDir ?? "public");
+  const typesDir = import_node_path9.default.resolve(wxtDir, "types");
+  const outBaseDir = import_node_path9.default.resolve(root, mergedConfig.outDir ?? ".output");
+  const outDir = import_node_path9.default.resolve(outBaseDir, `${browser}-mv${manifestVersion}`);
   const reloadCommand = mergedConfig.dev?.reloadCommand ?? "Alt+R";
   const runnerConfig = await (0, import_c12.loadConfig)({
     name: "web-ext",
@@ -1039,8 +1026,14 @@ async function resolveConfig(inlineConfig, command, server) {
       "~": srcDir,
       "@@": root,
       "~~": root
-    }).map(([key, value]) => [key, import_node_path8.default.resolve(root, value)])
+    }).map(([key, value]) => [key, import_node_path9.default.resolve(root, value)])
   );
+  const analysisOutputFile = import_node_path9.default.resolve(
+    root,
+    mergedConfig.analysis?.outputFile ?? "stats.html"
+  );
+  const analysisOutputDir = import_node_path9.default.dirname(analysisOutputFile);
+  const analysisOutputName = import_node_path9.default.parse(analysisOutputFile).name;
   const finalConfig = {
     browser,
     command,
@@ -1049,7 +1042,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,
@@ -1070,10 +1063,10 @@ async function resolveConfig(inlineConfig, command, server) {
     analysis: {
       enabled: mergedConfig.analysis?.enabled ?? false,
       template: mergedConfig.analysis?.template ?? "treemap",
-      outputFile: import_node_path8.default.resolve(
-        root,
-        mergedConfig.analysis?.outputFile ?? "stats.html"
-      )
+      outputFile: analysisOutputFile,
+      outputDir: analysisOutputDir,
+      outputName: analysisOutputName,
+      keepArtifacts: mergedConfig.analysis?.keepArtifacts ?? false
     },
     userConfigMetadata: userConfigMetadata ?? {},
     alias,
@@ -1106,22 +1099,22 @@ function mergeInlineConfig(inlineConfig, userConfig) {
   } else if (userConfig.imports == null && inlineConfig.imports == null) {
     imports = void 0;
   } else {
-    imports = (0, import_defu2.default)(inlineConfig.imports ?? {}, userConfig.imports ?? {});
+    imports = (0, import_defu.default)(inlineConfig.imports ?? {}, userConfig.imports ?? {});
   }
   const manifest = async (env) => {
     const user = await resolveManifestConfig(env, userConfig.manifest);
     const inline = await resolveManifestConfig(env, inlineConfig.manifest);
-    return (0, import_defu2.default)(inline, user);
+    return (0, import_defu.default)(inline, user);
   };
-  const runner = (0, import_defu2.default)(
+  const runner = (0, import_defu.default)(
     inlineConfig.runner ?? {},
     userConfig.runner ?? {}
   );
-  const zip = (0, import_defu2.default)(
+  const zip = (0, import_defu.default)(
     inlineConfig.zip ?? {},
     userConfig.zip ?? {}
   );
-  const hooks = (0, import_defu2.default)(
+  const hooks = (0, import_defu.default)(
     inlineConfig.hooks ?? {},
     userConfig.hooks ?? {}
   );
@@ -1185,12 +1178,50 @@ 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: import_node_path9.default.resolve(wxtDir, "eslintrc-auto-import.json"),
+      globalsPropValue: true
+    }
+  };
+  return (0, import_defu.default)(
+    config.imports ?? {},
+    defaultOptions
+  );
+}
 
 // src/core/utils/building/import-entrypoint.ts
 var import_jiti = __toESM(require("jiti"), 1);
-var import_unimport5 = require("unimport");
-var import_fs_extra8 = __toESM(require("fs-extra"), 1);
-var import_node_path9 = require("path");
+var import_unimport3 = require("unimport");
+var import_fs_extra9 = __toESM(require("fs-extra"), 1);
+var import_node_path10 = require("path");
 var import_esbuild = require("esbuild");
 var import_node_url = require("url");
 
@@ -1199,9 +1230,9 @@ var import_picocolors5 = __toESM(require("picocolors"), 1);
 var import_fs_extra12 = __toESM(require("fs-extra"), 1);
 
 // src/core/utils/log/printFileList.ts
-var import_node_path10 = __toESM(require("path"), 1);
+var import_node_path11 = __toESM(require("path"), 1);
 var import_picocolors3 = __toESM(require("picocolors"), 1);
-var import_fs_extra9 = __toESM(require("fs-extra"), 1);
+var import_fs_extra10 = __toESM(require("fs-extra"), 1);
 var import_filesize = require("filesize");
 var DEFAULT_COLOR = import_picocolors3.default.blue;
 var CHUNK_COLORS = {
@@ -1225,13 +1256,7 @@ var import_fast_glob3 = __toESM(require("fast-glob"), 1);
 
 // src/core/utils/manifest.ts
 var import_fs_extra11 = __toESM(require("fs-extra"), 1);
-
-// src/core/utils/package.ts
-var import_node_path11 = require("path");
-var import_fs_extra10 = __toESM(require("fs-extra"), 1);
-
-// src/core/utils/manifest.ts
-var import_defu3 = __toESM(require("defu"), 1);
+var import_defu2 = __toESM(require("defu"), 1);
 
 // src/core/utils/building/internal-build.ts
 var import_node_path13 = require("path");

package/dist/testing.d.cts

@@ -1,6 +1,6 @@
 export { FakeBrowser, fakeBrowser } from '@webext-core/fake-browser';
 import * as vite from 'vite';
-import { I as InlineConfig } from './index-znx-ff-l.cjs';
+import { I as InlineConfig } from './index-sl22zA2Z.cjs';
 import 'webextension-polyfill';
 import 'unimport';
 import 'consola';

package/dist/testing.d.ts

@@ -1,6 +1,6 @@
 export { FakeBrowser, fakeBrowser } from '@webext-core/fake-browser';
 import * as vite from 'vite';
-import { I as InlineConfig } from './index-znx-ff-l.js';
+import { I as InlineConfig } from './index-sl22zA2Z.js';
 import 'webextension-polyfill';
 import 'unimport';
 import 'consola';

package/dist/testing.js

@@ -5,7 +5,7 @@ import {
   tsconfigPaths,
   unimport,
   webextensionPolyfillMock
-} from "./chunk-N5MSLHHE.js";
+} from "./chunk-KKL6XTRP.js";
 import "./chunk-VBXJIVYU.js";
 
 // src/testing/fake-browser.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wxt",
   "type": "module",
-  "version": "0.16.5",
+  "version": "0.16.7",
   "description": "Next gen framework for developing web extensions",
   "engines": {
     "node": ">=18",
@@ -114,7 +114,7 @@
     "publish-browser-extension": "^2.1.2",
     "rollup-plugin-visualizer": "^5.9.2",
     "unimport": "^3.4.0",
-    "vite": "^5.0.12",
+    "vite": "^5.1.3",
     "web-ext-run": "^0.2.0",
     "webextension-polyfill": "^0.10.0",
     "zip-dir": "^2.0.0"
@@ -144,7 +144,7 @@
     "typedoc-vitepress-theme": "1.0.0-next.3",
     "typescript": "^5.3.2",
     "vitepress": "1.0.0-rc.34",
-    "vitest": "^1.1.0",
+    "vitest": "^1.2.2",
     "vitest-mock-extended": "^1.3.1",
     "vue": "^3.3.10"
   },