refactored verbose global var to prevent collisions

QwikDev · Jan 27, 2025 · 0b69dd3 · 0b69dd3
1 parent 71b3be5
commit 0b69dd3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/e2e/buffering/package.json b/e2e/buffering/package.json
@@ -10,7 +10,6 @@
     "build": "qwik build",
     "build.client": "vite build",
     "build.preview": "vite build --ssr src/entry.preview.tsx",
-    "build.server": "vite build -c adapters/static/vite.config.ts",
     "build.types": "tsc --incremental --noEmit",
     "deploy": "vercel deploy",
     "dev": "vite --mode ssr",

diff --git a/e2e/buffering/vite.config.ts b/e2e/buffering/vite.config.ts
@@ -64,7 +64,7 @@ export default defineConfig(({ command, mode }): UserConfig => {
     preview: {
       headers: {
         // Do cache the server response in preview (non-adapter production build)
-        'Cache-Control': 'public, max-age=0',
+        'Cache-Control': 'public, max-age=360',
       },
     },
   };

diff --git a/packages/qwik-city/src/runtime/src/sw-component.tsx b/packages/qwik-city/src/runtime/src/sw-component.tsx
@@ -4,7 +4,7 @@ import swRegister from '@qwik-city-sw-register';
 /** @public */
 export const ServiceWorkerRegister = (props: { nonce?: string; verbose?: boolean }) => {
   const content = props.verbose
-    ? `globalThis.verbose = ${props.verbose}; ${swRegister}`
+    ? `globalThis.qwikCitySWVerbose = ${props.verbose}; ${swRegister}`
     : swRegister;
   return jsx('script', {
     dangerouslySetInnerHTML: content,

diff --git a/packages/qwik-city/src/runtime/src/sw-register.ts b/packages/qwik-city/src/runtime/src/sw-register.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
 import type { QPrefetchData, QPrefetchMessage } from './service-worker/types';
 declare global {
-  var verbose: boolean;
+  var qwikCitySWVerbose: boolean;
 }
 // Source for what becomes innerHTML to the <ServiceWorkerRegister/> script
 
@@ -45,11 +45,16 @@ declare global {
         if (reg.installing) {
           reg.installing.addEventListener('statechange', (ev: any) => {
             if (ev.target.state == 'activated') {
+              if (globalThis.qwikCitySWVerbose) {
+                reg.active?.postMessage({
+                  type: 'verbose',
+                });
+              }
               initServiceWorker!();
             }
           });
         } else if (reg.active) {
-          if (globalThis.verbose) {
+          if (globalThis.qwikCitySWVerbose) {
             reg.active.postMessage({
               type: 'verbose',
             });