From 4e2e957a680612c30fbe186bbc08b276390e8609 Mon Sep 17 00:00:00 2001 From: Gabe Kangas Date: Wed, 4 Feb 2026 11:46:11 -0800 Subject: [PATCH] fix(js): merge all service worker logic into a single worker, and allow precaching to be cancelled --- web/.knip.json | 3 +- web/components/layouts/Main/Main.tsx | 2 - .../.editorconfig | 12 - .../PushNotificationServiceWorker.tsx | 27 -- web/next.config.js | 1 + web/package-lock.json | 278 +++++++++++++----- web/public/serviceWorker.js | 25 -- web/services/notifications-service.ts | 18 ++ web/worker/index.js | 46 +++ 9 files changed, 270 insertions(+), 142 deletions(-) delete mode 100644 web/components/workers/PushNotificationServiceWorker/.editorconfig delete mode 100644 web/components/workers/PushNotificationServiceWorker/PushNotificationServiceWorker.tsx delete mode 100644 web/public/serviceWorker.js create mode 100644 web/worker/index.js diff --git a/web/.knip.json b/web/.knip.json index 9d5712b2c9..43496cc6b5 100644 --- a/web/.knip.json +++ b/web/.knip.json @@ -13,7 +13,8 @@ "i18n/index.js", "i18next-parser.config.mjs", "types/index.ts", - "scripts/i18n-extract.js" + "scripts/i18n-extract.js", + "worker/**" ], "ignoreDependencies": [ "@fontsource/inter", diff --git a/web/components/layouts/Main/Main.tsx b/web/components/layouts/Main/Main.tsx index 5e4d5cb363..690d34a53a 100644 --- a/web/components/layouts/Main/Main.tsx +++ b/web/components/layouts/Main/Main.tsx @@ -25,7 +25,6 @@ import { TitleNotifier } from '../../TitleNotifier/TitleNotifier'; import { ServerRenderedHydration } from '../../ServerRendered/ServerRenderedHydration'; import { Theme } from '../../theme/Theme'; import styles from './Main.module.scss'; -import { PushNotificationServiceWorker } from '../../workers/PushNotificationServiceWorker/PushNotificationServiceWorker'; import { AppStateOptions } from '../../stores/application-state'; import { Noscript } from '../../ui/Noscript/Noscript'; import { ServerStatus } from '../../../interfaces/server-status.model'; @@ -96,7 +95,6 @@ export const Main: FC = () => { > -