wxt 0.19.10 → 0.19.12

package/README.md

@@ -71,7 +71,7 @@ Or see the [installation guide](https://wxt.dev/guide/installation.html) to get
 - 🦾 Auto-imports
 - 🤖 Automated publishing
 - 🎨 Frontend framework agnostic: works with Vue, React, Svelte, etc
-- 📦 Modular architecture with [WXT modules](https://wxt.dev/guide/go-further/reusable-modules.html#overview)
+- 📦 [Module system](https://wxt.dev/guide/essentials/wxt-modules.html#overview) for reusing code between extensions
 - 🖍️ Quickly bootstrap a new project
 - 📏 Bundle analysis
 - ⬇️ Download and bundle remote URL imports

package/dist/browser/index.d.ts

@@ -8,8 +8,16 @@ export type AugmentedBrowser = Omit<Browser, 'runtime' | 'i18n'> & {
     runtime: WxtRuntime & Omit<Browser['runtime'], 'getURL'>;
     i18n: WxtI18n & Omit<Browser['i18n'], 'getMessage'>;
 };
+/**
+ * This interface is empty because it is generated per-project when running `wxt prepare`. See:
+ * - `.wxt/types/paths.d.ts`
+ */
 export interface WxtRuntime {
 }
+/**
+ * This interface is empty because it is generated per-project when running `wxt prepare`. See:
+ * - `.wxt/types/i18n.d.ts`
+ */
 export interface WxtI18n {
 }
 export declare const browser: AugmentedBrowser;

package/dist/cli/cli-utils.mjs

@@ -4,6 +4,7 @@ import { printHeader } from "../core/utils/log/index.mjs";
 import { formatDuration } from "../core/utils/time.mjs";
 import { ValidationError } from "../core/utils/validation.mjs";
 import { registerWxt } from "../core/wxt.mjs";
+import spawn from "nano-spawn";
 export function wrapAction(cb, options) {
   return async (...args) => {
     const isDebug = !!args.find((arg) => arg?.debug);
@@ -43,8 +44,7 @@ export function createAliasedCommand(base, name, alias, bin, docsUrl) {
       const args = process.argv.slice(
         process.argv.indexOf(aliasedCommand.name) + 1
       );
-      const { execa } = await import("execa");
-      await execa(bin, args, {
+      await spawn(bin, args, {
         stdio: "inherit"
       });
     } catch {

package/dist/cli/commands.mjs

@@ -56,7 +56,7 @@ cli.command("build [root]", "build for production").option("-c, --config <file>"
     });
   })
 );
-cli.command("zip [root]", "build for production and zip output").option("-c, --config <file>", "use specified config file").option("-m, --mode <mode>", "set env mode").option("-b, --browser <browser>", "specify a browser").option("--mv3", "target manifest v3").option("--mv2", "target manifest v2").action(
+cli.command("zip [root]", "build for production and zip output").option("-c, --config <file>", "use specified config file").option("-m, --mode <mode>", "set env mode").option("-b, --browser <browser>", "specify a browser").option("--mv3", "target manifest v3").option("--mv2", "target manifest v2").option("--sources", "always create sources zip").action(
   wrapAction(async (root, flags) => {
     await zip({
       root,
@@ -64,7 +64,10 @@ cli.command("zip [root]", "build for production and zip output").option("-c, --c
       browser: flags.browser,
       manifestVersion: flags.mv3 ? 3 : flags.mv2 ? 2 : void 0,
       configFile: flags.config,
-      debug: flags.debug
+      debug: flags.debug,
+      zip: {
+        zipSources: flags.sources
+      }
     });
   })
 );

package/dist/client/content-scripts/ui/index.d.ts

@@ -4,13 +4,13 @@ export * from './types';
 /**
  * Create a content script UI without any isolation.
  *
- * @see https://wxt.dev/guide/key-concepts/content-script-ui.html#integrated
+ * @see https://wxt.dev/guide/essentials/content-scripts.html#integrated
  */
 export declare function createIntegratedUi<TMounted>(ctx: ContentScriptContext, options: IntegratedContentScriptUiOptions<TMounted>): IntegratedContentScriptUi<TMounted>;
 /**
  * Create a content script UI using an iframe.
  *
- * @see https://wxt.dev/guide/key-concepts/content-script-ui.html#iframe
+ * @see https://wxt.dev/guide/essentials/content-scripts.html#iframe
  */
 export declare function createIframeUi<TMounted>(ctx: ContentScriptContext, options: IframeContentScriptUiOptions<TMounted>): IframeContentScriptUi<TMounted>;
 /**
@@ -18,6 +18,6 @@ export declare function createIframeUi<TMounted>(ctx: ContentScriptContext, opti
  *
  * > This function is async because it has to load the CSS via a network call.
  *
- * @see https://wxt.dev/guide/key-concepts/content-script-ui.html#shadowroot
+ * @see https://wxt.dev/guide/essentials/content-scripts.html#shadowroot
  */
 export declare function createShadowRootUi<TMounted>(ctx: ContentScriptContext, options: ShadowRootContentScriptUiOptions<TMounted>): Promise<ShadowRootContentScriptUi<TMounted>>;

package/dist/core/builders/vite/index.mjs

@@ -17,6 +17,7 @@ export async function createViteBuilder(wxtConfig, hooks, server) {
     config.configFile = false;
     config.logLevel = "warn";
     config.mode = wxtConfig.mode;
+    config.envPrefix ??= ["VITE_", "WXT_"];
     config.build ??= {};
     config.publicDir = wxtConfig.publicDir;
     config.build.copyPublicDir = false;
@@ -67,7 +68,7 @@ export async function createViteBuilder(wxtConfig, hooks, server) {
       plugins,
       esbuild: {
         // Add a footer with the returned value so it can return values to `scripting.executeScript`
-        // Footer is added apart of esbuild to make sure it's not minified. It
+        // Footer is added a part of esbuild to make sure it's not minified. It
         // get's removed if added to `build.rollupOptions.output.footer`
         // See https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/scripting/executeScript#return_value
         footer: iifeReturnValueName + ";"

package/dist/core/generate-wxt-dir.d.ts

@@ -0,0 +1,5 @@
+import { Entrypoint } from '../types';
+/**
+ * Generate and write all the files inside the `InternalConfig.typesDir` directory.
+ */
+export declare function generateWxtDir(entrypoints: Entrypoint[]): Promise<void>;

package/dist/core/{utils/building/generate-wxt-dir.mjs → generate-wxt-dir.mjs}

@@ -1,16 +1,13 @@
 import fs from "fs-extra";
 import { dirname, relative, resolve } from "node:path";
-import {
-  getEntrypointBundlePath,
-  isHtmlEntrypoint
-} from "../../utils/entrypoints.mjs";
-import { getEntrypointGlobals, getGlobals } from "../../utils/globals.mjs";
-import { normalizePath } from "../../utils/paths.mjs";
+import { getEntrypointBundlePath, isHtmlEntrypoint } from "./utils/entrypoints.mjs";
+import { getEntrypointGlobals, getGlobals } from "./utils/globals.mjs";
+import { normalizePath } from "./utils/paths.mjs";
 import path from "node:path";
-import { parseI18nMessages } from "../../utils/i18n.mjs";
-import { writeFileIfDifferent, getPublicFiles } from "../../utils/fs.mjs";
-import { wxt } from "../../wxt.mjs";
-export async function generateTypesDir(entrypoints) {
+import { parseI18nMessages } from "./utils/i18n.mjs";
+import { writeFileIfDifferent, getPublicFiles } from "./utils/fs.mjs";
+import { wxt } from "./wxt.mjs";
+export async function generateWxtDir(entrypoints) {
   await fs.ensureDir(wxt.config.typesDir);
   const entries = [
     // Hard-coded entries

package/dist/core/package-managers/bun.mjs

@@ -1,4 +1,5 @@
 import { dedupeDependencies, npm } from "./npm.mjs";
+import spawn from "nano-spawn";
 export const bun = {
   overridesKey: "overrides",
   // But also supports "resolutions"
@@ -10,8 +11,7 @@ export const bun = {
     if (options?.all) {
       args.push("--all");
     }
-    const { execa } = await import("execa");
-    const res = await execa("bun", args, { cwd: options?.cwd });
+    const res = await spawn("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, version]) => ({ name, version }))
     );

package/dist/core/package-managers/npm.mjs

@@ -1,11 +1,11 @@
 import path from "node:path";
 import { ensureDir } from "fs-extra";
+import spawn from "nano-spawn";
 export const npm = {
   overridesKey: "overrides",
   async downloadDependency(id, downloadDir) {
     await ensureDir(downloadDir);
-    const { execa } = await import("execa");
-    const res = await execa("npm", ["pack", id, "--json"], {
+    const res = await spawn("npm", ["pack", id, "--json"], {
       cwd: downloadDir
     });
     const packed = JSON.parse(res.stdout);
@@ -16,8 +16,7 @@ export const npm = {
     if (options?.all) {
       args.push("--depth", "Infinity");
     }
-    const { execa } = await import("execa");
-    const res = await execa("npm", args, { cwd: options?.cwd });
+    const res = await spawn("npm", args, { cwd: options?.cwd });
     const project = JSON.parse(res.stdout);
     return flattenNpmListOutput([project]);
   }

package/dist/core/package-managers/pnpm.mjs

@@ -1,4 +1,5 @@
 import { flattenNpmListOutput, npm } from "./npm.mjs";
+import spawn from "nano-spawn";
 export const pnpm = {
   overridesKey: "resolutions",
   // "pnpm.overrides" has a higher priority, but I don't want to deal with nesting
@@ -13,8 +14,7 @@ export const pnpm = {
     if (typeof process !== "undefined" && process.env.WXT_PNPM_IGNORE_WORKSPACE === "true") {
       args.push("--ignore-workspace");
     }
-    const { execa } = await import("execa");
-    const res = await execa("pnpm", args, { cwd: options?.cwd });
+    const res = await spawn("pnpm", args, { cwd: options?.cwd });
     const projects = JSON.parse(res.stdout);
     return flattenNpmListOutput(projects);
   }

package/dist/core/package-managers/yarn.mjs

@@ -1,4 +1,5 @@
 import { dedupeDependencies, npm } from "./npm.mjs";
+import spawn from "nano-spawn";
 export const yarn = {
   overridesKey: "resolutions",
   downloadDependency(...args) {
@@ -9,8 +10,7 @@ export const yarn = {
     if (options?.all) {
       args.push("--depth", "Infinity");
     }
-    const { execa } = await import("execa");
-    const res = await execa("yarn", args, { cwd: options?.cwd });
+    const res = await spawn("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");
     const queue = [...tree.trees];

package/dist/core/prepare.mjs

@@ -1,8 +1,9 @@
-import { findEntrypoints, generateTypesDir } from "./utils/building/index.mjs";
+import { findEntrypoints } from "./utils/building/index.mjs";
+import { generateWxtDir } from "./generate-wxt-dir.mjs";
 import { registerWxt, wxt } from "./wxt.mjs";
 export async function prepare(config) {
   await registerWxt("build", config);
   wxt.logger.info("Generating types...");
   const entrypoints = await findEntrypoints();
-  await generateTypesDir(entrypoints);
+  await generateWxtDir(entrypoints);
 }

package/dist/core/{utils/building/resolve-config.d.ts → resolve-config.d.ts}

@@ -1,4 +1,4 @@
-import { InlineConfig, ResolvedConfig, UserConfig, Logger, WxtCommand, WxtModuleWithMetadata } from '../../../types';
+import { InlineConfig, ResolvedConfig, UserConfig, Logger, WxtCommand, WxtModuleWithMetadata } from '../types';
 /**
  * Given an inline config, discover the config file if necessary, merge the results, resolve any
  * relative paths, and apply any defaults.

package/dist/core/{utils/building/resolve-config.mjs → resolve-config.mjs}

@@ -1,15 +1,15 @@
 import { loadConfig } from "c12";
 import path from "node:path";
-import { createFsCache } from "../../utils/cache.mjs";
+import { createFsCache } from "./utils/cache.mjs";
 import consola, { LogLevels } from "consola";
 import defu from "defu";
 import fs from "fs-extra";
-import { normalizePath } from "../paths.mjs";
+import { normalizePath } from "./utils/paths.mjs";
 import glob from "fast-glob";
-import { builtinModules } from "../../../builtin-modules/index.mjs";
-import { getEslintVersion } from "../eslint.mjs";
-import { safeStringToNumber } from "../number.mjs";
-import { loadEnv } from "../env.mjs";
+import { builtinModules } from "../builtin-modules/index.mjs";
+import { getEslintVersion } from "./utils/eslint.mjs";
+import { safeStringToNumber } from "./utils/number.mjs";
+import { loadEnv } from "./utils/env.mjs";
 export async function resolveConfig(inlineConfig, command) {
   let userConfig = {};
   let userConfigMetadata;
@@ -53,7 +53,12 @@ export async function resolveConfig(inlineConfig, command) {
   const publicDir = path.resolve(srcDir, mergedConfig.publicDir ?? "public");
   const typesDir = path.resolve(wxtDir, "types");
   const outBaseDir = path.resolve(root, mergedConfig.outDir ?? ".output");
-  const outDir = path.resolve(outBaseDir, `${browser}-mv${manifestVersion}`);
+  const modeSuffixes = {
+    production: "",
+    development: "-dev"
+  };
+  const outDirTemplate = (mergedConfig.outDirTemplate ?? `${browser}-mv${manifestVersion}`).replaceAll("{{browser}}", browser).replaceAll("{{manifestVersion}}", manifestVersion.toString()).replaceAll("{{modeSuffix}}", modeSuffixes[mode] ?? `-${mode}`).replaceAll("{{mode}}", mode).replaceAll("{{command}}", command);
+  const outDir = path.resolve(outBaseDir, outDirTemplate);
   const reloadCommand = mergedConfig.dev?.reloadCommand ?? "Alt+R";
   const runnerConfig = await loadConfig({
     name: "web-ext",
@@ -129,7 +134,7 @@ export async function resolveConfig(inlineConfig, command) {
     srcDir,
     typesDir,
     wxtDir,
-    zip: resolveZipConfig(root, outBaseDir, mergedConfig),
+    zip: resolveZipConfig(root, browser, outBaseDir, mergedConfig),
     transformManifest: mergedConfig.transformManifest,
     analysis: resolveAnalysisConfig(root, mergedConfig),
     userConfigMetadata: userConfigMetadata ?? {},
@@ -178,7 +183,7 @@ async function mergeInlineConfig(inlineConfig, userConfig) {
     ...builderConfig
   };
 }
-function resolveZipConfig(root, outBaseDir, mergedConfig) {
+function resolveZipConfig(root, browser, outBaseDir, mergedConfig) {
   const downloadedPackagesDir = path.resolve(root, ".wxt/local_modules");
   return {
     name: void 0,
@@ -188,6 +193,7 @@ function resolveZipConfig(root, outBaseDir, mergedConfig) {
     includeSources: [],
     compressionLevel: 9,
     ...mergedConfig.zip,
+    zipSources: mergedConfig.zip?.zipSources ?? ["firefox", "opera"].includes(browser),
     exclude: mergedConfig.zip?.exclude ?? [],
     excludeSources: [
       "**/node_modules",
@@ -338,6 +344,7 @@ export async function resolveWxtUserModules(modulesDir, modules = []) {
     cwd: modulesDir,
     onlyFiles: true
   }).catch(() => []);
+  localModulePaths.sort();
   const localModules = await Promise.all(
     localModulePaths.map(async (file) => {
       const absolutePath = normalizePath(path.resolve(modulesDir, file));

package/dist/core/utils/building/index.d.ts

@@ -1,8 +1,6 @@
 export * from './build-entrypoints';
 export * from './detect-dev-changes';
 export * from './find-entrypoints';
-export * from './generate-wxt-dir';
-export * from './resolve-config';
 export * from './group-entrypoints';
 export * from './import-entrypoint';
 export * from './internal-build';

package/dist/core/utils/building/index.mjs

@@ -1,8 +1,6 @@
 export * from "./build-entrypoints.mjs";
 export * from "./detect-dev-changes.mjs";
 export * from "./find-entrypoints.mjs";
-export * from "./generate-wxt-dir.mjs";
-export * from "./resolve-config.mjs";
 export * from "./group-entrypoints.mjs";
 export * from "./import-entrypoint.mjs";
 export * from "./internal-build.mjs";

package/dist/core/utils/building/rebuild.mjs

@@ -1,4 +1,4 @@
-import { generateTypesDir } from "./generate-wxt-dir.mjs";
+import { generateWxtDir } from "../../generate-wxt-dir.mjs";
 import { buildEntrypoints } from "./build-entrypoints.mjs";
 import { generateManifest, writeManifest } from "../../utils/manifest.mjs";
 import { wxt } from "../../wxt.mjs";
@@ -8,7 +8,7 @@ export async function rebuild(allEntrypoints, entrypointGroups, existingOutput =
 }) {
   const { default: ora } = await import("ora");
   const spinner = ora(`Preparing...`).start();
-  await generateTypesDir(allEntrypoints).catch((err) => {
+  await generateWxtDir(allEntrypoints).catch((err) => {
     wxt.logger.warn("Failed to update .wxt directory:", err);
     if (wxt.config.command === "build") throw err;
   });

package/dist/core/utils/env.mjs

@@ -1,6 +1,6 @@
 import { config } from "dotenv";
 export function loadEnv(mode) {
   return config({
-    path: [`.env`, `.env.local`, `.env.${mode}`, `.env.${mode}.local`]
+    path: [`.env.${mode}.local`, `.env.${mode}`, `.env.local`, `.env`]
   });
 }