wxt 0.14.5 → 0.14.6

package/dist/index.js

@@ -15,7 +15,7 @@ import {
   rebuild,
   resolvePerBrowserOption,
   version
-} from "./chunk-YECUTQH3.js";
+} from "./chunk-XDRW7AKZ.js";
 import "./chunk-VBXJIVYU.js";
 
 // src/core/build.ts
@@ -91,7 +91,7 @@ function createWebExtRunner() {
   let runner;
   return {
     async openBrowser(config) {
-      config.logger.info("Opening browser...");
+      const startTime = Date.now();
       if (config.browser === "firefox" && config.manifestVersion === 3) {
         throw Error(
           "Dev mode does not support Firefox MV3. For alternatives, see https://github.com/wxt-dev/wxt/issues/230#issuecomment-1806881653"
@@ -136,7 +136,8 @@ function createWebExtRunner() {
       config.logger.debug("web-ext options:", options);
       const webExt = await import("web-ext-run");
       runner = await webExt.default.cmd.run(finalConfig, options);
-      config.logger.success("Opened!");
+      const duration = Date.now() - startTime;
+      config.logger.success(`Opened browser in ${formatDuration(duration)}`);
     },
     async closeBrowser() {
       return await runner?.exit();
@@ -211,19 +212,36 @@ async function createServer(inlineConfig) {
     hostname,
     origin
   };
+  const buildAndOpenBrowser = async () => {
+    server.currentOutput = await internalBuild(config);
+    await runner.openBrowser(config);
+  };
+  const closeAndRecreateRunner = async () => {
+    await runner.closeBrowser();
+    config = await getLatestConfig();
+    runner = await createExtensionRunner(config);
+  };
   const server = {
     ...serverInfo,
-    watcher: void 0,
-    // Filled out later down below
-    ws: void 0,
-    // Filled out later down below
+    get watcher() {
+      return builderServer.watcher;
+    },
+    get ws() {
+      return builderServer.ws;
+    },
     currentOutput: void 0,
-    // Filled out later down below
     async start() {
       await builderServer.listen();
       config.logger.success(`Started dev server @ ${serverInfo.origin}`);
-      server.currentOutput = await internalBuild(config);
-      await runner.openBrowser(config);
+      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);
@@ -236,17 +254,21 @@ async function createServer(inlineConfig) {
     },
     reloadExtension() {
       server.ws.send("wxt:reload-extension");
+    },
+    async restartBrowser() {
+      await closeAndRecreateRunner();
+      await runner.openBrowser(config);
     }
   };
   const getLatestConfig = () => getInternalConfig(inlineConfig ?? {}, "serve", server);
   let config = await getLatestConfig();
-  const [runner, builderServer] = await Promise.all([
+  let [runner, builderServer] = await Promise.all([
     createExtensionRunner(config),
     config.builder.createServer(server)
   ]);
-  server.watcher = builderServer.watcher;
-  server.ws = builderServer.ws;
   server.ws.on("wxt:background-initialized", () => {
+    if (server.currentOutput == null)
+      return;
     reloadContentScripts(server.currentOutput.steps, config, server);
   });
   const reloadOnChange = createFileReloader({
@@ -274,14 +296,30 @@ function createFileReloader(options) {
       return;
     changeQueue.push([event, path3]);
     await fileChangedMutex.runExclusive(async () => {
-      const fileChanges = changeQueue.splice(0, changeQueue.length);
+      if (server.currentOutput == null)
+        return;
+      const fileChanges = changeQueue.splice(0, changeQueue.length).map(([_, file]) => file);
       if (fileChanges.length === 0)
         return;
-      const changes = detectDevChanges(fileChanges, server.currentOutput);
+      const changes = detectDevChanges(
+        config,
+        fileChanges,
+        server.currentOutput
+      );
       if (changes.type === "no-change")
         return;
+      if (changes.type === "full-restart") {
+        config.logger.info("Config changed, restarting server...");
+        server.restart();
+        return;
+      }
+      if (changes.type === "browser-restart") {
+        config.logger.info("Runner config changed, restarting browser...");
+        server.restartBrowser();
+        return;
+      }
       config.logger.info(
-        `Changed: ${Array.from(new Set(fileChanges.map((change) => change[1]))).map((file) => pc2.dim(relative4(config.root, file))).join(", ")}`
+        `Changed: ${Array.from(new Set(fileChanges)).map((file) => pc2.dim(relative4(config.root, file))).join(", ")}`
       );
       const rebuiltNames = changes.rebuildGroups.flat().map((entry) => {
         return pc2.cyan(
@@ -315,6 +353,8 @@ function createFileReloader(options) {
 function reloadContentScripts(steps, config, server) {
   if (config.manifestVersion === 3) {
     steps.forEach((step) => {
+      if (server.currentOutput == null)
+        return;
       const entry = step.entrypoints;
       if (Array.isArray(entry) || entry.type !== "content-script")
         return;

package/dist/testing.cjs

@@ -896,6 +896,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);
         },
@@ -1161,6 +1164,11 @@ var import_fs_extra10 = __toESM(require("fs-extra"), 1);
 var import_immer = require("immer");
 var import_defu3 = __toESM(require("defu"), 1);
 
+// src/core/utils/building/internal-build.ts
+var import_manage_path = __toESM(require("manage-path"), 1);
+var import_node_path11 = require("path");
+var import_consola3 = __toESM(require("consola"), 1);
+
 // src/testing/wxt-vitest-plugin.ts
 function WxtVitest(inlineConfig) {
   return getInternalConfig(inlineConfig ?? {}, "serve").then((config) => [

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 './external-biT0d3qK.cjs';
+import { I as InlineConfig } from './external-mJ1bW7iy.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 './external-biT0d3qK.js';
+import { I as InlineConfig } from './external-mJ1bW7iy.js';
 import 'webextension-polyfill';
 import 'unimport';
 import 'consola';

package/dist/testing.js

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wxt",
   "type": "module",
-  "version": "0.14.5",
+  "version": "0.14.6",
   "description": "Next gen framework for developing web extensions",
   "engines": {
     "node": ">=18",
@@ -104,7 +104,9 @@
     "jiti": "^1.21.0",
     "json5": "^2.2.3",
     "linkedom": "^0.16.1",
+    "manage-path": "^2.0.0",
     "minimatch": "^9.0.3",
+    "natural-compare": "^1.4.0",
     "normalize-path": "^3.0.0",
     "ora": "^7.0.1",
     "picocolors": "^1.0.0",
@@ -120,6 +122,7 @@
     "@faker-js/faker": "^8.3.1",
     "@types/fs-extra": "^11.0.4",
     "@types/lodash.merge": "^4.6.9",
+    "@types/natural-compare": "^1.4.3",
     "@types/node": "^20.10.3",
     "@types/normalize-path": "^3.0.2",
     "@types/prompts": "^2.4.9",