From 67331bbf1fb8322cb1bd8aa28ab51842e5b111ae Mon Sep 17 00:00:00 2001 From: aurelienrichard Date: Sun, 28 Apr 2024 18:28:14 +0200 Subject: [PATCH] update vitest config --- apps/privelte/src/hooks.server.ts | 9 --------- .../lib/components/{Chat.test.ts => Chat.svelte.test.ts} | 0 .../{Message.test.ts => Message.svelte.test.ts} | 0 ...MessageForm.test.ts => NewMessageForm.svelte.test.ts} | 0 apps/privelte/src/routes/room/[id]/+server.ts | 8 ++++---- apps/privelte/src/routes/room/[id]/join/+page.server.ts | 8 ++++---- apps/privelte/{ => src}/vitest-setup.ts | 0 apps/privelte/svelte.config.js | 2 +- apps/privelte/vite.config.ts | 8 ++++---- apps/svelteflix/{ => src}/vitest-setup.ts | 0 apps/svelteflix/svelte.config.js | 2 +- apps/svelteflix/vite.config.ts | 8 ++++---- 12 files changed, 18 insertions(+), 27 deletions(-) delete mode 100644 apps/privelte/src/hooks.server.ts rename apps/privelte/src/lib/components/{Chat.test.ts => Chat.svelte.test.ts} (100%) rename apps/privelte/src/lib/components/{Message.test.ts => Message.svelte.test.ts} (100%) rename apps/privelte/src/lib/components/{NewMessageForm.test.ts => NewMessageForm.svelte.test.ts} (100%) rename apps/privelte/{ => src}/vitest-setup.ts (100%) rename apps/svelteflix/{ => src}/vitest-setup.ts (100%) diff --git a/apps/privelte/src/hooks.server.ts b/apps/privelte/src/hooks.server.ts deleted file mode 100644 index 47e7de9..0000000 --- a/apps/privelte/src/hooks.server.ts +++ /dev/null @@ -1,9 +0,0 @@ -import type { HandleServerError } from '@sveltejs/kit' - -export const handleError: HandleServerError = ({ error }) => { - console.error(error) - - return { - message: 'Internal error.' - } -} diff --git a/apps/privelte/src/lib/components/Chat.test.ts b/apps/privelte/src/lib/components/Chat.svelte.test.ts similarity index 100% rename from apps/privelte/src/lib/components/Chat.test.ts rename to apps/privelte/src/lib/components/Chat.svelte.test.ts diff --git a/apps/privelte/src/lib/components/Message.test.ts b/apps/privelte/src/lib/components/Message.svelte.test.ts similarity index 100% rename from apps/privelte/src/lib/components/Message.test.ts rename to apps/privelte/src/lib/components/Message.svelte.test.ts diff --git a/apps/privelte/src/lib/components/NewMessageForm.test.ts b/apps/privelte/src/lib/components/NewMessageForm.svelte.test.ts similarity index 100% rename from apps/privelte/src/lib/components/NewMessageForm.test.ts rename to apps/privelte/src/lib/components/NewMessageForm.svelte.test.ts diff --git a/apps/privelte/src/routes/room/[id]/+server.ts b/apps/privelte/src/routes/room/[id]/+server.ts index 30b1a5c..d42ec01 100644 --- a/apps/privelte/src/routes/room/[id]/+server.ts +++ b/apps/privelte/src/routes/room/[id]/+server.ts @@ -24,7 +24,7 @@ export const POST: RequestHandler = async ({ request, cookies, params }) => { .throwOnError() } catch (e) { console.error(e) - return error(401, 'Unauthorized.') + error(401, 'Unauthorized.') } const body = (await request.json()) as Pick @@ -39,7 +39,7 @@ export const POST: RequestHandler = async ({ request, cookies, params }) => { payload = { type: 'payload', id, message, userId, username } } catch (e) { console.error(e) - return error(400, 'Invalid ID or message.') + error(400, 'Invalid ID or message.') } const channel = supabase.channel(params.id, { @@ -54,7 +54,7 @@ export const POST: RequestHandler = async ({ request, cookies, params }) => { }) if (response !== 'ok') { - return error(500, { message: 'Internal error.' }) + error(500, { message: 'Internal error.' }) } } finally { await supabase.removeChannel(channel) @@ -86,7 +86,7 @@ export const PATCH: RequestHandler = async ({ cookies, params }) => { }) } catch (e) { console.error(e) - return error(401, 'Unauthorized.') + error(401, 'Unauthorized.') } return new Response(null, { status: 204 }) diff --git a/apps/privelte/src/routes/room/[id]/join/+page.server.ts b/apps/privelte/src/routes/room/[id]/join/+page.server.ts index 6f5f946..f9b6b9d 100644 --- a/apps/privelte/src/routes/room/[id]/join/+page.server.ts +++ b/apps/privelte/src/routes/room/[id]/join/+page.server.ts @@ -29,13 +29,13 @@ export const actions: Actions = { const room = await supabase.from('rooms').select('*').eq('id', params.id!).single() if (room.error) { - return error(404, { message: 'This room does not exist.' }) + error(404, { message: 'This room does not exist.' }) } const participants = room.data.participants ?? 0 if (participants === room.data.slots) { - return error(403, { message: 'This room is full.' }) + error(403, { message: 'This room is full.' }) } const form = await request.formData() @@ -60,9 +60,9 @@ export const actions: Actions = { }) } catch (e) { console.error(e) - return error(500, { message: 'Internal error.' }) + error(500, { message: 'Internal error.' }) } - return redirect(303, `/room/${params.id}`) + redirect(303, `/room/${params.id}`) } } diff --git a/apps/privelte/vitest-setup.ts b/apps/privelte/src/vitest-setup.ts similarity index 100% rename from apps/privelte/vitest-setup.ts rename to apps/privelte/src/vitest-setup.ts diff --git a/apps/privelte/svelte.config.js b/apps/privelte/svelte.config.js index 803bedc..dbd88dc 100644 --- a/apps/privelte/svelte.config.js +++ b/apps/privelte/svelte.config.js @@ -15,7 +15,7 @@ const config = { typescript: { config: (config) => ({ ...config, - include: [...config.include, '../tailwind.config.ts', '../vitest-setup.ts'] + include: [...config.include, '../tailwind.config.ts'] }) }, paths: { diff --git a/apps/privelte/vite.config.ts b/apps/privelte/vite.config.ts index 5f3a671..ace8cb2 100644 --- a/apps/privelte/vite.config.ts +++ b/apps/privelte/vite.config.ts @@ -1,15 +1,15 @@ import { sveltekit } from '@sveltejs/kit/vite' import { purgeCss } from 'vite-plugin-tailwind-purgecss' -import { defineConfig, type PluginOption } from 'vite' +import { defineConfig } from 'vite' export default defineConfig(({ mode }) => ({ - plugins: [sveltekit() as PluginOption, purgeCss()], + plugins: [sveltekit(), purgeCss()], resolve: { conditions: mode === 'test' ? ['browser'] : [] }, test: { include: ['src/**/*.test.ts'], - environmentMatchGlobs: [['**/[A-Z]*.test.ts', 'happy-dom']], - setupFiles: ['./vitest-setup.ts'] + environmentMatchGlobs: [['**/*.svelte.test.ts', 'happy-dom']], + setupFiles: ['./src/vitest-setup.ts'] } })) diff --git a/apps/svelteflix/vitest-setup.ts b/apps/svelteflix/src/vitest-setup.ts similarity index 100% rename from apps/svelteflix/vitest-setup.ts rename to apps/svelteflix/src/vitest-setup.ts diff --git a/apps/svelteflix/svelte.config.js b/apps/svelteflix/svelte.config.js index c01721d..155d908 100644 --- a/apps/svelteflix/svelte.config.js +++ b/apps/svelteflix/svelte.config.js @@ -15,7 +15,7 @@ const config = { typescript: { config: (config) => ({ ...config, - include: [...config.include, '../tailwind.config.ts', '../vitest-setup.ts'] + include: [...config.include, '../tailwind.config.ts'] }) } } diff --git a/apps/svelteflix/vite.config.ts b/apps/svelteflix/vite.config.ts index 7d9be64..18baca3 100644 --- a/apps/svelteflix/vite.config.ts +++ b/apps/svelteflix/vite.config.ts @@ -1,11 +1,11 @@ import { sveltekit } from '@sveltejs/kit/vite' -import { defineConfig, type PluginOption } from 'vite' +import { defineConfig } from 'vite' export default defineConfig({ - plugins: [sveltekit() as PluginOption], + plugins: [sveltekit()], test: { include: ['src/**/*.test.ts'], - environmentMatchGlobs: [['**/[A-Z]*.test.ts', 'happy-dom']], - setupFiles: ['./vitest-setup.ts'] + environmentMatchGlobs: [['**/*.svelte.test.ts', 'happy-dom']], + setupFiles: ['./src/vitest-setup.ts'] } })