Skip to content
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

Jump to bottom

fix: handle cleanUrls with subfolders when using a trailing slash #1575

Merged
merged 7 commits into from Dec 22, 2022
Merged

fix: handle cleanUrls with subfolders when using a trailing slash #1575

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
437ffd8
fix: handle cleanUrls with subfolders when using a trailing slash
rigor789 Nov 3, 2022
9a7e5ce
refactor: fallback to index.md lookup if .md fails
rigor789 Nov 3, 2022
40db044
revert: fix: handle cleanUrls with subfolders when using a trailing s…
rigor789 Nov 3, 2022
3c64778
fix: case for home page/index page
rigor789 Nov 3, 2022
affdeca
fix: fallback to previous behaviour in DEV mode
rigor789 Dec 21, 2022
ff6bf35
simplify stuff
brc-dd Dec 22, 2022
de55cc2
Merge branch 'main' into feat/clean-urls-with-subfolders-trailing-slash
brc-dd Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/client/app/utils.ts
View file
Open in desktop
Expand Up @@ -22,10 +22,7 @@ export function withBase(path: string) {
export function pathToFile(path: string): string {
let pagePath = path.replace(/\.html$/, '')
pagePath = decodeURIComponent(pagePath)
if (pagePath.endsWith('/')) {
pagePath += 'index'
}

pagePath = pagePath.replace(/\/$/, '/index') // /foo/ -> /foo/index
if (import.meta.env.DEV) {
// always force re-fetch content in dev
pagePath += `.md?t=${Date.now()}`
Expand All @@ -41,7 +38,11 @@ export function pathToFile(path: string): string {
) + '.md'
// client production build needs to account for page hash, which is
// injected directly in the page's html
const pageHash = __VP_HASH_MAP__[pagePath.toLowerCase()]
let pageHash = __VP_HASH_MAP__[pagePath.toLowerCase()]
if (!pageHash && pagePath.endsWith('_index.md')) {
pagePath = pagePath.slice(0, -9) + '.md'
pageHash = __VP_HASH_MAP__[pagePath.toLowerCase()]
}
pagePath = `${base}assets/${pagePath}.${pageHash}.js`
} else {
// ssr build uses much simpler name mapping
Expand Down