Skip to content

Commit 6fc88a5

Browse files
zonemeenbrc-dd
andauthored
fix: remove index.html when using createContentLoader (#2693)
Co-authored-by: Divyansh Singh <40380293+brc-dd@users.noreply.github.com>
1 parent 5d18fd8 commit 6fc88a5

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

src/client/theme-default/composables/langs.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function normalizeLink(
4343
? link.replace(/\/$/, '') +
4444
ensureStartingSlash(
4545
path
46-
.replace(/(^|\/)?index.md$/, '$1')
46+
.replace(/(^|\/)index\.md$/, '$1')
4747
.replace(/\.md$/, addExt ? '.html' : '')
4848
)
4949
: link

src/node/build/generateSitemap.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export async function generateSitemap(siteConfig: SiteConfig) {
1919
siteConfig.pages.map(async (page) => {
2020
//
2121
let url = siteConfig.rewrites.map[page] || page
22-
url = url.replace(/(^|\/)?index.md$/, '$1')
22+
url = url.replace(/(^|\/)index\.md$/, '$1')
2323
url = url.replace(/\.md$/, siteConfig.cleanUrls ? '' : '.html')
2424

2525
const lastmod = siteConfig.lastUpdated && (await getGitTimestamp(page))

src/node/contentLoader.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,9 @@ export function createContentLoader<T = ContentData[]>(
141141
)
142142
const url =
143143
'/' +
144-
normalizePath(path.relative(config.srcDir, file)).replace(
145-
/\.md$/,
146-
config.cleanUrls ? '' : '.html'
147-
)
144+
normalizePath(path.relative(config.srcDir, file))
145+
.replace(/(^|\/)index\.md$/, '$1')
146+
.replace(/\.md$/, config.cleanUrls ? '' : '.html')
148147
const html = render ? md.render(src) : undefined
149148
const renderedExcerpt = renderExcerpt
150149
? excerpt && md.render(excerpt)

src/node/plugins/localSearchPlugin.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export async function localSearchPlugin(
119119
let relFile = slash(path.relative(siteConfig.srcDir, file))
120120
relFile = siteConfig.rewrites.map[relFile] || relFile
121121
let id = slash(path.join(siteConfig.site.base, relFile))
122-
id = id.replace(/\/index\.md$/, '/')
122+
id = id.replace(/(^|\/)index\.md$/, '$1')
123123
id = id.replace(/\.md$/, siteConfig.cleanUrls ? '' : '.html')
124124
return id
125125
}

0 commit comments

Comments
 (0)