fix(service-worker): do not register if not supported

benji6 · Jul 6, 2024 · 52edaad · 52edaad
1 parent ca5c188
commit 52edaad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/client/src/firebase.ts b/client/src/firebase.ts
@@ -31,12 +31,11 @@ const messagingPromise: Promise<Messaging | void> = isSupported().then(
 );
 
 export const getRegistrationToken = async (): Promise<string> => {
-  const serviceWorkerRegistration = await navigator.serviceWorker.ready;
   const messaging = await messagingPromise;
   if (!messaging)
     throw Error("Firebase messaging is not supported in this browser");
   return getToken(messaging, {
-    serviceWorkerRegistration,
+    serviceWorkerRegistration: await navigator.serviceWorker.ready,
     vapidKey: PUBLIC_VAPID_KEY,
   });
 };
diff --git a/client/src/index.tsx b/client/src/index.tsx
@@ -20,10 +20,11 @@ import store from "./store";
 
 export const queryClient = new QueryClient();
 
-navigator.serviceWorker.register(
-  new URL("service-worker.ts", import.meta.url),
-  { type: "module" },
-);
+if ("serviceWorker" in navigator)
+  navigator.serviceWorker.register(
+    new URL("service-worker.ts", import.meta.url),
+    { type: "module" },
+  );
 
 navigator.storage.estimate().then((estimate) => {
   if (