wxt 0.17.2 → 0.17.4-alpha1

package/dist/{chunk-OLUK5FJF.js → chunk-63LEV65X.js}

@@ -1,5 +1,9 @@
+import {
+  __require
+} from "./chunk-P57PW2II.js";
+
 // package.json
-var version = "0.17.2";
+var version = "0.17.4-alpha1";
 
 // src/core/utils/paths.ts
 import systemPath from "node:path";
@@ -907,8 +911,8 @@ var reactRefreshPreamble = "";
 function devHtmlPrerender(config) {
   const htmlReloadId = "@wxt/reload-html";
   const resolvedHtmlReloadId = resolve6(
-    config.root,
-    "node_modules/wxt/dist/virtual/reload-html.js"
+    config.wxtModuleDir,
+    "dist/virtual/reload-html.js"
   );
   const virtualReactRefreshId = "@wxt/virtual-react-refresh";
   const resolvedVirtualReactRefreshId = "\0" + virtualReactRefreshId;
@@ -1253,10 +1257,7 @@ function virtualEntrypoint(type, config) {
         return;
       const inputPath = id.replace(resolvedVirtualId, "");
       const template = await fs7.readFile(
-        resolve8(
-          config.root,
-          `node_modules/wxt/dist/virtual/${type}-entrypoint.js`
-        ),
+        resolve8(config.wxtModuleDir, `dist/virtual/${type}-entrypoint.js`),
         "utf-8"
       );
       return template.replace(`virtual:user-${type}`, inputPath);
@@ -1362,8 +1363,8 @@ function webextensionPolyfillMock(config) {
           alias: {
             // Alias to use a mocked version of the polyfill
             "webextension-polyfill": path4.resolve(
-              config.root,
-              "node_modules/wxt/dist/virtual/mock-browser"
+              config.wxtModuleDir,
+              "dist/virtual/mock-browser"
             )
           }
         },
@@ -1702,6 +1703,7 @@ async function resolveConfig(inlineConfig, command, server) {
     inlineConfig.root ?? userConfig.root ?? process.cwd()
   );
   const wxtDir = path5.resolve(root, ".wxt");
+  const wxtModuleDir = resolveWxtModuleDir();
   const srcDir = path5.resolve(root, mergedConfig.srcDir ?? root);
   const entrypointsDir = path5.resolve(
     srcDir,
@@ -1752,6 +1754,7 @@ async function resolveConfig(inlineConfig, command, server) {
     outBaseDir,
     outDir,
     publicDir,
+    wxtModuleDir,
     root,
     runnerConfig,
     srcDir,
@@ -1918,6 +1921,9 @@ async function getUnimportOptions(wxtDir, logger, config) {
     defaultOptions
   );
 }
+function resolveWxtModuleDir() {
+  return path5.resolve(__require.resolve("wxt"), "../..");
+}
 
 // src/core/utils/building/group-entrypoints.ts
 function groupEntrypoints(entrypoints) {
@@ -2007,8 +2013,8 @@ async function importEntrypointFile(path7) {
       esmResolve: true,
       alias: {
         "webextension-polyfill": resolve10(
-          wxt.config.root,
-          "node_modules/wxt/dist/virtual/mock-browser.js"
+          wxt.config.wxtModuleDir,
+          "dist/virtual/mock-browser.js"
         )
       },
       // Continue using node to load TS files even if `bun run --bun` is detected. Jiti does not

package/dist/chunk-P57PW2II.js

@@ -0,0 +1,11 @@
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined")
+    return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+
+export {
+  __require
+};

package/dist/cli.js

@@ -1,5 +1,7 @@
 import { createRequire } from 'module';const require = createRequire(import.meta.url);
-import "./chunk-73I7FAJU.js";
+import {
+  __require
+} from "./chunk-73I7FAJU.js";
 
 // src/cli/commands.ts
 import cac from "cac";
@@ -932,8 +934,8 @@ var reactRefreshPreamble = "";
 function devHtmlPrerender(config) {
   const htmlReloadId = "@wxt/reload-html";
   const resolvedHtmlReloadId = resolve6(
-    config.root,
-    "node_modules/wxt/dist/virtual/reload-html.js"
+    config.wxtModuleDir,
+    "dist/virtual/reload-html.js"
   );
   const virtualReactRefreshId = "@wxt/virtual-react-refresh";
   const resolvedVirtualReactRefreshId = "\0" + virtualReactRefreshId;
@@ -1278,10 +1280,7 @@ function virtualEntrypoint(type, config) {
         return;
       const inputPath = id.replace(resolvedVirtualId, "");
       const template = await fs7.readFile(
-        resolve8(
-          config.root,
-          `node_modules/wxt/dist/virtual/${type}-entrypoint.js`
-        ),
+        resolve8(config.wxtModuleDir, `dist/virtual/${type}-entrypoint.js`),
         "utf-8"
       );
       return template.replace(`virtual:user-${type}`, inputPath);
@@ -1702,6 +1701,7 @@ async function resolveConfig(inlineConfig, command, server) {
     inlineConfig.root ?? userConfig.root ?? process.cwd()
   );
   const wxtDir = path4.resolve(root, ".wxt");
+  const wxtModuleDir = resolveWxtModuleDir();
   const srcDir = path4.resolve(root, mergedConfig.srcDir ?? root);
   const entrypointsDir = path4.resolve(
     srcDir,
@@ -1752,6 +1752,7 @@ async function resolveConfig(inlineConfig, command, server) {
     outBaseDir,
     outDir,
     publicDir,
+    wxtModuleDir,
     root,
     runnerConfig,
     srcDir,
@@ -1918,6 +1919,9 @@ async function getUnimportOptions(wxtDir, logger, config) {
     defaultOptions
   );
 }
+function resolveWxtModuleDir() {
+  return path4.resolve(__require.resolve("wxt"), "../..");
+}
 
 // src/core/utils/building/group-entrypoints.ts
 function groupEntrypoints(entrypoints) {
@@ -2007,8 +2011,8 @@ async function importEntrypointFile(path8) {
       esmResolve: true,
       alias: {
         "webextension-polyfill": resolve10(
-          wxt.config.root,
-          "node_modules/wxt/dist/virtual/mock-browser.js"
+          wxt.config.wxtModuleDir,
+          "dist/virtual/mock-browser.js"
         )
       },
       // Continue using node to load TS files even if `bun run --bun` is detected. Jiti does not
@@ -2181,7 +2185,7 @@ function getChunkSortWeight(filename) {
 import pc4 from "picocolors";
 
 // package.json
-var version = "0.17.2";
+var version = "0.17.4-alpha1";
 
 // src/core/utils/log/printHeader.ts
 import { consola as consola2 } from "consola";

package/dist/client.d.ts

@@ -1,4 +1,4 @@
-import { a as ContentScriptContext } from './index-v_64CCcw.js';
+import { a as ContentScriptContext } from './index-mYGv2dqk.js';
 import 'webextension-polyfill';
 
 interface IntegratedContentScriptUi<TMounted> extends ContentScriptUi<TMounted> {

package/dist/{index-v_64CCcw.d.ts → index-mYGv2dqk.d.ts}

@@ -13,6 +13,29 @@ declare class WxtLocationChangeEvent extends Event {
  *
  * It also provides several utilities like `ctx.setTimeout` and `ctx.setInterval` that should be used in
  * content scripts instead of `window.setTimeout` or `window.setInterval`.
+ *
+ * To create context for testing, you can use the class's constructor:
+ *
+ * ```ts
+ * import { ContentScriptContext } from 'wxt/client';
+ *
+ * test("storage listener should be removed when context is invalidated", () => {
+ *   const ctx = new ContentScriptContext('test');
+ *   const item = storage.defineItem("local:count", { defaultValue: 0 });
+ *   const watcher = vi.fn();
+ *
+ *   const unwatch = item.watch(watcher);
+ *   ctx.onInvalidated(unwatch); // Listen for invalidate here
+ *
+ *   await item.setValue(1);
+ *   expect(watcher).toBeCalledTimes(1);
+ *   expect(watcher).toBeCalledWith(1, 0);
+ *
+ *   ctx.notifyInvalidated(); // Use this function to invalidate the context
+ *   await item.setValue(2);
+ *   expect(watcher).toBeCalledTimes(1);
+ * });
+ * ```
  */
 declare class ContentScriptContext implements AbortController {
     #private;

package/dist/{index-V1QWdhdh.d.cts → index-vpYNIeCJ.d.cts}

@@ -20,6 +20,29 @@ declare class WxtLocationChangeEvent extends Event {
  *
  * It also provides several utilities like `ctx.setTimeout` and `ctx.setInterval` that should be used in
  * content scripts instead of `window.setTimeout` or `window.setInterval`.
+ *
+ * To create context for testing, you can use the class's constructor:
+ *
+ * ```ts
+ * import { ContentScriptContext } from 'wxt/client';
+ *
+ * test("storage listener should be removed when context is invalidated", () => {
+ *   const ctx = new ContentScriptContext('test');
+ *   const item = storage.defineItem("local:count", { defaultValue: 0 });
+ *   const watcher = vi.fn();
+ *
+ *   const unwatch = item.watch(watcher);
+ *   ctx.onInvalidated(unwatch); // Listen for invalidate here
+ *
+ *   await item.setValue(1);
+ *   expect(watcher).toBeCalledTimes(1);
+ *   expect(watcher).toBeCalledWith(1, 0);
+ *
+ *   ctx.notifyInvalidated(); // Use this function to invalidate the context
+ *   await item.setValue(2);
+ *   expect(watcher).toBeCalledTimes(1);
+ * });
+ * ```
  */
 declare class ContentScriptContext implements AbortController {
     #private;
@@ -953,6 +976,10 @@ interface ResolvedConfig {
     outBaseDir: string;
     outDir: string;
     debug: boolean;
+    /**
+     * Directory pointing to `node_modules/wxt`, wherever WXT is installed.
+     */
+    wxtModuleDir: string;
     mode: string;
     command: 'build' | 'serve';
     browser: TargetBrowser;

package/dist/{index-V1QWdhdh.d.ts → index-vpYNIeCJ.d.ts}

@@ -20,6 +20,29 @@ declare class WxtLocationChangeEvent extends Event {
  *
  * It also provides several utilities like `ctx.setTimeout` and `ctx.setInterval` that should be used in
  * content scripts instead of `window.setTimeout` or `window.setInterval`.
+ *
+ * To create context for testing, you can use the class's constructor:
+ *
+ * ```ts
+ * import { ContentScriptContext } from 'wxt/client';
+ *
+ * test("storage listener should be removed when context is invalidated", () => {
+ *   const ctx = new ContentScriptContext('test');
+ *   const item = storage.defineItem("local:count", { defaultValue: 0 });
+ *   const watcher = vi.fn();
+ *
+ *   const unwatch = item.watch(watcher);
+ *   ctx.onInvalidated(unwatch); // Listen for invalidate here
+ *
+ *   await item.setValue(1);
+ *   expect(watcher).toBeCalledTimes(1);
+ *   expect(watcher).toBeCalledWith(1, 0);
+ *
+ *   ctx.notifyInvalidated(); // Use this function to invalidate the context
+ *   await item.setValue(2);
+ *   expect(watcher).toBeCalledTimes(1);
+ * });
+ * ```
  */
 declare class ContentScriptContext implements AbortController {
     #private;
@@ -953,6 +976,10 @@ interface ResolvedConfig {
     outBaseDir: string;
     outDir: string;
     debug: boolean;
+    /**
+     * Directory pointing to `node_modules/wxt`, wherever WXT is installed.
+     */
+    wxtModuleDir: string;
     mode: string;
     command: 'build' | 'serve';
     browser: TargetBrowser;

package/dist/index.cjs

@@ -970,8 +970,8 @@ var reactRefreshPreamble = "";
 function devHtmlPrerender(config) {
   const htmlReloadId = "@wxt/reload-html";
   const resolvedHtmlReloadId = (0, import_node_path4.resolve)(
-    config.root,
-    "node_modules/wxt/dist/virtual/reload-html.js"
+    config.wxtModuleDir,
+    "dist/virtual/reload-html.js"
   );
   const virtualReactRefreshId = "@wxt/virtual-react-refresh";
   const resolvedVirtualReactRefreshId = "\0" + virtualReactRefreshId;
@@ -1316,10 +1316,7 @@ function virtualEntrypoint(type, config) {
         return;
       const inputPath = id.replace(resolvedVirtualId, "");
       const template = await import_fs_extra7.default.readFile(
-        (0, import_path6.resolve)(
-          config.root,
-          `node_modules/wxt/dist/virtual/${type}-entrypoint.js`
-        ),
+        (0, import_path6.resolve)(config.wxtModuleDir, `dist/virtual/${type}-entrypoint.js`),
         "utf-8"
       );
       return template.replace(`virtual:user-${type}`, inputPath);
@@ -1743,6 +1740,7 @@ async function resolveConfig(inlineConfig, command, server) {
     inlineConfig.root ?? userConfig.root ?? process.cwd()
   );
   const wxtDir = import_node_path9.default.resolve(root, ".wxt");
+  const wxtModuleDir = resolveWxtModuleDir();
   const srcDir = import_node_path9.default.resolve(root, mergedConfig.srcDir ?? root);
   const entrypointsDir = import_node_path9.default.resolve(
     srcDir,
@@ -1793,6 +1791,7 @@ async function resolveConfig(inlineConfig, command, server) {
     outBaseDir,
     outDir,
     publicDir,
+    wxtModuleDir,
     root,
     runnerConfig,
     srcDir,
@@ -1959,6 +1958,9 @@ async function getUnimportOptions(wxtDir, logger, config) {
     defaultOptions
   );
 }
+function resolveWxtModuleDir() {
+  return import_node_path9.default.resolve(require.resolve("wxt"), "../..");
+}
 
 // src/core/utils/building/group-entrypoints.ts
 function groupEntrypoints(entrypoints) {
@@ -2049,8 +2051,8 @@ async function importEntrypointFile(path9) {
       esmResolve: true,
       alias: {
         "webextension-polyfill": (0, import_node_path10.resolve)(
-          wxt.config.root,
-          "node_modules/wxt/dist/virtual/mock-browser.js"
+          wxt.config.wxtModuleDir,
+          "dist/virtual/mock-browser.js"
         )
       },
       // Continue using node to load TS files even if `bun run --bun` is detected. Jiti does not
@@ -2223,7 +2225,7 @@ function getChunkSortWeight(filename) {
 var import_picocolors4 = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "0.17.2";
+var version = "0.17.4-alpha1";
 
 // src/core/utils/log/printHeader.ts
 var import_consola2 = require("consola");

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { I as InlineConfig, B as BuildOutput, U as UserConfig, E as ExtensionRunnerConfig, W as WxtDevServer } from './index-V1QWdhdh.cjs';
-export { v as BackgroundDefinition, l as BackgroundEntrypoint, g as BackgroundEntrypointOptions, h as BaseContentScriptEntrypointOptions, k as BaseEntrypoint, f as BaseEntrypointOptions, d as BuildStepOutput, F as ConfigEnv, u as ContentScriptDefinition, C as ContentScriptEntrypoint, p as Entrypoint, q as EntrypointGroup, $ as EslintGlobalsPropValue, a0 as Eslintrc, Z as ExtensionRunner, Y as FsCache, G as GenericEntrypoint, N as HookResult, s as IsolatedWorldContentScriptDefinition, i as IsolatedWorldContentScriptEntrypointOptions, L as Logger, t as MainWorldContentScriptDefinition, M as MainWorldContentScriptEntrypointOptions, r as OnContentScriptStopped, n as OptionsEntrypoint, j as OptionsEntrypointOptions, c as OutputAsset, b as OutputChunk, O as OutputFile, y as PerBrowserMap, x as PerBrowserOption, m as PopupEntrypoint, P as PopupEntrypointOptions, R as ReloadContentScriptPayload, X as ResolvedConfig, a1 as ResolvedEslintrc, z as ResolvedPerBrowserOptions, K as ServerInfo, o as SidepanelEntrypoint, S as SidepanelEntrypointOptions, T as TargetBrowser, e as TargetManifestVersion, w as UnlistedScriptDefinition, A as UserManifest, D as UserManifestFn, _ as VirtualEntrypointType, V as Wxt, H as WxtBuilder, J as WxtBuilderServer, Q as WxtHooks, a3 as WxtResolvedUnimportOptions, a2 as WxtUnimportOptions, a as WxtViteConfig } from './index-V1QWdhdh.cjs';
+import { I as InlineConfig, B as BuildOutput, U as UserConfig, E as ExtensionRunnerConfig, W as WxtDevServer } from './index-vpYNIeCJ.cjs';
+export { v as BackgroundDefinition, l as BackgroundEntrypoint, g as BackgroundEntrypointOptions, h as BaseContentScriptEntrypointOptions, k as BaseEntrypoint, f as BaseEntrypointOptions, d as BuildStepOutput, F as ConfigEnv, u as ContentScriptDefinition, C as ContentScriptEntrypoint, p as Entrypoint, q as EntrypointGroup, $ as EslintGlobalsPropValue, a0 as Eslintrc, Z as ExtensionRunner, Y as FsCache, G as GenericEntrypoint, N as HookResult, s as IsolatedWorldContentScriptDefinition, i as IsolatedWorldContentScriptEntrypointOptions, L as Logger, t as MainWorldContentScriptDefinition, M as MainWorldContentScriptEntrypointOptions, r as OnContentScriptStopped, n as OptionsEntrypoint, j as OptionsEntrypointOptions, c as OutputAsset, b as OutputChunk, O as OutputFile, y as PerBrowserMap, x as PerBrowserOption, m as PopupEntrypoint, P as PopupEntrypointOptions, R as ReloadContentScriptPayload, X as ResolvedConfig, a1 as ResolvedEslintrc, z as ResolvedPerBrowserOptions, K as ServerInfo, o as SidepanelEntrypoint, S as SidepanelEntrypointOptions, T as TargetBrowser, e as TargetManifestVersion, w as UnlistedScriptDefinition, A as UserManifest, D as UserManifestFn, _ as VirtualEntrypointType, V as Wxt, H as WxtBuilder, J as WxtBuilderServer, Q as WxtHooks, a3 as WxtResolvedUnimportOptions, a2 as WxtUnimportOptions, a as WxtViteConfig } from './index-vpYNIeCJ.cjs';
 import 'vite';
 import 'webextension-polyfill';
 import 'unimport';
@@ -64,6 +64,6 @@ declare function prepare(config: InlineConfig): Promise<void>;
  */
 declare function zip(config?: InlineConfig): Promise<string[]>;
 
-var version = "0.17.2";
+var version = "0.17.4-alpha1";
 
 export { BuildOutput, ExtensionRunnerConfig, InlineConfig, UserConfig, WxtDevServer, build, clean, createServer, defineConfig, defineRunnerConfig, initialize, prepare, version, zip };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { I as InlineConfig, B as BuildOutput, U as UserConfig, E as ExtensionRunnerConfig, W as WxtDevServer } from './index-V1QWdhdh.js';
-export { v as BackgroundDefinition, l as BackgroundEntrypoint, g as BackgroundEntrypointOptions, h as BaseContentScriptEntrypointOptions, k as BaseEntrypoint, f as BaseEntrypointOptions, d as BuildStepOutput, F as ConfigEnv, u as ContentScriptDefinition, C as ContentScriptEntrypoint, p as Entrypoint, q as EntrypointGroup, $ as EslintGlobalsPropValue, a0 as Eslintrc, Z as ExtensionRunner, Y as FsCache, G as GenericEntrypoint, N as HookResult, s as IsolatedWorldContentScriptDefinition, i as IsolatedWorldContentScriptEntrypointOptions, L as Logger, t as MainWorldContentScriptDefinition, M as MainWorldContentScriptEntrypointOptions, r as OnContentScriptStopped, n as OptionsEntrypoint, j as OptionsEntrypointOptions, c as OutputAsset, b as OutputChunk, O as OutputFile, y as PerBrowserMap, x as PerBrowserOption, m as PopupEntrypoint, P as PopupEntrypointOptions, R as ReloadContentScriptPayload, X as ResolvedConfig, a1 as ResolvedEslintrc, z as ResolvedPerBrowserOptions, K as ServerInfo, o as SidepanelEntrypoint, S as SidepanelEntrypointOptions, T as TargetBrowser, e as TargetManifestVersion, w as UnlistedScriptDefinition, A as UserManifest, D as UserManifestFn, _ as VirtualEntrypointType, V as Wxt, H as WxtBuilder, J as WxtBuilderServer, Q as WxtHooks, a3 as WxtResolvedUnimportOptions, a2 as WxtUnimportOptions, a as WxtViteConfig } from './index-V1QWdhdh.js';
+import { I as InlineConfig, B as BuildOutput, U as UserConfig, E as ExtensionRunnerConfig, W as WxtDevServer } from './index-vpYNIeCJ.js';
+export { v as BackgroundDefinition, l as BackgroundEntrypoint, g as BackgroundEntrypointOptions, h as BaseContentScriptEntrypointOptions, k as BaseEntrypoint, f as BaseEntrypointOptions, d as BuildStepOutput, F as ConfigEnv, u as ContentScriptDefinition, C as ContentScriptEntrypoint, p as Entrypoint, q as EntrypointGroup, $ as EslintGlobalsPropValue, a0 as Eslintrc, Z as ExtensionRunner, Y as FsCache, G as GenericEntrypoint, N as HookResult, s as IsolatedWorldContentScriptDefinition, i as IsolatedWorldContentScriptEntrypointOptions, L as Logger, t as MainWorldContentScriptDefinition, M as MainWorldContentScriptEntrypointOptions, r as OnContentScriptStopped, n as OptionsEntrypoint, j as OptionsEntrypointOptions, c as OutputAsset, b as OutputChunk, O as OutputFile, y as PerBrowserMap, x as PerBrowserOption, m as PopupEntrypoint, P as PopupEntrypointOptions, R as ReloadContentScriptPayload, X as ResolvedConfig, a1 as ResolvedEslintrc, z as ResolvedPerBrowserOptions, K as ServerInfo, o as SidepanelEntrypoint, S as SidepanelEntrypointOptions, T as TargetBrowser, e as TargetManifestVersion, w as UnlistedScriptDefinition, A as UserManifest, D as UserManifestFn, _ as VirtualEntrypointType, V as Wxt, H as WxtBuilder, J as WxtBuilderServer, Q as WxtHooks, a3 as WxtResolvedUnimportOptions, a2 as WxtUnimportOptions, a as WxtViteConfig } from './index-vpYNIeCJ.js';
 import 'vite';
 import 'webextension-polyfill';
 import 'unimport';
@@ -64,6 +64,6 @@ declare function prepare(config: InlineConfig): Promise<void>;
  */
 declare function zip(config?: InlineConfig): Promise<string[]>;
 
-var version = "0.17.2";
+var version = "0.17.4-alpha1";
 
 export { BuildOutput, ExtensionRunnerConfig, InlineConfig, UserConfig, WxtDevServer, build, clean, createServer, defineConfig, defineRunnerConfig, initialize, prepare, version, zip };

package/dist/index.js

@@ -17,7 +17,8 @@ import {
   unnormalizePath,
   version,
   wxt
-} from "./chunk-OLUK5FJF.js";
+} from "./chunk-63LEV65X.js";
+import "./chunk-P57PW2II.js";
 
 // src/core/build.ts
 async function build(config) {

package/dist/sandbox.d.ts

@@ -1,4 +1,4 @@
-import { U as UnlistedScriptDefinition, B as BackgroundDefinition, C as ContentScriptDefinition } from './index-v_64CCcw.js';
+import { U as UnlistedScriptDefinition, B as BackgroundDefinition, C as ContentScriptDefinition } from './index-mYGv2dqk.js';
 export * from '@webext-core/match-patterns';
 import 'webextension-polyfill';
 

package/dist/storage.cjs

@@ -272,14 +272,14 @@ function createStorage() {
         );
       }
       const migrate = async () => {
-        const [value, meta] = await Promise.all([
-          // TODO: Optimize with getItems
-          getItem(driver, driverKey, void 0),
-          getMeta(driver, driverKey)
+        const driverMetaKey = getMetaKey(driverKey);
+        const [{ value }, { value: meta }] = await driver.getItems([
+          driverKey,
+          driverMetaKey
         ]);
         if (value == null)
           return;
-        const currentVersion = meta.v ?? 1;
+        const currentVersion = meta?.v ?? 1;
         if (currentVersion > targetVersion) {
           throw Error(
             `Version downgrade detected (v${currentVersion} -> v${targetVersion}) for "${key}"`
@@ -296,36 +296,47 @@ function createStorage() {
         for (const migrateToVersion of migrationsToRun) {
           migratedValue = await migrations?.[migrateToVersion]?.(migratedValue) ?? migratedValue;
         }
-        await Promise.all([
-          // TODO: Optimize with `setItem`
-          setItem(driver, driverKey, migratedValue),
-          setMeta(driver, driverKey, { v: targetVersion })
+        await driver.setItems([
+          { key: driverKey, value: migratedValue },
+          { key: driverMetaKey, value: { ...meta, v: targetVersion } }
         ]);
         logger.debug(
           `Storage migration completed for ${key} v${targetVersion}`,
           { migratedValue }
         );
       };
-      browser.runtime.onInstalled.addListener(async ({ reason }) => {
-        if (reason !== "update")
-          return;
-        try {
-          await migrate();
-        } catch (err) {
-          logger.error(`Migration failed for ${key}`, err);
-        }
+      const migrationsDone = opts?.migrations == null ? Promise.resolve() : migrate().catch((err) => {
+        logger.error(`Migration failed for ${key}`, err);
       });
       const getDefaultValue = () => opts?.defaultValue ?? null;
       return {
         get defaultValue() {
           return getDefaultValue();
         },
-        getValue: () => getItem(driver, driverKey, opts),
-        getMeta: () => getMeta(driver, driverKey),
-        setValue: (value) => setItem(driver, driverKey, value),
-        setMeta: (properties) => setMeta(driver, driverKey, properties),
-        removeValue: (opts2) => removeItem(driver, driverKey, opts2),
-        removeMeta: (properties) => removeMeta(driver, driverKey, properties),
+        getValue: async () => {
+          await migrationsDone;
+          return await getItem(driver, driverKey, opts);
+        },
+        getMeta: async () => {
+          await migrationsDone;
+          return await getMeta(driver, driverKey);
+        },
+        setValue: async (value) => {
+          await migrationsDone;
+          return await setItem(driver, driverKey, value);
+        },
+        setMeta: async (properties) => {
+          await migrationsDone;
+          return await setMeta(driver, driverKey, properties);
+        },
+        removeValue: async (opts2) => {
+          await migrationsDone;
+          return await removeItem(driver, driverKey, opts2);
+        },
+        removeMeta: async (properties) => {
+          await migrationsDone;
+          return await removeMeta(driver, driverKey, properties);
+        },
         watch: (cb) => watch(
           driver,
           driverKey,
@@ -353,7 +364,10 @@ function createDriver(storageArea) {
         "You must add the 'storage' permission to your manifest to use 'wxt/storage'"
       );
     }
-    return browser.storage[storageArea];
+    const area = browser.storage[storageArea];
+    if (area == null)
+      throw Error(`"browser.storage.${storageArea}" is undefined`);
+    return area;
   };
   const watchListeners = /* @__PURE__ */ new Set();
   return {

package/dist/storage.d.cts

@@ -8,7 +8,8 @@ interface WxtStorage {
      */
     getItem<T>(key: string, opts?: GetItemOptions<T>): Promise<T | null>;
     /**
-     * Get multiple items from storage. There is no guarantee of order in the returned array.
+     * Get multiple items from storage. The return order is guaranteed to be the same as the order
+     * requested.
      *
      * @example
      * await storage.getItems(["local:installDate", "session:someCounter"]);

package/dist/storage.d.ts

@@ -8,7 +8,8 @@ interface WxtStorage {
      */
     getItem<T>(key: string, opts?: GetItemOptions<T>): Promise<T | null>;
     /**
-     * Get multiple items from storage. There is no guarantee of order in the returned array.
+     * Get multiple items from storage. The return order is guaranteed to be the same as the order
+     * requested.
      *
      * @example
      * await storage.getItems(["local:installDate", "session:someCounter"]);

package/dist/storage.js

@@ -1,3 +1,5 @@
+import "./chunk-P57PW2II.js";
+
 // src/browser.ts
 import originalBrowser from "webextension-polyfill";
 var browser = originalBrowser;
@@ -235,14 +237,14 @@ function createStorage() {
         );
       }
       const migrate = async () => {
-        const [value, meta] = await Promise.all([
-          // TODO: Optimize with getItems
-          getItem(driver, driverKey, void 0),
-          getMeta(driver, driverKey)
+        const driverMetaKey = getMetaKey(driverKey);
+        const [{ value }, { value: meta }] = await driver.getItems([
+          driverKey,
+          driverMetaKey
         ]);
         if (value == null)
           return;
-        const currentVersion = meta.v ?? 1;
+        const currentVersion = meta?.v ?? 1;
         if (currentVersion > targetVersion) {
           throw Error(
             `Version downgrade detected (v${currentVersion} -> v${targetVersion}) for "${key}"`
@@ -259,36 +261,47 @@ function createStorage() {
         for (const migrateToVersion of migrationsToRun) {
           migratedValue = await migrations?.[migrateToVersion]?.(migratedValue) ?? migratedValue;
         }
-        await Promise.all([
-          // TODO: Optimize with `setItem`
-          setItem(driver, driverKey, migratedValue),
-          setMeta(driver, driverKey, { v: targetVersion })
+        await driver.setItems([
+          { key: driverKey, value: migratedValue },
+          { key: driverMetaKey, value: { ...meta, v: targetVersion } }
         ]);
         logger.debug(
           `Storage migration completed for ${key} v${targetVersion}`,
           { migratedValue }
         );
       };
-      browser.runtime.onInstalled.addListener(async ({ reason }) => {
-        if (reason !== "update")
-          return;
-        try {
-          await migrate();
-        } catch (err) {
-          logger.error(`Migration failed for ${key}`, err);
-        }
+      const migrationsDone = opts?.migrations == null ? Promise.resolve() : migrate().catch((err) => {
+        logger.error(`Migration failed for ${key}`, err);
       });
       const getDefaultValue = () => opts?.defaultValue ?? null;
       return {
         get defaultValue() {
           return getDefaultValue();
         },
-        getValue: () => getItem(driver, driverKey, opts),
-        getMeta: () => getMeta(driver, driverKey),
-        setValue: (value) => setItem(driver, driverKey, value),
-        setMeta: (properties) => setMeta(driver, driverKey, properties),
-        removeValue: (opts2) => removeItem(driver, driverKey, opts2),
-        removeMeta: (properties) => removeMeta(driver, driverKey, properties),
+        getValue: async () => {
+          await migrationsDone;
+          return await getItem(driver, driverKey, opts);
+        },
+        getMeta: async () => {
+          await migrationsDone;
+          return await getMeta(driver, driverKey);
+        },
+        setValue: async (value) => {
+          await migrationsDone;
+          return await setItem(driver, driverKey, value);
+        },
+        setMeta: async (properties) => {
+          await migrationsDone;
+          return await setMeta(driver, driverKey, properties);
+        },
+        removeValue: async (opts2) => {
+          await migrationsDone;
+          return await removeItem(driver, driverKey, opts2);
+        },
+        removeMeta: async (properties) => {
+          await migrationsDone;
+          return await removeMeta(driver, driverKey, properties);
+        },
         watch: (cb) => watch(
           driver,
           driverKey,
@@ -316,7 +329,10 @@ function createDriver(storageArea) {
         "You must add the 'storage' permission to your manifest to use 'wxt/storage'"
       );
     }
-    return browser.storage[storageArea];
+    const area = browser.storage[storageArea];
+    if (area == null)
+      throw Error(`"browser.storage.${storageArea}" is undefined`);
+    return area;
   };
   const watchListeners = /* @__PURE__ */ new Set();
   return {

package/dist/testing.cjs

@@ -75,8 +75,8 @@ var reactRefreshPreamble = "";
 function devHtmlPrerender(config) {
   const htmlReloadId = "@wxt/reload-html";
   const resolvedHtmlReloadId = (0, import_node_path3.resolve)(
-    config.root,
-    "node_modules/wxt/dist/virtual/reload-html.js"
+    config.wxtModuleDir,
+    "dist/virtual/reload-html.js"
   );
   const virtualReactRefreshId = "@wxt/virtual-react-refresh";
   const resolvedVirtualReactRefreshId = "\0" + virtualReactRefreshId;
@@ -412,10 +412,7 @@ function virtualEntrypoint(type, config) {
         return;
       const inputPath = id.replace(resolvedVirtualId, "");
       const template = await import_fs_extra2.default.readFile(
-        (0, import_path2.resolve)(
-          config.root,
-          `node_modules/wxt/dist/virtual/${type}-entrypoint.js`
-        ),
+        (0, import_path2.resolve)(config.wxtModuleDir, `dist/virtual/${type}-entrypoint.js`),
         "utf-8"
       );
       return template.replace(`virtual:user-${type}`, inputPath);
@@ -579,8 +576,8 @@ function webextensionPolyfillMock(config) {
           alias: {
             // Alias to use a mocked version of the polyfill
             "webextension-polyfill": import_node_path6.default.resolve(
-              config.root,
-              "node_modules/wxt/dist/virtual/mock-browser"
+              config.wxtModuleDir,
+              "dist/virtual/mock-browser"
             )
           }
         },
@@ -1008,6 +1005,7 @@ async function resolveConfig(inlineConfig, command, server) {
     inlineConfig.root ?? userConfig.root ?? process.cwd()
   );
   const wxtDir = import_node_path9.default.resolve(root, ".wxt");
+  const wxtModuleDir = resolveWxtModuleDir();
   const srcDir = import_node_path9.default.resolve(root, mergedConfig.srcDir ?? root);
   const entrypointsDir = import_node_path9.default.resolve(
     srcDir,
@@ -1058,6 +1056,7 @@ async function resolveConfig(inlineConfig, command, server) {
     outBaseDir,
     outDir,
     publicDir,
+    wxtModuleDir,
     root,
     runnerConfig,
     srcDir,
@@ -1224,6 +1223,9 @@ async function getUnimportOptions(wxtDir, logger, config) {
     defaultOptions
   );
 }
+function resolveWxtModuleDir() {
+  return import_node_path9.default.resolve(require.resolve("wxt"), "../..");
+}
 
 // src/core/utils/building/import-entrypoint.ts
 var import_jiti = __toESM(require("jiti"), 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-V1QWdhdh.cjs';
+import { I as InlineConfig } from './index-vpYNIeCJ.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-V1QWdhdh.js';
+import { I as InlineConfig } from './index-vpYNIeCJ.js';
 import 'webextension-polyfill';
 import 'unimport';
 import 'consola';

package/dist/testing.js

@@ -5,7 +5,8 @@ import {
   tsconfigPaths,
   unimport,
   webextensionPolyfillMock
-} from "./chunk-OLUK5FJF.js";
+} from "./chunk-63LEV65X.js";
+import "./chunk-P57PW2II.js";
 
 // src/testing/fake-browser.ts
 import { fakeBrowser } from "@webext-core/fake-browser";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wxt",
   "type": "module",
-  "version": "0.17.2",
+  "version": "0.17.4-alpha1",
   "description": "Next gen framework for developing web extensions",
   "engines": {
     "node": ">=18",