From 4da6c8c9e5a761480786792b51cef3a7d11d2202 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Mon, 28 Oct 2024 13:21:29 -0700
Subject: [PATCH 1/5] chore: sveltekit module redirects
---
apps/kit.svelte.dev/vercel.json | 4 --
.../src/routes/docs/kit/modules/+page.svelte | 54 +++++++++++++++++++
2 files changed, 54 insertions(+), 4 deletions(-)
create mode 100644 apps/svelte.dev/src/routes/docs/kit/modules/+page.svelte
diff --git a/apps/kit.svelte.dev/vercel.json b/apps/kit.svelte.dev/vercel.json
index 4df4ecb39f..6b9ecfbe6e 100644
--- a/apps/kit.svelte.dev/vercel.json
+++ b/apps/kit.svelte.dev/vercel.json
@@ -16,10 +16,6 @@
"destination": "https://svelte.dev/docs/kit/load",
"permanent": true
},
- {
- "source": "/docs/modules",
- "destination": "https://svelte.dev/docs/kit/@sveltejs-kit"
- },
{
"source": "/docs/types",
"destination": "https://svelte.dev/docs/kit/@sveltejs-kit"
diff --git a/apps/svelte.dev/src/routes/docs/kit/modules/+page.svelte b/apps/svelte.dev/src/routes/docs/kit/modules/+page.svelte
new file mode 100644
index 0000000000..d97209ab9c
--- /dev/null
+++ b/apps/svelte.dev/src/routes/docs/kit/modules/+page.svelte
@@ -0,0 +1,54 @@
+
+
+
From 5781b45b73f5a80ffff3d4b83756ba5a2d617adb Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Mon, 28 Oct 2024 13:23:35 -0700
Subject: [PATCH 2/5] format
---
.../src/routes/docs/kit/modules/+page.svelte | 167 +++++++++++++-----
1 file changed, 121 insertions(+), 46 deletions(-)
diff --git a/apps/svelte.dev/src/routes/docs/kit/modules/+page.svelte b/apps/svelte.dev/src/routes/docs/kit/modules/+page.svelte
index d97209ab9c..be216519cd 100644
--- a/apps/svelte.dev/src/routes/docs/kit/modules/+page.svelte
+++ b/apps/svelte.dev/src/routes/docs/kit/modules/+page.svelte
@@ -2,52 +2,127 @@
import RemovedPage from '../../RemovedPage.svelte';
const docs = new Map([
- ['$app-environment-browser', ["browser in $app/environment", '/docs/kit/$app-environment#browser']],
- ['$app-environment-building', ["building in $app/environment", '/docs/kit/$app-environment#building']],
- ['$app-environment-dev', ["dev in $app/environment", '/docs/kit/$app-environment#dev']],
- ['$app-environment-version', ["version in $app/environment", '/docs/kit/$app-environment#version']],
- ['$app-forms-applyaction', ["applyAction in $app/forms", '/docs/kit/$app-forms#applyAction']],
- ['$app-forms-deserialize', ["deserialize in $app/forms", '/docs/kit/$app-forms#deserialize']],
- ['$app-forms-enhance', ["enhance in $app/forms", '/docs/kit/$app-forms#enhance']],
- ['$app-navigation-afternavigate', ["afternavigate in $app/navigation", '/docs/kit/$app-navigation#afterNavigate']],
- ['$app-navigation-beforenavigate', ["beforeNavigate in $app/navigation", '/docs/kit/$app-navigation#beforeNavigate']],
- ['$app-navigation-disablescrollhandling', ["disableScrollHandling in $app/navigation", '/docs/kit/$app-navigation#disableScrollHandling']],
- ['$app-navigation-goto', ["goto in $app/navigation", '/docs/kit/$app-navigation#goto']],
- ['$app-navigation-invalidate', ["invalidate in $app/navigation", '/docs/kit/$app-navigation#invalidate']],
- ['$app-navigation-invalidateall', ["invalidateAll in $app/navigation", '/docs/kit/$app-navigation#invalidateAll']],
- ['$app-navigation-onnavigate', ["onNavigate in $app/navigation", '/docs/kit/$app-navigation#onNavigate']],
- ['$app-navigation-preloadcode', ["preloadCode in $app/navigation", '/docs/kit/$app-navigation#preloadCode']],
- ['$app-navigation-preloaddata', ["preloadData in $app/navigation", '/docs/kit/$app-navigation#preloadData']],
- ['$app-navigation-pushstate', ["pushState in $app/navigation", '/docs/kit/$app-navigation#pushState']],
- ['$app-navigation-replacestate', ["replaceState in $app/navigation", '/docs/kit/$app-navigation#replaceState']],
- ['$app-paths-assets', ["assets in $app/paths", '/docs/kit/$app-paths#assets']],
- ['$app-paths-base', ["base in $app/paths", '/docs/kit/$app-paths#base']],
- ['$app-paths-resolveroute', ["resolveRoute in $app-paths", '/docs/kit/$app-paths#resolveRoute']],
- ['$app-server-read', ["read in $app/paths", '/docs/kit/$app-paths#read']],
- ['$app-stores-getstores', ["getStores in $app/stores", '/docs/kit/$app-stores#getStores']],
- ['$app-stores-navigating', ["assets in $app/stores", '/docs/kit/$app-stores#assets']],
- ['$app-stores-page', ["page in $app/stores", '/docs/kit/$app-stores#page']],
- ['$app-stores-updated', ["updated in $app/stores", '/docs/kit/$app-stores#updated']],
- ['$lib-$lib-server', ["$lib", '/docs/kit/$lib']],
- ['$service-worker-base', ["base in $service-worker", '/docs/kit/$service-worker#base']],
- ['$service-worker-build', ["build in $service-worker", '/docs/kit/$service-worker#build']],
- ['$service-worker-files', ["files in $service-worker", '/docs/kit/$service-worker#files']],
- ['$service-worker-prerendered', ["prerendered in $service-worker", '/docs/kit/$service-worker#prerendered']],
- ['$service-worker-version', ["version in $service-worker", '/docs/kit/$service-worker#version']],
- ['sveltejs-kit-version', ["VERSION in @sveltejs/kit", '/@sveltejs-kit#VERSION']],
- ['sveltejs-kit-error', ["error in @sveltejs/kit", '/@sveltejs-kit#error']],
- ['sveltejs-kit-fail', ["fail in @sveltejs/kit", '/@sveltejs-kit#fail']],
- ['sveltejs-kit-ishttperror', ["isHttpError in @sveltejs/kit", '/@sveltejs-kit#isHttpError']],
- ['sveltejs-kit-isredirect', ["isRedirect in @sveltejs/kit", '/@sveltejs-kit#isRedirect']],
- ['sveltejs-kit-json', ["json in @sveltejs/kit", '/@sveltejs-kit#json']],
- ['sveltejs-kit-redirect', ["redirect in @sveltejs/kit", '/@sveltejs-kit#redirect']],
- ['sveltejs-kit-text', ["text in @sveltejs/kit", '/@sveltejs-kit#text']],
- ['sveltejs-kit-hooks-sequence', ["sequence in @sveltejs/kit/hooks", '/docs/kit/@sveltejs-kit-hooks#sequence']],
- ['sveltejs-kit-node-createreadablestream', ["createReadableStream in @sveltejs/kit/node", '/docs/kit/@sveltejs-kit-node#createReadableStream']],
- ['sveltejs-kit-node-getrequest', ["getRequest in @sveltejs/kit/node", '/docs/kit/@sveltejs-kit-node#getRequest']],
- ['sveltejs-kit-node-setresponse', ["setResponse in @sveltejs/kit/node", '/docs/kit/@sveltejs-kit-node#setResponse']],
- ['sveltejs-kit-node-polyfills-installpolyfills', ["installPolyfills in @sveltejs/kit/node/polyfills", '/docs/kit/@sveltejs-kit-node-polyfills#installPolyfills']],
- ['sveltejs-kit-vite-sveltekit', ["sveltekit in @sveltejs/kit/vite", '/docs/kit/@sveltejs-kit-vite#sveltekit']]
+ [
+ '$app-environment-browser',
+ ['browser in $app/environment', '/docs/kit/$app-environment#browser']
+ ],
+ [
+ '$app-environment-building',
+ ['building in $app/environment', '/docs/kit/$app-environment#building']
+ ],
+ ['$app-environment-dev', ['dev in $app/environment', '/docs/kit/$app-environment#dev']],
+ [
+ '$app-environment-version',
+ ['version in $app/environment', '/docs/kit/$app-environment#version']
+ ],
+ ['$app-forms-applyaction', ['applyAction in $app/forms', '/docs/kit/$app-forms#applyAction']],
+ ['$app-forms-deserialize', ['deserialize in $app/forms', '/docs/kit/$app-forms#deserialize']],
+ ['$app-forms-enhance', ['enhance in $app/forms', '/docs/kit/$app-forms#enhance']],
+ [
+ '$app-navigation-afternavigate',
+ ['afternavigate in $app/navigation', '/docs/kit/$app-navigation#afterNavigate']
+ ],
+ [
+ '$app-navigation-beforenavigate',
+ ['beforeNavigate in $app/navigation', '/docs/kit/$app-navigation#beforeNavigate']
+ ],
+ [
+ '$app-navigation-disablescrollhandling',
+ [
+ 'disableScrollHandling in $app/navigation',
+ '/docs/kit/$app-navigation#disableScrollHandling'
+ ]
+ ],
+ ['$app-navigation-goto', ['goto in $app/navigation', '/docs/kit/$app-navigation#goto']],
+ [
+ '$app-navigation-invalidate',
+ ['invalidate in $app/navigation', '/docs/kit/$app-navigation#invalidate']
+ ],
+ [
+ '$app-navigation-invalidateall',
+ ['invalidateAll in $app/navigation', '/docs/kit/$app-navigation#invalidateAll']
+ ],
+ [
+ '$app-navigation-onnavigate',
+ ['onNavigate in $app/navigation', '/docs/kit/$app-navigation#onNavigate']
+ ],
+ [
+ '$app-navigation-preloadcode',
+ ['preloadCode in $app/navigation', '/docs/kit/$app-navigation#preloadCode']
+ ],
+ [
+ '$app-navigation-preloaddata',
+ ['preloadData in $app/navigation', '/docs/kit/$app-navigation#preloadData']
+ ],
+ [
+ '$app-navigation-pushstate',
+ ['pushState in $app/navigation', '/docs/kit/$app-navigation#pushState']
+ ],
+ [
+ '$app-navigation-replacestate',
+ ['replaceState in $app/navigation', '/docs/kit/$app-navigation#replaceState']
+ ],
+ ['$app-paths-assets', ['assets in $app/paths', '/docs/kit/$app-paths#assets']],
+ ['$app-paths-base', ['base in $app/paths', '/docs/kit/$app-paths#base']],
+ [
+ '$app-paths-resolveroute',
+ ['resolveRoute in $app-paths', '/docs/kit/$app-paths#resolveRoute']
+ ],
+ ['$app-server-read', ['read in $app/paths', '/docs/kit/$app-paths#read']],
+ ['$app-stores-getstores', ['getStores in $app/stores', '/docs/kit/$app-stores#getStores']],
+ ['$app-stores-navigating', ['assets in $app/stores', '/docs/kit/$app-stores#assets']],
+ ['$app-stores-page', ['page in $app/stores', '/docs/kit/$app-stores#page']],
+ ['$app-stores-updated', ['updated in $app/stores', '/docs/kit/$app-stores#updated']],
+ ['$lib-$lib-server', ['$lib', '/docs/kit/$lib']],
+ ['$service-worker-base', ['base in $service-worker', '/docs/kit/$service-worker#base']],
+ ['$service-worker-build', ['build in $service-worker', '/docs/kit/$service-worker#build']],
+ ['$service-worker-files', ['files in $service-worker', '/docs/kit/$service-worker#files']],
+ [
+ '$service-worker-prerendered',
+ ['prerendered in $service-worker', '/docs/kit/$service-worker#prerendered']
+ ],
+ [
+ '$service-worker-version',
+ ['version in $service-worker', '/docs/kit/$service-worker#version']
+ ],
+ ['sveltejs-kit-version', ['VERSION in @sveltejs/kit', '/@sveltejs-kit#VERSION']],
+ ['sveltejs-kit-error', ['error in @sveltejs/kit', '/@sveltejs-kit#error']],
+ ['sveltejs-kit-fail', ['fail in @sveltejs/kit', '/@sveltejs-kit#fail']],
+ ['sveltejs-kit-ishttperror', ['isHttpError in @sveltejs/kit', '/@sveltejs-kit#isHttpError']],
+ ['sveltejs-kit-isredirect', ['isRedirect in @sveltejs/kit', '/@sveltejs-kit#isRedirect']],
+ ['sveltejs-kit-json', ['json in @sveltejs/kit', '/@sveltejs-kit#json']],
+ ['sveltejs-kit-redirect', ['redirect in @sveltejs/kit', '/@sveltejs-kit#redirect']],
+ ['sveltejs-kit-text', ['text in @sveltejs/kit', '/@sveltejs-kit#text']],
+ [
+ 'sveltejs-kit-hooks-sequence',
+ ['sequence in @sveltejs/kit/hooks', '/docs/kit/@sveltejs-kit-hooks#sequence']
+ ],
+ [
+ 'sveltejs-kit-node-createreadablestream',
+ [
+ 'createReadableStream in @sveltejs/kit/node',
+ '/docs/kit/@sveltejs-kit-node#createReadableStream'
+ ]
+ ],
+ [
+ 'sveltejs-kit-node-getrequest',
+ ['getRequest in @sveltejs/kit/node', '/docs/kit/@sveltejs-kit-node#getRequest']
+ ],
+ [
+ 'sveltejs-kit-node-setresponse',
+ ['setResponse in @sveltejs/kit/node', '/docs/kit/@sveltejs-kit-node#setResponse']
+ ],
+ [
+ 'sveltejs-kit-node-polyfills-installpolyfills',
+ [
+ 'installPolyfills in @sveltejs/kit/node/polyfills',
+ '/docs/kit/@sveltejs-kit-node-polyfills#installPolyfills'
+ ]
+ ],
+ [
+ 'sveltejs-kit-vite-sveltekit',
+ ['sveltekit in @sveltejs/kit/vite', '/docs/kit/@sveltejs-kit-vite#sveltekit']
+ ]
]);
From a71c5c36f6255b024acec52f177ffb88d647638b Mon Sep 17 00:00:00 2001
From: Rich Harris
Date: Mon, 28 Oct 2024 16:32:51 -0400
Subject: [PATCH 3/5] missed this in the initial review - we don't use bold
text anywhere any more
---
apps/svelte.dev/src/routes/docs/RemovedPage.svelte | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/apps/svelte.dev/src/routes/docs/RemovedPage.svelte b/apps/svelte.dev/src/routes/docs/RemovedPage.svelte
index 5d4e6b610a..579c9a6b5f 100644
--- a/apps/svelte.dev/src/routes/docs/RemovedPage.svelte
+++ b/apps/svelte.dev/src/routes/docs/RemovedPage.svelte
@@ -34,8 +34,7 @@
{#each docs.values() as [title, href]}
-
- {title} is now
- here
+ {title}
{/each}
From 6fdfd6f0661c1de8314089c68f7d3c2e0bf6ac89 Mon Sep 17 00:00:00 2001
From: Rich Harris
Date: Mon, 28 Oct 2024 17:01:04 -0400
Subject: [PATCH 4/5] this looks better
---
.../src/routes/docs/RemovedPage.svelte | 14 ++-
.../docs/component-directives/+page.svelte | 8 +-
.../docs/element-directives/+page.svelte | 22 ++--
.../src/routes/docs/kit/modules/+page.svelte | 105 ++++++++----------
.../src/routes/docs/logic-blocks/+page.svelte | 8 +-
.../routes/docs/special-elements/+page.svelte | 20 ++--
6 files changed, 90 insertions(+), 87 deletions(-)
diff --git a/apps/svelte.dev/src/routes/docs/RemovedPage.svelte b/apps/svelte.dev/src/routes/docs/RemovedPage.svelte
index 579c9a6b5f..092e269fa0 100644
--- a/apps/svelte.dev/src/routes/docs/RemovedPage.svelte
+++ b/apps/svelte.dev/src/routes/docs/RemovedPage.svelte
@@ -17,6 +17,10 @@
goto(new_docs[1], { replaceState: true });
}
});
+
+ function render(title: string) {
+ return title.replace(/`(.+?)`/g, (_, text) => `${text.replaceAll('<', '<')}
`);
+ }
@@ -34,7 +38,7 @@
@@ -47,5 +51,13 @@
max-width: var(--sk-page-content-width);
box-sizing: content-box;
margin: auto;
+
+ a {
+ text-decoration: none !important;
+
+ &:hover {
+ text-decoration: underline !important;
+ }
+ }
}
diff --git a/apps/svelte.dev/src/routes/docs/component-directives/+page.svelte b/apps/svelte.dev/src/routes/docs/component-directives/+page.svelte
index 9f7f4e6f07..b62057946c 100644
--- a/apps/svelte.dev/src/routes/docs/component-directives/+page.svelte
+++ b/apps/svelte.dev/src/routes/docs/component-directives/+page.svelte
@@ -4,11 +4,11 @@
const docs = new Map([
[
'on-eventname ',
- ['on:eventname', '/docs/svelte/v5-migration-guide#Event-changes-Component-events']
+ ['`on:eventname`', '/docs/svelte/v5-migration-guide#Event-changes-Component-events']
],
- ['style-props', ['--style-props', '/docs/svelte/custom-properties']],
- ['bind-property ', ['bind:property', '/docs/svelte/bind#bind:property-for-components']],
- ['bind-this ', ['bind:this', '/docs/svelte/bind#bind:this']]
+ ['style-props', ['`--style-props`', '/docs/svelte/custom-properties']],
+ ['bind-property ', ['`bind:property`', '/docs/svelte/bind#bind:property-for-components']],
+ ['bind-this ', ['`bind:this`', '/docs/svelte/bind#bind:this']]
]);
diff --git a/apps/svelte.dev/src/routes/docs/element-directives/+page.svelte b/apps/svelte.dev/src/routes/docs/element-directives/+page.svelte
index b99e5abc28..459b5e8797 100644
--- a/apps/svelte.dev/src/routes/docs/element-directives/+page.svelte
+++ b/apps/svelte.dev/src/routes/docs/element-directives/+page.svelte
@@ -2,21 +2,21 @@
import RemovedPage from '../RemovedPage.svelte';
const docs = new Map([
- ['on-eventname ', ['on:eventname', '/docs/svelte/basic-markup#Events']],
- ['bind-property', ['bind:property', '/docs/svelte/bind']],
- ['binding-select-value ', ['Binding