Skip to content

[Docs Site] Support paths with and without trailing slash in local dev #19596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 26, 2025
Merged

[Docs Site] Support paths with and without trailing slash in local dev #19596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a6a641
[Docs Site] Add trailingSlash: always to Astro config
KianNH Jan 31, 2025
c9dfa44
Support paths with and without trailing slash in local dev
KianNH Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/overrides/Sidebar.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Default from "@astrojs/starlight/components/Sidebar.astro";
import { Icon as AstroIcon } from "astro-icon/components";
import { lookupProductTitle } from "~/util/sidebar";

const [product, module] = Astro.url.pathname.split("/").slice(1, -1);
const [product, module] = Astro.url.pathname.split("/").filter(Boolean);
---

<a
Expand Down
13 changes: 9 additions & 4 deletions src/util/sidebar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const sidebars = new Map<string, Group>();

export async function getSidebar(context: AstroGlobal<Props>) {
const pathname = context.url.pathname;
const segments = pathname.split("/").slice(1, -1);
const segments = pathname.split("/").filter(Boolean);

const product = segments.at(0);

Expand Down Expand Up @@ -96,9 +96,14 @@ function setSidebarCurrentEntry(
pathname: string,
): boolean {
for (const entry of sidebar) {
if (entry.type === "link" && entry.href === pathname) {
entry.isCurrent = true;
return true;
if (entry.type === "link") {
const href = entry.href;

// Compare with and without trailing slash
if (href === pathname || href.slice(0, -1) === href) {
entry.isCurrent = true;
return true;
}
}

if (
Expand Down
Loading