Nikurasu/elk
1
0
Fork 0
forked from Mirrors/elk
Code Pull requests Releases 2 Packages 1 Activity

chore: revert changes to use network first

Browse source
This commit is contained in:
userquin 2023-11-02 15:16:37 +01:00
parent 3f3cb16979
commit 55e855181d
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/pwa.ts
View file

@ -13,8 +13,8 @@ export const pwa: VitePWANuxtOptions = {
includeManifestIcons: false, includeManifestIcons: false,
manifest: false, manifest: false,
injectManifest: { injectManifest: {
globPatterns: ['**/*.{js,json,css,html,txt,svg,png,ico,webp,woff,woff2,ttf,eot,otf,wasm,webmanifest}'], globPatterns: ['**/*.{js,json,css,html,txt,svg,png,ico,webp,woff,woff2,ttf,eot,otf,wasm}'],
globIgnores: ['emojis/**', 'shiki/**'/* , 'manifest**.webmanifest', 'pwa-*.png', 'maskable-icon.png', 'shortcuts/**', 'screenshots/**' */], globIgnores: ['emojis/**', 'shiki/**', 'manifest**.webmanifest'],
manifestTransforms: [(entries) => { manifestTransforms: [(entries) => {
const manifest = entries.map((entry) => { const manifest = entries.map((entry) => {
if (entry.url.length > 1 && entry.url[0] !== '/') if (entry.url.length > 1 && entry.url[0] !== '/')

18
service-worker/sw.ts
View file

@ -3,7 +3,7 @@
import { cleanupOutdatedCaches, createHandlerBoundToURL, precacheAndRoute } from 'workbox-precaching' import { cleanupOutdatedCaches, createHandlerBoundToURL, precacheAndRoute } from 'workbox-precaching'
import { NavigationRoute, registerRoute } from 'workbox-routing' import { NavigationRoute, registerRoute } from 'workbox-routing'
import { CacheableResponsePlugin } from 'workbox-cacheable-response' import { CacheableResponsePlugin } from 'workbox-cacheable-response'
import { StaleWhileRevalidate } from 'workbox-strategies' import { NetworkFirst, StaleWhileRevalidate } from 'workbox-strategies'
import { ExpirationPlugin } from 'workbox-expiration' import { ExpirationPlugin } from 'workbox-expiration'
import { onNotificationClick, onPush } from './web-push-notifications' import { onNotificationClick, onPush } from './web-push-notifications'
@ -33,7 +33,6 @@ if (import.meta.env.DEV)
// deny api and server page calls // deny api and server page calls
let denylist: undefined | RegExp[] let denylist: undefined | RegExp[]
if (import.meta.env.PROD) { if (import.meta.env.PROD) {
// const pwaIcons = /^\/(pwa-.*|maskable-icon|shortcuts\/.*|screenshots\/.*)\.(png|webp)/
denylist = [ denylist = [
/^\/api\//, /^\/api\//,
/^\/login\//, /^\/login\//,
@ -46,21 +45,14 @@ if (import.meta.env.PROD) {
/^\/emojis\//, /^\/emojis\//,
// exclude sw: if the user navigates to it, fallback to index.html // exclude sw: if the user navigates to it, fallback to index.html
/^\/sw\.js$/, /^\/sw\.js$/,
// exclude web manifest icons
// pwaIcons,
// exclude web manifest: has its own cache, if the user navigates to it, fallback to index.html // exclude web manifest: has its own cache, if the user navigates to it, fallback to index.html
/// ^\/manifest-(.*)\.webmanifest$/, /^\/manifest-(.*)\.webmanifest$/,
] ]
// only cache pages and external assets on local build + start or in production // only cache pages and external assets on local build + start or in production
// include webmanifest and images cache // include webmanifest and images cache
/* registerRoute( registerRoute(
({ request, sameOrigin, url }) => ({ request, sameOrigin }) => sameOrigin && request.destination === 'manifest',
sameOrigin && ((
request.destination === 'manifest' && url.pathname.startsWith('/manifest-')
) || (
request.destination === 'image' && pwaIcons.test(url.pathname)
)),
new NetworkFirst({ new NetworkFirst({
cacheName: 'elk-webmanifest', cacheName: 'elk-webmanifest',
// responses with a Vary: Accept-Encoding header // responses with a Vary: Accept-Encoding header
@ -73,7 +65,7 @@ if (import.meta.env.PROD) {
new ExpirationPlugin({ maxEntries: 100 }), new ExpirationPlugin({ maxEntries: 100 }),
], ],
}), }),
) */ )
// include shiki cache // include shiki cache
registerRoute( registerRoute(
({ sameOrigin, url }) => ({ sameOrigin, url }) =>