-
+
{#if data.topic}
{data.topic.name}
{data.topic.topicsToTasks.length} tasks
diff --git a/src/routes/projects/spotify-beatmap-finder/+page.server.ts b/src/routes/projects/spotify-beatmap-finder/+page.server.ts
index 8b664d6..93b7d2b 100644
--- a/src/routes/projects/spotify-beatmap-finder/+page.server.ts
+++ b/src/routes/projects/spotify-beatmap-finder/+page.server.ts
@@ -1,11 +1,11 @@
import type { Actions } from './$types';
import { fail } from '@sveltejs/kit';
-import { parseSpotifyInput } from '$lib/map-finder/input';
-import type { TrackMatchResult } from '$lib/map-finder/types';
-import { getSpotifyMetadata } from '$lib/server/spotify';
-import { getOsuMaps, MATCH_CONCURRENCY } from '$lib/server/osu';
-import { ApiError, publicError, logApiError, mapConcurrent } from '$lib/server/finder-http';
-import { acquireSearch } from '$lib/server/finder-limit';
+import { parseSpotifyInput } from '#lib/map-finder/input.js';
+import type { TrackMatchResult } from '#lib/map-finder/types.js';
+import { getSpotifyMetadata } from '#lib/server/spotify.js';
+import { getOsuMaps, MATCH_CONCURRENCY } from '#lib/server/osu.js';
+import { ApiError, publicError, logApiError, mapConcurrent } from '#lib/server/finder-http.js';
+import { acquireSearch } from '#lib/server/finder-limit.js';
export const actions: Actions = {
default: async ({ request, fetch, getClientAddress }) => {
const data = await request.formData();
diff --git a/src/routes/projects/spotify-beatmap-finder/+page.svelte b/src/routes/projects/spotify-beatmap-finder/+page.svelte
index 69a9789..b90531c 100644
--- a/src/routes/projects/spotify-beatmap-finder/+page.svelte
+++ b/src/routes/projects/spotify-beatmap-finder/+page.svelte
@@ -1,12 +1,12 @@
diff --git a/src/routes/robots.txt/+server.ts b/src/routes/robots.txt/+server.ts
index d008139..ce7d7e5 100644
--- a/src/routes/robots.txt/+server.ts
+++ b/src/routes/robots.txt/+server.ts
@@ -1,4 +1,4 @@
-import { SITE_ORIGIN } from '$lib/seo';
+import { SITE_ORIGIN } from '#lib/seo.js';
import type { RequestHandler } from './$types';
export const GET: RequestHandler = ({ url }) => {
diff --git a/src/routes/sitemap.xml/+server.ts b/src/routes/sitemap.xml/+server.ts
index 86f2b2c..76a3019 100644
--- a/src/routes/sitemap.xml/+server.ts
+++ b/src/routes/sitemap.xml/+server.ts
@@ -1,8 +1,8 @@
-import { db } from '$lib/server/db';
-import { blogArticles } from '$lib/server/db/schema';
-import { SITE_ORIGIN } from '$lib/seo';
-import { races } from '$lib/derby/races';
-import { COURSES } from '$lib/language-learner/courses';
+import { db } from '#lib/server/db/index.js';
+import { blogArticles } from '#lib/server/db/schema/index.js';
+import { SITE_ORIGIN } from '#lib/seo.js';
+import { races } from '#lib/derby/races.js';
+import { COURSES } from '#lib/language-learner/courses/index.js';
import { eq } from 'drizzle-orm';
import type { RequestHandler } from './$types';
diff --git a/svelte.config.js b/svelte.config.js
deleted file mode 100755
index 10bf3f2..0000000
--- a/svelte.config.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import adapter from '@sveltejs/adapter-node';
-import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
-
-/** @type {import('@sveltejs/kit').Config} */
-const config = {
- // Consult https://kit.svelte.dev/docs/integrations#preprocessors
- // for more information about preprocessors
- preprocess: vitePreprocess(),
-
- kit: {
- // adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
- // If your environment is not supported, or you settled on a specific environment, switch out the adapter.
- // See https://kit.svelte.dev/docs/adapters for more information about adapters.
- adapter: adapter(),
- csrf: {
- // vite dev has no way to trust X-Forwarded-Proto, so it thinks every
- // request is http:// even though Caddy terminates TLS in front of it,
- // causing a scheme mismatch against the browser's https Origin header.
- // The built adapter-node server (production) handles this correctly via
- // ORIGIN/PROTOCOL_HEADER, so only relax the check in dev.
- // checkOrigin: process.env.NODE_ENV === 'production',
- trustedOrigins: ['https://dev.stanrunge.dev']
- }
- }
-};
-
-export default config;
diff --git a/tsconfig.json b/tsconfig.json
index aa36266..2e9f6a2 100755
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,15 +1,8 @@
{
- "extends": "./.svelte-kit/tsconfig.json",
+ "extends": "$app/tsconfig",
"compilerOptions": {
- "allowJs": true,
- "checkJs": true,
- "esModuleInterop": true,
- "forceConsistentCasingInFileNames": true,
- "resolveJsonModule": true,
- "skipLibCheck": true,
"sourceMap": true,
- "strict": true,
- "moduleResolution": "bundler"
+ "strict": true
},
"exclude": [
"node_modules/**",
@@ -20,10 +13,6 @@
"src/service-worker/**/*.ts",
"src/service-worker.d.ts",
"src/service-worker/**/*.d.ts"
- ]
- // Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias
- // except $lib which is handled by https://kit.svelte.dev/docs/configuration#files
- //
- // If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
- // from the referenced tsconfig.json - TypeScript does not merge them in
+ ],
+ "include": ["src", "vite.config.ts", "drizzle.config.ts", "playwright.config.ts", "tests"]
}
diff --git a/vite.config.ts b/vite.config.ts
index 0d4c8c9..9a42542 100755
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,3 +1,5 @@
+import adapter from '@sveltejs/adapter-bun';
+import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
import { sveltekit } from '@sveltejs/kit/vite';
import tailwindcss from '@tailwindcss/vite';
import { defineConfig } from 'vitest/config';
@@ -5,10 +7,27 @@ import Icons from 'unplugin-icons/vite';
import { enhancedImages } from '@sveltejs/enhanced-img';
export default defineConfig({
- plugins: [tailwindcss(), enhancedImages(), sveltekit(), Icons({ compiler: 'svelte' })],
- test: {
- include: ['src/**/*.{test,spec}.{js,ts}']
- },
+ plugins: [
+ tailwindcss(),
+ enhancedImages(),
+ sveltekit({
+ // Consult https://svelte.dev/docs/kit/integrations#preprocessors
+ // for more information about preprocessors
+ preprocess: vitePreprocess(),
+
+ // Production runs `bun ./build` behind Caddy, which terminates TLS. Without
+ // paths.origin the server takes the host from the Host header and assumes
+ // https, which is right for both staging and production from one image.
+ adapter: adapter(),
+
+ csrf: {
+ // Allow form posts from the dev site, which Caddy also serves over https.
+ trustedOrigins: ['https://dev.stanrunge.dev']
+ }
+ }),
+ Icons({ compiler: 'svelte' })
+ ],
+ test: { include: ['src/**/*.{test,spec}.{js,ts}'] },
server: {
host: '127.0.0.1',
allowedHosts: ['dev.stanrunge.dev'],