😀

QwikDev · Jun 25, 2023 · 419064b · 419064b
1 parent 9b927c8
commit 419064b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/packages/qwik-city/runtime/src/service-worker/cached-fetch.ts b/packages/qwik-city/runtime/src/service-worker/cached-fetch.ts
@@ -5,8 +5,7 @@ export const cachedFetch = (
   cache: Cache,
   fetch: Fetch,
   awaitingRequests: AwaitingRequests,
-  request: Request,
-  preloadResponse?: Promise<Response> | undefined
+  request: Request
 ) =>
   new Promise<Response>((promiseResolve, promiseReject) => {
     const url = request.url;
@@ -60,8 +59,7 @@ export const cachedFetch = (
           } else {
             // no cached response found or user didn't want to use the cache
             // do a full network request
-            const responsePromise = preloadResponse ? preloadResponse : fetch(request);
-            return responsePromise.then(async (networkResponse) => {
+            return fetch(request).then(async (networkResponse) => {
               if (networkResponse.ok) {
                 // network response was good, let's cache it
                 await cache.put(url, networkResponse.clone());

diff --git a/packages/qwik-city/runtime/src/service-worker/setup.ts b/packages/qwik-city/runtime/src/service-worker/setup.ts
@@ -23,7 +23,7 @@ export const setupServiceWorkerScope = (
         ev.respondWith(
           swScope.caches.open(qBuildCacheName).then((qBuildCache) => {
             prefetchWaterfall(appBundles, qBuildCache, swFetch, url);
-            return cachedFetch(qBuildCache, swFetch, awaitingRequests, request, ev.preloadResponse);
+            return cachedFetch(qBuildCache, swFetch, awaitingRequests, request);
           })
         );
       }
@@ -63,10 +63,7 @@ export const setupServiceWorkerScope = (
     }
   });
 
-  swScope.addEventListener('activate', (event) => {
-    // if (self.registration.navigationPreload) {
-    //   event.waitUntil(self.registration.navigationPreload.enable());
-    // }
+  swScope.addEventListener('activate', () => {
     (async () => {
       try {
         const qBuildCache = await swScope.caches.open(qBuildCacheName);