refactor: only check if service-worker.ts is removed to unregister

Author: maiieul

.changeset/thin-horses-bake.md

@@ -2,4 +2,6 @@
 '@builder.io/qwik-city': patch
 ---
 
-FIX: Your service-worker.js won't be unregistered anymore if you added custom logic to it.
+FIX: Your service-worker.js won't be unregistered anymore if you added custom logic to it. 
+
+> Note: if you didn't add custom service-worker logic, you should remove your service-worker.ts file(s) for the `ServiceWorkerRegister` Component to actually unregister the service-worker.js and delete its related cache.

packages/qwik-city/src/buildtime/runtime-generation/generate-service-worker.ts

@@ -1,15 +1,11 @@
 import type { BuildContext } from '../types';
 
-export function generateServiceWorkerRegister(
-  ctx: BuildContext,
-  swRegister: string,
-  didNotAddCustomCode: boolean
-) {
+export function generateServiceWorkerRegister(ctx: BuildContext, swRegister: string) {
   let swReg: string;
   let swUrl = '/service-worker.js';
 
-  // Also unregister if the developer removed the service-worker.ts file or did not add custom code to it; since Qwik 1.14.0 and above now use modulepreload by default
-  if (ctx.isDevServer || didNotAddCustomCode || ctx.serviceWorkers.length === 0) {
+  // Also unregister if the developer removed the service-worker.ts file since Qwik 1.14.0 and above now use modulepreload by default
+  if (ctx.isDevServer || ctx.serviceWorkers.length === 0) {
     swReg = SW_UNREGISTER;
   } else {
     swReg = swRegister;

packages/qwik-city/src/buildtime/vite/plugin.ts

@@ -186,35 +186,12 @@ function qwikCityPlugin(userOpts?: QwikCityVitePluginOptions): any {
           }
 
           if (isSwRegister) {
-            // Detect if the developer added custom code in their service-worker.ts file
-            let didNotAddCustomCode = false;
-            const clientOutDir = qwikPlugin!.api.getClientOutDir();
-            if (clientOutDir) {
-              const basePathRelDir = api.getBasePathname().replace(/^\/|\/$/, '');
-              const clientOutBaseDir = join(clientOutDir, basePathRelDir);
-              for (const swEntry of ctx.serviceWorkers) {
-                try {
-                  const swClientDistPath = join(clientOutBaseDir, swEntry.chunkFileName);
-                  const swCode = await fs.promises.readFile(swClientDistPath, 'utf-8');
-                  const swCodeTrimmed = swCode.replace(/\s+/g, '');
-                  if (
-                    swCodeTrimmed ===
-                      'addEventListener("install",()=>self.skipWaiting());addEventListener("activate",()=>self.clients.claim());' ||
-                    swCodeTrimmed ===
-                      'self.addEventListener("install",()=>self.skipWaiting());self.addEventListener("activate",()=>self.clients.claim());'
-                  ) {
-                    didNotAddCustomCode = true;
-                  }
-                } catch (e) {
-                  console.error('Error reading service worker file', e);
-                }
-              }
-            }
             // @qwik-city-sw-register
-            return generateServiceWorkerRegister(ctx, swRegister, didNotAddCustomCode);
+            return generateServiceWorkerRegister(ctx, swRegister);
           }
         }
       }
+
       return null;
     },
 

packages/qwik-city/src/runtime/src/sw-component.tsx

@@ -5,6 +5,11 @@ import type { JSXOutput } from '@builder.io/qwik';
  * JS extensions are allowed) will be picked up, bundled into a separate file, and registered as a
  * service worker.
  *
+ * Qwik 1.14.0 and above now use `<link rel="modulepreload">` by default. If you didn't add custom
+ * service-worker logic, you should remove your service-worker.ts file(s) for the
+ * `ServiceWorkerRegister` Component to actually unregister the service-worker.js and delete its
+ * related cache.
+ *
  * @public
  */
 export const ServiceWorkerRegister = (props: { nonce?: string }): JSXOutput => (