wxt 0.16.3 → 0.16.4

package/dist/{chunk-4IVGHIAG.js → chunk-AV2C3JTL.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "0.16.3";
+var version = "0.16.4";
 
 // src/core/utils/fs.ts
 import fs from "fs-extra";
@@ -8,11 +8,11 @@ import glob from "fast-glob";
 // src/core/utils/paths.ts
 import systemPath from "node:path";
 import normalize from "normalize-path";
-function normalizePath(path6) {
-  return normalize(path6);
+function normalizePath(path7) {
+  return normalize(path7);
 }
-function unnormalizePath(path6) {
-  return systemPath.normalize(path6);
+function unnormalizePath(path7) {
+  return systemPath.normalize(path7);
 }
 var CSS_EXTENSIONS = ["css", "scss", "sass", "less", "styl", "stylus"];
 var CSS_EXTENSIONS_PATTERN = `+(${CSS_EXTENSIONS.join("|")})`;
@@ -45,6 +45,7 @@ async function buildEntrypoints(groups, spinner) {
     try {
       steps.push(await wxt.config.builder.build(group));
     } catch (err) {
+      wxt.logger.error(err);
       throw Error(`Failed to build ${groupNames.join(", ")}`, { cause: err });
     }
   }
@@ -724,7 +725,7 @@ async function writePathsDeclarationFile(entrypoints) {
       wxt.config.outDir,
       entry.inputPath.endsWith(".html") ? ".html" : ".js"
     )
-  ).concat(await getPublicFiles()).map(normalizePath).map((path6) => `    | "/${path6}"`).sort().join("\n");
+  ).concat(await getPublicFiles()).map(normalizePath).map((path7) => `    | "/${path7}"`).sort().join("\n");
   const template = `// Generated by wxt
 import "wxt/browser";
 
@@ -832,7 +833,7 @@ async function writeMainDeclarationFile(references) {
 }
 async function writeTsConfigFile(mainReference) {
   const dir = wxt.config.wxtDir;
-  const getTsconfigPath = (path6) => normalizePath(relative3(dir, path6));
+  const getTsconfigPath = (path7) => normalizePath(relative3(dir, path7));
   const paths = Object.entries(wxt.config.alias).flatMap(([alias, absolutePath]) => {
     const aliasPath = getTsconfigPath(absolutePath);
     return [
@@ -868,7 +869,7 @@ ${paths}
 
 // src/core/utils/building/resolve-config.ts
 import { loadConfig } from "c12";
-import path4 from "node:path";
+import path5 from "node:path";
 
 // src/core/utils/cache.ts
 import fs5, { ensureDir } from "fs-extra";
@@ -877,14 +878,14 @@ function createFsCache(wxtDir) {
   const getPath = (key) => resolve5(wxtDir, "cache", encodeURIComponent(key));
   return {
     async set(key, value) {
-      const path6 = getPath(key);
-      await ensureDir(dirname2(path6));
-      await writeFileIfDifferent(path6, value);
+      const path7 = getPath(key);
+      await ensureDir(dirname2(path7));
+      await writeFileIfDifferent(path7, value);
     },
     async get(key) {
-      const path6 = getPath(key);
+      const path7 = getPath(key);
       try {
-        return await fs5.readFile(path6, "utf-8");
+        return await fs5.readFile(path7, "utf-8");
       } catch {
         return void 0;
       }
@@ -1018,10 +1019,10 @@ function pointToDevServer(config, server, id, document, querySelector, attr) {
         relative4(config.root, resolvedAbsolutePath)
       );
       if (relativePath.startsWith(".")) {
-        let path6 = normalizePath(resolvedAbsolutePath);
-        if (!path6.startsWith("/"))
-          path6 = "/" + path6;
-        element.setAttribute(attr, `${server.origin}/@fs${path6}`);
+        let path7 = normalizePath(resolvedAbsolutePath);
+        if (!path7.startsWith("/"))
+          path7 = "/" + path7;
+        element.setAttribute(attr, `${server.origin}/@fs${path7}`);
       } else {
         const url = new URL(relativePath, server.origin);
         element.setAttribute(attr, url.href);
@@ -1318,12 +1319,12 @@ function cssEntrypoints(entrypoint, config) {
 
 // src/core/builders/vite/plugins/bundleAnalysis.ts
 import { visualizer } from "rollup-plugin-visualizer";
+import path3 from "node:path";
 var increment = 0;
-function bundleAnalysis() {
+function bundleAnalysis(config) {
   return visualizer({
-    emitFile: true,
     template: "raw-data",
-    filename: `stats-${increment++}.json`
+    filename: path3.resolve(config.outDir, `stats-${increment++}.json`)
   });
 }
 
@@ -1344,7 +1345,7 @@ function globals(config) {
 }
 
 // src/core/builders/vite/plugins/webextensionPolyfillMock.ts
-import path3 from "node:path";
+import path4 from "node:path";
 function webextensionPolyfillMock(config) {
   return {
     name: "wxt:testing-inline-deps",
@@ -1353,7 +1354,7 @@ function webextensionPolyfillMock(config) {
         resolve: {
           alias: {
             // Alias to use a mocked version of the polyfill
-            "webextension-polyfill": path3.resolve(
+            "webextension-polyfill": path4.resolve(
               config.root,
               "node_modules/wxt/dist/virtual/mock-browser"
             )
@@ -1464,7 +1465,7 @@ async function createViteBuilder(inlineConfig, userConfig, wxtConfig) {
       defineImportMeta()
     );
     if (wxtConfig.analysis.enabled) {
-      config.plugins.push(bundleAnalysis());
+      config.plugins.push(bundleAnalysis(wxtConfig));
     }
     return config;
   };
@@ -1665,20 +1666,20 @@ async function resolveConfig(inlineConfig, command, server) {
   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 = path4.resolve(
+  const root = path5.resolve(
     inlineConfig.root ?? userConfig.root ?? process.cwd()
   );
-  const wxtDir = path4.resolve(root, ".wxt");
-  const srcDir = path4.resolve(root, mergedConfig.srcDir ?? root);
-  const entrypointsDir = path4.resolve(
+  const wxtDir = path5.resolve(root, ".wxt");
+  const srcDir = path5.resolve(root, mergedConfig.srcDir ?? root);
+  const entrypointsDir = path5.resolve(
     srcDir,
     mergedConfig.entrypointsDir ?? "entrypoints"
   );
   const filterEntrypoints = !!mergedConfig.filterEntrypoints?.length ? new Set(mergedConfig.filterEntrypoints) : void 0;
-  const publicDir = path4.resolve(srcDir, mergedConfig.publicDir ?? "public");
-  const typesDir = path4.resolve(wxtDir, "types");
-  const outBaseDir = path4.resolve(root, mergedConfig.outDir ?? ".output");
-  const outDir = path4.resolve(outBaseDir, `${browser}-mv${manifestVersion}`);
+  const publicDir = path5.resolve(srcDir, mergedConfig.publicDir ?? "public");
+  const typesDir = path5.resolve(wxtDir, "types");
+  const outBaseDir = path5.resolve(root, mergedConfig.outDir ?? ".output");
+  const outDir = path5.resolve(outBaseDir, `${browser}-mv${manifestVersion}`);
   const reloadCommand = mergedConfig.dev?.reloadCommand ?? "Alt+R";
   const runnerConfig = await loadConfig({
     name: "web-ext",
@@ -1695,7 +1696,7 @@ async function resolveConfig(inlineConfig, command, server) {
       "~": srcDir,
       "@@": root,
       "~~": root
-    }).map(([key, value]) => [key, path4.resolve(root, value)])
+    }).map(([key, value]) => [key, path5.resolve(root, value)])
   );
   const finalConfig = {
     browser,
@@ -1725,7 +1726,11 @@ async function resolveConfig(inlineConfig, command, server) {
     },
     analysis: {
       enabled: mergedConfig.analysis?.enabled ?? false,
-      template: mergedConfig.analysis?.template ?? "treemap"
+      template: mergedConfig.analysis?.template ?? "treemap",
+      outputFile: path5.resolve(
+        root,
+        mergedConfig.analysis?.outputFile ?? "stats.html"
+      )
     },
     userConfigMetadata: userConfigMetadata ?? {},
     alias,
@@ -1795,8 +1800,8 @@ function mergeInlineConfig(inlineConfig, userConfig) {
     outDir: inlineConfig.outDir ?? userConfig.outDir,
     zip,
     analysis: {
-      enabled: inlineConfig.analysis?.enabled ?? userConfig.analysis?.enabled,
-      template: inlineConfig.analysis?.template ?? userConfig.analysis?.template
+      ...userConfig.analysis,
+      ...inlineConfig.analysis
     },
     alias: {
       ...userConfig.alias,
@@ -1903,16 +1908,16 @@ ${noImports}`;
 // src/core/utils/building/import-entrypoint.ts
 import { transformSync } from "esbuild";
 import { fileURLToPath } from "node:url";
-async function importEntrypointFile(path6) {
-  wxt.logger.debug("Loading file metadata:", path6);
-  const normalPath = normalizePath(path6);
+async function importEntrypointFile(path7) {
+  wxt.logger.debug("Loading file metadata:", path7);
+  const normalPath = normalizePath(path7);
   const unimport2 = createUnimport3({
     ...getUnimportOptions(wxt.config),
     // Only allow specific imports, not all from the project
     dirs: []
   });
   await unimport2.init();
-  const text = await fs8.readFile(path6, "utf-8");
+  const text = await fs8.readFile(path7, "utf-8");
   const textNoImports = removeProjectImportStatements(text);
   const { code } = await unimport2.injectImports(textNoImports);
   wxt.logger.debug(
@@ -1955,10 +1960,10 @@ async function importEntrypointFile(path6) {
     }
   );
   try {
-    const res = await jiti(path6);
+    const res = await jiti(path7);
     return res.default;
   } catch (err) {
-    const filePath = relative5(wxt.config.root, path6);
+    const filePath = relative5(wxt.config.root, path7);
     if (err instanceof ReferenceError) {
       const variableName = err.message.replace(" is not defined", "");
       throw Error(
@@ -1988,7 +1993,7 @@ import fs12 from "fs-extra";
 import { resolve as resolve10 } from "path";
 
 // src/core/utils/log/printFileList.ts
-import path5 from "node:path";
+import path6 from "node:path";
 import pc3 from "picocolors";
 import fs9 from "fs-extra";
 import { filesize } from "filesize";
@@ -2026,8 +2031,8 @@ async function printFileList(log, header, baseDir, files) {
   const fileRows = await Promise.all(
     files.map(async (file, i) => {
       const parts = [
-        path5.relative(process.cwd(), baseDir) + path5.sep,
-        path5.relative(baseDir, file)
+        path6.relative(process.cwd(), baseDir) + path6.sep,
+        path6.relative(baseDir, file)
       ];
       const prefix = i === files.length - 1 ? "  \u2514\u2500" : "  \u251C\u2500";
       const color = getChunkColor(file);
@@ -2219,7 +2224,6 @@ async function getPackageJson() {
 }
 
 // src/core/utils/manifest.ts
-import { produce } from "immer";
 import defu3 from "defu";
 async function writeManifest(manifest, output) {
   const str = wxt.config.mode === "production" ? JSON.stringify(manifest) : JSON.stringify(manifest, null, 2);
@@ -2250,7 +2254,7 @@ async function generateManifest(entrypoints, buildOutput) {
     icons: discoverIcons(buildOutput)
   };
   const userManifest = wxt.config.manifest;
-  const manifest = defu3(
+  let manifest = defu3(
     userManifest,
     baseManifest
   );
@@ -2277,19 +2281,24 @@ async function generateManifest(entrypoints, buildOutput) {
     addDevModeCsp(manifest);
   if (wxt.config.command === "serve")
     addDevModePermissions(manifest);
-  const finalManifest = produce(manifest, wxt.config.transformManifest);
-  await wxt.hooks.callHook("build:manifestGenerated", wxt, finalManifest);
-  if (finalManifest.name == null)
+  wxt.config.transformManifest(manifest);
+  await wxt.hooks.callHook("build:manifestGenerated", wxt, manifest);
+  if (wxt.config.manifestVersion === 2)
+    convertWebAccessibleResourcesToMv2(manifest);
+  if (wxt.config.manifestVersion === 3) {
+    validateMv3WebAccessbileResources(manifest);
+  }
+  if (manifest.name == null)
     throw Error(
       "Manifest 'name' is missing. Either:\n1. Set the name in your <rootDir>/package.json\n2. Set a name via the manifest option in your wxt.config.ts"
     );
-  if (finalManifest.version == null) {
+  if (manifest.version == null) {
     throw Error(
       "Manifest 'version' is missing. Either:\n1. Add a version in your <rootDir>/package.json\n2. Pass the version via the manifest option in your wxt.config.ts"
     );
   }
   return {
-    manifest: finalManifest,
+    manifest,
     warnings
   };
 }
@@ -2592,17 +2601,13 @@ function getContentScriptCssWebAccessibleResources(contentScripts, contentScript
     const cssFile = contentScriptCssMap[script.name];
     if (cssFile == null)
       return;
-    if (wxt.config.manifestVersion === 2) {
-      resources.push(cssFile);
-    } else {
-      resources.push({
-        resources: [cssFile],
-        matches: resolvePerBrowserOption(
-          script.options.matches,
-          wxt.config.browser
-        ).map((matchPattern) => stripPathFromMatchPattern(matchPattern))
-      });
-    }
+    resources.push({
+      resources: [cssFile],
+      matches: resolvePerBrowserOption(
+        script.options.matches,
+        wxt.config.browser
+      ).map((matchPattern) => stripPathFromMatchPattern(matchPattern))
+    });
   });
   return resources;
 }
@@ -2637,6 +2642,33 @@ function stripPathFromMatchPattern(pattern) {
   const startOfPath = pattern.indexOf("/", protocolSepIndex + 3);
   return pattern.substring(0, startOfPath) + "/*";
 }
+function convertWebAccessibleResourcesToMv2(manifest) {
+  if (manifest.web_accessible_resources == null)
+    return;
+  manifest.web_accessible_resources = Array.from(
+    new Set(
+      manifest.web_accessible_resources.flatMap((item) => {
+        if (typeof item === "string")
+          return item;
+        return item.resources;
+      })
+    )
+  );
+}
+function validateMv3WebAccessbileResources(manifest) {
+  if (manifest.web_accessible_resources == null)
+    return;
+  const stringResources = manifest.web_accessible_resources.filter(
+    (item) => typeof item === "string"
+  );
+  if (stringResources.length > 0) {
+    throw Error(
+      `Non-MV3 web_accessible_resources detected: ${JSON.stringify(
+        stringResources
+      )}. When manually defining web_accessible_resources, define them as MV3 objects ({ matches: [...], resources: [...] }), and WXT will automatically convert them to MV2 when necessary.`
+    );
+  }
+}
 
 // src/core/utils/building/rebuild.ts
 async function rebuild(allEntrypoints, entrypointGroups, existingOutput = {
@@ -2792,9 +2824,10 @@ async function internalBuild() {
   }
   if (wxt.config.analysis.enabled) {
     await combineAnalysisStats();
+    const statsPath = relative6(wxt.config.root, wxt.config.analysis.outputFile);
     wxt.logger.info(
       `Analysis complete:
-  ${pc5.gray("\u2514\u2500")} ${pc5.yellow("stats.html")}`
+  ${pc5.gray("\u2514\u2500")} ${pc5.yellow(statsPath)}`
     );
   }
   return output;
@@ -2807,9 +2840,16 @@ async function combineAnalysisStats() {
   const absolutePaths = unixFiles.map(unnormalizePath);
   await exec(
     "rollup-plugin-visualizer",
-    [...absolutePaths, "--template", wxt.config.analysis.template],
+    [
+      ...absolutePaths,
+      "--template",
+      wxt.config.analysis.template,
+      "--filename",
+      wxt.config.analysis.outputFile
+    ],
     { cwd: wxt.config.root, stdio: "inherit" }
   );
+  await Promise.all(absolutePaths.map((statsFile) => fs12.remove(statsFile)));
 }
 function printValidationResults({
   errorCount,