fix: enforce same-origin on all service worker cache routes

Wraps every defaultCache matcher to check sameOrigin first, preventing
the SW from intercepting cross-origin requests (Google favicons,
external images, fonts) which caused no-response errors on redirects.

1 files changed, 13 insertions, 8 deletions

diff --git a/apps/web/app/sw.ts b/apps/web/app/sw.ts
index fa2a8b7..0469377 100644
--- a/apps/web/app/sw.ts
+++ b/apps/web/app/sw.ts
@@ -1,7 +1,7 @@
 /// <reference lib="webworker" />
 import { defaultCache } from "@serwist/next/worker"
 import type { PrecacheEntry, SerwistGlobalConfig } from "serwist"
-import { Serwist, NetworkOnly } from "serwist"
+import { Serwist } from "serwist"
 
 declare global {
   interface WorkerGlobalScope extends SerwistGlobalConfig {
@@ -11,18 +11,23 @@ declare global {
 
 declare const self: ServiceWorkerGlobalScope
 
+const sameOriginCache = defaultCache.map((entry) => ({
+  ...entry,
+  matcher: (parameters: Parameters<Exclude<(typeof defaultCache)[number]["matcher"], RegExp | string | undefined>>[0]) => {
+    if (!parameters.sameOrigin) return false
+    const original = entry.matcher
+    if (typeof original === "function") return original(parameters)
+    if (original instanceof RegExp) return original.test(parameters.url.href)
+    return false
+  },
+}))
+
 const serwist = new Serwist({
   precacheEntries: self.__SW_MANIFEST,
   skipWaiting: true,
   clientsClaim: true,
   navigationPreload: true,
-  runtimeCaching: [
-    {
-      matcher: ({ url }) => url.origin !== self.location.origin,
-      handler: new NetworkOnly(),
-    },
-    ...defaultCache,
-  ],
+  runtimeCaching: sameOriginCache,
 })
 
 serwist.addEventListeners()