diff --git a/bun.lockb b/bun.lockb
index fca75521..d6aabcda 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/package.json b/package.json
index 5f03f451..3015a15d 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,6 @@
"@types/markdown-it": "^12.2.3",
"@types/markdown-it-container": "^2.0.6",
"@types/nprogress": "^0.2.0",
- "@vite-pwa/sveltekit": "^0.3.0",
"autoprefixer": "^10.4.16",
"jsdom": "^22.1.0",
"lemmy-js-client": "latest",
@@ -36,9 +35,7 @@
"tslib": "^2.4.1",
"typescript": "^5.0.0",
"vite": "^5.0.0",
- "vite-plugin-pwa": "^0.18.0",
- "vitest": "^1.0.0",
- "workbox-window": "^7.0.0"
+ "vitest": "^1.0.0"
},
"private": true,
"scripts": {
diff --git a/src/lib/PwaReload.svelte b/src/lib/PwaReload.svelte
deleted file mode 100644
index ce16eb61..00000000
--- a/src/lib/PwaReload.svelte
+++ /dev/null
@@ -1,36 +0,0 @@
-
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index a794e5b1..24fe31f6 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -6,8 +6,6 @@
import 'nprogress/nprogress.css'
import Moderation from '$lib/components/lemmy/moderation/Moderation.svelte'
import Sidebar from '$lib/components/ui/sidebar/Sidebar.svelte'
- // @ts-ignore
- import { pwaInfo } from 'virtual:pwa-info'
import {
colorScheme,
inDarkColorScheme,
@@ -59,8 +57,6 @@
}
}
- $: webManifest = pwaInfo ? pwaInfo.webManifest.linkTag : ''
-
onMount(() => {
if (browser) {
if (window.location.hash == 'main') {
@@ -115,7 +111,6 @@
{/if}
{/if}
- {@html webManifest}
+///
+///
+///
+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())
+})
diff --git a/static/img/pwa/narrow.webp b/static/img/pwa/narrow.webp
new file mode 100644
index 00000000..a14d4d1e
Binary files /dev/null and b/static/img/pwa/narrow.webp differ
diff --git a/static/img/pwa/wide.webp b/static/img/pwa/wide.webp
new file mode 100644
index 00000000..2140eece
Binary files /dev/null and b/static/img/pwa/wide.webp differ
diff --git a/static/manifest.json b/static/manifest.json
index 005e66f2..c930f71a 100644
--- a/static/manifest.json
+++ b/static/manifest.json
@@ -20,5 +20,35 @@
"display": "standalone",
"scope": "/",
"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"]
}
diff --git a/vite.config.ts b/vite.config.ts
index 8b6409dc..35e581c4 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,40 +1,9 @@
import { sveltekit } from '@sveltejs/kit/vite'
import { defineConfig, type PluginOption } from 'vite'
-import { SvelteKitPWA } from '@vite-pwa/sveltekit'
import { visualizer } from 'rollup-plugin-visualizer'
export default defineConfig({
- plugins: [
- 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,
- ],
+ plugins: [sveltekit(), visualizer({}) as PluginOption],
define: {
__VERSION__: JSON.stringify(process.env.npm_package_version),