@vuepress/client 2.0.0-rc.11 → 2.0.0-rc.13

package/dist/app.js

@@ -12,7 +12,7 @@ import {
   usePageLang,
   usePageLayout,
   withBase
-} from "./chunk-MPZOAYAQ.js";
+} from "./chunk-ZQJPP2LC.js";
 
 // src/app.ts
 import { clientConfigs } from "@internal/clientConfigs";

package/dist/{chunk-MPZOAYAQ.js → chunk-ZQJPP2LC.js}

@@ -60,30 +60,48 @@ if (__VUEPRESS_DEV__ && (import.meta.webpackHot || import.meta.hot)) {
 }
 
 // src/router/resolveRoutePath.ts
-var resolveRoutePath = (path, currentPath) => {
-  const normalizedPath = normalizeRoutePath(path, currentPath);
-  if (routes.value[normalizedPath])
-    return normalizedPath;
-  const encodedPath = encodeURI(normalizedPath);
-  if (routes.value[encodedPath])
-    return encodedPath;
-  return redirects.value[normalizedPath] || redirects.value[encodedPath] || normalizedPath;
+var resolveRoutePath = (pathname, currentPath) => {
+  const normalizedRoutePath = normalizeRoutePath(pathname, currentPath);
+  if (routes.value[normalizedRoutePath])
+    return normalizedRoutePath;
+  const encodedRoutePath = encodeURI(normalizedRoutePath);
+  if (routes.value[encodedRoutePath]) {
+    return encodedRoutePath;
+  }
+  const redirectedRoutePath = redirects.value[normalizedRoutePath] || redirects.value[encodedRoutePath];
+  if (redirectedRoutePath) {
+    return redirectedRoutePath;
+  }
+  return normalizedRoutePath;
 };
 
 // src/router/resolveRoute.ts
+import { splitPath } from "@vuepress/shared";
 var resolveRoute = (path, currentPath) => {
-  const routePath = resolveRoutePath(path, currentPath);
-  const route = routes.value[routePath] ?? {
-    ...routes.value["/404.html"],
-    notFound: true
-  };
+  const { pathname, hashAndQueries } = splitPath(path);
+  const routePath = resolveRoutePath(pathname, currentPath);
+  const routeFullPath = routePath + hashAndQueries;
+  if (!routes.value[routePath]) {
+    return {
+      ...routes.value["/404.html"],
+      path: routeFullPath,
+      notFound: true
+    };
+  }
   return {
-    path: routePath,
-    notFound: false,
-    ...route
+    ...routes.value[routePath],
+    path: routeFullPath,
+    notFound: false
   };
 };
 
+// src/router/resolveRouteFullPath.ts
+import { splitPath as splitPath2 } from "@vuepress/shared";
+var resolveRouteFullPath = (path, currentPath) => {
+  const { pathname, hashAndQueries } = splitPath2(path);
+  return resolveRoutePath(pathname, currentPath) + hashAndQueries;
+};
+
 // src/router/index.ts
 import { useRoute, useRouter } from "vue-router";
 
@@ -134,7 +152,7 @@ var RouteLink = defineComponent({
     const router = useRouter2();
     const route = useRoute2();
     const path = computed(
-      () => props.to.startsWith("#") || props.to.startsWith("?") ? props.to : `${__VUEPRESS_BASE__}${resolveRoutePath(props.to, route.path).substring(1)}`
+      () => props.to.startsWith("#") || props.to.startsWith("?") ? props.to : `${__VUEPRESS_BASE__}${resolveRouteFullPath(props.to, route.path).substring(1)}`
     );
     return () => h(
       "a",
@@ -334,7 +352,7 @@ var resolvers = reactive({
   /**
    * Resolve locale path according to route path and locales config
    */
-  resolveRouteLocale: (locales, routePath) => resolveLocalePath(locales, routePath),
+  resolveRouteLocale: (locales, routePath) => resolveLocalePath(locales, decodeURI(routePath)),
   /**
    * Resolve site data for specific locale
    *
@@ -385,6 +403,7 @@ export {
   routes,
   resolveRoutePath,
   resolveRoute,
+  resolveRouteFullPath,
   useRoute,
   useRouter,
   RouteLink,

package/dist/index.d.ts

@@ -302,10 +302,15 @@ interface ResolvedRoute<T extends RouteMeta = RouteMeta> extends Route<T> {
  */
 declare const resolveRoute: <T extends RouteMeta = RouteMeta>(path: string, currentPath?: string) => ResolvedRoute<T>;
 
+/**
+ * Resolve route full path with given raw path
+ */
+declare const resolveRouteFullPath: (path: string, currentPath?: string) => string;
+
 /**
  * Resolve route path with given raw path
  */
-declare const resolveRoutePath: (path: string, currentPath?: string) => string;
+declare const resolveRoutePath: (pathname: string, currentPath?: string) => string;
 
 /**
  * Resolver methods to get global computed
@@ -334,4 +339,4 @@ declare const defineClientConfig: (clientConfig?: ClientConfig) => ClientConfig;
  */
 declare const withBase: (url: string) => string;
 
-export { AutoLink, type AutoLinkConfig, type ClientConfig, type ClientData, ClientOnly, Content, type Layouts, type LayoutsRef, type PageChunk, type PageComponent, type PageComponentRef, type PageDataRef, type PageFrontmatterRef, type PageHead, type PageHeadRef, type PageHeadTitle, type PageHeadTitleRef, type PageLang, type PageLangRef, type PageLayout, type PageLayoutRef, type Redirects, type RedirectsRef, type ResolvedRoute, type Route, RouteLink, type RouteLinkProps, type RouteLocale, type RouteLocaleRef, type RouteMeta, type RoutePath, type RoutePathRef, type Routes, type RoutesRef, type SiteDataRef, type SiteLocaleDataRef, type UpdateHead, clientDataSymbol, defineClientConfig, resolveRoute, resolveRoutePath, resolvers, updateHeadSymbol, useClientData, useLayouts, usePageComponent, usePageData, usePageFrontmatter, usePageHead, usePageLang, usePageLayout, useRedirects, useRouteLocale, useRoutePath, useRoutes, useSiteData, useSiteLocaleData, useUpdateHead, withBase };
+export { AutoLink, type AutoLinkConfig, type ClientConfig, type ClientData, ClientOnly, Content, type Layouts, type LayoutsRef, type PageChunk, type PageComponent, type PageComponentRef, type PageDataRef, type PageFrontmatterRef, type PageHead, type PageHeadRef, type PageHeadTitle, type PageHeadTitleRef, type PageLang, type PageLangRef, type PageLayout, type PageLayoutRef, type Redirects, type RedirectsRef, type ResolvedRoute, type Route, RouteLink, type RouteLinkProps, type RouteLocale, type RouteLocaleRef, type RouteMeta, type RoutePath, type RoutePathRef, type Routes, type RoutesRef, type SiteDataRef, type SiteLocaleDataRef, type UpdateHead, clientDataSymbol, defineClientConfig, resolveRoute, resolveRouteFullPath, resolveRoutePath, resolvers, updateHeadSymbol, useClientData, useLayouts, usePageComponent, usePageData, usePageFrontmatter, usePageHead, usePageLang, usePageLayout, useRedirects, useRouteLocale, useRoutePath, useRoutes, useSiteData, useSiteLocaleData, useUpdateHead, withBase };

package/dist/index.js

@@ -6,6 +6,7 @@ import {
   clientDataSymbol,
   defineClientConfig,
   resolveRoute,
+  resolveRouteFullPath,
   resolveRoutePath,
   resolvers,
   updateHeadSymbol,
@@ -27,7 +28,7 @@ import {
   useSiteLocaleData,
   useUpdateHead,
   withBase
-} from "./chunk-MPZOAYAQ.js";
+} from "./chunk-ZQJPP2LC.js";
 export {
   AutoLink,
   ClientOnly,
@@ -36,6 +37,7 @@ export {
   clientDataSymbol,
   defineClientConfig,
   resolveRoute,
+  resolveRouteFullPath,
   resolveRoutePath,
   resolvers,
   updateHeadSymbol,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/client",
-  "version": "2.0.0-rc.11",
+  "version": "2.0.0-rc.13",
   "description": "Client package of VuePress",
   "keywords": [
     "vuepress",
@@ -36,7 +36,7 @@
     "@vue/devtools-api": "^6.6.1",
     "vue": "^3.4.27",
     "vue-router": "^4.3.2",
-    "@vuepress/shared": "2.0.0-rc.11"
+    "@vuepress/shared": "2.0.0-rc.13"
   },
   "publishConfig": {
     "access": "public"