add additional optional chaining to prevent import errors where the c…

…hrome api is not available
pixiebrix · May 9, 2024 · 120583e · 120583e
1 parent 908151e
commit 120583e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/mv3/api.ts b/src/mv3/api.ts
@@ -20,12 +20,15 @@
 import { type Tabs } from "webextension-polyfill";
 import { once } from "lodash";
 
-export const isMV3 = once(
-  (): boolean =>
-    // Use optional chaining in case the chrome runtime is not available:
-    // https://github.com/pixiebrix/pixiebrix-extension/issues/8273
-    chrome.runtime?.getManifest().manifest_version === 3,
-);
+export const isMV3 = once((): boolean => {
+  if (!chrome.runtime?.getManifest) {
+    return false;
+  }
+
+  // Use optional chaining in case the chrome runtime is not available:
+  // https://github.com/pixiebrix/pixiebrix-extension/issues/8273
+  return chrome.runtime.getManifest().manifest_version === 3;
+});
 export const browserAction =
   globalThis.chrome?.browserAction ?? globalThis.chrome?.action;
 export type Tab = Tabs.Tab | chrome.tabs.Tab;
diff --git a/src/tinyPages/offscreen.ts b/src/tinyPages/offscreen.ts
@@ -26,7 +26,7 @@ let createOffscreenDocumentPromise: Promise<void> | null = null;
 
 // Use optional chaining in case the chrome runtime is not available:
 // https://github.com/pixiebrix/pixiebrix-extension/issues/8397
-chrome.runtime?.onMessage.addListener(handleMessages);
+chrome.runtime?.onMessage?.addListener(handleMessages);
 
 export type RecordErrorMessage = {
   target: "offscreen-doc";