diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b032e9d18b09..0778f1ddfba3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -182,8 +182,8 @@ importers:
specifier: ^1.20.0
version: 1.20.0(svelte@packages+svelte)(vite@4.3.9)
'@sveltejs/site-kit':
- specifier: 6.0.0-next.3
- version: 6.0.0-next.3(@sveltejs/kit@1.20.0)(svelte@packages+svelte)
+ specifier: 6.0.0-next.4
+ version: 6.0.0-next.4(@sveltejs/kit@1.20.0)(svelte@packages+svelte)
'@sveltejs/vite-plugin-svelte':
specifier: ^2.4.1
version: 2.4.1(svelte@packages+svelte)(vite@4.3.9)
@@ -1797,8 +1797,8 @@ packages:
svelte-local-storage-store: 0.4.0(svelte@packages+svelte)
dev: false
- /@sveltejs/site-kit@6.0.0-next.3(@sveltejs/kit@1.20.0)(svelte@packages+svelte):
- resolution: {integrity: sha512-qcCv/Qkn5mylmlG11R7AX/vrT0zc2q/WOxn7id/uci+AtwVt8QrIJn3DJyOdsSRZu0i+V1p2gxyNPFfqqB0amQ==}
+ /@sveltejs/site-kit@6.0.0-next.4(@sveltejs/kit@1.20.0)(svelte@packages+svelte):
+ resolution: {integrity: sha512-8TF43iHjGrn9ozq0oiDoP9ZCQPtTY9DOE164kXrIeShr0pDRVpwXNeDLhJM8GGvrIEUa+nqIWDxWojSRAArl9w==}
peerDependencies:
'@sveltejs/kit': ^1.0.0
svelte: ^3.54.0 || ^4.0.0-next.0 || ^4.0.0
diff --git a/sites/svelte.dev/package.json b/sites/svelte.dev/package.json
index b8c33610de44..1de6d4bc3aff 100644
--- a/sites/svelte.dev/package.json
+++ b/sites/svelte.dev/package.json
@@ -29,7 +29,7 @@
"@resvg/resvg-js": "^2.4.1",
"@sveltejs/adapter-vercel": "^3.0.0",
"@sveltejs/kit": "^1.20.0",
- "@sveltejs/site-kit": "6.0.0-next.3",
+ "@sveltejs/site-kit": "6.0.0-next.4",
"@sveltejs/vite-plugin-svelte": "^2.4.1",
"@types/marked": "^5.0.0",
"@types/node": "^20.2.6",
diff --git a/sites/svelte.dev/src/global.d.ts b/sites/svelte.dev/src/global.d.ts
deleted file mode 100644
index a3e64bed49e9..000000000000
--- a/sites/svelte.dev/src/global.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-///
-
-declare global {
- namespace App {
- interface PageData {
- nav_title: string;
- }
- }
-}
-
-export {};
diff --git a/sites/svelte.dev/src/routes/+layout.server.js b/sites/svelte.dev/src/routes/+layout.server.js
index af468f274346..c62f5a1206dd 100644
--- a/sites/svelte.dev/src/routes/+layout.server.js
+++ b/sites/svelte.dev/src/routes/+layout.server.js
@@ -24,6 +24,9 @@ function get_nav_title(url) {
return '';
}
+/**
+ * @returns {Promise}
+ */
async function get_nav_context_list() {
const docs_list = get_docs_list(get_docs_data());
const processed_docs_list = docs_list.map(({ title, pages }) => ({
@@ -58,17 +61,42 @@ async function get_nav_context_list() {
}))
.filter(({ title }) => title !== 'Embeds');
- return {
- docs: processed_docs_list,
- blog: processed_blog_list,
- tutorial: processed_tutorial_list,
- examples: processed_examples_list
- };
+ return [
+ {
+ title: 'Tutorial',
+ prefix: 'tutorial',
+ pathname: '/tutorial',
+ sections: processed_tutorial_list
+ },
+ {
+ title: 'Docs',
+ prefix: 'docs',
+ pathname: '/docs/introduction',
+ sections: processed_docs_list
+ },
+ {
+ title: 'Examples',
+ prefix: 'examples',
+ pathname: '/examples',
+ sections: processed_examples_list
+ },
+ {
+ title: 'REPL',
+ prefix: 'repl',
+ pathname: '/repl'
+ },
+ {
+ title: 'Blog',
+ prefix: 'blog',
+ pathname: '/blog',
+ sections: processed_blog_list
+ }
+ ];
}
export const load = async ({ url }) => {
return {
nav_title: get_nav_title(url),
- nav_context_list: get_nav_context_list()
+ nav_links: get_nav_context_list()
};
};
diff --git a/sites/svelte.dev/src/routes/+layout.svelte b/sites/svelte.dev/src/routes/+layout.svelte
index 12bad588e1c6..352f2223eaeb 100644
--- a/sites/svelte.dev/src/routes/+layout.svelte
+++ b/sites/svelte.dev/src/routes/+layout.svelte
@@ -2,9 +2,11 @@
import { browser } from '$app/environment';
import { page } from '$app/stores';
import { Icon, Shell } from '@sveltejs/site-kit/components';
- import { Nav, NavItem, Separator } from '@sveltejs/site-kit/nav';
+ import { Nav, Separator } from '@sveltejs/site-kit/nav';
import { Search, SearchBox } from '@sveltejs/site-kit/search';
import '@sveltejs/site-kit/styles/index.css';
+
+ export let data;
@@ -17,7 +19,7 @@
-