Disallow async function in service worker (#7482)
offline-plugin depends on webpack.optimize.UglifyJsPlugin, which is an alias of uglifyjs-webpack-plugin v0.4.6. uglifyjs-webpack-plugin v0.4.6 uses uglify-js 2.8.29, which is not compatible with async function.gh/stable
parent
ed4bae182b
commit
03b69ebc45
|
@ -28,11 +28,10 @@ self.addEventListener('fetch', function(event) {
|
||||||
const asyncResponse = fetchRoot();
|
const asyncResponse = fetchRoot();
|
||||||
const asyncCache = openWebCache();
|
const asyncCache = openWebCache();
|
||||||
|
|
||||||
event.respondWith(asyncResponse.then(async response => {
|
event.respondWith(asyncResponse.then(response => {
|
||||||
if (response.ok) {
|
if (response.ok) {
|
||||||
const cache = await asyncCache;
|
return asyncCache.then(cache => cache.put('/', response))
|
||||||
await cache.put('/', response);
|
.then(() => response.clone());
|
||||||
return response.clone();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
throw null;
|
throw null;
|
||||||
|
@ -41,35 +40,38 @@ self.addEventListener('fetch', function(event) {
|
||||||
const asyncResponse = fetch(event.request);
|
const asyncResponse = fetch(event.request);
|
||||||
const asyncCache = openWebCache();
|
const asyncCache = openWebCache();
|
||||||
|
|
||||||
event.respondWith(asyncResponse.then(async response => {
|
event.respondWith(asyncResponse.then(response => {
|
||||||
if (response.ok || response.type === 'opaqueredirect') {
|
if (response.ok || response.type === 'opaqueredirect') {
|
||||||
await Promise.all([
|
return Promise.all([
|
||||||
asyncCache.then(cache => cache.delete('/')),
|
asyncCache.then(cache => cache.delete('/')),
|
||||||
indexedDB.deleteDatabase('mastodon'),
|
indexedDB.deleteDatabase('mastodon'),
|
||||||
]);
|
]).then(() => response);
|
||||||
}
|
}
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
}));
|
}));
|
||||||
} else if (process.env.CDN_HOST ? url.host === process.env.CDN_HOST : url.pathname.startsWith('/system/')) {
|
} else if (process.env.CDN_HOST ? url.host === process.env.CDN_HOST : url.pathname.startsWith('/system/')) {
|
||||||
event.respondWith(openSystemCache().then(async cache => {
|
event.respondWith(openSystemCache().then(cache => {
|
||||||
const cached = await cache.match(event.request.url);
|
return cache.match(event.request.url).then(cached => {
|
||||||
|
if (cached === undefined) {
|
||||||
|
return fetch(event.request).then(fetched => {
|
||||||
|
if (fetched.ok) {
|
||||||
|
const put = cache.put(event.request.url, fetched.clone());
|
||||||
|
|
||||||
if (cached === undefined) {
|
put.catch(() => freeStorage());
|
||||||
const fetched = await fetch(event.request);
|
|
||||||
|
|
||||||
if (fetched.ok) {
|
return put.then(() => {
|
||||||
try {
|
freeStorage();
|
||||||
await cache.put(event.request.url, fetched.clone());
|
return fetched;
|
||||||
} finally {
|
});
|
||||||
freeStorage();
|
}
|
||||||
}
|
|
||||||
|
return fetched;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return fetched;
|
return cached;
|
||||||
}
|
});
|
||||||
|
|
||||||
return cached;
|
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Reference in New Issue