From f6857a2d983833dd2296149bec0eb80e6c2d3757 Mon Sep 17 00:00:00 2001 From: kai Date: Mon, 23 Aug 2021 11:32:27 -0700 Subject: [PATCH 1/2] Update registerMessagingCompat.ts --- .../messaging-compat/src/registerMessagingCompat.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/messaging-compat/src/registerMessagingCompat.ts b/packages/messaging-compat/src/registerMessagingCompat.ts index ab510019e6a..79c931857d2 100644 --- a/packages/messaging-compat/src/registerMessagingCompat.ts +++ b/packages/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').getImmediate() + container.getProvider('messaging-sw-exp').getImmediate() ); } else { - // in sw + // in window return new MessagingCompatImpl( container.getProvider('app-compat').getImmediate(), - container.getProvider('messaging-sw').getImmediate() + container.getProvider('messaging-exp').getImmediate() ); } }; From d0906d4205ffe0375f64f49be5fda1d9570fce92 Mon Sep 17 00:00:00 2001 From: Kai Wu Date: Mon, 23 Aug 2021 14:11:33 -0700 Subject: [PATCH 2/2] Update packages-exp/messaging-compat/src/registerMessagingCompat.ts Co-authored-by: Feiyang --- packages/messaging-compat/src/registerMessagingCompat.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/messaging-compat/src/registerMessagingCompat.ts b/packages/messaging-compat/src/registerMessagingCompat.ts index 79c931857d2..2a4d5d37291 100644 --- a/packages/messaging-compat/src/registerMessagingCompat.ts +++ b/packages/messaging-compat/src/registerMessagingCompat.ts @@ -44,7 +44,7 @@ const messagingCompatFactory: InstanceFactory<'messaging-compat'> = ( // in window return new MessagingCompatImpl( container.getProvider('app-compat').getImmediate(), - container.getProvider('messaging-exp').getImmediate() + container.getProvider('messaging').getImmediate() ); } };