wxt 0.5.2 → 0.5.3

package/dist/index.cjs

@@ -40,9 +40,45 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/core/utils/getInternalConfig.ts
+var import_c12 = require("c12");
 var import_node_path4 = __toESM(require("path"), 1);
 var vite2 = __toESM(require("vite"), 1);
-var import_consola = require("consola");
+
+// src/core/utils/createFsCache.ts
+var import_fs_extra2 = __toESM(require("fs-extra"), 1);
+var import_path = require("path");
+
+// src/core/utils/fs.ts
+var import_fs_extra = __toESM(require("fs-extra"), 1);
+async function writeFileIfDifferent(file, newContents) {
+  const existingContents = await import_fs_extra.default.readFile(file, "utf-8").catch(() => void 0);
+  if (existingContents !== newContents) {
+    await import_fs_extra.default.writeFile(file, newContents);
+  }
+}
+
+// src/core/utils/createFsCache.ts
+function createFsCache(wxtDir) {
+  const getPath = (key) => (0, import_path.resolve)(wxtDir, "cache", encodeURIComponent(key));
+  return {
+    async set(key, value) {
+      const path7 = getPath(key);
+      await (0, import_fs_extra2.ensureDir)((0, import_path.dirname)(path7));
+      await writeFileIfDifferent(path7, value);
+    },
+    async get(key) {
+      const path7 = getPath(key);
+      try {
+        return await import_fs_extra2.default.readFile(path7, "utf-8");
+      } catch {
+        return void 0;
+      }
+    }
+  };
+}
+
+// src/core/utils/getInternalConfig.ts
+var import_consola = __toESM(require("consola"), 1);
 
 // src/core/utils/entrypoints.ts
 var import_node_path2 = __toESM(require("path"), 1);
@@ -76,7 +112,7 @@ function getEntrypointBundlePath(entrypoint, outDir, ext) {
 
 // src/core/vite-plugins/devHtmlPrerender.ts
 var import_linkedom = require("linkedom");
-var import_path = require("path");
+var import_path2 = require("path");
 function devHtmlPrerender(config) {
   return {
     apply: "build",
@@ -85,7 +121,7 @@ function devHtmlPrerender(config) {
       return {
         resolve: {
           alias: {
-            "@wxt/reload-html": (0, import_path.resolve)(
+            "@wxt/reload-html": (0, import_path2.resolve)(
               config.root,
               "node_modules/wxt/dist/virtual-modules/reload-html.js"
             )
@@ -111,11 +147,11 @@ function devHtmlPrerender(config) {
           const src = element.getAttribute(attr);
           if (!src)
             return;
-          if ((0, import_path.isAbsolute)(src)) {
+          if ((0, import_path2.isAbsolute)(src)) {
             element.setAttribute(attr, server.origin + src);
           } else if (src.startsWith(".")) {
-            const abs = (0, import_path.resolve)((0, import_path.dirname)(id), src);
-            const pathname = (0, import_path.relative)(config.root, abs);
+            const abs = (0, import_path2.resolve)((0, import_path2.dirname)(id), src);
+            const pathname = (0, import_path2.relative)(config.root, abs);
             element.setAttribute(attr, `${server.origin}/${pathname}`);
           }
         });
@@ -226,7 +262,7 @@ function download(config) {
 
 // src/core/vite-plugins/multipageMove.ts
 var import_node_path3 = require("path");
-var import_fs_extra = __toESM(require("fs-extra"), 1);
+var import_fs_extra3 = __toESM(require("fs-extra"), 1);
 function multipageMove(entrypoints, config) {
   return {
     name: "wxt:multipage-move",
@@ -255,8 +291,8 @@ function multipageMove(entrypoints, config) {
         }
         const oldAbsPath = (0, import_node_path3.resolve)(config.outDir, oldBundlePath);
         const newAbsPath = (0, import_node_path3.resolve)(config.outDir, newBundlePath);
-        await (0, import_fs_extra.ensureDir)((0, import_node_path3.dirname)(newAbsPath));
-        await import_fs_extra.default.move(oldAbsPath, newAbsPath, { overwrite: true });
+        await (0, import_fs_extra3.ensureDir)((0, import_node_path3.dirname)(newAbsPath));
+        await import_fs_extra3.default.move(oldAbsPath, newAbsPath, { overwrite: true });
         const renamedChunk = {
           ...bundle[oldBundlePath],
           fileName: newBundlePath
@@ -290,7 +326,7 @@ function getUnimportOptions(config) {
 }
 
 // src/core/vite-plugins/unimport.ts
-var import_path2 = require("path");
+var import_path3 = require("path");
 var ENABLED_EXTENSIONS = {
   ".js": true,
   ".jsx": true,
@@ -310,7 +346,7 @@ function unimport(config) {
       await unimport2.scanImportsFromDir(void 0, { cwd: config.srcDir });
     },
     async transform(code, id) {
-      const ext = (0, import_path2.extname)(id);
+      const ext = (0, import_path3.extname)(id);
       if (ENABLED_EXTENSIONS[ext])
         return unimport2.injectImports(code, id);
     }
@@ -318,8 +354,8 @@ function unimport(config) {
 }
 
 // src/core/vite-plugins/virtualEntrypoint.ts
-var import_fs_extra2 = __toESM(require("fs-extra"), 1);
-var import_path3 = require("path");
+var import_fs_extra4 = __toESM(require("fs-extra"), 1);
+var import_path4 = require("path");
 function virtualEntrypoin(type, config) {
   const virtualId = `virtual:wxt-${type}?`;
   const resolvedVirtualId = `\0${virtualId}`;
@@ -336,8 +372,8 @@ function virtualEntrypoin(type, config) {
       if (!id.startsWith(resolvedVirtualId))
         return;
       const inputPath = id.replace(resolvedVirtualId, "");
-      const template = await import_fs_extra2.default.readFile(
-        (0, import_path3.resolve)(
+      const template = await import_fs_extra4.default.readFile(
+        (0, import_path4.resolve)(
           config.root,
           `node_modules/wxt/dist/virtual-modules/${type}-entrypoint.js`
         ),
@@ -411,39 +447,6 @@ function cssEntrypoints(entrypoint, config) {
   };
 }
 
-// src/core/utils/createFsCache.ts
-var import_fs_extra4 = __toESM(require("fs-extra"), 1);
-var import_path4 = require("path");
-
-// src/core/utils/fs.ts
-var import_fs_extra3 = __toESM(require("fs-extra"), 1);
-async function writeFileIfDifferent(file, newContents) {
-  const existingContents = await import_fs_extra3.default.readFile(file, "utf-8").catch(() => void 0);
-  if (existingContents !== newContents) {
-    await import_fs_extra3.default.writeFile(file, newContents);
-  }
-}
-
-// src/core/utils/createFsCache.ts
-function createFsCache(wxtDir) {
-  const getPath = (key) => (0, import_path4.resolve)(wxtDir, "cache", encodeURIComponent(key));
-  return {
-    async set(key, value) {
-      const path7 = getPath(key);
-      await (0, import_fs_extra4.ensureDir)((0, import_path4.dirname)(path7));
-      await writeFileIfDifferent(path7, value);
-    },
-    async get(key) {
-      const path7 = getPath(key);
-      try {
-        return await import_fs_extra4.default.readFile(path7, "utf-8");
-      } catch {
-        return void 0;
-      }
-    }
-  };
-}
-
 // src/core/utils/globals.ts
 function getGlobals(config) {
   return [
@@ -491,128 +494,182 @@ function getGlobals(config) {
 }
 
 // src/core/utils/getInternalConfig.ts
-var import_c12 = require("c12");
-async function getInternalConfig(config, command) {
-  const root = config.root ? import_node_path4.default.resolve(config.root) : process.cwd();
-  const mode = config.mode ?? (command === "build" ? "production" : "development");
-  const browser = config.browser ?? "chrome";
-  const manifestVersion = config.manifestVersion ?? (browser == "firefox" ? 2 : 3);
-  const outBaseDir = import_node_path4.default.resolve(root, ".output");
-  const outDir = import_node_path4.default.resolve(outBaseDir, `${browser}-mv${manifestVersion}`);
-  const logger = config.logger ?? import_consola.consola;
-  const debug = !!config.debug;
-  if (debug)
-    logger.level = import_consola.LogLevels.debug;
-  const baseConfig = {
-    root,
-    outDir,
-    outBaseDir,
-    storeIds: config.storeIds ?? {},
-    browser,
-    manifestVersion,
-    mode,
-    command,
-    debug,
-    logger,
-    vite: config.vite ?? {},
-    imports: config.imports ?? {},
-    runnerConfig: await (0, import_c12.loadConfig)({
-      name: "web-ext",
-      cwd: root,
-      globalRc: true,
-      rcFile: ".webextrc",
-      overrides: config.runner
-    })
-  };
-  let userConfig = {
-    mode
-  };
-  if (config.configFile !== false) {
+async function getInternalConfig(inlineConfig, command) {
+  let userConfig = {};
+  if (inlineConfig.configFile !== false) {
     const loaded = await (0, import_c12.loadConfig)({
       name: "wxt",
-      cwd: root,
+      cwd: inlineConfig.root ?? process.cwd(),
       rcFile: false
     });
     userConfig = loaded.config ?? {};
   }
-  const merged = vite2.mergeConfig(
-    baseConfig,
-    userConfig
+  const mergedConfig = mergeInlineConfig(inlineConfig, userConfig);
+  const debug = mergedConfig.debug ?? false;
+  const logger = mergedConfig.logger ?? import_consola.default;
+  if (debug)
+    logger.level = import_consola.LogLevels.debug;
+  const browser = mergedConfig.browser ?? "chrome";
+  const manifestVersion = mergedConfig.manifestVersion ?? (browser == "firefox" ? 2 : 3);
+  const mode = mergedConfig.mode ?? (command === "build" ? "production" : "development");
+  const env = { browser, command, manifestVersion, mode };
+  const root = import_node_path4.default.resolve(
+    inlineConfig.root ?? userConfig.root ?? process.cwd()
   );
-  const srcDir = userConfig.srcDir ? (0, import_node_path4.resolve)(root, userConfig.srcDir) : root;
-  const entrypointsDir = (0, import_node_path4.resolve)(
+  const wxtDir = import_node_path4.default.resolve(root, ".wxt");
+  const srcDir = import_node_path4.default.resolve(root, mergedConfig.srcDir ?? root);
+  const entrypointsDir = import_node_path4.default.resolve(
     srcDir,
-    userConfig.entrypointsDir ?? "entrypoints"
+    mergedConfig.entrypointsDir ?? "entrypoints"
   );
-  const publicDir = (0, import_node_path4.resolve)(srcDir, userConfig.publicDir ?? "public");
-  const wxtDir = (0, import_node_path4.resolve)(root, ".wxt");
-  const typesDir = (0, import_node_path4.resolve)(wxtDir, "types");
-  const env = { mode, browser, manifestVersion, command };
-  const userManifest = await resolveManifestConfig(env, userConfig.manifest);
-  const inlineManifest = await resolveManifestConfig(env, config.manifest);
-  const manifest = vite2.mergeConfig(userManifest, inlineManifest);
+  const publicDir = import_node_path4.default.resolve(srcDir, mergedConfig.publicDir ?? "public");
+  const typesDir = import_node_path4.default.resolve(wxtDir, "types");
+  const outBaseDir = import_node_path4.default.resolve(root, ".output");
+  const outDir = import_node_path4.default.resolve(outBaseDir, `${browser}-mv${manifestVersion}`);
+  const runnerConfig = await (0, import_c12.loadConfig)({
+    name: "web-ext",
+    cwd: root,
+    globalRc: true,
+    rcFile: ".webextrc",
+    overrides: mergedConfig.runner
+  });
   const finalConfig = {
-    ...merged,
-    srcDir,
+    browser,
+    command,
+    debug,
     entrypointsDir,
+    fsCache: createFsCache(wxtDir),
+    imports: mergedConfig.imports ?? {},
+    logger,
+    manifest: await resolveManifestConfig(env, mergedConfig.manifest),
+    manifestVersion,
+    mode,
+    outBaseDir,
+    outDir,
     publicDir,
-    wxtDir,
+    root,
+    runnerConfig,
+    srcDir,
     typesDir,
-    fsCache: createFsCache(wxtDir),
-    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 ?? []
-      ]
-    }
+    vite: {},
+    // Real value added after this object is initialized.
+    wxtDir,
+    zip: resolveInternalZipConfig(root, mergedConfig)
   };
-  finalConfig.vite.root = root;
-  finalConfig.vite.configFile = false;
-  finalConfig.vite.logLevel = "warn";
-  finalConfig.vite.build ??= {};
-  finalConfig.vite.build.outDir = outDir;
-  finalConfig.vite.build.emptyOutDir = false;
-  finalConfig.vite.plugins ??= [];
-  finalConfig.vite.plugins.push(download(finalConfig));
-  finalConfig.vite.plugins.push(devHtmlPrerender(finalConfig));
-  finalConfig.vite.plugins.push(unimport(finalConfig));
-  finalConfig.vite.plugins.push(
-    virtualEntrypoin("background", finalConfig)
+  finalConfig.vite = await resolveInternalViteConfig(
+    env,
+    mergedConfig,
+    finalConfig
   );
-  finalConfig.vite.plugins.push(
-    virtualEntrypoin("content-script", finalConfig)
-  );
-  finalConfig.vite.plugins.push(devServerGlobals(finalConfig));
-  finalConfig.vite.plugins.push(tsconfigPaths(finalConfig));
-  finalConfig.vite.plugins.push(noopBackground());
-  finalConfig.vite.define ??= {};
-  getGlobals(finalConfig).forEach((global) => {
-    finalConfig.vite.define[global.name] = JSON.stringify(global.value);
-  });
   return finalConfig;
 }
 async function resolveManifestConfig(env, manifest) {
   return await (typeof manifest === "function" ? manifest(env) : manifest ?? {});
 }
+function mergeInlineConfig(inlineConfig, userConfig) {
+  let imports;
+  if (inlineConfig.imports === false || userConfig.imports === false) {
+    imports = false;
+  } else if (userConfig.imports == null && inlineConfig.imports == null) {
+    imports = void 0;
+  } else {
+    imports = vite2.mergeConfig(
+      userConfig.imports ?? {},
+      inlineConfig.imports ?? {}
+    );
+  }
+  const manifest = async (env) => {
+    const user = await resolveManifestConfig(env, userConfig.manifest);
+    const inline = await resolveManifestConfig(env, inlineConfig.manifest);
+    return vite2.mergeConfig(user, inline);
+  };
+  const viteConfig = async (env) => {
+    const user = await resolveViteConfig(env, userConfig.vite);
+    const inline = await resolveViteConfig(env, inlineConfig.vite);
+    return vite2.mergeConfig(user, inline);
+  };
+  const runner = vite2.mergeConfig(
+    userConfig.runner ?? {},
+    inlineConfig.runner ?? {}
+  );
+  const zip = vite2.mergeConfig(
+    userConfig.zip ?? {},
+    inlineConfig.zip ?? {}
+  );
+  return {
+    root: inlineConfig.root ?? userConfig.root,
+    browser: inlineConfig.browser ?? userConfig.browser,
+    manifestVersion: inlineConfig.manifestVersion ?? userConfig.manifestVersion,
+    configFile: inlineConfig.configFile,
+    debug: inlineConfig.debug ?? userConfig.debug,
+    entrypointsDir: inlineConfig.entrypointsDir ?? userConfig.entrypointsDir,
+    imports,
+    logger: inlineConfig.logger ?? userConfig.logger,
+    manifest,
+    mode: inlineConfig.mode ?? userConfig.mode,
+    publicDir: inlineConfig.publicDir ?? userConfig.publicDir,
+    runner,
+    srcDir: inlineConfig.srcDir ?? userConfig.srcDir,
+    vite: viteConfig,
+    zip
+  };
+}
+async function resolveViteConfig(env, vite6) {
+  return await (typeof vite6 === "function" ? vite6(env) : vite6 ?? {});
+}
+function resolveInternalZipConfig(root, mergedConfig) {
+  return {
+    sourcesTemplate: "{{name}}-{{version}}-sources.zip",
+    artifactTemplate: "{{name}}-{{version}}-{{browser}}.zip",
+    sourcesRoot: root,
+    ...mergedConfig.zip,
+    ignoredSources: [
+      "**/node_modules",
+      // WXT files
+      "**/web-ext.config.ts",
+      // Hidden files
+      "**/.*",
+      // Tests
+      "**/__tests__/**",
+      "**/*.+(test|spec).?(c|m)+(j|t)s?(x)",
+      // From user
+      ...mergedConfig.zip?.ignoredSources ?? []
+    ]
+  };
+}
+async function resolveInternalViteConfig(env, mergedConfig, finalConfig) {
+  const internalVite = await resolveViteConfig(
+    env,
+    mergedConfig.vite
+  );
+  internalVite.root = finalConfig.root;
+  internalVite.configFile = false;
+  internalVite.logLevel = "warn";
+  internalVite.build ??= {};
+  internalVite.build.outDir = finalConfig.outDir;
+  internalVite.build.emptyOutDir = false;
+  internalVite.plugins ??= [];
+  internalVite.plugins.push(download(finalConfig));
+  internalVite.plugins.push(devHtmlPrerender(finalConfig));
+  internalVite.plugins.push(unimport(finalConfig));
+  internalVite.plugins.push(
+    virtualEntrypoin("background", finalConfig)
+  );
+  internalVite.plugins.push(
+    virtualEntrypoin("content-script", finalConfig)
+  );
+  internalVite.plugins.push(devServerGlobals(finalConfig));
+  internalVite.plugins.push(tsconfigPaths(finalConfig));
+  internalVite.plugins.push(noopBackground());
+  internalVite.define ??= {};
+  for (const global of getGlobals(finalConfig)) {
+    internalVite.define[global.name] = JSON.stringify(global.value);
+  }
+  return internalVite;
+}
 
 // src/index.ts
 var import_picocolors4 = __toESM(require("picocolors"), 1);
-var vite6 = __toESM(require("vite"), 1);
 
 // src/core/utils/arrays.ts
 function every(array, predicate) {
@@ -2225,7 +2282,7 @@ async function clean(root = process.cwd()) {
 }
 
 // package.json
-var version2 = "0.5.2";
+var version2 = "0.5.3";
 
 // src/core/utils/defineConfig.ts
 function defineConfig(config) {
@@ -2244,12 +2301,14 @@ async function build2(config) {
 }
 async function createServer2(config) {
   const serverInfo = await getServerInfo();
-  const getLatestInternalConfig = () => {
-    const viteConfig = vite6.mergeConfig(
-      serverInfo.viteServerConfig,
-      config?.vite ?? {}
+  const getLatestInternalConfig = async () => {
+    return getInternalConfig(
+      {
+        ...config,
+        vite: serverInfo.viteServerConfig
+      },
+      "serve"
     );
-    return getInternalConfig({ ...config, vite: viteConfig }, "serve");
   };
   let internalConfig = await getLatestInternalConfig();
   const server = await setupServer(serverInfo, internalConfig);