wxt 0.19.22 → 0.20.0-beta1

package/dist/core/resolve-config.mjs

@@ -11,6 +11,7 @@ import { getEslintVersion } from "./utils/eslint.mjs";
 import { safeStringToNumber } from "./utils/number.mjs";
 import { loadEnv } from "./utils/env.mjs";
 import { getPort } from "get-port-please";
+import { fileURLToPath } from "node:url";
 export async function resolveConfig(inlineConfig, command) {
   let userConfig = {};
   let userConfigMetadata;
@@ -19,10 +20,7 @@ export async function resolveConfig(inlineConfig, command) {
       configFile: inlineConfig.configFile,
       name: "wxt",
       cwd: inlineConfig.root ?? process.cwd(),
-      rcFile: false,
-      jitiOptions: {
-        esmResolve: true
-      }
+      rcFile: false
     });
     if (inlineConfig.configFile && metadata.layers?.length === 0) {
       throw Error(`Config file "${inlineConfig.configFile}" not found`);
@@ -49,28 +47,34 @@ export async function resolveConfig(inlineConfig, command) {
     srcDir,
     mergedConfig.entrypointsDir ?? "entrypoints"
   );
-  const modulesDir = path.resolve(srcDir, mergedConfig.modulesDir ?? "modules");
   if (await isDirMissing(entrypointsDir)) {
     logMissingDir(logger, "Entrypoints", entrypointsDir);
   }
+  const modulesDir = path.resolve(root, mergedConfig.modulesDir ?? "modules");
   const filterEntrypoints = mergedConfig.filterEntrypoints?.length ? new Set(mergedConfig.filterEntrypoints) : void 0;
-  const publicDir = path.resolve(srcDir, mergedConfig.publicDir ?? "public");
+  const publicDir = path.resolve(root, mergedConfig.publicDir ?? "public");
   const typesDir = path.resolve(wxtDir, "types");
   const outBaseDir = path.resolve(root, mergedConfig.outDir ?? ".output");
   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 modeSuffix = modeSuffixes[mode] ?? `-${mode}`;
+  const outDirTemplate = (mergedConfig.outDirTemplate ?? `${browser}-mv${manifestVersion}${modeSuffix}`).replaceAll("{{browser}}", browser).replaceAll("{{manifestVersion}}", manifestVersion.toString()).replaceAll("{{modeSuffix}}", modeSuffix).replaceAll("{{mode}}", mode).replaceAll("{{command}}", command);
   const outDir = path.resolve(outBaseDir, outDirTemplate);
   const reloadCommand = mergedConfig.dev?.reloadCommand ?? "Alt+R";
+  if (inlineConfig.runner != null || userConfig.runner != null) {
+    logger.warn(
+      "`InlineConfig#runner` is deprecated, use `InlineConfig#webExt` instead. See https://wxt.dev/guide/resources/upgrading.html#v0-19-0-rarr-v0-20-0"
+    );
+  }
   const runnerConfig = await loadConfig({
     name: "web-ext",
     cwd: root,
     globalRc: true,
     rcFile: ".webextrc",
-    overrides: inlineConfig.runner,
-    defaults: userConfig.runner
+    overrides: inlineConfig.webExt ?? inlineConfig.runner,
+    defaults: userConfig.webExt ?? userConfig.runner
   });
   const alias = Object.fromEntries(
     Object.entries({
@@ -113,7 +117,6 @@ export async function resolveConfig(inlineConfig, command) {
     },
     {}
   );
-  const extensionApi = mergedConfig.extensionApi ?? "webextension-polyfill";
   return {
     browser,
     command,
@@ -123,13 +126,7 @@ export async function resolveConfig(inlineConfig, command) {
     filterEntrypoints,
     env,
     fsCache: createFsCache(wxtDir),
-    imports: await getUnimportOptions(
-      wxtDir,
-      srcDir,
-      logger,
-      extensionApi,
-      mergedConfig
-    ),
+    imports: await getUnimportOptions(wxtDir, srcDir, logger, mergedConfig),
     logger,
     manifest: await resolveManifestConfig(env, mergedConfig.manifest),
     manifestVersion,
@@ -144,12 +141,9 @@ export async function resolveConfig(inlineConfig, command) {
     typesDir,
     wxtDir,
     zip: resolveZipConfig(root, browser, outBaseDir, mergedConfig),
-    transformManifest: mergedConfig.transformManifest,
     analysis: resolveAnalysisConfig(root, mergedConfig),
     userConfigMetadata: userConfigMetadata ?? {},
     alias,
-    extensionApi,
-    entrypointLoader: mergedConfig.entrypointLoader ?? "vite-node",
     experimental: defu(mergedConfig.experimental, {}),
     dev: {
       server: devServerConfig,
@@ -173,10 +167,6 @@ async function mergeInlineConfig(inlineConfig, userConfig) {
     const inline = await resolveManifestConfig(env, inlineConfig.manifest);
     return defu(inline, user);
   };
-  const transformManifest = (manifest2) => {
-    userConfig.transformManifest?.(manifest2);
-    inlineConfig.transformManifest?.(manifest2);
-  };
   const merged = defu(inlineConfig, userConfig);
   const builderConfig = await mergeBuilderConfig(
     merged.logger ?? consola,
@@ -186,7 +176,6 @@ async function mergeInlineConfig(inlineConfig, userConfig) {
   return {
     ...merged,
     // Custom merge values
-    transformManifest,
     imports,
     manifest,
     ...builderConfig
@@ -239,34 +228,136 @@ function resolveAnalysisConfig(root, mergedConfig) {
     keepArtifacts: mergedConfig.analysis?.keepArtifacts ?? false
   };
 }
-async function getUnimportOptions(wxtDir, srcDir, logger, extensionApi, config) {
-  if (config.imports === false) return false;
+async function getUnimportOptions(wxtDir, srcDir, logger, config) {
+  const disabled = config.imports === false;
+  const eslintrc = await getUnimportEslintOptions(wxtDir, config.imports);
+  const invalidExports = ["options"];
+  const defineImportsAndTypes = (imports, typeImports) => [
+    ...imports,
+    ...typeImports.map((name) => ({ name, type: true }))
+  ];
   const defaultOptions = {
-    debugLog: logger.debug,
-    imports: [
-      { name: "defineConfig", from: "wxt" },
-      { name: "fakeBrowser", from: "wxt/testing" }
-    ],
+    imports: [{ name: "fakeBrowser", from: "wxt/testing" }],
     presets: [
       {
-        package: "wxt/client",
-        // There seems to be a bug in unimport that thinks "options" is an
-        // export from wxt/client, but it doesn't actually exist... so it's
-        // ignored.
-        ignore: ["options"]
+        from: "wxt/browser",
+        imports: defineImportsAndTypes(["browser"], [])
+      },
+      {
+        from: "wxt/utils/storage",
+        imports: defineImportsAndTypes(
+          ["storage"],
+          [
+            "StorageArea",
+            "WxtStorage",
+            "WxtStorageItem",
+            "StorageArea",
+            "StorageItemKey",
+            "StorageAreaChanges",
+            "MigrationError"
+          ]
+        )
+      },
+      {
+        from: "wxt/utils/app-config",
+        imports: defineImportsAndTypes(["useAppConfig"], [])
+      },
+      {
+        from: "wxt/utils/content-script-context",
+        imports: defineImportsAndTypes(
+          ["ContentScriptContext"],
+          ["WxtWindowEventMap"]
+        )
+      },
+      {
+        from: "wxt/utils/content-script-ui/iframe",
+        imports: defineImportsAndTypes(
+          ["createIframeUi"],
+          ["IframeContentScriptUi", "IframeContentScriptUiOptions"]
+        ),
+        ignore: invalidExports
+      },
+      {
+        from: "wxt/utils/content-script-ui/integrated",
+        imports: defineImportsAndTypes(
+          ["createIntegratedUi"],
+          ["IntegratedContentScriptUi", "IntegratedContentScriptUiOptions"]
+        ),
+        ignore: invalidExports
+      },
+      {
+        from: "wxt/utils/content-script-ui/shadow-root",
+        imports: defineImportsAndTypes(
+          ["createShadowRootUi"],
+          ["ShadowRootContentScriptUi", "ShadowRootContentScriptUiOptions"]
+        ),
+        ignore: invalidExports
+      },
+      {
+        from: "wxt/utils/content-script-ui/types",
+        imports: defineImportsAndTypes(
+          [],
+          [
+            "ContentScriptUi",
+            "ContentScriptUiOptions",
+            "ContentScriptOverlayAlignment",
+            "ContentScriptAppendMode",
+            "ContentScriptInlinePositioningOptions",
+            "ContentScriptOverlayPositioningOptions",
+            "ContentScriptModalPositioningOptions",
+            "ContentScriptPositioningOptions",
+            "ContentScriptAnchoredOptions",
+            "AutoMountOptions",
+            "StopAutoMount",
+            "AutoMount"
+          ]
+        )
+      },
+      {
+        from: "wxt/utils/define-app-config",
+        imports: defineImportsAndTypes(["defineAppConfig"], ["WxtAppConfig"])
+      },
+      {
+        from: "wxt/utils/define-background",
+        imports: defineImportsAndTypes(["defineBackground"], [])
+      },
+      {
+        from: "wxt/utils/define-content-script",
+        imports: defineImportsAndTypes(["defineContentScript"], [])
       },
       {
-        package: extensionApi === "chrome" ? "wxt/browser/chrome" : "wxt/browser"
+        from: "wxt/utils/define-unlisted-script",
+        imports: defineImportsAndTypes(["defineUnlistedScript"], [])
       },
-      { package: "wxt/sandbox" },
-      { package: "wxt/storage" }
+      {
+        from: "wxt/utils/define-wxt-plugin",
+        imports: defineImportsAndTypes(["defineWxtPlugin"], [])
+      },
+      {
+        from: "wxt/utils/inject-script",
+        imports: defineImportsAndTypes(
+          ["injectScript"],
+          ["ScriptPublicPath", "InjectScriptOptions"]
+        ),
+        ignore: invalidExports
+      },
+      {
+        from: "wxt/utils/match-patterns",
+        imports: defineImportsAndTypes(
+          ["InvalidMatchPattern", "MatchPattern"],
+          []
+        )
+      }
     ],
+    virtualImports: ["#imports"],
+    debugLog: logger.debug,
     warn: logger.warn,
-    dirs: ["components", "composables", "hooks", "utils"],
     dirsScanOptions: {
       cwd: srcDir
     },
-    eslintrc: await getUnimportEslintOptions(wxtDir, config.imports?.eslintrc)
+    eslintrc,
+    dirs: disabled ? [] : ["components", "composables", "hooks", "utils"],
+    disabled
   };
   return defu(
     config.imports ?? {},
@@ -274,35 +365,35 @@ async function getUnimportOptions(wxtDir, srcDir, logger, extensionApi, config)
   );
 }
 async function getUnimportEslintOptions(wxtDir, options) {
-  const rawEslintEnabled = options?.enabled ?? "auto";
-  let eslintEnabled;
-  switch (rawEslintEnabled) {
+  const inlineEnabled = options === false ? false : options?.eslintrc?.enabled ?? "auto";
+  let enabled;
+  switch (inlineEnabled) {
     case "auto":
       const version = await getEslintVersion();
       let major = parseInt(version[0]);
-      if (isNaN(major)) eslintEnabled = false;
-      if (major <= 8) eslintEnabled = 8;
-      else if (major >= 9) eslintEnabled = 9;
-      else eslintEnabled = false;
+      if (isNaN(major)) enabled = false;
+      if (major <= 8) enabled = 8;
+      else if (major >= 9) enabled = 9;
+      else enabled = false;
       break;
     case true:
-      eslintEnabled = 8;
+      enabled = 8;
       break;
     default:
-      eslintEnabled = rawEslintEnabled;
+      enabled = inlineEnabled;
   }
   return {
-    enabled: eslintEnabled,
+    enabled,
     filePath: path.resolve(
       wxtDir,
-      eslintEnabled === 9 ? "eslint-auto-imports.mjs" : "eslintrc-auto-import.json"
+      enabled === 9 ? "eslint-auto-imports.mjs" : "eslintrc-auto-import.json"
     ),
     globalsPropValue: true
   };
 }
 async function resolveWxtModuleDir() {
-  const requireResolve = globalThis.require?.resolve ?? (await import("node:module")).default.createRequire(import.meta.url).resolve;
-  return path.resolve(requireResolve("wxt"), "../..");
+  const url = import.meta.resolve("wxt", import.meta.url);
+  return path.resolve(fileURLToPath(url), "../..");
 }
 async function isDirMissing(dir) {
   return !await fs.exists(dir);
@@ -380,3 +471,9 @@ export async function resolveWxtUserModules(modulesDir, modules = []) {
   );
   return [...npmModules, ...localModules];
 }
+if (false) {
+  (void 0).resolve = (path2) => (
+    // @ts-expect-error: vitestCreateRequire defined in vitest.setup.ts
+    "file://" + vitestCreateRequire(import.meta.url).resolve(path2)
+  );
+}

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

@@ -21,7 +21,7 @@ export function createWebExtRunner() {
       };
       const wxtUserConfig = wxt.config.runnerConfig.config;
       const userConfig = {
-        console: wxtUserConfig?.openConsole,
+        browserConsole: wxtUserConfig?.openConsole,
         devtools: wxtUserConfig?.openDevtools,
         startUrl: wxtUserConfig?.startUrls,
         keepProfileChanges: wxtUserConfig?.keepProfileChanges,

package/dist/core/utils/building/find-entrypoints.mjs

@@ -45,6 +45,7 @@ export async function findEntrypoints() {
     }
     return results;
   }, []);
+  await wxt.hooks.callHook("entrypoints:found", wxt, entrypointInfos);
   preventNoEntrypoints(entrypointInfos);
   preventDuplicateEntrypointNames(entrypointInfos);
   let hasBackground = false;
@@ -108,6 +109,7 @@ export async function findEntrypoints() {
     ...entry,
     skipped: isEntrypointSkipped(entry)
   }));
+  await wxt.hooks.callHook("entrypoints:resolved", wxt, entrypoints);
   wxt.logger.debug("All entrypoints:", entrypoints);
   const skippedEntrypointNames = entrypoints.filter((item) => item.skipped).map((item) => item.name);
   if (skippedEntrypointNames.length) {
@@ -120,7 +122,6 @@ export async function findEntrypoints() {
       ].join("\n")
     );
   }
-  await wxt.hooks.callHook("entrypoints:resolved", wxt, entrypoints);
   return entrypoints;
 }
 async function importEntrypoints(infos) {

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

@@ -2,6 +2,5 @@ export * from './build-entrypoints';
 export * from './detect-dev-changes';
 export * from './find-entrypoints';
 export * from './group-entrypoints';
-export * from './import-entrypoint';
 export * from './internal-build';
 export * from './rebuild';

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

@@ -2,6 +2,5 @@ export * from "./build-entrypoints.mjs";
 export * from "./detect-dev-changes.mjs";
 export * from "./find-entrypoints.mjs";
 export * from "./group-entrypoints.mjs";
-export * from "./import-entrypoint.mjs";
 export * from "./internal-build.mjs";
 export * from "./rebuild.mjs";

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

@@ -1,4 +1,3 @@
-import type { Manifest } from 'wxt/browser';
 import { BuildOutput, Entrypoint, EntrypointGroup } from '../../../types';
 /**
  * Given a configuration, list of entrypoints, and an existing, partial output, build the
@@ -18,6 +17,6 @@ import { BuildOutput, Entrypoint, EntrypointGroup } from '../../../types';
  */
 export declare function rebuild(allEntrypoints: Entrypoint[], entrypointGroups: EntrypointGroup[], existingOutput?: Omit<BuildOutput, 'manifest'>): Promise<{
     output: BuildOutput;
-    manifest: Manifest.WebExtensionManifest;
+    manifest: chrome.runtime.Manifest;
     warnings: any[][];
 }>;

package/dist/core/utils/content-scripts.d.ts

@@ -1,11 +1,11 @@
-import type { Manifest, Scripting } from 'wxt/browser';
 import { ContentScriptEntrypoint, ResolvedConfig } from '../../types';
+import { ManifestContentScript } from './types';
 /**
  * Returns a unique and consistent string hash based on a content scripts options.
  *
  * It is able to recognize default values,
  */
 export declare function hashContentScriptOptions(options: ContentScriptEntrypoint['options']): string;
-export declare function mapWxtOptionsToContentScript(options: ContentScriptEntrypoint['options'], js: string[] | undefined, css: string[] | undefined): Manifest.ContentScript;
-export declare function mapWxtOptionsToRegisteredContentScript(options: ContentScriptEntrypoint['options'], js: string[] | undefined, css: string[] | undefined): Omit<Scripting.RegisteredContentScript, 'id'>;
+export declare function mapWxtOptionsToContentScript(options: ContentScriptEntrypoint['options'], js: string[] | undefined, css: string[] | undefined): ManifestContentScript;
+export declare function mapWxtOptionsToRegisteredContentScript(options: ContentScriptEntrypoint['options'], js: string[] | undefined, css: string[] | undefined): Omit<chrome.scripting.RegisteredContentScript, 'id'>;
 export declare function getContentScriptJs(config: ResolvedConfig, entrypoint: ContentScriptEntrypoint): string[];

package/dist/core/utils/content-scripts.mjs

@@ -15,6 +15,7 @@ export function hashContentScriptOptions(options) {
     match_about_blank: false,
     run_at: "document_idle",
     all_frames: false,
+    // @ts-expect-error: Untyped
     match_origin_as_fallback: false,
     world: "ISOLATED",
     ...simplifiedOptions
@@ -37,6 +38,7 @@ export function mapWxtOptionsToContentScript(options, js, css) {
     run_at: options.runAt,
     css,
     js,
+    // @ts-expect-error: Untyped
     match_origin_as_fallback: options.matchOriginAsFallback,
     world: options.world
   };

package/dist/core/utils/eslint.mjs

@@ -1,10 +1,8 @@
+const ESLINT_PACKAGE_NAME = "eslint";
 export async function getEslintVersion() {
   try {
-    const require = (await import("node:module")).default.createRequire(
-      import.meta.url
-    );
-    const { ESLint } = require("eslint");
-    return ESLint.version?.split(".") ?? [];
+    const { version } = await import(ESLINT_PACKAGE_NAME);
+    return version.split(".") ?? [];
   } catch {
     return [];
   }

package/dist/core/utils/manifest.d.ts

@@ -1,14 +1,13 @@
-import type { Manifest } from 'wxt/browser';
 import { Entrypoint, BuildOutput, ContentScriptEntrypoint } from '../../types';
 /**
  * Writes the manifest to the output directory and the build output.
  */
-export declare function writeManifest(manifest: Manifest.WebExtensionManifest, output: BuildOutput): Promise<void>;
+export declare function writeManifest(manifest: chrome.runtime.Manifest, output: BuildOutput): Promise<void>;
 /**
  * Generates the manifest based on the config and entrypoints.
  */
 export declare function generateManifest(allEntrypoints: Entrypoint[], buildOutput: Omit<BuildOutput, 'manifest'>): Promise<{
-    manifest: Manifest.WebExtensionManifest;
+    manifest: chrome.runtime.Manifest;
     warnings: any[][];
 }>;
 /**
@@ -37,8 +36,4 @@ export declare function stripPathFromMatchPattern(pattern: string): string;
  * generated in this file, and may be defined by the user in their manifest. In both cases, when
  * targeting MV2, automatically convert their definitions down to the basic MV2 array.
  */
-export declare function convertWebAccessibleResourcesToMv2(manifest: Manifest.WebExtensionManifest): void;
-/**
- * Make sure all resources are in MV3 format. If not, add a wanring
- */
-export declare function validateMv3WebAccessibleResources(manifest: Manifest.WebExtensionManifest): void;
+export declare function convertWebAccessibleResourcesToMv2(manifest: chrome.runtime.Manifest): void;

package/dist/core/utils/manifest.mjs

@@ -41,10 +41,7 @@ export async function generateManifest(allEntrypoints, buildOutput) {
     icons: discoverIcons(buildOutput)
   };
   const userManifest = wxt.config.manifest;
-  let manifest = defu(
-    userManifest,
-    baseManifest
-  );
+  let manifest = defu(userManifest, baseManifest);
   if (wxt.config.command === "serve" && wxt.config.dev.reloadCommand) {
     if (manifest.commands && // If the following limit is exceeded, Chrome will fail to load the extension.
     // Error: "Too many commands specified for 'commands': The maximum is 4."
@@ -70,7 +67,6 @@ export async function generateManifest(allEntrypoints, buildOutput) {
   addEntrypoints(manifest, entrypoints, buildOutput);
   if (wxt.config.command === "serve") addDevModeCsp(manifest);
   if (wxt.config.command === "serve") addDevModePermissions(manifest);
-  wxt.config.transformManifest?.(manifest);
   await wxt.hooks.callHook("build:manifestGenerated", wxt, manifest);
   if (wxt.config.manifestVersion === 2) {
     convertWebAccessibleResourcesToMv2(manifest);
@@ -220,6 +216,7 @@ function addEntrypoints(manifest, entrypoints, buildOutput) {
     const page = getEntrypointBundlePath(options, wxt.config.outDir, ".html");
     manifest.options_ui = {
       open_in_tab: options.options.openInTab,
+      // @ts-expect-error: Not typed by @types/chrome, but supported by Firefox
       browser_style: wxt.config.browser === "firefox" ? options.options.browserStyle : void 0,
       chrome_style: wxt.config.browser !== "firefox" ? options.options.chromeStyle : void 0,
       page
@@ -400,7 +397,7 @@ export function getContentScriptCssWebAccessibleResources(contentScripts, conten
       resources: [cssFile],
       matches: script.options.matches?.map(
         (matchPattern) => stripPathFromMatchPattern(matchPattern)
-      )
+      ) ?? []
     });
   });
   return resources;
@@ -460,7 +457,7 @@ function convertCspToMv2(manifest) {
     return;
   manifest.content_security_policy = manifest.content_security_policy.extension_pages;
 }
-export function validateMv3WebAccessibleResources(manifest) {
+function validateMv3WebAccessibleResources(manifest) {
   if (manifest.web_accessible_resources == null) return;
   const stringResources = manifest.web_accessible_resources.filter(
     (item) => typeof item === "string"

package/dist/core/utils/strings.d.ts

@@ -12,7 +12,3 @@ export declare function safeFilename(str: string): string;
  * calls.
  */
 export declare function removeImportStatements(text: string): string;
-/**
- * Removes imports, ensuring that some of WXT's client imports are present, so that entrypoints can be parsed if auto-imports are disabled.
- */
-export declare function removeProjectImportStatements(text: string): string;

package/dist/core/utils/strings.mjs

@@ -16,9 +16,3 @@ export function removeImportStatements(text) {
     ""
   );
 }
-export function removeProjectImportStatements(text) {
-  const noImports = removeImportStatements(text);
-  return `import { defineUnlistedScript, defineContentScript, defineBackground } from 'wxt/sandbox';
-
-${noImports}`;
-}