wxt 0.8.1 → 0.8.2

package/dist/index.d.cts

@@ -5,18 +5,20 @@ import { LogLevel } from 'consola';
 import { PluginVisualizerOptions } from 'rollup-plugin-visualizer';
 
 /**
- * Extends [`AbortController`](https://developer.mozilla.org/en-US/docs/Web/API/AbortController).
+ * Implements [`AbortController`](https://developer.mozilla.org/en-US/docs/Web/API/AbortController).
  * Used to detect and stop content script code when the script is invalidated.
  *
  * It also provides several utilities like `ctx.setTimeout` and `ctx.setInterval` that should be used in
  * content scripts instead of `window.setTimeout` or `window.setInterval`.
  */
-declare class ContentScriptContext extends AbortController {
+declare class ContentScriptContext implements AbortController {
     #private;
     private readonly contentScriptName;
     readonly options?: Omit<ContentScriptDefinition, "main"> | undefined;
     private static SCRIPT_STARTED_MESSAGE_TYPE;
     constructor(contentScriptName: string, options?: Omit<ContentScriptDefinition, "main"> | undefined);
+    get signal(): AbortSignal;
+    abort(reason?: any): void;
     get isInvalid(): boolean;
     get isValid(): boolean;
     /**
@@ -578,7 +580,7 @@ type EntrypointGroup = Entrypoint | Entrypoint[];
  */
 declare function clean(root?: string): Promise<void>;
 
-var version = "0.8.1";
+var version = "0.8.2";
 
 declare function defineConfig(config: UserConfig): UserConfig;
 

package/dist/index.d.ts

@@ -5,18 +5,20 @@ import { LogLevel } from 'consola';
 import { PluginVisualizerOptions } from 'rollup-plugin-visualizer';
 
 /**
- * Extends [`AbortController`](https://developer.mozilla.org/en-US/docs/Web/API/AbortController).
+ * Implements [`AbortController`](https://developer.mozilla.org/en-US/docs/Web/API/AbortController).
  * Used to detect and stop content script code when the script is invalidated.
  *
  * It also provides several utilities like `ctx.setTimeout` and `ctx.setInterval` that should be used in
  * content scripts instead of `window.setTimeout` or `window.setInterval`.
  */
-declare class ContentScriptContext extends AbortController {
+declare class ContentScriptContext implements AbortController {
     #private;
     private readonly contentScriptName;
     readonly options?: Omit<ContentScriptDefinition, "main"> | undefined;
     private static SCRIPT_STARTED_MESSAGE_TYPE;
     constructor(contentScriptName: string, options?: Omit<ContentScriptDefinition, "main"> | undefined);
+    get signal(): AbortSignal;
+    abort(reason?: any): void;
     get isInvalid(): boolean;
     get isValid(): boolean;
     /**
@@ -578,7 +580,7 @@ type EntrypointGroup = Entrypoint | Entrypoint[];
  */
 declare function clean(root?: string): Promise<void>;
 
-var version = "0.8.1";
+var version = "0.8.2";
 
 declare function defineConfig(config: UserConfig): UserConfig;
 

package/dist/index.js

@@ -1960,17 +1960,15 @@ async function findEntrypoints(config) {
   });
   relativePaths.sort();
   const pathGlobs = Object.keys(PATH_GLOB_TO_TYPE_MAP);
-  const existingNames = {};
-  const entrypoints = [];
   let hasBackground = false;
-  await Promise.all(
+  const possibleEntrypoints = await Promise.all(
     relativePaths.map(async (relativePath) => {
       const path9 = resolve8(config.entrypointsDir, relativePath);
       const matchingGlob = pathGlobs.find(
         (glob5) => minimatch(relativePath, glob5)
       );
       if (matchingGlob == null) {
-        return config.logger.warn(
+        config.logger.warn(
           `${relativePath} does not match any known entrypoint. Known entrypoints:
 ${JSON.stringify(
             PATH_GLOB_TO_TYPE_MAP,
@@ -1978,33 +1976,27 @@ ${JSON.stringify(
             2
           )}`
         );
+        return;
       }
       const type = PATH_GLOB_TO_TYPE_MAP[matchingGlob];
       if (type === "ignored")
         return;
-      let entrypoint;
       switch (type) {
         case "popup":
-          entrypoint = await getPopupEntrypoint(config, path9);
-          break;
+          return await getPopupEntrypoint(config, path9);
         case "options":
-          entrypoint = await getOptionsEntrypoint(config, path9);
-          break;
+          return await getOptionsEntrypoint(config, path9);
         case "background":
-          entrypoint = await getBackgroundEntrypoint(config, path9);
           hasBackground = true;
-          break;
+          return await getBackgroundEntrypoint(config, path9);
         case "content-script":
-          entrypoint = await getContentScriptEntrypoint(config, path9);
-          break;
+          return await getContentScriptEntrypoint(config, path9);
         case "unlisted-page":
-          entrypoint = await getUnlistedPageEntrypoint(config, path9);
-          break;
+          return await getUnlistedPageEntrypoint(config, path9);
         case "unlisted-script":
-          entrypoint = await getUnlistedScriptEntrypoint(config, path9);
-          break;
+          return await getUnlistedScriptEntrypoint(config, path9);
         case "content-script-style":
-          entrypoint = {
+          return {
             type,
             name: getEntrypointName(config.entrypointsDir, path9),
             inputPath: path9,
@@ -2014,9 +2006,8 @@ ${JSON.stringify(
               exclude: void 0
             }
           };
-          break;
         default:
-          entrypoint = {
+          return {
             type,
             name: getEntrypointName(config.entrypointsDir, path9),
             inputPath: path9,
@@ -2027,19 +2018,24 @@ ${JSON.stringify(
             }
           };
       }
-      const withSameName = existingNames[entrypoint.name];
-      if (withSameName) {
-        throw Error(
-          `Multiple entrypoints with the name "${entrypoint.name}" detected, but only one is allowed: ${[
-            relative3(config.root, withSameName.inputPath),
-            relative3(config.root, entrypoint.inputPath)
-          ].join(", ")}`
-        );
-      }
-      entrypoints.push(entrypoint);
-      existingNames[entrypoint.name] = entrypoint;
     })
   );
+  const entrypoints = possibleEntrypoints.filter(
+    (entry) => !!entry
+  );
+  const existingNames = {};
+  entrypoints.forEach((entrypoint) => {
+    const withSameName = existingNames[entrypoint.name];
+    if (withSameName) {
+      throw Error(
+        `Multiple entrypoints with the name "${entrypoint.name}" detected, but only one is allowed: ${[
+          relative3(config.root, withSameName.inputPath),
+          relative3(config.root, entrypoint.inputPath)
+        ].join(", ")}`
+      );
+    }
+    existingNames[entrypoint.name] = entrypoint;
+  });
   if (config.command === "serve" && !hasBackground) {
     entrypoints.push(
       await getBackgroundEntrypoint(config, VIRTUAL_NOOP_BACKGROUND_MODULE_ID)
@@ -2822,12 +2818,10 @@ function addEntrypoints(manifest, entrypoints, buildOutput, config) {
       const newContentScripts = Array.from(hashToEntrypointsMap.entries()).map(
         ([, scripts]) => ({
           ...mapWxtOptionsToContentScript(scripts[0].options, config),
-          // TOOD: Sorting css and js arrays here so we get consistent test results... but we
-          // shouldn't have to. Where is the inconsistency coming from?
-          css: getContentScriptCssFiles(scripts, cssMap)?.sort(),
+          css: getContentScriptCssFiles(scripts, cssMap),
           js: scripts.map(
             (entry) => getEntrypointBundlePath(entry, config.outDir, ".js")
-          ).sort()
+          )
         })
       );
       if (newContentScripts.length >= 0) {
@@ -4608,7 +4602,7 @@ async function clean(root = process.cwd()) {
 }
 
 // package.json
-var version2 = "0.8.1";
+var version2 = "0.8.2";
 
 // src/core/utils/defineConfig.ts
 function defineConfig(config) {