wxt 0.7.4 → 0.7.5

package/dist/index.d.cts

@@ -391,6 +391,7 @@ interface PopupEntrypoint extends BaseEntrypoint {
         mv2Key?: 'browser_action' | 'page_action';
         defaultIcon?: Record<string, string>;
         defaultTitle?: string;
+        browserStyle?: boolean;
     } & BaseEntrypointOptions;
 }
 interface OptionsEntrypoint extends BaseEntrypoint {
@@ -453,6 +454,8 @@ interface ContentScriptDefinition extends ExcludableEntrypoint {
      * - `"manual"` - Exclude the CSS from the manifest. You are responsible for manually loading it
      *   onto the page. Use `browser.runtime.getURL("content-scripts/<name>.css")` to get the file's
      *   URL
+     * - `"ui"` - Exclude the CSS from the manifest. CSS will be automatically added to your UI when
+     *   calling `createContentScriptUi`
      *
      * @default "manifest"
      */
@@ -565,7 +568,7 @@ type EntrypointGroup = Entrypoint | Entrypoint[];
  */
 declare function clean(root?: string): Promise<void>;
 
-var version = "0.7.4";
+var version = "0.7.5";
 
 declare function defineConfig(config: UserConfig): UserConfig;
 

package/dist/index.d.ts

@@ -391,6 +391,7 @@ interface PopupEntrypoint extends BaseEntrypoint {
         mv2Key?: 'browser_action' | 'page_action';
         defaultIcon?: Record<string, string>;
         defaultTitle?: string;
+        browserStyle?: boolean;
     } & BaseEntrypointOptions;
 }
 interface OptionsEntrypoint extends BaseEntrypoint {
@@ -453,6 +454,8 @@ interface ContentScriptDefinition extends ExcludableEntrypoint {
      * - `"manual"` - Exclude the CSS from the manifest. You are responsible for manually loading it
      *   onto the page. Use `browser.runtime.getURL("content-scripts/<name>.css")` to get the file's
      *   URL
+     * - `"ui"` - Exclude the CSS from the manifest. CSS will be automatically added to your UI when
+     *   calling `createContentScriptUi`
      *
      * @default "manifest"
      */
@@ -565,7 +568,7 @@ type EntrypointGroup = Entrypoint | Entrypoint[];
  */
 declare function clean(root?: string): Promise<void>;
 
-var version = "0.7.4";
+var version = "0.7.5";
 
 declare function defineConfig(config: UserConfig): UserConfig;
 

package/dist/index.js

@@ -2084,9 +2084,13 @@ async function getPopupEntrypoint(config, path9) {
       );
     }
   }
-  const mv2KeyContent = document.querySelector("meta[name='manifest.type']")?.getAttribute("content");
-  if (mv2KeyContent) {
-    options.mv2Key = mv2KeyContent === "page_action" ? "page_action" : "browser_action";
+  const mv2TypeContent = document.querySelector("meta[name='manifest.type']")?.getAttribute("content");
+  if (mv2TypeContent) {
+    options.mv2Key = mv2TypeContent === "page_action" ? "page_action" : "browser_action";
+  }
+  const browserStyleContent = document.querySelector("meta[name='manifest.browser_style']")?.getAttribute("content");
+  if (browserStyleContent) {
+    options.browserStyle = browserStyleContent === "true";
   }
   return {
     type: "popup",
@@ -2473,18 +2477,23 @@ var ContentSecurityPolicy = class _ContentSecurityPolicy {
 };
 
 // src/core/utils/content-scripts.ts
-function hashContentScriptOptions(options) {
+function hashContentScriptOptions(options, config) {
+  const simplifiedOptions = mapWxtOptionsToContentScript(options, config);
+  Object.keys(simplifiedOptions).forEach((key) => {
+    if (simplifiedOptions[key] == null)
+      delete simplifiedOptions[key];
+  });
   const withDefaults = {
-    excludeGlobs: [],
-    excludeMatches: [],
-    includeGlobs: [],
-    matchAboutBlank: false,
-    matchOriginAsFallback: false,
-    runAt: "document_idle",
-    allFrames: false,
+    exclude_globs: [],
+    exclude_matches: [],
+    include_globs: [],
+    match_about_blank: false,
+    run_at: "document_idle",
+    all_frames: false,
+    // @ts-expect-error - not in type
+    match_origin_as_fallback: false,
     world: "ISOLATED",
-    // TODO: strip undefined fields from options object to improve content script grouping.
-    ...options
+    ...simplifiedOptions
   };
   return JSON.stringify(
     Object.entries(withDefaults).map(([key, value]) => {
@@ -2557,13 +2566,17 @@ async function writeManifest(manifest, output, config) {
 }
 async function generateMainfest(entrypoints, buildOutput, config) {
   const pkg = await getPackageJson(config);
+  const versionName = config.manifest.version_name ?? pkg?.version;
+  const version3 = config.manifest.version ?? simplifyVersion(pkg?.version);
   const baseManifest = {
     manifest_version: config.manifestVersion,
     name: pkg?.name,
     description: pkg?.description,
-    version: pkg?.version && simplifyVersion(pkg.version),
-    // Only add the version name to chromium and if the user hasn't specified a custom version.
-    version_name: config.browser !== "firefox" && !config.manifest.version ? pkg?.version : void 0,
+    version: version3,
+    version_name: (
+      // Firefox doesn't support version_name
+      config.browser === "firefox" || versionName === version3 ? void 0 : versionName
+    ),
     short_name: pkg?.shortName,
     icons: discoverIcons(buildOutput)
   };
@@ -2757,7 +2770,7 @@ function addEntrypoints(manifest, entrypoints, buildOutput, config) {
       );
     } else {
       const hashToEntrypointsMap = contentScripts.reduce((map, script) => {
-        const hash = hashContentScriptOptions(script.options);
+        const hash = hashContentScriptOptions(script.options, config);
         if (map.has(hash))
           map.get(hash)?.push(script);
         else
@@ -4553,7 +4566,7 @@ async function clean(root = process.cwd()) {
 }
 
 // package.json
-var version2 = "0.7.4";
+var version2 = "0.7.5";
 
 // src/core/utils/defineConfig.ts
 function defineConfig(config) {