fixup! feat(web-extension): detect bg script when on firefox

Author: mirceahasegan

packages/web-extension/src/messaging/index.ts

@@ -3,7 +3,6 @@ import { ChannelName, ConsumeRemoteApiOptions, ExposeApiProps, MessengerDependen
 import { FinalizationRegistryDestructor, isBackgroundProcess } from './util';
 import { consumeMessengerRemoteApi, exposeMessengerApi } from './remoteApi';
 import { createNonBackgroundMessenger } from './NonBackgroundMessenger';
-import { runtime } from 'webextension-polyfill';
 
 export * from './BackgroundMessenger';
 export * from './NonBackgroundMessenger';
@@ -16,7 +15,7 @@ export * from './errors';
 
 export type BaseChannel = { baseChannel: ChannelName };
 
-const isInBackgroundProcess = isBackgroundProcess(runtime);
+const isInBackgroundProcess = isBackgroundProcess();
 
 const getBackgroundMessenger = (() => {
   let backgroundMessenger: BackgroundMessenger | null = null;

packages/web-extension/src/messaging/types.ts

@@ -60,7 +60,6 @@ export interface MessengerPort {
 export interface MinimalRuntime {
   connect(connectInfo: Runtime.ConnectConnectInfoType): MessengerPort;
   onConnect: MinimalEvent<(port: MessengerPort) => void>;
-  getBackgroundPage?: unknown;
   lastError?: unknown;
 }
 

packages/web-extension/src/messaging/util.ts

@@ -9,7 +9,6 @@ import {
   FactoryCallMessage,
   InternalMsg,
   MethodRequest,
-  MinimalRuntime,
   RequestMessage,
   ResponseMessage
 } from './types';
@@ -79,5 +78,5 @@ export class FinalizationRegistryDestructor implements Destructor {
   }
 }
 
-export const isBackgroundProcess = (runtime: MinimalRuntime) =>
-  typeof window === 'undefined' || typeof runtime.getBackgroundPage === 'function';
+export const isBackgroundProcess = () =>
+  typeof window === 'undefined' || typeof (window as any).chrome?.runtime?.getBackgroundPage === 'function';