From daa755017e5a4f0ed5e444cd2c0d68cb4e9c9813 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 1 Oct 2020 14:04:11 +0100
Subject: [PATCH] Revert "consolidate"

This reverts commit aa2f3918

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/vector/platform/WebPlatform.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/vector/platform/WebPlatform.ts b/src/vector/platform/WebPlatform.ts
index d91bb2593e..3f93ad712e 100644
--- a/src/vector/platform/WebPlatform.ts
+++ b/src/vector/platform/WebPlatform.ts
@@ -39,12 +39,15 @@ export default class WebPlatform extends VectorBasePlatform {
 
         // load service worker if available on this platform
         if ('serviceWorker' in navigator) {
+            // clean up old dummy sw.js
+            navigator.serviceWorker.getRegistration('sw.js').then(reg => reg.unregister());
+
             // Service worker is disabled in webpack-dev-server: https://github.com/GoogleChrome/workbox/issues/1790
             if (!process.env.WEBPACK_DEV_SERVER) {
                 navigator.serviceWorker.register('service-worker.js');
             } else {
                 // we no longer run workbox when in webpack-dev-server, clean it up
-                navigator.serviceWorker.getRegistration().then(reg => reg && reg.unregister());
+                navigator.serviceWorker.getRegistration('service-worker.js').then(reg => reg.unregister());
             }
         }
     }