wxt 0.7.1-alpha1 → 0.7.2

package/dist/index.d.cts

@@ -404,47 +404,47 @@ interface OptionsEntrypoint extends BaseEntrypoint {
 type Entrypoint = GenericEntrypoint | BackgroundEntrypoint | ContentScriptEntrypoint | PopupEntrypoint | OptionsEntrypoint;
 type OnContentScriptStopped = (cb: () => void) => void;
 interface ContentScriptDefinition extends ExcludableEntrypoint {
-    matches: Manifest.ContentScript['matches'];
+    matches: PerBrowserOption<Manifest.ContentScript['matches']>;
     /**
      * See https://developer.chrome.com/docs/extensions/mv3/content_scripts/
      * @default "documentIdle"
      */
-    runAt?: Manifest.ContentScript['run_at'];
+    runAt?: PerBrowserOption<Manifest.ContentScript['run_at']>;
     /**
      * See https://developer.chrome.com/docs/extensions/mv3/content_scripts/
      * @default false
      */
-    matchAboutBlank?: Manifest.ContentScript['match_about_blank'];
+    matchAboutBlank?: PerBrowserOption<Manifest.ContentScript['match_about_blank']>;
     /**
      * See https://developer.chrome.com/docs/extensions/mv3/content_scripts/
      * @default []
      */
-    excludeMatches?: Manifest.ContentScript['exclude_matches'];
+    excludeMatches?: PerBrowserOption<Manifest.ContentScript['exclude_matches']>;
     /**
      * See https://developer.chrome.com/docs/extensions/mv3/content_scripts/
      * @default []
      */
-    includeGlobs?: Manifest.ContentScript['include_globs'];
+    includeGlobs?: PerBrowserOption<Manifest.ContentScript['include_globs']>;
     /**
      * See https://developer.chrome.com/docs/extensions/mv3/content_scripts/
      * @default []
      */
-    excludeGlobs?: Manifest.ContentScript['exclude_globs'];
+    excludeGlobs?: PerBrowserOption<Manifest.ContentScript['exclude_globs']>;
     /**
      * See https://developer.chrome.com/docs/extensions/mv3/content_scripts/
      * @default false
      */
-    allFrames?: Manifest.ContentScript['all_frames'];
+    allFrames?: PerBrowserOption<Manifest.ContentScript['all_frames']>;
     /**
      * See https://developer.chrome.com/docs/extensions/mv3/content_scripts/
      * @default false
      */
-    matchOriginAsFallback?: boolean;
+    matchOriginAsFallback?: PerBrowserOption<boolean>;
     /**
      * See https://developer.chrome.com/docs/extensions/mv3/content_scripts/
      * @default "ISOLATED"
      */
-    world?: 'ISOLATED' | 'MAIN';
+    world?: PerBrowserOption<'ISOLATED' | 'MAIN'>;
     /**
      * Customize how imported/generated styles are injected with the content script. Regardless of the
      * mode selected, CSS will always be built and included in the output directory.
@@ -456,16 +456,20 @@ interface ContentScriptDefinition extends ExcludableEntrypoint {
      *
      * @default "manifest"
      */
-    cssInjectionMode?: 'manifest' | 'manual' | 'ui';
+    cssInjectionMode?: PerBrowserOption<'manifest' | 'manual' | 'ui'>;
     /**
      * Main function executed when the content script is loaded.
      */
     main(ctx: ContentScriptContext): void | Promise<void>;
 }
 interface BackgroundScriptDefintition extends ExcludableEntrypoint {
-    type?: 'module';
+    type?: PerBrowserOption<'module'>;
+    persistent?: PerBrowserOption<boolean>;
     main(): void;
 }
+type PerBrowserOption<T> = T | {
+    [browser: TargetBrowser]: T;
+};
 interface ExcludableEntrypoint {
     /**
      * List of target browsers to include this entrypoint in. Defaults to being included in all
@@ -561,7 +565,7 @@ type EntrypointGroup = Entrypoint | Entrypoint[];
  */
 declare function clean(root?: string): Promise<void>;
 
-var version = "0.7.1-alpha1";
+var version = "0.7.2";
 
 declare function defineConfig(config: UserConfig): UserConfig;
 
@@ -577,4 +581,4 @@ declare function build(config: InlineConfig): Promise<BuildOutput>;
  */
 declare function createServer(config?: InlineConfig): Promise<WxtDevServer>;
 
-export { BackgroundEntrypoint, BackgroundScriptDefintition, BaseEntrypoint, BaseEntrypointOptions, BuildOutput, BuildStepOutput, ConfigEnv, ContentScriptDefinition, ContentScriptEntrypoint, Entrypoint, ExcludableEntrypoint, ExtensionRunnerConfig, GenericEntrypoint, InlineConfig, Logger, OnContentScriptStopped, OptionsEntrypoint, PopupEntrypoint, TargetBrowser, TargetManifestVersion, UserConfig, UserManifest, UserManifestFn, WxtDevServer, WxtInlineViteConfig, WxtViteConfig, build, clean, createServer, defineConfig, defineRunnerConfig, version };
+export { BackgroundEntrypoint, BackgroundScriptDefintition, BaseEntrypoint, BaseEntrypointOptions, BuildOutput, BuildStepOutput, ConfigEnv, ContentScriptDefinition, ContentScriptEntrypoint, Entrypoint, ExcludableEntrypoint, ExtensionRunnerConfig, GenericEntrypoint, InlineConfig, Logger, OnContentScriptStopped, OptionsEntrypoint, PerBrowserOption, PopupEntrypoint, TargetBrowser, TargetManifestVersion, UserConfig, UserManifest, UserManifestFn, WxtDevServer, WxtInlineViteConfig, WxtViteConfig, build, clean, createServer, defineConfig, defineRunnerConfig, version };

package/dist/index.d.ts

@@ -404,47 +404,47 @@ interface OptionsEntrypoint extends BaseEntrypoint {
 type Entrypoint = GenericEntrypoint | BackgroundEntrypoint | ContentScriptEntrypoint | PopupEntrypoint | OptionsEntrypoint;
 type OnContentScriptStopped = (cb: () => void) => void;
 interface ContentScriptDefinition extends ExcludableEntrypoint {
-    matches: Manifest.ContentScript['matches'];
+    matches: PerBrowserOption<Manifest.ContentScript['matches']>;
     /**
      * See https://developer.chrome.com/docs/extensions/mv3/content_scripts/
      * @default "documentIdle"
      */
-    runAt?: Manifest.ContentScript['run_at'];
+    runAt?: PerBrowserOption<Manifest.ContentScript['run_at']>;
     /**
      * See https://developer.chrome.com/docs/extensions/mv3/content_scripts/
      * @default false
      */
-    matchAboutBlank?: Manifest.ContentScript['match_about_blank'];
+    matchAboutBlank?: PerBrowserOption<Manifest.ContentScript['match_about_blank']>;
     /**
      * See https://developer.chrome.com/docs/extensions/mv3/content_scripts/
      * @default []
      */
-    excludeMatches?: Manifest.ContentScript['exclude_matches'];
+    excludeMatches?: PerBrowserOption<Manifest.ContentScript['exclude_matches']>;
     /**
      * See https://developer.chrome.com/docs/extensions/mv3/content_scripts/
      * @default []
      */
-    includeGlobs?: Manifest.ContentScript['include_globs'];
+    includeGlobs?: PerBrowserOption<Manifest.ContentScript['include_globs']>;
     /**
      * See https://developer.chrome.com/docs/extensions/mv3/content_scripts/
      * @default []
      */
-    excludeGlobs?: Manifest.ContentScript['exclude_globs'];
+    excludeGlobs?: PerBrowserOption<Manifest.ContentScript['exclude_globs']>;
     /**
      * See https://developer.chrome.com/docs/extensions/mv3/content_scripts/
      * @default false
      */
-    allFrames?: Manifest.ContentScript['all_frames'];
+    allFrames?: PerBrowserOption<Manifest.ContentScript['all_frames']>;
     /**
      * See https://developer.chrome.com/docs/extensions/mv3/content_scripts/
      * @default false
      */
-    matchOriginAsFallback?: boolean;
+    matchOriginAsFallback?: PerBrowserOption<boolean>;
     /**
      * See https://developer.chrome.com/docs/extensions/mv3/content_scripts/
      * @default "ISOLATED"
      */
-    world?: 'ISOLATED' | 'MAIN';
+    world?: PerBrowserOption<'ISOLATED' | 'MAIN'>;
     /**
      * Customize how imported/generated styles are injected with the content script. Regardless of the
      * mode selected, CSS will always be built and included in the output directory.
@@ -456,16 +456,20 @@ interface ContentScriptDefinition extends ExcludableEntrypoint {
      *
      * @default "manifest"
      */
-    cssInjectionMode?: 'manifest' | 'manual' | 'ui';
+    cssInjectionMode?: PerBrowserOption<'manifest' | 'manual' | 'ui'>;
     /**
      * Main function executed when the content script is loaded.
      */
     main(ctx: ContentScriptContext): void | Promise<void>;
 }
 interface BackgroundScriptDefintition extends ExcludableEntrypoint {
-    type?: 'module';
+    type?: PerBrowserOption<'module'>;
+    persistent?: PerBrowserOption<boolean>;
     main(): void;
 }
+type PerBrowserOption<T> = T | {
+    [browser: TargetBrowser]: T;
+};
 interface ExcludableEntrypoint {
     /**
      * List of target browsers to include this entrypoint in. Defaults to being included in all
@@ -561,7 +565,7 @@ type EntrypointGroup = Entrypoint | Entrypoint[];
  */
 declare function clean(root?: string): Promise<void>;
 
-var version = "0.7.1-alpha1";
+var version = "0.7.2";
 
 declare function defineConfig(config: UserConfig): UserConfig;
 
@@ -577,4 +581,4 @@ declare function build(config: InlineConfig): Promise<BuildOutput>;
  */
 declare function createServer(config?: InlineConfig): Promise<WxtDevServer>;
 
-export { BackgroundEntrypoint, BackgroundScriptDefintition, BaseEntrypoint, BaseEntrypointOptions, BuildOutput, BuildStepOutput, ConfigEnv, ContentScriptDefinition, ContentScriptEntrypoint, Entrypoint, ExcludableEntrypoint, ExtensionRunnerConfig, GenericEntrypoint, InlineConfig, Logger, OnContentScriptStopped, OptionsEntrypoint, PopupEntrypoint, TargetBrowser, TargetManifestVersion, UserConfig, UserManifest, UserManifestFn, WxtDevServer, WxtInlineViteConfig, WxtViteConfig, build, clean, createServer, defineConfig, defineRunnerConfig, version };
+export { BackgroundEntrypoint, BackgroundScriptDefintition, BaseEntrypoint, BaseEntrypointOptions, BuildOutput, BuildStepOutput, ConfigEnv, ContentScriptDefinition, ContentScriptEntrypoint, Entrypoint, ExcludableEntrypoint, ExtensionRunnerConfig, GenericEntrypoint, InlineConfig, Logger, OnContentScriptStopped, OptionsEntrypoint, PerBrowserOption, PopupEntrypoint, TargetBrowser, TargetManifestVersion, UserConfig, UserManifest, UserManifestFn, WxtDevServer, WxtInlineViteConfig, WxtViteConfig, build, clean, createServer, defineConfig, defineRunnerConfig, version };

package/dist/index.js

@@ -940,6 +940,11 @@ function getEntrypointBundlePath(entrypoint, outDir, ext) {
     relative(outDir, getEntrypointOutputFile(entrypoint, ext))
   );
 }
+function resolvePerBrowserOption(option, browser) {
+  if (typeof option === "object" && !Array.isArray(option))
+    return option[browser];
+  return option;
+}
 
 // src/core/vite-plugins/devHtmlPrerender.ts
 import { parseHTML } from "linkedom";
@@ -1363,7 +1368,7 @@ async function getInternalConfig(inlineConfig, command) {
   if (debug)
     logger.level = LogLevels.debug;
   const browser = mergedConfig.browser ?? "chrome";
-  const manifestVersion = mergedConfig.manifestVersion ?? (browser == "firefox" ? 2 : 3);
+  const manifestVersion = mergedConfig.manifestVersion ?? (browser === "firefox" || browser === "safari" ? 2 : 3);
   const mode = mergedConfig.mode ?? (command === "build" ? "production" : "development");
   const env = { browser, command, manifestVersion, mode };
   const root = path2.resolve(
@@ -2083,7 +2088,11 @@ async function getBackgroundEntrypoint(config, path9) {
     name: "background",
     inputPath: path9,
     outputDir: config.outDir,
-    options
+    options: {
+      ...options,
+      type: resolvePerBrowserOption(options.type, config.browser),
+      persistent: resolvePerBrowserOption(options.persistent, config.browser)
+    }
   };
 }
 async function getContentScriptEntrypoint(config, name, path9) {
@@ -2428,17 +2437,32 @@ function hashContentScriptOptions(options) {
     }).sort((l, r) => l[0].localeCompare(r[0]))
   );
 }
-function mapWxtOptionsToContentScript(options) {
+function mapWxtOptionsToContentScript(options, config) {
   return {
-    matches: options.matches,
-    all_frames: options.allFrames,
-    match_about_blank: options.matchAboutBlank,
-    exclude_globs: options.excludeGlobs,
-    exclude_matches: options.excludeMatches,
-    include_globs: options.includeGlobs,
-    run_at: options.runAt,
+    matches: resolvePerBrowserOption(options.matches, config.browser),
+    all_frames: resolvePerBrowserOption(options.allFrames, config.browser),
+    match_about_blank: resolvePerBrowserOption(
+      options.matchAboutBlank,
+      config.browser
+    ),
+    exclude_globs: resolvePerBrowserOption(
+      options.excludeGlobs,
+      config.browser
+    ),
+    exclude_matches: resolvePerBrowserOption(
+      options.excludeMatches,
+      config.browser
+    ),
+    include_globs: resolvePerBrowserOption(
+      options.includeGlobs,
+      config.browser
+    ),
+    run_at: resolvePerBrowserOption(options.runAt, config.browser),
     // @ts-expect-error: untyped chrome options
-    match_origin_as_fallback: options.matchOriginAsFallback,
+    match_origin_as_fallback: resolvePerBrowserOption(
+      options.matchOriginAsFallback,
+      config.browser
+    ),
     world: options.world
   };
 }
@@ -2662,7 +2686,11 @@ function addEntrypoints(manifest, entrypoints, buildOutput, config) {
     if (config.command === "serve" && config.manifestVersion === 3) {
       const hostPermissions = new Set(manifest.host_permissions ?? []);
       contentScripts.forEach((script) => {
-        script.options.matches.forEach((matchPattern) => {
+        const matches = resolvePerBrowserOption(
+          script.options.matches,
+          config.browser
+        );
+        matches.forEach((matchPattern) => {
           hostPermissions.add(matchPattern);
         });
       });
@@ -2680,7 +2708,7 @@ function addEntrypoints(manifest, entrypoints, buildOutput, config) {
       }, /* @__PURE__ */ new Map());
       const newContentScripts = Array.from(hashToEntrypointsMap.entries()).map(
         ([, scripts]) => ({
-          ...mapWxtOptionsToContentScript(scripts[0].options),
+          ...mapWxtOptionsToContentScript(scripts[0].options, config),
           // TOOD: Sorting css and js arrays here so we get consistent test results... but we
           // shouldn't have to. Where is the inconsistency coming from?
           css: getContentScriptCssFiles(scripts, cssMap)?.sort(),
@@ -4404,12 +4432,18 @@ function reloadContentScripts(steps, config, server) {
       const cssMap = getContentScriptsCssMap(server.currentOutput, [entry]);
       const css = getContentScriptCssFiles([entry], cssMap);
       server.reloadContentScript({
-        allFrames: entry.options.allFrames,
-        excludeMatches: entry.options.excludeMatches,
-        matches: entry.options.matches,
-        runAt: entry.options.runAt,
+        allFrames: resolvePerBrowserOption(
+          entry.options.allFrames,
+          config.browser
+        ),
+        excludeMatches: resolvePerBrowserOption(
+          entry.options.excludeMatches,
+          config.browser
+        ),
+        matches: resolvePerBrowserOption(entry.options.matches, config.browser),
+        runAt: resolvePerBrowserOption(entry.options.runAt, config.browser),
         // @ts-expect-error: Chrome accepts this, not typed in webextension-polyfill (https://developer.chrome.com/docs/extensions/reference/scripting/#type-RegisteredContentScript)
-        world: entry.options.world,
+        world: resolvePerBrowserOption(entry.options.world, config.browser),
         js,
         css
       });
@@ -4461,7 +4495,7 @@ async function clean(root = process.cwd()) {
 }
 
 // package.json
-var version2 = "0.7.1-alpha1";
+var version2 = "0.7.2";
 
 // src/core/utils/defineConfig.ts
 function defineConfig(config) {