Bump webextension-polyfill from 0.8.0 to 0.9.0

package.json

@@ -149,11 +149,11 @@
     "webext-content-scripts": "^1.0.1",
     "webext-detect-page": "^4.0.1",
     "webext-dynamic-content-scripts": "^8.0.1",
-    "webext-messenger": "^0.17.1",
+    "webext-messenger": "^0.18.0",
     "webext-patterns": "^1.1.1",
     "webext-polyfill-kinda": "^0.10.0",
     "webext-tools": "^0.3.0",
-    "webextension-polyfill": "^0.8.0",
+    "webextension-polyfill": "^0.9.0",
     "whatwg-mimetype": "^3.0.0",
     "yup": "^0.32.11"
   },

src/background/deployment.test.ts

@@ -15,7 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import browser from "webextension-polyfill";
 import { loadOptions, saveOptions } from "@/store/extensionsStorage";
 import {
   deploymentFactory,
@@ -28,8 +27,7 @@ import MockAdapter from "axios-mock-adapter";
 import axios from "axios";
 import { updateDeployments } from "@/background/deployment";
 
-// @ts-expect-error No way to extend `globalThis` effectively
-globalThis.browser = browser;
+browser.permissions.contains = jest.fn().mockResolvedValue(true);
 
 const axiosMock = new MockAdapter(axios);
 
@@ -93,27 +91,6 @@ jest.mock("webext-detect-page", () => ({
   isContentScript: () => false,
 }));
 
-jest.mock("webextension-polyfill", () => {
-  const mock = jest.requireActual("webextension-polyfill");
-
-  return {
-    __esModule: true,
-    default: {
-      // Keep the existing local storage mock
-      ...mock,
-      permissions: {
-        contains: jest.fn().mockResolvedValue(true),
-      },
-      runtime: {
-        openOptionsPage: jest.fn(),
-        getManifest: jest.fn().mockReturnValue({
-          version: "1.5.2",
-        }),
-      },
-    },
-  };
-});
-
 jest.mock("@/background/installer", () => ({
   isUpdateAvailable: jest.fn().mockReturnValue(false),
 }));

src/extensionContext.ts

@@ -15,10 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// It must be the very first thing or telemetry will fail
-// eslint-disable-next-line import/no-unassigned-import -- Import for side effects
-import "@/extensionPolyfill";
-
 // Init rollbar early so we get error reporting on the other initialization
 import "@/telemetry/reportUncaughtErrors";
 

src/globals.d.ts

@@ -15,6 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+// This cannot be a regular import because it turns `globals.d.ts` in a "module definition", which it isn't
+type Browser = import("webextension-polyfill").Browser;
+
 // https://stackoverflow.com/questions/43638454/webpack-typescript-image-import
 declare module "*.svg" {
   const CONTENT: string;
@@ -143,3 +146,39 @@ interface ErrorConstructor {
   new (message?: string, options?: ErrorOptions): Error;
   (message?: string, options?: ErrorOptions): Error;
 }
+
+// TODO: This overrides Firefox’ types. It's possible that the return types are different between Firefox and Chrome
+interface ExtendedRuntime
+  extends Omit<Browser["runtime"], "requestUpdateCheck"> {
+  /*
+   * Requests an update check for this app/extension.
+   */
+  requestUpdateCheck(): Promise<chrome.runtime.RequestUpdateCheckStatus>;
+}
+
+type Identity = Browser["identity"];
+
+/**
+ * Gets an OAuth2 access token using the client ID and scopes specified in the oauth2 section of manifest.json.
+ */
+interface ExtendedIdentity extends Identity {
+  /**
+   * Gets an OAuth2 access token using the client ID and scopes specified in the oauth2 section of manifest.json.
+   */
+  getAuthToken(details?: chrome.identity.TokenDetails): Promise<string>;
+
+  /**
+   * Removes an OAuth2 access token from the Identity API's token cache.
+   */
+  removeCachedAuthToken(
+    details: chrome.identity.TokenInformation
+  ): Promise<void>;
+}
+
+// @ts-expect-error See Firefox/requestUpdateCheck-related comment above
+interface ChromeifiedBrowser extends Browser {
+  runtime: ExtendedRuntime;
+  identity: ExtendedIdentity;
+}
+
+declare const browser: ChromeifiedBrowser;

src/testAfterEnv.js

@@ -23,3 +23,12 @@ global.jQuery = $;
 
 // Disable onMessage handler, or else it will respond to `sendMessage` calls locally
 global.browser.runtime.onMessage.addListener = jest.fn();
+
+// @ts-expect-error API missing from mock https://github.com/clarkbw/jest-webextension-mock/issues/148
+browser.permissions = {
+  contains: jest.fn(),
+};
+
+browser.runtime.getManifest = jest.fn().mockReturnValue({
+  version: "1.5.2",
+});

webpack.config.js

@@ -234,7 +234,6 @@ module.exports = (env, options) =>
       vendors: [
         "react",
         "react-dom",
-        "webextension-polyfill",
         "jquery",
         "lodash-es",
         "js-beautify",
@@ -318,6 +317,7 @@ module.exports = (env, options) =>
       new webpack.ProvidePlugin({
         $: "jquery",
         jQuery: "jquery",
+        browser: "webextension-polyfill",
       }),
 
       // This will inject the current ENVs into the bundle, if found