wxt 0.16.9 → 0.16.11-alpha1

package/dist/{chunk-CKAPFUPR.js → chunk-UNU4RJJA.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "0.16.9";
+var version = "0.16.11-alpha1";
 
 // src/core/utils/paths.ts
 import systemPath from "node:path";
@@ -212,6 +212,9 @@ function resolvePerBrowserOptions(options, browser) {
     ])
   );
 }
+function isHtmlEntrypoint(entrypoint) {
+  return entrypoint.inputPath.endsWith(".html");
+}
 
 // src/core/utils/constants.ts
 var VIRTUAL_NOOP_BACKGROUND_MODULE_ID = "virtual:user-background";
@@ -724,7 +727,7 @@ async function writePathsDeclarationFile(entrypoints) {
     (entry) => getEntrypointBundlePath(
       entry,
       wxt.config.outDir,
-      entry.inputPath.endsWith(".html") ? ".html" : ".js"
+      isHtmlEntrypoint(entry) ? ".html" : ".js"
     )
   ).concat(await getPublicFiles()).map(normalizePath).map((path7) => `    | "/${path7}"`).sort().join("\n");
   const template = `// Generated by wxt
@@ -1520,6 +1523,9 @@ async function createViteBuilder(inlineConfig, userConfig, wxtConfig) {
     return libMode;
   };
   const getMultiPageConfig = (entrypoints) => {
+    const htmlEntrypoints = new Set(
+      entrypoints.filter(isHtmlEntrypoint).map((e) => e.name)
+    );
     return {
       mode: wxtConfig.mode,
       plugins: [
@@ -1535,10 +1541,11 @@ async function createViteBuilder(inlineConfig, userConfig, wxtConfig) {
           output: {
             // Include a hash to prevent conflicts
             chunkFileNames: "chunks/[name]-[hash].js",
-            // Place JS entrypoints in main directory without a hash. (popup.html & popup.js are
-            // next to each other). The unique entrypoint name requirement prevents conflicts with
-            // scripts of the same name
-            entryFileNames: "[name].js",
+            entryFileNames: ({ name }) => {
+              if (htmlEntrypoints.has(name))
+                return "chunks/[name]-[hash].js";
+              return "[name].js";
+            },
             // We can't control the "name", so we need a hash to prevent conflicts
             assetFileNames: "assets/[name]-[hash].[ext]"
           }
@@ -1671,6 +1678,7 @@ async function resolveConfig(inlineConfig, command, server) {
   let userConfigMetadata;
   if (inlineConfig.configFile !== false) {
     const { config: loadedConfig, ...metadata } = await loadConfig({
+      configFile: inlineConfig.configFile,
       name: "wxt",
       cwd: inlineConfig.root ?? process.cwd(),
       rcFile: false,
@@ -2049,7 +2057,12 @@ function getEsbuildOptions(opts) {
   return {
     format: "cjs",
     loader: isJsx ? "tsx" : "ts",
-    jsx: isJsx ? "automatic" : void 0
+    ...isJsx ? {
+      // `h` and `Fragment` are undefined, but that's OK because JSX is never evaluated while
+      // grabbing the entrypoint's options.
+      jsxFactory: "h",
+      jsxFragment: "Fragment"
+    } : void 0
   };
 }
 
@@ -2528,17 +2541,13 @@ function addEntrypoints(manifest, entrypoints, buildOutput) {
   if (contentScripts?.length) {
     const cssMap = getContentScriptsCssMap(buildOutput, contentScripts);
     if (wxt.config.command === "serve" && wxt.config.manifestVersion === 3) {
-      const hostPermissions = new Set(manifest.host_permissions ?? []);
       contentScripts.forEach((script) => {
         script.options.matches.forEach((matchPattern) => {
-          hostPermissions.add(matchPattern);
+          addHostPermission(manifest, matchPattern);
         });
       });
-      hostPermissions.forEach(
-        (permission) => addHostPermission(manifest, permission)
-      );
     } else {
-      const hashToEntrypointsMap = contentScripts.reduce((map, script) => {
+      const hashToEntrypointsMap = contentScripts.filter((cs) => cs.options.registration !== "runtime").reduce((map, script) => {
         const hash = hashContentScriptOptions(script.options);
         if (map.has(hash))
           map.get(hash)?.push(script);
@@ -2546,8 +2555,10 @@ function addEntrypoints(manifest, entrypoints, buildOutput) {
           map.set(hash, [script]);
         return map;
       }, /* @__PURE__ */ new Map());
-      const newContentScripts = Array.from(hashToEntrypointsMap.entries()).map(
-        ([, scripts]) => mapWxtOptionsToContentScript(
+      const manifestContentScripts = Array.from(
+        hashToEntrypointsMap.values()
+      ).map(
+        (scripts) => mapWxtOptionsToContentScript(
           scripts[0].options,
           scripts.map(
             (entry) => getEntrypointBundlePath(entry, wxt.config.outDir, ".js")
@@ -2555,10 +2566,23 @@ function addEntrypoints(manifest, entrypoints, buildOutput) {
           getContentScriptCssFiles(scripts, cssMap)
         )
       );
-      if (newContentScripts.length >= 0) {
+      if (manifestContentScripts.length >= 0) {
         manifest.content_scripts ??= [];
-        manifest.content_scripts.push(...newContentScripts);
+        manifest.content_scripts.push(...manifestContentScripts);
       }
+      const runtimeContentScripts = contentScripts.filter(
+        (cs) => cs.options.registration === "runtime"
+      );
+      if (runtimeContentScripts.length > 0 && wxt.config.manifestVersion === 2) {
+        throw Error(
+          'Cannot use `registration: "runtime"` with MV2 content scripts, it is a MV3-only feature.'
+        );
+      }
+      runtimeContentScripts.forEach((script) => {
+        script.options.matches.forEach((matchPattern) => {
+          addHostPermission(manifest, matchPattern);
+        });
+      });
     }
     const contentScriptCssResources = getContentScriptCssWebAccessibleResources(
       contentScripts,
@@ -2959,6 +2983,7 @@ export {
   registerWxt,
   detectDevChanges,
   getEntrypointBundlePath,
+  isHtmlEntrypoint,
   findEntrypoints,
   generateTypesDir,
   formatDuration,

package/dist/cli.js

@@ -237,6 +237,9 @@ function resolvePerBrowserOptions(options, browser) {
     ])
   );
 }
+function isHtmlEntrypoint(entrypoint) {
+  return entrypoint.inputPath.endsWith(".html");
+}
 
 // src/core/utils/constants.ts
 var VIRTUAL_NOOP_BACKGROUND_MODULE_ID = "virtual:user-background";
@@ -749,7 +752,7 @@ async function writePathsDeclarationFile(entrypoints) {
     (entry) => getEntrypointBundlePath(
       entry,
       wxt.config.outDir,
-      entry.inputPath.endsWith(".html") ? ".html" : ".js"
+      isHtmlEntrypoint(entry) ? ".html" : ".js"
     )
   ).concat(await getPublicFiles()).map(normalizePath).map((path8) => `    | "/${path8}"`).sort().join("\n");
   const template = `// Generated by wxt
@@ -1520,6 +1523,9 @@ async function createViteBuilder(inlineConfig, userConfig, wxtConfig) {
     return libMode;
   };
   const getMultiPageConfig = (entrypoints) => {
+    const htmlEntrypoints = new Set(
+      entrypoints.filter(isHtmlEntrypoint).map((e) => e.name)
+    );
     return {
       mode: wxtConfig.mode,
       plugins: [
@@ -1535,10 +1541,11 @@ async function createViteBuilder(inlineConfig, userConfig, wxtConfig) {
           output: {
             // Include a hash to prevent conflicts
             chunkFileNames: "chunks/[name]-[hash].js",
-            // Place JS entrypoints in main directory without a hash. (popup.html & popup.js are
-            // next to each other). The unique entrypoint name requirement prevents conflicts with
-            // scripts of the same name
-            entryFileNames: "[name].js",
+            entryFileNames: ({ name }) => {
+              if (htmlEntrypoints.has(name))
+                return "chunks/[name]-[hash].js";
+              return "[name].js";
+            },
             // We can't control the "name", so we need a hash to prevent conflicts
             assetFileNames: "assets/[name]-[hash].[ext]"
           }
@@ -1671,6 +1678,7 @@ async function resolveConfig(inlineConfig, command, server) {
   let userConfigMetadata;
   if (inlineConfig.configFile !== false) {
     const { config: loadedConfig, ...metadata } = await loadConfig({
+      configFile: inlineConfig.configFile,
       name: "wxt",
       cwd: inlineConfig.root ?? process.cwd(),
       rcFile: false,
@@ -2049,7 +2057,12 @@ function getEsbuildOptions(opts) {
   return {
     format: "cjs",
     loader: isJsx ? "tsx" : "ts",
-    jsx: isJsx ? "automatic" : void 0
+    ...isJsx ? {
+      // `h` and `Fragment` are undefined, but that's OK because JSX is never evaluated while
+      // grabbing the entrypoint's options.
+      jsxFactory: "h",
+      jsxFragment: "Fragment"
+    } : void 0
   };
 }
 
@@ -2168,7 +2181,7 @@ function getChunkSortWeight(filename) {
 import pc4 from "picocolors";
 
 // package.json
-var version = "0.16.9";
+var version = "0.16.11-alpha1";
 
 // src/core/utils/log/printHeader.ts
 import { consola as consola2 } from "consola";
@@ -2537,17 +2550,13 @@ function addEntrypoints(manifest, entrypoints, buildOutput) {
   if (contentScripts?.length) {
     const cssMap = getContentScriptsCssMap(buildOutput, contentScripts);
     if (wxt.config.command === "serve" && wxt.config.manifestVersion === 3) {
-      const hostPermissions = new Set(manifest.host_permissions ?? []);
       contentScripts.forEach((script) => {
         script.options.matches.forEach((matchPattern) => {
-          hostPermissions.add(matchPattern);
+          addHostPermission(manifest, matchPattern);
         });
       });
-      hostPermissions.forEach(
-        (permission) => addHostPermission(manifest, permission)
-      );
     } else {
-      const hashToEntrypointsMap = contentScripts.reduce((map, script) => {
+      const hashToEntrypointsMap = contentScripts.filter((cs) => cs.options.registration !== "runtime").reduce((map, script) => {
         const hash = hashContentScriptOptions(script.options);
         if (map.has(hash))
           map.get(hash)?.push(script);
@@ -2555,8 +2564,10 @@ function addEntrypoints(manifest, entrypoints, buildOutput) {
           map.set(hash, [script]);
         return map;
       }, /* @__PURE__ */ new Map());
-      const newContentScripts = Array.from(hashToEntrypointsMap.entries()).map(
-        ([, scripts]) => mapWxtOptionsToContentScript(
+      const manifestContentScripts = Array.from(
+        hashToEntrypointsMap.values()
+      ).map(
+        (scripts) => mapWxtOptionsToContentScript(
           scripts[0].options,
           scripts.map(
             (entry) => getEntrypointBundlePath(entry, wxt.config.outDir, ".js")
@@ -2564,10 +2575,23 @@ function addEntrypoints(manifest, entrypoints, buildOutput) {
           getContentScriptCssFiles(scripts, cssMap)
         )
       );
-      if (newContentScripts.length >= 0) {
+      if (manifestContentScripts.length >= 0) {
         manifest.content_scripts ??= [];
-        manifest.content_scripts.push(...newContentScripts);
+        manifest.content_scripts.push(...manifestContentScripts);
+      }
+      const runtimeContentScripts = contentScripts.filter(
+        (cs) => cs.options.registration === "runtime"
+      );
+      if (runtimeContentScripts.length > 0 && wxt.config.manifestVersion === 2) {
+        throw Error(
+          'Cannot use `registration: "runtime"` with MV2 content scripts, it is a MV3-only feature.'
+        );
       }
+      runtimeContentScripts.forEach((script) => {
+        script.options.matches.forEach((matchPattern) => {
+          addHostPermission(manifest, matchPattern);
+        });
+      });
     }
     const contentScriptCssResources = getContentScriptCssWebAccessibleResources(
       contentScripts,
@@ -3291,7 +3315,7 @@ function reloadContentScripts(steps, server) {
   }
 }
 function reloadHtmlPages(groups, server) {
-  const htmlEntries = groups.flat().filter((entry) => entry.inputPath.endsWith(".html"));
+  const htmlEntries = groups.flat().filter(isHtmlEntrypoint);
   htmlEntries.forEach((entry) => {
     const path8 = getEntrypointBundlePath(entry, wxt.config.outDir, ".html");
     server.reloadPage(path8);

package/dist/client.d.ts

@@ -1,4 +1,4 @@
-import { a as ContentScriptContext } from './index-nSEE-7AX.js';
+import { a as ContentScriptContext } from './index-v_64CCcw.js';
 import 'webextension-polyfill';
 
 interface IntegratedContentScriptUi<TMounted> extends ContentScriptUi<TMounted> {

package/dist/{index-GDr2OfIq.d.cts → index-h54vKikt.d.cts}

@@ -571,6 +571,18 @@ interface BaseContentScriptEntrypointOptions extends BaseEntrypointOptions {
      * @default "manifest"
      */
     cssInjectionMode?: PerBrowserOption<'manifest' | 'manual' | 'ui'>;
+    /**
+     * Specify how the content script is registered.
+     *
+     * - `"manifest"`: The content script will be added to the `content_scripts` entry in the
+     *   manifest. This is the normal and most well known way of registering a content script.
+     * - `"runtime"`: The content script's `matches` is added to `host_permissions` and you are
+     *   responsible for using the scripting API to register the content script dynamically at
+     *   runtime.
+     *
+     * @default "manifest"
+     */
+    registration?: PerBrowserOption<'manifest' | 'runtime'>;
 }
 interface MainWorldContentScriptEntrypointOptions extends BaseContentScriptEntrypointOptions {
     /**

package/dist/{index-GDr2OfIq.d.ts → index-h54vKikt.d.ts}

@@ -571,6 +571,18 @@ interface BaseContentScriptEntrypointOptions extends BaseEntrypointOptions {
      * @default "manifest"
      */
     cssInjectionMode?: PerBrowserOption<'manifest' | 'manual' | 'ui'>;
+    /**
+     * Specify how the content script is registered.
+     *
+     * - `"manifest"`: The content script will be added to the `content_scripts` entry in the
+     *   manifest. This is the normal and most well known way of registering a content script.
+     * - `"runtime"`: The content script's `matches` is added to `host_permissions` and you are
+     *   responsible for using the scripting API to register the content script dynamically at
+     *   runtime.
+     *
+     * @default "manifest"
+     */
+    registration?: PerBrowserOption<'manifest' | 'runtime'>;
 }
 interface MainWorldContentScriptEntrypointOptions extends BaseContentScriptEntrypointOptions {
     /**

package/dist/{index-nSEE-7AX.d.ts → index-v_64CCcw.d.ts}

@@ -176,6 +176,18 @@ interface BaseContentScriptEntrypointOptions extends BaseEntrypointOptions {
      * @default "manifest"
      */
     cssInjectionMode?: PerBrowserOption<'manifest' | 'manual' | 'ui'>;
+    /**
+     * Specify how the content script is registered.
+     *
+     * - `"manifest"`: The content script will be added to the `content_scripts` entry in the
+     *   manifest. This is the normal and most well known way of registering a content script.
+     * - `"runtime"`: The content script's `matches` is added to `host_permissions` and you are
+     *   responsible for using the scripting API to register the content script dynamically at
+     *   runtime.
+     *
+     * @default "manifest"
+     */
+    registration?: PerBrowserOption<'manifest' | 'runtime'>;
 }
 interface MainWorldContentScriptEntrypointOptions extends BaseContentScriptEntrypointOptions {
     /**

package/dist/index.cjs

@@ -2660,6 +2660,9 @@ function resolvePerBrowserOptions(options, browser) {
     ])
   );
 }
+function isHtmlEntrypoint(entrypoint) {
+  return entrypoint.inputPath.endsWith(".html");
+}
 
 // src/core/utils/constants.ts
 var VIRTUAL_NOOP_BACKGROUND_MODULE_ID = "virtual:user-background";
@@ -3172,7 +3175,7 @@ async function writePathsDeclarationFile(entrypoints) {
     (entry) => getEntrypointBundlePath(
       entry,
       wxt.config.outDir,
-      entry.inputPath.endsWith(".html") ? ".html" : ".js"
+      isHtmlEntrypoint(entry) ? ".html" : ".js"
     )
   ).concat(await getPublicFiles()).map(normalizePath).map((path11) => `    | "/${path11}"`).sort().join("\n");
   const template = `// Generated by wxt
@@ -3946,6 +3949,9 @@ async function createViteBuilder(inlineConfig, userConfig, wxtConfig) {
     return libMode;
   };
   const getMultiPageConfig = (entrypoints) => {
+    const htmlEntrypoints = new Set(
+      entrypoints.filter(isHtmlEntrypoint).map((e) => e.name)
+    );
     return {
       mode: wxtConfig.mode,
       plugins: [
@@ -3961,10 +3967,11 @@ async function createViteBuilder(inlineConfig, userConfig, wxtConfig) {
           output: {
             // Include a hash to prevent conflicts
             chunkFileNames: "chunks/[name]-[hash].js",
-            // Place JS entrypoints in main directory without a hash. (popup.html & popup.js are
-            // next to each other). The unique entrypoint name requirement prevents conflicts with
-            // scripts of the same name
-            entryFileNames: "[name].js",
+            entryFileNames: ({ name }) => {
+              if (htmlEntrypoints.has(name))
+                return "chunks/[name]-[hash].js";
+              return "[name].js";
+            },
             // We can't control the "name", so we need a hash to prevent conflicts
             assetFileNames: "assets/[name]-[hash].[ext]"
           }
@@ -4097,6 +4104,7 @@ async function resolveConfig(inlineConfig, command, server) {
   let userConfigMetadata;
   if (inlineConfig.configFile !== false) {
     const { config: loadedConfig, ...metadata } = await (0, import_c12.loadConfig)({
+      configFile: inlineConfig.configFile,
       name: "wxt",
       cwd: inlineConfig.root ?? process.cwd(),
       rcFile: false,
@@ -4476,7 +4484,12 @@ function getEsbuildOptions(opts) {
   return {
     format: "cjs",
     loader: isJsx ? "tsx" : "ts",
-    jsx: isJsx ? "automatic" : void 0
+    ...isJsx ? {
+      // `h` and `Fragment` are undefined, but that's OK because JSX is never evaluated while
+      // grabbing the entrypoint's options.
+      jsxFactory: "h",
+      jsxFragment: "Fragment"
+    } : void 0
   };
 }
 
@@ -4595,7 +4608,7 @@ function getChunkSortWeight(filename) {
 var import_picocolors4 = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "0.16.9";
+var version = "0.16.11-alpha1";
 
 // src/core/utils/log/printHeader.ts
 var import_consola2 = require("consola");
@@ -4960,17 +4973,13 @@ function addEntrypoints(manifest, entrypoints, buildOutput) {
   if (contentScripts?.length) {
     const cssMap = getContentScriptsCssMap(buildOutput, contentScripts);
     if (wxt.config.command === "serve" && wxt.config.manifestVersion === 3) {
-      const hostPermissions = new Set(manifest.host_permissions ?? []);
       contentScripts.forEach((script) => {
         script.options.matches.forEach((matchPattern) => {
-          hostPermissions.add(matchPattern);
+          addHostPermission(manifest, matchPattern);
         });
       });
-      hostPermissions.forEach(
-        (permission) => addHostPermission(manifest, permission)
-      );
     } else {
-      const hashToEntrypointsMap = contentScripts.reduce((map, script) => {
+      const hashToEntrypointsMap = contentScripts.filter((cs) => cs.options.registration !== "runtime").reduce((map, script) => {
         const hash = hashContentScriptOptions(script.options);
         if (map.has(hash))
           map.get(hash)?.push(script);
@@ -4978,8 +4987,10 @@ function addEntrypoints(manifest, entrypoints, buildOutput) {
           map.set(hash, [script]);
         return map;
       }, /* @__PURE__ */ new Map());
-      const newContentScripts = Array.from(hashToEntrypointsMap.entries()).map(
-        ([, scripts]) => mapWxtOptionsToContentScript(
+      const manifestContentScripts = Array.from(
+        hashToEntrypointsMap.values()
+      ).map(
+        (scripts) => mapWxtOptionsToContentScript(
           scripts[0].options,
           scripts.map(
             (entry) => getEntrypointBundlePath(entry, wxt.config.outDir, ".js")
@@ -4987,10 +4998,23 @@ function addEntrypoints(manifest, entrypoints, buildOutput) {
           getContentScriptCssFiles(scripts, cssMap)
         )
       );
-      if (newContentScripts.length >= 0) {
+      if (manifestContentScripts.length >= 0) {
         manifest.content_scripts ??= [];
-        manifest.content_scripts.push(...newContentScripts);
+        manifest.content_scripts.push(...manifestContentScripts);
+      }
+      const runtimeContentScripts = contentScripts.filter(
+        (cs) => cs.options.registration === "runtime"
+      );
+      if (runtimeContentScripts.length > 0 && wxt.config.manifestVersion === 2) {
+        throw Error(
+          'Cannot use `registration: "runtime"` with MV2 content scripts, it is a MV3-only feature.'
+        );
       }
+      runtimeContentScripts.forEach((script) => {
+        script.options.matches.forEach((matchPattern) => {
+          addHostPermission(manifest, matchPattern);
+        });
+      });
     }
     const contentScriptCssResources = getContentScriptCssWebAccessibleResources(
       contentScripts,
@@ -5724,7 +5748,7 @@ function reloadContentScripts(steps, server) {
   }
 }
 function reloadHtmlPages(groups, server) {
-  const htmlEntries = groups.flat().filter((entry) => entry.inputPath.endsWith(".html"));
+  const htmlEntries = groups.flat().filter(isHtmlEntrypoint);
   htmlEntries.forEach((entry) => {
     const path11 = getEntrypointBundlePath(entry, wxt.config.outDir, ".html");
     server.reloadPage(path11);

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { I as InlineConfig, B as BuildOutput, U as UserConfig, E as ExtensionRunnerConfig, W as WxtDevServer } from './index-GDr2OfIq.cjs';
-export { v as BackgroundDefinition, l as BackgroundEntrypoint, g as BackgroundEntrypointOptions, h as BaseContentScriptEntrypointOptions, k as BaseEntrypoint, f as BaseEntrypointOptions, d as BuildStepOutput, D as ConfigEnv, u as ContentScriptDefinition, C as ContentScriptEntrypoint, p as Entrypoint, q as EntrypointGroup, _ as EslintGlobalsPropValue, $ as Eslintrc, Y as ExtensionRunner, X as FsCache, G as GenericEntrypoint, K as HookResult, s as IsolatedWorldContentScriptDefinition, i as IsolatedWorldContentScriptEntrypointOptions, L as Logger, t as MainWorldContentScriptDefinition, M as MainWorldContentScriptEntrypointOptions, r as OnContentScriptStopped, n as OptionsEntrypoint, j as OptionsEntrypointOptions, c as OutputAsset, b as OutputChunk, O as OutputFile, y as PerBrowserMap, x as PerBrowserOption, m as PopupEntrypoint, P as PopupEntrypointOptions, V as ResolvedConfig, a0 as ResolvedEslintrc, R as ResolvedPerBrowserOptions, J as ServerInfo, o as SidepanelEntrypoint, S as SidepanelEntrypointOptions, T as TargetBrowser, e as TargetManifestVersion, w as UnlistedScriptDefinition, z as UserManifest, A as UserManifestFn, Z as VirtualEntrypointType, Q as Wxt, F as WxtBuilder, H as WxtBuilderServer, N as WxtHooks, a2 as WxtResolvedUnimportOptions, a1 as WxtUnimportOptions, a as WxtViteConfig } from './index-GDr2OfIq.cjs';
+import { I as InlineConfig, B as BuildOutput, U as UserConfig, E as ExtensionRunnerConfig, W as WxtDevServer } from './index-h54vKikt.cjs';
+export { v as BackgroundDefinition, l as BackgroundEntrypoint, g as BackgroundEntrypointOptions, h as BaseContentScriptEntrypointOptions, k as BaseEntrypoint, f as BaseEntrypointOptions, d as BuildStepOutput, D as ConfigEnv, u as ContentScriptDefinition, C as ContentScriptEntrypoint, p as Entrypoint, q as EntrypointGroup, _ as EslintGlobalsPropValue, $ as Eslintrc, Y as ExtensionRunner, X as FsCache, G as GenericEntrypoint, K as HookResult, s as IsolatedWorldContentScriptDefinition, i as IsolatedWorldContentScriptEntrypointOptions, L as Logger, t as MainWorldContentScriptDefinition, M as MainWorldContentScriptEntrypointOptions, r as OnContentScriptStopped, n as OptionsEntrypoint, j as OptionsEntrypointOptions, c as OutputAsset, b as OutputChunk, O as OutputFile, y as PerBrowserMap, x as PerBrowserOption, m as PopupEntrypoint, P as PopupEntrypointOptions, V as ResolvedConfig, a0 as ResolvedEslintrc, R as ResolvedPerBrowserOptions, J as ServerInfo, o as SidepanelEntrypoint, S as SidepanelEntrypointOptions, T as TargetBrowser, e as TargetManifestVersion, w as UnlistedScriptDefinition, z as UserManifest, A as UserManifestFn, Z as VirtualEntrypointType, Q as Wxt, F as WxtBuilder, H as WxtBuilderServer, N as WxtHooks, a2 as WxtResolvedUnimportOptions, a1 as WxtUnimportOptions, a as WxtViteConfig } from './index-h54vKikt.cjs';
 import 'vite';
 import 'webextension-polyfill';
 import 'unimport';
@@ -64,6 +64,6 @@ declare function prepare(config: InlineConfig): Promise<void>;
  */
 declare function zip(config?: InlineConfig): Promise<string[]>;
 
-var version = "0.16.9";
+var version = "0.16.11-alpha1";
 
 export { BuildOutput, ExtensionRunnerConfig, InlineConfig, UserConfig, WxtDevServer, build, clean, createServer, defineConfig, defineRunnerConfig, initialize, prepare, version, zip };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { I as InlineConfig, B as BuildOutput, U as UserConfig, E as ExtensionRunnerConfig, W as WxtDevServer } from './index-GDr2OfIq.js';
-export { v as BackgroundDefinition, l as BackgroundEntrypoint, g as BackgroundEntrypointOptions, h as BaseContentScriptEntrypointOptions, k as BaseEntrypoint, f as BaseEntrypointOptions, d as BuildStepOutput, D as ConfigEnv, u as ContentScriptDefinition, C as ContentScriptEntrypoint, p as Entrypoint, q as EntrypointGroup, _ as EslintGlobalsPropValue, $ as Eslintrc, Y as ExtensionRunner, X as FsCache, G as GenericEntrypoint, K as HookResult, s as IsolatedWorldContentScriptDefinition, i as IsolatedWorldContentScriptEntrypointOptions, L as Logger, t as MainWorldContentScriptDefinition, M as MainWorldContentScriptEntrypointOptions, r as OnContentScriptStopped, n as OptionsEntrypoint, j as OptionsEntrypointOptions, c as OutputAsset, b as OutputChunk, O as OutputFile, y as PerBrowserMap, x as PerBrowserOption, m as PopupEntrypoint, P as PopupEntrypointOptions, V as ResolvedConfig, a0 as ResolvedEslintrc, R as ResolvedPerBrowserOptions, J as ServerInfo, o as SidepanelEntrypoint, S as SidepanelEntrypointOptions, T as TargetBrowser, e as TargetManifestVersion, w as UnlistedScriptDefinition, z as UserManifest, A as UserManifestFn, Z as VirtualEntrypointType, Q as Wxt, F as WxtBuilder, H as WxtBuilderServer, N as WxtHooks, a2 as WxtResolvedUnimportOptions, a1 as WxtUnimportOptions, a as WxtViteConfig } from './index-GDr2OfIq.js';
+import { I as InlineConfig, B as BuildOutput, U as UserConfig, E as ExtensionRunnerConfig, W as WxtDevServer } from './index-h54vKikt.js';
+export { v as BackgroundDefinition, l as BackgroundEntrypoint, g as BackgroundEntrypointOptions, h as BaseContentScriptEntrypointOptions, k as BaseEntrypoint, f as BaseEntrypointOptions, d as BuildStepOutput, D as ConfigEnv, u as ContentScriptDefinition, C as ContentScriptEntrypoint, p as Entrypoint, q as EntrypointGroup, _ as EslintGlobalsPropValue, $ as Eslintrc, Y as ExtensionRunner, X as FsCache, G as GenericEntrypoint, K as HookResult, s as IsolatedWorldContentScriptDefinition, i as IsolatedWorldContentScriptEntrypointOptions, L as Logger, t as MainWorldContentScriptDefinition, M as MainWorldContentScriptEntrypointOptions, r as OnContentScriptStopped, n as OptionsEntrypoint, j as OptionsEntrypointOptions, c as OutputAsset, b as OutputChunk, O as OutputFile, y as PerBrowserMap, x as PerBrowserOption, m as PopupEntrypoint, P as PopupEntrypointOptions, V as ResolvedConfig, a0 as ResolvedEslintrc, R as ResolvedPerBrowserOptions, J as ServerInfo, o as SidepanelEntrypoint, S as SidepanelEntrypointOptions, T as TargetBrowser, e as TargetManifestVersion, w as UnlistedScriptDefinition, z as UserManifest, A as UserManifestFn, Z as VirtualEntrypointType, Q as Wxt, F as WxtBuilder, H as WxtBuilderServer, N as WxtHooks, a2 as WxtResolvedUnimportOptions, a1 as WxtUnimportOptions, a as WxtViteConfig } from './index-h54vKikt.js';
 import 'vite';
 import 'webextension-polyfill';
 import 'unimport';
@@ -64,6 +64,6 @@ declare function prepare(config: InlineConfig): Promise<void>;
  */
 declare function zip(config?: InlineConfig): Promise<string[]>;
 
-var version = "0.16.9";
+var version = "0.16.11-alpha1";
 
 export { BuildOutput, ExtensionRunnerConfig, InlineConfig, UserConfig, WxtDevServer, build, clean, createServer, defineConfig, defineRunnerConfig, initialize, prepare, version, zip };

package/dist/index.js

@@ -8,6 +8,7 @@ import {
   getEntrypointBundlePath,
   getPackageJson,
   internalBuild,
+  isHtmlEntrypoint,
   kebabCaseAlphanumeric,
   mapWxtOptionsToRegisteredContentScript,
   printFileList,
@@ -16,7 +17,7 @@ import {
   unnormalizePath,
   version,
   wxt
-} from "./chunk-CKAPFUPR.js";
+} from "./chunk-UNU4RJJA.js";
 import "./chunk-VBXJIVYU.js";
 
 // src/core/build.ts
@@ -378,7 +379,7 @@ function reloadContentScripts(steps, server) {
   }
 }
 function reloadHtmlPages(groups, server) {
-  const htmlEntries = groups.flat().filter((entry) => entry.inputPath.endsWith(".html"));
+  const htmlEntries = groups.flat().filter(isHtmlEntrypoint);
   htmlEntries.forEach((entry) => {
     const path3 = getEntrypointBundlePath(entry, wxt.config.outDir, ".html");
     server.reloadPage(path3);

package/dist/sandbox.d.ts

@@ -1,4 +1,4 @@
-import { U as UnlistedScriptDefinition, B as BackgroundDefinition, C as ContentScriptDefinition } from './index-nSEE-7AX.js';
+import { U as UnlistedScriptDefinition, B as BackgroundDefinition, C as ContentScriptDefinition } from './index-v_64CCcw.js';
 export * from '@webext-core/match-patterns';
 import 'webextension-polyfill';
 

package/dist/testing.cjs

@@ -64,6 +64,9 @@ function getEntrypointBundlePath(entrypoint, outDir, ext) {
     (0, import_node_path2.relative)(outDir, getEntrypointOutputFile(entrypoint, ext))
   );
 }
+function isHtmlEntrypoint(entrypoint) {
+  return entrypoint.inputPath.endsWith(".html");
+}
 
 // src/core/builders/vite/plugins/devHtmlPrerender.ts
 var import_linkedom = require("linkedom");
@@ -837,6 +840,9 @@ async function createViteBuilder(inlineConfig, userConfig, wxtConfig) {
     return libMode;
   };
   const getMultiPageConfig = (entrypoints) => {
+    const htmlEntrypoints = new Set(
+      entrypoints.filter(isHtmlEntrypoint).map((e) => e.name)
+    );
     return {
       mode: wxtConfig.mode,
       plugins: [
@@ -852,10 +858,11 @@ async function createViteBuilder(inlineConfig, userConfig, wxtConfig) {
           output: {
             // Include a hash to prevent conflicts
             chunkFileNames: "chunks/[name]-[hash].js",
-            // Place JS entrypoints in main directory without a hash. (popup.html & popup.js are
-            // next to each other). The unique entrypoint name requirement prevents conflicts with
-            // scripts of the same name
-            entryFileNames: "[name].js",
+            entryFileNames: ({ name }) => {
+              if (htmlEntrypoints.has(name))
+                return "chunks/[name]-[hash].js";
+              return "[name].js";
+            },
             // We can't control the "name", so we need a hash to prevent conflicts
             assetFileNames: "assets/[name]-[hash].[ext]"
           }
@@ -977,6 +984,7 @@ async function resolveConfig(inlineConfig, command, server) {
   let userConfigMetadata;
   if (inlineConfig.configFile !== false) {
     const { config: loadedConfig, ...metadata } = await (0, import_c12.loadConfig)({
+      configFile: inlineConfig.configFile,
       name: "wxt",
       cwd: inlineConfig.root ?? process.cwd(),
       rcFile: false,

package/dist/testing.d.cts

@@ -1,6 +1,6 @@
 export { FakeBrowser, fakeBrowser } from '@webext-core/fake-browser';
 import * as vite from 'vite';
-import { I as InlineConfig } from './index-GDr2OfIq.cjs';
+import { I as InlineConfig } from './index-h54vKikt.cjs';
 import 'webextension-polyfill';
 import 'unimport';
 import 'consola';

package/dist/testing.d.ts

@@ -1,6 +1,6 @@
 export { FakeBrowser, fakeBrowser } from '@webext-core/fake-browser';
 import * as vite from 'vite';
-import { I as InlineConfig } from './index-GDr2OfIq.js';
+import { I as InlineConfig } from './index-h54vKikt.js';
 import 'webextension-polyfill';
 import 'unimport';
 import 'consola';

package/dist/testing.js

@@ -5,7 +5,7 @@ import {
   tsconfigPaths,
   unimport,
   webextensionPolyfillMock
-} from "./chunk-CKAPFUPR.js";
+} from "./chunk-UNU4RJJA.js";
 import "./chunk-VBXJIVYU.js";
 
 // src/testing/fake-browser.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wxt",
   "type": "module",
-  "version": "0.16.9",
+  "version": "0.16.11-alpha1",
   "description": "Next gen framework for developing web extensions",
   "engines": {
     "node": ">=18",