feat: nuke vite-pwa because it sucks and use my own service worker
This commit is contained in:
1 parent
19fa06b5bd
commit
25a3b10937
9 files changed
+116
-78
No files matched your search
+1
-4
@@ -15,7 +15,6 @@
|
|||||||
"@types/markdown-it": "^12.2.3",
|
"@types/markdown-it": "^12.2.3",
|
||||||
"@types/markdown-it-container": "^2.0.6",
|
"@types/markdown-it-container": "^2.0.6",
|
||||||
"@types/nprogress": "^0.2.0",
|
"@types/nprogress": "^0.2.0",
|
||||||
"@vite-pwa/sveltekit": "^0.3.0",
|
|
||||||
"autoprefixer": "^10.4.16",
|
"autoprefixer": "^10.4.16",
|
||||||
"jsdom": "^22.1.0",
|
"jsdom": "^22.1.0",
|
||||||
"lemmy-js-client": "latest",
|
"lemmy-js-client": "latest",
|
||||||
@@ -36,9 +35,7 @@
|
|||||||
"tslib": "^2.4.1",
|
"tslib": "^2.4.1",
|
||||||
"typescript": "^5.0.0",
|
"typescript": "^5.0.0",
|
||||||
"vite": "^5.0.0",
|
"vite": "^5.0.0",
|
||||||
"vite-plugin-pwa": "^0.18.0",
|
"vitest": "^1.0.0"
|
||||||
"vitest": "^1.0.0",
|
|
||||||
"workbox-window": "^7.0.0"
|
|
||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { toast as showToast } from 'mono-svelte'
|
|
||||||
import { useRegisterSW } from 'virtual:pwa-register/svelte'
|
|
||||||
const { needRefresh, updateServiceWorker, offlineReady } = useRegisterSW({
|
|
||||||
onRegistered(r) {
|
|
||||||
// uncomment following code if you want check for updates
|
|
||||||
// r && setInterval(() => {
|
|
||||||
// console.log('Checking for sw update')
|
|
||||||
// r.update()
|
|
||||||
// }, 20000 /* 20s for testing purposes */)
|
|
||||||
console.log(`SW Registered: ${r}`)
|
|
||||||
},
|
|
||||||
onRegisterError(error) {
|
|
||||||
console.log('SW registration error', error)
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
const close = () => {
|
|
||||||
offlineReady.set(false)
|
|
||||||
needRefresh.set(false)
|
|
||||||
}
|
|
||||||
|
|
||||||
$: toast = $offlineReady || $needRefresh
|
|
||||||
|
|
||||||
const t = () => {
|
|
||||||
if (!$offlineReady && $needRefresh) {
|
|
||||||
showToast({
|
|
||||||
content: 'Updates available. Click the check to update.',
|
|
||||||
action: () => updateServiceWorker(true),
|
|
||||||
duration: 9999 * 1000,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$: if (toast) t()
|
|
||||||
</script>
|
|
||||||
@@ -6,8 +6,6 @@
|
|||||||
import 'nprogress/nprogress.css'
|
import 'nprogress/nprogress.css'
|
||||||
import Moderation from '$lib/components/lemmy/moderation/Moderation.svelte'
|
import Moderation from '$lib/components/lemmy/moderation/Moderation.svelte'
|
||||||
import Sidebar from '$lib/components/ui/sidebar/Sidebar.svelte'
|
import Sidebar from '$lib/components/ui/sidebar/Sidebar.svelte'
|
||||||
// @ts-ignore
|
|
||||||
import { pwaInfo } from 'virtual:pwa-info'
|
|
||||||
import {
|
import {
|
||||||
colorScheme,
|
colorScheme,
|
||||||
inDarkColorScheme,
|
inDarkColorScheme,
|
||||||
@@ -59,8 +57,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$: webManifest = pwaInfo ? pwaInfo.webManifest.linkTag : ''
|
|
||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
if (browser) {
|
if (browser) {
|
||||||
if (window.location.hash == 'main') {
|
if (window.location.hash == 'main') {
|
||||||
@@ -115,7 +111,6 @@
|
|||||||
<meta name="description" content="A sleek client for Lemmy" />
|
<meta name="description" content="A sleek client for Lemmy" />
|
||||||
{/if}
|
{/if}
|
||||||
{/if}
|
{/if}
|
||||||
{@html webManifest}
|
|
||||||
</svelte:head>
|
</svelte:head>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
|
|||||||
@@ -0,0 +1,83 @@
|
|||||||
|
/// <reference types="@sveltejs/kit" />
|
||||||
|
/// <reference no-default-lib="true"/>
|
||||||
|
/// <reference lib="esnext" />
|
||||||
|
/// <reference lib="webworker" />
|
||||||
|
import { build, files, version } from '$service-worker'
|
||||||
|
|
||||||
|
// Create a unique cache name for this deployment
|
||||||
|
const CACHE = `cache-${version}`
|
||||||
|
|
||||||
|
const ASSETS = [
|
||||||
|
...build, // the app itself
|
||||||
|
...files, // everything in `static`
|
||||||
|
]
|
||||||
|
|
||||||
|
self.addEventListener('install', (event) => {
|
||||||
|
// Create a new cache and add all files to it
|
||||||
|
async function addFilesToCache() {
|
||||||
|
const cache = await caches.open(CACHE)
|
||||||
|
await cache.addAll(ASSETS)
|
||||||
|
}
|
||||||
|
|
||||||
|
event.waitUntil(addFilesToCache())
|
||||||
|
})
|
||||||
|
|
||||||
|
self.addEventListener('activate', (event) => {
|
||||||
|
// Remove previous cached data from disk
|
||||||
|
async function deleteOldCaches() {
|
||||||
|
for (const key of await caches.keys()) {
|
||||||
|
if (key !== CACHE) await caches.delete(key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
event.waitUntil(deleteOldCaches())
|
||||||
|
})
|
||||||
|
|
||||||
|
self.addEventListener('fetch', (event) => {
|
||||||
|
// ignore POST requests etc
|
||||||
|
if (event.request.method !== 'GET') return
|
||||||
|
|
||||||
|
async function respond() {
|
||||||
|
const url = new URL(event.request.url)
|
||||||
|
const cache = await caches.open(CACHE)
|
||||||
|
|
||||||
|
// `build`/`files` can always be served from the cache
|
||||||
|
if (ASSETS.includes(url.pathname)) {
|
||||||
|
const response = await cache.match(url.pathname)
|
||||||
|
|
||||||
|
if (response) {
|
||||||
|
return response
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// for everything else, try the network first, but
|
||||||
|
// fall back to the cache if we're offline
|
||||||
|
try {
|
||||||
|
const response = await fetch(event.request)
|
||||||
|
|
||||||
|
// if we're offline, fetch can return a value that is not a Response
|
||||||
|
// instead of throwing - and we can't pass this non-Response to respondWith
|
||||||
|
if (!(response instanceof Response)) {
|
||||||
|
throw new Error('invalid response from fetch')
|
||||||
|
}
|
||||||
|
|
||||||
|
if (response.status === 200) {
|
||||||
|
cache.put(event.request, response.clone())
|
||||||
|
}
|
||||||
|
|
||||||
|
return response
|
||||||
|
} catch (err) {
|
||||||
|
const response = await cache.match(event.request)
|
||||||
|
|
||||||
|
if (response) {
|
||||||
|
return response
|
||||||
|
}
|
||||||
|
|
||||||
|
// if there's no cache, then just error out
|
||||||
|
// as there is nothing we can do to respond to this request
|
||||||
|
throw err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
event.respondWith(respond())
|
||||||
|
})
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 97 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 153 KiB |
+31
-1
@@ -20,5 +20,35 @@
|
|||||||
"display": "standalone",
|
"display": "standalone",
|
||||||
"scope": "/",
|
"scope": "/",
|
||||||
"theme_color": "#000000",
|
"theme_color": "#000000",
|
||||||
"description": "A sleek client for Lemmy."
|
"description": "A client for Lemmy with design as priority.",
|
||||||
|
"screenshots": [
|
||||||
|
{
|
||||||
|
"form_factor": "wide",
|
||||||
|
"label": "Desktop interface",
|
||||||
|
"type": "image/webp",
|
||||||
|
"src": "img/pwa/wide.webp",
|
||||||
|
"sizes": "3692x1948"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"form_factor": "narrow",
|
||||||
|
"label": "Mobile interface",
|
||||||
|
"src": "img/pwa/narrow.webp",
|
||||||
|
"sizes": "962x1948"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"shortcuts": [
|
||||||
|
{
|
||||||
|
"name": "Inbox",
|
||||||
|
"url": "/inbox"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Create post",
|
||||||
|
"url": "/create/post"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Profile",
|
||||||
|
"url": "/profile/user"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"categories": ["entertainment", "news", "social"]
|
||||||
}
|
}
|
||||||
+1
-32
@@ -1,40 +1,9 @@
|
|||||||
import { sveltekit } from '@sveltejs/kit/vite'
|
import { sveltekit } from '@sveltejs/kit/vite'
|
||||||
import { defineConfig, type PluginOption } from 'vite'
|
import { defineConfig, type PluginOption } from 'vite'
|
||||||
import { SvelteKitPWA } from '@vite-pwa/sveltekit'
|
|
||||||
import { visualizer } from 'rollup-plugin-visualizer'
|
import { visualizer } from 'rollup-plugin-visualizer'
|
||||||
|
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
plugins: [
|
plugins: [sveltekit(), visualizer({}) as PluginOption],
|
||||||
sveltekit(),
|
|
||||||
SvelteKitPWA({
|
|
||||||
registerType: 'autoUpdate',
|
|
||||||
strategies: 'generateSW',
|
|
||||||
devOptions: {
|
|
||||||
enabled: true,
|
|
||||||
type: 'module',
|
|
||||||
navigateFallback: '/',
|
|
||||||
},
|
|
||||||
manifest: {
|
|
||||||
name: 'Photon for Lemmy',
|
|
||||||
short_name: 'Photon',
|
|
||||||
description: 'A lemmy client with a sleek design',
|
|
||||||
theme_color: '#000000',
|
|
||||||
display: 'standalone',
|
|
||||||
icons: [
|
|
||||||
{
|
|
||||||
src: 'logo_512.png',
|
|
||||||
sizes: '512x512',
|
|
||||||
type: 'image/png',
|
|
||||||
purpose: 'masked any',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
start_url: '/',
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
visualizer({
|
|
||||||
template: 'network',
|
|
||||||
}) as PluginOption,
|
|
||||||
],
|
|
||||||
|
|
||||||
define: {
|
define: {
|
||||||
__VERSION__: JSON.stringify(process.env.npm_package_version),
|
__VERSION__: JSON.stringify(process.env.npm_package_version),
|
||||||
|
|||||||
Reference in new issue
Block a user