wxt 0.18.7 → 0.18.8

package/dist/{chunk-A3R6ZPUA.js → chunk-Z3C7S5VV.js}

@@ -12,7 +12,7 @@ import {
 } from "./chunk-QGM4M3NI.js";
 
 // package.json
-var version = "0.18.6";
+var version = "0.18.7";
 
 // src/core/utils/paths.ts
 import systemPath from "node:path";
@@ -713,10 +713,13 @@ try {
       // Use "pre" so the new script is added before vite bundles all the scripts
       order: "pre",
       handler(html, _ctx) {
+        const src = config.command === "serve" ? `http://${config.dev.server?.hostname}:${config.dev.server?.port}/@id/${virtualHtmlModuleId}` : virtualHtmlModuleId;
         const { document } = parseHTML2(html);
+        const existing = document.querySelector(`script[src='${src}']`);
+        if (existing) return;
         const script = document.createElement("script");
         script.type = "module";
-        script.src = config.command === "serve" ? `http://${config.dev.server?.hostname}:${config.dev.server?.port}/@id/${virtualHtmlModuleId}` : virtualHtmlModuleId;
+        script.src = src;
         if (document.head == null) {
           const newHead = document.createElement("head");
           document.documentElement.prepend(newHead);
@@ -822,11 +825,25 @@ function detectDevChanges(changedFiles, currentOutput) {
       (changedFile) => findEffectedSteps(changedFile, currentOutput)
     )
   );
-  if (changedSteps.size === 0) return { type: "no-change" };
+  if (changedSteps.size === 0) {
+    const hasPublicChange = some(
+      changedFiles,
+      (file) => file.startsWith(wxt.config.publicDir)
+    );
+    if (hasPublicChange) {
+      return {
+        type: "extension-reload",
+        rebuildGroups: [],
+        cachedOutput: currentOutput
+      };
+    } else {
+      return { type: "no-change" };
+    }
+  }
   const unchangedOutput = {
     manifest: currentOutput.manifest,
     steps: [],
-    publicAssets: []
+    publicAssets: [...currentOutput.publicAssets]
   };
   const changedOutput = {
     manifest: currentOutput.manifest,
@@ -840,13 +857,6 @@ function detectDevChanges(changedFiles, currentOutput) {
       unchangedOutput.steps.push(step);
     }
   }
-  for (const asset of currentOutput.publicAssets) {
-    if (changedSteps.has(asset)) {
-      changedOutput.publicAssets.push(asset);
-    } else {
-      unchangedOutput.publicAssets.push(asset);
-    }
-  }
   const isOnlyHtmlChanges = changedFiles.length > 0 && every(changedFiles, (file) => file.endsWith(".html"));
   if (isOnlyHtmlChanges) {
     return {
@@ -887,10 +897,6 @@ function findEffectedSteps(changedFile, currentOutput) {
     const effectedChunk = step.chunks.find((chunk) => isChunkEffected(chunk));
     if (effectedChunk) changes.push(step);
   }
-  const effectedAsset = currentOutput.publicAssets.find(
-    (chunk) => isChunkEffected(chunk)
-  );
-  if (effectedAsset) changes.push(effectedAsset);
   return changes;
 }
 

package/dist/cli.js

@@ -917,10 +917,13 @@ try {
       // Use "pre" so the new script is added before vite bundles all the scripts
       order: "pre",
       handler(html, _ctx) {
+        const src = config.command === "serve" ? `http://${config.dev.server?.hostname}:${config.dev.server?.port}/@id/${virtualHtmlModuleId}` : virtualHtmlModuleId;
         const { document } = parseHTML2(html);
+        const existing = document.querySelector(`script[src='${src}']`);
+        if (existing) return;
         const script = document.createElement("script");
         script.type = "module";
-        script.src = config.command === "serve" ? `http://${config.dev.server?.hostname}:${config.dev.server?.port}/@id/${virtualHtmlModuleId}` : virtualHtmlModuleId;
+        script.src = src;
         if (document.head == null) {
           const newHead = document.createElement("head");
           document.documentElement.prepend(newHead);
@@ -1321,11 +1324,25 @@ function detectDevChanges(changedFiles, currentOutput) {
       (changedFile) => findEffectedSteps(changedFile, currentOutput)
     )
   );
-  if (changedSteps.size === 0) return { type: "no-change" };
+  if (changedSteps.size === 0) {
+    const hasPublicChange = some(
+      changedFiles,
+      (file) => file.startsWith(wxt.config.publicDir)
+    );
+    if (hasPublicChange) {
+      return {
+        type: "extension-reload",
+        rebuildGroups: [],
+        cachedOutput: currentOutput
+      };
+    } else {
+      return { type: "no-change" };
+    }
+  }
   const unchangedOutput = {
     manifest: currentOutput.manifest,
     steps: [],
-    publicAssets: []
+    publicAssets: [...currentOutput.publicAssets]
   };
   const changedOutput = {
     manifest: currentOutput.manifest,
@@ -1339,13 +1356,6 @@ function detectDevChanges(changedFiles, currentOutput) {
       unchangedOutput.steps.push(step);
     }
   }
-  for (const asset of currentOutput.publicAssets) {
-    if (changedSteps.has(asset)) {
-      changedOutput.publicAssets.push(asset);
-    } else {
-      unchangedOutput.publicAssets.push(asset);
-    }
-  }
   const isOnlyHtmlChanges = changedFiles.length > 0 && every(changedFiles, (file) => file.endsWith(".html"));
   if (isOnlyHtmlChanges) {
     return {
@@ -1386,10 +1396,6 @@ function findEffectedSteps(changedFile, currentOutput) {
     const effectedChunk = step.chunks.find((chunk) => isChunkEffected(chunk));
     if (effectedChunk) changes.push(step);
   }
-  const effectedAsset = currentOutput.publicAssets.find(
-    (chunk) => isChunkEffected(chunk)
-  );
-  if (effectedAsset) changes.push(effectedAsset);
   return changes;
 }
 
@@ -2609,7 +2615,7 @@ function getChunkSortWeight(filename) {
 import pc4 from "picocolors";
 
 // package.json
-var version = "0.18.6";
+var version = "0.18.7";
 
 // src/core/utils/log/printHeader.ts
 function printHeader() {
@@ -3690,6 +3696,7 @@ function createFileReloader(server) {
   return async (event, path11) => {
     await wxt.reloadConfig();
     if (path11.startsWith(wxt.config.outBaseDir)) return;
+    if (path11.startsWith(wxt.config.wxtDir)) return;
     changeQueue.push([event, path11]);
     await fileChangedMutex.runExclusive(async () => {
       if (server.currentOutput == null) return;

package/dist/index.cjs

@@ -10981,10 +10981,13 @@ try {
       // Use "pre" so the new script is added before vite bundles all the scripts
       order: "pre",
       handler(html, _ctx) {
+        const src2 = config.command === "serve" ? `http://${config.dev.server?.hostname}:${config.dev.server?.port}/@id/${virtualHtmlModuleId}` : virtualHtmlModuleId;
         const { document } = (0, import_linkedom2.parseHTML)(html);
+        const existing = document.querySelector(`script[src='${src2}']`);
+        if (existing) return;
         const script = document.createElement("script");
         script.type = "module";
-        script.src = config.command === "serve" ? `http://${config.dev.server?.hostname}:${config.dev.server?.port}/@id/${virtualHtmlModuleId}` : virtualHtmlModuleId;
+        script.src = src2;
         if (document.head == null) {
           const newHead = document.createElement("head");
           document.documentElement.prepend(newHead);
@@ -11382,11 +11385,25 @@ function detectDevChanges(changedFiles, currentOutput) {
       (changedFile) => findEffectedSteps(changedFile, currentOutput)
     )
   );
-  if (changedSteps.size === 0) return { type: "no-change" };
+  if (changedSteps.size === 0) {
+    const hasPublicChange = some(
+      changedFiles,
+      (file) => file.startsWith(wxt.config.publicDir)
+    );
+    if (hasPublicChange) {
+      return {
+        type: "extension-reload",
+        rebuildGroups: [],
+        cachedOutput: currentOutput
+      };
+    } else {
+      return { type: "no-change" };
+    }
+  }
   const unchangedOutput = {
     manifest: currentOutput.manifest,
     steps: [],
-    publicAssets: []
+    publicAssets: [...currentOutput.publicAssets]
   };
   const changedOutput = {
     manifest: currentOutput.manifest,
@@ -11400,13 +11417,6 @@ function detectDevChanges(changedFiles, currentOutput) {
       unchangedOutput.steps.push(step);
     }
   }
-  for (const asset of currentOutput.publicAssets) {
-    if (changedSteps.has(asset)) {
-      changedOutput.publicAssets.push(asset);
-    } else {
-      unchangedOutput.publicAssets.push(asset);
-    }
-  }
   const isOnlyHtmlChanges = changedFiles.length > 0 && every(changedFiles, (file) => file.endsWith(".html"));
   if (isOnlyHtmlChanges) {
     return {
@@ -11447,10 +11457,6 @@ function findEffectedSteps(changedFile, currentOutput) {
     const effectedChunk = step.chunks.find((chunk) => isChunkEffected(chunk));
     if (effectedChunk) changes.push(step);
   }
-  const effectedAsset = currentOutput.publicAssets.find(
-    (chunk) => isChunkEffected(chunk)
-  );
-  if (effectedAsset) changes.push(effectedAsset);
   return changes;
 }
 
@@ -12682,7 +12688,7 @@ function getChunkSortWeight(filename) {
 var import_picocolors4 = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "0.18.6";
+var version = "0.18.7";
 
 // src/core/utils/building/internal-build.ts
 var import_fast_glob4 = __toESM(require("fast-glob"), 1);
@@ -13767,6 +13773,7 @@ function createFileReloader(server) {
   return async (event, path12) => {
     await wxt.reloadConfig();
     if (path12.startsWith(wxt.config.outBaseDir)) return;
+    if (path12.startsWith(wxt.config.wxtDir)) return;
     changeQueue.push([event, path12]);
     await fileChangedMutex.runExclusive(async () => {
       if (server.currentOutput == null) return;

package/dist/index.d.cts

@@ -65,6 +65,6 @@ declare function prepare(config: InlineConfig): Promise<void>;
  */
 declare function zip(config?: InlineConfig): Promise<string[]>;
 
-var version = "0.18.6";
+var version = "0.18.7";
 
 export { BuildOutput, ExtensionRunnerConfig, InlineConfig, UserConfig, WxtDevServer, build, clean, createServer, defineConfig, defineRunnerConfig, initialize, prepare, version, zip };

package/dist/index.d.ts

@@ -65,6 +65,6 @@ declare function prepare(config: InlineConfig): Promise<void>;
  */
 declare function zip(config?: InlineConfig): Promise<string[]>;
 
-var version = "0.18.6";
+var version = "0.18.7";
 
 export { BuildOutput, ExtensionRunnerConfig, InlineConfig, UserConfig, WxtDevServer, build, clean, createServer, defineConfig, defineRunnerConfig, initialize, prepare, version, zip };

package/dist/index.js

@@ -19,7 +19,7 @@ import {
   unnormalizePath,
   version,
   wxt
-} from "./chunk-A3R6ZPUA.js";
+} from "./chunk-Z3C7S5VV.js";
 import "./chunk-BERPNPEZ.js";
 import {
   consola
@@ -302,6 +302,7 @@ function createFileReloader(server) {
   return async (event, path4) => {
     await wxt.reloadConfig();
     if (path4.startsWith(wxt.config.outBaseDir)) return;
+    if (path4.startsWith(wxt.config.wxtDir)) return;
     changeQueue.push([event, path4]);
     await fileChangedMutex.runExclusive(async () => {
       if (server.currentOutput == null) return;

package/dist/modules.cjs

@@ -65,12 +65,11 @@ function addPublicAssets(wxt, dir) {
 function addViteConfig(wxt, viteConfig) {
   wxt.hooks.hook("ready", (wxt2) => {
     const userVite = wxt2.config.vite;
-    wxt2.config.vite = (env) => vite.mergeConfig(
-      // Use config added by module as base
-      viteConfig(env) ?? {},
-      // Overwrite module config with user config
-      userVite(env)
-    );
+    wxt2.config.vite = async (env) => {
+      const fromUser = await userVite(env);
+      const fromModule = viteConfig(env) ?? {};
+      return vite.mergeConfig(fromModule, fromUser);
+    };
   });
 }
 function addWxtPlugin(wxt, plugin) {

package/dist/modules.js

@@ -28,12 +28,11 @@ function addPublicAssets(wxt, dir) {
 function addViteConfig(wxt, viteConfig) {
   wxt.hooks.hook("ready", (wxt2) => {
     const userVite = wxt2.config.vite;
-    wxt2.config.vite = (env) => vite.mergeConfig(
-      // Use config added by module as base
-      viteConfig(env) ?? {},
-      // Overwrite module config with user config
-      userVite(env)
-    );
+    wxt2.config.vite = async (env) => {
+      const fromUser = await userVite(env);
+      const fromModule = viteConfig(env) ?? {};
+      return vite.mergeConfig(fromModule, fromUser);
+    };
   });
 }
 function addWxtPlugin(wxt, plugin) {

package/dist/testing.js

@@ -5,7 +5,7 @@ import {
   tsconfigPaths,
   unimport,
   webextensionPolyfillMock
-} from "./chunk-A3R6ZPUA.js";
+} from "./chunk-Z3C7S5VV.js";
 import "./chunk-BERPNPEZ.js";
 import "./chunk-BM6QYGAW.js";
 import "./chunk-QGM4M3NI.js";

package/dist/virtual/background-entrypoint.js

@@ -19,30 +19,41 @@ var logger = {
   error: (...args) => print(console.error, ...args)
 };
 
-// src/virtual/utils/setup-web-socket.ts
-function setupWebSocket(onMessage) {
-  const serverUrl = `${__DEV_SERVER_PROTOCOL__}//${__DEV_SERVER_HOSTNAME__}:${__DEV_SERVER_PORT__}`;
-  logger.debug("Connecting to dev server @", serverUrl);
-  const ws = new WebSocket(serverUrl, "vite-hmr");
-  ws.addEventListener("open", () => {
-    logger.debug("Connected to dev server");
-  });
-  ws.addEventListener("close", () => {
-    logger.debug("Disconnected from dev server");
-  });
-  ws.addEventListener("error", (event) => {
-    logger.error("Failed to connect to dev server", event);
-  });
-  ws.addEventListener("message", (e) => {
-    try {
-      const message = JSON.parse(e.data);
-      if (message.type === "custom" && message.event?.startsWith?.("wxt:")) {
-        onMessage?.(message);
+// src/sandbox/dev-server-websocket.ts
+var ws;
+function getDevServerWebSocket() {
+  if (import.meta.env.COMMAND !== "serve")
+    throw Error(
+      "Must be running WXT dev command to connect to call getDevServerWebSocket()"
+    );
+  if (ws == null) {
+    const serverUrl = `${__DEV_SERVER_PROTOCOL__}//${__DEV_SERVER_HOSTNAME__}:${__DEV_SERVER_PORT__}`;
+    logger.debug("Connecting to dev server @", serverUrl);
+    ws = new WebSocket(serverUrl, "vite-hmr");
+    ws.addWxtEventListener = ws.addEventListener.bind(ws);
+    ws.sendCustom = (event, payload) => ws?.send(JSON.stringify({ type: "custom", event, payload }));
+    ws.addEventListener("open", () => {
+      logger.debug("Connected to dev server");
+    });
+    ws.addEventListener("close", () => {
+      logger.debug("Disconnected from dev server");
+    });
+    ws.addEventListener("error", (event) => {
+      logger.error("Failed to connect to dev server", event);
+    });
+    ws.addEventListener("message", (e) => {
+      try {
+        const message = JSON.parse(e.data);
+        if (message.type === "custom") {
+          ws?.dispatchEvent(
+            new CustomEvent(message.event, { detail: message.data })
+          );
+        }
+      } catch (err) {
+        logger.error("Failed to handle message", err);
       }
-    } catch (err) {
-      logger.error("Failed to handle message", err);
-    }
-  });
+    });
+  }
   return ws;
 }
 
@@ -131,16 +142,18 @@ async function reloadContentScriptMv2(_payload) {
 // src/virtual/background-entrypoint.ts
 if (import.meta.env.COMMAND === "serve") {
   try {
-    const ws = setupWebSocket((message) => {
-      if (message.event === "wxt:reload-extension") browser3.runtime.reload();
-      if (message.event === "wxt:reload-content-script" && message.data != null)
-        reloadContentScript(message.data);
+    const ws2 = getDevServerWebSocket();
+    ws2.addWxtEventListener("wxt:reload-extension", () => {
+      browser3.runtime.reload();
+    });
+    ws2.addWxtEventListener("wxt:reload-content-script", (event) => {
+      reloadContentScript(event.detail);
     });
     if (import.meta.env.MANIFEST_VERSION === 3) {
-      ws.addEventListener("open", () => {
-        const msg = { type: "custom", event: "wxt:background-initialized" };
-        ws.send(JSON.stringify(msg));
-      });
+      ws2.addEventListener(
+        "open",
+        () => ws2.sendCustom("wxt:background-initialized")
+      );
       keepServiceWorkerAlive();
     }
   } catch (err) {

package/dist/virtual/reload-html.js

@@ -15,42 +15,50 @@ var logger = {
   error: (...args) => print(console.error, ...args)
 };
 
-// src/virtual/utils/setup-web-socket.ts
-function setupWebSocket(onMessage) {
-  const serverUrl = `${__DEV_SERVER_PROTOCOL__}//${__DEV_SERVER_HOSTNAME__}:${__DEV_SERVER_PORT__}`;
-  logger.debug("Connecting to dev server @", serverUrl);
-  const ws = new WebSocket(serverUrl, "vite-hmr");
-  ws.addEventListener("open", () => {
-    logger.debug("Connected to dev server");
-  });
-  ws.addEventListener("close", () => {
-    logger.debug("Disconnected from dev server");
-  });
-  ws.addEventListener("error", (event) => {
-    logger.error("Failed to connect to dev server", event);
-  });
-  ws.addEventListener("message", (e) => {
-    try {
-      const message = JSON.parse(e.data);
-      if (message.type === "custom" && message.event?.startsWith?.("wxt:")) {
-        onMessage?.(message);
+// src/sandbox/dev-server-websocket.ts
+var ws;
+function getDevServerWebSocket() {
+  if (import.meta.env.COMMAND !== "serve")
+    throw Error(
+      "Must be running WXT dev command to connect to call getDevServerWebSocket()"
+    );
+  if (ws == null) {
+    const serverUrl = `${__DEV_SERVER_PROTOCOL__}//${__DEV_SERVER_HOSTNAME__}:${__DEV_SERVER_PORT__}`;
+    logger.debug("Connecting to dev server @", serverUrl);
+    ws = new WebSocket(serverUrl, "vite-hmr");
+    ws.addWxtEventListener = ws.addEventListener.bind(ws);
+    ws.sendCustom = (event, payload) => ws?.send(JSON.stringify({ type: "custom", event, payload }));
+    ws.addEventListener("open", () => {
+      logger.debug("Connected to dev server");
+    });
+    ws.addEventListener("close", () => {
+      logger.debug("Disconnected from dev server");
+    });
+    ws.addEventListener("error", (event) => {
+      logger.error("Failed to connect to dev server", event);
+    });
+    ws.addEventListener("message", (e) => {
+      try {
+        const message = JSON.parse(e.data);
+        if (message.type === "custom") {
+          ws?.dispatchEvent(
+            new CustomEvent(message.event, { detail: message.data })
+          );
+        }
+      } catch (err) {
+        logger.error("Failed to handle message", err);
       }
-    } catch (err) {
-      logger.error("Failed to handle message", err);
-    }
-  });
+    });
+  }
   return ws;
 }
 
 // src/virtual/reload-html.ts
 if (import.meta.env.COMMAND === "serve") {
   try {
-    setupWebSocket((message) => {
-      if (message.event === "wxt:reload-page") {
-        if (message.data === location.pathname.substring(1)) {
-          location.reload();
-        }
-      }
+    const ws2 = getDevServerWebSocket();
+    ws2.addWxtEventListener("wxt:reload-page", (event) => {
+      if (event.detail === location.pathname.substring(1)) location.reload();
     });
   } catch (err) {
     logger.error("Failed to setup web socket connection with dev server", err);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wxt",
   "type": "module",
-  "version": "0.18.7",
+  "version": "0.18.8",
   "description": "Next gen framework for developing web extensions",
   "repository": {
     "type": "git",