fix: Revert "fix: no need for double reload of SW in Chrome (#1251)" (#1257)

This reverts commit fa2eb8fe52.
This commit is contained in:
Nolan Lawson 2019-06-01 12:17:12 -07:00 committed by GitHub
parent fcf64c2169
commit 27864fc47f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 82 deletions

View file

@ -36,7 +36,7 @@
methods: { methods: {
reload (event) { reload (event) {
event.preventDefault() event.preventDefault()
location.reload() document.location.reload(true)
} }
} }
} }

View file

@ -1,81 +1,17 @@
import { snackbar } from '../_components/snackbar/snackbar' import { snackbar } from '../_components/snackbar/snackbar'
// A lot of this code is borrowed from https://github.com/GoogleChromeLabs/squoosh/blob/53b46f8/src/lib/offliner.ts function onUpdateFound (registration) {
// Service Workers are hard! const newWorker = registration.installing
// Tell the service worker to skip waiting newWorker.addEventListener('statechange', async () => {
async function skipWaiting () { if (newWorker.state === 'installed' && navigator.serviceWorker.controller) {
const reg = await navigator.serviceWorker.getRegistration() snackbar.announce('App update available.', 'Reload', () => document.location.reload(true))
if (!reg || !reg.waiting) { }
return
}
reg.waiting.postMessage('skip-waiting')
}
// Wait for an installing worker
async function installingWorker (reg) {
if (reg.installing) {
return reg.installing
}
return new Promise((resolve) => {
reg.addEventListener(
'updatefound',
() => resolve(reg.installing),
{ once: true }
)
}) })
} }
// Wait a service worker to become waiting if ('serviceWorker' in navigator) {
async function updateReady (reg) { navigator.serviceWorker.register('/service-worker.js').then(registration => {
if (reg.waiting) { registration.addEventListener('updatefound', () => onUpdateFound(registration))
return
}
const installing = await installingWorker(reg)
return new Promise((resolve) => {
const listener = () => {
if (installing.state === 'installed') {
installing.removeEventListener('statechange', listener)
resolve()
}
}
installing.addEventListener('statechange', listener)
}) })
} }
(async () => {
if ('serviceWorker' in navigator) {
navigator.serviceWorker.register('/service-worker.js')
const hasController = !!navigator.serviceWorker.controller
navigator.serviceWorker.addEventListener('controllerchange', () => {
if (!hasController) { // first install
return
}
location.reload()
})
// If we don't have a controller, we don't need to check for updates we've just loaded from the
// network.
if (!hasController) {
return
}
const reg = await navigator.serviceWorker.getRegistration()
if (!reg) { // SW not registered yet
return
}
// Look for updates
await updateReady(reg)
// Ask the user if they want to update.
snackbar.announce('App update available.', 'Reload', () => {
// Tell the waiting worker to activate, this will change the controller and cause a reload (see
// 'controllerchange')
/* no await */ skipWaiting()
})
}
})()

View file

@ -35,6 +35,7 @@ self.addEventListener('install', event => {
caches.open(WEBPACK_ASSETS).then(cache => cache.addAll(webpackAssets)), caches.open(WEBPACK_ASSETS).then(cache => cache.addAll(webpackAssets)),
caches.open(ASSETS).then(cache => cache.addAll(assets)) caches.open(ASSETS).then(cache => cache.addAll(assets))
]) ])
self.skipWaiting()
})()) })())
}) })
@ -242,11 +243,3 @@ self.addEventListener('notificationclick', event => {
} }
})()) })())
}) })
self.addEventListener('message', (event) => {
switch (event.data) {
case 'skip-waiting':
self.skipWaiting()
break
}
})