-
diff --git a/apps/svelte.dev/src/routes/docs/[topic]/[...path]/+page.server.js b/apps/svelte.dev/src/routes/docs/[topic]/[...path]/+page.server.js
deleted file mode 100644
index 1461edfa2b..0000000000
--- a/apps/svelte.dev/src/routes/docs/[topic]/[...path]/+page.server.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { docs } from '$lib/server/content';
-import { render_content } from '$lib/server/renderer';
-import { error } from '@sveltejs/kit';
-
-export async function load({ params }) {
- const document = docs.pages[`docs/${params.topic}/${params.path}`];
-
- if (!document) {
- error(404);
- }
-
- return {
- document: {
- ...document,
- body: await render_content(document.file, document.body)
- }
- };
-}
diff --git a/apps/svelte.dev/src/routes/docs/[topic]/[...path]/+page.svelte b/apps/svelte.dev/src/routes/docs/[topic]/[...path]/+page.svelte
index 2af29fa6eb..aaba145ad4 100644
--- a/apps/svelte.dev/src/routes/docs/[topic]/[...path]/+page.svelte
+++ b/apps/svelte.dev/src/routes/docs/[topic]/[...path]/+page.svelte
@@ -9,17 +9,20 @@
import { goto } from '$app/navigation';
import { escape_html } from '$lib/utils/escape';
import { page } from '$app/state';
+ import { get_document } from './data.remote';
import { get_topic_title } from '$lib/topics';
- let { data } = $props();
+ let { params } = $props();
+
+ let document = $derived(await get_document(params));
setupDocsHovers();
let content = $state() as HTMLElement;
const repo = $derived.by(() => {
- const name = data.document.slug.split('/')[1];
- const link = 'docs/' + data.document.file.split('/').slice(2).join('/');
+ const name = document.slug.split('/')[1];
+ const link = 'docs/' + document.file.split('/').slice(2).join('/');
return `https://github.com/sveltejs/${name}/edit/main/documentation/${link}`;
});
@@ -61,15 +64,15 @@
- {data.document.metadata.title} • {topic_title} Docs
+ {document.metadata.title} • Docs • Svelte
-
+
-
+
- {@html escape_html(data.document.metadata.title).replaceAll('/', '/
+ {@html escape_html(document.metadata.title).replaceAll('/', '/
-
- {@html data.document.body}
+ {@html document.body}
diff --git a/apps/svelte.dev/src/routes/docs/[topic]/[...path]/OnThisPage.svelte b/apps/svelte.dev/src/routes/docs/[topic]/[...path]/OnThisPage.svelte
index 3bad6b262c..ebe54515e5 100644
--- a/apps/svelte.dev/src/routes/docs/[topic]/[...path]/OnThisPage.svelte
+++ b/apps/svelte.dev/src/routes/docs/[topic]/[...path]/OnThisPage.svelte
@@ -8,6 +8,12 @@
let current = $state('');
afterNavigate(() => {
+ if (!content) {
+ // TODO bind:this is broken?
+ console.error('missing content');
+ return;
+ }
+
current = location.hash.slice(1);
headings = content.querySelectorAll('h2');
update(); // Ensure active link is set correctly on navigation
@@ -15,6 +21,11 @@
// Update function to activate the correct section link
function update() {
+ if (!headings) {
+ // TODO bind:this is broken?
+ return;
+ }
+
const threshold = (innerHeight * 1) / 3;
let found = false;
diff --git a/apps/svelte.dev/src/routes/docs/[topic]/[...path]/data.remote.ts b/apps/svelte.dev/src/routes/docs/[topic]/[...path]/data.remote.ts
new file mode 100644
index 0000000000..7980f3fc1a
--- /dev/null
+++ b/apps/svelte.dev/src/routes/docs/[topic]/[...path]/data.remote.ts
@@ -0,0 +1,31 @@
+import { redirect } from '@sveltejs/kit';
+import { error } from '@sveltejs/kit';
+import { prerender } from '$app/server';
+import { create_summary, docs } from '$lib/server/content';
+import * as v from 'valibot';
+import { render_content } from '$lib/server/renderer';
+
+const schema = v.object({
+ path: v.string(),
+ topic: v.string()
+});
+
+export const get_sections = prerender(v.string(), (topic) => {
+ const document = docs.topics[`docs/${topic}`];
+ if (!document) error(404, 'Not found');
+
+ return document.children.map(create_summary);
+});
+
+export const get_document = prerender(schema, async (params) => {
+ const document = docs.pages[`docs/${params.topic}/${params.path}`];
+
+ if (!document) {
+ error(404);
+ }
+
+ return {
+ ...document,
+ body: await render_content(document.file, document.body)
+ };
+});
diff --git a/apps/svelte.dev/src/routes/llms-small.txt/content-svelte.md b/apps/svelte.dev/src/routes/llms-small.txt/content-svelte.md
index 34dcb781e9..2eb9e0c655 100644
--- a/apps/svelte.dev/src/routes/llms-small.txt/content-svelte.md
+++ b/apps/svelte.dev/src/routes/llms-small.txt/content-svelte.md
@@ -297,7 +297,6 @@ let { a, b, ...others } = $props();
### Using await in Svelte
- **Where you can use await**
-
- **Top-level `
{@html escape_html(data.document.metadata.title).replaceAll('/', '/')}
+ {@html escape_html(document.metadata.title).replaceAll('/', '/')}
- {#each data.homepage as category}
+ {#each await get_packages() as category}
diff --git a/apps/svelte.dev/src/routes/packages/+page.server.ts b/apps/svelte.dev/src/routes/packages/data.remote.ts
similarity index 84%
rename from apps/svelte.dev/src/routes/packages/+page.server.ts
rename to apps/svelte.dev/src/routes/packages/data.remote.ts
index 188720f5fd..c77d8cd866 100644
--- a/apps/svelte.dev/src/routes/packages/+page.server.ts
+++ b/apps/svelte.dev/src/routes/packages/data.remote.ts
@@ -1,8 +1,7 @@
+import { prerender } from '$app/server';
import { PACKAGES_META } from '$lib/packages-meta';
import { registry, type Category, type Package, type PackageDefinition } from '$lib/server/content';
-export const prerender = false;
-
const arrToPackages = (arr: PackageDefinition[]) => {
return arr
.map((pkgDef) => {
@@ -22,9 +21,10 @@ const arrToPackages = (arr: PackageDefinition[]) => {
};
// Netflix style page. Send pre-done cards with categories
-const homepage: Category[] = [];
+const categories: Category[] = [];
+
for (const { packages, title, description } of PACKAGES_META.FEATURED) {
- homepage.push({
+ categories.push({
title,
hash: title.toLowerCase().replace(/ /g, '-'),
description,
@@ -32,6 +32,6 @@ for (const { packages, title, description } of PACKAGES_META.FEATURED) {
});
}
-export async function load() {
- return { homepage };
-}
+export const get_packages = prerender(() => {
+ return categories;
+});
diff --git a/apps/svelte.dev/src/routes/tutorial/[...slug]/+layout.server.ts b/apps/svelte.dev/src/routes/tutorial/[...slug]/+layout.server.ts
deleted file mode 100644
index 73b9ce4921..0000000000
--- a/apps/svelte.dev/src/routes/tutorial/[...slug]/+layout.server.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { parts } from './content.server';
-
-export async function load() {
- return {
- index: parts
- };
-}
diff --git a/apps/svelte.dev/src/routes/tutorial/[...slug]/+page.server.ts b/apps/svelte.dev/src/routes/tutorial/[...slug]/+page.server.ts
index a208bbf888..c1f71e798e 100644
--- a/apps/svelte.dev/src/routes/tutorial/[...slug]/+page.server.ts
+++ b/apps/svelte.dev/src/routes/tutorial/[...slug]/+page.server.ts
@@ -1,18 +1,5 @@
-import { redirect } from '@sveltejs/kit';
-import { load_exercise } from './content.server';
-
-export async function load({ params }) {
- if (!params.slug || params.slug === 'svelte') redirect(307, '/tutorial/svelte/welcome-to-svelte');
- if (params.slug === 'kit') redirect(307, '/tutorial/kit/introducing-sveltekit');
- if (!params.slug.includes('/')) redirect(307, `/tutorial/svelte/${params.slug}`);
-
- return {
- exercise: await load_exercise(params.slug)
- };
-}
-
export function entries() {
- // These are not findable by the router, but we need to know about them for redirects
+ // These are not findable by the crawler, but we need to know about them for redirects
return [
// So that redirects from these URLs to /tutorial/
-
{/if}
@@ -325,8 +328,8 @@
{#snippet b()}