Merge pull request #15345 from vector-im/t3chguy/fix/workbox

Disable workbox when running in webpack dev server, not in dev mode

src/vector/platform/WebPlatform.ts

@@ -38,13 +38,17 @@ export default class WebPlatform extends VectorBasePlatform {
         super();
 
         // load service worker if available on this platform
-        // Service worker is disabled in development: https://github.com/GoogleChrome/workbox/issues/1790
-        if ('serviceWorker' in navigator && process.env.NODE_ENV === "production") {
-            navigator.serviceWorker.register('service-worker.js');
+        if ('serviceWorker' in navigator) {
+            // 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());
+            }
         }
     }
 
-
     getHumanReadableName(): string {
         return 'Web Platform'; // no translation required: only used for analytics
     }