wxt 0.21.4 → 0.21.5

package/dist/{modules.d.mts → modules/index.d.mts}

@@ -1,8 +1,8 @@
-import { Entrypoint, Wxt, WxtModule, WxtModuleOptions, WxtModuleSetup } from "./types.mjs";
+import { Entrypoint, Wxt, WxtModule, WxtModuleOptions, WxtModuleSetup } from "../types.mjs";
 import { UnimportOptions } from "unimport";
 import * as vite from "vite";
 
-//#region src/modules.d.ts
+//#region src/modules/index.d.ts
 declare function defineWxtModule<TOptions extends WxtModuleOptions>(module: WxtModule<TOptions> | WxtModuleSetup<TOptions>): WxtModule<TOptions>;
 /**
  * Adds a TS/JS file as an entrypoint to the project. This file will be bundled
@@ -71,14 +71,20 @@ declare function addViteConfig(wxt: Wxt, viteConfig: (env: vite.ConfigEnv) => vi
  *
  * @example
  *   export default defineWxtModule((wxt) => {
- *     addWxtPlugin(wxt, 'wxt-module-analytics/client-plugin');
+ *     addWxtPlugin(
+ *       wxt,
+ *       'wxt-module-analytics/background-plugin',
+ *       (entrypoint) => entrypoint.type === 'background',
+ *     );
  *   });
  *
  * @param wxt The wxt instance provided by the module's setup function.
  * @param plugin An import from an NPM module, or an absolute file path to the
  *   file to load at runtime.
+ * @param apply Optional. Return `true` to load the plugin in the given
+ *   entrypoint. Defaults to loading the plugin in every entrypoint.
  */
-declare function addWxtPlugin(wxt: Wxt, plugin: string): void;
+declare function addWxtPlugin(wxt: Wxt, plugin: string, apply?: (entrypoint: Entrypoint) => boolean): void;
 /**
  * Add an Unimport preset
  * ([built-in](https://github.com/unjs/unimport?tab=readme-ov-file#built-in-presets),

package/dist/{modules.mjs → modules/index.mjs}

@@ -1,6 +1,6 @@
-import { glob } from "tinyglobby";
 import { resolve } from "node:path";
-//#region src/modules.ts
+import { glob } from "tinyglobby";
+//#region src/modules/index.ts
 function defineWxtModule(module) {
 	if (typeof module === "function") return { setup: module };
 	return module;
@@ -102,16 +102,25 @@ function addViteConfig(wxt, viteConfig) {
 *
 * @example
 *   export default defineWxtModule((wxt) => {
-*     addWxtPlugin(wxt, 'wxt-module-analytics/client-plugin');
+*     addWxtPlugin(
+*       wxt,
+*       'wxt-module-analytics/background-plugin',
+*       (entrypoint) => entrypoint.type === 'background',
+*     );
 *   });
 *
 * @param wxt The wxt instance provided by the module's setup function.
 * @param plugin An import from an NPM module, or an absolute file path to the
 *   file to load at runtime.
+* @param apply Optional. Return `true` to load the plugin in the given
+*   entrypoint. Defaults to loading the plugin in every entrypoint.
 */
-function addWxtPlugin(wxt, plugin) {
+function addWxtPlugin(wxt, plugin, apply) {
 	wxt.hooks.hook("config:resolved", (wxt) => {
-		wxt.config.plugins.push(plugin);
+		wxt.config.plugins.push({
+			module: plugin,
+			apply
+		});
 	});
 }
 /**

package/dist/prepare.d.mts

@@ -0,0 +1,6 @@
+import { InlineConfig } from "./types.mjs";
+
+//#region src/prepare.d.ts
+declare function prepare(config: InlineConfig): Promise<void>;
+//#endregion
+export { prepare };

package/dist/prepare.mjs

@@ -0,0 +1,11 @@
+import { registerWxt, wxt } from "./internal/wxt.mjs";
+import { findEntrypoints } from "./internal/find-entrypoints.mjs";
+import { generateWxtDir } from "./internal/generate-wxt-dir.mjs";
+//#region src/prepare.ts
+async function prepare(config) {
+	await registerWxt("build", config);
+	wxt.logger.info("Generating types...");
+	await generateWxtDir(await findEntrypoints());
+}
+//#endregion
+export { prepare };

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

@@ -1,9 +1,9 @@
-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";
-import { resolveAppConfig } from "../core/builders/vite/plugins/resolveAppConfig.mjs";
-import "../core/builders/vite/plugins/index.mjs";
-import { registerWxt, wxt } from "../core/wxt.mjs";
+import { addRuntimeEnvEntries } from "../internal/builders/vite/plugins/add-runtime-env-entries.mjs";
+import { extensionApiMock } from "../internal/builders/vite/plugins/extension-api-mock.mjs";
+import { resolveAppConfig } from "../internal/builders/vite/plugins/resolve-app-config.mjs";
+import { tsconfigPaths } from "../internal/builders/vite/plugins/tsconfig-paths.mjs";
+import "../internal/builders/vite/plugins/index.mjs";
+import { registerWxt, wxt } from "../internal/wxt.mjs";
 import UnimportPlugin from "unimport/unplugin";
 //#region src/testing/wxt-vitest-plugin.ts
 /**
@@ -26,7 +26,7 @@ import UnimportPlugin from "unimport/unplugin";
 async function WxtVitest(inlineConfig) {
 	await registerWxt("serve", inlineConfig ?? {});
 	const plugins = [
-		globals(wxt.config),
+		addRuntimeEnvEntries(wxt.config),
 		tsconfigPaths(wxt.config),
 		resolveAppConfig(wxt.config),
 		extensionApiMock(wxt.config)

package/dist/types.d.mts

@@ -19,13 +19,13 @@
  *     });
  *   });
  */import { ContentScriptContext } from "./utils/content-script-context.mjs";
-import { ManifestContentScript } from "./core/utils/types.mjs";
+import { ManifestContentScript } from "./internal-utils/type-utils.mjs";
 import { Hookable, NestedHooks } from "hookable";
 import { Import, UnimportOptions } from "unimport";
-import { PluginVisualizerOptions } from "@aklinker1/rollup-plugin-visualizer";
 import * as Nypm from "nypm";
 import { ResolvedConfig } from "c12";
 import { LogLevel } from "consola";
+import { PluginVisualizerOptions } from "@aklinker1/rollup-plugin-visualizer";
 import { Browser } from "@wxt-dev/browser";
 import * as vite from "vite";
 
@@ -544,8 +544,8 @@ interface WxtHooks {
    * Called when WXT has created Vite's config for the dev server. Useful if you
    * want to add plugins or update the vite config per entrypoint group.
    *
-   * @param viteConfig The config that will be used to build the entrypoints.
-   *   Can be updated by reference.
+   * @param config The config that will be used to build the entrypoints. Can be
+   *   updated by reference.
    */
   'vite:devServer:extendConfig': (config: vite.InlineConfig) => HookResult;
 }
@@ -635,8 +635,8 @@ interface Logger {
   level: LogLevel;
 }
 /**
- * The logger available at `wxt.logger`. Extends {@link Logger} with a `warnOnce`
- * which only logs a message once per process.
+ * The logger available at `wxt.logger` and `wxt.config.logger`. Extends
+ * {@link Logger} with a `warnOnce` which only logs a message once per process.
  */
 interface WxtLogger extends Logger {
   /**
@@ -683,7 +683,7 @@ interface BaseScriptEntrypointOptions extends BaseEntrypointOptions {
    * the default IIFE variable name may conflict with an existing variable on
    * the target page. This applies to content scripts with world=MAIN, and
    * others, such as unlisted scripts, that could be dynamically injected into
-   * the page with a <script> tag.
+   * the page with a `<script>` tag.
    *
    * Available options:
    *
@@ -1088,7 +1088,7 @@ interface ConfigEnv {
   /**
    * Manifest version passed in from the CLI via the `--mv2` or `--mv3` flags.
    * When not passed, it depends on the target browser. See [the
-   * guide](https://wxt.dev/guide/key-concepts/multiple-browsers.html#target-manifest-version)
+   * guide](https://wxt.dev/guide/essentials/target-different-browsers.html#target-a-manifest-version)
    * for more details.
    */
   manifestVersion: 2 | 3;
@@ -1295,7 +1295,7 @@ interface WxtHooks {
    * Called once all entrypoints have been grouped into their build groups.
    *
    * @param wxt The configured WXT object
-   * @param entrypoints The list of groups to build in each build step
+   * @param groups The list of groups to build in each build step
    */
   'entrypoints:grouped': (wxt: Wxt, groups: EntrypointGroup[]) => HookResult;
   /**
@@ -1303,7 +1303,7 @@ interface WxtHooks {
    * reference to add or remove public files.
    *
    * @param wxt The configured WXT object
-   * @param entrypoints The list of files that will be copied into the output
+   * @param files The list of files that will be copied into the output
    *   directory
    */
   'build:publicAssets': (wxt: Wxt, files: ResolvedPublicFile[]) => HookResult;
@@ -1377,7 +1377,7 @@ interface Wxt {
   hooks: Hookable<WxtHooks>;
   /** Alias for `wxt.hooks.hook(...)`. */
   hook: Hookable<WxtHooks>['hook'];
-  /** Wraps `config.logger`, adding `warnOnce`. */
+  /** Alias for `config.logger`. */
   logger: WxtLogger;
   /** Reload config file and update `wxt.config` with the result. */
   reloadConfig: () => Promise<void>;
@@ -1385,8 +1385,39 @@ interface Wxt {
   pm: WxtPackageManager;
   /** If the dev server was started, it will be available. */
   server?: WxtDevServer;
-  /** The module in charge of executing all the build steps. */
+  /**
+   * The module in charge of executing all the build steps.
+   *
+   * To override the entire builder process, set this value in a module's
+   * `setup` function or during the `config:resolved` hook.
+   *
+   * ```ts
+   * wxt.build = new MyBuilder(wxt.config);
+   * ```
+   */
   builder: WxtBuilder;
+  /**
+   * Service responsible for discovering entrypoints in a project.
+   *
+   * To override how entrypoints are discovered, set this value in a module's
+   * `setup` function or during the `config:resolved` hook.
+   *
+   * ```ts
+   * wxt.entrypointFinder = new MyEntrypointFinder(wxt.config);
+   * ```
+   */
+  entrypointFinder: EntrypointFinder;
+  /**
+   * Service responsible for opening the browser during dev mode.
+   *
+   * To override how the browser is opened, set this value in a module's `setup`
+   * function or during the `config:resolved` hook.
+   *
+   * ```ts
+   * wxt.runner = new MyRunner(wxt.config);
+   * ```
+   */
+  runner: ExtensionRunner;
 }
 interface ResolvedConfig$1 {
   root: string;
@@ -1434,6 +1465,7 @@ interface ResolvedConfig$1 {
   manifest: UserManifest;
   fsCache: FsCache;
   webExt: ResolvedConfig<WebExtConfig>;
+  /** @deprecated Use `wxt.runner` instead of `wxt.config.runner` */
   runner: ExtensionRunner;
   zip: {
     name?: string;
@@ -1503,13 +1535,27 @@ interface ResolvedConfig$1 {
   builtinModules: WxtModule<any>[];
   userModules: WxtModuleWithMetadata<any>[];
   /**
-   * An array of string to import plugins from. These paths should be resolvable
-   * by vite, and they should `export default defineWxtPlugin(...)`.
+   * Plugins registered via `addWxtPlugin`. Each entry's `module` should be
+   * resolvable by vite, and should `export default defineWxtPlugin(...)`. An
+   * optional `apply` function restricts which entrypoints the plugin loads in.
    *
    * @example
-   *   ['@wxt-dev/module-vue/plugin', 'wxt-module-google-analytics/plugin'];
+   *   [{ module: '@wxt-dev/module-vue/plugin' }];
    */
-  plugins: string[];
+  plugins: Array<string | WxtPluginEntry>;
+}
+/**
+ * A plugin registered via `addWxtPlugin`, along with an optional `apply`
+ * function controlling which entrypoints it's loaded in.
+ */
+interface WxtPluginEntry {
+  /** Import path or absolute file path to the plugin module. */
+  module: string;
+  /**
+   * Return `true` to include the plugin in this entrypoint. When omitted, the
+   * plugin is included in every entrypoint.
+   */
+  apply?: (entrypoint: Entrypoint) => boolean;
 }
 interface FsCache {
   set(key: string, value: string): Promise<void>;
@@ -1519,7 +1565,7 @@ interface ExtensionRunner {
   openBrowser(): Promise<void>;
   closeBrowser?(): Promise<void>;
   /** Whether or not this runner actually opens the browser. */
-  canOpen?(): boolean;
+  canOpen?(): Promise<boolean>;
 }
 type EslintGlobalsPropValue = boolean | 'readonly' | 'readable' | 'writable' | 'writeable';
 type EslintConfigVersion = 8 | 9;
@@ -1564,7 +1610,7 @@ type WxtUnimportOptions = Partial<UnimportOptions> & {
    * extended, fixes these lint errors.
    *
    * See
-   * [https://wxt.dev/guide/key-concepts/auto-imports.html#eslint](https://wxt.dev/guide/key-concepts/auto-imports.html#eslint)
+   * [https://wxt.dev/guide/essentials/config/auto-imports.html#eslint](https://wxt.dev/guide/essentials/config/auto-imports.html#eslint)
    */
   eslintrc?: Eslintrc;
 };
@@ -1697,5 +1743,12 @@ interface WxtDirFileEntry {
   /** Set to `true` to add a reference to this file in `.wxt/wxt.d.ts`. */
   tsReference?: boolean;
 }
+interface EntrypointFinder {
+  /**
+   * @returns A list of file paths (absolute or relative to
+   *   `wxt.config.rootDir`) to load as entrypoints for.
+   */
+  findEntrypoints(): Promise<EntrypointInfo[]> | EntrypointInfo[];
+}
 //#endregion
-export { BackgroundDefinition, BackgroundEntrypoint, BackgroundEntrypointOptions, BaseContentScriptEntrypointOptions, BaseEntrypoint, BaseEntrypointOptions, BaseScriptEntrypointOptions, BuildOutput, BuildStepOutput, ConfigEnv, ContentScriptDefinition, ContentScriptEntrypoint, CopiedPublicFile, Dependency, Entrypoint, EntrypointGroup, EntrypointInfo, EslintConfigVersion, 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$1 as 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, WxtLogger, WxtModule, WxtModuleOptions, WxtModuleSetup, WxtModuleWithMetadata, WxtPackageManager, WxtPlugin, WxtResolvedUnimportOptions, WxtUnimportOptions, WxtViteConfig };
+export { BackgroundDefinition, BackgroundEntrypoint, BackgroundEntrypointOptions, BaseContentScriptEntrypointOptions, BaseEntrypoint, BaseEntrypointOptions, BaseScriptEntrypointOptions, BuildOutput, BuildStepOutput, ConfigEnv, ContentScriptDefinition, ContentScriptEntrypoint, CopiedPublicFile, Dependency, Entrypoint, EntrypointFinder, EntrypointGroup, EntrypointInfo, EslintConfigVersion, 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$1 as 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, WxtLogger, WxtModule, WxtModuleOptions, WxtModuleSetup, WxtModuleWithMetadata, WxtPackageManager, WxtPlugin, WxtPluginEntry, WxtResolvedUnimportOptions, WxtUnimportOptions, WxtViteConfig };

package/dist/utils/content-script-context.d.mts

@@ -141,4 +141,4 @@ interface WxtWindowEventMap extends WindowEventMap {
   'wxt:locationchange': WxtLocationChangeEvent;
 }
 //#endregion
-export { ContentScriptContext, WxtWindowEventMap };
+export { ContentScriptContext, type WxtLocationChangeEvent, WxtWindowEventMap };

package/dist/utils/content-script-ui/iframe.d.mts

@@ -17,6 +17,11 @@ interface IframeContentScriptUi<TMounted> extends ContentScriptUi<TMounted> {
   /** A wrapper div that assists in positioning. */
   wrapper: HTMLDivElement;
 }
+/**
+ * {@inheritDoc wxt/utils/content-script-ui/types!ContentScriptUiOptions}
+ *
+ * @interface
+ */
 type IframeContentScriptUiOptions<TMounted> = ContentScriptUiOptions<TMounted> & {
   /**
    * The path to the HTML page that will be shown in the iframe. This string

package/dist/utils/content-script-ui/integrated.d.mts

@@ -19,6 +19,11 @@ interface IntegratedContentScriptUi<TMounted> extends ContentScriptUi<TMounted>
   /** A wrapper div that assists in positioning. */
   wrapper: HTMLElement;
 }
+/**
+ * {@inheritDoc wxt/utils/content-script-ui/types!ContentScriptUiOptions}
+ *
+ * @interface
+ */
 type IntegratedContentScriptUiOptions<TMounted> = ContentScriptUiOptions<TMounted> & {
   /**
    * Tag used to create the wrapper element.

package/dist/utils/content-script-ui/shadow-root.d.mts

@@ -28,6 +28,11 @@ interface ShadowRootContentScriptUi<TMounted> extends ContentScriptUi<TMounted>
   /** The shadow root performing the isolation. */
   shadow: ShadowRoot;
 }
+/**
+ * {@inheritDoc wxt/utils/content-script-ui/types!ContentScriptUiOptions}
+ *
+ * @interface
+ */
 type ShadowRootContentScriptUiOptions<TMounted> = ContentScriptUiOptions<TMounted> & {
   /**
    * The name of the custom component used to host the ShadowRoot. Must be

package/dist/utils/content-script-ui/types.d.mts

@@ -3,6 +3,13 @@
 interface ContentScriptUi<TMounted> extends MountFunctions {
   mounted: TMounted | undefined;
 }
+/**
+ * Options shared by integrated, shadow root, and iframe UIs.
+ *
+ * `position` selects `"inline"`, `"overlay"`, or `"modal"` positioning.
+ * `zIndex` controls the positioning element's stacking level for overlays and
+ * modals. `alignment` is available for overlays.
+ */
 type ContentScriptUiOptions<TMounted> = ContentScriptPositioningOptions & ContentScriptAnchoredOptions & {
   /**
    * Callback called before the UI is removed from the webpage. Use to cleanup
@@ -20,19 +27,24 @@ type ContentScriptOverlayAlignment = 'top-left' | 'top-right' | 'bottom-left' |
  * modes](https://wxt.dev/content-script-ui-append.png)
  */
 type ContentScriptAppendMode = 'last' | 'first' | 'replace' | 'before' | 'after' | ((anchor: Element, ui: Element) => void);
+/** Inline positioning does not support `zIndex` or `alignment`. */
 interface ContentScriptInlinePositioningOptions {
+  /** Choose between `"inline"`, `"overlay"`, or `"modal"` positioning. */
   position: 'inline';
+  zIndex?: never;
+  alignment?: never;
 }
 interface ContentScriptOverlayPositioningOptions {
   position: 'overlay';
   /**
-   * The `z-index` used on the `wrapper` element. Set to a positive number to
+   * The `z-index` used on the positioning element. Set to a positive number to
    * show your UI over website content.
    */
   zIndex?: number;
   /**
-   * When using `type: "overlay"`, the mounted element is 0px by 0px in size.
-   * Alignment specifies which corner is aligned with that 0x0 pixel space.
+   * When using `position: "overlay"`, the mounted element is 0px by 0px in
+   * size. Alignment specifies which corner is aligned with that 0x0 pixel
+   * space.
    *
    * [Visualization of alignment
    * options](https://wxt.dev/content-script-ui-alignment.png)
@@ -41,13 +53,17 @@ interface ContentScriptOverlayPositioningOptions {
    */
   alignment?: ContentScriptOverlayAlignment;
 }
+/**
+ * Modal positioning options.
+ *
+ * @property zIndex The `z-index` used on the `shadowHost` element. Set to a
+ *   positive number to show your UI over website content.
+ * @property alignment Only available when `position` is `"overlay"`.
+ */
 interface ContentScriptModalPositioningOptions {
   position: 'modal';
-  /**
-   * The `z-index` used on the `shadowHost`. Set to a positive number to show
-   * your UI over website content.
-   */
   zIndex?: number;
+  alignment?: never;
 }
 /**
  * Choose between `"inline"`, `"overlay"`, or `"modal"` positions.

package/dist/utils/internal/custom-events.d.mts

@@ -1,9 +1,19 @@
 //#region src/utils/internal/custom-events.d.ts
+/**
+ * Fired on `window` as `wxt:locationchange` when a content script detects a
+ * same-document URL change.
+ */
 declare class WxtLocationChangeEvent extends Event {
+  /** The URL after the change. */
   readonly newUrl: URL;
+  /** The URL before the change. */
   readonly oldUrl: URL;
   static EVENT_NAME: string;
-  constructor(newUrl: URL, oldUrl: URL);
+  constructor(/** The URL after the change. */
+
+  newUrl: URL, /** The URL before the change. */
+
+  oldUrl: URL);
 }
 //#endregion
 export { WxtLocationChangeEvent };

package/dist/utils/internal/custom-events.mjs

@@ -1,5 +1,9 @@
 import { browser } from "wxt/browser";
 //#region src/utils/internal/custom-events.ts
+/**
+* Fired on `window` as `wxt:locationchange` when a content script detects a
+* same-document URL change.
+*/
 var WxtLocationChangeEvent = class WxtLocationChangeEvent extends Event {
 	static EVENT_NAME = getUniqueEventName("wxt:locationchange");
 	constructor(newUrl, oldUrl) {

package/dist/version.mjs

@@ -1,4 +1,4 @@
 //#region src/version.ts
-const version = "0.21.4";
+const version = "0.21.5";
 //#endregion
 export { version };

package/dist/virtual/background-entrypoint.mjs

@@ -69,8 +69,19 @@ async function reloadContentScriptMv3({ registration, contentScript }) {
 	if (registration === "runtime") await reloadRuntimeContentScriptMv3(contentScript);
 	else await reloadManifestContentScriptMv3(contentScript);
 }
+/**
+* Reloads of one script run one after another. Two reloads that overlap can
+* both read an empty registration list and both register, and the second
+* registration throws "Duplicate script ID".
+*/
+const manifestReloads = /* @__PURE__ */ new Map();
 async function reloadManifestContentScriptMv3(contentScript) {
 	const id = `wxt:${contentScript.js[0]}`;
+	const reload = (manifestReloads.get(id) ?? Promise.resolve()).then(() => reloadManifestContentScriptNow(id, contentScript));
+	manifestReloads.set(id, reload.catch(() => {}));
+	return reload;
+}
+async function reloadManifestContentScriptNow(id, contentScript) {
 	logger.log("Reloading content script:", contentScript);
 	const registered = await browser.scripting.getRegisteredContentScripts();
 	logger.debug("Existing scripts:", registered);

package/dist/{core/zip.d.mts → zip.d.mts}

@@ -1,6 +1,6 @@
-import { InlineConfig } from "../types.mjs";
+import { InlineConfig } from "./types.mjs";
 
-//#region src/core/zip.d.ts
+//#region src/zip.d.ts
 /**
  * Build and zip the extension for distribution.
  *

package/dist/{core/zip.mjs → zip.mjs}

@@ -1,19 +1,17 @@
-import { normalizePath } from "./utils/paths.mjs";
-import "./utils/index.mjs";
-import { safeFilename } from "./utils/strings.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 { normalizePath } from "./internal-utils/path-utils.mjs";
+import { safeFilename } from "./internal-utils/string-utils.mjs";
+import { formatDuration } from "./internal-utils/time-utils.mjs";
+import { registerWxt, wxt } from "./internal/wxt.mjs";
+import { findEntrypoints } from "./internal/find-entrypoints.mjs";
+import { printFileList } from "./internal-utils/log/print-file-list.mjs";
+import "./internal-utils/log/index.mjs";
+import { getPackageJson } from "./internal/package.mjs";
+import { internalBuild } from "./internal/internal-build.mjs";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
-import { glob } from "tinyglobby";
 import path from "node:path";
+import { glob } from "tinyglobby";
 import { createZip } from "@aklinker1/zero-zip";
-//#region src/core/zip.ts
+//#region src/zip.ts
 /**
 * Build and zip the extension for distribution.
 *

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wxt",
   "type": "module",
-  "version": "0.21.4",
+  "version": "0.21.5",
   "description": "⚡ Next-gen Web Extension Framework",
   "license": "MIT",
   "scripts": {
@@ -15,7 +15,7 @@
     "prepack": "bun run build"
   },
   "dependencies": {
-    "@1natsu/wait-element": "^4.1.2",
+    "@1natsu/wait-element": "^5.0.0",
     "@aklinker1/rollup-plugin-visualizer": "5.12.0",
     "@aklinker1/zero-zip": "^1.0.1",
     "@topcli/prompts": "^4.0.0",
@@ -29,7 +29,6 @@
     "chokidar": "^5.0.0",
     "consola": "^3.4.2",
     "defu": "^6.1.4",
-    "dotenv-expand": "^13.0.0",
     "filesize": "^11.0.17",
     "giget": "^1.2.3 || ^2.0.0 || ^3.0.0",
     "hookable": "^6.1.0",
@@ -38,7 +37,7 @@
     "magicast": "^0.5.2",
     "nypm": "^0.6.5",
     "picomatch": "^4.0.3",
-    "publish-browser-extension": "^5.1.0 || ^6.0.0",
+    "publish-browser-extension": "^6.0.0",
     "superlock": "^1.3.2",
     "tiny-open": "^1.3.0",
     "tinyexec": "^1.2.4",
@@ -65,12 +64,13 @@
   "devDependencies": {
     "@aklinker1/buildc": "^1.1.7",
     "@faker-js/faker": "^10.3.0",
-    "@types/bun": "^1.3.5",
+    "@types/bun": "^1.4.4",
     "@types/lodash.merge": "^4.6.9",
     "@types/node": "^22",
     "@types/normalize-path": "^3.0.2",
     "@types/picomatch": "^4.0.2",
     "@types/prompts": "^2.4.9",
+    "dotenv-expand": "^13.0.0",
     "eslint": "^10.1.0",
     "extract-zip": "^2.0.1",
     "get-port-please": "^3.2.0",
@@ -199,8 +199,8 @@
       "types": "./dist/vite-builder-env.d.ts"
     },
     "./modules": {
-      "types": "./dist/modules.d.mts",
-      "default": "./dist/modules.mjs"
+      "types": "./dist/modules/index.d.mts",
+      "default": "./dist/modules/index.mjs"
     }
   },
   "engines": {

package/dist/core/builders/vite/plugins/entrypointGroupGlobals.mjs

@@ -1,16 +0,0 @@
-import { getEntrypointGlobals } from "../../../utils/globals.mjs";
-//#region src/core/builders/vite/plugins/entrypointGroupGlobals.ts
-/** Define a set of global variables specific to an entrypoint. */
-function entrypointGroupGlobals(entrypointGroup) {
-	return {
-		name: "wxt:entrypoint-group-globals",
-		config() {
-			const define = {};
-			let name = Array.isArray(entrypointGroup) ? "html" : entrypointGroup.name;
-			for (const global of getEntrypointGlobals(name)) define[`import.meta.env.${global.name}`] = JSON.stringify(global.value);
-			return { define };
-		}
-	};
-}
-//#endregion
-export { entrypointGroupGlobals };

package/dist/core/builders/vite/plugins/globals.mjs

@@ -1,14 +0,0 @@
-import { getGlobals } from "../../../utils/globals.mjs";
-//#region src/core/builders/vite/plugins/globals.ts
-function globals(config) {
-	return {
-		name: "wxt:globals",
-		config() {
-			const define = {};
-			for (const global of getGlobals(config)) define[`import.meta.env.${global.name}`] = JSON.stringify(global.value);
-			return { define };
-		}
-	};
-}
-//#endregion
-export { globals };

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

@@ -1,17 +0,0 @@
-import "./devHtmlPrerender.mjs";
-import "./devServerGlobals.mjs";
-import "./resolveVirtualModules.mjs";
-import "./tsconfigPaths.mjs";
-import "./noopBackground.mjs";
-import "./cssEntrypoints.mjs";
-import "./bundleAnalysis.mjs";
-import "./globals.mjs";
-import "./extensionApiMock.mjs";
-import "./entrypointGroupGlobals.mjs";
-import "./defineImportMeta.mjs";
-import "./removeEntrypointMainFunction.mjs";
-import "./wxtPluginLoader.mjs";
-import "./resolveAppConfig.mjs";
-import "./iifeFooter.mjs";
-import "./iifeAnonymous.mjs";
-export {};