wxt 0.10.3 → 0.11.0

package/dist/index.d.cts

@@ -1,10 +1,11 @@
-import { I as InlineConfig, B as BuildOutput, U as UserConfig, E as ExtensionRunnerConfig, W as WxtDevServer } from './external-d75ae6fd.js';
-export { k as BackgroundDefinition, f as BackgroundEntrypoint, e as BaseEntrypoint, d as BaseEntrypointOptions, b as BuildStepOutput, q as ConfigEnv, j as ContentScriptDefinition, C as ContentScriptEntrypoint, g as Entrypoint, h as EntrypointGroup, n as ExcludableEntrypoint, G as GenericEntrypoint, L as Logger, i as OnContentScriptStopped, O as OptionsEntrypoint, m as PerBrowserOption, P as PopupEntrypoint, T as TargetBrowser, c as TargetManifestVersion, l as UnlistedScriptDefinition, o as UserManifest, p as UserManifestFn, a as WxtInlineViteConfig, r as WxtViteConfig } from './external-d75ae6fd.js';
+import { I as InlineConfig, B as BuildOutput, U as UserConfig, E as ExtensionRunnerConfig, W as WxtDevServer } from './external-n9SucYhJ.cjs';
+export { n as BackgroundDefinition, h as BackgroundEntrypoint, g as BaseEntrypoint, f as BaseEntrypointOptions, d as BuildStepOutput, t as ConfigEnv, m as ContentScriptDefinition, C as ContentScriptEntrypoint, j as Entrypoint, k as EntrypointGroup, q as ExcludableEntrypoint, G as GenericEntrypoint, L as Logger, l as OnContentScriptStopped, i as OptionsEntrypoint, c as OutputAsset, b as OutputChunk, O as OutputFile, p as PerBrowserOption, P as PopupEntrypoint, S as ServerInfo, T as TargetBrowser, e as TargetManifestVersion, o as UnlistedScriptDefinition, r as UserManifest, s as UserManifestFn, u as WxtBuilder, v as WxtBuilderServer, a as WxtViteConfig } from './external-n9SucYhJ.cjs';
 import 'vite';
 import 'webextension-polyfill';
 import 'unimport';
 import 'consola';
 import 'rollup-plugin-visualizer';
+import 'chokidar';
 
 /**
  * Bundles the extension for production. Returns a promise of the build result. Discovers the `wxt.config.ts` file in
@@ -44,7 +45,7 @@ declare function defineRunnerConfig(config: ExtensionRunnerConfig): ExtensionRun
  * });
  * await server.start();
  */
-declare function createServer(config?: InlineConfig): Promise<WxtDevServer>;
+declare function createServer(inlineConfig?: InlineConfig): Promise<WxtDevServer>;
 
 declare function initialize(options: {
     directory: string;
@@ -61,6 +62,6 @@ declare function prepare(config: InlineConfig): Promise<void>;
  */
 declare function zip(config?: InlineConfig): Promise<string[]>;
 
-var version = "0.10.3";
+var version = "0.11.0";
 
 export { BuildOutput, ExtensionRunnerConfig, InlineConfig, UserConfig, WxtDevServer, build, clean, createServer, defineConfig, defineRunnerConfig, initialize, prepare, version, zip };

package/dist/index.d.ts

@@ -1,10 +1,11 @@
-import { I as InlineConfig, B as BuildOutput, U as UserConfig, E as ExtensionRunnerConfig, W as WxtDevServer } from './external-d75ae6fd.js';
-export { k as BackgroundDefinition, f as BackgroundEntrypoint, e as BaseEntrypoint, d as BaseEntrypointOptions, b as BuildStepOutput, q as ConfigEnv, j as ContentScriptDefinition, C as ContentScriptEntrypoint, g as Entrypoint, h as EntrypointGroup, n as ExcludableEntrypoint, G as GenericEntrypoint, L as Logger, i as OnContentScriptStopped, O as OptionsEntrypoint, m as PerBrowserOption, P as PopupEntrypoint, T as TargetBrowser, c as TargetManifestVersion, l as UnlistedScriptDefinition, o as UserManifest, p as UserManifestFn, a as WxtInlineViteConfig, r as WxtViteConfig } from './external-d75ae6fd.js';
+import { I as InlineConfig, B as BuildOutput, U as UserConfig, E as ExtensionRunnerConfig, W as WxtDevServer } from './external-n9SucYhJ.js';
+export { n as BackgroundDefinition, h as BackgroundEntrypoint, g as BaseEntrypoint, f as BaseEntrypointOptions, d as BuildStepOutput, t as ConfigEnv, m as ContentScriptDefinition, C as ContentScriptEntrypoint, j as Entrypoint, k as EntrypointGroup, q as ExcludableEntrypoint, G as GenericEntrypoint, L as Logger, l as OnContentScriptStopped, i as OptionsEntrypoint, c as OutputAsset, b as OutputChunk, O as OutputFile, p as PerBrowserOption, P as PopupEntrypoint, S as ServerInfo, T as TargetBrowser, e as TargetManifestVersion, o as UnlistedScriptDefinition, r as UserManifest, s as UserManifestFn, u as WxtBuilder, v as WxtBuilderServer, a as WxtViteConfig } from './external-n9SucYhJ.js';
 import 'vite';
 import 'webextension-polyfill';
 import 'unimport';
 import 'consola';
 import 'rollup-plugin-visualizer';
+import 'chokidar';
 
 /**
  * Bundles the extension for production. Returns a promise of the build result. Discovers the `wxt.config.ts` file in
@@ -44,7 +45,7 @@ declare function defineRunnerConfig(config: ExtensionRunnerConfig): ExtensionRun
  * });
  * await server.start();
  */
-declare function createServer(config?: InlineConfig): Promise<WxtDevServer>;
+declare function createServer(inlineConfig?: InlineConfig): Promise<WxtDevServer>;
 
 declare function initialize(options: {
     directory: string;
@@ -61,6 +62,6 @@ declare function prepare(config: InlineConfig): Promise<void>;
  */
 declare function zip(config?: InlineConfig): Promise<string[]>;
 
-var version = "0.10.3";
+var version = "0.11.0";
 
 export { BuildOutput, ExtensionRunnerConfig, InlineConfig, UserConfig, WxtDevServer, build, clean, createServer, defineConfig, defineRunnerConfig, initialize, prepare, version, zip };

package/dist/index.js

@@ -15,8 +15,8 @@ import {
   rebuild,
   resolvePerBrowserOption,
   version
-} from "./chunk-BHUP6PAP.js";
-import "./chunk-YUG22S6W.js";
+} from "./chunk-6V4H2CZ4.js";
+import "./chunk-VBXJIVYU.js";
 
 // src/core/build.ts
 async function build(config) {
@@ -69,9 +69,6 @@ function defineRunnerConfig(config) {
   return config;
 }
 
-// src/core/create-server.ts
-import * as vite from "vite";
-
 // src/core/runners/wsl.ts
 import { relative } from "node:path";
 function createWslRunner() {
@@ -205,27 +202,75 @@ import { consola as consola2 } from "consola";
 import { Mutex } from "async-mutex";
 import pc2 from "picocolors";
 import { relative as relative4 } from "node:path";
-async function createServer2(config) {
-  const serverInfo = await getServerInfo();
-  const getLatestInternalConfig = async () => {
-    return getInternalConfig(
-      {
-        ...config,
-        vite: () => serverInfo.viteServerConfig
-      },
-      "serve"
-    );
+async function createServer(inlineConfig) {
+  const port = await getPort();
+  const hostname = "localhost";
+  const origin = `http://${hostname}:${port}`;
+  const serverInfo = {
+    port,
+    hostname,
+    origin
   };
-  let internalConfig = await getLatestInternalConfig();
-  const server = await setupServer(serverInfo, internalConfig);
-  internalConfig.server = server;
-  const fileChangedMutex = new Mutex();
-  const changeQueue = [];
+  const server = {
+    ...serverInfo,
+    watcher: void 0,
+    // Filled out later down below
+    ws: void 0,
+    // Filled out later down below
+    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);
+    },
+    transformHtml(url, html, originalUrl) {
+      return builderServer.transformHtml(url, html, originalUrl);
+    },
+    reloadContentScript(contentScript) {
+      server.ws.send("wxt:reload-content-script", contentScript);
+    },
+    reloadPage(path3) {
+      server.ws.send("wxt:reload-page", path3);
+    },
+    reloadExtension() {
+      server.ws.send("wxt:reload-extension");
+    }
+  };
+  const getLatestConfig = () => getInternalConfig(inlineConfig ?? {}, "serve", server);
+  let config = await getLatestConfig();
+  const [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", () => {
-    reloadContentScripts(server.currentOutput.steps, internalConfig, server);
+    reloadContentScripts(server.currentOutput.steps, config, server);
   });
-  server.watcher.on("all", async (event, path3, _stats) => {
-    if (path3.startsWith(internalConfig.outBaseDir))
+  const reloadOnChange = createFileReloader({
+    server,
+    getLatestConfig,
+    updateConfig(newConfig) {
+      config = newConfig;
+    }
+  });
+  server.watcher.on("all", reloadOnChange);
+  return server;
+}
+async function getPort() {
+  const { default: getPort2, portNumbers } = await import("get-port");
+  return await getPort2({ port: portNumbers(3e3, 3010) });
+}
+function createFileReloader(options) {
+  const { server, getLatestConfig, updateConfig } = options;
+  const fileChangedMutex = new Mutex();
+  const changeQueue = [];
+  return async (event, path3) => {
+    const config = await getLatestConfig();
+    updateConfig(config);
+    if (path3.startsWith(config.outBaseDir))
       return;
     changeQueue.push([event, path3]);
     await fileChangedMutex.runExclusive(async () => {
@@ -235,18 +280,16 @@ async function createServer2(config) {
       const changes = detectDevChanges(fileChanges, server.currentOutput);
       if (changes.type === "no-change")
         return;
-      internalConfig.logger.info(
-        `Changed: ${Array.from(new Set(fileChanges.map((change) => change[1]))).map((file) => pc2.dim(relative4(internalConfig.root, file))).join(", ")}`
+      config.logger.info(
+        `Changed: ${Array.from(new Set(fileChanges.map((change) => change[1]))).map((file) => pc2.dim(relative4(config.root, file))).join(", ")}`
       );
       const rebuiltNames = changes.rebuildGroups.flat().map((entry) => {
         return pc2.cyan(
-          relative4(internalConfig.outDir, getEntrypointOutputFile(entry, ""))
+          relative4(config.outDir, getEntrypointOutputFile(entry, ""))
         );
       }).join(pc2.dim(", "));
-      internalConfig = await getLatestInternalConfig();
-      internalConfig.server = server;
       const { output: newOutput } = await rebuild(
-        internalConfig,
+        config,
         // TODO: this excludes new entrypoints, so they're not built until the dev command is restarted
         changes.rebuildGroups,
         changes.cachedOutput
@@ -257,75 +300,16 @@ async function createServer2(config) {
           server.reloadExtension();
           break;
         case "html-reload":
-          reloadHtmlPages(changes.rebuildGroups, server, internalConfig);
+          reloadHtmlPages(changes.rebuildGroups, server, config);
           break;
         case "content-script-reload":
-          reloadContentScripts(changes.changedSteps, internalConfig, server);
+          reloadContentScripts(changes.changedSteps, config, server);
           break;
       }
       consola2.success(`Reloaded: ${rebuiltNames}`);
     });
-  });
-  return server;
-}
-async function getServerInfo() {
-  const { default: getPort, portNumbers } = await import("get-port");
-  const port = await getPort({ port: portNumbers(3e3, 3010) });
-  const hostname = "localhost";
-  const origin = `http://${hostname}:${port}`;
-  const serverConfig = {
-    server: {
-      origin
-    }
-  };
-  return {
-    port,
-    hostname,
-    origin,
-    viteServerConfig: serverConfig
   };
 }
-async function setupServer(serverInfo, config) {
-  const runner = await createExtensionRunner(config);
-  const viteServer = await vite.createServer(
-    vite.mergeConfig(serverInfo, await config.vite(config.env))
-  );
-  const start = async () => {
-    await viteServer.listen(server.port);
-    config.logger.success(`Started dev server @ ${serverInfo.origin}`);
-    server.currentOutput = await internalBuild(config);
-    await runner.openBrowser(config);
-  };
-  const reloadExtension = () => {
-    viteServer.ws.send("wxt:reload-extension");
-  };
-  const reloadPage = (path3) => {
-    viteServer.ws.send("wxt:reload-page", path3);
-  };
-  const reloadContentScript = (contentScript) => {
-    viteServer.ws.send("wxt:reload-content-script", contentScript);
-  };
-  const server = {
-    ...viteServer,
-    start,
-    currentOutput: {
-      manifest: {
-        manifest_version: 3,
-        name: "",
-        version: ""
-      },
-      publicAssets: [],
-      steps: []
-    },
-    port: serverInfo.port,
-    hostname: serverInfo.hostname,
-    origin: serverInfo.origin,
-    reloadExtension,
-    reloadPage,
-    reloadContentScript
-  };
-  return server;
-}
 function reloadContentScripts(steps, config, server) {
   if (config.manifestVersion === 3) {
     steps.forEach((step) => {
@@ -562,7 +546,7 @@ async function zip(config) {
 export {
   build,
   clean,
-  createServer2 as createServer,
+  createServer,
   defineConfig,
   defineRunnerConfig,
   initialize,

package/dist/sandbox.d.ts

@@ -1,4 +1,4 @@
-import { U as UnlistedScriptDefinition } from './external-9107db91.js';
+import { U as UnlistedScriptDefinition } from './external-6YqvLCcd.js';
 import 'webextension-polyfill';
 
 declare function defineUnlistedScript(main: () => void): UnlistedScriptDefinition;

package/dist/storage.d.cts

@@ -12,4 +12,4 @@ declare const webExtensionDriver: (opts: WebExtensionDriverOptions) => Driver;
 type StorageValue = null | string | number | boolean | object;
 declare const storage: Storage<StorageValue>;
 
-export { StorageValue, WebExtensionDriverOptions, storage, webExtensionDriver };
+export { type StorageValue, type WebExtensionDriverOptions, storage, webExtensionDriver };

package/dist/storage.d.ts

@@ -12,4 +12,4 @@ declare const webExtensionDriver: (opts: WebExtensionDriverOptions) => Driver;
 type StorageValue = null | string | number | boolean | object;
 declare const storage: Storage<StorageValue>;
 
-export { StorageValue, WebExtensionDriverOptions, storage, webExtensionDriver };
+export { type StorageValue, type WebExtensionDriverOptions, storage, webExtensionDriver };

package/dist/storage.js

@@ -1,4 +1,4 @@
-import "./chunk-YUG22S6W.js";
+import "./chunk-VBXJIVYU.js";
 
 // src/storage.ts
 import {