Merge branch 'route-link' into auto-link

Author: Mister-Hope

packages/client/src/components/RouteLink.ts

@@ -1,4 +1,3 @@
-import { removeLeadingSlash } from '@vuepress/shared'
 import { computed, defineComponent, h } from 'vue'
 import type { SlotsType, VNode } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
@@ -92,7 +91,7 @@ export const RouteLink = defineComponent({
     const path = computed(() =>
       props.to.startsWith('#') || props.to.startsWith('?')
         ? props.to
-        : `${__VUEPRESS_BASE__}${removeLeadingSlash(resolveRoutePath(props.to, route.path))}`,
+        : `${__VUEPRESS_BASE__}${resolveRoutePath(props.to, route.path).substring(1)}`,
     )
 
     return () =>

packages/shared/src/utils/index.ts

@@ -2,11 +2,11 @@ export * from './dedupeHead.js'
 export * from './ensureLeadingSlash.js'
 export * from './ensureEndingSlash.js'
 export * from './formatDateString.js'
+export * from './inferRoutePath.js'
 export * from './isLinkExternal.js'
 export * from './isLinkHttp.js'
 export * from './isLinkWithProtocol.js'
 export * from './isPlainObject.js'
-export * from './inferRoutePath.js'
 export * from './normalizeRoutePath.js'
 export * from './omit.js'
 export * from './removeEndingSlash.js'

packages/shared/src/utils/inferRoutePath.ts

@@ -1,3 +1,6 @@
+/**
+ * Infer route path according to the given (markdown file) path
+ */
 export const inferRoutePath = (path: string): string => {
   // if the pathname is empty or ends with `/`, return as is
   if (!path || path.endsWith('/')) return path

packages/shared/src/utils/isLinkExternal.ts

@@ -1,23 +1,13 @@
-import { isLinkHttp } from './isLinkHttp.js'
+import { isLinkWithProtocol } from './isLinkWithProtocol.js'
 
 const markdownLinkRegexp = /.md((\?|#).*)?$/
 
 /**
  * Determine a link is external or not
  */
-export const isLinkExternal = (link: string, base = '/'): boolean => {
-  if (isLinkHttp(link)) {
-    return true
-  }
-
+export const isLinkExternal = (link: string, base = '/'): boolean =>
+  isLinkWithProtocol(link) ||
   // absolute link that does not start with `base` and does not end with `.md`
-  if (
-    link.startsWith('/') &&
+  (link.startsWith('/') &&
     !link.startsWith(base) &&
-    !markdownLinkRegexp.test(link)
-  ) {
-    return true
-  }
-
-  return false
-}
+    !markdownLinkRegexp.test(link))

packages/shared/tests/isLinkExternal.spec.ts

@@ -20,13 +20,13 @@ const testCases: [
   [['//foobar.com/base/README.md', '/base/'], true],
 
   // links with other protocols
-  [['mailto:foobar', '/base/'], false],
-  [['tel:foobar', '/base/'], false],
-  [['ftp://foobar.com'], false],
-  [['ftp://foobar.com', '/base/'], false],
-  [['ftp://foobar.com/base/README.md'], false],
-  [['ftp://foobar.com/base/README.md', '/base/'], false],
-  [['ms-windows-store://home', '/base/'], false],
+  [['mailto:foobar', '/base/'], true],
+  [['tel:foobar', '/base/'], true],
+  [['ftp://foobar.com'], true],
+  [['ftp://foobar.com', '/base/'], true],
+  [['ftp://foobar.com/base/README.md'], true],
+  [['ftp://foobar.com/base/README.md', '/base/'], true],
+  [['ms-windows-store://home', '/base/'], true],
 
   // absolute links
   [['/foo/bar'], false],