Skip to content

fix: incorrect dismatch index route paths #121

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
JounQin merged 2 commits into from
Jul 11, 2025
Merged

fix: incorrect dismatch index route paths #121

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed4fabd
fix: incorrect dismatch index route paths
JounQin Jul 11, 2025
87d9abd
Create eleven-hotels-behave.md
JounQin Jul 11, 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
7 changes: 1 addition & 6 deletions src/runtime/components/_utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { withBase } from '@rspress/core/runtime'
import type {
NormalizedSidebarGroup,
SidebarDivider,
Expand Down Expand Up @@ -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
)
}
Expand Down
10 changes: 3 additions & 7 deletions src/runtime/hooks/useSiteOverrides.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -51,7 +50,6 @@ let normalizedSiteOverrides: NormalizedSiteOverrides | undefined
let promise: Promise<NormalizedSiteOverrides> | undefined

const fetchSiteOverrides = async (
base: string,
version?: string,
acpSite?: DoomSite,
): Promise<NormalizedSiteOverrides> => {
Expand All @@ -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) {
Expand Down Expand Up @@ -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] || {}
Expand Down
Loading