fix(page): use qualified url for service worker

podlove · Jul 15, 2024 · c355df3 · c355df3
1 parent 3803877
commit c355df3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 41 deletions.
diff --git a/apps/page/src/features/LoadingOverlay.vue b/apps/page/src/features/LoadingOverlay.vue
diff --git a/apps/page/src/layouts/Layout.astro b/apps/page/src/layouts/Layout.astro
@@ -7,7 +7,6 @@ import PageFooter from '../features/PageFooter.vue';
 import LoadingBar from '../features/LoadingBar.vue';
 import Subscribe from '../features/subscribe/Subscribe.vue';
 import Colors from '../features/Colors.vue';
-import LoadingOverlay from '../features/LoadingOverlay.vue';
 import { store } from '../logic';
 import { getLanguage } from '../i18n';
 
@@ -32,7 +31,6 @@ const lang = getLanguage();
 	</head>
 	<body>
     <Colors client:only="vue" />
-    <LoadingOverlay client:load />
     <LoadingBar client:only="vue" />
     <PageHeader client:idle transition:persist="header" />
     <main transition:animate="fade">

diff --git a/apps/page/src/logic/sagas/serviceworker.sagas.ts b/apps/page/src/logic/sagas/serviceworker.sagas.ts
@@ -17,10 +17,13 @@ export default ({
 
     const feed: string = yield select(selectFeed);
     const cacheKey: string = yield select(selectCacheKey);
+    const baseUrl = new URL(document.location.href);
+
+    const serviceWorkerUrl = `${baseUrl.origin}${serviceWorker}?feed=${feed}&cacheKey=${cacheKey}`;
 
     try {
       const registration: ServiceWorkerRegistration = yield navigator.serviceWorker.register(
-        `${serviceWorker}?feed=${feed}&cacheKey=${cacheKey}`,
+        serviceWorkerUrl,
         {
           scope: '/'
         }
@@ -35,7 +38,7 @@ export default ({
 
   return function* () {
     if(import.meta.env.MODE === 'production') {
-      yield registerServiceWorker();
+    yield registerServiceWorker();
     }
   };
 };