From 5f4f07df78b6363e435f6ba72186a82163f5e4b3 Mon Sep 17 00:00:00 2001
From: ComputerGuy <63362464+Ocean-OS@users.noreply.github.com>
Date: Thu, 4 Sep 2025 00:45:25 -0700
Subject: [PATCH 1/5] feat: relative github links

---
 .../site-kit/src/lib/nav/MobileMenu.svelte    | 11 +++++++++-
 packages/site-kit/src/lib/nav/Nav.svelte      | 21 ++++++++++++-------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/packages/site-kit/src/lib/nav/MobileMenu.svelte b/packages/site-kit/src/lib/nav/MobileMenu.svelte
index 98fa16fe1b..973a097c73 100644
--- a/packages/site-kit/src/lib/nav/MobileMenu.svelte
+++ b/packages/site-kit/src/lib/nav/MobileMenu.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { afterNavigate } from '$app/navigation';
+	import { page } from '$app/state';
 	import { trap } from '../actions';
 	import { reduced_motion } from '../stores';
 	import { tick } from 'svelte';
@@ -147,7 +148,15 @@
 						<ul>
 							<li><a href="/chat">Discord</a></li>
 							<li><a href="https://bsky.app/profile/svelte.dev">Bluesky</a></li>
-							<li><a href="https://github.com/sveltejs/svelte">GitHub</a></li>
+							<li>
+								<a
+									href="https://github.com/sveltejs/{page.url.pathname.startsWith('/docs/kit')
+										? 'kit'
+										: page.url.pathname.startsWith('/docs/cli')
+											? 'cli'
+											: 'svelte'}">GitHub</a
+								>
+							</li>
 						</ul>
 					</div>
 				</div>
diff --git a/packages/site-kit/src/lib/nav/Nav.svelte b/packages/site-kit/src/lib/nav/Nav.svelte
index b71147ad06..0dcc30d827 100644
--- a/packages/site-kit/src/lib/nav/Nav.svelte
+++ b/packages/site-kit/src/lib/nav/Nav.svelte
@@ -6,7 +6,7 @@ Top navigation bar for the application. It provides a slot for the left side, th
 	import { overlay_open, on_this_page_open } from '../stores';
 	import { search } from '../state/search.svelte';
 	import Icon from '../components/Icon.svelte';
-	import { page } from '$app/stores';
+	import { page } from '$app/state';
 	import ThemeToggle from '../components/ThemeToggle.svelte';
 	import MobileMenu from './MobileMenu.svelte';
 	import type { NavigationLink } from '../types';
@@ -86,7 +86,7 @@ Top navigation bar for the application. It provides a slot for the left side, th
 					<Dropdown>
 						<a
 							href="/{link.slug}"
-							aria-current={$page.url.pathname.startsWith(`/${link.slug}`) ? 'page' : undefined}
+							aria-current={page.url.pathname.startsWith(`/${link.slug}`) ? 'page' : undefined}
 						>
 							{link.title}
 
@@ -99,8 +99,8 @@ Top navigation bar for the application. It provides a slot for the left side, th
 									<a
 										class="secondary"
 										href={section.path}
-										aria-current={$page.url.pathname === section.path ||
-										$page.url.pathname.startsWith(section.path!)
+										aria-current={page.url.pathname === section.path ||
+										page.url.pathname.startsWith(section.path!)
 											? 'page'
 											: undefined}
 									>
@@ -113,7 +113,7 @@ Top navigation bar for the application. It provides a slot for the left side, th
 				{:else}
 					<a
 						href="/{link.slug}"
-						aria-current={$page.url.pathname.startsWith(`/${link.slug}`) ? 'page' : null}
+						aria-current={page.url.pathname.startsWith(`/${link.slug}`) ? 'page' : null}
 					>
 						{link.title}
 					</a>
@@ -133,7 +133,14 @@ Top navigation bar for the application. It provides a slot for the left side, th
 					<span data-icon="bluesky"></span>
 				</a>
 
-				<a href="https://github.com/sveltejs/svelte" aria-label="GitHub Repo">
+				<a
+					href="https://github.com/sveltejs/{page.url.pathname.startsWith('/docs/kit')
+						? 'kit'
+						: page.url.pathname.startsWith('/docs/cli')
+							? 'cli'
+							: 'svelte'}"
+					aria-label="GitHub Repo"
+				>
 					<span data-icon="github"></span>
 				</a>
 			</div>
@@ -169,7 +176,7 @@ Top navigation bar for the application. It provides a slot for the left side, th
 				open = !open;
 
 				if (open) {
-					const segment = $page.url.pathname.split('/')[1];
+					const segment = page.url.pathname.split('/')[1];
 					current = links.find((link) => link.slug === segment);
 				}
 			}}

From 0a93d4a0efb0586d783937bcdbf85a594c19606e Mon Sep 17 00:00:00 2001
From: ComputerGuy <63362464+Ocean-OS@users.noreply.github.com>
Date: Sun, 7 Sep 2025 12:45:49 -0700
Subject: [PATCH 2/5] make it work with tutorials, dedupe logic

---
 .../site-kit/src/lib/nav/MobileMenu.svelte    |  7 ++----
 packages/site-kit/src/lib/nav/Nav.svelte      | 22 ++++++++++++-------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/packages/site-kit/src/lib/nav/MobileMenu.svelte b/packages/site-kit/src/lib/nav/MobileMenu.svelte
index 973a097c73..eef8e7a51b 100644
--- a/packages/site-kit/src/lib/nav/MobileMenu.svelte
+++ b/packages/site-kit/src/lib/nav/MobileMenu.svelte
@@ -10,6 +10,7 @@
 	import MobileSubMenu from './MobileSubMenu.svelte';
 	import type { NavigationLink } from '../types';
 	import ModalOverlay from '../components/ModalOverlay.svelte';
+	import { github_link } from './Nav.svelte';
 
 	interface Props {
 		links: NavigationLink[];
@@ -150,11 +151,7 @@
 							<li><a href="https://bsky.app/profile/svelte.dev">Bluesky</a></li>
 							<li>
 								<a
-									href="https://github.com/sveltejs/{page.url.pathname.startsWith('/docs/kit')
-										? 'kit'
-										: page.url.pathname.startsWith('/docs/cli')
-											? 'cli'
-											: 'svelte'}">GitHub</a
+									href={github_link(page)}>GitHub</a
 								>
 							</li>
 						</ul>
diff --git a/packages/site-kit/src/lib/nav/Nav.svelte b/packages/site-kit/src/lib/nav/Nav.svelte
index 0dcc30d827..468b6de166 100644
--- a/packages/site-kit/src/lib/nav/Nav.svelte
+++ b/packages/site-kit/src/lib/nav/Nav.svelte
@@ -2,6 +2,19 @@
 Top navigation bar for the application. It provides a slot for the left side, the right side, and the center.
 -->
 
+<script lang="ts" module>
+	import type { Page } from '@sveltejs/kit';
+	export function github_link(page: Page) {
+		if (page.url.pathname.startsWith('/tutorial')) {
+			return `https://github.com/sveltejs/${page.params.slug.split('/')[0]}`;
+		}
+		if (page.url.pathname.startsWith('/docs')) {
+			return `https://github.com/sveltejs/${page.params.topic}`;
+		}
+		return 'https://github.com/sveltejs/svelte';
+	}
+</script>
+
 <script lang="ts">
 	import { overlay_open, on_this_page_open } from '../stores';
 	import { search } from '../state/search.svelte';
@@ -133,14 +146,7 @@ Top navigation bar for the application. It provides a slot for the left side, th
 					<span data-icon="bluesky"></span>
 				</a>
 
-				<a
-					href="https://github.com/sveltejs/{page.url.pathname.startsWith('/docs/kit')
-						? 'kit'
-						: page.url.pathname.startsWith('/docs/cli')
-							? 'cli'
-							: 'svelte'}"
-					aria-label="GitHub Repo"
-				>
+				<a href={github_link(page)} aria-label="GitHub Repo">
 					<span data-icon="github"></span>
 				</a>
 			</div>

From b79aa8a484f1a945207eb208ae31b05b6d15fbcd Mon Sep 17 00:00:00 2001
From: ComputerGuy <63362464+Ocean-OS@users.noreply.github.com>
Date: Sun, 7 Sep 2025 12:49:20 -0700
Subject: [PATCH 3/5] lint

---
 packages/site-kit/src/lib/nav/MobileMenu.svelte | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/site-kit/src/lib/nav/MobileMenu.svelte b/packages/site-kit/src/lib/nav/MobileMenu.svelte
index eef8e7a51b..1a4d7e3094 100644
--- a/packages/site-kit/src/lib/nav/MobileMenu.svelte
+++ b/packages/site-kit/src/lib/nav/MobileMenu.svelte
@@ -150,9 +150,7 @@
 							<li><a href="/chat">Discord</a></li>
 							<li><a href="https://bsky.app/profile/svelte.dev">Bluesky</a></li>
 							<li>
-								<a
-									href={github_link(page)}>GitHub</a
-								>
+								<a href={github_link(page)}>GitHub</a>
 							</li>
 						</ul>
 					</div>

From a744e774ba23e5c3e7403f61495d376ae3e8022f Mon Sep 17 00:00:00 2001
From: ComputerGuy <63362464+Ocean-OS@users.noreply.github.com>
Date: Sun, 7 Sep 2025 12:54:47 -0700
Subject: [PATCH 4/5] more

---
 packages/site-kit/src/lib/nav/Nav.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/site-kit/src/lib/nav/Nav.svelte b/packages/site-kit/src/lib/nav/Nav.svelte
index 468b6de166..45543a094e 100644
--- a/packages/site-kit/src/lib/nav/Nav.svelte
+++ b/packages/site-kit/src/lib/nav/Nav.svelte
@@ -6,10 +6,10 @@ Top navigation bar for the application. It provides a slot for the left side, th
 	import type { Page } from '@sveltejs/kit';
 	export function github_link(page: Page) {
 		if (page.url.pathname.startsWith('/tutorial')) {
-			return `https://github.com/sveltejs/${page.params.slug.split('/')[0]}`;
+			return `https://github.com/sveltejs/${page.params.slug!.split('/')[0]}`;
 		}
 		if (page.url.pathname.startsWith('/docs')) {
-			return `https://github.com/sveltejs/${page.params.topic}`;
+			return `https://github.com/sveltejs/${page.params.topic!}`;
 		}
 		return 'https://github.com/sveltejs/svelte';
 	}

From ac951d3f5ce530f35d35fb22fd0b6c8029577108 Mon Sep 17 00:00:00 2001
From: ComputerGuy <63362464+Ocean-OS@users.noreply.github.com>
Date: Mon, 8 Sep 2025 17:46:35 -0700
Subject: [PATCH 5/5] link to org

---
 packages/site-kit/src/lib/nav/MobileMenu.svelte |  4 +---
 packages/site-kit/src/lib/nav/Nav.svelte        | 15 +--------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/packages/site-kit/src/lib/nav/MobileMenu.svelte b/packages/site-kit/src/lib/nav/MobileMenu.svelte
index 1a4d7e3094..a1c6a2cd29 100644
--- a/packages/site-kit/src/lib/nav/MobileMenu.svelte
+++ b/packages/site-kit/src/lib/nav/MobileMenu.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
 	import { afterNavigate } from '$app/navigation';
-	import { page } from '$app/state';
 	import { trap } from '../actions';
 	import { reduced_motion } from '../stores';
 	import { tick } from 'svelte';
@@ -10,7 +9,6 @@
 	import MobileSubMenu from './MobileSubMenu.svelte';
 	import type { NavigationLink } from '../types';
 	import ModalOverlay from '../components/ModalOverlay.svelte';
-	import { github_link } from './Nav.svelte';
 
 	interface Props {
 		links: NavigationLink[];
@@ -150,7 +148,7 @@
 							<li><a href="/chat">Discord</a></li>
 							<li><a href="https://bsky.app/profile/svelte.dev">Bluesky</a></li>
 							<li>
-								<a href={github_link(page)}>GitHub</a>
+								<a href="https://github.com/sveltejs">GitHub</a>
 							</li>
 						</ul>
 					</div>
diff --git a/packages/site-kit/src/lib/nav/Nav.svelte b/packages/site-kit/src/lib/nav/Nav.svelte
index 45543a094e..d6dd5b5e0f 100644
--- a/packages/site-kit/src/lib/nav/Nav.svelte
+++ b/packages/site-kit/src/lib/nav/Nav.svelte
@@ -2,19 +2,6 @@
 Top navigation bar for the application. It provides a slot for the left side, the right side, and the center.
 -->
 
-<script lang="ts" module>
-	import type { Page } from '@sveltejs/kit';
-	export function github_link(page: Page) {
-		if (page.url.pathname.startsWith('/tutorial')) {
-			return `https://github.com/sveltejs/${page.params.slug!.split('/')[0]}`;
-		}
-		if (page.url.pathname.startsWith('/docs')) {
-			return `https://github.com/sveltejs/${page.params.topic!}`;
-		}
-		return 'https://github.com/sveltejs/svelte';
-	}
-</script>
-
 <script lang="ts">
 	import { overlay_open, on_this_page_open } from '../stores';
 	import { search } from '../state/search.svelte';
@@ -146,7 +133,7 @@ Top navigation bar for the application. It provides a slot for the left side, th
 					<span data-icon="bluesky"></span>
 				</a>
 
-				<a href={github_link(page)} aria-label="GitHub Repo">
+				<a href="https://github.com/sveltejs" aria-label="GitHub Organization">
 					<span data-icon="github"></span>
 				</a>
 			</div>