Merge branch 'main' into meteorlxy-markdown-to-vue

Author: meteorlxy

packages/core/src/page/inferPagePath.ts

@@ -1,4 +1,8 @@
-import { ensureLeadingSlash, resolveLocalePath } from '@vuepress/shared'
+import {
+  ensureLeadingSlash,
+  inferRoutePath,
+  resolveLocalePath,
+} from '@vuepress/shared'
 import type { App } from '../types/index.js'
 
 /**
@@ -23,9 +27,7 @@ export const inferPagePath = ({
 
   // infer page route path from file path
   // foo/bar.md -> /foo/bar.html
-  const pathInferred = ensureLeadingSlash(filePathRelative)
-    .replace(/\.md$/, '.html')
-    .replace(/\/(README|index).html$/i, '/')
+  const pathInferred = ensureLeadingSlash(inferRoutePath(filePathRelative))
 
   // resolve page locale path
   const pathLocale = resolveLocalePath(app.siteData.locales, pathInferred)

packages/shared/src/utils/routes/inferRoutePath.ts

@@ -1,12 +1,12 @@
 /**
- * Infer route path according to the given (markdown file) path
+ * Infer route path of the given raw path
  */
-export const inferRoutePath = (path: string): string => {
-  // if the pathname is empty or ends with `/`, return as is
-  if (!path || path.endsWith('/')) return path
+export const inferRoutePath = (rawPath: string): string => {
+  // if the raw path is empty or ends with `/`, return as is
+  if (!rawPath || rawPath.endsWith('/')) return rawPath
 
   // convert README.md to index.html
-  let routePath = path.replace(/(^|\/)README.md$/i, '$1index.html')
+  let routePath = rawPath.replace(/(^|\/)README.md$/i, '$1index.html')
 
   // convert /foo/bar.md to /foo/bar.html
   if (routePath.endsWith('.md')) {