wxt 0.19.15 → 0.19.17

package/dist/builtin-modules/unimport.mjs

@@ -7,7 +7,7 @@ export default defineWxtModule({
     const options = wxt.config.imports;
     if (options === false) return;
     let unimport;
-    wxt.hooks.hook("ready", () => {
+    wxt.hooks.hook("config:resolved", () => {
       const addModuleImports = (module) => {
         if (!module.imports) return;
         options.imports ??= [];
@@ -17,7 +17,7 @@ export default defineWxtModule({
       wxt.config.userModules.forEach(addModuleImports);
     });
     wxt.hooks.afterEach((event) => {
-      if (event.name === "ready") {
+      if (event.name === "config:resolved") {
         unimport = createUnimport(options);
       }
     });

package/dist/client/content-scripts/ui/index.mjs

@@ -13,6 +13,7 @@ export function createIntegratedUi(ctx, options) {
   };
   const remove = () => {
     options.onRemove?.(mounted);
+    wrapper.replaceChildren();
     wrapper.remove();
     mounted = void 0;
   };

package/dist/core/builders/vite/index.d.ts

@@ -1,3 +1,3 @@
 import { ResolvedConfig, WxtBuilder, WxtDevServer, WxtHooks } from '../../../types';
 import { Hookable } from 'hookable';
-export declare function createViteBuilder(wxtConfig: ResolvedConfig, hooks: Hookable<WxtHooks>, server?: WxtDevServer): Promise<WxtBuilder>;
+export declare function createViteBuilder(wxtConfig: ResolvedConfig, hooks: Hookable<WxtHooks>, getWxtDevServer?: () => WxtDevServer | undefined): Promise<WxtBuilder>;

package/dist/core/builders/vite/index.mjs

@@ -9,7 +9,7 @@ import { importEntrypointFile } from "../../utils/building/index.mjs";
 import { ViteNodeServer } from "vite-node/server";
 import { ViteNodeRunner } from "vite-node/client";
 import { installSourcemapsSupport } from "vite-node/source-map";
-export async function createViteBuilder(wxtConfig, hooks, server) {
+export async function createViteBuilder(wxtConfig, hooks, getWxtDevServer) {
   const vite = await import("vite");
   const getBaseConfig = async (baseConfigOptions) => {
     const config = await wxtConfig.vite(wxtConfig.env);
@@ -33,6 +33,7 @@ export async function createViteBuilder(wxtConfig, hooks, server) {
     config.server.watch = {
       ignored: [`${wxtConfig.outBaseDir}/**`, `${wxtConfig.wxtDir}/**`]
     };
+    const server = getWxtDevServer?.();
     config.plugins ??= [];
     config.plugins.push(
       wxtPlugins.download(wxtConfig),
@@ -180,18 +181,18 @@ export async function createViteBuilder(wxtConfig, hooks, server) {
             plugins: [wxtPlugins.removeEntrypointMainFunction(wxtConfig, path)]
           };
           const config = vite.mergeConfig(baseConfig, envConfig);
-          const server2 = await vite.createServer(config);
-          await server2.pluginContainer.buildStart({});
+          const server = await vite.createServer(config);
+          await server.pluginContainer.buildStart({});
           const node = new ViteNodeServer(
             // @ts-ignore: Some weird type error...
-            server2
+            server
           );
           installSourcemapsSupport({
             getSourceMap: (source) => node.getSourceMap(source)
           });
           const runner = new ViteNodeRunner({
-            root: server2.config.root,
-            base: server2.config.base,
+            root: server.config.root,
+            base: server.config.base,
             // when having the server and runner in a different context,
             // you will need to handle the communication between them
             // and pass to this function
@@ -203,7 +204,7 @@ export async function createViteBuilder(wxtConfig, hooks, server) {
             }
           });
           const res = await runner.executeFile(path);
-          await server2.close();
+          await server.close();
           return res.default;
         }
       }
@@ -239,7 +240,7 @@ export async function createViteBuilder(wxtConfig, hooks, server) {
       const finalConfig = vite.mergeConfig(baseConfig, serverConfig);
       await hooks.callHook("vite:devServer:extendConfig", finalConfig);
       const viteServer = await vite.createServer(finalConfig);
-      const server2 = {
+      const server = {
         async listen() {
           await viteServer.listen(info.port);
         },
@@ -259,7 +260,7 @@ export async function createViteBuilder(wxtConfig, hooks, server) {
         },
         watcher: viteServer.watcher
       };
-      return server2;
+      return server;
     }
   };
 }

package/dist/core/create-server.mjs

@@ -14,66 +14,98 @@ import { createExtensionRunner } from "./runners/index.mjs";
 import { Mutex } from "async-mutex";
 import pc from "picocolors";
 import { relative } from "node:path";
-import { registerWxt, wxt } from "./wxt.mjs";
+import { deinitWxtModules, initWxtModules, registerWxt, wxt } from "./wxt.mjs";
 import { unnormalizePath } from "./utils/paths.mjs";
 import {
   getContentScriptJs,
   mapWxtOptionsToRegisteredContentScript
 } from "./utils/content-scripts.mjs";
 export async function createServer(inlineConfig) {
-  await registerWxt("serve", inlineConfig, async (config) => {
-    const { port, hostname } = config.dev.server;
-    const serverInfo = {
+  await registerWxt("serve", inlineConfig);
+  wxt.server = await createServerInternal();
+  await wxt.hooks.callHook("server:created", wxt, wxt.server);
+  return wxt.server;
+}
+async function createServerInternal() {
+  const getServerInfo = () => {
+    const { port, hostname } = wxt.config.dev.server;
+    return {
       port,
       hostname,
       origin: `http://${hostname}:${port}`
     };
-    const server2 = {
-      ...serverInfo,
-      get watcher() {
-        return builderServer.watcher;
-      },
-      get ws() {
-        return builderServer.ws;
-      },
-      currentOutput: void 0,
-      async start() {
-        await builderServer.listen();
-        wxt.logger.success(`Started dev server @ ${serverInfo.origin}`);
-        await buildAndOpenBrowser();
-      },
-      async stop() {
-        await runner.closeBrowser();
-        await builderServer.close();
-      },
-      async restart() {
-        await closeAndRecreateRunner();
-        await buildAndOpenBrowser();
-      },
-      transformHtml(url, html, originalUrl) {
-        return builderServer.transformHtml(url, html, originalUrl);
-      },
-      reloadContentScript(payload) {
-        server2.ws.send("wxt:reload-content-script", payload);
-      },
-      reloadPage(path) {
-        server2.ws.send("wxt:reload-page", path);
-      },
-      reloadExtension() {
-        server2.ws.send("wxt:reload-extension");
-      },
-      async restartBrowser() {
-        await closeAndRecreateRunner();
-        await runner.openBrowser();
-      }
-    };
-    return server2;
-  });
-  const server = wxt.server;
+  };
   let [runner, builderServer] = await Promise.all([
     createExtensionRunner(),
-    wxt.builder.createServer(server)
+    wxt.builder.createServer(getServerInfo())
   ]);
+  let wasStopped = false;
+  const server = {
+    get hostname() {
+      return getServerInfo().hostname;
+    },
+    get port() {
+      return getServerInfo().port;
+    },
+    get origin() {
+      return getServerInfo().origin;
+    },
+    get watcher() {
+      return builderServer.watcher;
+    },
+    get ws() {
+      return builderServer.ws;
+    },
+    currentOutput: void 0,
+    async start() {
+      if (wasStopped) {
+        await wxt.reloadConfig();
+        runner = await createExtensionRunner();
+        builderServer = await wxt.builder.createServer(getServerInfo());
+        await initWxtModules();
+      }
+      await builderServer.listen();
+      wxt.logger.success(`Started dev server @ ${server.origin}`);
+      await wxt.hooks.callHook("server:started", wxt, server);
+      await buildAndOpenBrowser();
+      server.ws.on("wxt:background-initialized", () => {
+        if (server.currentOutput == null) return;
+        reloadContentScripts(server.currentOutput.steps, server);
+      });
+      const reloadOnChange = createFileReloader(server);
+      server.watcher.on("all", reloadOnChange);
+    },
+    async stop() {
+      wasStopped = true;
+      await runner.closeBrowser();
+      await builderServer.close();
+      await wxt.hooks.callHook("server:closed", wxt, server);
+      deinitWxtModules();
+      server.currentOutput = void 0;
+    },
+    async restart() {
+      await server.stop();
+      await server.start();
+    },
+    transformHtml(url, html, originalUrl) {
+      return builderServer.transformHtml(url, html, originalUrl);
+    },
+    reloadContentScript(payload) {
+      server.ws.send("wxt:reload-content-script", payload);
+    },
+    reloadPage(path) {
+      server.ws.send("wxt:reload-page", path);
+    },
+    reloadExtension() {
+      server.ws.send("wxt:reload-extension");
+    },
+    async restartBrowser() {
+      await runner.closeBrowser();
+      await wxt.reloadConfig();
+      runner = await createExtensionRunner();
+      await runner.openBrowser();
+    }
+  };
   const buildAndOpenBrowser = async () => {
     server.currentOutput = await internalBuild();
     try {
@@ -83,17 +115,6 @@ export async function createServer(inlineConfig) {
     }
     await runner.openBrowser();
   };
-  const closeAndRecreateRunner = async () => {
-    await runner.closeBrowser();
-    await wxt.reloadConfig();
-    runner = await createExtensionRunner();
-  };
-  server.ws.on("wxt:background-initialized", () => {
-    if (server.currentOutput == null) return;
-    reloadContentScripts(server.currentOutput.steps, server);
-  });
-  const reloadOnChange = createFileReloader(server);
-  server.watcher.on("all", reloadOnChange);
   return server;
 }
 function createFileReloader(server) {

package/dist/core/generate-wxt-dir.mjs

@@ -125,7 +125,7 @@ ${commentLines.map((line) => `     * ${line}`.trimEnd()).join("\n")}
         message.message
       )
     ),
-    // Include a final union-based override so TS accepts valid string templates or concatinations
+    // Include a final union-based override so TS accepts valid string templates or concatenations
     // ie: browser.i18n.getMessage(`some_enum_${enumValue}`)
     renderGetMessageOverload(
       messages.map((message) => `"${message.name}"`).join(" | ")

package/dist/core/resolve-config.mjs

@@ -10,6 +10,7 @@ import { builtinModules } from "../builtin-modules/index.mjs";
 import { getEslintVersion } from "./utils/eslint.mjs";
 import { safeStringToNumber } from "./utils/number.mjs";
 import { loadEnv } from "./utils/env.mjs";
+import { getPort } from "get-port-please";
 export async function resolveConfig(inlineConfig, command) {
   let userConfig = {};
   let userConfigMetadata;
@@ -82,14 +83,19 @@ export async function resolveConfig(inlineConfig, command) {
   );
   let devServerConfig;
   if (command === "serve") {
+    const hostname = mergedConfig.dev?.server?.hostname ?? "localhost";
     let port = mergedConfig.dev?.server?.port;
     if (port == null || !isFinite(port)) {
-      const { default: getPort, portNumbers } = await import("get-port");
-      port = await getPort({ port: portNumbers(3e3, 3010) });
+      port = await getPort({
+        port: 3e3,
+        portRange: [3001, 3010],
+        // Passing host required for Mac, unsure of Windows/Linux
+        host: hostname
+      });
     }
     devServerConfig = {
       port,
-      hostname: mergedConfig.dev?.server?.hostname ?? "localhost",
+      hostname,
       watchDebounce: safeStringToNumber(process.env.WXT_WATCH_DEBOUNCE) ?? 800
     };
   }
@@ -274,9 +280,10 @@ async function getUnimportEslintOptions(wxtDir, options) {
     case "auto":
       const version = await getEslintVersion();
       let major = parseInt(version[0]);
+      if (isNaN(major)) eslintEnabled = false;
       if (major <= 8) eslintEnabled = 8;
       else if (major >= 9) eslintEnabled = 9;
-      else eslintEnabled = 8;
+      else eslintEnabled = false;
       break;
     case true:
       eslintEnabled = 8;

package/dist/core/utils/building/detect-dev-changes.d.ts

@@ -17,7 +17,11 @@ import { BuildOutput, BuildStepOutput, EntrypointGroup } from '../../../types';
  *   - Background script is changed
  *   - Manifest is different
  * - Restart browser
- *   - Config file changed (wxt.config.ts, .env, web-ext.config.ts, etc)
+ *   - web-ext.config.ts (runner config changes)
+ * - Full dev server restart
+ *   - wxt.config.ts (main config file)
+ *   - modules/* (any file related to WXT modules)
+ *   - .env (environment variable changed could effect build)
  */
 export declare function detectDevChanges(changedFiles: string[], currentOutput: BuildOutput): DevModeChange;
 /**

package/dist/core/utils/building/detect-dev-changes.mjs

@@ -7,6 +7,11 @@ export function detectDevChanges(changedFiles, currentOutput) {
     (file) => file === wxt.config.userConfigMetadata.configFile
   );
   if (isConfigChange) return { type: "full-restart" };
+  const isWxtModuleChange = some(
+    changedFiles,
+    (file) => file.startsWith(wxt.config.modulesDir)
+  );
+  if (isWxtModuleChange) return { type: "full-restart" };
   const isRunnerChange = some(
     changedFiles,
     (file) => file === wxt.config.runnerConfig.configFile

package/dist/core/utils/content-scripts.mjs

@@ -28,7 +28,7 @@ export function hashContentScriptOptions(options) {
 }
 export function mapWxtOptionsToContentScript(options, js, css) {
   return {
-    matches: options.matches,
+    matches: options.matches ?? [],
     all_frames: options.allFrames,
     match_about_blank: options.matchAboutBlank,
     exclude_globs: options.excludeGlobs,

package/dist/core/utils/manifest.d.ts

@@ -35,10 +35,10 @@ export declare function stripPathFromMatchPattern(pattern: string): string;
 /**
  * Converts all MV3 web accessible resources to their MV2 forms. MV3 web accessible resources are
  * generated in this file, and may be defined by the user in their manifest. In both cases, when
- * targetting MV2, automatically convert their definitions down to the basic MV2 array.
+ * targeting MV2, automatically convert their definitions down to the basic MV2 array.
  */
 export declare function convertWebAccessibleResourcesToMv2(manifest: Manifest.WebExtensionManifest): void;
 /**
  * Make sure all resources are in MV3 format. If not, add a wanring
  */
-export declare function validateMv3WebAccessbileResources(manifest: Manifest.WebExtensionManifest): void;
+export declare function validateMv3WebAccessibleResources(manifest: Manifest.WebExtensionManifest): void;

package/dist/core/utils/manifest.mjs

@@ -70,10 +70,11 @@ export async function generateManifest(entrypoints, buildOutput) {
   if (wxt.config.manifestVersion === 2) {
     convertWebAccessibleResourcesToMv2(manifest);
     convertActionToMv2(manifest);
+    convertCspToMv2(manifest);
     moveHostPermissionsToPermissions(manifest);
   }
   if (wxt.config.manifestVersion === 3) {
-    validateMv3WebAccessbileResources(manifest);
+    validateMv3WebAccessibleResources(manifest);
   }
   stripKeys(manifest);
   if (manifest.name == null)
@@ -262,7 +263,7 @@ function addEntrypoints(manifest, entrypoints, buildOutput) {
     const cssMap = getContentScriptsCssMap(buildOutput, contentScripts);
     if (wxt.config.command === "serve" && wxt.config.manifestVersion === 3) {
       contentScripts.forEach((script) => {
-        script.options.matches.forEach((matchPattern) => {
+        script.options.matches?.forEach((matchPattern) => {
           addHostPermission(manifest, matchPattern);
         });
       });
@@ -297,7 +298,7 @@ function addEntrypoints(manifest, entrypoints, buildOutput) {
         );
       }
       runtimeContentScripts.forEach((script) => {
-        script.options.matches.forEach((matchPattern) => {
+        script.options.matches?.forEach((matchPattern) => {
           addHostPermission(manifest, matchPattern);
         });
       });
@@ -353,28 +354,20 @@ function addDevModeCsp(manifest) {
     addPermission(manifest, permission);
   }
   const extensionPagesCsp = new ContentSecurityPolicy(
-    manifest.manifest_version === 3 ? (
-      // @ts-expect-error: extension_pages is not typed
-      manifest.content_security_policy?.extension_pages ?? "script-src 'self' 'wasm-unsafe-eval'; object-src 'self';"
-    ) : manifest.content_security_policy ?? "script-src 'self'; object-src 'self';"
-    // default CSP for MV2
+    // @ts-expect-error: extension_pages exists, we convert MV2 CSPs to this earlier in the process
+    manifest.content_security_policy?.extension_pages ?? (manifest.manifest_version === 3 ? DEFAULT_MV3_EXTENSION_PAGES_CSP : DEFAULT_MV2_CSP)
   );
   const sandboxCsp = new ContentSecurityPolicy(
     // @ts-expect-error: sandbox is not typed
-    manifest.content_security_policy?.sandbox ?? "sandbox allow-scripts allow-forms allow-popups allow-modals; script-src 'self' 'unsafe-inline' 'unsafe-eval'; child-src 'self';"
-    // default sandbox CSP for MV3
+    manifest.content_security_policy?.sandbox ?? DEFAULT_MV3_SANDBOX_CSP
   );
-  if (wxt.server) {
+  if (wxt.config.command === "serve") {
     extensionPagesCsp.add("script-src", allowedCsp);
     sandboxCsp.add("script-src", allowedCsp);
   }
-  if (manifest.manifest_version === 3) {
-    manifest.content_security_policy ??= {};
-    manifest.content_security_policy.extension_pages = extensionPagesCsp.toString();
-    manifest.content_security_policy.sandbox = sandboxCsp.toString();
-  } else {
-    manifest.content_security_policy = extensionPagesCsp.toString();
-  }
+  manifest.content_security_policy ??= {};
+  manifest.content_security_policy.extension_pages = extensionPagesCsp.toString();
+  manifest.content_security_policy.sandbox = sandboxCsp.toString();
 }
 function addDevModePermissions(manifest) {
   addPermission(manifest, "tabs");
@@ -400,7 +393,7 @@ export function getContentScriptCssWebAccessibleResources(contentScripts, conten
     if (cssFile == null) return;
     resources.push({
       resources: [cssFile],
-      matches: script.options.matches.map(
+      matches: script.options.matches?.map(
         (matchPattern) => stripPathFromMatchPattern(matchPattern)
       )
     });
@@ -457,7 +450,12 @@ function convertActionToMv2(manifest) {
     return;
   manifest.browser_action = manifest.action;
 }
-export function validateMv3WebAccessbileResources(manifest) {
+function convertCspToMv2(manifest) {
+  if (typeof manifest.content_security_policy === "string" || manifest.content_security_policy?.extension_pages == null)
+    return;
+  manifest.content_security_policy = manifest.content_security_policy.extension_pages;
+}
+export function validateMv3WebAccessibleResources(manifest) {
   if (manifest.web_accessible_resources == null) return;
   const stringResources = manifest.web_accessible_resources.filter(
     (item) => typeof item === "string"
@@ -510,3 +508,6 @@ const mv3OnlyKeys = [
   "side_panel"
 ];
 const firefoxMv3OnlyKeys = ["host_permissions"];
+const DEFAULT_MV3_EXTENSION_PAGES_CSP = "script-src 'self' 'wasm-unsafe-eval'; object-src 'self';";
+const DEFAULT_MV3_SANDBOX_CSP = "sandbox allow-scripts allow-forms allow-popups allow-modals; script-src 'self' 'unsafe-inline' 'unsafe-eval'; child-src 'self';";
+const DEFAULT_MV2_CSP = "script-src 'self'; object-src 'self';";