wxt 0.20.27 → 0.21.1

package/dist/core/resolve-config.mjs

@@ -5,15 +5,19 @@ import { createFsCache } from "./utils/cache.mjs";
 import { getEslintVersion } from "./utils/eslint.mjs";
 import { safeStringToNumber } from "./utils/number.mjs";
 import { loadEnv } from "./utils/env.mjs";
+import { createSafariRunner } from "./runners/safari.mjs";
+import { createWslRunner } from "./runners/wsl.mjs";
+import { createManualRunner } from "./runners/manual.mjs";
 import { pathExists } from "./utils/fs.mjs";
 import { glob } from "tinyglobby";
 import path from "node:path";
-import consola, { LogLevels } from "consola";
 import { loadConfig } from "c12";
 import { resolve as resolve$1 } from "import-meta-resolve";
+import consola, { LogLevels } from "consola";
 import defu from "defu";
 import { getPort } from "get-port-please";
 import { fileURLToPath, pathToFileURL } from "node:url";
+import isWsl from "is-wsl";
 //#region src/core/resolve-config.ts
 /**
 * Given an inline config, discover the config file if necessary, merge the
@@ -69,14 +73,13 @@ async function resolveConfig(inlineConfig, command) {
 	const outDirTemplate = (mergedConfig.outDirTemplate ?? `${browser}-mv${manifestVersion}${modeSuffix}`).replaceAll("{{browser}}", browser).replaceAll("{{manifestVersion}}", manifestVersion.toString()).replaceAll("{{modeSuffix}}", modeSuffix).replaceAll("{{mode}}", mode).replaceAll("{{command}}", command);
 	const outDir = path.resolve(outBaseDir, outDirTemplate);
 	const reloadCommand = mergedConfig.dev?.reloadCommand ?? "Alt+R";
-	if (inlineConfig.runner != null || userConfig.runner != null) logger.warn("`InlineConfig#runner` is deprecated, use `InlineConfig#webExt` instead. See https://wxt.dev/guide/resources/upgrading.html#v0-19-0-rarr-v0-20-0");
-	const runnerConfig = await loadConfig({
+	const webExt = await loadConfig({
 		name: "web-ext",
 		cwd: root,
 		globalRc: true,
 		rcFile: ".webextrc",
-		overrides: inlineConfig.webExt ?? inlineConfig.runner,
-		defaults: userConfig.webExt ?? userConfig.runner
+		overrides: inlineConfig.webExt,
+		defaults: userConfig.webExt
 	});
 	const alias = Object.fromEntries(Object.entries({
 		...mergedConfig.alias,
@@ -87,10 +90,9 @@ async function resolveConfig(inlineConfig, command) {
 	}).map(([key, value]) => [key, path.resolve(root, value)]));
 	let devServerConfig;
 	if (command === "serve") {
-		if (mergedConfig.dev?.server?.hostname) logger.warn(`The 'hostname' option is deprecated, please use 'host' or 'origin' depending on your circumstances.`);
-		const host = mergedConfig.dev?.server?.host ?? mergedConfig.dev?.server?.hostname ?? "localhost";
+		const host = mergedConfig.dev?.server?.host ?? "localhost";
 		let port = mergedConfig.dev?.server?.port;
-		const origin = mergedConfig.dev?.server?.origin ?? mergedConfig.dev?.server?.hostname ?? "localhost";
+		const origin = mergedConfig.dev?.server?.origin ?? "localhost";
 		const strictPort = mergedConfig.dev?.server?.strictPort ?? false;
 		if (port == null || !isFinite(port)) port = await getPort({
 			host,
@@ -139,7 +141,8 @@ async function resolveConfig(inlineConfig, command) {
 		publicDir,
 		wxtModuleDir,
 		root,
-		runnerConfig,
+		webExt,
+		runner: command === "serve" ? await resolveRunner(browser, logger, mergedConfig) : createManualRunner(),
 		srcDir,
 		typesDir,
 		wxtDir,
@@ -149,6 +152,7 @@ async function resolveConfig(inlineConfig, command) {
 		alias,
 		experimental: defu(mergedConfig.experimental, {}),
 		suppressWarnings: mergedConfig.suppressWarnings ?? {},
+		watchOptions: mergedConfig.watchOptions ?? {},
 		dev: {
 			server: devServerConfig,
 			reloadCommand
@@ -187,10 +191,10 @@ function resolveZipConfig(root, browser, outBaseDir, mergedConfig) {
 	const downloadedPackagesDir = path.resolve(root, ".wxt/local_modules");
 	return {
 		name: void 0,
-		sourcesTemplate: "{{name}}-{{version}}-sources.zip",
-		artifactTemplate: "{{name}}-{{version}}-{{browser}}.zip",
+		sourcesTemplate: "{{name}}-{{packageVersion}}-sources{{modeSuffix}}.zip",
+		artifactTemplate: "{{name}}-{{packageVersion}}-{{browser}}{{modeSuffix}}.zip",
 		sourcesRoot: root,
-		includeSources: [],
+		includeSources: mergedConfig.zip?.includeSources ?? ["**/*"],
 		compressionLevel: 9,
 		...mergedConfig.zip,
 		zipSources: mergedConfig.zip?.zipSources ?? ["firefox", "opera"].includes(browser),
@@ -198,12 +202,12 @@ function resolveZipConfig(root, browser, outBaseDir, mergedConfig) {
 		excludeSources: [
 			"**/node_modules",
 			"**/web-ext.config.ts",
-			"**/.*",
 			"**/__tests__/**",
 			"**/*.+(test|spec).?(c|m)+(j|t)s?(x)",
 			`${path.relative(root, outBaseDir)}/**`,
 			...mergedConfig.zip?.excludeSources ?? []
 		],
+		dotSources: mergedConfig.zip?.dotSources ?? false,
 		downloadPackages: mergedConfig.zip?.downloadPackages ?? [],
 		downloadedPackagesDir
 	};
@@ -224,7 +228,7 @@ function resolveAnalysisConfig(root, mergedConfig) {
 }
 async function getUnimportOptions(wxtDir, srcDir, logger, config) {
 	const disabled = config.imports === false;
-	const eslintrc = await getUnimportEslintOptions(wxtDir, config.imports);
+	const eslintrc = await getUnimportEslintOptions(logger, wxtDir, config.imports);
 	const invalidExports = ["options"];
 	const defineImportsAndTypes = (imports, typeImports) => [...imports, ...typeImports.map((name) => ({
 		name,
@@ -233,7 +237,7 @@ async function getUnimportOptions(wxtDir, srcDir, logger, config) {
 	const defaultOptions = {
 		imports: [{
 			name: "fakeBrowser",
-			from: "wxt/testing"
+			from: "wxt/testing/fake-browser"
 		}],
 		presets: [
 			{
@@ -337,26 +341,26 @@ async function getUnimportOptions(wxtDir, srcDir, logger, config) {
 	};
 	return defu(config.imports ?? {}, defaultOptions);
 }
-async function getUnimportEslintOptions(wxtDir, options) {
+async function getUnimportEslintOptions(logger, wxtDir, options) {
 	const inlineEnabled = options === false ? false : options?.eslintrc?.enabled ?? "auto";
+	const version = await getEslintVersion();
+	const major = parseInt(version[0]);
 	let enabled;
 	switch (inlineEnabled) {
 		case "auto":
-			const version = await getEslintVersion();
-			let major = parseInt(version[0]);
-			if (isNaN(major)) enabled = false;
-			if (major <= 8) enabled = 8;
+		case true:
+			if (isNaN(major)) {
+				if (inlineEnabled === true) logger.warn("Could not determine installed ESLint version, `eslint-auto-imports.mjs` not generated");
+				enabled = false;
+			} else if (major <= 8) enabled = 8;
 			else if (major >= 9) enabled = 9;
 			else enabled = false;
 			break;
-		case true:
-			enabled = 8;
-			break;
 		default: enabled = inlineEnabled;
 	}
 	return {
 		enabled,
-		filePath: path.resolve(wxtDir, enabled === 9 ? "eslint-auto-imports.mjs" : "eslintrc-auto-import.json"),
+		filePath: path.resolve(wxtDir, enabled === 8 ? "eslintrc-auto-import.json" : "eslint-auto-imports.mjs"),
 		globalsPropValue: true
 	};
 }
@@ -423,5 +427,17 @@ async function resolveWxtUserModules(root, modulesDir, modules = []) {
 	}));
 	return [...npmModules, ...localModules];
 }
+async function resolveRunner(browser, logger, mergedConfig) {
+	if (browser === "safari") return createSafariRunner();
+	if (isWsl) return createWslRunner();
+	try {
+		const { createWebExtRunner } = await import("./runners/web-ext.mjs");
+		return mergedConfig.webExt?.disabled ? createManualRunner() : createWebExtRunner();
+	} catch (err) {
+		if (err?.code !== "ERR_MODULE_NOT_FOUND") throw err;
+		logger.debug("Error loading the web-ext runner", err);
+	}
+	return createManualRunner();
+}
 //#endregion
 export { resolveConfig };

package/dist/core/runners/web-ext.mjs

@@ -1,6 +1,8 @@
-import { formatDuration } from "../utils/time.mjs";
 import { wxt } from "../wxt.mjs";
+import { formatDuration } from "../utils/time.mjs";
 import defu from "defu";
+import webExt from "web-ext";
+import { consoleStream } from "web-ext/util/logger";
 //#region src/core/runners/web-ext.ts
 /** Create an `ExtensionRunner` backed by `web-ext`. */
 function createWebExtRunner() {
@@ -11,12 +13,11 @@ function createWebExtRunner() {
 		},
 		async openBrowser() {
 			const startTime = Date.now();
-			const webExtLogger = await import("web-ext-run/util/logger");
-			webExtLogger.consoleStream.write = ({ level, msg, name }) => {
+			consoleStream.write = ({ level, msg, name }) => {
 				if (level >= ERROR_LOG_LEVEL) wxt.logger.error(name, msg);
 				if (level >= WARN_LOG_LEVEL) wxt.logger.warn(msg);
 			};
-			const wxtUserConfig = wxt.config.runnerConfig.config;
+			const wxtUserConfig = wxt.config.webExt.config;
 			const finalConfig = {
 				browserConsole: wxtUserConfig?.openConsole,
 				devtools: wxtUserConfig?.openDevtools,
@@ -43,7 +44,7 @@ function createWebExtRunner() {
 			const options = { shouldExitProgram: false };
 			wxt.logger.debug("web-ext config:", finalConfig);
 			wxt.logger.debug("web-ext options:", options);
-			runner = await (await import("web-ext-run")).default.cmd.run(finalConfig, options);
+			runner = await webExt.cmd.run(finalConfig, options);
 			const duration = Date.now() - startTime;
 			wxt.logger.success(`Opened browser in ${formatDuration(duration)}`);
 		},

package/dist/core/utils/building/detect-dev-changes.mjs

@@ -36,11 +36,12 @@ import { wxt } from "../../wxt.mjs";
 *   - .env (environment variable changed could effect build)
 */
 function detectDevChanges(changedFiles, currentOutput) {
-	if (some(changedFiles, (file) => file === wxt.config.userConfigMetadata.configFile)) return { type: "full-restart" };
-	if (some(changedFiles, (file) => file.startsWith(wxt.config.modulesDir))) return { type: "full-restart" };
-	if (some(changedFiles, (file) => file === wxt.config.runnerConfig.configFile)) return { type: "browser-restart" };
-	const changedSteps = new Set(changedFiles.flatMap((changedFile) => findEffectedSteps(changedFile, currentOutput)));
-	if (changedSteps.size === 0) if (some(changedFiles, (file) => file.startsWith(wxt.config.publicDir))) return {
+	const relevantChangedFiles = getRelevantDevChangedFiles(changedFiles, currentOutput);
+	if (some(relevantChangedFiles, (file) => file === wxt.config.userConfigMetadata.configFile)) return { type: "full-restart" };
+	if (some(relevantChangedFiles, (file) => file.startsWith(wxt.config.modulesDir))) return { type: "full-restart" };
+	if (some(relevantChangedFiles, (file) => file === wxt.config.webExt.configFile)) return { type: "browser-restart" };
+	const changedSteps = new Set(relevantChangedFiles.flatMap((changedFile) => findEffectedSteps(changedFile, currentOutput)));
+	if (changedSteps.size === 0) if (some(relevantChangedFiles, (file) => file.startsWith(wxt.config.publicDir))) return {
 		type: "extension-reload",
 		rebuildGroups: [],
 		cachedOutput: currentOutput
@@ -58,7 +59,7 @@ function detectDevChanges(changedFiles, currentOutput) {
 	};
 	for (const step of currentOutput.steps) if (changedSteps.has(step)) changedOutput.steps.push(step);
 	else unchangedOutput.steps.push(step);
-	if (changedFiles.length > 0 && every(changedFiles, (file) => file.endsWith(".html"))) return {
+	if (relevantChangedFiles.length > 0 && every(relevantChangedFiles, (file) => file.endsWith(".html"))) return {
 		type: "html-reload",
 		cachedOutput: unchangedOutput,
 		rebuildGroups: changedOutput.steps.map((step) => step.entrypoints)
@@ -75,6 +76,15 @@ function detectDevChanges(changedFiles, currentOutput) {
 		rebuildGroups: changedOutput.steps.map((step) => step.entrypoints)
 	};
 }
+function getRelevantDevChangedFiles(changedFiles, currentOutput) {
+	return Array.from(new Set(changedFiles)).filter((changedFile) => {
+		if (changedFile === wxt.config.userConfigMetadata.configFile) return true;
+		if (changedFile.startsWith(wxt.config.modulesDir)) return true;
+		if (changedFile === wxt.config.webExt.configFile) return true;
+		if (changedFile.startsWith(wxt.config.publicDir)) return true;
+		return findEffectedSteps(changedFile, currentOutput).length > 0;
+	});
+}
 /**
 * For a single change, return all the step of the build output that were
 * effected by it.
@@ -93,4 +103,4 @@ function findEffectedSteps(changedFile, currentOutput) {
 	return changes;
 }
 //#endregion
-export { detectDevChanges };
+export { detectDevChanges, getRelevantDevChangedFiles };

package/dist/core/utils/building/internal-build.mjs

@@ -1,8 +1,8 @@
 import { unnormalizePath } from "../paths.mjs";
-import { formatDuration } from "../time.mjs";
 import { wxt } from "../../wxt.mjs";
 import { findEntrypoints } from "./find-entrypoints.mjs";
 import { groupEntrypoints } from "./group-entrypoints.mjs";
+import { formatDuration } from "../time.mjs";
 import { printBuildSummary } from "../log/printBuildSummary.mjs";
 import "../log/index.mjs";
 import { rebuild } from "./rebuild.mjs";

package/dist/core/utils/create-file-reloader.mjs

@@ -1,7 +1,10 @@
+import { normalizePath } from "./paths.mjs";
 import { getEntrypointBundlePath, isHtmlEntrypoint } from "./entrypoints.mjs";
+import { filterTruthy, toArray } from "./arrays.mjs";
 import { wxt } from "../wxt.mjs";
-import { detectDevChanges } from "./building/detect-dev-changes.mjs";
+import { detectDevChanges, getRelevantDevChangedFiles } from "./building/detect-dev-changes.mjs";
 import { findEntrypoints } from "./building/find-entrypoints.mjs";
+import { groupEntrypoints } from "./building/group-entrypoints.mjs";
 import { getContentScriptJs, mapWxtOptionsToRegisteredContentScript } from "./content-scripts.mjs";
 import { getContentScriptCssFiles, getContentScriptsCssMap } from "./manifest.mjs";
 import { rebuild } from "./building/rebuild.mjs";
@@ -9,7 +12,6 @@ import "./building/index.mjs";
 import { isBabelSyntaxError, logBabelSyntaxError } from "./syntax-errors.mjs";
 import { relative } from "node:path";
 import { styleText } from "node:util";
-import { debounce } from "perfect-debounce";
 import { Mutex } from "async-mutex";
 //#region src/core/utils/create-file-reloader.ts
 /**
@@ -19,15 +21,23 @@ import { Mutex } from "async-mutex";
 function createFileReloader(server) {
 	const fileChangedMutex = new Mutex();
 	const changeQueue = [];
-	const cb = async (event, path) => {
-		changeQueue.push([event, path]);
+	let processLoop;
+	const processQueue = async () => {
 		await fileChangedMutex.runExclusive(async () => {
-			if (server.currentOutput == null) return;
 			const fileChanges = changeQueue.splice(0, changeQueue.length).map(([_, file]) => file);
 			if (fileChanges.length === 0) return;
+			if (server.currentOutput == null) return;
+			const normalizedFileChanges = fileChanges.map(normalizePath);
+			const relevantFileChanges = getRelevantDevChangedFiles(fileChanges, server.currentOutput);
+			const normalizedEntrypointsDir = normalizePath(wxt.config.entrypointsDir);
+			const hasEntrypointDirChange = normalizedFileChanges.some((file) => file === normalizedEntrypointsDir || file.startsWith(`${normalizedEntrypointsDir}/`));
+			if (relevantFileChanges.length === 0 && !hasEntrypointDirChange) return;
 			await wxt.reloadConfig();
-			const changes = detectDevChanges(fileChanges, server.currentOutput);
-			if (changes.type === "no-change") return;
+			const allEntrypoints = await findEntrypoints();
+			const allEntrypointGroups = groupEntrypoints(allEntrypoints);
+			const newEntrypointGroups = getNewEntrypointGroups(normalizedFileChanges, allEntrypointGroups, server.currentOutput);
+			if (relevantFileChanges.length === 0 && newEntrypointGroups.length === 0) return;
+			const changes = detectDevChanges(relevantFileChanges, server.currentOutput);
 			if (changes.type === "full-restart") {
 				wxt.logger.info("Config changed, restarting server...");
 				server.restart();
@@ -38,25 +48,24 @@ function createFileReloader(server) {
 				server.restartBrowser();
 				return;
 			}
-			wxt.logger.info(`Changed: ${Array.from(new Set(fileChanges)).map((file) => styleText("dim", relative(wxt.config.root, file))).join(", ")}`);
-			const allEntrypoints = await findEntrypoints();
+			const hasNewEntrypoints = newEntrypointGroups.length > 0;
+			if (changes.type === "no-change" && !hasNewEntrypoints) return;
+			const changedFilesToLog = Array.from(new Set([...relevantFileChanges, ...newEntrypointGroups.flatMap((group) => toArray(group)).map((entry) => entry.inputPath)]));
+			wxt.logger.info(`Changed: ${changedFilesToLog.map((file) => styleText("dim", relative(wxt.config.root, file))).join(", ")}`);
+			const rebuildGroups = changes.type === "no-change" ? newEntrypointGroups : mergeEntrypointGroups(getLatestRebuildGroups(changes.rebuildGroups, allEntrypointGroups), newEntrypointGroups);
 			try {
-				const { output: newOutput } = await rebuild(allEntrypoints, changes.rebuildGroups, changes.cachedOutput);
+				const { output: newOutput } = await rebuild(allEntrypoints, rebuildGroups, changes.type === "no-change" ? server.currentOutput : changes.cachedOutput);
 				server.currentOutput = newOutput;
-				switch (changes.type) {
-					case "extension-reload":
-						server.reloadExtension();
-						wxt.logger.success(`Reloaded extension`);
-						break;
-					case "html-reload":
-						const { reloadedNames } = reloadHtmlPages(changes.rebuildGroups, server);
-						wxt.logger.success(`Reloaded: ${getFilenameList(reloadedNames)}`);
-						break;
-					case "content-script-reload":
-						reloadContentScripts(changes.changedSteps, server);
-						const rebuiltNames = changes.rebuildGroups.flat().map((entry) => entry.name);
-						wxt.logger.success(`Reloaded: ${getFilenameList(rebuiltNames)}`);
-						break;
+				if (hasNewEntrypoints || changes.type === "extension-reload") {
+					server.reloadExtension();
+					wxt.logger.success(`Reloaded extension`);
+				} else if (changes.type === "html-reload") {
+					const { reloadedNames } = reloadHtmlPages(rebuildGroups, server);
+					wxt.logger.success(`Reloaded: ${getFilenameList(reloadedNames)}`);
+				} else if (changes.type === "content-script-reload") {
+					reloadContentScripts(changes.changedSteps, server);
+					const rebuiltNames = rebuildGroups.flat().map((entry) => entry.name);
+					wxt.logger.success(`Reloaded: ${getFilenameList(rebuiltNames)}`);
 				}
 			} catch {}
 		}).catch((error) => {
@@ -64,11 +73,57 @@ function createFileReloader(server) {
 			logBabelSyntaxError(error);
 		});
 	};
-	return debounce(cb, wxt.config.dev.server.watchDebounce, {
-		leading: true,
-		trailing: false
+	const waitForDebounceWindow = async () => {
+		await new Promise((resolve) => {
+			setTimeout(resolve, wxt.config.dev.server.watchDebounce);
+		});
+	};
+	const queueWorker = async () => {
+		while (true) {
+			await processQueue();
+			await waitForDebounceWindow();
+			if (changeQueue.length === 0) break;
+		}
+	};
+	return async (event, path) => {
+		changeQueue.push([event, path]);
+		processLoop ??= queueWorker().finally(() => {
+			processLoop = void 0;
+		});
+		await processLoop;
+	};
+}
+function getNewEntrypointGroups(normalizedFileChanges, allEntrypointGroups, currentOutput) {
+	const changedFiles = new Set(normalizedFileChanges);
+	const builtEntrypointPaths = new Set(currentOutput.steps.flatMap((step) => toArray(step.entrypoints).map((entry) => normalizePath(entry.inputPath))));
+	return allEntrypointGroups.filter((group) => {
+		const groupEntrypoints = toArray(group);
+		const hasNewEntrypoint = groupEntrypoints.some((entry) => !builtEntrypointPaths.has(normalizePath(entry.inputPath)));
+		const changedEntrypoint = groupEntrypoints.some((entry) => changedFiles.has(normalizePath(entry.inputPath)));
+		return hasNewEntrypoint && changedEntrypoint;
 	});
 }
+function getLatestRebuildGroups(rebuildGroups, allEntrypointGroups) {
+	const groupByEntrypointPath = /* @__PURE__ */ new Map();
+	allEntrypointGroups.forEach((group) => {
+		toArray(group).forEach((entry) => {
+			groupByEntrypointPath.set(normalizePath(entry.inputPath), group);
+		});
+	});
+	return mergeEntrypointGroups(rebuildGroups.flatMap((group) => {
+		return filterTruthy(toArray(group).map((entry) => groupByEntrypointPath.get(normalizePath(entry.inputPath))));
+	}));
+}
+function mergeEntrypointGroups(...groups) {
+	const deduped = /* @__PURE__ */ new Map();
+	groups.flat().forEach((group) => {
+		deduped.set(getEntrypointGroupKey(group), group);
+	});
+	return [...deduped.values()];
+}
+function getEntrypointGroupKey(group) {
+	return toArray(group).map((entry) => normalizePath(entry.inputPath)).sort().join("|");
+}
 /**
 * From the server, tell the client to reload content scripts from the provided
 * build step outputs.

package/dist/core/utils/entrypoints.d.mts

@@ -0,0 +1,10 @@
+import { Entrypoint } from "../../types.mjs";
+
+//#region src/core/utils/entrypoints.d.ts
+/**
+ * Return's the entrypoint's output path relative to the output directory. Used
+ * for paths in the manifest and rollup's bundle.
+ */
+declare function getEntrypointBundlePath(entrypoint: Entrypoint, outDir: string, ext: string): string;
+//#endregion
+export { getEntrypointBundlePath };

package/dist/core/utils/index.d.mts

@@ -0,0 +1,2 @@
+import { normalizePath } from "./paths.mjs";
+import { getEntrypointBundlePath } from "./entrypoints.mjs";

package/dist/core/utils/index.mjs

@@ -1,2 +1,3 @@
 import "./paths.mjs";
+import "./entrypoints.mjs";
 export {};

package/dist/core/utils/time.mjs

@@ -5,14 +5,5 @@ function formatDuration(duration) {
 	if (duration < 6e4) return `${(duration / 1e3).toFixed(1)} s`;
 	return `${(duration / 1e3).toFixed(0)} s`;
 }
-/** Add a timeout to a promise. */
-function withTimeout(promise, duration) {
-	return new Promise((res, rej) => {
-		const timeout = setTimeout(() => {
-			rej(`Promise timed out after ${duration}ms`);
-		}, duration);
-		promise.then(res).catch(rej).finally(() => clearTimeout(timeout));
-	});
-}
 //#endregion
-export { formatDuration, withTimeout };
+export { formatDuration };

package/dist/core/utils/transform.mjs

@@ -28,7 +28,7 @@ function removeMainFunctionCode(code) {
 function emptyMainFunction(mod) {
 	if (mod.exports?.default?.$type === "function-call") {
 		if (mod.exports.default.$ast?.arguments?.[0]?.body) delete mod.exports.default.$ast.arguments[0];
-		else if (mod.exports.default.$ast?.arguments?.[0]?.properties) mod.exports.default.$ast.arguments[0].properties = mod.exports.default.$ast.arguments[0].properties.filter((prop) => prop.key.name !== "main");
+		else if (mod.exports.default.$ast?.arguments?.[0]?.properties) mod.exports.default.$ast.arguments[0].properties = mod.exports.default.$ast.arguments[0].properties.filter((prop) => prop.key?.name !== "main");
 	}
 }
 function removeUnusedTopLevelVariables(mod) {

package/dist/core/zip.mjs

@@ -1,15 +1,14 @@
 import { normalizePath } from "./utils/paths.mjs";
 import "./utils/index.mjs";
 import { safeFilename } from "./utils/strings.mjs";
-import { formatDuration } from "./utils/time.mjs";
 import { registerWxt, wxt } from "./wxt.mjs";
 import { findEntrypoints } from "./utils/building/find-entrypoints.mjs";
+import { formatDuration } from "./utils/time.mjs";
 import { printFileList } from "./utils/log/printFileList.mjs";
 import "./utils/log/index.mjs";
 import { getPackageJson } from "./utils/package.mjs";
 import { internalBuild } from "./utils/building/internal-build.mjs";
 import "./utils/building/index.mjs";
-import { picomatchMultiple } from "./utils/picomatch-multiple.mjs";
 import { mkdir, readFile } from "node:fs/promises";
 import { glob } from "tinyglobby";
 import path from "node:path";
@@ -31,7 +30,11 @@ async function zip(config) {
 	const zipFiles = [];
 	const packageJson = await getPackageJson();
 	const projectName = wxt.config.zip.name ?? safeFilename(packageJson?.name || path.basename(process.cwd()));
-	const applyTemplate = (template) => template.replaceAll("{{name}}", projectName).replaceAll("{{browser}}", wxt.config.browser).replaceAll("{{version}}", output.manifest.version_name ?? output.manifest.version).replaceAll("{{packageVersion}}", packageJson?.version).replaceAll("{{mode}}", wxt.config.mode).replaceAll("{{manifestVersion}}", `mv${wxt.config.manifestVersion}`);
+	const modeSuffix = {
+		production: "",
+		development: "-dev"
+	}[wxt.config.mode] ?? `-${wxt.config.mode}`;
+	const applyTemplate = (template) => template.replaceAll("{{name}}", projectName).replaceAll("{{browser}}", wxt.config.browser).replaceAll("{{version}}", output.manifest.version).replaceAll("{{versionName}}", output.manifest.version_name ?? output.manifest.version).replaceAll("{{packageVersion}}", packageJson?.version).replaceAll("{{modeSuffix}}", modeSuffix).replaceAll("{{mode}}", wxt.config.mode).replaceAll("{{manifestVersion}}", `mv${wxt.config.manifestVersion}`);
 	await mkdir(wxt.config.outBaseDir, { recursive: true });
 	await wxt.hooks.callHook("zip:extension:start", wxt);
 	const outZipFilename = applyTemplate(wxt.config.zip.artifactTemplate);
@@ -46,16 +49,18 @@ async function zip(config) {
 		const { overrides, files: downloadedPackages } = await downloadPrivatePackages();
 		const sourcesZipFilename = applyTemplate(wxt.config.zip.sourcesTemplate);
 		const sourcesZipPath = path.resolve(wxt.config.outBaseDir, sourcesZipFilename);
-		await zipDir(wxt.config.zip.sourcesRoot, sourcesZipPath, {
+		const files = await zipDir(wxt.config.zip.sourcesRoot, sourcesZipPath, {
 			include: wxt.config.zip.includeSources,
 			exclude: excludeSources,
 			transform(absolutePath, zipPath, content) {
 				if (zipPath.endsWith("package.json")) return addOverridesToPackageJson(absolutePath, content, overrides);
 			},
-			additionalFiles: downloadedPackages
+			additionalFiles: downloadedPackages,
+			dot: wxt.config.zip.dotSources
 		});
 		zipFiles.push(sourcesZipPath);
 		await wxt.hooks.callHook("zip:sources:done", wxt, sourcesZipPath);
+		await printFileList(wxt.logger.info, `Sources included in \`${sourcesZipFilename}\``, wxt.config.zip.sourcesRoot, files);
 	}
 	await printFileList(wxt.logger.success, `Zipped extension in ${formatDuration(Date.now() - start)}`, wxt.config.outBaseDir, zipFiles);
 	await wxt.hooks.callHook("zip:done", wxt, zipFiles);
@@ -63,14 +68,12 @@ async function zip(config) {
 }
 async function zipDir(directory, outputPath, options) {
 	const archive = new JSZip();
-	const filesToZip = [...(await glob(["**/*", ...options?.include || []], {
+	const filesToZip = [...await glob(options?.include ?? ["**/*"], {
 		cwd: directory,
-		ignore: ["**/node_modules"],
+		ignore: options?.exclude ?? [],
 		onlyFiles: true,
-		expandDirectories: false
-	})).filter((relativePath) => {
-		return picomatchMultiple(relativePath, options?.include) || !picomatchMultiple(relativePath, options?.exclude);
-	}), ...(options?.additionalFiles ?? []).map((file) => path.relative(directory, file))];
+		dot: options?.dot
+	}), ...(options?.additionalFiles ?? []).map((file) => path.relative(directory, file))].sort();
 	for (const file of filesToZip) {
 		const absolutePath = path.resolve(directory, file);
 		if (file.endsWith(".json")) {
@@ -89,6 +92,7 @@ async function zipDir(directory, outputPath, options) {
 			compressionOptions: { level: wxt.config.zip.compressionLevel }
 		}
 	}).pipe(createWriteStream(outputPath)).on("error", reject).on("close", resolve));
+	return filesToZip;
 }
 async function downloadPrivatePackages() {
 	const overrides = {};

package/dist/index.d.mts

@@ -1,12 +1,13 @@
-import { BackgroundDefinition, BackgroundEntrypoint, BackgroundEntrypointOptions, BaseContentScriptEntrypointOptions, BaseEntrypoint, BaseEntrypointOptions, BaseScriptEntrypointOptions, BuildOutput, BuildStepOutput, ConfigEnv, ContentScriptDefinition, ContentScriptEntrypoint, CopiedPublicFile, Dependency, Entrypoint, EntrypointGroup, EntrypointInfo, EslintGlobalsPropValue, Eslintrc, ExtensionRunner, ExtensionRunnerConfig, FirefoxDataCollectionPermissions, FirefoxDataCollectionType, FsCache, GeneratedPublicFile, GenericEntrypoint, HookResult, InlineConfig, IsolatedWorldContentScriptDefinition, IsolatedWorldContentScriptEntrypointOptions, Logger, MainWorldContentScriptDefinition, MainWorldContentScriptEntrypointOptions, OnContentScriptStopped, OptionsEntrypoint, OptionsEntrypointOptions, OutputAsset, OutputChunk, OutputFile, PerBrowserMap, PerBrowserOption, PopupEntrypoint, PopupEntrypointOptions, PublicPathEntry, ReloadContentScriptPayload, ResolvedBasePublicFile, ResolvedConfig, ResolvedEslintrc, ResolvedPerBrowserOptions, ResolvedPublicFile, ServerInfo, SidepanelEntrypoint, SidepanelEntrypointOptions, TargetBrowser, TargetManifestVersion, ThemeIcon, UnlistedScriptDefinition, UnlistedScriptEntrypoint, UserConfig, UserManifest, UserManifestFn, WebExtConfig, Wxt, WxtBuilder, WxtBuilderServer, WxtCommand, WxtDevServer, WxtDirEntry, WxtDirFileEntry, WxtDirTypeReferenceEntry, WxtHooks, WxtModule, WxtModuleOptions, WxtModuleSetup, WxtModuleWithMetadata, WxtPackageManager, WxtPlugin, WxtResolvedUnimportOptions, WxtUnimportOptions, WxtViteConfig } from "./types.mjs";
+import { BackgroundDefinition, BackgroundEntrypoint, BackgroundEntrypointOptions, BaseContentScriptEntrypointOptions, BaseEntrypoint, BaseEntrypointOptions, BaseScriptEntrypointOptions, BuildOutput, BuildStepOutput, ConfigEnv, ContentScriptDefinition, ContentScriptEntrypoint, CopiedPublicFile, Dependency, Entrypoint, EntrypointGroup, EntrypointInfo, EslintGlobalsPropValue, Eslintrc, ExtensionRunner, FirefoxDataCollectionPermissions, FirefoxDataCollectionType, FsCache, GeneratedPublicFile, GenericEntrypoint, HookResult, InlineConfig, IsolatedWorldContentScriptDefinition, IsolatedWorldContentScriptEntrypointOptions, Logger, MainWorldContentScriptDefinition, MainWorldContentScriptEntrypointOptions, OnContentScriptStopped, OptionsEntrypoint, OptionsEntrypointOptions, OutputAsset, OutputChunk, OutputFile, PerBrowserMap, PerBrowserOption, PopupEntrypoint, PopupEntrypointOptions, PrepareTsconfigs, PublicPathEntry, ReloadContentScriptPayload, ResolvedBasePublicFile, ResolvedConfig, ResolvedEslintrc, ResolvedPerBrowserOptions, ResolvedPublicFile, ServerInfo, SidepanelEntrypoint, SidepanelEntrypointOptions, TargetBrowser, TargetManifestVersion, ThemeIcon, UnlistedScriptDefinition, UnlistedScriptEntrypoint, UserConfig, UserManifest, UserManifestFn, WebExtConfig, Wxt, WxtBuilder, WxtBuilderServer, WxtCommand, WxtDevServer, WxtDirEntry, WxtDirFileEntry, WxtDirTypeReferenceEntry, WxtHooks, WxtModule, WxtModuleOptions, WxtModuleSetup, WxtModuleWithMetadata, WxtPackageManager, WxtPlugin, WxtResolvedUnimportOptions, WxtUnimportOptions, WxtViteConfig } from "./types.mjs";
 import { build } from "./core/build.mjs";
 import { clean } from "./core/clean.mjs";
 import { defineConfig } from "./core/define-config.mjs";
-import { defineRunnerConfig, defineWebExtConfig } from "./core/define-web-ext-config.mjs";
+import { defineWebExtConfig } from "./core/define-web-ext-config.mjs";
 import { createServer } from "./core/create-server.mjs";
 import { initialize } from "./core/initialize.mjs";
 import { prepare } from "./core/prepare.mjs";
 import { zip } from "./core/zip.mjs";
 import { normalizePath } from "./core/utils/paths.mjs";
+import { getEntrypointBundlePath } from "./core/utils/entrypoints.mjs";
 import { version } from "./version.mjs";
-export { BackgroundDefinition, BackgroundEntrypoint, BackgroundEntrypointOptions, BaseContentScriptEntrypointOptions, BaseEntrypoint, BaseEntrypointOptions, BaseScriptEntrypointOptions, BuildOutput, BuildStepOutput, ConfigEnv, ContentScriptDefinition, ContentScriptEntrypoint, CopiedPublicFile, Dependency, Entrypoint, EntrypointGroup, EntrypointInfo, EslintGlobalsPropValue, Eslintrc, ExtensionRunner, ExtensionRunnerConfig, FirefoxDataCollectionPermissions, FirefoxDataCollectionType, FsCache, GeneratedPublicFile, GenericEntrypoint, HookResult, InlineConfig, IsolatedWorldContentScriptDefinition, IsolatedWorldContentScriptEntrypointOptions, Logger, MainWorldContentScriptDefinition, MainWorldContentScriptEntrypointOptions, OnContentScriptStopped, OptionsEntrypoint, OptionsEntrypointOptions, OutputAsset, OutputChunk, OutputFile, PerBrowserMap, PerBrowserOption, PopupEntrypoint, PopupEntrypointOptions, PublicPathEntry, ReloadContentScriptPayload, ResolvedBasePublicFile, ResolvedConfig, ResolvedEslintrc, ResolvedPerBrowserOptions, ResolvedPublicFile, ServerInfo, SidepanelEntrypoint, SidepanelEntrypointOptions, TargetBrowser, TargetManifestVersion, ThemeIcon, UnlistedScriptDefinition, UnlistedScriptEntrypoint, UserConfig, UserManifest, UserManifestFn, WebExtConfig, Wxt, WxtBuilder, WxtBuilderServer, WxtCommand, WxtDevServer, WxtDirEntry, WxtDirFileEntry, WxtDirTypeReferenceEntry, WxtHooks, WxtModule, WxtModuleOptions, WxtModuleSetup, WxtModuleWithMetadata, WxtPackageManager, WxtPlugin, WxtResolvedUnimportOptions, WxtUnimportOptions, WxtViteConfig, build, clean, createServer, defineConfig, defineRunnerConfig, defineWebExtConfig, initialize, normalizePath, prepare, version, zip };
+export { BackgroundDefinition, BackgroundEntrypoint, BackgroundEntrypointOptions, BaseContentScriptEntrypointOptions, BaseEntrypoint, BaseEntrypointOptions, BaseScriptEntrypointOptions, BuildOutput, BuildStepOutput, ConfigEnv, ContentScriptDefinition, ContentScriptEntrypoint, CopiedPublicFile, Dependency, Entrypoint, EntrypointGroup, EntrypointInfo, EslintGlobalsPropValue, Eslintrc, ExtensionRunner, FirefoxDataCollectionPermissions, FirefoxDataCollectionType, FsCache, GeneratedPublicFile, GenericEntrypoint, HookResult, InlineConfig, IsolatedWorldContentScriptDefinition, IsolatedWorldContentScriptEntrypointOptions, Logger, MainWorldContentScriptDefinition, MainWorldContentScriptEntrypointOptions, OnContentScriptStopped, OptionsEntrypoint, OptionsEntrypointOptions, OutputAsset, OutputChunk, OutputFile, PerBrowserMap, PerBrowserOption, PopupEntrypoint, PopupEntrypointOptions, PrepareTsconfigs, PublicPathEntry, ReloadContentScriptPayload, ResolvedBasePublicFile, ResolvedConfig, ResolvedEslintrc, ResolvedPerBrowserOptions, ResolvedPublicFile, ServerInfo, SidepanelEntrypoint, SidepanelEntrypointOptions, TargetBrowser, TargetManifestVersion, ThemeIcon, UnlistedScriptDefinition, UnlistedScriptEntrypoint, UserConfig, UserManifest, UserManifestFn, WebExtConfig, Wxt, WxtBuilder, WxtBuilderServer, WxtCommand, WxtDevServer, WxtDirEntry, WxtDirFileEntry, WxtDirTypeReferenceEntry, WxtHooks, WxtModule, WxtModuleOptions, WxtModuleSetup, WxtModuleWithMetadata, WxtPackageManager, WxtPlugin, WxtResolvedUnimportOptions, WxtUnimportOptions, WxtViteConfig, build, clean, createServer, defineConfig, defineWebExtConfig, getEntrypointBundlePath, initialize, normalizePath, prepare, version, zip };

package/dist/index.mjs

@@ -1,12 +1,13 @@
 import { normalizePath } from "./core/utils/paths.mjs";
+import { getEntrypointBundlePath } from "./core/utils/entrypoints.mjs";
 import { version } from "./version.mjs";
 import { build } from "./core/build.mjs";
 import { clean } from "./core/clean.mjs";
 import { defineConfig } from "./core/define-config.mjs";
-import { defineRunnerConfig, defineWebExtConfig } from "./core/define-web-ext-config.mjs";
+import { defineWebExtConfig } from "./core/define-web-ext-config.mjs";
 import { createServer } from "./core/create-server.mjs";
 import { initialize } from "./core/initialize.mjs";
 import { prepare } from "./core/prepare.mjs";
 import { zip } from "./core/zip.mjs";
 import "./core/index.mjs";
-export { build, clean, createServer, defineConfig, defineRunnerConfig, defineWebExtConfig, initialize, normalizePath, prepare, version, zip };
+export { build, clean, createServer, defineConfig, defineWebExtConfig, getEntrypointBundlePath, initialize, normalizePath, prepare, version, zip };

package/dist/testing/wxt-vitest-plugin.mjs

@@ -1,4 +1,3 @@
-import { download } from "../core/builders/vite/plugins/download.mjs";
 import { tsconfigPaths } from "../core/builders/vite/plugins/tsconfigPaths.mjs";
 import { globals } from "../core/builders/vite/plugins/globals.mjs";
 import { extensionApiMock } from "../core/builders/vite/plugins/extensionApiMock.mjs";
@@ -28,7 +27,6 @@ async function WxtVitest(inlineConfig) {
 	await registerWxt("serve", inlineConfig ?? {});
 	const plugins = [
 		globals(wxt.config),
-		download(wxt.config),
 		tsconfigPaths(wxt.config),
 		resolveAppConfig(wxt.config),
 		extensionApiMock(wxt.config)