From ed4fabdfe87f292cb9df9c615ed14cb8568cd68a Mon Sep 17 00:00:00 2001 From: JounQin Date: Fri, 11 Jul 2025 13:33:42 +0800 Subject: [PATCH 1/2] fix: incorrect dismatch index route paths --- src/runtime/components/_utils.ts | 7 +------ src/runtime/hooks/useSiteOverrides.ts | 10 +++------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/runtime/components/_utils.ts b/src/runtime/components/_utils.ts index 6a226679..d3d523c8 100644 --- a/src/runtime/components/_utils.ts +++ b/src/runtime/components/_utils.ts @@ -1,4 +1,3 @@ -import { withBase } from '@rspress/core/runtime' import type { NormalizedSidebarGroup, SidebarDivider, @@ -65,14 +64,10 @@ export function findItemByRoutePath( if (isSidebarDivider(item) || isSidebarSectionHeader(item)) { return false } - const withBaseUrl = withBase(item.link) - const removeIndexUrl = removeIndex(withBaseUrl) + const removeIndexUrl = removeIndex(item.link || '/') const removeBackSlashedRoutePath = routePath.replace(/\/$/, '') return ( - // FIXME: 😅 we should refactor all the path logic, /index.html / or no /, l - withBaseUrl === routePath || removeIndexUrl === routePath || - withBaseUrl === removeBackSlashedRoutePath || removeIndexUrl === removeBackSlashedRoutePath ) } diff --git a/src/runtime/hooks/useSiteOverrides.ts b/src/runtime/hooks/useSiteOverrides.ts index 7d6e70f7..8aee853e 100644 --- a/src/runtime/hooks/useSiteOverrides.ts +++ b/src/runtime/hooks/useSiteOverrides.ts @@ -1,8 +1,7 @@ -import { isProduction } from '@rspress/core/runtime' +import { isProduction, withBase } from '@rspress/core/runtime' import virtual from 'doom-@global-virtual' import { merge } from 'es-toolkit/compat' import { useEffect, useMemo, useState } from 'react' -import { base } from 'virtual-runtime-config' import { parse } from 'yaml' import { isUnversioned, type Language } from '../../shared/index.js' @@ -51,7 +50,6 @@ let normalizedSiteOverrides: NormalizedSiteOverrides | undefined let promise: Promise | undefined const fetchSiteOverrides = async ( - base: string, version?: string, acpSite?: DoomSite, ): Promise => { @@ -63,7 +61,7 @@ const fetchSiteOverrides = async ( acpSite && isProduction() ? `${(virtual.prefix || '') + acpSite.base}${isUnversioned(version) ? '' : acpSite.version + '/'}overrides.yaml` : null - const siteOverridesUrl = `${base}/overrides.yaml` + const siteOverridesUrl = withBase('overrides.yaml') const urls = [acpSiteOverridesUrl] if (acpSiteOverridesUrl !== siteOverridesUrl) { @@ -121,9 +119,7 @@ export const useSiteOverrides = (): SiteOverridesItem => { if (normalizedSiteOverrides) { return } - void fetchSiteOverrides(base, virtual.version, acpSite).then( - setSiteOverrides, - ) + void fetchSiteOverrides(virtual.version, acpSite).then(setSiteOverrides) }, [acpSite]) return siteOverrides?.[lang] || {} From 87d9abd21af04e2a0b54dca0a8cb8a2cf10bbec8 Mon Sep 17 00:00:00 2001 From: JounQin Date: Fri, 11 Jul 2025 13:34:47 +0800 Subject: [PATCH 2/2] Create eleven-hotels-behave.md Signed-off-by: JounQin --- .changeset/eleven-hotels-behave.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/eleven-hotels-behave.md diff --git a/.changeset/eleven-hotels-behave.md b/.changeset/eleven-hotels-behave.md new file mode 100644 index 00000000..3ca848fc --- /dev/null +++ b/.changeset/eleven-hotels-behave.md @@ -0,0 +1,5 @@ +--- +"@alauda/doom": patch +--- + +fix: incorrect dismatch index route paths