consolidate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2020-09-30 17:36:57 +01:00
parent 11e676cee0
commit aa2f3918cc

View file

@ -39,15 +39,12 @@ export default class WebPlatform extends VectorBasePlatform {
// load service worker if available on this platform // load service worker if available on this platform
if ('serviceWorker' in navigator) { 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 // Service worker is disabled in webpack-dev-server: https://github.com/GoogleChrome/workbox/issues/1790
if (!process.env.WEBPACK_DEV_SERVER) { if (!process.env.WEBPACK_DEV_SERVER) {
navigator.serviceWorker.register('service-worker.js'); navigator.serviceWorker.register('service-worker.js');
} else { } else {
// we no longer run workbox when in webpack-dev-server, clean it up // we no longer run workbox when in webpack-dev-server, clean it up
navigator.serviceWorker.getRegistration('service-worker.js').then(reg => reg.unregister()); navigator.serviceWorker.getRegistration().then(reg => reg && reg.unregister());
} }
} }
} }