wxt 0.5.6 → 0.6.0-alpha1

package/dist/client.d.ts

@@ -128,4 +128,4 @@ declare function defineBackground(definition: BackgroundScriptDefintition): Back
 
 declare function mountContentScriptUi(): void;
 
-export { defineBackground, defineContentScript, mountContentScriptUi };
+export { ContentScriptContext, defineBackground, defineContentScript, mountContentScriptUi };

package/dist/client.js

@@ -14,9 +14,142 @@ function defineBackground(arg) {
 function mountContentScriptUi() {
   throw Error("Not implemented: mountContentScriptUi");
 }
+
+// src/client/browser.ts
+import originalBrowser from "webextension-polyfill";
+var browser = originalBrowser;
+
+// src/client/utils/logger.ts
+function print(method, ...args) {
+  if (typeof args[0] === "string") {
+    const message = args.shift();
+    method(`[wxt] ${message}`, ...args);
+  } else {
+    method("[wxt]", ...args);
+  }
+}
+var logger = {
+  debug: (...args) => print(console.debug, ...args),
+  log: (...args) => print(console.log, ...args),
+  warn: (...args) => print(console.warn, ...args),
+  error: (...args) => print(console.error, ...args)
+};
+
+// src/client/utils/ContentScriptContext.ts
+var ContentScriptContext = class _ContentScriptContext extends AbortController {
+  constructor(contentScriptName) {
+    super();
+    this.contentScriptName = contentScriptName;
+    if (this.#isTopFrame) {
+      this.#stopOldScripts();
+    }
+    this.setTimeout(() => {
+      this.#listenForNewerScripts();
+    });
+  }
+  static SCRIPT_STARTED_MESSAGE_TYPE = "wxt:content-script-started";
+  #isTopFrame = window.self === window.top;
+  get isInvalid() {
+    if (browser.runtime.id == null) {
+      this.notifyInvalidated();
+    }
+    return this.signal.aborted;
+  }
+  get isValid() {
+    return !this.isInvalid;
+  }
+  /**
+   * Add a listener that is called when the content script's context is invalidated.
+   *
+   * @returns A function to remove the listener.
+   *
+   * @example
+   * browser.runtime.onMessage.addListener(cb);
+   * const removeInvalidatedListener = ctx.onInvalidated(() => {
+   *   browser.runtime.onMessage.removeListener(cb);
+   * })
+   * // ...
+   * removeInvalidatedListener();
+   */
+  onInvalidated(cb) {
+    this.signal.addEventListener("abort", cb);
+    return () => this.signal.removeEventListener("abort", cb);
+  }
+  /**
+   * Wrapper around `window.setInterval` that automatically clears the interval when invalidated.
+   */
+  setInterval(handler, timeout) {
+    const id = setInterval(() => {
+      if (this.isValid)
+        handler();
+    }, timeout);
+    this.onInvalidated(() => clearInterval(id));
+    return id;
+  }
+  /**
+   * Wrapper around `window.setTimeout` that automatically clears the interval when invalidated.
+   */
+  setTimeout(handler, timeout) {
+    const id = setTimeout(() => {
+      if (this.isValid)
+        handler();
+    }, timeout);
+    this.onInvalidated(() => clearTimeout(id));
+    return id;
+  }
+  /**
+   * Wrapper around `window.requestAnimationFrame` that automatically cancels the request when
+   * invalidated.
+   */
+  requestAnimationFrame(callback) {
+    const id = requestAnimationFrame((...args) => {
+      if (this.isValid)
+        callback(...args);
+    });
+    this.onInvalidated(() => cancelAnimationFrame(id));
+    return id;
+  }
+  /**
+   * Wrapper around `window.requestIdleCallback` that automatically cancels the request when
+   * invalidated.
+   */
+  requestIdleCallback(callback, options) {
+    const id = requestIdleCallback((...args) => {
+      if (!this.signal.aborted)
+        callback(...args);
+    }, options);
+    this.onInvalidated(() => cancelIdleCallback(id));
+    return id;
+  }
+  /**
+   * Abort the abort controller and execute all `onInvalidated` listeners.
+   */
+  notifyInvalidated() {
+    this.abort("Content script context invalidated");
+    logger.debug(
+      `Content script "${this.contentScriptName}" context invalidated`
+    );
+  }
+  #stopOldScripts() {
+    window.postMessage({
+      event: _ContentScriptContext.SCRIPT_STARTED_MESSAGE_TYPE,
+      contentScriptName: this.contentScriptName
+    });
+  }
+  #listenForNewerScripts() {
+    const cb = (event) => {
+      if (event.data?.type === _ContentScriptContext.SCRIPT_STARTED_MESSAGE_TYPE && event.data?.contentScriptName === this.contentScriptName) {
+        this.notifyInvalidated();
+      }
+    };
+    addEventListener("message", cb);
+    this.onInvalidated(() => removeEventListener("message", cb));
+  }
+};
 export {
+  ContentScriptContext,
   defineBackground,
   defineContentScript,
   mountContentScriptUi
 };
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2NsaWVudC9kZWZpbmVDb250ZW50U2NyaXB0LnRzIiwgIi4uL3NyYy9jbGllbnQvZGVmaW5lQmFja2dyb3VuZC50cyIsICIuLi9zcmMvY2xpZW50L21vdW50Q29udGVudFNjcmlwdFVpLnRzIl0sCiAgInNvdXJjZXNDb250ZW50IjogWyJpbXBvcnQgeyBDb250ZW50U2NyaXB0RGVmaW5pdGlvbiB9IGZyb20gJy4uL2NvcmUvdHlwZXMnO1xuXG5leHBvcnQgZnVuY3Rpb24gZGVmaW5lQ29udGVudFNjcmlwdChcbiAgZGVmaW5pdGlvbjogQ29udGVudFNjcmlwdERlZmluaXRpb24sXG4pOiBDb250ZW50U2NyaXB0RGVmaW5pdGlvbiB7XG4gIHJldHVybiBkZWZpbml0aW9uO1xufVxuIiwgImltcG9ydCB7IEJhY2tncm91bmRTY3JpcHREZWZpbnRpdGlvbiB9IGZyb20gJy4uJztcblxuZXhwb3J0IGZ1bmN0aW9uIGRlZmluZUJhY2tncm91bmQobWFpbjogKCkgPT4gdm9pZCk6IEJhY2tncm91bmRTY3JpcHREZWZpbnRpdGlvbjtcbmV4cG9ydCBmdW5jdGlvbiBkZWZpbmVCYWNrZ3JvdW5kKFxuICBkZWZpbml0aW9uOiBCYWNrZ3JvdW5kU2NyaXB0RGVmaW50aXRpb24sXG4pOiBCYWNrZ3JvdW5kU2NyaXB0RGVmaW50aXRpb247XG5leHBvcnQgZnVuY3Rpb24gZGVmaW5lQmFja2dyb3VuZChcbiAgYXJnOiAoKCkgPT4gdm9pZCkgfCBCYWNrZ3JvdW5kU2NyaXB0RGVmaW50aXRpb24sXG4pOiBCYWNrZ3JvdW5kU2NyaXB0RGVmaW50aXRpb24ge1xuICBpZiAodHlwZW9mIGFyZyA9PT0gJ2Z1bmN0aW9uJykgcmV0dXJuIHsgbWFpbjogYXJnIH07XG4gIHJldHVybiBhcmc7XG59XG4iLCAiZXhwb3J0IGZ1bmN0aW9uIG1vdW50Q29udGVudFNjcmlwdFVpKCkge1xuICB0aHJvdyBFcnJvcignTm90IGltcGxlbWVudGVkOiBtb3VudENvbnRlbnRTY3JpcHRVaScpO1xufVxuIl0sCiAgIm1hcHBpbmdzIjogIjtBQUVPLFNBQVMsb0JBQ2QsWUFDeUI7QUFDekIsU0FBTztBQUNUOzs7QUNBTyxTQUFTLGlCQUNkLEtBQzZCO0FBQzdCLE1BQUksT0FBTyxRQUFRO0FBQVksV0FBTyxFQUFFLE1BQU0sSUFBSTtBQUNsRCxTQUFPO0FBQ1Q7OztBQ1hPLFNBQVMsdUJBQXVCO0FBQ3JDLFFBQU0sTUFBTSx1Q0FBdUM7QUFDckQ7IiwKICAibmFtZXMiOiBbXQp9Cg==
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../src/client/defineContentScript.ts", "../src/client/defineBackground.ts", "../src/client/mountContentScriptUi.ts", "../src/client/browser.ts", "../src/client/utils/logger.ts", "../src/client/utils/ContentScriptContext.ts"],
  "sourcesContent": ["import { ContentScriptDefinition } from '../core/types';\n\nexport function defineContentScript(\n  definition: ContentScriptDefinition,\n): ContentScriptDefinition {\n  return definition;\n}\n", "import { BackgroundScriptDefintition } from '..';\n\nexport function defineBackground(main: () => void): BackgroundScriptDefintition;\nexport function defineBackground(\n  definition: BackgroundScriptDefintition,\n): BackgroundScriptDefintition;\nexport function defineBackground(\n  arg: (() => void) | BackgroundScriptDefintition,\n): BackgroundScriptDefintition {\n  if (typeof arg === 'function') return { main: arg };\n  return arg;\n}\n", "export function mountContentScriptUi() {\n  throw Error('Not implemented: mountContentScriptUi');\n}\n", "import originalBrowser, { Browser, Runtime, I18n } from 'webextension-polyfill';\n\nexport interface AugmentedBrowser extends Browser {\n  runtime: WxtRuntime;\n  i18n: WxtI18n;\n}\n\nexport interface WxtRuntime extends Runtime.Static {\n  // Overriden per-project\n}\n\nexport interface WxtI18n extends I18n.Static {\n  // Overriden per-project\n}\n\nexport const browser: AugmentedBrowser = originalBrowser;\n", "function print(method: (...args: any[]) => void, ...args: any[]) {\n  if (typeof args[0] === 'string') {\n    const message = args.shift();\n    method(`[wxt] ${message}`, ...args);\n  } else {\n    method('[wxt]', ...args);\n  }\n}\n\n/**\n * Wrapper around `console` with a \"[wxt]\" prefix\n */\nexport const logger = {\n  debug: (...args: any[]) => print(console.debug, ...args),\n  log: (...args: any[]) => print(console.log, ...args),\n  warn: (...args: any[]) => print(console.warn, ...args),\n  error: (...args: any[]) => print(console.error, ...args),\n};\n", "import { browser } from '../browser';\nimport { logger } from './logger';\n\n/**\n * Extends [`AbortController`](https://developer.mozilla.org/en-US/docs/Web/API/AbortController).\n * Used to detect and stop content script code when the script is invalidated.\n *\n * It also provides several utilities like `ctx.setTimeout` and `ctx.setInterval` that should be used in\n * content scripts instead of `window.setTimeout` or `window.setInterval`.\n */\nexport class ContentScriptContext extends AbortController {\n  static SCRIPT_STARTED_MESSAGE_TYPE = 'wxt:content-script-started';\n\n  #isTopFrame = window.self === window.top;\n\n  constructor(private readonly contentScriptName: string) {\n    super();\n\n    if (this.#isTopFrame) {\n      this.#stopOldScripts();\n    }\n    this.setTimeout(() => {\n      // Run on next tick so the listener it adds isn't triggered by stopOldScript\n      this.#listenForNewerScripts();\n    });\n  }\n\n  get isInvalid(): boolean {\n    if (browser.runtime.id == null) {\n      this.notifyInvalidated(); // Sets `signal.aborted` to true\n    }\n    return this.signal.aborted;\n  }\n\n  get isValid(): boolean {\n    return !this.isInvalid;\n  }\n\n  /**\n   * Add a listener that is called when the content script's context is invalidated.\n   *\n   * @returns A function to remove the listener.\n   *\n   * @example\n   * browser.runtime.onMessage.addListener(cb);\n   * const removeInvalidatedListener = ctx.onInvalidated(() => {\n   *   browser.runtime.onMessage.removeListener(cb);\n   * })\n   * // ...\n   * removeInvalidatedListener();\n   */\n  onInvalidated(cb: () => void): () => void {\n    this.signal.addEventListener('abort', cb);\n    return () => this.signal.removeEventListener('abort', cb);\n  }\n\n  /**\n   * Wrapper around `window.setInterval` that automatically clears the interval when invalidated.\n   */\n  setInterval(handler: () => void, timeout?: number): number {\n    const id = setInterval(() => {\n      if (this.isValid) handler();\n    }, timeout) as unknown as number;\n    this.onInvalidated(() => clearInterval(id));\n    return id;\n  }\n\n  /**\n   * Wrapper around `window.setTimeout` that automatically clears the interval when invalidated.\n   */\n  setTimeout(handler: () => void, timeout?: number): number {\n    const id = setTimeout(() => {\n      if (this.isValid) handler();\n    }, timeout) as unknown as number;\n    this.onInvalidated(() => clearTimeout(id));\n    return id;\n  }\n\n  /**\n   * Wrapper around `window.requestAnimationFrame` that automatically cancels the request when\n   * invalidated.\n   */\n  requestAnimationFrame(callback: FrameRequestCallback): number {\n    const id = requestAnimationFrame((...args) => {\n      if (this.isValid) callback(...args);\n    });\n\n    this.onInvalidated(() => cancelAnimationFrame(id));\n    return id;\n  }\n\n  /**\n   * Wrapper around `window.requestIdleCallback` that automatically cancels the request when\n   * invalidated.\n   */\n  requestIdleCallback(\n    callback: IdleRequestCallback,\n    options?: IdleRequestOptions,\n  ): number {\n    const id = requestIdleCallback((...args) => {\n      if (!this.signal.aborted) callback(...args);\n    }, options);\n\n    this.onInvalidated(() => cancelIdleCallback(id));\n    return id;\n  }\n\n  /**\n   * Abort the abort controller and execute all `onInvalidated` listeners.\n   */\n  notifyInvalidated() {\n    this.abort('Content script context invalidated');\n    logger.debug(\n      `Content script \"${this.contentScriptName}\" context invalidated`,\n    );\n  }\n\n  #stopOldScripts() {\n    // Use postMessage so it get's sent to all the frames of the page.\n    window.postMessage({\n      event: ContentScriptContext.SCRIPT_STARTED_MESSAGE_TYPE,\n      contentScriptName: this.contentScriptName,\n    });\n  }\n\n  #listenForNewerScripts() {\n    const cb = (event: MessageEvent) => {\n      if (\n        event.data?.type === ContentScriptContext.SCRIPT_STARTED_MESSAGE_TYPE &&\n        event.data?.contentScriptName === this.contentScriptName\n      ) {\n        this.notifyInvalidated();\n      }\n    };\n\n    addEventListener('message', cb);\n    this.onInvalidated(() => removeEventListener('message', cb));\n  }\n}\n"],
  "mappings": "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",
  "names": []
}


package/dist/index.cjs

@@ -547,6 +547,7 @@ async function getInternalConfig(inlineConfig, command) {
     command,
     debug,
     entrypointsDir,
+    env,
     fsCache: createFsCache(wxtDir),
     imports: mergedConfig.imports ?? {},
     logger,
@@ -560,16 +561,12 @@ async function getInternalConfig(inlineConfig, command) {
     runnerConfig,
     srcDir,
     typesDir,
-    vite: {},
+    vite: () => ({}),
     // Real value added after this object is initialized.
     wxtDir,
     zip: resolveInternalZipConfig(root, mergedConfig)
   };
-  finalConfig.vite = await resolveInternalViteConfig(
-    env,
-    mergedConfig,
-    finalConfig
-  );
+  finalConfig.vite = (env2) => resolveInternalViteConfig(env2, mergedConfig, finalConfig);
   return finalConfig;
 }
 async function resolveManifestConfig(env, manifest) {
@@ -593,9 +590,9 @@ function mergeInlineConfig(inlineConfig, userConfig) {
     return vite2.mergeConfig(user, inline);
   };
   const viteConfig = async (env) => {
-    const user = await resolveViteConfig(env, userConfig.vite);
-    const inline = await resolveViteConfig(env, inlineConfig.vite);
-    return vite2.mergeConfig(user, inline);
+    const user = await userConfig.vite?.(env);
+    const inline = await inlineConfig.vite?.(env);
+    return vite2.mergeConfig(user ?? {}, inline ?? {});
   };
   const runner = vite2.mergeConfig(
     userConfig.runner ?? {},
@@ -623,9 +620,6 @@ function mergeInlineConfig(inlineConfig, userConfig) {
     zip
   };
 }
-async function resolveViteConfig(env, vite6) {
-  return await (typeof vite6 === "function" ? vite6(env) : vite6 ?? {});
-}
 function resolveInternalZipConfig(root, mergedConfig) {
   return {
     sourcesTemplate: "{{name}}-{{version}}-sources.zip",
@@ -647,10 +641,7 @@ function resolveInternalZipConfig(root, mergedConfig) {
   };
 }
 async function resolveInternalViteConfig(env, mergedConfig, finalConfig) {
-  const internalVite = await resolveViteConfig(
-    env,
-    mergedConfig.vite
-  );
+  const internalVite = await mergedConfig.vite?.(env) ?? {};
   internalVite.root = finalConfig.root;
   internalVite.configFile = false;
   internalVite.logLevel = "warn";
@@ -865,7 +856,7 @@ async function buildSingleEntrypoint(entrypoint, config) {
   }
   const entryConfig = vite3.mergeConfig(
     libMode,
-    config.vite
+    await config.vite(config.env)
   );
   const result = await vite3.build(entryConfig);
   return {
@@ -899,7 +890,7 @@ async function buildMultipleEntrypoints(entrypoints, config) {
   }
   const entryConfig = vite3.mergeConfig(
     multiPage,
-    config.vite
+    await config.vite(config.env)
   );
   const result = await vite3.build(entryConfig);
   return {
@@ -2202,7 +2193,7 @@ async function getServerInfo() {
 async function setupServer(serverInfo, config) {
   const runner = createWebExtRunner();
   const viteServer = await vite5.createServer(
-    vite5.mergeConfig(serverInfo, config.vite)
+    vite5.mergeConfig(serverInfo, await config.vite(config.env))
   );
   const start = async () => {
     await viteServer.listen(server.port);
@@ -2303,7 +2294,7 @@ async function clean(root = process.cwd()) {
 }
 
 // package.json
-var version2 = "0.5.6";
+var version2 = "0.6.0-alpha1";
 
 // src/core/utils/defineConfig.ts
 function defineConfig(config) {
@@ -2326,7 +2317,7 @@ async function createServer2(config) {
     return getInternalConfig(
       {
         ...config,
-        vite: serverInfo.viteServerConfig
+        vite: () => serverInfo.viteServerConfig
       },
       "serve"
     );