diff --git a/bun.lockb b/bun.lockb index 5754b001..54505bc1 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index 69c73148..34244484 100644 --- a/package.json +++ b/package.json @@ -14,9 +14,10 @@ }, "devDependencies": { "@catdadcode/svelte-adapter-bun": "^0.5.7", - "@sveltejs/adapter-node": "^1.3.1", + "@sveltejs/adapter-node": "^2.0.0", "@sveltejs/adapter-vercel": "^5.1.0", - "@sveltejs/kit": "^1.24.0", + "@sveltejs/kit": "^2.0.0", + "@sveltejs/vite-plugin-svelte": "^3.0.0", "@types/markdown-it": "^12.2.3", "@types/markdown-it-container": "^2.0.6", "@types/nprogress": "^0.2.0", @@ -37,9 +38,9 @@ "tailwindcss": "^3.3.3", "tslib": "^2.4.1", "typescript": "^5.0.0", - "vite": "^4.3.0", + "vite": "^5.0.0", "vite-plugin-pwa": "^0.16.5", - "vitest": "^0.33.0", + "vitest": "^1.0.0", "workbox-window": "^7.0.0" }, "dependencies": { @@ -52,4 +53,4 @@ "@rollup/plugin-node-resolve": "^15.2.3" }, "type": "module" -} +} \ No newline at end of file diff --git a/src/lib/lemmy.ts b/src/lib/lemmy.ts index 70b305e3..6a15efb2 100644 --- a/src/lib/lemmy.ts +++ b/src/lib/lemmy.ts @@ -47,7 +47,7 @@ async function customFetch( if (auth && url) url.searchParams.set('auth', auth) const res = await f(url ?? input, init) - if (!res.ok) throw error(res.status, await res.text()) + if (!res.ok) error(res.status, await res.text()); return res } diff --git a/src/routes/+page.ts b/src/routes/+page.ts index bc6ac7e9..1d6864a4 100644 --- a/src/routes/+page.ts +++ b/src/routes/+page.ts @@ -39,8 +39,8 @@ export async function load({ url, fetch }) { }, } } catch (err) { - throw error(500, { - message: 'Failed to fetch homepage.', - }) + error(500, { + message: 'Failed to fetch homepage.', + }); } } diff --git a/src/routes/admin/+page.ts b/src/routes/admin/+page.ts index 7223762b..fec0da15 100644 --- a/src/routes/admin/+page.ts +++ b/src/routes/admin/+page.ts @@ -1,5 +1,5 @@ import { redirect } from '@sveltejs/kit' export const load = () => { - throw redirect(300, '/admin/config') + redirect(300, '/admin/config'); } diff --git a/src/routes/comment/[instance]/+page.ts b/src/routes/comment/[instance]/+page.ts index ecf16638..fd14fa58 100644 --- a/src/routes/comment/[instance]/+page.ts +++ b/src/routes/comment/[instance]/+page.ts @@ -3,5 +3,5 @@ import { redirect } from '@sveltejs/kit' export function load({ params }) { // If you somehow got to /comment/instance, it likely means you passed in an ID, not an instance. - throw redirect(300, `/comment/${getInstance()}/${params.instance}`) + redirect(300, `/comment/${getInstance()}/${params.instance}`); } diff --git a/src/routes/comment/[instance]/[id]/+page.ts b/src/routes/comment/[instance]/[id]/+page.ts index ca9aae0b..5e9a694f 100644 --- a/src/routes/comment/[instance]/[id]/+page.ts +++ b/src/routes/comment/[instance]/[id]/+page.ts @@ -8,8 +8,8 @@ export async function load({ params, fetch }) { id: Number(params.id), }) - throw redirect( - 300, - `/post/${params.instance}/${comment.comment_view.post.id}?thread=${comment.comment_view.comment.path}#${comment.comment_view.comment.id}` - ) + redirect( + 300, + `/post/${params.instance}/${comment.comment_view.post.id}?thread=${comment.comment_view.comment.path}#${comment.comment_view.comment.id}` + ); } diff --git a/src/routes/post/[instance]/+page.ts b/src/routes/post/[instance]/+page.ts index 45636c23..07db3212 100644 --- a/src/routes/post/[instance]/+page.ts +++ b/src/routes/post/[instance]/+page.ts @@ -12,8 +12,8 @@ export function load({ params, url }) { const newUrl = new URL(url) newUrl.pathname = split.join('/') - throw redirect(300, newUrl.toString()) + redirect(300, newUrl.toString()); } - throw error(404, 'Not found') + error(404, 'Not found'); } diff --git a/src/routes/profile/+page.ts b/src/routes/profile/+page.ts index fa35cc72..1d9e35b7 100644 --- a/src/routes/profile/+page.ts +++ b/src/routes/profile/+page.ts @@ -1,5 +1,5 @@ import { redirect } from '@sveltejs/kit' export const load = async () => { - throw redirect(300, '/profile/user') + redirect(300, '/profile/user'); } diff --git a/src/routes/signup/+page.ts b/src/routes/signup/+page.ts index f5902515..67311eb7 100644 --- a/src/routes/signup/+page.ts +++ b/src/routes/signup/+page.ts @@ -3,6 +3,6 @@ import { redirect } from "@sveltejs/kit"; export const load = () => { if (LINKED_INSTANCE_URL) { - throw redirect(300, `/signup/${LINKED_INSTANCE_URL}`) + redirect(300, `/signup/${LINKED_INSTANCE_URL}`); } } \ No newline at end of file diff --git a/svelte.config.js b/svelte.config.js index 1bbedde5..e4d39c3b 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -1,7 +1,7 @@ import node from '@sveltejs/adapter-node'; import bun from '@catdadcode/svelte-adapter-bun' import vercel from '@sveltejs/adapter-vercel' -import { vitePreprocess } from '@sveltejs/kit/vite'; +import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'; /** @type {import('@sveltejs/kit').Config} */ const config = {