Various import/copy cleanup, avoid unnecessary library injection (#3511)

package.json

@@ -148,11 +148,11 @@
     "webext-additional-permissions": "^2.3.0",
     "webext-content-scripts": "^1.0.1",
     "webext-detect-page": "^4.0.1",
-    "webext-dynamic-content-scripts": "^8.0.1",
+    "webext-dynamic-content-scripts": "^8.1.1",
     "webext-messenger": "^0.18.2",
     "webext-patterns": "^1.1.1",
     "webext-polyfill-kinda": "^0.10.0",
-    "webext-tools": "^0.3.0",
+    "webext-tools": "^1.0.0",
     "webextension-polyfill": "^0.9.0",
     "whatwg-mimetype": "^3.0.0",
     "yup": "^0.32.11"

src/background/activateBrowserActionIcon.ts

@@ -17,6 +17,6 @@
 
 export default function activateBrowserActionIcon() {
   // This re-sets the colored manifest icons
-  const { icons: path } = chrome.runtime.getManifest();
+  const { icons: path } = browser.runtime.getManifest();
   (chrome.browserAction ?? chrome.action).setIcon({ path });
 }

src/background/permissionPrompt.ts

@@ -17,6 +17,7 @@
 
 import { Tabs, Windows } from "webextension-polyfill";
 import { isFirefox } from "webext-detect-page";
+import { isMac } from "@/utils";
 
 const POPUP_WIDTH_PX = 400; // Makes the native prompt appear centered
 const POPUP_HEIGHT_PX = 215; // Includes titlebar height, must fit the content and error to avoid scrollbars
@@ -46,7 +47,7 @@ async function openPopup(
   url: string,
   opener: Windows.Window
 ): Promise<Tabs.Tab> {
-  // `top` and `left are ignored in .create on Firefox, but attempt anyway.
+  // `top` and `left` are ignored in .create on Firefox, but attempt anyway.
   // If present, the popup will be centered on screen rather than on the window.
   // https://bugzilla.mozilla.org/show_bug.cgi?id=1396881
   const window = await browser.windows.create({
@@ -65,15 +66,11 @@ async function openPopup(
 /**
  * Return true if popups are expected to work properly for the user agent / operating system.
  */
-async function detectPopupSupport(
-  currentWindow: Windows.Window
-): Promise<boolean> {
+function detectPopupSupport(currentWindow: Windows.Window): boolean {
   // Firefox on Mac seems to be unable to handle popups in fullscreen mode, changing the macOS "space"
   // back to the desktop
   const isBuggy =
-    isFirefox() &&
-    navigator.userAgent.includes("Macintosh") &&
-    currentWindow.state === "fullscreen";
+    isFirefox() && isMac() && currentWindow.state === "fullscreen";
   return !isBuggy;
 }
 
@@ -84,7 +81,7 @@ export async function openPopupPrompt(openerTabId: number, url: string) {
   const { windowId } = await browser.tabs.get(openerTabId);
   const openerWindow = await browser.windows.get(windowId);
 
-  const popupTab = (await detectPopupSupport(openerWindow))
+  const popupTab = detectPopupSupport(openerWindow)
     ? await openPopup(url, openerWindow)
     : await openTab(url, openerTabId);
 

src/blocks/available.test.ts

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { checkAvailable } from "@/blocks/available";
+import { checkAvailable, testMatchPatterns } from "@/blocks/available";
 
 describe("isAvailable.urlPatterns", () => {
   test("can match hash", async () => {
@@ -57,3 +57,43 @@ describe("isAvailable.matchPatterns", () => {
     ).toBe(false);
   });
 });
+
+describe("testMatchPatterns", () => {
+  test("can match pattern", async () => {
+    const patterns = [
+      "https://www.example.com/*",
+      "https://*.pixiebrix.com/update/*",
+    ];
+    expect(testMatchPatterns(patterns, "https://www.example.com")).toBeTrue();
+    expect(
+      testMatchPatterns(patterns, "https://pixiebrix.com/update/")
+    ).toBeTrue();
+
+    expect(testMatchPatterns(patterns, "https://example.com")).toBeFalse();
+    expect(
+      testMatchPatterns(patterns, "https://www.example.comunication")
+    ).toBeFalse();
+    expect(
+      testMatchPatterns(patterns, "https://www.pixiebrix.com/")
+    ).toBeFalse();
+  });
+
+  test("will throw BusinessError or invalid patterns", async () => {
+    const url = "irrelevant";
+    expect(() =>
+      testMatchPatterns(["https://pixiebrix.*/update/*"], url)
+    ).toThrowErrorMatchingInlineSnapshot(
+      '"Pattern not recognized as valid match pattern: https://pixiebrix.*/update/*"'
+    );
+    expect(() =>
+      testMatchPatterns(["www.example.com/*"], url)
+    ).toThrowErrorMatchingInlineSnapshot(
+      '"Pattern not recognized as valid match pattern: www.example.com/*"'
+    );
+    expect(() =>
+      testMatchPatterns(["*.example.com/*"], url)
+    ).toThrowErrorMatchingInlineSnapshot(
+      '"Pattern not recognized as valid match pattern: *.example.com/*"'
+    );
+  });
+});

src/blocks/available.ts

@@ -28,25 +28,19 @@ export function testMatchPatterns(
   patterns: string[],
   url: string = document.location.href
 ): boolean {
-  let re;
-
-  try {
-    // Try all at once
-    re = patternToRegex(...patterns);
-  } catch {
-    // Try them one at a time to find the broken one
-    for (const pattern of patterns) {
-      try {
-        patternToRegex(pattern);
-      } catch {
-        throw new BusinessError(
-          `Pattern not recognized as valid match pattern: ${pattern}`
-        );
+  for (const pattern of patterns) {
+    try {
+      if (patternToRegex(pattern).test(url)) {
+        return true;
       }
+    } catch {
+      throw new BusinessError(
+        `Pattern not recognized as valid match pattern: ${pattern}`
+      );
     }
   }
 
-  return re.test(url);
+  return false;
 }
 
 function testUrlPattern(