sveltekit-auth-example 1.0.52 → 1.0.53

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Backlog
 * Add password complexity checking on /register and /profile pages (only checks for length currently despite what the pages say)
 
+# 1.0.53
+* Fix service-worker.ts typing
+* Bump pg, sveltekit, svelte, vite, tslib and other devDependencies
+
 # 1.0.52
 * Bump @sveltejs/kit, svelte, vite, vitest, pg, adapter-node, google-auth-library, eslint, sass, @typescript*, typescript, prettier, eslint-config-prettier, prettier-plugin-svelte, svelte-check
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sveltekit-auth-example",
   "description": "SvelteKit Authentication Example",
-  "version": "1.0.52",
+  "version": "1.0.53",
   "private": false,
   "author": "Nate Stuyvesant",
   "license": "https://github.com/nstuyvesant/sveltekit-auth-example/blob/master/LICENSE",
@@ -33,24 +33,24 @@
   },
   "engines": {
     "node": "^18.16.0",
-    "npm": "^9.6.4"
+    "npm": "^9.6.7"
   },
   "type": "module",
   "dependencies": {
     "@sendgrid/mail": "^7.7.0",
-    "pg": "^8.10.0"
+    "pg": "^8.11.0"
   },
   "devDependencies": {
     "@sveltejs/adapter-node": "^1.2.4",
-    "@sveltejs/kit": "^1.15.10",
+    "@sveltejs/kit": "^1.19.0",
     "@types/bootstrap": "5.2.6",
     "@types/google.accounts": "^0.0.7",
     "@types/jsonwebtoken": "^9.0.2",
-    "@types/pg": "^8.6.6",
-    "@typescript-eslint/eslint-plugin": "^5.59.2",
-    "@typescript-eslint/parser": "^5.59.2",
+    "@types/pg": "^8.10.1",
+    "@typescript-eslint/eslint-plugin": "^5.59.7",
+    "@typescript-eslint/parser": "^5.59.7",
     "bootstrap": "^5.2.3",
-    "eslint": "^8.39.0",
+    "eslint": "^8.41.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-svelte3": "^4.0.0",
     "google-auth-library": "^8.8.0",
@@ -58,11 +58,11 @@
     "prettier": "^2.8.8",
     "prettier-plugin-svelte": "^2.10.0",
     "sass": "^1.62.1",
-    "svelte": "^3.58.0",
-    "svelte-check": "^3.2.0",
-    "tslib": "^2.5.0",
+    "svelte": "^3.59.1",
+    "svelte-check": "^3.4.3",
+    "tslib": "^2.5.2",
     "typescript": "^5.0.4",
-    "vite": "^4.3.4",
-    "vitest": "^0.30.1"
+    "vite": "^4.3.9",
+    "vitest": "^0.31.1"
   }
 }

package/src/service-worker.ts

@@ -1,74 +1,68 @@
+/// <reference types="@sveltejs/kit" />
+/// <reference no-default-lib="true"/>
+/// <reference lib="esnext" />
 /// <reference lib="webworker" />
+
 import { build, files, version } from '$service-worker'
 
-const worker = <ServiceWorkerGlobalScope> <unknown> self
-const cacheName = `cache${version}`
-const toCache = build.concat(files)
-const staticAssets = new Set(toCache)
+const sw = self as unknown as ServiceWorkerGlobalScope
 
-worker.addEventListener('install', event => {
-	// console.log('[Service Worker] Installation')
-	event.waitUntil(
-		caches
-			.open(cacheName)
-			.then(cache => cache.addAll(toCache))
-			.then(() => {
-				worker.skipWaiting()
-			})
-			.catch(error => console.error(error))
-	)
-})
+// Create a unique cache name for this deployment
+const CACHE = `cache-${version}`
 
-worker.addEventListener('activate', event => {
-	// console.log('[Service Worker] Activation')
-	event.waitUntil(
-		caches.keys()
-			.then(async (keys) => {
-				for (const key of keys) {
-					if (key !== cacheName) await caches.delete(key)
-				}
-			})
-	)
-	worker.clients.claim() // or should this be inside the caches.keys().then()?
-})
+const ASSETS = [
+	...build, // the app itself
+	...files // everything in `static`
+]
+
+sw.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)
+	}
 
-// Fetch from network into cache and fall back to cache if user offline
-async function fetchAndCache(request: Request) {
-	const cache = await caches.open(`offline${version}`)
+	event.waitUntil(addFilesToCache())
+})
 
-	try {
-		const response = await fetch(request)
-		cache.put(request, response.clone())
-		return response
-	} catch (err) {
-		const response = await cache.match(request)
-		if (response) return response
-		throw err
+sw.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)
+		}
 	}
-}
 
-worker.addEventListener('fetch', event => {
-	if (event.request.method !== 'GET' || event.request.headers.has('range')) return
+	event.waitUntil(deleteOldCaches())
+})
+
+sw.addEventListener('fetch', (event) => {
+	// ignore POST requests etc
+	if (event.request.method !== 'GET') return
 
-	const url = new URL(event.request.url)
-	// console.log(`[Service Worker] Fetch ${url}`)
+	async function respond() {
+		const url = new URL(event.request.url)
+		const cache = await caches.open(CACHE)
 
-	// don't try to handle data: or blob: URIs
-	const isHttp = url.protocol.startsWith('http')
-	const isDevServerRequest = url.hostname === self.location.hostname && url.port !== self.location.port
-	const isStaticAsset = url.host === self.location.host && staticAssets.has(url.pathname)
-	const skipBecauseUncached = event.request.cache === 'only-if-cached' && !isStaticAsset
+		// `build`/`files` can always be served from the cache
+		if (ASSETS.includes(url.pathname)) {
+			return cache.match(url.pathname)
+		}
 
-	if (isHttp && !isDevServerRequest && !skipBecauseUncached) {
-		event.respondWith(
-			(async () => {
-				// always serve static files and bundler-generated assets from cache.
-				// if your application has other URLs with data that will never change,
-				// set this variable to true for them and they will only be fetched once.
-				const cachedAsset = isStaticAsset && (await caches.match(event.request))
+		// for everything else, try the network first, but
+		// fall back to the cache if we're offline
+		try {
+			const response = await fetch(event.request)
 
-				return cachedAsset || fetchAndCache(event.request)
-			})()
-		)
+			if (response.status === 200) {
+				cache.put(event.request, response.clone())
+			}
+
+			return response
+		} catch {
+			return cache.match(event.request)
+		}
 	}
+
+	event.respondWith(respond() as PromiseLike<Response>)
 })