From 25db58ce116df1ab73e241f4a4bf131f2ce593bd Mon Sep 17 00:00:00 2001 From: Glen Huang Date: Mon, 6 Oct 2025 19:51:18 +0800 Subject: [PATCH] site: use trailing slash for urls --- site/package-lock.json | 10 +++---- site/package.json | 2 +- site/src/routes/+layout.ts | 2 ++ site/src/routes/docs/[...path]/+page.ts | 2 +- site/svelte.config.js | 36 ++++++++++++------------- 5 files changed, 27 insertions(+), 25 deletions(-) create mode 100644 site/src/routes/+layout.ts diff --git a/site/package-lock.json b/site/package-lock.json index da078732e..d539e70ef 100644 --- a/site/package-lock.json +++ b/site/package-lock.json @@ -8,7 +8,7 @@ "name": "clan-site", "version": "0.0.1", "devDependencies": { - "@sveltejs/adapter-auto": "^6.1.0", + "@sveltejs/adapter-static": "^3.0.10", "@sveltejs/kit": "^2.43.2", "@sveltejs/vite-plugin-svelte": "^6.2.0", "mdsvex": "^0.12.6", @@ -844,10 +844,10 @@ "acorn": "^8.9.0" } }, - "node_modules/@sveltejs/adapter-auto": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/@sveltejs/adapter-auto/-/adapter-auto-6.1.1.tgz", - "integrity": "sha512-cBNt4jgH4KuaNO5gRSB2CZKkGtz+OCZ8lPjRQGjhvVUD4akotnj2weUia6imLl2v07K3IgsQRyM36909miSwoQ==", + "node_modules/@sveltejs/adapter-static": { + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/@sveltejs/adapter-static/-/adapter-static-3.0.10.tgz", + "integrity": "sha512-7D9lYFWJmB7zxZyTE/qxjksvMqzMuYrrsyh1f4AlZqeZeACPRySjbC3aFiY55wb1tWUaKOQG9PVbm74JcN2Iew==", "dev": true, "license": "MIT", "peerDependencies": { diff --git a/site/package.json b/site/package.json index 06c027dcc..62396e1e0 100644 --- a/site/package.json +++ b/site/package.json @@ -14,7 +14,7 @@ "lint": "prettier --check ." }, "devDependencies": { - "@sveltejs/adapter-auto": "^6.1.0", + "@sveltejs/adapter-static": "^3.0.10", "@sveltejs/kit": "^2.43.2", "@sveltejs/vite-plugin-svelte": "^6.2.0", "mdsvex": "^0.12.6", diff --git a/site/src/routes/+layout.ts b/site/src/routes/+layout.ts new file mode 100644 index 000000000..e325c179f --- /dev/null +++ b/site/src/routes/+layout.ts @@ -0,0 +1,2 @@ +export const prerender = true; +export const trailingSlash = "always"; diff --git a/site/src/routes/docs/[...path]/+page.ts b/site/src/routes/docs/[...path]/+page.ts index c3f44cad1..6bb6de8e1 100644 --- a/site/src/routes/docs/[...path]/+page.ts +++ b/site/src/routes/docs/[...path]/+page.ts @@ -9,7 +9,7 @@ const articles = import.meta.glob<{ }>("../**/*.md"); export async function load({ params }) { - const article = articles[`../${params.path}.md`]; + const article = articles[`../${params.path.slice(0, -"/".length)}.md`]; if (!article) { error(404, ""); } diff --git a/site/svelte.config.js b/site/svelte.config.js index dcaa0f0d0..15817a78c 100644 --- a/site/svelte.config.js +++ b/site/svelte.config.js @@ -1,24 +1,24 @@ -import { mdsvex } from 'mdsvex'; -import adapter from '@sveltejs/adapter-auto'; -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'; +import { mdsvex } from "mdsvex"; +import adapter from "@sveltejs/adapter-static"; +import { vitePreprocess } from "@sveltejs/vite-plugin-svelte"; /** @type {import('@sveltejs/kit').Config} */ const config = { - // Consult https://svelte.dev/docs/kit/integrations - // for more information about preprocessors - preprocess: [ - vitePreprocess(), - mdsvex({ - extensions: ['.md'] - }) - ], - kit: { - // adapter-auto only supports some environments, see https://svelte.dev/docs/kit/adapter-auto for a list. - // If your environment is not supported, or you settled on a specific environment, switch out the adapter. - // See https://svelte.dev/docs/kit/adapters for more information about adapters. - adapter: adapter() - }, - extensions: ['.svelte', '.md'] + // Consult https://svelte.dev/docs/kit/integrations + // for more information about preprocessors + preprocess: [ + vitePreprocess(), + mdsvex({ + extensions: [".md"], + }), + ], + kit: { + // adapter-auto only supports some environments, see https://svelte.dev/docs/kit/adapter-auto for a list. + // If your environment is not supported, or you settled on a specific environment, switch out the adapter. + // See https://svelte.dev/docs/kit/adapters for more information about adapters. + adapter: adapter(), + }, + extensions: [".svelte", ".md"], }; export default config;