From d27a9a1d3135a17b8779ed262558006622503fa5 Mon Sep 17 00:00:00 2001
From: mcoms <mastercoms@tuta.io>
Date: Thu, 30 Jun 2022 04:12:46 -0400
Subject: [PATCH] fix: skip waiting check (#306)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Joaquín Sánchez <userquin@gmail.com>
---
 src/index.ts   | 9 ++++++++-
 src/options.ts | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index b451cb19..e2c8c481 100644
--- 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
index 6d8b6246..175fc0ab 100644
--- 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
   }