feat: extract normalizePath to helper (#671)

Author: Mister-Hope

plugins/tools/plugin-redirect/src/client/composables/setupDevServerRedirect.ts

@@ -1,4 +1,4 @@
-import { entries, isLinkHttp } from '@vuepress/helper/client'
+import { entries, normalizePath, isLinkHttp } from '@vuepress/helper/client'
 import { usePreferredLanguages, watchImmediate } from '@vueuse/core'
 import { computed } from 'vue'
 import {
@@ -11,7 +11,6 @@ import {
 import { redirectMap } from '@temp/redirect/map.js'
 
 import type { RedirectBehaviorConfig } from '../../shared/index.js'
-import { normalizePath } from '../../shared/index.js'
 
 export const setupDevServerRedirect = ({
   autoLocale,

plugins/tools/plugin-redirect/src/node/getRedirectMap.ts

@@ -4,10 +4,10 @@ import {
   isArray,
   isFunction,
   isPlainObject,
+  normalizePath,
 } from '@vuepress/helper'
 import type { App, Page } from 'vuepress/core'
 
-import { normalizePath } from '../shared/normalizePath.js'
 import type {
   RedirectPluginFrontmatter,
   RedirectPluginOptions,

plugins/tools/plugin-redirect/src/node/handleRedirectTo.ts

@@ -1,7 +1,10 @@
-import { isLinkAbsolute, removeLeadingSlash } from '@vuepress/helper'
+import {
+  isLinkAbsolute,
+  normalizePath,
+  removeLeadingSlash,
+} from '@vuepress/helper'
 import type { App, Page } from 'vuepress/core'
 
-import { normalizePath } from '../shared/normalizePath.js'
 import type { RedirectPluginFrontmatter } from './types/index.js'
 
 export const handleRedirectTo = ({ frontmatter }: Page, app: App): void => {

plugins/tools/plugin-redirect/src/shared/index.ts

@@ -1,3 +1,2 @@
 export type * from './behavior.js'
 export type * from './locales.js'
-export * from './normalizePath.js'

themes/theme-default/src/client/utils/isActiveSidebarItem.ts

@@ -1,20 +1,16 @@
+import { normalizePath } from '@vuepress/helper/client'
 import type { RouteLocationNormalizedLoaded } from 'vuepress/client'
 
 import type { SidebarItem } from '../typings.js'
 
-const normalizePath = (path: string): string =>
-  decodeURI(path)
-    .replace(/#.*$/, '')
-    .replace(/(index)?\.(md|html)$/, '')
-
 const isActiveLink = (
   link: string,
   route: RouteLocationNormalizedLoaded,
 ): boolean => {
   if (route.hash === link) return true
 
-  const currentPath = normalizePath(route.path)
-  const targetPath = normalizePath(link)
+  const currentPath = normalizePath(decodeURI(route.path), true)
+  const targetPath = normalizePath(decodeURI(link), true)
   return currentPath === targetPath
 }
 

tools/helper/src/shared/index.ts

@@ -4,5 +4,6 @@ export type * from './header.js'
 export * from './helper.js'
 export * from './link.js'
 export type * from './locales.js'
+export * from './normalizePath.js'
 export type * from './key.js'
 export type * from './types.js'