Use webextension-polyfill explicitly

Author: fregante

source/global.d.ts

@@ -1,7 +1,2 @@
-import type { Browser } from "webextension-polyfill";
-
-declare global {
-  const browser: Browser;
-  // eslint-disable-next-line no-var -- `let/const` behave differently https://stackoverflow.com/a/69208755/288906
-  var __webextMessenger: string;
-}
+// eslint-disable-next-line no-var -- `let/const` behave differently https://stackoverflow.com/a/69208755/288906
+declare var __webextMessenger: string;

source/receiver.ts

@@ -1,3 +1,4 @@
+import browser from "webextension-polyfill";
 import { serializeError } from "serialize-error";
 import { getContextName } from "webext-detect";
 

source/sender.ts

@@ -1,3 +1,4 @@
+import browser from "webextension-polyfill";
 import pRetry from "p-retry";
 import { isBackground } from "webext-detect";
 import { deserializeError } from "serialize-error";

source/test/background.ts

@@ -1,4 +1,3 @@
-import "./webextensionPolyfill.js";
 import "./background/registration.js";
 import "./contentscript/api.test.js";
 

source/test/background/testingApi.ts

@@ -1,10 +1,11 @@
+import browser from "webextension-polyfill";
 import { executeFunction } from "webext-content-scripts";
 import { once } from "webext-messenger/shared.js";
 
 export async function ensureScripts(tabId: number): Promise<void> {
   await browser.scripting.executeScript({
     target: { tabId },
-    files: ["webextensionPolyfill.js", "contentscript/registration.js"],
+    files: ["contentscript/registration.js"],
   });
 }
 

source/test/contentscript/api.test.ts

@@ -1,3 +1,4 @@
+import browser from "webextension-polyfill";
 import test from "tape";
 import { isBackground, isContentScript, isWebPage } from "webext-detect";
 import { type PageTarget, type Target } from "webext-messenger";

source/test/contentscript/fixtures/unrelatedMessageListener.ts

@@ -1,3 +1,5 @@
+import browser from "webextension-polyfill";
+
 browser.runtime.onMessage.addListener(
   (message: unknown): Promise<string> | undefined => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

source/test/iframe.html

@@ -7,6 +7,5 @@
     margin: 20px 0;
   }
 </style>
-<script type="module" src="webextensionPolyfill.ts"></script>
 <script type="module" src="contentscript/registration.ts"></script>
 <h1>Extension frame</h1>

source/test/manifest.json

@@ -19,43 +19,40 @@
       "matches": [
         "https://fregante.github.io/pixiebrix-testing-ground/Will-call-background-methods"
       ],
-      "js": ["webextensionPolyfill.ts", "background/api.test.ts"]
+      "js": ["background/api.test.ts"]
     },
     {
       "matches": [
         "https://fregante.github.io/pixiebrix-testing-ground/Will-call-offscreen-methods"
       ],
-      "js": ["webextensionPolyfill.ts", "offscreen/api.test.ts"]
+      "js": ["offscreen/api.test.ts"]
     },
     {
       "all_frames": true,
       "matches": [
         "https://fregante.github.io/pixiebrix-testing-ground/Will-receive-CS-calls/*"
       ],
-      "js": ["webextensionPolyfill.ts", "contentscript/registration.ts"]
+      "js": ["contentscript/registration.ts"]
     },
     {
       "matches": [
         "https://fregante.github.io/pixiebrix-testing-ground/Will-call-other-CS-via-background"
       ],
-      "js": ["webextensionPolyfill.ts", "contentscript/api.test.ts"]
+      "js": ["contentscript/api.test.ts"]
     },
     {
       "all_frames": true,
       "matches": [
         "https://fregante.github.io/pixiebrix-testing-ground/Unrelated-CS-on-this-page"
       ],
-      "js": [
-        "webextensionPolyfill.ts",
-        "contentscript/fixtures/unrelatedMessageListener.ts"
-      ]
+      "js": ["contentscript/fixtures/unrelatedMessageListener.ts"]
     },
     {
       "all_frames": true,
       "matches": [
         "https://fregante.github.io/pixiebrix-testing-ground/webext-messenger-was-imported-but-not-executed"
       ],
-      "js": ["webextensionPolyfill.ts", "contentscript/missedRegistration.ts"]
+      "js": ["contentscript/missedRegistration.ts"]
     }
   ],
   "web_accessible_resources": [

source/test/offscreen.html

@@ -1,5 +1,4 @@
 <!doctype html>
 <meta charset="UTF-8" />
 <title>Offscreen page</title>
-<script type="module" src="webextensionPolyfill.ts"></script>
 <script type="module" src="offscreen/registration.ts"></script>