fix: skip waiting check (#306)

Co-authored-by: Joaquín Sánchez <[email protected]>
vite-pwa · Jun 30, 2022 · d27a9a1 · d27a9a1
1 parent 7e81e59
commit d27a9a1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -67,7 +67,14 @@ export function VitePWA(userOptions: Partial<VitePWAOptions> = {}): Plugin[] {
       transformIndexHtml: {
         enforce: 'post',
         transform(html) {
-          return options.disable ? html : injectServiceWorker(html, options)
+          if (options.disable)
+            return html
+
+          // if virtual register is requested, do not inject.
+          if (options.injectRegister === 'auto')
+            options.injectRegister = useImportRegister ? null : 'script'
+
+          return injectServiceWorker(html, options)
         },
       },
       generateBundle(_, bundle) {

diff --git a/src/options.ts b/src/options.ts
@@ -104,7 +104,7 @@ export async function resolveOptions(options: Partial<VitePWAOptions>, viteConfi
   const { vitePlugins = defaultInjectManifestVitePlugins, ...userInjectManifest } = options.injectManifest || {}
   const injectManifest = Object.assign({}, defaultInjectManifest, userInjectManifest)
 
-  if ((injectRegister === 'auto' || registerType == null) && registerType === 'autoUpdate') {
+  if ((injectRegister === 'auto' || injectRegister == null) && registerType === 'autoUpdate') {
     workbox.skipWaiting = true
     workbox.clientsClaim = true
   }