Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/early-eels-listen.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@builder.io/qwik': patch
'@builder.io/qwik-city': patch
---

PATCH: Keeping the service worker components now properly unregisters them.
9 changes: 8 additions & 1 deletion packages/qwik-city/src/runtime/src/sw-register.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@

(() => {
if ('serviceWorker' in navigator) {
navigator.serviceWorker.register('__url').catch((e) => console.error(e));
navigator.serviceWorker.getRegistrations().then((regs) => {
for (const reg of regs) {
const url = '__url'.split('/').pop();
if (reg.active?.scriptURL.endsWith(url || 'service-worker.js')) {
reg.unregister().catch(console.error);
}
}
});
} else {
// eslint-disable-next-line no-console
console.log('Service worker not supported in this browser.');
Expand Down
2 changes: 1 addition & 1 deletion packages/qwik/src/core/components/prefetch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export const PrefetchServiceWorker = (opts: {
// the file 'qwik-prefetch-service-worker.js' is not located in /build/
resolvedOpts.path = baseUrl + resolvedOpts.path;
}
let code = PREFETCH_CODE.replace("'_URL_'", JSON.stringify(resolvedOpts.path));
let code = PREFETCH_CODE.replace('"_URL_"', JSON.stringify(resolvedOpts.path.split('/').pop()));
if (!isDev) {
// consecutive spaces are indentation
code = code.replaceAll(/\s\s+/gm, '');
Expand Down
Loading