Merge d4ebee2 into 7818176

firebase · Aug 23, 2021 · 8c5137c · 8c5137c
2 parents 7818176 + d4ebee2
commit 8c5137c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/packages-exp/messaging-compat/src/registerMessagingCompat.ts b/packages-exp/messaging-compat/src/registerMessagingCompat.ts
@@ -34,17 +34,17 @@ declare module '@firebase/component' {
 const messagingCompatFactory: InstanceFactory<'messaging-compat'> = (
   container: ComponentContainer
 ) => {
-  if (!!navigator) {
-    // in window
+  if (self && 'ServiceWorkerGlobalScope' in self) {
+    // in sw
     return new MessagingCompatImpl(
       container.getProvider('app-compat').getImmediate(),
-      container.getProvider('messaging-exp').getImmediate()
+      container.getProvider('messaging-sw-exp').getImmediate()
     );
   } else {
-    // in sw
+    // in window
     return new MessagingCompatImpl(
       container.getProvider('app-compat').getImmediate(),
-      container.getProvider('messaging-sw-exp').getImmediate()
+      container.getProvider('messaging-exp').getImmediate()
     );
   }
 };