wxt 0.19.29 → 0.20.0-beta2

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

@@ -1,11 +1,12 @@
-import type { Manifest, Scripting } from 'wxt/browser';
+import type { Browser } from '@wxt-dev/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<Browser.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/manifest.d.ts

@@ -1,14 +1,14 @@
-import type { Manifest } from 'wxt/browser';
 import { Entrypoint, BuildOutput, ContentScriptEntrypoint } from '../../types';
+import type { Browser } from '@wxt-dev/browser';
 /**
  * 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: Browser.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: Browser.runtime.Manifest;
     warnings: any[][];
 }>;
 /**
@@ -37,8 +37,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: Browser.runtime.Manifest): void;

package/dist/core/utils/manifest.mjs

@@ -47,10 +47,7 @@ export async function generateManifest(allEntrypoints, buildOutput) {
       "`manifest.manifest_version` config was set, but ignored. To change the target manifest version, use the `manifestVersion` option or the `--mv2`/`--mv3` CLI flags.\nSee https://wxt.dev/guide/essentials/target-different-browsers.html#target-a-manifest-version"
     );
   }
-  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."
@@ -76,7 +73,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);
@@ -226,6 +222,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 @wxt-dev/browser, 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
@@ -401,7 +398,7 @@ export function getContentScriptCssWebAccessibleResources(contentScripts, conten
       resources: [cssFile],
       matches: script.options.matches?.map(
         (matchPattern) => stripPathFromMatchPattern(matchPattern)
-      )
+      ) ?? []
     });
   });
   return resources;
@@ -461,7 +458,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}`;
-}