Skip to content

Commit 931851f

Browse files
committed
refactored verbose global var to prevent collisions
1 parent 0a46d1a commit 931851f

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

e2e/buffering/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"build": "qwik build",
1111
"build.client": "vite build",
1212
"build.preview": "vite build --ssr src/entry.preview.tsx",
13-
"build.server": "vite build -c adapters/static/vite.config.ts",
1413
"build.types": "tsc --incremental --noEmit",
1514
"deploy": "vercel deploy",
1615
"dev": "vite --mode ssr",

e2e/buffering/vite.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export default defineConfig(({ command, mode }): UserConfig => {
6464
preview: {
6565
headers: {
6666
// Do cache the server response in preview (non-adapter production build)
67-
'Cache-Control': 'public, max-age=0',
67+
'Cache-Control': 'public, max-age=360',
6868
},
6969
},
7070
};

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import swRegister from '@qwik-city-sw-register';
44
/** @public */
55
export const ServiceWorkerRegister = (props: { nonce?: string; verbose?: boolean }) => {
66
const content = props.verbose
7-
? `globalThis.verbose = ${props.verbose}; ${swRegister}`
7+
? `globalThis.qwikCitySWVerbose = ${props.verbose}; ${swRegister}`
88
: swRegister;
99
return jsx('script', {
1010
dangerouslySetInnerHTML: content,

packages/qwik-city/src/runtime/src/sw-register.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable */
22
import type { QPrefetchData, QPrefetchMessage } from './service-worker/types';
33
declare global {
4-
var verbose: boolean;
4+
var qwikCitySWVerbose: boolean;
55
}
66
// Source for what becomes innerHTML to the <ServiceWorkerRegister/> script
77

@@ -45,11 +45,16 @@ declare global {
4545
if (reg.installing) {
4646
reg.installing.addEventListener('statechange', (ev: any) => {
4747
if (ev.target.state == 'activated') {
48+
if (globalThis.qwikCitySWVerbose) {
49+
reg.active?.postMessage({
50+
type: 'verbose',
51+
});
52+
}
4853
initServiceWorker!();
4954
}
5055
});
5156
} else if (reg.active) {
52-
if (globalThis.verbose) {
57+
if (globalThis.qwikCitySWVerbose) {
5358
reg.active.postMessage({
5459
type: 'verbose',
5560
});

0 commit comments

Comments
 (0)