wxt 0.18.3 → 0.18.5

package/dist/storage.d.ts

@@ -6,7 +6,7 @@ interface WxtStorage {
      * @example
      * await storage.getItem<number>("local:installDate");
      */
-    getItem<T>(key: string, opts?: GetItemOptions<T>): Promise<T | null>;
+    getItem<T>(key: StorageItemKey, opts?: GetItemOptions<T>): Promise<T | null>;
     /**
      * Get multiple items from storage. The return order is guaranteed to be the same as the order
      * requested.
@@ -14,11 +14,11 @@ interface WxtStorage {
      * @example
      * await storage.getItems(["local:installDate", "session:someCounter"]);
      */
-    getItems(keys: Array<string | {
-        key: string;
+    getItems(keys: Array<StorageItemKey | {
+        key: StorageItemKey;
         options?: GetItemOptions<any>;
     }>): Promise<Array<{
-        key: string;
+        key: StorageItemKey;
         value: any;
     }>>;
     /**
@@ -28,7 +28,7 @@ interface WxtStorage {
      * @example
      * await storage.getMeta("local:installDate");
      */
-    getMeta<T extends Record<string, unknown>>(key: string): Promise<T>;
+    getMeta<T extends Record<string, unknown>>(key: StorageItemKey): Promise<T>;
     /**
      * Set a value in storage. Setting a value to `null` or `undefined` is equivalent to calling
      * `removeItem`.
@@ -36,7 +36,7 @@ interface WxtStorage {
      * @example
      * await storage.setItem<number>("local:installDate", Date.now());
      */
-    setItem<T>(key: string, value: T | null): Promise<void>;
+    setItem<T>(key: StorageItemKey, value: T | null): Promise<void>;
     /**
      * Set multiple values in storage. If a value is set to `null` or `undefined`, the key is removed.
      *
@@ -47,7 +47,7 @@ interface WxtStorage {
      * ]);
      */
     setItems(values: Array<{
-        key: string;
+        key: StorageItemKey;
         value: any;
     }>): Promise<void>;
     /**
@@ -57,19 +57,19 @@ interface WxtStorage {
      * @example
      * await storage.setMeta("local:installDate", { appVersion });
      */
-    setMeta<T extends Record<string, unknown>>(key: string, properties: T | null): Promise<void>;
+    setMeta<T extends Record<string, unknown>>(key: StorageItemKey, properties: T | null): Promise<void>;
     /**
      * Removes an item from storage.
      *
      * @example
      * await storage.removeItem("local:installDate");
      */
-    removeItem(key: string, opts?: RemoveItemOptions): Promise<void>;
+    removeItem(key: StorageItemKey, opts?: RemoveItemOptions): Promise<void>;
     /**
      * Remove a list of keys from storage.
      */
-    removeItems(keys: Array<string | {
-        key: string;
+    removeItems(keys: Array<StorageItemKey | {
+        key: StorageItemKey;
         options?: RemoveItemOptions;
     }>): Promise<void>;
     /**
@@ -82,20 +82,20 @@ interface WxtStorage {
      * // Remove only specific the "v" field
      * await storage.removeMeta("local:installDate", "v")
      */
-    removeMeta(key: string, properties?: string | string[]): Promise<void>;
+    removeMeta(key: StorageItemKey, properties?: string | string[]): Promise<void>;
     /**
      * Return all the items in storage.
      */
-    snapshot(base: string, opts?: SnapshotOptions): Promise<Record<string, unknown>>;
+    snapshot(base: StorageArea, opts?: SnapshotOptions): Promise<Record<string, unknown>>;
     /**
      * Restores the results of `snapshot`. If new properties have been saved since the snapshot, they are
      * not overridden. Only values existing in the snapshot are overridden.
      */
-    restoreSnapshot(base: string, data: any): Promise<void>;
+    restoreSnapshot(base: StorageArea, data: any): Promise<void>;
     /**
      * Watch for changes to a specific key in storage.
      */
-    watch<T>(key: string, cb: WatchCallback<T | null>): Unwatch;
+    watch<T>(key: StorageItemKey, cb: WatchCallback<T | null>): Unwatch;
     /**
      * Remove all watch listeners.
      */
@@ -105,8 +105,8 @@ interface WxtStorage {
      *
      * Read full docs: https://wxt.dev/guide/storage.html#defining-storage-items
      */
-    defineItem<TValue, TMetadata extends Record<string, unknown> = {}>(key: string): WxtStorageItem<TValue | null, TMetadata>;
-    defineItem<TValue, TMetadata extends Record<string, unknown> = {}>(key: string, options: WxtStorageItemOptions<TValue>): WxtStorageItem<TValue, TMetadata>;
+    defineItem<TValue, TMetadata extends Record<string, unknown> = {}>(key: StorageItemKey): WxtStorageItem<TValue | null, TMetadata>;
+    defineItem<TValue, TMetadata extends Record<string, unknown> = {}>(key: StorageItemKey, options: WxtStorageItemOptions<TValue>): WxtStorageItem<TValue, TMetadata>;
 }
 interface WxtStorageItem<TValue, TMetadata extends Record<string, unknown>> {
     defaultValue: TValue;
@@ -146,6 +146,8 @@ interface WxtStorageItem<TValue, TMetadata extends Record<string, unknown>> {
      */
     migrate(): Promise<void>;
 }
+type StorageArea = 'local' | 'session' | 'sync' | 'managed';
+type StorageItemKey = `${StorageArea}:${string}`;
 interface GetItemOptions<T> {
     /**
      * Value returned from `getValue` when it would otherwise return null.
@@ -195,4 +197,4 @@ type WatchCallback<T> = (newValue: T, oldValue: T) => void;
  */
 type Unwatch = () => void;
 
-export { type GetItemOptions, type NullablePartial, type RemoveItemOptions, type SnapshotOptions, type Unwatch, type WatchCallback, type WxtStorage, type WxtStorageItem, type WxtStorageItemOptions, storage };
+export { type GetItemOptions, type NullablePartial, type RemoveItemOptions, type SnapshotOptions, type StorageArea, type StorageItemKey, type Unwatch, type WatchCallback, type WxtStorage, type WxtStorageItem, type WxtStorageItemOptions, storage };

package/dist/testing.cjs

@@ -2169,6 +2169,9 @@ var import_magicast = require("magicast");
 // src/core/builders/vite/plugins/removeEntrypointMainFunction.ts
 var import_node_path7 = require("path");
 
+// src/core/builders/vite/plugins/wxtPluginLoader.ts
+var import_linkedom2 = require("linkedom");
+
 // src/core/utils/fs.ts
 var import_fs_extra4 = __toESM(require("fs-extra"), 1);
 var import_fast_glob = __toESM(require("fast-glob"), 1);
@@ -2198,7 +2201,7 @@ var import_picocolors = __toESM(require("picocolors"), 1);
 // src/core/utils/building/find-entrypoints.ts
 var import_fs_extra7 = __toESM(require("fs-extra"), 1);
 var import_minimatch = require("minimatch");
-var import_linkedom2 = require("linkedom");
+var import_linkedom3 = require("linkedom");
 var import_json5 = __toESM(require("json5"), 1);
 var import_fast_glob2 = __toESM(require("fast-glob"), 1);
 var import_picocolors2 = __toESM(require("picocolors"), 1);
@@ -2308,6 +2311,7 @@ function isModuleInstalled(name) {
 
 // src/core/utils/building/resolve-config.ts
 var import_fs_extra11 = __toESM(require("fs-extra"), 1);
+var import_fast_glob3 = __toESM(require("fast-glob"), 1);
 var import_meta = {};
 async function resolveConfig(inlineConfig, command) {
   let userConfig = {};
@@ -2344,6 +2348,7 @@ async function resolveConfig(inlineConfig, command) {
     srcDir,
     mergedConfig.entrypointsDir ?? "entrypoints"
   );
+  const modulesDir = import_node_path15.default.resolve(srcDir, mergedConfig.modulesDir ?? "modules");
   if (await isDirMissing(entrypointsDir)) {
     logMissingDir(logger, "Entrypoints", entrypointsDir);
   }
@@ -2385,11 +2390,20 @@ async function resolveConfig(inlineConfig, command) {
       hostname: "localhost"
     };
   }
+  const modules = await resolveWxtModules(modulesDir, mergedConfig.modules);
+  const moduleOptions = modules.reduce((map, module2) => {
+    if (module2.configKey) {
+      map[module2.configKey] = // @ts-expect-error
+      mergedConfig[module2.configKey];
+    }
+    return map;
+  }, {});
   return {
     browser,
     command,
     debug,
     entrypointsDir,
+    modulesDir,
     filterEntrypoints,
     env: env2,
     fsCache: createFsCache(wxtDir),
@@ -2421,7 +2435,10 @@ async function resolveConfig(inlineConfig, command) {
       reloadCommand
     },
     hooks: mergedConfig.hooks ?? {},
-    vite: mergedConfig.vite ?? (() => ({}))
+    vite: mergedConfig.vite ?? (() => ({})),
+    modules,
+    plugins: [],
+    ...moduleOptions
   };
 }
 async function resolveManifestConfig(env2, manifest) {
@@ -2560,6 +2577,43 @@ async function mergeBuilderConfig(inlineConfig, userConfig) {
   }
   throw Error("Builder not found. Make sure vite is installed.");
 }
+async function resolveWxtModules(modulesDir, modules = []) {
+  const npmModules = await Promise.all(
+    modules.map(async (moduleId) => {
+      const mod = await import(
+        /* @vite-ignore */
+        moduleId
+      );
+      if (mod.default == null) {
+        throw Error("Module missing default export: " + moduleId);
+      }
+      return mod.default;
+    })
+  );
+  const localModulePaths = await (0, import_fast_glob3.default)(["*.[tj]s", "*/index.[tj]s"], {
+    cwd: modulesDir,
+    onlyFiles: true
+  }).catch(() => []);
+  const localModules = await Promise.all(
+    localModulePaths.map(async (file) => {
+      const { config } = await (0, import_c12.loadConfig)({
+        configFile: import_node_path15.default.resolve(modulesDir, file),
+        globalRc: false,
+        rcFile: false,
+        packageJson: false,
+        envName: false,
+        dotenv: false
+      });
+      if (config == null)
+        throw Error(
+          `No config found for ${file}. Did you forget to add a default export?`
+        );
+      config.name ??= file;
+      return config;
+    })
+  );
+  return [...npmModules, ...localModules];
+}
 
 // src/core/utils/building/internal-build.ts
 var import_picocolors5 = __toESM(require("picocolors"), 1);
@@ -2587,7 +2641,7 @@ var CHUNK_COLORS = {
 var import_picocolors4 = __toESM(require("picocolors"), 1);
 
 // src/core/utils/building/internal-build.ts
-var import_fast_glob3 = __toESM(require("fast-glob"), 1);
+var import_fast_glob4 = __toESM(require("fast-glob"), 1);
 
 // src/core/utils/manifest.ts
 var import_fs_extra13 = __toESM(require("fs-extra"), 1);

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-xOGXP3vY.cjs';
+import { I as InlineConfig } from './index-q2ZwJBs6.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-xOGXP3vY.js';
+import { I as InlineConfig } from './index-q2ZwJBs6.js';
 import 'webextension-polyfill';
 import 'unimport';
 import 'consola';

package/dist/testing.js

@@ -5,7 +5,7 @@ import {
   tsconfigPaths,
   unimport,
   webextensionPolyfillMock
-} from "./chunk-XAYX5BXI.js";
+} from "./chunk-7AOGIMIM.js";
 import "./chunk-5X3S6AWF.js";
 import "./chunk-ZZCTFNQ5.js";
 import "./chunk-VBXJIVYU.js";

package/dist/virtual/background-entrypoint.js

@@ -1,5 +1,6 @@
 // src/virtual/background-entrypoint.ts
 import definition from "virtual:user-background-entrypoint";
+import { initPlugins } from "virtual:wxt-plugins";
 
 // src/sandbox/utils/logger.ts
 function print(method, ...args) {
@@ -156,6 +157,7 @@ if (import.meta.env.COMMAND === "serve") {
 }
 var result;
 try {
+  initPlugins();
   result = definition.main();
   if (result instanceof Promise) {
     console.warn(

package/dist/virtual/content-script-isolated-world-entrypoint.js

@@ -21,8 +21,10 @@ var logger = {
 
 // src/virtual/content-script-isolated-world-entrypoint.ts
 import { ContentScriptContext } from "wxt/client";
+import { initPlugins } from "virtual:wxt-plugins";
 var result = (async () => {
   try {
+    initPlugins();
     const { main, ...options } = definition;
     const ctx = new ContentScriptContext(import.meta.env.ENTRYPOINT, options);
     return await main(ctx);

package/dist/virtual/content-script-main-world-entrypoint.js

@@ -20,8 +20,10 @@ var logger = {
 };
 
 // src/virtual/content-script-main-world-entrypoint.ts
+import { initPlugins } from "virtual:wxt-plugins";
 var result = (async () => {
   try {
+    initPlugins();
     const { main } = definition;
     return await main();
   } catch (err) {

package/dist/virtual/unlisted-script-entrypoint.js

@@ -20,8 +20,10 @@ var logger = {
 };
 
 // src/virtual/unlisted-script-entrypoint.ts
+import { initPlugins } from "virtual:wxt-plugins";
 var result = (async () => {
   try {
+    initPlugins();
     return await definition.main();
   } catch (err) {
     logger.error(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wxt",
   "type": "module",
-  "version": "0.18.3",
+  "version": "0.18.5",
   "description": "Next gen framework for developing web extensions",
   "repository": {
     "type": "git",
@@ -78,6 +78,16 @@
     },
     "./vite-builder-env": {
       "types": "./dist/vite-builder-env.d.ts"
+    },
+    "./modules": {
+      "import": {
+        "types": "./dist/modules.d.ts",
+        "default": "./dist/modules.js"
+      },
+      "require": {
+        "types": "./dist/modules.d.cts",
+        "default": "./dist/modules.cjs"
+      }
     }
   },
   "dependencies": {
@@ -104,12 +114,12 @@
     "jiti": "^1.21.0",
     "json5": "^2.2.3",
     "jszip": "^3.10.1",
-    "linkedom": "^0.16.1",
+    "linkedom": "^0.18.2",
     "magicast": "^0.3.4",
     "minimatch": "^9.0.3",
     "natural-compare": "^1.4.0",
     "normalize-path": "^3.0.0",
-    "nypm": "^0.3.6",
+    "nypm": "^0.3.8",
     "open": "^10.1.0",
     "ora": "^7.0.1",
     "picocolors": "^1.0.0",
@@ -129,21 +139,16 @@
     "@types/node": "^20.10.3",
     "@types/normalize-path": "^3.0.2",
     "@types/prompts": "^2.4.9",
-    "execa": "^8.0.1",
+    "execa": "^9.1.0",
     "extract-zip": "^2.0.1",
     "happy-dom": "^13.3.8",
     "lodash.merge": "^4.6.2",
     "p-map": "^7.0.0",
     "publint": "^0.2.6",
     "tsup": "^8.0.1",
-    "tsx": "^4.6.2",
+    "tsx": "^4.11.2",
     "typescript": "^5.3.2"
   },
-  "changelog": {
-    "excludeAuthors": [
-      "aaronklinker1@gmail.com"
-    ]
-  },
   "scripts": {
     "wxt": "tsx src/cli/index.ts",
     "build": "tsx scripts/build.ts",