From 5bbfb2d4e23fb49dde949cbeffe2a2c748e21595 Mon Sep 17 00:00:00 2001 From: Innei Date: Thu, 28 Nov 2024 17:19:58 +0800 Subject: [PATCH] fix: sw register Signed-off-by: Innei --- apps/renderer/src/main.tsx | 9 ++++----- apps/renderer/src/push-notification.ts | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/renderer/src/main.tsx b/apps/renderer/src/main.tsx index ac4358a8b..8f50bd49c 100644 --- a/apps/renderer/src/main.tsx +++ b/apps/renderer/src/main.tsx @@ -13,16 +13,15 @@ import { setAppIsReady } from "./atoms/app" import { ElECTRON_CUSTOM_TITLEBAR_HEIGHT, isWebBuild } from "./constants" import { initializeApp } from "./initialize" import { registerAppGlobalShortcuts } from "./initialize/global-shortcuts" -import { registerWebPushNotifications } from "./push-notification" import { router } from "./router" initializeApp().finally(() => { import("./push-notification").then(({ registerWebPushNotifications }) => { - registerWebPushNotifications() + if (navigator.serviceWorker && isWebBuild) { + registerWebPushNotifications() + } }) - if (navigator.serviceWorker && isWebBuild) { - registerWebPushNotifications() - } + setAppIsReady(true) }) diff --git a/apps/renderer/src/push-notification.ts b/apps/renderer/src/push-notification.ts index abe6b35bc..57407dc3d 100644 --- a/apps/renderer/src/push-notification.ts +++ b/apps/renderer/src/push-notification.ts @@ -15,8 +15,9 @@ export async function registerWebPushNotifications() { const existingRegistration = await navigator.serviceWorker.getRegistration() let registration = existingRegistration + const isPWA = window.matchMedia("(display-mode: standalone)").matches if (!registration) { - registration = await navigator.serviceWorker.register("/sw.js", { + registration = await navigator.serviceWorker.register(`/sw.js${isPWA ? "?pwa=true" : ""}`, { scope: "/", }) }