Skip to content

Commit c717a4d

Browse files
PuruVJdummdidumm
PuruVJ
and
dummdidumm
authored
feat: bump site to SvelteKit 2 (#9923)
* Push * Bump deps * Update sites/svelte.dev/src/routes/roadmap/+page.js * Bump deps * Fix stuff --------- Co-authored-by: Simon H <[email protected]>
1 parent 32772b4 commit c717a4d

File tree

21 files changed

+1546
-1097
lines changed

21 files changed

+1546
-1097
lines changed

‎pnpm-lock.yaml

Lines changed: 1507 additions & 1052 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sites/svelte.dev/package.json

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"dependencies": {
2020
"@jridgewell/sourcemap-codec": "^1.4.15",
21-
"@supabase/supabase-js": "^2.39.0",
21+
"@supabase/supabase-js": "^2.39.2",
2222
"@sveltejs/repl": "0.6.0",
2323
"cookie": "^0.6.0",
2424
"devalue": "^4.3.2",
@@ -28,31 +28,32 @@
2828
},
2929
"devDependencies": {
3030
"@resvg/resvg-js": "^2.6.0",
31-
"@sveltejs/adapter-vercel": "^3.1.0",
32-
"@sveltejs/kit": "^1.27.6",
31+
"@sveltejs/adapter-vercel": "^4.0.3",
32+
"@sveltejs/kit": "^2.0.6",
3333
"@sveltejs/site-kit": "6.0.0-next.59",
34+
"@sveltejs/vite-plugin-svelte": "^3.0.0",
3435
"@types/cookie": "^0.6.0",
35-
"@types/node": "^20.10.2",
36-
"browserslist": "^4.22.1",
36+
"@types/node": "^20.10.6",
37+
"browserslist": "^4.22.2",
3738
"degit": "^2.8.4",
3839
"dotenv": "^16.3.1",
3940
"jimp": "^0.22.10",
4041
"lightningcss": "^1.22.1",
4142
"magic-string": "^0.30.5",
42-
"marked": "^11.0.0",
43-
"prettier": "^3.1.0",
43+
"marked": "^11.1.1",
44+
"prettier": "^3.1.1",
4445
"prettier-plugin-svelte": "^3.1.2",
4546
"satori": "^0.10.11",
4647
"satori-html": "^0.3.2",
4748
"shelljs": "^0.8.5",
48-
"shiki": "^0.14.5",
49+
"shiki": "^0.14.7",
4950
"shiki-twoslash": "^3.1.2",
5051
"svelte": "workspace:*",
5152
"svelte-check": "^3.6.2",
52-
"svelte-preprocess": "^5.1.1",
53+
"svelte-preprocess": "^5.1.3",
5354
"tiny-glob": "^0.2.9",
54-
"typescript": "^5.3.2",
55-
"vite": "^4.5.0",
56-
"vite-imagetools": "^6.2.6"
55+
"typescript": "^5.3.3",
56+
"vite": "^5.0.10",
57+
"vite-imagetools": "^6.2.8"
5758
}
58-
}
59+
}

‎sites/svelte.dev/src/routes/(authed)/+layout.server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ export const config = {
77

88
export async function load({ request }) {
99
return {
10-
user: session.from_cookie(request.headers.get('cookie'))
10+
user: await session.from_cookie(request.headers.get('cookie'))
1111
};
1212
}

‎sites/svelte.dev/src/routes/(authed)/repl/+page.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ export function load({ url }) {
99

1010
// redirect to v2 REPL if appropriate
1111
if (version && /^[^>]?[12]/.test(version)) {
12-
throw redirect(302, `https://v2.svelte.dev/repl?${query}`);
12+
redirect(302, `https://v2.svelte.dev/repl?${query}`);
1313
}
1414

1515
const id = gist || example || 'hello-world';
1616
// we need to filter out null values
1717
const q = new URLSearchParams();
1818
if (version) q.set('version', version);
1919
if (vim) q.set('vim', vim);
20-
throw redirect(301, `/repl/${id}?${q}`);
20+
redirect(301, `/repl/${id}?${q}`);
2121
}

‎sites/svelte.dev/src/routes/(authed)/repl/[id]/+page.server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export async function load({ fetch, params, url }) {
44
const res = await fetch(`/repl/api/${params.id}.json`);
55

66
if (!res.ok) {
7-
throw error(res.status);
7+
error(/** @type {import('@sveltejs/kit').NumericRange<400, 599>} */(res.status));
88
}
99

1010
const gist = await res.json();

‎sites/svelte.dev/src/routes/(authed)/repl/[id]/+page.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script>
22
import { browser } from '$app/environment';
3-
import { afterNavigate, goto } from '$app/navigation';
3+
import { afterNavigate, goto, replaceState } from '$app/navigation';
44
import Repl from '@sveltejs/repl';
55
import { theme } from '@sveltejs/site-kit/stores';
66
import { onMount } from 'svelte';

‎sites/svelte.dev/src/routes/(authed)/repl/api/[id].json/+server.js

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ export const prerender = 'auto';
99

1010
const UUID_REGEX = /^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$/;
1111

12-
/** @type {Set<string>} */
13-
let examples;
1412

1513
/** @param {import('$lib/server/examples/types').ExamplesData[number]['examples'][number]['files'][number][]} files */
1614
function munge(files) {
@@ -39,13 +37,6 @@ export async function GET({ params }) {
3937
// We prerender examples pages during build time. That means, when something like `/repl/hello-world.json`
4038
// is accessed, this function won't be run at all, as it will be served from the filesystem
4139

42-
examples = new Set(
43-
get_examples_list(examples_data)
44-
.map((category) => category.examples)
45-
.flat()
46-
.map((example) => example.slug)
47-
);
48-
4940
const example = get_example(examples_data, params.id);
5041
if (example) {
5142
return json({
@@ -73,13 +64,13 @@ export async function GET({ params }) {
7364
}
7465

7566
if (!UUID_REGEX.test(params.id)) {
76-
throw error(404);
67+
error(404);
7768
}
7869

7970
const app = await gist.read(params.id);
8071

8172
if (!app) {
82-
throw error(404, 'not found');
73+
error(404, 'not found');
8374
}
8475

8576
return json({

‎sites/svelte.dev/src/routes/(authed)/repl/create.json/+server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { error, json } from '@sveltejs/kit';
44

55
export async function POST({ request }) {
66
const user = await session.from_cookie(request.headers.get('cookie'));
7-
if (!user) throw error(401);
7+
if (!user) error(401);
88

99
const body = await request.json();
1010
const result = await gist.create(user, body);

‎sites/svelte.dev/src/routes/(authed)/repl/save/[id].json/+server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { error } from '@sveltejs/kit';
55
// TODO reimplement as an action
66
export async function PUT({ params, request }) {
77
const user = await session.from_cookie(request.headers.get('cookie'));
8-
if (!user) throw error(401, 'Unauthorized');
8+
if (!user) error(401, 'Unauthorized');
99

1010
const body = await request.json();
1111
await gist.update(user, params.id, body);

‎sites/svelte.dev/src/routes/+layout.server.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import { fetchBanner } from '@sveltejs/site-kit/components';
22

33
export const load = async ({ url, fetch }) => {
4-
const nav_links = fetch('/nav.json').then((r) => r.json());
5-
const banner = fetchBanner('svelte.dev', fetch);
4+
const [nav_links, banner] = await Promise.all([
5+
fetch('/nav.json').then((r) => r.json()),
6+
fetchBanner('svelte.dev', fetch)
7+
]);
68

79
return {
810
nav_title: get_nav_title(url),

0 commit comments

Comments
 (0)