wxt 0.17.4 → 0.17.6

package/dist/{chunk-E5MGUY6P.js → chunk-3ZE2CHPV.js}

@@ -1,18 +1,18 @@
 import {
   __require
-} from "./chunk-P57PW2II.js";
+} from "./chunk-VBXJIVYU.js";
 
 // package.json
-var version = "0.17.4";
+var version = "0.17.6";
 
 // 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("|")})`;
@@ -733,7 +733,7 @@ async function writePathsDeclarationFile(entrypoints) {
       wxt.config.outDir,
       isHtmlEntrypoint(entry) ? ".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";
 
@@ -841,7 +841,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 [
@@ -886,14 +886,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;
       }
@@ -1027,10 +1027,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);
@@ -1674,6 +1674,7 @@ function isModuleInstalled(name) {
 }
 
 // src/core/utils/building/resolve-config.ts
+import fs9 from "fs-extra";
 async function resolveConfig(inlineConfig, command, server) {
   let userConfig = {};
   let userConfigMetadata;
@@ -1709,8 +1710,14 @@ async function resolveConfig(inlineConfig, command, server) {
     srcDir,
     mergedConfig.entrypointsDir ?? "entrypoints"
   );
+  if (await isDirMissing(entrypointsDir)) {
+    logMissingDir(logger, "Entrypoints", entrypointsDir);
+  }
   const filterEntrypoints = !!mergedConfig.filterEntrypoints?.length ? new Set(mergedConfig.filterEntrypoints) : void 0;
   const publicDir = path5.resolve(srcDir, mergedConfig.publicDir ?? "public");
+  if (await isDirMissing(publicDir)) {
+    logMissingDir(logger, "Public", publicDir);
+  }
   const typesDir = path5.resolve(wxtDir, "types");
   const outBaseDir = path5.resolve(root, mergedConfig.outDir ?? ".output");
   const outDir = path5.resolve(outBaseDir, `${browser}-mv${manifestVersion}`);
@@ -1862,6 +1869,7 @@ function mergeInlineConfig(inlineConfig, userConfig) {
   };
 }
 function resolveInternalZipConfig(root, mergedConfig) {
+  const downloadedPackagesDir = path5.resolve(root, ".wxt/local_modules");
   return {
     name: void 0,
     sourcesTemplate: "{{name}}-{{version}}-sources.zip",
@@ -1880,7 +1888,9 @@ function resolveInternalZipConfig(root, mergedConfig) {
       "**/*.+(test|spec).?(c|m)+(j|t)s?(x)",
       // From user
       ...mergedConfig.zip?.excludeSources ?? []
-    ]
+    ],
+    downloadPackages: mergedConfig.zip?.downloadPackages ?? [],
+    downloadedPackagesDir
   };
 }
 async function getUnimportOptions(wxtDir, logger, config) {
@@ -1925,6 +1935,16 @@ async function resolveWxtModuleDir() {
   const requireResolve = __require?.resolve ?? (await import("node:module")).default.createRequire(import.meta.url).resolve;
   return path5.resolve(requireResolve("wxt"), "../..");
 }
+async function isDirMissing(dir) {
+  return !await fs9.exists(dir);
+}
+function logMissingDir(logger, name, expected) {
+  logger.warn(
+    `${name} directory not found: ./${normalizePath(
+      path5.relative(process.cwd(), expected)
+    )}`
+  );
+}
 
 // src/core/utils/building/group-entrypoints.ts
 function groupEntrypoints(entrypoints) {
@@ -1968,7 +1988,7 @@ var ENTRY_TYPE_TO_GROUP_MAP = {
 // src/core/utils/building/import-entrypoint.ts
 import createJITI from "jiti";
 import { createUnimport as createUnimport3 } from "unimport";
-import fs9 from "fs-extra";
+import fs10 from "fs-extra";
 import { relative as relative5, resolve as resolve10 } from "node:path";
 
 // src/core/utils/strings.ts
@@ -1991,16 +2011,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({
     ...wxt.config.imports,
     // Only allow specific imports, not all from the project
     dirs: []
   });
   await unimport2.init();
-  const text = await fs9.readFile(path7, "utf-8");
+  const text = await fs10.readFile(path8, "utf-8");
   const textNoImports = removeProjectImportStatements(text);
   const { code } = await unimport2.injectImports(textNoImports);
   wxt.logger.debug(
@@ -2043,10 +2063,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(
@@ -2075,7 +2095,7 @@ function getEsbuildOptions(opts) {
 
 // src/core/utils/building/internal-build.ts
 import pc5 from "picocolors";
-import fs12 from "fs-extra";
+import fs13 from "fs-extra";
 
 // src/core/utils/log/printBuildSummary.ts
 import { resolve as resolve11 } from "path";
@@ -2083,7 +2103,7 @@ import { resolve as resolve11 } from "path";
 // src/core/utils/log/printFileList.ts
 import path6 from "node:path";
 import pc3 from "picocolors";
-import fs10 from "fs-extra";
+import fs11 from "fs-extra";
 import { filesize } from "filesize";
 
 // src/core/utils/log/printTable.ts
@@ -2124,7 +2144,7 @@ async function printFileList(log, header, baseDir, files) {
       ];
       const prefix = i === files.length - 1 ? "  \u2514\u2500" : "  \u251C\u2500";
       const color = getChunkColor(file);
-      const stats = await fs10.lstat(file);
+      const stats = await fs11.lstat(file);
       totalSize += stats.size;
       const size = String(filesize(stats.size));
       return [
@@ -2192,7 +2212,7 @@ import { consola as consola2 } from "consola";
 import glob3 from "fast-glob";
 
 // src/core/utils/manifest.ts
-import fs11 from "fs-extra";
+import fs12 from "fs-extra";
 import { resolve as resolve12 } from "path";
 
 // src/core/utils/content-security-policy.ts
@@ -2303,7 +2323,7 @@ function mapWxtOptionsToRegisteredContentScript(options, js, css) {
 import defu2 from "defu";
 async function writeManifest(manifest, output) {
   const str = wxt.config.mode === "production" ? JSON.stringify(manifest) : JSON.stringify(manifest, null, 2);
-  await fs11.ensureDir(wxt.config.outDir);
+  await fs12.ensureDir(wxt.config.outDir);
   await writeFileIfDifferent(resolve12(wxt.config.outDir, "manifest.json"), str);
   output.publicAssets.unshift({
     type: "asset",
@@ -2359,11 +2379,14 @@ async function generateManifest(entrypoints, buildOutput) {
     addDevModePermissions(manifest);
   wxt.config.transformManifest(manifest);
   await wxt.hooks.callHook("build:manifestGenerated", wxt, manifest);
-  if (wxt.config.manifestVersion === 2)
+  if (wxt.config.manifestVersion === 2) {
     convertWebAccessibleResourcesToMv2(manifest);
+    convertActionToMv2(manifest);
+  }
   if (wxt.config.manifestVersion === 3) {
     validateMv3WebAccessbileResources(manifest);
   }
+  stripKeys(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"
@@ -2739,6 +2762,11 @@ function convertWebAccessibleResourcesToMv2(manifest) {
     )
   );
 }
+function convertActionToMv2(manifest) {
+  if (manifest.action == null || manifest.browser_action != null || manifest.page_action != null)
+    return;
+  manifest.browser_action = manifest.action;
+}
 function validateMv3WebAccessbileResources(manifest) {
   if (manifest.web_accessible_resources == null)
     return;
@@ -2753,6 +2781,46 @@ function validateMv3WebAccessbileResources(manifest) {
     );
   }
 }
+function stripKeys(manifest) {
+  let keysToRemove = [];
+  if (wxt.config.manifestVersion === 2) {
+    keysToRemove.push(...mv3OnlyKeys);
+    if (wxt.config.browser === "firefox")
+      keysToRemove.push(...firefoxMv3OnlyKeys);
+  } else {
+    keysToRemove.push(...mv2OnlyKeys);
+  }
+  keysToRemove.forEach((key) => {
+    delete manifest[key];
+  });
+}
+var mv2OnlyKeys = [
+  "page_action",
+  "browser_action",
+  "automation",
+  "content_capabilities",
+  "converted_from_user_script",
+  "current_locale",
+  "differential_fingerprint",
+  "event_rules",
+  "file_browser_handlers",
+  "file_system_provider_capabilities",
+  "input_components",
+  "nacl_modules",
+  "natively_connectable",
+  "offline_enabled",
+  "platforms",
+  "replacement_web_app",
+  "system_indicator",
+  "user_scripts"
+];
+var mv3OnlyKeys = [
+  "action",
+  "export",
+  "optional_host_permissions",
+  "side_panel"
+];
+var firefoxMv3OnlyKeys = ["host_permissions"];
 
 // src/core/utils/building/rebuild.ts
 async function rebuild(allEntrypoints, entrypointGroups, existingOutput = {
@@ -2867,8 +2935,8 @@ async function internalBuild() {
     )}`
   );
   const startTime = Date.now();
-  await fs12.rm(wxt.config.outDir, { recursive: true, force: true });
-  await fs12.ensureDir(wxt.config.outDir);
+  await fs13.rm(wxt.config.outDir, { recursive: true, force: true });
+  await fs13.ensureDir(wxt.config.outDir);
   const entrypoints = await findEntrypoints();
   wxt.logger.debug("Detected entrypoints:", entrypoints);
   const validationResults = validateEntrypoints(entrypoints);
@@ -2914,7 +2982,7 @@ async function combineAnalysisStats() {
     filename: wxt.config.analysis.outputFile
   });
   if (!wxt.config.analysis.keepArtifacts) {
-    await Promise.all(absolutePaths.map((statsFile) => fs12.remove(statsFile)));
+    await Promise.all(absolutePaths.map((statsFile) => fs13.remove(statsFile)));
   }
 }
 function printValidationResults({
@@ -2946,10 +3014,218 @@ function printValidationResults({
 
 // src/core/wxt.ts
 import { createHooks } from "hookable";
+
+// src/core/package-managers/index.ts
+import {
+  detectPackageManager,
+  addDependency,
+  addDevDependency,
+  ensureDependencyInstalled,
+  installDependencies,
+  removeDependency
+} from "nypm";
+
+// src/core/package-managers/npm.ts
+import path7 from "node:path";
+import { ensureDir as ensureDir3 } from "fs-extra";
+var npm = {
+  overridesKey: "overrides",
+  async downloadDependency(id, downloadDir) {
+    await ensureDir3(downloadDir);
+    const { execa } = await import("./execa-4F7CCWCA.js");
+    const res = await execa("npm", ["pack", id, "--json"], {
+      cwd: downloadDir
+    });
+    const packed = JSON.parse(res.stdout);
+    return path7.resolve(downloadDir, packed[0].filename);
+  },
+  async listDependencies(options) {
+    const args = ["ls", "--json"];
+    if (options?.all) {
+      args.push("--depth", "Infinity");
+    }
+    const { execa } = await import("./execa-4F7CCWCA.js");
+    const res = await execa("npm", args, { cwd: options?.cwd });
+    const project = JSON.parse(res.stdout);
+    return flattenNpmListOutput([project]);
+  }
+};
+function flattenNpmListOutput(projects) {
+  const queue = projects.flatMap(
+    (project) => {
+      const acc = [];
+      if (project.dependencies)
+        acc.push(project.dependencies);
+      if (project.devDependencies)
+        acc.push(project.devDependencies);
+      return acc;
+    }
+  );
+  const dependencies = [];
+  while (queue.length > 0) {
+    Object.entries(queue.pop()).forEach(([name, meta]) => {
+      dependencies.push({
+        name,
+        version: meta.version
+      });
+      if (meta.dependencies)
+        queue.push(meta.dependencies);
+      if (meta.devDependencies)
+        queue.push(meta.devDependencies);
+    });
+  }
+  return dedupeDependencies(dependencies);
+}
+function dedupeDependencies(dependencies) {
+  const hashes = /* @__PURE__ */ new Set();
+  return dependencies.filter((dep) => {
+    const hash = `${dep.name}@${dep.version}`;
+    if (hashes.has(hash)) {
+      return false;
+    } else {
+      hashes.add(hash);
+      return true;
+    }
+  });
+}
+
+// src/core/package-managers/bun.ts
+var bun = {
+  overridesKey: "overrides",
+  // But also supports "resolutions"
+  downloadDependency(...args) {
+    return npm.downloadDependency(...args);
+  },
+  async listDependencies(options) {
+    const args = ["pm", "ls"];
+    if (options?.all) {
+      args.push("--all");
+    }
+    const { execa } = await import("./execa-4F7CCWCA.js");
+    const res = await execa("bun", args, { cwd: options?.cwd });
+    return dedupeDependencies(
+      res.stdout.split("\n").slice(1).map((line) => line.trim()).map((line) => /.* (@?\S+)@(\S+)$/.exec(line)).filter((match) => !!match).map(([_, name, version2]) => ({ name, version: version2 }))
+    );
+  }
+};
+
+// src/core/package-managers/yarn.ts
+var yarn = {
+  overridesKey: "resolutions",
+  downloadDependency(...args) {
+    return npm.downloadDependency(...args);
+  },
+  async listDependencies(options) {
+    const args = ["list", "--json"];
+    if (options?.all) {
+      args.push("--depth", "Infinity");
+    }
+    const { execa } = await import("./execa-4F7CCWCA.js");
+    const res = await execa("yarn", args, { cwd: options?.cwd });
+    const tree = res.stdout.split("\n").map((line) => JSON.parse(line)).find((line) => line.type === "tree")?.data;
+    if (tree == null)
+      throw Error("'yarn list --json' did not output a tree");
+    const queue = [...tree.trees];
+    const dependencies = [];
+    while (queue.length > 0) {
+      const { name: treeName, children } = queue.pop();
+      const match = /(@?\S+)@(\S+)$/.exec(treeName);
+      if (match) {
+        const [_, name, version2] = match;
+        dependencies.push({ name, version: version2 });
+      }
+      if (children != null) {
+        queue.push(...children);
+      }
+    }
+    return dedupeDependencies(dependencies);
+  }
+};
+
+// src/core/package-managers/pnpm.ts
+var pnpm = {
+  overridesKey: "resolutions",
+  // "pnpm.overrides" has a higher priority, but I don't want to deal with nesting
+  downloadDependency(...args) {
+    return npm.downloadDependency(...args);
+  },
+  async listDependencies(options) {
+    const args = ["ls", "-r", "--json"];
+    if (options?.all) {
+      args.push("--depth", "Infinity");
+    }
+    if (typeof process !== "undefined" && process.env.WXT_PNPM_IGNORE_WORKSPACE === "true") {
+      args.push("--ignore-workspace");
+    }
+    const { execa } = await import("./execa-4F7CCWCA.js");
+    const res = await execa("pnpm", args, { cwd: options?.cwd });
+    const projects = JSON.parse(res.stdout);
+    return flattenNpmListOutput(projects);
+  }
+};
+
+// src/core/package-managers/index.ts
+async function createWxtPackageManager(root) {
+  const pm = await detectPackageManager(root, {
+    includeParentDirs: true
+  });
+  const requirePm = (cb) => {
+    if (pm == null)
+      throw Error("Could not detect package manager");
+    return cb(pm);
+  };
+  return {
+    get name() {
+      return requirePm((pm2) => pm2.name);
+    },
+    get command() {
+      return requirePm((pm2) => pm2.command);
+    },
+    get version() {
+      return requirePm((pm2) => pm2.version);
+    },
+    get majorVersion() {
+      return requirePm((pm2) => pm2.majorVersion);
+    },
+    get lockFile() {
+      return requirePm((pm2) => pm2.lockFile);
+    },
+    get files() {
+      return requirePm((pm2) => pm2.files);
+    },
+    addDependency,
+    addDevDependency,
+    ensureDependencyInstalled,
+    installDependencies,
+    removeDependency,
+    get overridesKey() {
+      return requirePm((pm2) => packageManagers[pm2.name].overridesKey);
+    },
+    downloadDependency(...args) {
+      return requirePm(
+        (pm2) => packageManagers[pm2.name].downloadDependency(...args)
+      );
+    },
+    listDependencies(...args) {
+      return requirePm(
+        (pm2) => packageManagers[pm2.name].listDependencies(...args)
+      );
+    }
+  };
+}
+var packageManagers = {
+  npm,
+  pnpm,
+  bun,
+  yarn
+};
+
+// src/core/wxt.ts
 var wxt;
 async function registerWxt(command, inlineConfig = {}, server) {
   const config = await resolveConfig(inlineConfig, command, server);
   const hooks = createHooks();
+  const pm = await createWxtPackageManager(config.root);
   wxt = {
     config,
     hooks,
@@ -2958,13 +3234,15 @@ async function registerWxt(command, inlineConfig = {}, server) {
     },
     async reloadConfig() {
       wxt.config = await resolveConfig(inlineConfig, command, server);
-    }
+    },
+    pm
   };
   wxt.hooks.addHooks(config.hooks);
   await wxt.hooks.callHook("ready", wxt);
 }
 
 export {
+  normalizePath,
   unnormalizePath,
   wxt,
   registerWxt,

package/dist/chunk-VBXJIVYU.js

@@ -0,0 +1,38 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined")
+    return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+var __commonJS = (cb, mod) => function __require2() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+
+export {
+  __require,
+  __commonJS,
+  __toESM
+};

package/dist/cli.d.ts

@@ -0,0 +1,2 @@
+
+export {  }