From 934ff6ac2494fde613c0a5637be7511c98b11e50 Mon Sep 17 00:00:00 2001
From: Geoff Rich <geoff.rich@alaskaair.com>
Date: Thu, 13 Jan 2022 08:58:12 -0800
Subject: [PATCH 1/8] Update to latest Kit and handle breaking changes

---
 packages/repl/package.json                    |   4 +-
 packages/site-kit/package.json                |   2 +-
 .../src/lib/components/NavItem.svelte         |   2 +-
 packages/site-kit/src/lib/docs/Main.svelte    |   6 +-
 pnpm-lock.yaml                                | 184 ++++++++++--------
 sites/kit.svelte.dev/package.json             |   2 +-
 sites/svelte.dev/package.json                 |   4 +-
 sites/svelte.dev/src/routes/__layout.svelte   |   2 +-
 .../svelte.dev/src/routes/apps/index.json.js  |   3 +-
 sites/svelte.dev/src/routes/apps/index.svelte |   6 +-
 sites/svelte.dev/src/routes/auth/callback.js  |   6 +-
 sites/svelte.dev/src/routes/auth/logout.js    |   2 +-
 .../svelte.dev/src/routes/blog/[slug].svelte  |   2 +-
 .../src/routes/examples/[slug]/index.svelte   |   6 +-
 .../src/routes/repl/[id]/index.svelte         |   6 +-
 sites/svelte.dev/src/routes/repl/embed.svelte |   3 +-
 sites/svelte.dev/src/routes/repl/index.svelte |   3 +-
 .../src/routes/tutorial/[slug]/index.svelte   |   6 +-
 .../src/routes/tutorial/random-number.js      |   4 +-
 19 files changed, 141 insertions(+), 112 deletions(-)

diff --git a/packages/repl/package.json b/packages/repl/package.json
index 9690138f..ec3a6d3f 100644
--- a/packages/repl/package.json
+++ b/packages/repl/package.json
@@ -10,8 +10,8 @@
 		"format": "prettier --ignore-path .gitignore --write --plugin-search-dir=. ."
 	},
 	"devDependencies": {
-		"@sveltejs/adapter-auto": "next",
-		"@sveltejs/kit": "next",
+		"@sveltejs/adapter-auto": "^1.0.0-next.10",
+		"@sveltejs/kit": "^1.0.0-next.225",
 		"eslint": "^7.32.0",
 		"eslint-config-prettier": "^8.3.0",
 		"eslint-plugin-svelte3": "^3.2.1",
diff --git a/packages/site-kit/package.json b/packages/site-kit/package.json
index 828e5ef1..64412071 100644
--- a/packages/site-kit/package.json
+++ b/packages/site-kit/package.json
@@ -20,7 +20,7 @@
 	},
 	"homepage": "https://github.com/sveltejs/site-kit#readme",
 	"devDependencies": {
-		"@sveltejs/kit": "next",
+		"@sveltejs/kit": "^1.0.0-next.225",
 		"svelte": "^3.43.0",
 		"svelte2tsx": "^0.4.11",
 		"typescript": "^4.5.3"
diff --git a/packages/site-kit/src/lib/components/NavItem.svelte b/packages/site-kit/src/lib/components/NavItem.svelte
index 594c6415..d7e75609 100644
--- a/packages/site-kit/src/lib/components/NavItem.svelte
+++ b/packages/site-kit/src/lib/components/NavItem.svelte
@@ -11,7 +11,7 @@
 {:else}
 	<li>
 		<a
-			aria-current={$page.path.startsWith(href) ? true : undefined}
+			aria-current={$page.url.pathname.startsWith(href) ? true : undefined}
 			sveltekit:prefetch
 			{href}
 			{title}
diff --git a/packages/site-kit/src/lib/docs/Main.svelte b/packages/site-kit/src/lib/docs/Main.svelte
index 08f348a5..c8d7879b 100644
--- a/packages/site-kit/src/lib/docs/Main.svelte
+++ b/packages/site-kit/src/lib/docs/Main.svelte
@@ -15,7 +15,7 @@
 			if (heading.nodeName.startsWith('H') && !heading.querySelector('a')) {
 				const a = document.createElement('a');
 				a.className = 'anchor';
-				a.href = `${$page.path}#${heading.id}`;
+				a.href = `${$page.url.pathname}#${heading.id}`;
 				const span = document.createElement('span');
 				span.className = "visually-hidden";
 				span.innerHTML = "permalink";
@@ -45,7 +45,7 @@
 					const { id } = heading;
 
 					if (id !== last_id) {
-						path = `${$page.path}#${id}`;
+						path = `${$page.url.pathname}#${id}`;
 						last_id = id;
 					}
 
@@ -53,7 +53,7 @@
 				}
 			}
 
-			path = $page.path;
+			path = $page.url.pathname;
 		};
 
 		window.addEventListener('scroll', onscroll, true);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a399a094..396456e9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -10,8 +10,8 @@ importers:
 
   packages/repl:
     specifiers:
-      '@sveltejs/adapter-auto': next
-      '@sveltejs/kit': next
+      '@sveltejs/adapter-auto': ^1.0.0-next.10
+      '@sveltejs/kit': ^1.0.0-next.225
       '@sveltejs/site-kit': workspace:*
       acorn: ^8.6.0
       codemirror: '5'
@@ -36,8 +36,8 @@ importers:
       svelte-json-tree: 0.1.0
       yootils: 0.3.1
     devDependencies:
-      '@sveltejs/adapter-auto': 1.0.0-next.4
-      '@sveltejs/kit': 1.0.0-next.202_svelte@3.44.2
+      '@sveltejs/adapter-auto': 1.0.0-next.10
+      '@sveltejs/kit': 1.0.0-next.225_svelte@3.44.2
       eslint: 7.32.0
       eslint-config-prettier: 8.3.0_eslint@7.32.0
       eslint-plugin-svelte3: 3.2.1_eslint@7.32.0+svelte@3.44.2
@@ -49,7 +49,7 @@ importers:
 
   packages/site-kit:
     specifiers:
-      '@sveltejs/kit': next
+      '@sveltejs/kit': ^1.0.0-next.225
       golden-fleece: ^1.0.9
       svelte: ^3.43.0
       svelte2tsx: ^0.4.11
@@ -57,7 +57,7 @@ importers:
     dependencies:
       golden-fleece: 1.0.9
     devDependencies:
-      '@sveltejs/kit': 1.0.0-next.202_svelte@3.44.2
+      '@sveltejs/kit': 1.0.0-next.225_svelte@3.44.2
       svelte: 3.44.2
       svelte2tsx: 0.4.11_svelte@3.44.2+typescript@4.5.3
       typescript: 4.5.3
@@ -65,14 +65,14 @@ importers:
   sites/kit.svelte.dev:
     specifiers:
       '@sveltejs/adapter-netlify': next
-      '@sveltejs/kit': next
+      '@sveltejs/kit': ^1.0.0-next.225
       '@sveltejs/site-kit': workspace:*
       '@types/node': ^16.6.1
       svelte: ^3.43.0
       vite-imagetools: ^4.0.3
     devDependencies:
-      '@sveltejs/adapter-netlify': 1.0.0-next.36
-      '@sveltejs/kit': 1.0.0-next.202_svelte@3.44.2
+      '@sveltejs/adapter-netlify': 1.0.0-next.38
+      '@sveltejs/kit': 1.0.0-next.225_svelte@3.44.2
       '@sveltejs/site-kit': link:../../packages/site-kit
       '@types/node': 16.11.12
       svelte: 3.44.2
@@ -82,8 +82,8 @@ importers:
     specifiers:
       '@sindresorhus/slugify': ^0.9.1
       '@supabase/supabase-js': ^1.28.5
-      '@sveltejs/adapter-auto': ^1.0.0-next.3
-      '@sveltejs/kit': next
+      '@sveltejs/adapter-auto': ^1.0.0-next.10
+      '@sveltejs/kit': ^1.0.0-next.225
       '@sveltejs/repl': workspace:*
       '@sveltejs/site-kit': workspace:*
       cookie: ^0.4.0
@@ -113,8 +113,8 @@ importers:
       prismjs: 1.25.0
     devDependencies:
       '@sindresorhus/slugify': 0.9.1
-      '@sveltejs/adapter-auto': 1.0.0-next.3
-      '@sveltejs/kit': 1.0.0-next.202_svelte@3.44.2
+      '@sveltejs/adapter-auto': 1.0.0-next.10
+      '@sveltejs/kit': 1.0.0-next.225_svelte@3.44.2
       '@sveltejs/site-kit': link:../../packages/site-kit
       degit: 2.8.4
       dotenv: 10.0.0
@@ -734,7 +734,7 @@ packages:
     engines: {node: '>= 8.0.0'}
     dependencies:
       estree-walker: 2.0.2
-      picomatch: 2.3.0
+      picomatch: 2.3.1
     dev: true
 
   /@sindresorhus/slugify/0.9.1:
@@ -779,72 +779,45 @@ packages:
       '@supabase/storage-js': 1.5.0
     dev: false
 
-  /@sveltejs/adapter-auto/1.0.0-next.3:
-    resolution: {integrity: sha512-FVNLtr0bj/slQqA0TuoylnVsGrvBYdYL+hpp2Qy5Kg3q1m8i9bJ0aifKnaGn7m01II2KUSnpnhuRbX/HwKVDcA==}
-    dependencies:
-      '@sveltejs/adapter-cloudflare': 1.0.0-next.2
-      '@sveltejs/adapter-netlify': 1.0.0-next.35
-      '@sveltejs/adapter-vercel': 1.0.0-next.31
-    dev: true
-
-  /@sveltejs/adapter-auto/1.0.0-next.4:
-    resolution: {integrity: sha512-kfygrjF2uIgVVDsySl7I9oWSekU6adJCr/3qzLQDLM4FJ98FWmfhj4OOWsmF9X4JRPSm97t3RPugYsN3NLwKMQ==}
-    dependencies:
-      '@sveltejs/adapter-cloudflare': 1.0.0-next.3
-      '@sveltejs/adapter-netlify': 1.0.0-next.36
-      '@sveltejs/adapter-vercel': 1.0.0-next.32
-    dev: true
-
-  /@sveltejs/adapter-cloudflare/1.0.0-next.2:
-    resolution: {integrity: sha512-4Q7ZuoMck7wwzIO7gd8gqnm7gWflztTDHU/C1DzLr8V2UprQFQwsUE/padtQhFPXkgAiXJ8AwLksey4A8qjOsA==}
+  /@sveltejs/adapter-auto/1.0.0-next.10:
+    resolution: {integrity: sha512-ETMhpg8bUtLpRAqGxuRmm7teRCdg8u8ANF6eC8R2QLSy1ylPP6RPPg8D5q6LiJavVG/kHMH8fj7vvfobpVfwFg==}
     dependencies:
-      esbuild: 0.13.15
+      '@sveltejs/adapter-cloudflare': 1.0.0-next.7
+      '@sveltejs/adapter-netlify': 1.0.0-next.38
+      '@sveltejs/adapter-vercel': 1.0.0-next.36
     dev: true
 
-  /@sveltejs/adapter-cloudflare/1.0.0-next.3:
-    resolution: {integrity: sha512-LauvvkBFCE8myGMLWOncv97/xU8JJn9OMl1miy8f/q8qs0CrduvR1sv2uCM9AylqT/FNPy3mony5wpe3w1v7sg==}
+  /@sveltejs/adapter-cloudflare/1.0.0-next.7:
+    resolution: {integrity: sha512-P2rq+Tdvv9IKX4SVrIRqgZ2DnjmpPjp/bhAISs6cgbMzc2AmLMCeN++DXAZAVWugIjF1freLmtXcCl3/0HByNg==}
     dependencies:
       esbuild: 0.13.15
     dev: true
 
-  /@sveltejs/adapter-netlify/1.0.0-next.35:
-    resolution: {integrity: sha512-3PC1RaRReu652ot+LC9EOjkebnZehdwvUm0zhPC8OFPJJccQwq6Y1kbHDeACIIFRTaKLIRBpuYh3idP6ffUGdw==}
+  /@sveltejs/adapter-netlify/1.0.0-next.38:
+    resolution: {integrity: sha512-u0mCV3YOBakdeiIt4Sd7buiTACkzHpPuUoSkLjtmJ5PsbrvtFhFNKE4AARqI8nDoX1yjs6pUKlIX3IZDmEeM5A==}
     dependencies:
       '@iarna/toml': 2.2.5
       esbuild: 0.13.15
+      tiny-glob: 0.2.9
     dev: true
 
-  /@sveltejs/adapter-netlify/1.0.0-next.36:
-    resolution: {integrity: sha512-LdrIXCTBnIubtt/lthcnyt5VljuHpZlVzUqpWXk9Eu6bpNKblqQLMHkTBQfIbPfanmNSDZXJQVsdcFLqF2/+Cw==}
-    dependencies:
-      '@iarna/toml': 2.2.5
-      esbuild: 0.13.15
-    dev: true
-
-  /@sveltejs/adapter-vercel/1.0.0-next.31:
-    resolution: {integrity: sha512-W8p/U00B6ihVrDpwMkgEexfVUzaLmn4MRtXj//Gw4NDFfsrZR4P5wBidrOAIkCYBMvqCOHD+vbAvIiAMOaN23g==}
-    dependencies:
-      esbuild: 0.13.15
-    dev: true
-
-  /@sveltejs/adapter-vercel/1.0.0-next.32:
-    resolution: {integrity: sha512-ZcltaS5bAobGD5P0z7xJIjPHSlGpF7padMIkqTzJxwMEb/acGgdO5yzDS8XUEaSNgj+prpD2oG8+gm33ds8x0A==}
+  /@sveltejs/adapter-vercel/1.0.0-next.36:
+    resolution: {integrity: sha512-IpvxBb5n9k5l6nikwq8mCeBg0VtSqAt7AY/PSujwjGs5KqYx3CrVu/Cyj4b0dyCO2Yyt2dr2QjS/R2R42PRBeA==}
     dependencies:
       esbuild: 0.13.15
     dev: true
 
-  /@sveltejs/kit/1.0.0-next.202_svelte@3.44.2:
-    resolution: {integrity: sha512-rXmJ0FplkWvD1CaeCfejRYhOJYrlmeUm5Fkw7gIKDdWPQev5rqOhd9B9ZvRpq35oMqCAwaOfK+e5S6k+83feEQ==}
+  /@sveltejs/kit/1.0.0-next.225_svelte@3.44.2:
+    resolution: {integrity: sha512-J/f+FZVdvpTmn7nCeRKRC1L9gbcI7g1bJRaw+jMdq/MYtGqcRw/fjYrx9/xO3+1YH0wgNG1b26GwmQZE64PFIQ==}
     engines: {node: '>=14.13'}
     hasBin: true
     peerDependencies:
       svelte: ^3.44.0
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 1.0.0-next.31_svelte@3.44.2+vite@2.7.2
-      cheap-watch: 1.0.4
-      sade: 1.7.4
+      '@sveltejs/vite-plugin-svelte': 1.0.0-next.34_svelte@3.44.2+vite@2.7.10
+      sade: 1.8.1
       svelte: 3.44.2
-      vite: 2.7.2
+      vite: 2.7.10
     transitivePeerDependencies:
       - diff-match-patch
       - less
@@ -853,13 +826,13 @@ packages:
       - supports-color
     dev: true
 
-  /@sveltejs/vite-plugin-svelte/1.0.0-next.31_svelte@3.44.2+vite@2.7.2:
-    resolution: {integrity: sha512-8K3DcGP1V+XBv389u32S6wt8xiun6hHd5wn28AKLSoNTIhOmJOA2RJUJzp0seTRI86Shme4lzHI2Fgq4qz1wXQ==}
+  /@sveltejs/vite-plugin-svelte/1.0.0-next.34_svelte@3.44.2+vite@2.7.10:
+    resolution: {integrity: sha512-qZH2jndijrdkvevgbO7OH3iQsviM5Kz7h5APiNP4yEMZTrwq9bifzYvco6BprwtPvLb5wYlRVFZUOdusY6AovQ==}
     engines: {node: ^14.13.1 || >= 16}
     peerDependencies:
       diff-match-patch: ^1.0.5
       svelte: ^3.44.0
-      vite: ^2.6.0
+      vite: ^2.7.0
     peerDependenciesMeta:
       diff-match-patch:
         optional: true
@@ -870,8 +843,8 @@ packages:
       magic-string: 0.25.7
       require-relative: 0.8.7
       svelte: 3.44.2
-      svelte-hmr: 0.14.7_svelte@3.44.2
-      vite: 2.7.2
+      svelte-hmr: 0.14.9_svelte@3.44.2
+      vite: 2.7.10
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -1148,11 +1121,6 @@ packages:
     resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
     dev: true
 
-  /cheap-watch/1.0.4:
-    resolution: {integrity: sha512-QR/9FrtRL5fjfUJBhAKCdi0lSRQ3rVRRum3GF9wDKp2TJbEIMGhUEr2yU8lORzm9Isdjx7/k9S0DFDx+z5VGtw==}
-    engines: {node: '>=8'}
-    dev: true
-
   /chownr/1.1.4:
     resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
     dev: true
@@ -2008,6 +1976,10 @@ packages:
       type-fest: 0.20.2
     dev: true
 
+  /globalyzer/0.1.0:
+    resolution: {integrity: sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==}
+    dev: true
+
   /globby/11.0.4:
     resolution: {integrity: sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==}
     engines: {node: '>=10'}
@@ -2020,6 +1992,10 @@ packages:
       slash: 3.0.0
     dev: true
 
+  /globrex/0.1.2:
+    resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
+    dev: true
+
   /golden-fleece/1.0.9:
     resolution: {integrity: sha512-YSwLaGMOgSBx9roJlNLL12c+FRiw7VECphinc6mGucphc/ZxTHgdEz6gmJqH6NOzYEd/yr64hwjom5pZ+tJVpg==}
     dev: false
@@ -2153,6 +2129,12 @@ packages:
       has: 1.0.3
     dev: true
 
+  /is-core-module/2.8.1:
+    resolution: {integrity: sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==}
+    dependencies:
+      has: 1.0.3
+    dev: true
+
   /is-extglob/2.1.1:
     resolution: {integrity: sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=}
     engines: {node: '>=0.10.0'}
@@ -2495,8 +2477,8 @@ packages:
     resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
     dev: true
 
-  /nanoid/3.1.30:
-    resolution: {integrity: sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==}
+  /nanoid/3.1.32:
+    resolution: {integrity: sha512-F8mf7R3iT9bvThBoW4tGXhXFHCctyCiUUPrWF8WaTqa3h96d9QybkSeba43XVOOE3oiLfkVDe4bT8MeGmkrTxw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
     dev: true
@@ -2753,6 +2735,11 @@ packages:
     engines: {node: '>=8.6'}
     dev: true
 
+  /picomatch/2.3.1:
+    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
+    engines: {node: '>=8.6'}
+    dev: true
+
   /pify/4.0.1:
     resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
     engines: {node: '>=6'}
@@ -2777,11 +2764,11 @@ packages:
     engines: {node: '>=4.0.0'}
     dev: true
 
-  /postcss/8.4.4:
-    resolution: {integrity: sha512-joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q==}
+  /postcss/8.4.5:
+    resolution: {integrity: sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==}
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
-      nanoid: 3.1.30
+      nanoid: 3.1.32
       picocolors: 1.0.0
       source-map-js: 1.0.1
     dev: true
@@ -3009,6 +2996,15 @@ packages:
       path-parse: 1.0.7
     dev: true
 
+  /resolve/1.21.0:
+    resolution: {integrity: sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==}
+    hasBin: true
+    dependencies:
+      is-core-module: 2.8.1
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
+    dev: true
+
   /reusify/1.0.4:
     resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
@@ -3027,6 +3023,15 @@ packages:
     hasBin: true
     optionalDependencies:
       fsevents: 2.3.2
+    dev: false
+
+  /rollup/2.63.0:
+    resolution: {integrity: sha512-nps0idjmD+NXl6OREfyYXMn/dar3WGcyKn+KBzPdaLecub3x/LrId0wUcthcr8oZUAcZAR8NKcfGGFlNgGL1kQ==}
+    engines: {node: '>=10.0.0'}
+    hasBin: true
+    optionalDependencies:
+      fsevents: 2.3.2
+    dev: true
 
   /run-parallel/1.2.0:
     resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
@@ -3041,6 +3046,13 @@ packages:
       mri: 1.2.0
     dev: true
 
+  /sade/1.8.1:
+    resolution: {integrity: sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==}
+    engines: {node: '>=6'}
+    dependencies:
+      mri: 1.2.0
+    dev: true
+
   /safe-buffer/5.1.2:
     resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
     dev: true
@@ -3319,8 +3331,13 @@ packages:
       has-flag: 4.0.0
     dev: true
 
-  /svelte-hmr/0.14.7_svelte@3.44.2:
-    resolution: {integrity: sha512-pDrzgcWSoMaK6AJkBWkmgIsecW0GChxYZSZieIYfCP0v2oPyx2CYU/zm7TBIcjLVUPP714WxmViE9Thht4etog==}
+  /supports-preserve-symlinks-flag/1.0.0:
+    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
+  /svelte-hmr/0.14.9_svelte@3.44.2:
+    resolution: {integrity: sha512-bKE9+4qb4sAnA+TKHiYurUl970rjA0XmlP9TEP7K/ncyWz3m81kA4HOgmlZK/7irGK7gzZlaPDI3cmf8fp/+tg==}
     peerDependencies:
       svelte: '>=3.19.0'
     dependencies:
@@ -3399,6 +3416,13 @@ packages:
     resolution: {integrity: sha512-IjZc9KIotudix8bMaBW6QvMuq64BrJWFs1+4V0lXwWGQZwH+LnX87doAYhem4caOEusRP9/g6jVDQmZ8XOk1nw==}
     dev: true
 
+  /tiny-glob/0.2.9:
+    resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==}
+    dependencies:
+      globalyzer: 0.1.0
+      globrex: 0.1.2
+    dev: true
+
   /tinycolor2/1.4.2:
     resolution: {integrity: sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA==}
     dev: true
@@ -3562,8 +3586,8 @@ packages:
       magic-string: 0.25.7
     dev: true
 
-  /vite/2.7.2:
-    resolution: {integrity: sha512-wMffVVdKZRZP/HwW3yttKL8X+IJePz7bUcnGm0vqljffpVwHpjWC3duZtJQHAGvy+wrTjmwU7vkULpZ1dVXY6w==}
+  /vite/2.7.10:
+    resolution: {integrity: sha512-KEY96ntXUid1/xJihJbgmLZx7QSC2D4Tui0FdS0Old5OokYzFclcofhtxtjDdGOk/fFpPbHv9yw88+rB93Tb8w==}
     engines: {node: '>=12.2.0'}
     hasBin: true
     peerDependencies:
@@ -3579,9 +3603,9 @@ packages:
         optional: true
     dependencies:
       esbuild: 0.13.15
-      postcss: 8.4.4
-      resolve: 1.20.0
-      rollup: 2.61.1
+      postcss: 8.4.5
+      resolve: 1.21.0
+      rollup: 2.63.0
     optionalDependencies:
       fsevents: 2.3.2
     dev: true
diff --git a/sites/kit.svelte.dev/package.json b/sites/kit.svelte.dev/package.json
index 99f76514..958e9f66 100644
--- a/sites/kit.svelte.dev/package.json
+++ b/sites/kit.svelte.dev/package.json
@@ -10,7 +10,7 @@
 	},
 	"devDependencies": {
 		"@sveltejs/adapter-netlify": "next",
-		"@sveltejs/kit": "next",
+		"@sveltejs/kit": "^1.0.0-next.225",
 		"@sveltejs/site-kit": "workspace:*",
 		"@types/node": "^16.6.1",
 		"svelte": "^3.43.0",
diff --git a/sites/svelte.dev/package.json b/sites/svelte.dev/package.json
index f073108b..51dee607 100644
--- a/sites/svelte.dev/package.json
+++ b/sites/svelte.dev/package.json
@@ -24,8 +24,8 @@
 	},
 	"devDependencies": {
 		"@sindresorhus/slugify": "^0.9.1",
-		"@sveltejs/adapter-auto": "^1.0.0-next.3",
-		"@sveltejs/kit": "next",
+		"@sveltejs/adapter-auto": "^1.0.0-next.10",
+		"@sveltejs/kit": "^1.0.0-next.225",
 		"@sveltejs/site-kit": "workspace:*",
 		"degit": "^2.1.4",
 		"dotenv": "^10.0.0",
diff --git a/sites/svelte.dev/src/routes/__layout.svelte b/sites/svelte.dev/src/routes/__layout.svelte
index 7eef733b..956bc5f5 100644
--- a/sites/svelte.dev/src/routes/__layout.svelte
+++ b/sites/svelte.dev/src/routes/__layout.svelte
@@ -36,7 +36,7 @@
 	<PreloadingIndicator />
 {/if}
 
-{#if $page.path !== '/repl/embed'}
+{#if $page.url.pathname !== '/repl/embed'}
 	<Nav {page} logo="/svelte-logo-horizontal.svg">
 		<svelte:fragment slot="nav-center">
 			<NavItem href="/tutorial">Tutorial</NavItem>
diff --git a/sites/svelte.dev/src/routes/apps/index.json.js b/sites/svelte.dev/src/routes/apps/index.json.js
index 7a04c114..e319d5b0 100644
--- a/sites/svelte.dev/src/routes/apps/index.json.js
+++ b/sites/svelte.dev/src/routes/apps/index.json.js
@@ -1,6 +1,7 @@
 import * as gist from '$lib/db/gist';
 
-export async function get({ query, locals }) {
+export async function get({ url, locals }) {
+	const query = url.searchParams;
 	if (locals.user) {
 		const offset = query.get('offset') ? parseInt(query.get('offset')) : 0;
 		const search = query.get('search');
diff --git a/sites/svelte.dev/src/routes/apps/index.svelte b/sites/svelte.dev/src/routes/apps/index.svelte
index 47fcda51..a2f2bb77 100644
--- a/sites/svelte.dev/src/routes/apps/index.svelte
+++ b/sites/svelte.dev/src/routes/apps/index.svelte
@@ -1,12 +1,12 @@
 <script context="module">
-	export async function load({ fetch, page, session: { user } }) {
+	export async function load({ fetch, url, session: { user } }) {
 		let gists = [];
 		let next = null;
 
-		const search = page.query.get('search');
+		const search = url.searchParams.get('search');
 
 		if (user) {
-			const r = await fetch(`/apps.json?${page.query}`, {
+			const r = await fetch(`/apps.json?${url.searchParams}`, {
 				credentials: 'include'
 			});
 
diff --git a/sites/svelte.dev/src/routes/auth/callback.js b/sites/svelte.dev/src/routes/auth/callback.js
index f54cf4d4..4bc5d294 100644
--- a/sites/svelte.dev/src/routes/auth/callback.js
+++ b/sites/svelte.dev/src/routes/auth/callback.js
@@ -4,13 +4,13 @@ import { stringify } from 'querystring';
 import * as session from '$lib/db/session';
 import { oauth, client_id, client_secret } from './_config.js';
 
-export async function get({ host, query }) {
+export async function get({ url }) {
 	try {
 		// Trade "code" for "access_token"
 		const r1 = await fetch(
 			`${oauth}/access_token?` +
 				stringify({
-					code: query.get('code'),
+					code: url.searchParams.get('code'),
 					client_id,
 					client_secret
 				})
@@ -44,7 +44,7 @@ export async function get({ host, query }) {
 					expires: new Date(expires),
 					path: '/',
 					httpOnly: true,
-					secure: !host.startsWith('localhost:')
+					secure: !url.host.startsWith('localhost:')
 				}),
 				'Content-Type': 'text/html; charset=utf-8'
 			},
diff --git a/sites/svelte.dev/src/routes/auth/logout.js b/sites/svelte.dev/src/routes/auth/logout.js
index 746d9b8a..d18d63b0 100644
--- a/sites/svelte.dev/src/routes/auth/logout.js
+++ b/sites/svelte.dev/src/routes/auth/logout.js
@@ -10,7 +10,7 @@ export async function get(request) {
 				maxAge: -1,
 				path: '/',
 				httpOnly: true,
-				secure: !request.host.startsWith('localhost:')
+				secure: !request.url.host.startsWith('localhost:')
 			})
 		}
 	};
diff --git a/sites/svelte.dev/src/routes/blog/[slug].svelte b/sites/svelte.dev/src/routes/blog/[slug].svelte
index 21ac9ae9..e0ff567f 100644
--- a/sites/svelte.dev/src/routes/blog/[slug].svelte
+++ b/sites/svelte.dev/src/routes/blog/[slug].svelte
@@ -1,7 +1,7 @@
 <script context="module">
 	import { API_BASE } from '$lib/env';
 
-	export async function load({ fetch, page: { params } }) {
+	export async function load({ fetch, params }) {
 		const res = await fetch(`${API_BASE}/docs/svelte/blog/${params.slug}`);
 
 		if (!res.ok) return { status: 404, error: 'That post could not be found' };
diff --git a/sites/svelte.dev/src/routes/examples/[slug]/index.svelte b/sites/svelte.dev/src/routes/examples/[slug]/index.svelte
index 1030963f..662d5acb 100644
--- a/sites/svelte.dev/src/routes/examples/[slug]/index.svelte
+++ b/sites/svelte.dev/src/routes/examples/[slug]/index.svelte
@@ -2,15 +2,15 @@
 <script context="module">
 	import { API_BASE } from '$lib/env';
 
-	export async function load({ page }) {
-		const example = await fetch(`${API_BASE}/docs/svelte/examples/${page.params.slug}`, {
+	export async function load({ params }) {
+		const example = await fetch(`${API_BASE}/docs/svelte/examples/${params.slug}`, {
 			credentials: 'omit'
 		});
 
 		return {
 			props: {
 				example: await example.json(),
-				slug: page.params.slug
+				slug: params.slug
 			},
 			maxage: 60
 		};
diff --git a/sites/svelte.dev/src/routes/repl/[id]/index.svelte b/sites/svelte.dev/src/routes/repl/[id]/index.svelte
index 8cf16432..6ee0f7ed 100644
--- a/sites/svelte.dev/src/routes/repl/[id]/index.svelte
+++ b/sites/svelte.dev/src/routes/repl/[id]/index.svelte
@@ -1,6 +1,6 @@
 <script context="module">
-	export async function load({ page, fetch }) {
-		const res = await fetch(`/repl/${page.params.id}.json`);
+	export async function load({ params, fetch, url }) {
+		const res = await fetch(`/repl/${params.id}.json`);
 
 		if (!res.ok) {
 			return {
@@ -13,7 +13,7 @@
 		return {
 			props: {
 				gist,
-				version: page.query.get('version') || '3'
+				version: url.searchParams.get('version') || '3'
 			}
 		};
 	}
diff --git a/sites/svelte.dev/src/routes/repl/embed.svelte b/sites/svelte.dev/src/routes/repl/embed.svelte
index 9a5ace2f..80bc55e7 100644
--- a/sites/svelte.dev/src/routes/repl/embed.svelte
+++ b/sites/svelte.dev/src/routes/repl/embed.svelte
@@ -1,5 +1,6 @@
 <script context="module">
-	export function load({ page: { query }}) {
+	export function load({ url }) {
+		const query = url.searchParams;
 		return {
 			props: {
 				version: query.get('version') || '3',
diff --git a/sites/svelte.dev/src/routes/repl/index.svelte b/sites/svelte.dev/src/routes/repl/index.svelte
index 483ab7e4..4a42acf7 100644
--- a/sites/svelte.dev/src/routes/repl/index.svelte
+++ b/sites/svelte.dev/src/routes/repl/index.svelte
@@ -1,5 +1,6 @@
 <script context="module">
-	export function load({ page: { query } }) {
+	export function load({ url }) {
+		const query = url.searchParams;
 		const gist = query.get('gist');
 		const example = query.get('example');
 		const version = query.get('version');
diff --git a/sites/svelte.dev/src/routes/tutorial/[slug]/index.svelte b/sites/svelte.dev/src/routes/tutorial/[slug]/index.svelte
index b50861b5..dda96de6 100644
--- a/sites/svelte.dev/src/routes/tutorial/[slug]/index.svelte
+++ b/sites/svelte.dev/src/routes/tutorial/[slug]/index.svelte
@@ -1,8 +1,8 @@
 <script context="module">
 	import { API_BASE } from '$lib/env';
 
-	export async function load({ page }) {
-		const tutorial = await fetch(`${API_BASE}/docs/svelte/tutorial/${page.params.slug}`);
+	export async function load({ params }) {
+		const tutorial = await fetch(`${API_BASE}/docs/svelte/tutorial/${params.slug}`);
 
 		if (!tutorial.ok) {
 			return {
@@ -12,7 +12,7 @@
 		}
 
 		return {
-			props: { tutorial: await tutorial.json(), slug: page.params.slug },
+			props: { tutorial: await tutorial.json(), slug: params.slug },
 			maxage: 60
 		};
 	}
diff --git a/sites/svelte.dev/src/routes/tutorial/random-number.js b/sites/svelte.dev/src/routes/tutorial/random-number.js
index 5a4d94e1..37ad6be8 100644
--- a/sites/svelte.dev/src/routes/tutorial/random-number.js
+++ b/sites/svelte.dev/src/routes/tutorial/random-number.js
@@ -1,5 +1,7 @@
 export async function get(req) {
-	let { min = '0', max = '100' } = req.query;
+	const query = req.url.searchParams;
+	let min = query.get('min') || '0';
+	let max = query.get('max') || '100';
 	min = +min;
 	max = +max;
 

From 1c3a3405dcb3fc3cad92ca1b460a9c14c9630fcf Mon Sep 17 00:00:00 2001
From: Geoff Rich <geoff.rich@alaskaair.com>
Date: Thu, 13 Jan 2022 09:25:45 -0800
Subject: [PATCH 2/8] Update to next.229

---
 packages/repl/package.json        |  4 ++--
 packages/site-kit/package.json    |  2 +-
 pnpm-lock.yaml                    | 20 ++++++++++----------
 sites/kit.svelte.dev/package.json |  2 +-
 sites/svelte.dev/package.json     |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/repl/package.json b/packages/repl/package.json
index ec3a6d3f..9690138f 100644
--- a/packages/repl/package.json
+++ b/packages/repl/package.json
@@ -10,8 +10,8 @@
 		"format": "prettier --ignore-path .gitignore --write --plugin-search-dir=. ."
 	},
 	"devDependencies": {
-		"@sveltejs/adapter-auto": "^1.0.0-next.10",
-		"@sveltejs/kit": "^1.0.0-next.225",
+		"@sveltejs/adapter-auto": "next",
+		"@sveltejs/kit": "next",
 		"eslint": "^7.32.0",
 		"eslint-config-prettier": "^8.3.0",
 		"eslint-plugin-svelte3": "^3.2.1",
diff --git a/packages/site-kit/package.json b/packages/site-kit/package.json
index 64412071..828e5ef1 100644
--- a/packages/site-kit/package.json
+++ b/packages/site-kit/package.json
@@ -20,7 +20,7 @@
 	},
 	"homepage": "https://github.com/sveltejs/site-kit#readme",
 	"devDependencies": {
-		"@sveltejs/kit": "^1.0.0-next.225",
+		"@sveltejs/kit": "next",
 		"svelte": "^3.43.0",
 		"svelte2tsx": "^0.4.11",
 		"typescript": "^4.5.3"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 396456e9..73db3cc2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -11,7 +11,7 @@ importers:
   packages/repl:
     specifiers:
       '@sveltejs/adapter-auto': ^1.0.0-next.10
-      '@sveltejs/kit': ^1.0.0-next.225
+      '@sveltejs/kit': ^1.0.0-next.229
       '@sveltejs/site-kit': workspace:*
       acorn: ^8.6.0
       codemirror: '5'
@@ -37,7 +37,7 @@ importers:
       yootils: 0.3.1
     devDependencies:
       '@sveltejs/adapter-auto': 1.0.0-next.10
-      '@sveltejs/kit': 1.0.0-next.225_svelte@3.44.2
+      '@sveltejs/kit': 1.0.0-next.229_svelte@3.44.2
       eslint: 7.32.0
       eslint-config-prettier: 8.3.0_eslint@7.32.0
       eslint-plugin-svelte3: 3.2.1_eslint@7.32.0+svelte@3.44.2
@@ -49,7 +49,7 @@ importers:
 
   packages/site-kit:
     specifiers:
-      '@sveltejs/kit': ^1.0.0-next.225
+      '@sveltejs/kit': ^1.0.0-next.229
       golden-fleece: ^1.0.9
       svelte: ^3.43.0
       svelte2tsx: ^0.4.11
@@ -57,7 +57,7 @@ importers:
     dependencies:
       golden-fleece: 1.0.9
     devDependencies:
-      '@sveltejs/kit': 1.0.0-next.225_svelte@3.44.2
+      '@sveltejs/kit': 1.0.0-next.229_svelte@3.44.2
       svelte: 3.44.2
       svelte2tsx: 0.4.11_svelte@3.44.2+typescript@4.5.3
       typescript: 4.5.3
@@ -65,14 +65,14 @@ importers:
   sites/kit.svelte.dev:
     specifiers:
       '@sveltejs/adapter-netlify': next
-      '@sveltejs/kit': ^1.0.0-next.225
+      '@sveltejs/kit': ^1.0.0-next.229
       '@sveltejs/site-kit': workspace:*
       '@types/node': ^16.6.1
       svelte: ^3.43.0
       vite-imagetools: ^4.0.3
     devDependencies:
       '@sveltejs/adapter-netlify': 1.0.0-next.38
-      '@sveltejs/kit': 1.0.0-next.225_svelte@3.44.2
+      '@sveltejs/kit': 1.0.0-next.229_svelte@3.44.2
       '@sveltejs/site-kit': link:../../packages/site-kit
       '@types/node': 16.11.12
       svelte: 3.44.2
@@ -83,7 +83,7 @@ importers:
       '@sindresorhus/slugify': ^0.9.1
       '@supabase/supabase-js': ^1.28.5
       '@sveltejs/adapter-auto': ^1.0.0-next.10
-      '@sveltejs/kit': ^1.0.0-next.225
+      '@sveltejs/kit': ^1.0.0-next.229
       '@sveltejs/repl': workspace:*
       '@sveltejs/site-kit': workspace:*
       cookie: ^0.4.0
@@ -114,7 +114,7 @@ importers:
     devDependencies:
       '@sindresorhus/slugify': 0.9.1
       '@sveltejs/adapter-auto': 1.0.0-next.10
-      '@sveltejs/kit': 1.0.0-next.225_svelte@3.44.2
+      '@sveltejs/kit': 1.0.0-next.229_svelte@3.44.2
       '@sveltejs/site-kit': link:../../packages/site-kit
       degit: 2.8.4
       dotenv: 10.0.0
@@ -807,8 +807,8 @@ packages:
       esbuild: 0.13.15
     dev: true
 
-  /@sveltejs/kit/1.0.0-next.225_svelte@3.44.2:
-    resolution: {integrity: sha512-J/f+FZVdvpTmn7nCeRKRC1L9gbcI7g1bJRaw+jMdq/MYtGqcRw/fjYrx9/xO3+1YH0wgNG1b26GwmQZE64PFIQ==}
+  /@sveltejs/kit/1.0.0-next.229_svelte@3.44.2:
+    resolution: {integrity: sha512-i609g5T58Qdgh/qgO1atak70R7woNuJwWp7GtF/YUOZ9csMR9JPUr1tfX9lSh2I4Ez7j+Dc10RLlQ3szVywfXA==}
     engines: {node: '>=14.13'}
     hasBin: true
     peerDependencies:
diff --git a/sites/kit.svelte.dev/package.json b/sites/kit.svelte.dev/package.json
index 958e9f66..99f76514 100644
--- a/sites/kit.svelte.dev/package.json
+++ b/sites/kit.svelte.dev/package.json
@@ -10,7 +10,7 @@
 	},
 	"devDependencies": {
 		"@sveltejs/adapter-netlify": "next",
-		"@sveltejs/kit": "^1.0.0-next.225",
+		"@sveltejs/kit": "next",
 		"@sveltejs/site-kit": "workspace:*",
 		"@types/node": "^16.6.1",
 		"svelte": "^3.43.0",
diff --git a/sites/svelte.dev/package.json b/sites/svelte.dev/package.json
index 51dee607..c29b7483 100644
--- a/sites/svelte.dev/package.json
+++ b/sites/svelte.dev/package.json
@@ -24,8 +24,8 @@
 	},
 	"devDependencies": {
 		"@sindresorhus/slugify": "^0.9.1",
-		"@sveltejs/adapter-auto": "^1.0.0-next.10",
-		"@sveltejs/kit": "^1.0.0-next.225",
+		"@sveltejs/adapter-auto": "next",
+		"@sveltejs/kit": "next",
 		"@sveltejs/site-kit": "workspace:*",
 		"degit": "^2.1.4",
 		"dotenv": "^10.0.0",

From c32a6f4d08f4da18492ad9f098c0383bc187717f Mon Sep 17 00:00:00 2001
From: Geoff Rich <geoff.rich@alaskaair.com>
Date: Thu, 13 Jan 2022 09:28:17 -0800
Subject: [PATCH 3/8] Update lockfile

---
 pnpm-lock.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 73db3cc2..1fbc3cf8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -10,8 +10,8 @@ importers:
 
   packages/repl:
     specifiers:
-      '@sveltejs/adapter-auto': ^1.0.0-next.10
-      '@sveltejs/kit': ^1.0.0-next.229
+      '@sveltejs/adapter-auto': next
+      '@sveltejs/kit': next
       '@sveltejs/site-kit': workspace:*
       acorn: ^8.6.0
       codemirror: '5'
@@ -49,7 +49,7 @@ importers:
 
   packages/site-kit:
     specifiers:
-      '@sveltejs/kit': ^1.0.0-next.229
+      '@sveltejs/kit': next
       golden-fleece: ^1.0.9
       svelte: ^3.43.0
       svelte2tsx: ^0.4.11
@@ -65,7 +65,7 @@ importers:
   sites/kit.svelte.dev:
     specifiers:
       '@sveltejs/adapter-netlify': next
-      '@sveltejs/kit': ^1.0.0-next.229
+      '@sveltejs/kit': next
       '@sveltejs/site-kit': workspace:*
       '@types/node': ^16.6.1
       svelte: ^3.43.0
@@ -82,8 +82,8 @@ importers:
     specifiers:
       '@sindresorhus/slugify': ^0.9.1
       '@supabase/supabase-js': ^1.28.5
-      '@sveltejs/adapter-auto': ^1.0.0-next.10
-      '@sveltejs/kit': ^1.0.0-next.229
+      '@sveltejs/adapter-auto': next
+      '@sveltejs/kit': next
       '@sveltejs/repl': workspace:*
       '@sveltejs/site-kit': workspace:*
       cookie: ^0.4.0

From 55c0a0f2392d5a93c8606ad9502ad4a620dcfbfd Mon Sep 17 00:00:00 2001
From: Geoff Rich <geoff.rich@alaskaair.com>
Date: Fri, 14 Jan 2022 08:06:27 -0800
Subject: [PATCH 4/8] Update login route to use url

---
 sites/svelte.dev/src/routes/auth/login.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sites/svelte.dev/src/routes/auth/login.js b/sites/svelte.dev/src/routes/auth/login.js
index e160f90b..f76bd119 100644
--- a/sites/svelte.dev/src/routes/auth/login.js
+++ b/sites/svelte.dev/src/routes/auth/login.js
@@ -2,15 +2,15 @@ import { stringify } from 'querystring';
 import { oauth, client_id } from './_config.js';
 
 export const get = client_id
-	? ({ host }) => {
-			const protocol = host.startsWith('localhost:') ? 'http' : 'https';
+	? ({ url }) => {
+			const protocol = url.host.startsWith('localhost:') ? 'http' : 'https';
 
 			const Location =
 				`${oauth}/authorize?` +
 				stringify({
 					scope: 'read:user',
 					client_id,
-					redirect_uri: `${protocol}://${host}/auth/callback`
+					redirect_uri: `${protocol}://${url.host}/auth/callback`
 				});
 
 			return {

From 2cc82e6e70679a685f076fad3eefca26ebfec84e Mon Sep 17 00:00:00 2001
From: Geoff Rich <4992896+geoffrich@users.noreply.github.com>
Date: Thu, 20 Jan 2022 08:39:05 -0800
Subject: [PATCH 5/8] Update to latest Kit

---
 pnpm-lock.yaml | 70 +++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1fbc3cf8..a5125c44 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -36,8 +36,8 @@ importers:
       svelte-json-tree: 0.1.0
       yootils: 0.3.1
     devDependencies:
-      '@sveltejs/adapter-auto': 1.0.0-next.10
-      '@sveltejs/kit': 1.0.0-next.229_svelte@3.44.2
+      '@sveltejs/adapter-auto': 1.0.0-next.13
+      '@sveltejs/kit': 1.0.0-next.235_svelte@3.44.2
       eslint: 7.32.0
       eslint-config-prettier: 8.3.0_eslint@7.32.0
       eslint-plugin-svelte3: 3.2.1_eslint@7.32.0+svelte@3.44.2
@@ -57,7 +57,7 @@ importers:
     dependencies:
       golden-fleece: 1.0.9
     devDependencies:
-      '@sveltejs/kit': 1.0.0-next.229_svelte@3.44.2
+      '@sveltejs/kit': 1.0.0-next.235_svelte@3.44.2
       svelte: 3.44.2
       svelte2tsx: 0.4.11_svelte@3.44.2+typescript@4.5.3
       typescript: 4.5.3
@@ -71,8 +71,8 @@ importers:
       svelte: ^3.43.0
       vite-imagetools: ^4.0.3
     devDependencies:
-      '@sveltejs/adapter-netlify': 1.0.0-next.38
-      '@sveltejs/kit': 1.0.0-next.229_svelte@3.44.2
+      '@sveltejs/adapter-netlify': 1.0.0-next.41
+      '@sveltejs/kit': 1.0.0-next.235_svelte@3.44.2
       '@sveltejs/site-kit': link:../../packages/site-kit
       '@types/node': 16.11.12
       svelte: 3.44.2
@@ -113,8 +113,8 @@ importers:
       prismjs: 1.25.0
     devDependencies:
       '@sindresorhus/slugify': 0.9.1
-      '@sveltejs/adapter-auto': 1.0.0-next.10
-      '@sveltejs/kit': 1.0.0-next.229_svelte@3.44.2
+      '@sveltejs/adapter-auto': 1.0.0-next.13
+      '@sveltejs/kit': 1.0.0-next.235_svelte@3.44.2
       '@sveltejs/site-kit': link:../../packages/site-kit
       degit: 2.8.4
       dotenv: 10.0.0
@@ -779,45 +779,45 @@ packages:
       '@supabase/storage-js': 1.5.0
     dev: false
 
-  /@sveltejs/adapter-auto/1.0.0-next.10:
-    resolution: {integrity: sha512-ETMhpg8bUtLpRAqGxuRmm7teRCdg8u8ANF6eC8R2QLSy1ylPP6RPPg8D5q6LiJavVG/kHMH8fj7vvfobpVfwFg==}
+  /@sveltejs/adapter-auto/1.0.0-next.13:
+    resolution: {integrity: sha512-bXhoyQa2DtyftAnaRaK9pWV1VtiXeDlGpfXfmR/StEEOgw3NUwk6JHimDmbbHnxYWk71sNwdYPgzpub5LHLLTQ==}
     dependencies:
-      '@sveltejs/adapter-cloudflare': 1.0.0-next.7
-      '@sveltejs/adapter-netlify': 1.0.0-next.38
-      '@sveltejs/adapter-vercel': 1.0.0-next.36
+      '@sveltejs/adapter-cloudflare': 1.0.0-next.8
+      '@sveltejs/adapter-netlify': 1.0.0-next.41
+      '@sveltejs/adapter-vercel': 1.0.0-next.39
     dev: true
 
-  /@sveltejs/adapter-cloudflare/1.0.0-next.7:
-    resolution: {integrity: sha512-P2rq+Tdvv9IKX4SVrIRqgZ2DnjmpPjp/bhAISs6cgbMzc2AmLMCeN++DXAZAVWugIjF1freLmtXcCl3/0HByNg==}
+  /@sveltejs/adapter-cloudflare/1.0.0-next.8:
+    resolution: {integrity: sha512-uje8eUfP1xrMEdKczvjl0rpu7WTZZrZCBTgH2sTSYYiAqpCevsmJNZ9Lgh5U5a4BYBYGVvAcYdh8nzoddxOZkw==}
     dependencies:
       esbuild: 0.13.15
     dev: true
 
-  /@sveltejs/adapter-netlify/1.0.0-next.38:
-    resolution: {integrity: sha512-u0mCV3YOBakdeiIt4Sd7buiTACkzHpPuUoSkLjtmJ5PsbrvtFhFNKE4AARqI8nDoX1yjs6pUKlIX3IZDmEeM5A==}
+  /@sveltejs/adapter-netlify/1.0.0-next.41:
+    resolution: {integrity: sha512-w2TvRnuzYRkF9ZOCxiWhY/GaqGbvyeLotRndXFlLv8+uCV0A150XOacKkespDhHC8qZgC4PUB/Hr2Azar3r1qw==}
     dependencies:
       '@iarna/toml': 2.2.5
       esbuild: 0.13.15
       tiny-glob: 0.2.9
     dev: true
 
-  /@sveltejs/adapter-vercel/1.0.0-next.36:
-    resolution: {integrity: sha512-IpvxBb5n9k5l6nikwq8mCeBg0VtSqAt7AY/PSujwjGs5KqYx3CrVu/Cyj4b0dyCO2Yyt2dr2QjS/R2R42PRBeA==}
+  /@sveltejs/adapter-vercel/1.0.0-next.39:
+    resolution: {integrity: sha512-YOPGKIILm26h22GN4/iliXce61aTG3Dq5hX8xpDx0cNuCocv0OoLfIqiGpdyJ9NIMpjwXmpVoL4+nV+yh2wcSA==}
     dependencies:
       esbuild: 0.13.15
     dev: true
 
-  /@sveltejs/kit/1.0.0-next.229_svelte@3.44.2:
-    resolution: {integrity: sha512-i609g5T58Qdgh/qgO1atak70R7woNuJwWp7GtF/YUOZ9csMR9JPUr1tfX9lSh2I4Ez7j+Dc10RLlQ3szVywfXA==}
+  /@sveltejs/kit/1.0.0-next.235_svelte@3.44.2:
+    resolution: {integrity: sha512-VCat9bA8yUF7CP2RYzTTdk43ZjQybN7ZT53Sv870mUGtwUNwLEx4egtF4dSkfQuIya+1hNU8+doRNhpmsIrVTQ==}
     engines: {node: '>=14.13'}
     hasBin: true
     peerDependencies:
       svelte: ^3.44.0
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 1.0.0-next.34_svelte@3.44.2+vite@2.7.10
+      '@sveltejs/vite-plugin-svelte': 1.0.0-next.34_svelte@3.44.2+vite@2.7.13
       sade: 1.8.1
       svelte: 3.44.2
-      vite: 2.7.10
+      vite: 2.7.13
     transitivePeerDependencies:
       - diff-match-patch
       - less
@@ -826,7 +826,7 @@ packages:
       - supports-color
     dev: true
 
-  /@sveltejs/vite-plugin-svelte/1.0.0-next.34_svelte@3.44.2+vite@2.7.10:
+  /@sveltejs/vite-plugin-svelte/1.0.0-next.34_svelte@3.44.2+vite@2.7.13:
     resolution: {integrity: sha512-qZH2jndijrdkvevgbO7OH3iQsviM5Kz7h5APiNP4yEMZTrwq9bifzYvco6BprwtPvLb5wYlRVFZUOdusY6AovQ==}
     engines: {node: ^14.13.1 || >= 16}
     peerDependencies:
@@ -844,7 +844,7 @@ packages:
       require-relative: 0.8.7
       svelte: 3.44.2
       svelte-hmr: 0.14.9_svelte@3.44.2
-      vite: 2.7.10
+      vite: 2.7.13
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -2477,8 +2477,8 @@ packages:
     resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
     dev: true
 
-  /nanoid/3.1.32:
-    resolution: {integrity: sha512-F8mf7R3iT9bvThBoW4tGXhXFHCctyCiUUPrWF8WaTqa3h96d9QybkSeba43XVOOE3oiLfkVDe4bT8MeGmkrTxw==}
+  /nanoid/3.2.0:
+    resolution: {integrity: sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
     dev: true
@@ -2768,9 +2768,9 @@ packages:
     resolution: {integrity: sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==}
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
-      nanoid: 3.1.32
+      nanoid: 3.2.0
       picocolors: 1.0.0
-      source-map-js: 1.0.1
+      source-map-js: 1.0.2
     dev: true
 
   /prebuild-install/7.0.0:
@@ -3025,8 +3025,8 @@ packages:
       fsevents: 2.3.2
     dev: false
 
-  /rollup/2.63.0:
-    resolution: {integrity: sha512-nps0idjmD+NXl6OREfyYXMn/dar3WGcyKn+KBzPdaLecub3x/LrId0wUcthcr8oZUAcZAR8NKcfGGFlNgGL1kQ==}
+  /rollup/2.64.0:
+    resolution: {integrity: sha512-+c+lbw1lexBKSMb1yxGDVfJ+vchJH3qLbmavR+awDinTDA2C5Ug9u7lkOzj62SCu0PKUExsW36tpgW7Fmpn3yQ==}
     engines: {node: '>=10.0.0'}
     hasBin: true
     optionalDependencies:
@@ -3183,8 +3183,8 @@ packages:
       yargs: 15.4.1
     dev: true
 
-  /source-map-js/1.0.1:
-    resolution: {integrity: sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==}
+  /source-map-js/1.0.2:
+    resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
     engines: {node: '>=0.10.0'}
     dev: true
 
@@ -3586,8 +3586,8 @@ packages:
       magic-string: 0.25.7
     dev: true
 
-  /vite/2.7.10:
-    resolution: {integrity: sha512-KEY96ntXUid1/xJihJbgmLZx7QSC2D4Tui0FdS0Old5OokYzFclcofhtxtjDdGOk/fFpPbHv9yw88+rB93Tb8w==}
+  /vite/2.7.13:
+    resolution: {integrity: sha512-Mq8et7f3aK0SgSxjDNfOAimZGW9XryfHRa/uV0jseQSilg+KhYDSoNb9h1rknOy6SuMkvNDLKCYAYYUMCE+IgQ==}
     engines: {node: '>=12.2.0'}
     hasBin: true
     peerDependencies:
@@ -3605,7 +3605,7 @@ packages:
       esbuild: 0.13.15
       postcss: 8.4.5
       resolve: 1.21.0
-      rollup: 2.63.0
+      rollup: 2.64.0
     optionalDependencies:
       fsevents: 2.3.2
     dev: true

From b7788d175b99d2f39a161be6f73738215df61bde Mon Sep 17 00:00:00 2001
From: Geoff Rich <4992896+geoffrich@users.noreply.github.com>
Date: Thu, 20 Jan 2022 08:43:30 -0800
Subject: [PATCH 6/8] pnpm i again

---
 pnpm-lock.yaml | 203 ++++++++++++++++++-------------------------------
 1 file changed, 75 insertions(+), 128 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3cef5186..2d5a11dd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -70,8 +70,8 @@ importers:
       prettier-plugin-svelte: ^2.4.0
       svelte: ^3.44.0
     devDependencies:
-      '@sveltejs/adapter-auto': 1.0.0-next.11
-      '@sveltejs/kit': 1.0.0-next.232_svelte@3.44.2
+      '@sveltejs/adapter-auto': 1.0.0-next.13
+      '@sveltejs/kit': 1.0.0-next.235_svelte@3.44.2
       prettier: 2.5.1
       prettier-plugin-svelte: 2.5.0_prettier@2.5.1+svelte@3.44.2
       svelte: 3.44.2
@@ -95,7 +95,7 @@ importers:
   sites/svelte.dev:
     specifiers:
       '@sindresorhus/slugify': ^0.9.1
-      '@supabase/supabase-js': ^1.28.5
+      '@supabase/supabase-js': ^1.29.2
       '@sveltejs/adapter-auto': next
       '@sveltejs/kit': next
       '@sveltejs/repl': workspace:*
@@ -128,7 +128,7 @@ importers:
     devDependencies:
       '@sindresorhus/slugify': 0.9.1
       '@sveltejs/adapter-auto': 1.0.0-next.13
-      '@sveltejs/kit': 1.0.0-next.235_svelte@3.44.2
+      '@sveltejs/kit': 1.0.0-next.235_svelte@3.46.2
       '@sveltejs/site-kit': link:../../packages/site-kit
       degit: 2.8.4
       dotenv: 10.0.0
@@ -147,11 +147,11 @@ packages:
       '@babel/highlight': 7.16.0
     dev: true
 
-  /@babel/code-frame/7.16.7:
-    resolution: {integrity: sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==}
+  /@babel/code-frame/7.16.0:
+    resolution: {integrity: sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/highlight': 7.16.7
+      '@babel/highlight': 7.16.0
     dev: true
 
   /@babel/helper-validator-identifier/7.15.7:
@@ -159,11 +159,6 @@ packages:
     engines: {node: '>=6.9.0'}
     dev: true
 
-  /@babel/helper-validator-identifier/7.16.7:
-    resolution: {integrity: sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
   /@babel/highlight/7.16.0:
     resolution: {integrity: sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==}
     engines: {node: '>=6.9.0'}
@@ -173,17 +168,8 @@ packages:
       js-tokens: 4.0.0
     dev: true
 
-  /@babel/highlight/7.16.7:
-    resolution: {integrity: sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-validator-identifier': 7.16.7
-      chalk: 2.4.2
-      js-tokens: 4.0.0
-    dev: true
-
-  /@babel/runtime/7.16.7:
-    resolution: {integrity: sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==}
+  /@babel/runtime/7.16.3:
+    resolution: {integrity: sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
       regenerator-runtime: 0.13.9
@@ -192,7 +178,7 @@ packages:
   /@changesets/apply-release-plan/5.0.3:
     resolution: {integrity: sha512-V15OPq/GyaRB3FA0hEV0V21OhsxXcPAOUeXFF9VKKPl9XkB+nDndvUcqUfr06OeeXczP8+1aCB9N+bazbfa0TQ==}
     dependencies:
-      '@babel/runtime': 7.16.7
+      '@babel/runtime': 7.16.3
       '@changesets/config': 1.6.3
       '@changesets/get-version-range-type': 0.3.2
       '@changesets/git': 1.2.1
@@ -210,7 +196,7 @@ packages:
   /@changesets/assemble-release-plan/5.0.4:
     resolution: {integrity: sha512-kn0UecLXiif6DzB2EBEOrS54BWSo2nPC4111I4a42ut0Tpeu5z4dEOGmREMd2lMQjx9EE/q9VudkfFa12SFdwA==}
     dependencies:
-      '@babel/runtime': 7.16.7
+      '@babel/runtime': 7.16.3
       '@changesets/errors': 0.1.4
       '@changesets/get-dependents-graph': 1.2.4
       '@changesets/types': 4.0.2
@@ -222,7 +208,7 @@ packages:
     resolution: {integrity: sha512-AqtWiarNSUD42pv7ldTAFMU7pa/39t78VDAWFy78RgUJQyFmXktOG8fzjMhksJ+G5+pWLVSXaLSj6cCbpeWivg==}
     hasBin: true
     dependencies:
-      '@babel/runtime': 7.16.7
+      '@babel/runtime': 7.16.3
       '@changesets/apply-release-plan': 5.0.3
       '@changesets/assemble-release-plan': 5.0.4
       '@changesets/config': 1.6.3
@@ -286,7 +272,7 @@ packages:
   /@changesets/get-release-plan/3.0.4:
     resolution: {integrity: sha512-XEMI1WlB2crtXHLrpF8qLteZDe6ZIvuj9J3Pc9EkCo1QbVonx74zOC65KFPqNJOTpcYrex6MzOueUn2Vp32gwA==}
     dependencies:
-      '@babel/runtime': 7.16.7
+      '@babel/runtime': 7.16.3
       '@changesets/assemble-release-plan': 5.0.4
       '@changesets/config': 1.6.3
       '@changesets/pre': 1.0.9
@@ -302,7 +288,7 @@ packages:
   /@changesets/git/1.2.1:
     resolution: {integrity: sha512-Qkubed8zg4/YOXnR97ZOocKXncjLMc185jSKu3ah5TgCpwMcK1EMkGcmpf3U8EHtQbh9pRKAxlfGq376WPPyPA==}
     dependencies:
-      '@babel/runtime': 7.16.7
+      '@babel/runtime': 7.16.3
       '@changesets/errors': 0.1.4
       '@changesets/types': 4.0.2
       '@manypkg/get-packages': 1.1.3
@@ -326,7 +312,7 @@ packages:
   /@changesets/pre/1.0.9:
     resolution: {integrity: sha512-F3+qMun89KlynecBD15fEpwGT/KxbYb3WGeut6w1xhZb0u7V/jdcPy9b+kJ2xmBqFZLn1WteWIP96IjxS57H7A==}
     dependencies:
-      '@babel/runtime': 7.16.7
+      '@babel/runtime': 7.16.3
       '@changesets/errors': 0.1.4
       '@changesets/types': 4.0.2
       '@manypkg/get-packages': 1.1.3
@@ -336,7 +322,7 @@ packages:
   /@changesets/read/0.5.2:
     resolution: {integrity: sha512-spI5uMYsyZfuXbZmUAQhXitu09YZ6iwmEE1QJnJkAPFLkpt5uEgyG9EnP3HRkGSkmLy8c+3pYIR2bbhxbZIm6w==}
     dependencies:
-      '@babel/runtime': 7.16.7
+      '@babel/runtime': 7.16.3
       '@changesets/git': 1.2.1
       '@changesets/logger': 0.0.5
       '@changesets/parse': 0.3.10
@@ -353,7 +339,7 @@ packages:
   /@changesets/write/0.1.6:
     resolution: {integrity: sha512-JWE2gJs9eHhorxqembkf43fllKlCz+sp1TJKSheaWfhWILMHPdfa/xQG4+sMZkISo1qZ+IlJyiBLha6iGGjXyA==}
     dependencies:
-      '@babel/runtime': 7.16.7
+      '@babel/runtime': 7.16.3
       '@changesets/types': 4.0.2
       fs-extra: 7.0.1
       human-id: 1.0.2
@@ -720,8 +706,8 @@ packages:
   /@manypkg/find-root/1.1.0:
     resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==}
     dependencies:
-      '@babel/runtime': 7.16.7
-      '@types/node': 12.20.42
+      '@babel/runtime': 7.16.3
+      '@types/node': 12.20.37
       find-up: 4.1.0
       fs-extra: 8.1.0
     dev: true
@@ -729,11 +715,11 @@ packages:
   /@manypkg/get-packages/1.1.3:
     resolution: {integrity: sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==}
     dependencies:
-      '@babel/runtime': 7.16.7
+      '@babel/runtime': 7.16.3
       '@changesets/types': 4.0.2
       '@manypkg/find-root': 1.1.0
       fs-extra: 8.1.0
-      globby: 11.1.0
+      globby: 11.0.4
       read-yaml-file: 1.1.0
     dev: true
 
@@ -780,8 +766,8 @@ packages:
       cross-fetch: 3.1.4
     dev: false
 
-  /@supabase/postgrest-js/0.35.1:
-    resolution: {integrity: sha512-N9IOxwgKvek2HqVrC3Usr6hUWvzy53vebsoqLqUBaelu8StATTrhdqaw+9IKthQsn8qoB9A0XD2vN39SGlgd/A==}
+  /@supabase/postgrest-js/0.35.0:
+    resolution: {integrity: sha512-z+XKJ2oXuGEAEBVXseeQUXaM3ekQZK4XF0Kc399Glyg+rZaBTwNeJtY+Q/23NcIE5uNMYbTnEXm80jZbLBnWdw==}
     dependencies:
       cross-fetch: 3.1.4
     dev: false
@@ -793,8 +779,8 @@ packages:
       websocket: 1.0.34
     dev: false
 
-  /@supabase/storage-js/1.5.1:
-    resolution: {integrity: sha512-W82st1RvkChVJ/FTCcPXFXfS3V0Z4rZuMnoDnB9/NI5i9r9zspZS40tHpUQ+vbN6R6k0pfr/Waa1jcEd3YAtrQ==}
+  /@supabase/storage-js/1.5.0:
+    resolution: {integrity: sha512-ki2HT9FrCYRN3yoqWqX+u47TUHQ8lgSStAqV/97kMov1z2d+iIlqGBGVcaGDqq4NvK8CipG8IJARYM72oX+afA==}
     dependencies:
       cross-fetch: 3.1.4
     dev: false
@@ -803,9 +789,9 @@ packages:
     resolution: {integrity: sha512-zyURfsWxGeuVQd4QfqeSyzhpplYIQznL92mATcb8uUjnoXRC+oDiVQ3Ak5mtFJlPPT1tRwEWTr5o9fr0AncOcg==}
     dependencies:
       '@supabase/gotrue-js': 1.21.7
-      '@supabase/postgrest-js': 0.35.1
+      '@supabase/postgrest-js': 0.35.0
       '@supabase/realtime-js': 1.3.5
-      '@supabase/storage-js': 1.5.1
+      '@supabase/storage-js': 1.5.0
     dev: false
 
   /@sveltejs/adapter-auto/1.0.0-next.13:
@@ -825,6 +811,7 @@ packages:
   /@sveltejs/adapter-netlify/1.0.0-next.41:
     resolution: {integrity: sha512-w2TvRnuzYRkF9ZOCxiWhY/GaqGbvyeLotRndXFlLv8+uCV0A150XOacKkespDhHC8qZgC4PUB/Hr2Azar3r1qw==}
     dependencies:
+      '@iarna/toml': 2.2.5
       esbuild: 0.13.15
       tiny-glob: 0.2.9
     dev: true
@@ -833,7 +820,6 @@ packages:
     resolution: {integrity: sha512-YOPGKIILm26h22GN4/iliXce61aTG3Dq5hX8xpDx0cNuCocv0OoLfIqiGpdyJ9NIMpjwXmpVoL4+nV+yh2wcSA==}
     dependencies:
       esbuild: 0.13.15
-      tiny-glob: 0.2.9
     dev: true
 
   /@sveltejs/kit/1.0.0-next.235_svelte@3.44.2:
@@ -855,6 +841,25 @@ packages:
       - supports-color
     dev: true
 
+  /@sveltejs/kit/1.0.0-next.235_svelte@3.46.2:
+    resolution: {integrity: sha512-VCat9bA8yUF7CP2RYzTTdk43ZjQybN7ZT53Sv870mUGtwUNwLEx4egtF4dSkfQuIya+1hNU8+doRNhpmsIrVTQ==}
+    engines: {node: '>=14.13'}
+    hasBin: true
+    peerDependencies:
+      svelte: ^3.44.0
+    dependencies:
+      '@sveltejs/vite-plugin-svelte': 1.0.0-next.34_svelte@3.46.2+vite@2.7.13
+      sade: 1.8.1
+      svelte: 3.46.2
+      vite: 2.7.13
+    transitivePeerDependencies:
+      - diff-match-patch
+      - less
+      - sass
+      - stylus
+      - supports-color
+    dev: true
+
   /@sveltejs/vite-plugin-svelte/1.0.0-next.34_svelte@3.44.2+vite@2.7.13:
     resolution: {integrity: sha512-qZH2jndijrdkvevgbO7OH3iQsviM5Kz7h5APiNP4yEMZTrwq9bifzYvco6BprwtPvLb5wYlRVFZUOdusY6AovQ==}
     engines: {node: ^14.13.1 || >= 16}
@@ -911,17 +916,12 @@ packages:
     resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==}
     dev: true
 
-  /@types/node/12.20.42:
-    resolution: {integrity: sha512-aI3/oo5DzyiI5R/xAhxxRzfZlWlsbbqdgxfTPkqu/Zt+23GXiJvMCyPJT4+xKSXOnLqoL8jJYMLTwvK2M3a5hw==}
+  /@types/node/12.20.37:
+    resolution: {integrity: sha512-i1KGxqcvJaLQali+WuypQnXwcplhtNtjs66eNsZpp2P2FL/trJJxx/VWsM0YCL2iMoIJrbXje48lvIQAQ4p2ZA==}
     dev: true
 
   /@types/node/16.11.12:
     resolution: {integrity: sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw==}
-    dev: true
-
-  /@types/node/17.0.10:
-    resolution: {integrity: sha512-S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog==}
-    dev: false
 
   /@types/normalize-package-data/2.4.1:
     resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
@@ -934,7 +934,7 @@ packages:
   /@types/websocket/1.0.4:
     resolution: {integrity: sha512-qn1LkcFEKK8RPp459jkjzsfpbsx36BBt3oC3pITYtkoBw/aVX+EZFa5j3ThCRTNpLFvIMr5dSTD4RaMdilIOpA==}
     dependencies:
-      '@types/node': 17.0.10
+      '@types/node': 16.11.12
     dev: false
 
   /acorn-jsx/5.3.2_acorn@7.4.1:
@@ -1123,8 +1123,8 @@ packages:
       ieee754: 1.2.1
     dev: true
 
-  /bufferutil/4.0.6:
-    resolution: {integrity: sha512-jduaYOYtnio4aIAyc6UbvPCVcgq7nYpVnucyxr6eCYg/Woad9Hf/oxxBRDnGGjPfjUm6j5O/uBWhIu4iLebFaw==}
+  /bufferutil/4.0.5:
+    resolution: {integrity: sha512-HTm14iMQKK2FjFLRTM5lAVcyaUzOnqbPtesFIvREgXpJHdQm8bWS+GkQgIkfaBYRHuCnea7w8UVNfwiAQhlr9A==}
     engines: {node: '>=6.14.2'}
     requiresBuild: true
     dependencies:
@@ -1247,8 +1247,8 @@ packages:
       simple-swizzle: 0.2.2
     dev: true
 
-  /color/4.2.0:
-    resolution: {integrity: sha512-hHTcrbvEnGjC7WBMk6ibQWFVDgEFTVmjrz2Q5HlU6ltwxv0JJN2Z8I7uRbWeQLF04dikxs8zgyZkazRJvSMtyQ==}
+  /color/4.1.0:
+    resolution: {integrity: sha512-o2rkkxyLGgYoeUy1OodXpbPAQNmlNBrirQ8ODO8QutzDiDMNdezSOZLNnusQ6pUpCQJUsaJIo9DZJKqa2HgH7A==}
     dependencies:
       color-convert: 2.0.1
       color-string: 1.9.0
@@ -1855,9 +1855,9 @@ packages:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
     dev: true
 
-  /fast-glob/3.2.11:
-    resolution: {integrity: sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==}
-    engines: {node: '>=8.6.0'}
+  /fast-glob/3.2.7:
+    resolution: {integrity: sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==}
+    engines: {node: '>=8'}
     dependencies:
       '@nodelib/fs.stat': 2.0.5
       '@nodelib/fs.walk': 1.2.8
@@ -1947,7 +1947,7 @@ packages:
     resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}
     engines: {node: '>=6 <7 || >=8'}
     dependencies:
-      graceful-fs: 4.2.9
+      graceful-fs: 4.2.8
       jsonfile: 4.0.0
       universalify: 0.1.2
     dev: true
@@ -1956,7 +1956,7 @@ packages:
     resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
     engines: {node: '>=6 <7 || >=8'}
     dependencies:
-      graceful-fs: 4.2.9
+      graceful-fs: 4.2.8
       jsonfile: 4.0.0
       universalify: 0.1.2
     dev: true
@@ -2049,8 +2049,8 @@ packages:
     dependencies:
       array-union: 2.1.0
       dir-glob: 3.0.1
-      fast-glob: 3.2.11
-      ignore: 5.2.0
+      fast-glob: 3.2.7
+      ignore: 5.1.9
       merge2: 1.4.1
       slash: 3.0.0
     dev: true
@@ -2063,8 +2063,8 @@ packages:
     resolution: {integrity: sha512-YSwLaGMOgSBx9roJlNLL12c+FRiw7VECphinc6mGucphc/ZxTHgdEz6gmJqH6NOzYEd/yr64hwjom5pZ+tJVpg==}
     dev: false
 
-  /graceful-fs/4.2.9:
-    resolution: {integrity: sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==}
+  /graceful-fs/4.2.8:
+    resolution: {integrity: sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==}
     dev: true
 
   /grapheme-splitter/1.0.4:
@@ -2121,8 +2121,8 @@ packages:
     engines: {node: '>= 4'}
     dev: true
 
-  /ignore/5.2.0:
-    resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==}
+  /ignore/5.1.9:
+    resolution: {integrity: sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==}
     engines: {node: '>= 4'}
     dev: true
 
@@ -2186,12 +2186,6 @@ packages:
       ci-info: 3.3.0
     dev: true
 
-  /is-core-module/2.8.0:
-    resolution: {integrity: sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==}
-    dependencies:
-      has: 1.0.3
-    dev: true
-
   /is-core-module/2.8.1:
     resolution: {integrity: sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==}
     dependencies:
@@ -2315,7 +2309,7 @@ packages:
   /jsonfile/4.0.0:
     resolution: {integrity: sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=}
     optionalDependencies:
-      graceful-fs: 4.2.9
+      graceful-fs: 4.2.8
     dev: true
 
   /kind-of/6.0.3:
@@ -2357,7 +2351,7 @@ packages:
     resolution: {integrity: sha512-OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw==}
     engines: {node: '>=6'}
     dependencies:
-      graceful-fs: 4.2.9
+      graceful-fs: 4.2.8
       js-yaml: 3.14.1
       pify: 4.0.1
       strip-bom: 3.0.0
@@ -2546,12 +2540,6 @@ packages:
     hasBin: true
     dev: true
 
-  /nanoid/3.2.0:
-    resolution: {integrity: sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==}
-    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
-    hasBin: true
-    dev: true
-
   /napi-build-utils/1.0.2:
     resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==}
     dev: true
@@ -2754,7 +2742,7 @@ packages:
     resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
     engines: {node: '>=8'}
     dependencies:
-      '@babel/code-frame': 7.16.7
+      '@babel/code-frame': 7.16.0
       error-ex: 1.3.2
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
@@ -2809,11 +2797,6 @@ packages:
     engines: {node: '>=8.6'}
     dev: true
 
-  /picomatch/2.3.1:
-    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
-    engines: {node: '>=8.6'}
-    dev: true
-
   /pify/4.0.1:
     resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
     engines: {node: '>=6'}
@@ -2847,15 +2830,6 @@ packages:
       source-map-js: 1.0.2
     dev: true
 
-  /postcss/8.4.5:
-    resolution: {integrity: sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==}
-    engines: {node: ^10 || ^12 || >=14}
-    dependencies:
-      nanoid: 3.2.0
-      picocolors: 1.0.0
-      source-map-js: 1.0.2
-    dev: true
-
   /prebuild-install/7.0.0:
     resolution: {integrity: sha512-IvSenf33K7JcgddNz2D5w521EgO+4aMMjFt73Uk9FRzQ7P+QZPKrp7qPsDydsSwjGt3T5xRNnM1bj1zMTD5fTA==}
     engines: {node: '>=10'}
@@ -2994,7 +2968,7 @@ packages:
     resolution: {integrity: sha512-VIMnQi/Z4HT2Fxuwg5KrY174U1VdUIASQVWXXyqtNRtxSr9IYkn1rsI6Tb6HsrHCmB7gVpNwX6JxPTHcH6IoTA==}
     engines: {node: '>=6'}
     dependencies:
-      graceful-fs: 4.2.9
+      graceful-fs: 4.2.8
       js-yaml: 3.14.1
       pify: 4.0.1
       strip-bom: 3.0.0
@@ -3073,13 +3047,6 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /resolve/1.20.0:
-    resolution: {integrity: sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==}
-    dependencies:
-      is-core-module: 2.8.0
-      path-parse: 1.0.7
-    dev: true
-
   /resolve/1.21.0:
     resolution: {integrity: sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==}
     hasBin: true
@@ -3117,27 +3084,12 @@ packages:
       fsevents: 2.3.2
     dev: true
 
-  /rollup/2.64.0:
-    resolution: {integrity: sha512-+c+lbw1lexBKSMb1yxGDVfJ+vchJH3qLbmavR+awDinTDA2C5Ug9u7lkOzj62SCu0PKUExsW36tpgW7Fmpn3yQ==}
-    engines: {node: '>=10.0.0'}
-    hasBin: true
-    optionalDependencies:
-      fsevents: 2.3.2
-    dev: true
-
   /run-parallel/1.2.0:
     resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
     dependencies:
       queue-microtask: 1.2.3
     dev: true
 
-  /sade/1.7.4:
-    resolution: {integrity: sha512-y5yauMD93rX840MwUJr7C1ysLFBgMspsdTo4UVrDg3fXDvtwOyIqykhVAAm6fk/3au77773itJStObgK+LKaiA==}
-    engines: {node: '>= 6'}
-    dependencies:
-      mri: 1.2.0
-    dev: true
-
   /sade/1.8.1:
     resolution: {integrity: sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==}
     engines: {node: '>=6'}
@@ -3183,7 +3135,7 @@ packages:
     engines: {node: '>=12.13.0'}
     requiresBuild: true
     dependencies:
-      color: 4.2.0
+      color: 4.1.0
       detect-libc: 1.0.3
       node-addon-api: 4.2.0
       prebuild-install: 7.0.0
@@ -3280,11 +3232,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /source-map-js/1.0.2:
-    resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
   /sourcemap-codec/1.4.8:
     resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
     dev: true
@@ -3641,8 +3588,8 @@ packages:
       punycode: 2.1.1
     dev: true
 
-  /utf-8-validate/5.0.8:
-    resolution: {integrity: sha512-k4dW/Qja1BYDl2qD4tOMB9PFVha/UJtxTc1cXYOe3WwA/2m0Yn4qB7wLMpJyLJ/7DR0XnTut3HsCSzDT4ZvKgA==}
+  /utf-8-validate/5.0.7:
+    resolution: {integrity: sha512-vLt1O5Pp+flcArHGIyKEQq883nBt8nN8tVBcoL0qUXj2XT1n7p70yGIq2VK98I5FdZ1YHc0wk/koOnHjnXWk1Q==}
     engines: {node: '>=6.14.2'}
     requiresBuild: true
     dependencies:
@@ -3728,11 +3675,11 @@ packages:
     resolution: {integrity: sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ==}
     engines: {node: '>=4.0.0'}
     dependencies:
-      bufferutil: 4.0.6
+      bufferutil: 4.0.5
       debug: 2.6.9
       es5-ext: 0.10.53
       typedarray-to-buffer: 3.1.5
-      utf-8-validate: 5.0.8
+      utf-8-validate: 5.0.7
       yaeti: 0.0.6
     dev: false
 
@@ -3773,7 +3720,7 @@ packages:
   /wide-align/1.1.5:
     resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==}
     dependencies:
-      string-width: 1.0.2
+      string-width: 4.2.3
     dev: true
 
   /widest-line/2.0.1:

From bae6f6e748bd96a02a21726f4e04325c4a73e673 Mon Sep 17 00:00:00 2001
From: Geoff Rich <4992896+geoffrich@users.noreply.github.com>
Date: Thu, 20 Jan 2022 08:57:17 -0800
Subject: [PATCH 7/8] Handle new breaking request/response changes

---
 sites/svelte.dev/src/hooks.js                   | 12 ++++++------
 sites/svelte.dev/src/routes/apps/destroy.js     |  5 +++--
 sites/svelte.dev/src/routes/repl/create.json.js |  3 ++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/sites/svelte.dev/src/hooks.js b/sites/svelte.dev/src/hooks.js
index a716ef94..fd56228b 100644
--- a/sites/svelte.dev/src/hooks.js
+++ b/sites/svelte.dev/src/hooks.js
@@ -6,16 +6,16 @@ import * as cookie from 'cookie';
 import * as session from '$lib/db/session';
 
 /** @type {import('@sveltejs/kit').Handle} */
-export async function handle({ request, resolve }) {
-	request.locals.cookies = cookie.parse(request.headers.cookie || '');
-	request.locals.user = await session.read(request.locals.cookies.sid);
+export async function handle({ event, resolve }) {
+	event.locals.cookies = cookie.parse(event.request.headers.get('cookie') || '');
+	event.locals.user = await session.read(event.locals.cookies.sid);
 
-	return resolve(request);
+	return await resolve(event);
 }
 
 /** @type {import('@sveltejs/kit').GetSession} */
-export function getSession(request) {
+export function getSession(event) {
 	return {
-		user: request.locals.user
+		user: event.locals.user
 	};
 }
diff --git a/sites/svelte.dev/src/routes/apps/destroy.js b/sites/svelte.dev/src/routes/apps/destroy.js
index 6c4dc610..e4d1fc8f 100644
--- a/sites/svelte.dev/src/routes/apps/destroy.js
+++ b/sites/svelte.dev/src/routes/apps/destroy.js
@@ -1,11 +1,12 @@
 import * as gist from '$lib/db/gist';
 
-export async function post({ locals, body }) {
+export async function post({ locals, request }) {
 	if (!locals.user) return { status: 401 };
 
+	const body = await request.json();
 	await gist.destroy(locals.user.id, body.ids);
 
 	return {
 		status: 204
 	};
-}
\ No newline at end of file
+}
diff --git a/sites/svelte.dev/src/routes/repl/create.json.js b/sites/svelte.dev/src/routes/repl/create.json.js
index 65a4c165..513da0ef 100644
--- a/sites/svelte.dev/src/routes/repl/create.json.js
+++ b/sites/svelte.dev/src/routes/repl/create.json.js
@@ -1,10 +1,11 @@
 import * as gist from '$lib/db/gist';
 
-export async function post({ locals, body }) {
+export async function post({ locals, request }) {
 	const { user } = locals;
 	if (!user) return; // response already sent
 
 	try {
+		const body = await request.json();
 		const result = await gist.create(user, body);
 
 		// normalize id

From 9f8a47f6b0201d29fe03d44138660eae507f4524 Mon Sep 17 00:00:00 2001
From: Geoff Rich <4992896+geoffrich@users.noreply.github.com>
Date: Thu, 20 Jan 2022 09:25:06 -0800
Subject: [PATCH 8/8] Refactor url.host usage

---
 sites/svelte.dev/src/routes/auth/callback.js | 2 +-
 sites/svelte.dev/src/routes/auth/login.js    | 4 +---
 sites/svelte.dev/src/routes/auth/logout.js   | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/sites/svelte.dev/src/routes/auth/callback.js b/sites/svelte.dev/src/routes/auth/callback.js
index 4bc5d294..a494e4e7 100644
--- a/sites/svelte.dev/src/routes/auth/callback.js
+++ b/sites/svelte.dev/src/routes/auth/callback.js
@@ -44,7 +44,7 @@ export async function get({ url }) {
 					expires: new Date(expires),
 					path: '/',
 					httpOnly: true,
-					secure: !url.host.startsWith('localhost:')
+					secure: url.protocol === 'https'
 				}),
 				'Content-Type': 'text/html; charset=utf-8'
 			},
diff --git a/sites/svelte.dev/src/routes/auth/login.js b/sites/svelte.dev/src/routes/auth/login.js
index f76bd119..db33455a 100644
--- a/sites/svelte.dev/src/routes/auth/login.js
+++ b/sites/svelte.dev/src/routes/auth/login.js
@@ -3,14 +3,12 @@ import { oauth, client_id } from './_config.js';
 
 export const get = client_id
 	? ({ url }) => {
-			const protocol = url.host.startsWith('localhost:') ? 'http' : 'https';
-
 			const Location =
 				`${oauth}/authorize?` +
 				stringify({
 					scope: 'read:user',
 					client_id,
-					redirect_uri: `${protocol}://${url.host}/auth/callback`
+					redirect_uri: `${url.origin}/auth/callback`
 				});
 
 			return {
diff --git a/sites/svelte.dev/src/routes/auth/logout.js b/sites/svelte.dev/src/routes/auth/logout.js
index d18d63b0..9a662892 100644
--- a/sites/svelte.dev/src/routes/auth/logout.js
+++ b/sites/svelte.dev/src/routes/auth/logout.js
@@ -10,7 +10,7 @@ export async function get(request) {
 				maxAge: -1,
 				path: '/',
 				httpOnly: true,
-				secure: !request.url.host.startsWith('localhost:')
+				secure: request.url.protocol === 'https'
 			})
 		}
 	};