wxt 0.16.3 → 0.16.5

package/dist/cli.js

@@ -11,11 +11,11 @@ import glob from "fast-glob";
 // src/core/utils/paths.ts
 import systemPath from "node:path";
 import normalize from "normalize-path";
-function normalizePath(path7) {
-  return normalize(path7);
+function normalizePath(path8) {
+  return normalize(path8);
 }
-function unnormalizePath(path7) {
-  return systemPath.normalize(path7);
+function unnormalizePath(path8) {
+  return systemPath.normalize(path8);
 }
 var CSS_EXTENSIONS = ["css", "scss", "sass", "less", "styl", "stylus"];
 var CSS_EXTENSIONS_PATTERN = `+(${CSS_EXTENSIONS.join("|")})`;
@@ -68,6 +68,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 });
     }
   }
@@ -747,7 +748,7 @@ async function writePathsDeclarationFile(entrypoints) {
       wxt.config.outDir,
       entry.inputPath.endsWith(".html") ? ".html" : ".js"
     )
-  ).concat(await getPublicFiles()).map(normalizePath).map((path7) => `    | "/${path7}"`).sort().join("\n");
+  ).concat(await getPublicFiles()).map(normalizePath).map((path8) => `    | "/${path8}"`).sort().join("\n");
   const template = `// Generated by wxt
 import "wxt/browser";
 
@@ -855,7 +856,7 @@ async function writeMainDeclarationFile(references) {
 }
 async function writeTsConfigFile(mainReference) {
   const dir = wxt.config.wxtDir;
-  const getTsconfigPath = (path7) => normalizePath(relative3(dir, path7));
+  const getTsconfigPath = (path8) => normalizePath(relative3(dir, path8));
   const paths = Object.entries(wxt.config.alias).flatMap(([alias, absolutePath]) => {
     const aliasPath = getTsconfigPath(absolutePath);
     return [
@@ -891,7 +892,7 @@ ${paths}
 
 // src/core/utils/building/resolve-config.ts
 import { loadConfig } from "c12";
-import path3 from "node:path";
+import path4 from "node:path";
 
 // src/core/utils/cache.ts
 import fs5, { ensureDir } from "fs-extra";
@@ -900,14 +901,14 @@ function createFsCache(wxtDir) {
   const getPath = (key) => resolve5(wxtDir, "cache", encodeURIComponent(key));
   return {
     async set(key, value) {
-      const path7 = getPath(key);
-      await ensureDir(dirname2(path7));
-      await writeFileIfDifferent(path7, value);
+      const path8 = getPath(key);
+      await ensureDir(dirname2(path8));
+      await writeFileIfDifferent(path8, value);
     },
     async get(key) {
-      const path7 = getPath(key);
+      const path8 = getPath(key);
       try {
-        return await fs5.readFile(path7, "utf-8");
+        return await fs5.readFile(path8, "utf-8");
       } catch {
         return void 0;
       }
@@ -1041,10 +1042,10 @@ function pointToDevServer(config, server, id, document, querySelector, attr) {
         relative4(config.root, resolvedAbsolutePath)
       );
       if (relativePath.startsWith(".")) {
-        let path7 = normalizePath(resolvedAbsolutePath);
-        if (!path7.startsWith("/"))
-          path7 = "/" + path7;
-        element.setAttribute(attr, `${server.origin}/@fs${path7}`);
+        let path8 = normalizePath(resolvedAbsolutePath);
+        if (!path8.startsWith("/"))
+          path8 = "/" + path8;
+        element.setAttribute(attr, `${server.origin}/@fs${path8}`);
       } else {
         const url = new URL(relativePath, server.origin);
         element.setAttribute(attr, url.href);
@@ -1341,12 +1342,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`)
   });
 }
 
@@ -1462,7 +1463,7 @@ async function createViteBuilder(inlineConfig, userConfig, wxtConfig) {
       defineImportMeta()
     );
     if (wxtConfig.analysis.enabled) {
-      config.plugins.push(bundleAnalysis());
+      config.plugins.push(bundleAnalysis(wxtConfig));
     }
     return config;
   };
@@ -1663,20 +1664,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 = path3.resolve(
+  const root = path4.resolve(
     inlineConfig.root ?? userConfig.root ?? process.cwd()
   );
-  const wxtDir = path3.resolve(root, ".wxt");
-  const srcDir = path3.resolve(root, mergedConfig.srcDir ?? root);
-  const entrypointsDir = path3.resolve(
+  const wxtDir = path4.resolve(root, ".wxt");
+  const srcDir = path4.resolve(root, mergedConfig.srcDir ?? root);
+  const entrypointsDir = path4.resolve(
     srcDir,
     mergedConfig.entrypointsDir ?? "entrypoints"
   );
   const filterEntrypoints = !!mergedConfig.filterEntrypoints?.length ? new Set(mergedConfig.filterEntrypoints) : void 0;
-  const publicDir = path3.resolve(srcDir, mergedConfig.publicDir ?? "public");
-  const typesDir = path3.resolve(wxtDir, "types");
-  const outBaseDir = path3.resolve(root, mergedConfig.outDir ?? ".output");
-  const outDir = path3.resolve(outBaseDir, `${browser}-mv${manifestVersion}`);
+  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 reloadCommand = mergedConfig.dev?.reloadCommand ?? "Alt+R";
   const runnerConfig = await loadConfig({
     name: "web-ext",
@@ -1693,7 +1694,7 @@ async function resolveConfig(inlineConfig, command, server) {
       "~": srcDir,
       "@@": root,
       "~~": root
-    }).map(([key, value]) => [key, path3.resolve(root, value)])
+    }).map(([key, value]) => [key, path4.resolve(root, value)])
   );
   const finalConfig = {
     browser,
@@ -1723,7 +1724,11 @@ async function resolveConfig(inlineConfig, command, server) {
     },
     analysis: {
       enabled: mergedConfig.analysis?.enabled ?? false,
-      template: mergedConfig.analysis?.template ?? "treemap"
+      template: mergedConfig.analysis?.template ?? "treemap",
+      outputFile: path4.resolve(
+        root,
+        mergedConfig.analysis?.outputFile ?? "stats.html"
+      )
     },
     userConfigMetadata: userConfigMetadata ?? {},
     alias,
@@ -1793,8 +1798,8 @@ function mergeInlineConfig(inlineConfig, userConfig) {
     outDir: inlineConfig.outDir ?? userConfig.outDir,
     zip: zip2,
     analysis: {
-      enabled: inlineConfig.analysis?.enabled ?? userConfig.analysis?.enabled,
-      template: inlineConfig.analysis?.template ?? userConfig.analysis?.template
+      ...userConfig.analysis,
+      ...inlineConfig.analysis
     },
     alias: {
       ...userConfig.alias,
@@ -1901,16 +1906,16 @@ ${noImports}`;
 // src/core/utils/building/import-entrypoint.ts
 import { transformSync } from "esbuild";
 import { fileURLToPath } from "node:url";
-async function importEntrypointFile(path7) {
-  wxt.logger.debug("Loading file metadata:", path7);
-  const normalPath = normalizePath(path7);
+async function importEntrypointFile(path8) {
+  wxt.logger.debug("Loading file metadata:", path8);
+  const normalPath = normalizePath(path8);
   const unimport2 = createUnimport3({
     ...getUnimportOptions(wxt.config),
     // Only allow specific imports, not all from the project
     dirs: []
   });
   await unimport2.init();
-  const text = await fs8.readFile(path7, "utf-8");
+  const text = await fs8.readFile(path8, "utf-8");
   const textNoImports = removeProjectImportStatements(text);
   const { code } = await unimport2.injectImports(textNoImports);
   wxt.logger.debug(
@@ -1953,10 +1958,10 @@ async function importEntrypointFile(path7) {
     }
   );
   try {
-    const res = await jiti(path7);
+    const res = await jiti(path8);
     return res.default;
   } catch (err) {
-    const filePath = relative5(wxt.config.root, path7);
+    const filePath = relative5(wxt.config.root, path8);
     if (err instanceof ReferenceError) {
       const variableName = err.message.replace(" is not defined", "");
       throw Error(
@@ -1986,7 +1991,7 @@ import fs12 from "fs-extra";
 import { resolve as resolve10 } from "path";
 
 // src/core/utils/log/printFileList.ts
-import path4 from "node:path";
+import path5 from "node:path";
 import pc3 from "picocolors";
 import fs9 from "fs-extra";
 import { filesize } from "filesize";
@@ -2024,8 +2029,8 @@ async function printFileList(log, header, baseDir, files) {
   const fileRows = await Promise.all(
     files.map(async (file, i) => {
       const parts = [
-        path4.relative(process.cwd(), baseDir) + path4.sep,
-        path4.relative(baseDir, file)
+        path5.relative(process.cwd(), baseDir) + path5.sep,
+        path5.relative(baseDir, file)
       ];
       const prefix = i === files.length - 1 ? "  \u2514\u2500" : "  \u251C\u2500";
       const color = getChunkColor(file);
@@ -2093,7 +2098,7 @@ function getChunkSortWeight(filename) {
 import pc4 from "picocolors";
 
 // package.json
-var version = "0.16.3";
+var version = "0.16.5";
 
 // src/core/utils/log/printHeader.ts
 import { consola as consola2 } from "consola";
@@ -2226,7 +2231,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);
@@ -2257,7 +2261,7 @@ async function generateManifest(entrypoints, buildOutput) {
     icons: discoverIcons(buildOutput)
   };
   const userManifest = wxt.config.manifest;
-  const manifest = defu3(
+  let manifest = defu3(
     userManifest,
     baseManifest
   );
@@ -2284,19 +2288,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
   };
 }
@@ -2599,17 +2608,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;
 }
@@ -2644,6 +2649,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 = {
@@ -2799,9 +2831,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;
@@ -2814,9 +2847,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,
@@ -2852,7 +2892,7 @@ async function build(config) {
 }
 
 // src/core/clean.ts
-import path5 from "node:path";
+import path6 from "node:path";
 import glob4 from "fast-glob";
 import fs13 from "fs-extra";
 import { consola as consola4 } from "consola";
@@ -2867,7 +2907,7 @@ async function clean(root = process.cwd()) {
   ];
   consola4.debug("Looking for:", tempDirs.map(pc6.cyan).join(", "));
   const directories = await glob4(tempDirs, {
-    cwd: path5.resolve(root),
+    cwd: path6.resolve(root),
     absolute: true,
     onlyDirectories: true,
     deep: 2
@@ -2878,11 +2918,11 @@ async function clean(root = process.cwd()) {
   }
   consola4.debug(
     "Found:",
-    directories.map((dir) => pc6.cyan(path5.relative(root, dir))).join(", ")
+    directories.map((dir) => pc6.cyan(path6.relative(root, dir))).join(", ")
   );
   for (const directory of directories) {
     await fs13.rm(directory, { force: true, recursive: true });
-    consola4.debug("Deleted " + pc6.cyan(path5.relative(root, directory)));
+    consola4.debug("Deleted " + pc6.cyan(path6.relative(root, directory)));
   }
 }
 
@@ -3081,8 +3121,8 @@ async function createServer(inlineConfig) {
     reloadContentScript(contentScript) {
       server.ws.send("wxt:reload-content-script", contentScript);
     },
-    reloadPage(path7) {
-      server.ws.send("wxt:reload-page", path7);
+    reloadPage(path8) {
+      server.ws.send("wxt:reload-page", path8);
     },
     reloadExtension() {
       server.ws.send("wxt:reload-extension");
@@ -3113,11 +3153,11 @@ async function getPort() {
 function createFileReloader(server) {
   const fileChangedMutex = new Mutex();
   const changeQueue = [];
-  return async (event, path7) => {
+  return async (event, path8) => {
     await wxt.reloadConfig();
-    if (path7.startsWith(wxt.config.outBaseDir))
+    if (path8.startsWith(wxt.config.outBaseDir))
       return;
-    changeQueue.push([event, path7]);
+    changeQueue.push([event, path8]);
     await fileChangedMutex.runExclusive(async () => {
       if (server.currentOutput == null)
         return;
@@ -3207,8 +3247,8 @@ function reloadContentScripts(steps, server) {
 function reloadHtmlPages(groups, server) {
   const htmlEntries = groups.flat().filter((entry) => entry.inputPath.endsWith(".html"));
   htmlEntries.forEach((entry) => {
-    const path7 = getEntrypointBundlePath(entry, wxt.config.outDir, ".html");
-    server.reloadPage(path7);
+    const path8 = getEntrypointBundlePath(entry, wxt.config.outDir, ".html");
+    server.reloadPage(path8);
   });
   return {
     reloadedNames: htmlEntries.map((entry) => entry.name)
@@ -3225,7 +3265,7 @@ import prompts from "prompts";
 import { consola as consola6 } from "consola";
 import { downloadTemplate } from "giget";
 import fs14 from "fs-extra";
-import path6 from "node:path";
+import path7 from "node:path";
 import pc8 from "picocolors";
 async function initialize(options) {
   consola6.info("Initalizing new project");
@@ -3273,7 +3313,7 @@ async function initialize(options) {
   input.template ??= defaultTemplate;
   input.packageManager ??= options.packageManager;
   await cloneProject(input);
-  const cdPath = path6.relative(process.cwd(), path6.resolve(input.directory));
+  const cdPath = path7.relative(process.cwd(), path7.resolve(input.directory));
   console.log();
   consola6.log(
     `\u2728 WXT project created with the ${TEMPLATE_COLORS[input.template.name]?.(input.template.name) ?? input.template.name} template.`
@@ -3317,8 +3357,8 @@ async function cloneProject({
       force: true
     });
     await fs14.move(
-      path6.join(directory, "_gitignore"),
-      path6.join(directory, ".gitignore")
+      path7.join(directory, "_gitignore"),
+      path7.join(directory, ".gitignore")
     ).catch(
       (err) => consola6.warn("Failed to move _gitignore to .gitignore:", err)
     );
@@ -3379,8 +3419,8 @@ async function zip(config) {
     const sourcesZipPath = resolve14(wxt.config.outBaseDir, sourcesZipFilename);
     await zipdir(wxt.config.zip.sourcesRoot, {
       saveTo: sourcesZipPath,
-      filter(path7) {
-        const relativePath = relative11(wxt.config.zip.sourcesRoot, path7);
+      filter(path8) {
+        const relativePath = relative11(wxt.config.zip.sourcesRoot, path8);
         return wxt.config.zip.includeSources.some(
           (pattern) => minimatch2(relativePath, pattern)
         ) || !wxt.config.zip.excludeSources.some(

package/dist/{index-wltPoSyr.d.cts → index-znx-ff-l.d.cts}

@@ -303,6 +303,12 @@ interface InlineConfig {
          * @default "treemap"
          */
         template?: PluginVisualizerOptions['template'];
+        /**
+         * Name of the output HTML file. Relative to the project's root directory.
+         *
+         * @default "stats.html"
+         */
+        outputFile?: string;
     };
     /**
      * Add additional paths to the `.wxt/tsconfig.json`. Use this instead of overwriting the `paths`
@@ -895,6 +901,8 @@ interface ResolvedConfig {
     analysis: {
         enabled: boolean;
         template: NonNullable<PluginVisualizerOptions['template']>;
+        /** Absolute file path */
+        outputFile: string;
     };
     userConfigMetadata: Omit<ResolvedConfig$1<UserConfig>, 'config'>;
     /**

package/dist/{index-wltPoSyr.d.ts → index-znx-ff-l.d.ts}

@@ -303,6 +303,12 @@ interface InlineConfig {
          * @default "treemap"
          */
         template?: PluginVisualizerOptions['template'];
+        /**
+         * Name of the output HTML file. Relative to the project's root directory.
+         *
+         * @default "stats.html"
+         */
+        outputFile?: string;
     };
     /**
      * Add additional paths to the `.wxt/tsconfig.json`. Use this instead of overwriting the `paths`
@@ -895,6 +901,8 @@ interface ResolvedConfig {
     analysis: {
         enabled: boolean;
         template: NonNullable<PluginVisualizerOptions['template']>;
+        /** Absolute file path */
+        outputFile: string;
     };
     userConfigMetadata: Omit<ResolvedConfig$1<UserConfig>, 'config'>;
     /**