wxt 0.2.2 → 0.2.4

package/dist/index.cjs

@@ -470,7 +470,27 @@ async function getInternalConfig(config, command) {
     wxtDir,
     typesDir,
     fsCache: createFsCache(wxtDir),
-    manifest
+    manifest,
+    zip: {
+      sourcesTemplate: "{{name}}-{{version}}-sources.zip",
+      artifactTemplate: "{{name}}-{{version}}-{{browser}}.zip",
+      sourcesRoot: root,
+      ...userConfig.zip,
+      ...config.zip,
+      ignoredSources: [
+        "**/node_modules",
+        // WXT files
+        "**/web-ext.config.ts",
+        // Hidden files
+        "**/.*",
+        // Tests
+        "**/__tests__/**",
+        "**/*.+(test|spec).?(c|m)+(j|t)s?(x)",
+        // User config
+        ...userConfig.zip?.ignoredSources ?? [],
+        ...config.zip?.ignoredSources ?? []
+      ]
+    }
   };
   finalConfig.vite.root = root;
   finalConfig.vite.configFile = false;
@@ -598,7 +618,7 @@ function findEffectedSteps(changedFile, currentOutput) {
 // src/index.ts
 var import_async_mutex = require("async-mutex");
 var import_consola2 = require("consola");
-var import_node_path4 = require("path");
+var import_node_path6 = require("path");
 
 // src/core/build/buildEntrypoints.ts
 var vite2 = __toESM(require("vite"), 1);
@@ -890,15 +910,15 @@ async function getOptionsEntrypoint(config, path5) {
   const { document } = (0, import_linkedom2.parseHTML)(content);
   const openInTabContent = document.querySelector("meta[name='manifest.open_in_tab']")?.getAttribute("content");
   if (openInTabContent) {
-    options.openInTab = Boolean(openInTabContent);
+    options.openInTab = openInTabContent === "true";
   }
   const chromeStyleContent = document.querySelector("meta[name='manifest.chrome_style']")?.getAttribute("content");
   if (chromeStyleContent) {
-    options.chromeStyle = Boolean(chromeStyleContent);
+    options.chromeStyle = chromeStyleContent === "true";
   }
   const browserStyleContent = document.querySelector("meta[name='manifest.browser_style']")?.getAttribute("content");
   if (browserStyleContent) {
-    options.browserStyle = Boolean(browserStyleContent);
+    options.browserStyle = browserStyleContent === "true";
   }
   return {
     type: "options",
@@ -1089,7 +1109,7 @@ async function writeTsConfigFile(mainReference, config) {
 }
 
 // src/core/utils/manifest.ts
-var import_fs_extra9 = __toESM(require("fs-extra"), 1);
+var import_fs_extra10 = __toESM(require("fs-extra"), 1);
 var import_path10 = require("path");
 
 // src/core/utils/ContentSecurityPolicy.ts
@@ -1173,11 +1193,26 @@ function mapWxtOptionsToContentScript(options) {
   };
 }
 
+// src/core/utils/package.ts
+var import_node_path4 = require("path");
+var import_fs_extra9 = __toESM(require("fs-extra"), 1);
+async function getPackageJson(config) {
+  const file = (0, import_node_path4.resolve)(config.root, "package.json");
+  try {
+    return await import_fs_extra9.default.readJson(file);
+  } catch (err) {
+    config.logger.debug(
+      `Failed to read package.json at: ${file}. Returning undefined.`
+    );
+    return {};
+  }
+}
+
 // src/core/utils/manifest.ts
 async function writeManifest(manifest, output, config) {
   const str = config.mode === "production" ? JSON.stringify(manifest) : JSON.stringify(manifest, null, 2);
-  await import_fs_extra9.default.ensureDir(config.outDir);
-  await import_fs_extra9.default.writeFile((0, import_path10.resolve)(config.outDir, "manifest.json"), str, "utf-8");
+  await import_fs_extra10.default.ensureDir(config.outDir);
+  await import_fs_extra10.default.writeFile((0, import_path10.resolve)(config.outDir, "manifest.json"), str, "utf-8");
   output.publicAssets.unshift({
     type: "asset",
     fileName: "manifest.json",
@@ -1188,30 +1223,34 @@ async function writeManifest(manifest, output, config) {
 }
 async function generateMainfest(entrypoints, buildOutput, config) {
   const pkg = await getPackageJson(config);
-  if (pkg.version == null)
-    throw Error("package.json does not include a version");
-  if (pkg.name == null)
-    throw Error("package.json does not include a name");
-  if (pkg.description == null)
-    throw Error("package.json does not include a description");
-  const manifest = {
-    manifest_version: config.manifestVersion,
-    name: pkg.name,
-    short_name: pkg.shortName,
-    version: simplifyVersion(pkg.version),
-    version_name: config.browser === "firefox" ? void 0 : pkg.version,
-    ...config.manifest
-  };
+  const manifest = Object.assign(
+    {
+      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,
+      short_name: pkg?.shortName
+    },
+    config.manifest
+  );
   addEntrypoints(manifest, entrypoints, buildOutput, config);
   if (config.command === "serve")
     addDevModeCsp(manifest, config);
   if (config.command === "serve")
     addDevModePermissions(manifest, config);
+  if (manifest.name == null)
+    throw Error(
+      "Manifest 'name' is missing. Either:\n1. Set the name in your <root>/package.json\n2. Set a name via the manifest option in your wxt.config.ts"
+    );
+  if (manifest.version == null) {
+    throw Error(
+      "Manifest 'version' is missing. Either:\n1. Add a version in your <root>/package.json\n2. Pass the version via the manifest option in your wxt.config.ts"
+    );
+  }
   return manifest;
 }
-async function getPackageJson(config) {
-  return await import_fs_extra9.default.readJson((0, import_path10.resolve)(config.root, "package.json"));
-}
 function simplifyVersion(versionName) {
   const version3 = /^((0|[1-9][0-9]{0,8})([.](0|[1-9][0-9]{0,8})){0,3}).*$/.exec(
     versionName
@@ -1455,7 +1494,7 @@ function addHostPermission(manifest, hostPermission) {
 // src/core/build.ts
 var import_picocolors2 = __toESM(require("picocolors"), 1);
 var vite3 = __toESM(require("vite"), 1);
-var import_fs_extra11 = __toESM(require("fs-extra"), 1);
+var import_fs_extra12 = __toESM(require("fs-extra"), 1);
 
 // src/core/utils/groupEntrypoints.ts
 function groupEntrypoints(entrypoints) {
@@ -1503,7 +1542,13 @@ function formatDuration(duration) {
 }
 
 // src/core/log/printBuildSummary.ts
-var import_path11 = __toESM(require("path"), 1);
+var import_path11 = require("path");
+
+// src/core/log/printFileList.ts
+var import_node_path5 = __toESM(require("path"), 1);
+var import_picocolors = __toESM(require("picocolors"), 1);
+var import_fs_extra11 = __toESM(require("fs-extra"), 1);
+var import_filesize = require("filesize");
 
 // src/core/log/printTable.ts
 function printTable(log, rows, gap = 2) {
@@ -1531,10 +1576,42 @@ function printTable(log, rows, gap = 2) {
   log(str);
 }
 
+// src/core/log/printFileList.ts
+async function printFileList(log, baseDir, files) {
+  let totalSize = 0;
+  const fileRows = await Promise.all(
+    files.map(async (file, i) => {
+      const parts = [
+        import_node_path5.default.relative(process.cwd(), baseDir) + import_node_path5.default.sep,
+        import_node_path5.default.relative(baseDir, file)
+      ];
+      const prefix = i === files.length - 1 ? "  \u2514\u2500" : "  \u251C\u2500";
+      const color = getChunkColor(file);
+      const stats = await import_fs_extra11.default.lstat(file);
+      totalSize += stats.size;
+      const size = String((0, import_filesize.filesize)(stats.size));
+      return [
+        `${import_picocolors.default.gray(prefix)} ${import_picocolors.default.dim(parts[0])}${color(parts[1])}`,
+        import_picocolors.default.dim(size)
+      ];
+    })
+  );
+  printTable(log, fileRows);
+  log(`${import_picocolors.default.cyan("\u03A3 Total size:")} ${String((0, import_filesize.filesize)(totalSize))}`);
+}
+var DEFAULT_COLOR = import_picocolors.default.blue;
+var CHUNK_COLORS = {
+  ".js.map": import_picocolors.default.gray,
+  ".html": import_picocolors.default.green,
+  ".css": import_picocolors.default.magenta,
+  ".js": import_picocolors.default.cyan,
+  ".zip": import_picocolors.default.yellow
+};
+function getChunkColor(filename) {
+  return Object.entries(CHUNK_COLORS).find(([key]) => filename.endsWith(key))?.[1] ?? DEFAULT_COLOR;
+}
+
 // src/core/log/printBuildSummary.ts
-var import_picocolors = __toESM(require("picocolors"), 1);
-var import_fs_extra10 = __toESM(require("fs-extra"), 1);
-var import_filesize = require("filesize");
 async function printBuildSummary(output, config) {
   const chunks = [
     ...output.steps.flatMap((step) => step.chunks),
@@ -1547,28 +1624,8 @@ async function printBuildSummary(output, config) {
       return diff;
     return l.fileName.localeCompare(r.fileName);
   });
-  let totalSize = 0;
-  const chunkRows = await Promise.all(
-    chunks.map(async (chunk, i) => {
-      const file = [
-        (0, import_path11.relative)(process.cwd(), config.outDir) + import_path11.default.sep,
-        chunk.fileName
-      ];
-      const prefix = i === chunks.length - 1 ? "  \u2514\u2500" : "  \u251C\u2500";
-      const color = getChunkColor(chunk.fileName);
-      const stats = await import_fs_extra10.default.lstat((0, import_path11.resolve)(config.outDir, chunk.fileName));
-      totalSize += stats.size;
-      const size = String((0, import_filesize.filesize)(stats.size));
-      return [
-        `${import_picocolors.default.gray(prefix)} ${import_picocolors.default.dim(file[0])}${color(file[1])}`,
-        import_picocolors.default.dim(size)
-      ];
-    })
-  );
-  printTable(config.logger.log, chunkRows);
-  config.logger.log(
-    `${import_picocolors.default.cyan("\u03A3 Total size:")} ${String((0, import_filesize.filesize)(totalSize))}`
-  );
+  const files = chunks.map((chunk) => (0, import_path11.resolve)(config.outDir, chunk.fileName));
+  await printFileList(config.logger.log, config.outDir, files);
 }
 var DEFAULT_SORT_WEIGHT = 100;
 var CHUNK_SORT_WEIGHTS = {
@@ -1583,16 +1640,6 @@ function getChunkSortWeight(filename) {
     ([key]) => filename.endsWith(key)
   )?.[1] ?? DEFAULT_SORT_WEIGHT;
 }
-var DEFAULT_COLOR = import_picocolors.default.blue;
-var CHUNK_COLORS = {
-  ".js.map": import_picocolors.default.gray,
-  ".html": import_picocolors.default.green,
-  ".css": import_picocolors.default.magenta,
-  ".js": import_picocolors.default.cyan
-};
-function getChunkColor(filename) {
-  return Object.entries(CHUNK_COLORS).find(([key]) => filename.endsWith(key))?.[1] ?? DEFAULT_COLOR;
-}
 
 // src/core/build.ts
 async function buildInternal(config) {
@@ -1604,8 +1651,8 @@ async function buildInternal(config) {
     )}`
   );
   const startTime = Date.now();
-  await import_fs_extra11.default.rm(config.outDir, { recursive: true, force: true });
-  await import_fs_extra11.default.ensureDir(config.outDir);
+  await import_fs_extra12.default.rm(config.outDir, { recursive: true, force: true });
+  await import_fs_extra12.default.ensureDir(config.outDir);
   const entrypoints = await findEntrypoints(config);
   const groups = groupEntrypoints(entrypoints);
   const { output } = await rebuild(config, groups);
@@ -1652,29 +1699,6 @@ async function rebuild(config, entrypointGroups, existingOutput = {
 // src/core/server.ts
 var vite4 = __toESM(require("vite"), 1);
 
-// src/core/utils/findOpenPort.ts
-var import_node_net = __toESM(require("net"), 1);
-function findOpenPort(startPort, endPort) {
-  return findOpenPortRecursive(startPort, startPort, endPort);
-}
-function findOpenPortRecursive(port, startPort, endPort) {
-  return new Promise((resolve13, reject) => {
-    if (port > endPort)
-      return reject(
-        Error(`Could not find open port between ${startPort}-${endPort}`)
-      );
-    const server = import_node_net.default.createServer();
-    server.listen(port, () => {
-      server.once("close", () => resolve13(port));
-      server.close();
-    });
-    server.on(
-      "error",
-      () => resolve13(findOpenPortRecursive(port + 1, startPort, endPort))
-    );
-  });
-}
-
 // src/core/runners/createWebExtRunner.ts
 function createWebExtRunner() {
   let runner;
@@ -1734,7 +1758,8 @@ var ERROR_LOG_LEVEL = 50;
 
 // src/core/server.ts
 async function getServerInfo() {
-  const port = await findOpenPort(3e3, 3010);
+  const { default: getPort, portNumbers } = await import("get-port");
+  const port = await getPort({ port: portNumbers(3e3, 3010) });
   const hostname = "localhost";
   const origin = `http://${hostname}:${port}`;
   const serverConfig = {
@@ -1818,7 +1843,7 @@ function reloadHtmlPages(groups, server, config) {
 }
 
 // package.json
-var version2 = "0.2.2";
+var version2 = "0.2.4";
 
 // src/core/utils/defineConfig.ts
 function defineConfig(config) {
@@ -1862,11 +1887,11 @@ async function createServer2(config) {
       if (changes.type === "no-change")
         return;
       internalConfig.logger.info(
-        `Changed: ${Array.from(new Set(fileChanges.map((change) => change[1]))).map((file) => import_picocolors3.default.dim((0, import_node_path4.relative)(internalConfig.root, file))).join(", ")}`
+        `Changed: ${Array.from(new Set(fileChanges.map((change) => change[1]))).map((file) => import_picocolors3.default.dim((0, import_node_path6.relative)(internalConfig.root, file))).join(", ")}`
       );
       const rebuiltNames = changes.rebuildGroups.flat().map((entry) => {
         return import_picocolors3.default.cyan(
-          (0, import_node_path4.relative)(internalConfig.outDir, getEntrypointOutputFile(entry, ""))
+          (0, import_node_path6.relative)(internalConfig.outDir, getEntrypointOutputFile(entry, ""))
         );
       }).join(import_picocolors3.default.dim(", "));
       internalConfig = await getLatestInternalConfig();