From 0a2732a2b0be45121b772f8de5e271439e3bd888 Mon Sep 17 00:00:00 2001
From: "Lyu, Wei-Da" <36730922+jasonlyu123@users.noreply.github.com>
Date: Thu, 6 Jul 2023 17:38:24 +0800
Subject: [PATCH 1/2] fix: generate type definition with nullable types (#8924)

This results in `undefined` and `null` being added explicitly in places which is crucial in some situations
---
 .changeset/funny-bags-occur.md          | 5 +++++
 packages/svelte/scripts/generate-dts.js | 3 +++
 2 files changed, 8 insertions(+)
 create mode 100644 .changeset/funny-bags-occur.md

diff --git a/.changeset/funny-bags-occur.md b/.changeset/funny-bags-occur.md
new file mode 100644
index 0000000000..81f89bcd0f
--- /dev/null
+++ b/.changeset/funny-bags-occur.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: generate type definition with nullable types
diff --git a/packages/svelte/scripts/generate-dts.js b/packages/svelte/scripts/generate-dts.js
index fe4b70e09a..0ecf7127df 100644
--- a/packages/svelte/scripts/generate-dts.js
+++ b/packages/svelte/scripts/generate-dts.js
@@ -16,6 +16,9 @@ fs.writeFileSync('./types/compiler/interfaces.d.ts', `import '../index.js';`);
 
 await createBundle({
 	output: 'types/index.d.ts',
+	compilerOptions: {
+		strict: true
+	},
 	modules: {
 		svelte: 'src/runtime/public.d.ts',
 		'svelte/compiler': 'src/compiler/public.d.ts',

From 76baa078792f52df53ea302042c397cb84403f48 Mon Sep 17 00:00:00 2001
From: Puru Vijay <47742487+PuruVJ@users.noreply.github.com>
Date: Thu, 6 Jul 2023 17:48:10 +0530
Subject: [PATCH 2/2] feat: On this page mobile (#8782)

---
 pnpm-lock.yaml                                       | 12 ++++++------
 sites/svelte.dev/package.json                        |  2 +-
 sites/svelte.dev/src/routes/docs/+layout.svelte      |  1 -
 sites/svelte.dev/src/routes/docs/[slug]/+page.svelte |  4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index da78071c69..e641f90334 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -185,8 +185,8 @@ importers:
         specifier: ^1.21.0
         version: 1.21.0(svelte@packages+svelte)(vite@4.3.9)
       '@sveltejs/site-kit':
-        specifier: 6.0.0-next.18
-        version: 6.0.0-next.18(@sveltejs/kit@1.21.0)(svelte@packages+svelte)
+        specifier: 6.0.0-next.20
+        version: 6.0.0-next.20(@sveltejs/kit@1.21.0)(svelte@packages+svelte)
       '@sveltejs/vite-plugin-svelte':
         specifier: ^2.4.2
         version: 2.4.2(svelte@packages+svelte)(vite@4.3.9)
@@ -1800,11 +1800,11 @@ packages:
       svelte-local-storage-store: 0.4.0(svelte@packages+svelte)
     dev: false
 
-  /@sveltejs/site-kit@6.0.0-next.18(@sveltejs/kit@1.21.0)(svelte@packages+svelte):
-    resolution: {integrity: sha512-8uWjP61UAkCqWf9UuQQWSCpyPNk4cqnGaQozjIr3sGbQnauTQDiS4K8AxqyBSyphEIrhxd68iYMEFQDQVAHjcg==}
+  /@sveltejs/site-kit@6.0.0-next.20(@sveltejs/kit@1.21.0)(svelte@packages+svelte):
+    resolution: {integrity: sha512-tWT/pKdCFxY+Wsayoj287AcNOYsm0EW5fiOsSSVseEK+62R1KcWHcioSgm1Fk12HOUgFcYnskaJ9JOo+p7+9/w==}
     peerDependencies:
-      '@sveltejs/kit': ^1.0.0
-      svelte: ^3.54.0 || ^4.0.0-next.1 || ^4.0.0
+      '@sveltejs/kit': ^1.20.0
+      svelte: ^4.0.0
     dependencies:
       '@sveltejs/kit': 1.21.0(svelte@packages+svelte)(vite@4.3.9)
       esm-env: 1.0.0
diff --git a/sites/svelte.dev/package.json b/sites/svelte.dev/package.json
index 9994843b61..05abbd4b53 100644
--- a/sites/svelte.dev/package.json
+++ b/sites/svelte.dev/package.json
@@ -30,7 +30,7 @@
     "@resvg/resvg-js": "^2.4.1",
     "@sveltejs/adapter-vercel": "^3.0.1",
     "@sveltejs/kit": "^1.21.0",
-    "@sveltejs/site-kit": "6.0.0-next.18",
+    "@sveltejs/site-kit": "6.0.0-next.20",
     "@sveltejs/vite-plugin-svelte": "^2.4.2",
     "@types/marked": "^5.0.0",
     "@types/node": "^20.3.2",
diff --git a/sites/svelte.dev/src/routes/docs/+layout.svelte b/sites/svelte.dev/src/routes/docs/+layout.svelte
index cee570c006..55ced57717 100644
--- a/sites/svelte.dev/src/routes/docs/+layout.svelte
+++ b/sites/svelte.dev/src/routes/docs/+layout.svelte
@@ -32,7 +32,6 @@
 	}
 
 	.page {
-		--on-this-page-display: none;
 		padding: var(--sk-page-padding-top) var(--sk-page-padding-side);
 
 		min-width: 0 !important;
diff --git a/sites/svelte.dev/src/routes/docs/[slug]/+page.svelte b/sites/svelte.dev/src/routes/docs/[slug]/+page.svelte
index a052bfd5ab..1bdcbccc40 100644
--- a/sites/svelte.dev/src/routes/docs/[slug]/+page.svelte
+++ b/sites/svelte.dev/src/routes/docs/[slug]/+page.svelte
@@ -29,6 +29,8 @@
 		<Icon size={50} name="edit" /> Edit this page on GitHub
 	</a>
 
+	<DocsOnThisPage details={data.page} />
+
 	{@html data.page.content}
 </div>
 
@@ -49,8 +51,6 @@
 	</div>
 </div>
 
-<DocsOnThisPage details={data.page} />
-
 <style>
 	.edit {
 		position: relative;