wxt 0.14.4 → 0.14.6

package/dist/{chunk-LETSPJCU.js → chunk-XDRW7AKZ.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "0.14.4";
+var version = "0.14.6";
 
 // src/core/utils/arrays.ts
 function every(array, predicate) {
@@ -8,6 +8,12 @@ function every(array, predicate) {
       return false;
   return true;
 }
+function some(array, predicate) {
+  for (let i = 0; i < array.length; i++)
+    if (predicate(array[i], i))
+      return true;
+  return false;
+}
 
 // src/core/utils/paths.ts
 import systemPath from "node:path";
@@ -22,9 +28,19 @@ var CSS_EXTENSIONS = ["css", "scss", "sass", "less", "styl", "stylus"];
 var CSS_EXTENSIONS_PATTERN = `+(${CSS_EXTENSIONS.join("|")})`;
 
 // src/core/utils/building/detect-dev-changes.ts
-function detectDevChanges(changedFiles, currentOutput) {
-  if (currentOutput == null)
-    return { type: "no-change" };
+function detectDevChanges(config, changedFiles, currentOutput) {
+  const isConfigChange = some(
+    changedFiles,
+    (file) => file === config.userConfigMetadata.configFile
+  );
+  if (isConfigChange)
+    return { type: "full-restart" };
+  const isRunnerChange = some(
+    changedFiles,
+    (file) => file === config.runnerConfig.configFile
+  );
+  if (isRunnerChange)
+    return { type: "browser-restart" };
   const changedSteps = new Set(
     changedFiles.flatMap(
       (changedFile) => findEffectedSteps(changedFile, currentOutput)
@@ -56,7 +72,7 @@ function detectDevChanges(changedFiles, currentOutput) {
       unchangedOutput.publicAssets.push(asset);
     }
   }
-  const isOnlyHtmlChanges = changedFiles.length > 0 && every(changedFiles, ([_, file]) => file.endsWith(".html"));
+  const isOnlyHtmlChanges = changedFiles.length > 0 && every(changedFiles, (file) => file.endsWith(".html"));
   if (isOnlyHtmlChanges) {
     return {
       type: "html-reload",
@@ -84,7 +100,7 @@ function detectDevChanges(changedFiles, currentOutput) {
 }
 function findEffectedSteps(changedFile, currentOutput) {
   const changes = [];
-  const changedPath = normalizePath(changedFile[1]);
+  const changedPath = normalizePath(changedFile);
   const isChunkEffected = (chunk) => (
     // If it's an HTML file with the same path, is is effected because HTML files need to be pre-rendered
     // fileName is normalized, relative bundle path
@@ -127,7 +143,7 @@ function resolvePerBrowserOption(option, browser) {
 }
 
 // src/core/utils/building/find-entrypoints.ts
-import { relative as relative5, resolve as resolve12 } from "path";
+import { relative as relative6, resolve as resolve13 } from "path";
 import fs12 from "fs-extra";
 import { minimatch } from "minimatch";
 import { parseHTML as parseHTML2 } from "linkedom";
@@ -1172,6 +1188,9 @@ async function createViteBuilder(inlineConfig, userConfig, wxtConfig) {
         async listen() {
           await viteServer.listen(info.port);
         },
+        async close() {
+          await viteServer.close();
+        },
         transformHtml(...args) {
           return viteServer.transformIndexHtml(...args);
         },
@@ -1237,6 +1256,7 @@ async function getInternalConfig(inlineConfig, command, server) {
   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",
     cwd: root,
@@ -1289,7 +1309,10 @@ async function getInternalConfig(inlineConfig, command, server) {
     experimental: {
       includeBrowserPolyfill: mergedConfig.experimental?.includeBrowserPolyfill ?? true
     },
-    server
+    server,
+    dev: {
+      reloadCommand
+    }
   };
   const builder = await createViteBuilder(
     inlineConfig,
@@ -1356,7 +1379,11 @@ function mergeInlineConfig(inlineConfig, userConfig) {
       ...inlineConfig.experimental
     },
     vite: void 0,
-    transformManifest: void 0
+    transformManifest: void 0,
+    dev: {
+      ...userConfig.dev,
+      ...inlineConfig.dev
+    }
   };
 }
 function resolveInternalZipConfig(root, mergedConfig) {
@@ -1768,6 +1795,7 @@ async function writeManifest(manifest, output, config) {
   });
 }
 async function generateManifest(entrypoints, buildOutput, config) {
+  const warnings = [];
   const pkg = await getPackageJson(config);
   let versionName = config.manifest.version_name ?? config.manifest.version ?? pkg?.version;
   if (versionName == null) {
@@ -1785,21 +1813,26 @@ async function generateManifest(entrypoints, buildOutput, config) {
     short_name: pkg?.shortName,
     icons: discoverIcons(buildOutput)
   };
-  if (config.command === "serve") {
-    baseManifest.commands = {
-      "wxt:reload-extension": {
-        description: "Reload the extension during development",
-        suggested_key: {
-          default: "Alt+R"
-        }
-      }
-    };
-  }
   const userManifest = config.manifest;
   const manifest = defu3(
     userManifest,
     baseManifest
   );
+  if (config.command === "serve" && config.dev.reloadCommand) {
+    if (manifest.commands && Object.keys(manifest.commands).length >= 4) {
+      warnings.push([
+        "Extension already has 4 registered commands, WXT's reload command is disabled"
+      ]);
+    } else {
+      manifest.commands ??= {};
+      manifest.commands["wxt:reload-extension"] = {
+        description: "Reload the extension during development",
+        suggested_key: {
+          default: config.dev.reloadCommand
+        }
+      };
+    }
+  }
   manifest.version = version2;
   manifest.version_name = // Firefox doesn't support version_name
   config.browser === "firefox" || versionName === version2 ? void 0 : versionName;
@@ -1818,7 +1851,10 @@ async function generateManifest(entrypoints, buildOutput, config) {
       "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 finalManifest;
+  return {
+    manifest: finalManifest,
+    warnings
+  };
 }
 function simplifyVersion(versionName) {
   const version2 = /^((0|[1-9][0-9]{0,8})([.](0|[1-9][0-9]{0,8})){0,3}).*$/.exec(
@@ -2179,11 +2215,7 @@ async function rebuild(config, allEntrypoints, entrypointGroups, existingOutput
     steps: [...existingOutput.steps, ...newOutput.steps],
     publicAssets: [...existingOutput.publicAssets, ...newOutput.publicAssets]
   };
-  const newManifest = await generateManifest(
-    allEntrypoints,
-    mergedOutput,
-    config
-  );
+  const { manifest: newManifest, warnings: manifestWarnings } = await generateManifest(allEntrypoints, mergedOutput, config);
   const finalOutput = {
     manifest: newManifest,
     ...newOutput
@@ -2199,11 +2231,76 @@ async function rebuild(config, allEntrypoints, entrypointGroups, existingOutput
         ...finalOutput.publicAssets
       ]
     },
-    manifest: newManifest
+    manifest: newManifest,
+    warnings: manifestWarnings
   };
 }
 
 // src/core/utils/building/internal-build.ts
+import managePath from "manage-path";
+import { resolve as resolve12, relative as relative5 } from "node:path";
+
+// src/core/utils/validation.ts
+function validateEntrypoints(entrypoints) {
+  const errors = entrypoints.flatMap((entrypoint) => {
+    switch (entrypoint.type) {
+      case "content-script":
+        return validateContentScriptEntrypoint(entrypoint);
+      default:
+        return validateBaseEntrypoint(entrypoint);
+    }
+  });
+  let errorCount = 0;
+  let warningCount = 0;
+  for (const err of errors) {
+    if (err.type === "warning")
+      warningCount++;
+    else
+      errorCount++;
+  }
+  return {
+    errors,
+    errorCount,
+    warningCount
+  };
+}
+function validateContentScriptEntrypoint(definition) {
+  const errors = validateBaseEntrypoint(definition);
+  if (definition.options.matches == null) {
+    errors.push({
+      type: "error",
+      message: "`matches` is required",
+      value: definition.options.matches,
+      entrypoint: definition
+    });
+  }
+  return errors;
+}
+function validateBaseEntrypoint(definition) {
+  const errors = [];
+  if (definition.options.exclude != null && !Array.isArray(definition.options.exclude)) {
+    errors.push({
+      type: "error",
+      message: "`exclude` must be an array of browser names",
+      value: definition.options.exclude,
+      entrypoint: definition
+    });
+  }
+  if (definition.options.include != null && !Array.isArray(definition.options.include)) {
+    errors.push({
+      type: "error",
+      message: "`include` must be an array of browser names",
+      value: definition.options.include,
+      entrypoint: definition
+    });
+  }
+  return errors;
+}
+var ValidationError = class extends Error {
+};
+
+// src/core/utils/building/internal-build.ts
+import consola3 from "consola";
 async function internalBuild(config) {
   const verb = config.command === "serve" ? "Pre-rendering" : "Building";
   const target = `${config.browser}-mv${config.manifestVersion}`;
@@ -2217,14 +2314,31 @@ async function internalBuild(config) {
   await fs11.ensureDir(config.outDir);
   const entrypoints = await findEntrypoints(config);
   config.logger.debug("Detected entrypoints:", entrypoints);
+  const validationResults = validateEntrypoints(entrypoints);
+  if (validationResults.errorCount + validationResults.warningCount > 0) {
+    printValidationResults(config, validationResults);
+  }
+  if (validationResults.errorCount > 0) {
+    throw new ValidationError(`Entrypoint validation failed`, {
+      cause: validationResults
+    });
+  }
   const groups = groupEntrypoints(entrypoints);
-  const { output } = await rebuild(config, entrypoints, groups, void 0);
+  const { output, warnings } = await rebuild(
+    config,
+    entrypoints,
+    groups,
+    void 0
+  );
   await printBuildSummary(
     config.logger.success,
     `Built extension in ${formatDuration(Date.now() - startTime)}`,
     output,
     config
   );
+  for (const warning of warnings) {
+    config.logger.warn(...warning);
+  }
   if (config.analysis.enabled) {
     await combineAnalysisStats(config);
     config.logger.info(
@@ -2241,11 +2355,35 @@ async function combineAnalysisStats(config) {
     absolute: true
   });
   const absolutePaths = unixFiles.map(unnormalizePath);
+  const alterPath = managePath(process.env);
+  alterPath.push(resolve12(config.root, "node_modules/wxt/node_modules/.bin"));
   await execaCommand(
     `rollup-plugin-visualizer ${absolutePaths.join(" ")} --template ${config.analysis.template}`,
     { cwd: config.root, stdio: "inherit" }
   );
 }
+function printValidationResults(config, { errorCount, errors, warningCount }) {
+  (errorCount > 0 ? config.logger.error : config.logger.warn)(
+    `Entrypoint validation failed: ${errorCount} error${errorCount === 1 ? "" : "s"}, ${warningCount} warning${warningCount === 1 ? "" : "s"}`
+  );
+  const cwd = process.cwd();
+  const entrypointErrors = errors.reduce((map, error) => {
+    const entryErrors = map.get(error.entrypoint) ?? [];
+    entryErrors.push(error);
+    map.set(error.entrypoint, entryErrors);
+    return map;
+  }, /* @__PURE__ */ new Map());
+  Array.from(entrypointErrors.entries()).forEach(([entrypoint, errors2]) => {
+    consola3.log(relative5(cwd, entrypoint.inputPath));
+    console.log();
+    errors2.forEach((err) => {
+      const type = err.type === "error" ? pc4.red("ERROR") : pc4.yellow("WARN");
+      const recieved = pc4.dim(`(recieved: ${JSON.stringify(err.value)})`);
+      consola3.log(`  - ${type} ${err.message} ${recieved}`);
+    });
+    console.log();
+  });
+}
 
 // src/core/utils/building/find-entrypoints.ts
 import glob3 from "fast-glob";
@@ -2257,7 +2395,7 @@ async function findEntrypoints(config) {
   relativePaths.sort();
   const pathGlobs = Object.keys(PATH_GLOB_TO_TYPE_MAP);
   const entrypointInfos = relativePaths.reduce((results, relativePath) => {
-    const inputPath = resolve12(config.entrypointsDir, relativePath);
+    const inputPath = resolve13(config.entrypointsDir, relativePath);
     const name = getEntrypointName(config.entrypointsDir, inputPath);
     const matchingGlob = pathGlobs.find(
       (glob4) => minimatch(relativePath, glob4)
@@ -2297,7 +2435,7 @@ async function findEntrypoints(config) {
           return {
             ...info,
             type,
-            outputDir: resolve12(config.outDir, CONTENT_SCRIPT_OUT_DIR),
+            outputDir: resolve13(config.outDir, CONTENT_SCRIPT_OUT_DIR),
             options: {
               include: void 0,
               exclude: void 0
@@ -2370,7 +2508,7 @@ function preventDuplicateEntrypointNames(config, files) {
       if (absolutePaths.length > 1) {
         lines.push(`- ${name}`);
         absolutePaths.forEach((absolutePath) => {
-          lines.push(`  - ${relative5(config.root, absolutePath)}`);
+          lines.push(`  - ${relative6(config.root, absolutePath)}`);
         });
       }
       return lines;
@@ -2535,7 +2673,7 @@ async function getContentScriptEntrypoint(config, { inputPath, name, skipped })
     type: "content-script",
     name,
     inputPath,
-    outputDir: resolve12(config.outDir, CONTENT_SCRIPT_OUT_DIR),
+    outputDir: resolve13(config.outDir, CONTENT_SCRIPT_OUT_DIR),
     options,
     skipped
   };

package/dist/cli.d.ts

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