wxt 0.18.11 → 0.18.13

package/README.md

@@ -1,5 +1,5 @@
 <h1 align="center">
-  <img style="vertical-align:middle" width="44" src="./docs/public/hero-logo.svg" alt="WXT Logo">
+  <img style="vertical-align:middle" width="44" src="https://raw.githubusercontent.com/wxt-dev/wxt/HEAD/docs/public/hero-logo.svg" alt="WXT Logo">
   <span>WXT</span>
 </h1>
 
@@ -22,22 +22,22 @@
 </p>
 
 <p align="center">
-  <a href="https://wxt.dev" target="_blank">Get Started</a>
-  &bull;
-  <a href="https://wxt.dev/guide/installation.html" target="_blank">Installation</a>
+  <a href="https://wxt.dev/guide/installation.html" target="_blank">Get Started</a>
   &bull;
   <a href="https://wxt.dev/api/config.html" target="_blank">Configuration</a>
   &bull;
   <a href="https://wxt.dev/examples.html" target="_blank">Examples</a>
   &bull;
+  <a href="https://github.com/wxt-dev/wxt/blob/main/packages/wxt/CHANGELOG.md" target="_blank">Changelog</a>
+  &bull;
   <a href="https://discord.gg/ZFsZqGery9" target="_blank">Discord</a>
 </p>
 
-![Example CLI Output](./docs/assets/cli-output.png)
+![Example CLI Output](https://raw.githubusercontent.com/wxt-dev/wxt/HEAD/docs/assets/cli-output.png)
 
 ## Demo
 
-https://github.com/wxt-dev/wxt/assets/10101283/4d678939-1bdb-495c-9c36-3aa281d84c94
+<video src="https://github.com/wxt-dev/wxt/assets/10101283/4d678939-1bdb-495c-9c36-3aa281d84c94"></video>
 
 ## Quick Start
 

package/dist/{chunk-XNTIBS6O.js → chunk-TENM236J.js}

@@ -16,7 +16,7 @@ import {
 } from "./chunk-QGM4M3NI.js";
 
 // package.json
-var version = "0.18.10";
+var version = "0.18.12";
 
 // src/core/utils/paths.ts
 import systemPath from "node:path";
@@ -242,14 +242,33 @@ function webextensionPolyfillMock(config) {
   };
 }
 
+// src/core/builders/vite/plugins/resolveAppConfig.ts
+import { exists } from "fs-extra";
+import { resolve as resolve2 } from "node:path";
+function resolveAppConfig(config) {
+  const virtualModuleId = "virtual:app-config";
+  const resolvedVirtualModuleId = "\0" + virtualModuleId;
+  const appConfigFile = resolve2(config.srcDir, "app.config.ts");
+  return {
+    name: "wxt:resolve-app-config",
+    async resolveId(id) {
+      if (id !== virtualModuleId) return;
+      return await exists(appConfigFile) ? appConfigFile : resolvedVirtualModuleId;
+    },
+    load(id) {
+      if (id === resolvedVirtualModuleId) return `export default {}`;
+    }
+  };
+}
+
 // src/core/builders/vite/plugins/devHtmlPrerender.ts
 import { parseHTML } from "linkedom";
-import { dirname, relative as relative2, resolve as resolve2 } from "node:path";
+import { dirname, relative as relative2, resolve as resolve3 } from "node:path";
 import { murmurHash } from "ohash";
 var inlineScriptContents = {};
 function devHtmlPrerender(config, server) {
   const htmlReloadId = "@wxt/reload-html";
-  const resolvedHtmlReloadId = resolve2(
+  const resolvedHtmlReloadId = resolve3(
     config.wxtModuleDir,
     "dist/virtual/reload-html.js"
   );
@@ -351,12 +370,12 @@ function pointToDevServer(config, server, id, document, querySelector, attr) {
     );
     if (matchingAlias) {
       const [alias, replacement] = matchingAlias;
-      resolvedAbsolutePath = resolve2(
+      resolvedAbsolutePath = resolve3(
         config.root,
         src.replace(alias, replacement)
       );
     } else {
-      resolvedAbsolutePath = resolve2(dirname(id), src);
+      resolvedAbsolutePath = resolve3(dirname(id), src);
     }
     if (resolvedAbsolutePath) {
       const relativePath = normalizePath(
@@ -400,7 +419,7 @@ function devServerGlobals(config, server) {
 }
 
 // src/core/builders/vite/plugins/multipageMove.ts
-import { dirname as dirname2, extname, resolve as resolve3, join } from "node:path";
+import { dirname as dirname2, extname, resolve as resolve4, join } from "node:path";
 import fs, { ensureDir } from "fs-extra";
 function multipageMove(entrypoints, config) {
   return {
@@ -428,8 +447,8 @@ function multipageMove(entrypoints, config) {
           );
           continue;
         }
-        const oldAbsPath = resolve3(config.outDir, oldBundlePath);
-        const newAbsPath = resolve3(config.outDir, newBundlePath);
+        const oldAbsPath = resolve4(config.outDir, oldBundlePath);
+        const newAbsPath = resolve4(config.outDir, newBundlePath);
         await ensureDir(dirname2(newAbsPath));
         await fs.move(oldAbsPath, newAbsPath, { overwrite: true });
         const renamedChunk = {
@@ -476,7 +495,7 @@ var virtualModuleNames = [
 
 // src/core/builders/vite/plugins/resolveVirtualModules.ts
 import fs2 from "fs-extra";
-import { resolve as resolve4 } from "path";
+import { resolve as resolve5 } from "path";
 function resolveVirtualModules(config) {
   return virtualModuleNames.map((name) => {
     const virtualId = `virtual:wxt-${name}?`;
@@ -493,7 +512,7 @@ function resolveVirtualModules(config) {
         if (!id.startsWith(resolvedVirtualId)) return;
         const inputPath = id.replace(resolvedVirtualId, "");
         const template = await fs2.readFile(
-          resolve4(config.wxtModuleDir, `dist/virtual/${name}.js`),
+          resolve5(config.wxtModuleDir, `dist/virtual/${name}.js`),
           "utf-8"
         );
         return template.replace(`virtual:user-${name}`, inputPath);
@@ -635,9 +654,9 @@ function emptyMainFunction(mod) {
 }
 
 // src/core/builders/vite/plugins/removeEntrypointMainFunction.ts
-import { resolve as resolve5 } from "node:path";
+import { resolve as resolve6 } from "node:path";
 function removeEntrypointMainFunction(config, path8) {
-  const absPath = normalizePath(resolve5(config.root, path8));
+  const absPath = normalizePath(resolve6(config.root, path8));
   return {
     name: "wxt:remove-entrypoint-main-function",
     transform(code, id) {
@@ -813,6 +832,7 @@ function getEslint9ConfigEntry(options, globals2) {
     text: `const globals = ${JSON.stringify(globals2, null, 2)}
 
 export default {
+  name: "wxt/auto-imports",
   languageOptions: {
     globals,
     sourceType: "module",
@@ -839,7 +859,7 @@ async function getPublicFiles() {
 
 // src/core/utils/building/build-entrypoints.ts
 import fs4 from "fs-extra";
-import { dirname as dirname3, resolve as resolve6 } from "path";
+import { dirname as dirname3, resolve as resolve7 } from "path";
 import pc from "picocolors";
 async function buildEntrypoints(groups, spinner) {
   const steps = [];
@@ -861,14 +881,14 @@ async function buildEntrypoints(groups, spinner) {
 }
 async function copyPublicDirectory() {
   const files = (await getPublicFiles()).map((file) => ({
-    absoluteSrc: resolve6(wxt.config.publicDir, file),
+    absoluteSrc: resolve7(wxt.config.publicDir, file),
     relativeDest: file
   }));
   await wxt.hooks.callHook("build:publicAssets", wxt, files);
   if (files.length === 0) return [];
   const publicAssets = [];
   for (const file of files) {
-    const absoluteDest = resolve6(wxt.config.outDir, file.relativeDest);
+    const absoluteDest = resolve7(wxt.config.outDir, file.relativeDest);
     await fs4.ensureDir(dirname3(absoluteDest));
     if ("absoluteSrc" in file) {
       await fs4.copyFile(file.absoluteSrc, absoluteDest);
@@ -976,7 +996,7 @@ function findEffectedSteps(changedFile, currentOutput) {
 }
 
 // src/core/utils/building/find-entrypoints.ts
-import { relative as relative3, resolve as resolve7 } from "path";
+import { relative as relative3, resolve as resolve8 } from "path";
 import fs5 from "fs-extra";
 import { minimatch } from "minimatch";
 import { parseHTML as parseHTML3 } from "linkedom";
@@ -985,14 +1005,14 @@ import glob2 from "fast-glob";
 import pc2 from "picocolors";
 async function findEntrypoints() {
   await fs5.mkdir(wxt.config.wxtDir, { recursive: true });
-  await fs5.writeJson(resolve7(wxt.config.wxtDir, "tsconfig.json"), {});
+  await fs5.writeJson(resolve8(wxt.config.wxtDir, "tsconfig.json"), {});
   const relativePaths = await glob2(Object.keys(PATH_GLOB_TO_TYPE_MAP), {
     cwd: wxt.config.entrypointsDir
   });
   relativePaths.sort();
   const pathGlobs = Object.keys(PATH_GLOB_TO_TYPE_MAP);
   const entrypointInfos = relativePaths.reduce((results, relativePath) => {
-    const inputPath = resolve7(wxt.config.entrypointsDir, relativePath);
+    const inputPath = resolve8(wxt.config.entrypointsDir, relativePath);
     const name = getEntrypointName(wxt.config.entrypointsDir, inputPath);
     const matchingGlob = pathGlobs.find(
       (glob5) => minimatch(relativePath, glob5)
@@ -1034,7 +1054,7 @@ async function findEntrypoints() {
           return {
             ...info,
             type,
-            outputDir: resolve7(wxt.config.outDir, CONTENT_SCRIPT_OUT_DIR),
+            outputDir: resolve8(wxt.config.outDir, CONTENT_SCRIPT_OUT_DIR),
             options: {
               include: void 0,
               exclude: void 0
@@ -1261,7 +1281,7 @@ async function getContentScriptEntrypoint({
     type: "content-script",
     name,
     inputPath,
-    outputDir: resolve7(wxt.config.outDir, CONTENT_SCRIPT_OUT_DIR),
+    outputDir: resolve8(wxt.config.outDir, CONTENT_SCRIPT_OUT_DIR),
     options: resolvePerBrowserOptions(options, wxt.config.browser),
     skipped
   };
@@ -1357,7 +1377,7 @@ var CONTENT_SCRIPT_OUT_DIR = "content-scripts";
 
 // src/core/utils/building/generate-wxt-dir.ts
 import fs6 from "fs-extra";
-import { dirname as dirname4, relative as relative4, resolve as resolve8 } from "node:path";
+import { dirname as dirname4, relative as relative4, resolve as resolve9 } from "node:path";
 import path4 from "node:path";
 
 // src/core/utils/i18n.ts
@@ -1416,7 +1436,7 @@ async function generateTypesDir(entrypoints) {
   entries.push(getMainDeclarationEntry(entries));
   const absoluteFileEntries = entries.filter((entry) => "path" in entry).map((entry) => ({
     ...entry,
-    path: resolve8(wxt.config.wxtDir, entry.path)
+    path: resolve9(wxt.config.wxtDir, entry.path)
   }));
   await Promise.all(
     absoluteFileEntries.map(async (file) => {
@@ -1528,7 +1548,7 @@ function getMainDeclarationEntry(references) {
     if ("module" in ref) {
       return lines.push(`/// <reference types="${ref.module}" />`);
     } else if (ref.tsReference) {
-      const absolutePath = resolve8(wxt.config.wxtDir, ref.path);
+      const absolutePath = resolve9(wxt.config.wxtDir, ref.path);
       const relativePath = relative4(wxt.config.wxtDir, absolutePath);
       lines.push(`/// <reference types="./${normalizePath(relativePath)}" />`);
     }
@@ -1581,9 +1601,9 @@ import path5 from "node:path";
 
 // src/core/utils/cache.ts
 import fs7, { ensureDir as ensureDir2 } from "fs-extra";
-import { dirname as dirname5, resolve as resolve9 } from "path";
+import { dirname as dirname5, resolve as resolve10 } from "path";
 function createFsCache(wxtDir) {
-  const getPath = (key) => resolve9(wxtDir, "cache", encodeURIComponent(key));
+  const getPath = (key) => resolve10(wxtDir, "cache", encodeURIComponent(key));
   return {
     async set(key, value) {
       const path8 = getPath(key);
@@ -1696,7 +1716,7 @@ async function resolveConfig(inlineConfig, command) {
     }
     devServerConfig = {
       port,
-      hostname: "localhost"
+      hostname: mergedConfig.dev?.server?.hostname ?? "localhost"
     };
   }
   const userModules = await resolveWxtUserModules(
@@ -1771,9 +1791,14 @@ async function mergeInlineConfig(inlineConfig, userConfig) {
     userConfig.transformManifest?.(manifest2);
     inlineConfig.transformManifest?.(manifest2);
   };
-  const builderConfig = await mergeBuilderConfig(inlineConfig, userConfig);
+  const merged = defu(inlineConfig, userConfig);
+  const builderConfig = await mergeBuilderConfig(
+    merged.logger ?? consola,
+    inlineConfig,
+    userConfig
+  );
   return {
-    ...defu(inlineConfig, userConfig),
+    ...merged,
     // Custom merge values
     transformManifest,
     imports,
@@ -1896,8 +1921,10 @@ var COMMAND_MODES = {
   build: "production",
   serve: "development"
 };
-async function mergeBuilderConfig(inlineConfig, userConfig) {
-  const vite = await import("vite").catch(() => void 0);
+async function mergeBuilderConfig(logger, inlineConfig, userConfig) {
+  const vite = await import("vite").catch((err) => {
+    logger.debug("Failed to import vite:", err);
+  });
   if (vite) {
     return {
       vite: async (env) => {
@@ -1999,7 +2026,7 @@ var ENTRY_TYPE_TO_GROUP_MAP = {
 import createJITI from "jiti";
 import { createUnimport as createUnimport2 } from "unimport";
 import fs9 from "fs-extra";
-import { relative as relative5, resolve as resolve10 } from "node:path";
+import { relative as relative5, resolve as resolve11 } from "node:path";
 import { transformSync } from "esbuild";
 import { fileURLToPath } from "node:url";
 async function importEntrypointFile(path8) {
@@ -2024,7 +2051,14 @@ async function importEntrypointFile(path8) {
       debug: wxt.config.debug,
       esmResolve: true,
       alias: {
-        "webextension-polyfill": resolve10(
+        "webextension-polyfill": resolve11(
+          wxt.config.wxtModuleDir,
+          "dist/virtual/mock-browser.js"
+        ),
+        // TODO: Resolve this virtual module to some file with
+        // `export default {}` instead of this hack of using another file with
+        // a default export.
+        "virtual:app-config": resolve11(
           wxt.config.wxtModuleDir,
           "dist/virtual/mock-browser.js"
         )
@@ -2089,7 +2123,7 @@ import pc5 from "picocolors";
 import fs13 from "fs-extra";
 
 // src/core/utils/log/printBuildSummary.ts
-import { resolve as resolve11 } from "path";
+import { resolve as resolve12 } from "path";
 
 // src/core/utils/log/printFileList.ts
 import path6 from "node:path";
@@ -2173,7 +2207,7 @@ async function printBuildSummary(log, header, output) {
     return l.fileName.localeCompare(r.fileName);
   });
   const files = chunks.map(
-    (chunk) => resolve11(wxt.config.outDir, chunk.fileName)
+    (chunk) => resolve12(wxt.config.outDir, chunk.fileName)
   );
   await printFileList(log, header, wxt.config.outDir, files);
 }
@@ -2199,7 +2233,7 @@ import glob4 from "fast-glob";
 
 // src/core/utils/manifest.ts
 import fs12 from "fs-extra";
-import { resolve as resolve13 } from "path";
+import { resolve as resolve14 } from "path";
 
 // src/core/utils/content-security-policy.ts
 var ContentSecurityPolicy = class _ContentSecurityPolicy {
@@ -2304,10 +2338,10 @@ function getContentScriptJs(config, entrypoint) {
 }
 
 // src/core/utils/package.ts
-import { resolve as resolve12 } from "node:path";
+import { resolve as resolve13 } from "node:path";
 import fs11 from "fs-extra";
 async function getPackageJson() {
-  const file = resolve12(wxt.config.root, "package.json");
+  const file = resolve13(wxt.config.root, "package.json");
   try {
     return await fs11.readJson(file);
   } catch (err) {
@@ -2323,7 +2357,7 @@ import defu2 from "defu";
 async function writeManifest(manifest, output) {
   const str = wxt.config.mode === "production" ? JSON.stringify(manifest) : JSON.stringify(manifest, null, 2);
   await fs12.ensureDir(wxt.config.outDir);
-  await writeFileIfDifferent(resolve13(wxt.config.outDir, "manifest.json"), str);
+  await writeFileIfDifferent(resolve14(wxt.config.outDir, "manifest.json"), str);
   output.publicAssets.unshift({
     type: "asset",
     fileName: "manifest.json"
@@ -3252,7 +3286,8 @@ async function createViteBuilder(wxtConfig, hooks, server) {
       globals(wxtConfig),
       excludeBrowserPolyfill(wxtConfig),
       defineImportMeta(),
-      wxtPluginLoader(wxtConfig)
+      wxtPluginLoader(wxtConfig),
+      resolveAppConfig(wxtConfig)
     );
     if (wxtConfig.analysis.enabled) {
       config.plugins.push(bundleAnalysis(wxtConfig));
@@ -3553,6 +3588,7 @@ export {
   tsconfigPaths,
   globals,
   webextensionPolyfillMock,
+  resolveAppConfig,
   kebabCaseAlphanumeric,
   vitePlugin,
   wxt,