@vuepress/client 2.0.0-rc.7 → 2.0.0-rc.9

package/dist/app.d.ts

@@ -1,4 +1,4 @@
-import { C as CreateVueAppFunction } from './createVueAppFunction-YNGNKfE3.js';
+import { C as CreateVueAppFunction } from './createVueAppFunction-onJTVJru.js';
 import 'vue';
 import 'vue-router';
 

package/dist/app.js

@@ -12,7 +12,7 @@ import {
   usePageLang,
   usePageLayout,
   withBase
-} from "./chunk-VWNFZFFH.js";
+} from "./chunk-FJNK2BS7.js";
 
 // src/app.ts
 import { clientConfigs } from "@internal/clientConfigs";
@@ -69,6 +69,8 @@ var createVueRouter = () => {
         // attach page chunk route meta
         _pageChunk: pageChunk
       };
+    } else if (to.path === from.path) {
+      to.meta = from.meta;
     }
   });
   return router;
@@ -82,21 +84,26 @@ var setupGlobalComponents = (app) => {
 };
 
 // src/setupGlobalComputed.ts
-import { computedWithControl } from "@vueuse/core";
-import { computed } from "vue";
+import { computed, customRef } from "vue";
 var setupGlobalComputed = (app, router, clientConfigs2) => {
   const routePath = computed(() => router.currentRoute.value.path);
-  const pageChunk = computedWithControl(
-    routePath,
-    () => router.currentRoute.value.meta._pageChunk
-  );
+  const pageChunk = customRef((track, trigger) => ({
+    get() {
+      track();
+      return router.currentRoute.value.meta._pageChunk;
+    },
+    set(value) {
+      router.currentRoute.value.meta._pageChunk = value;
+      trigger();
+    }
+  }));
   if (__VUEPRESS_DEV__ && (import.meta.webpackHot || import.meta.hot)) {
     __VUE_HMR_RUNTIME__.updatePageData = async (newPageData) => {
       const oldPageChunk = await routes.value[newPageData.path].loader();
-      routes.value[newPageData.path].loader = () => Promise.resolve({ comp: oldPageChunk.comp, data: newPageData });
+      const newPageChunk = { comp: oldPageChunk.comp, data: newPageData };
+      routes.value[newPageData.path].loader = () => Promise.resolve(newPageChunk);
       if (newPageData.path === router.currentRoute.value.meta._pageChunk?.data.path) {
-        router.currentRoute.value.meta._pageChunk.data = newPageData;
-        pageChunk.trigger();
+        pageChunk.value = newPageChunk;
       }
     };
   }

package/dist/{chunk-VWNFZFFH.js → chunk-FJNK2BS7.js}

@@ -67,7 +67,7 @@ var resolveRoutePath = (path) => {
   const encodedPath = encodeURI(normalizedPath);
   if (routes.value[encodedPath])
     return encodedPath;
-  return redirects.value[normalizedPath] || normalizedPath;
+  return redirects.value[normalizedPath] || redirects.value[encodedPath] || normalizedPath;
 };
 
 // src/router/resolveRoute.ts
@@ -124,6 +124,9 @@ var Content = defineComponent2({
   }
 });
 
+// src/utils/defineClientConfig.ts
+var defineClientConfig = (clientConfig = {}) => clientConfig;
+
 // src/utils/withBase.ts
 import { isLinkHttp, removeLeadingSlash } from "@vuepress/shared";
 var withBase = (url) => {
@@ -152,7 +155,11 @@ var guardEvent = (event) => {
 };
 var RouteLink = ({ active = false, activeClass = "route-link-active", to, ...attrs }, { slots }) => {
   const router = useRouter2();
-  const path = withBase(resolveRoutePath(to));
+  const resolvedPath = resolveRoutePath(to);
+  const path = (
+    // only anchor or query
+    resolvedPath.startsWith("#") || resolvedPath.startsWith("?") ? resolvedPath : withBase(resolvedPath)
+  );
   return h2(
     "a",
     {
@@ -225,6 +232,9 @@ var resolvers = reactive({
    */
   resolvePageLayout: (pageData, layouts) => {
     const layoutName = isString(pageData.frontmatter.layout) ? pageData.frontmatter.layout : LAYOUT_NAME_DEFAULT;
+    if (!layouts[layoutName]) {
+      throw new Error(`[vuepress] Cannot resolve layout: ${layoutName}`);
+    }
     return layouts[layoutName];
   },
   /**
@@ -274,6 +284,7 @@ export {
   useRoute,
   useRouter,
   Content,
+  defineClientConfig,
   withBase,
   RouteLink,
   resolvers

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import { PageData, HeadConfig, SiteData, PageFrontmatter } from '@vuepress/share
 export { HeadConfig, PageData, PageFrontmatter, PageHeader, SiteData } from '@vuepress/shared';
 import { Router } from 'vue-router';
 export { RouteLocationNormalizedLoaded, Router, useRoute, useRouter } from 'vue-router';
-export { C as CreateVueAppFunction } from './createVueAppFunction-YNGNKfE3.js';
+export { C as CreateVueAppFunction } from './createVueAppFunction-onJTVJru.js';
 
 /**
  * Name of the default layout
@@ -91,7 +91,7 @@ interface ClientConfig {
     /**
      * Layout components
      */
-    layouts?: Layouts;
+    layouts?: Partial<Layouts>;
     /**
      * Components to be placed directly into the root node of vue app
      */
@@ -224,9 +224,14 @@ declare const resolvers: {
     resolveSiteLocaleData: (siteData: SiteData, routeLocale: RouteLocale) => SiteLocaleData;
 };
 
+/**
+ * A helper function to help you define vuepress client config file
+ */
+declare const defineClientConfig: (clientConfig?: ClientConfig) => ClientConfig;
+
 /**
  * Prefix url with site base
  */
 declare const withBase: (url: string) => string;
 
-export { 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 Route, RouteLink, type RouteLinkProps, type RouteLocale, type RouteLocaleRef, type RouteMeta, type RoutePath, type RoutePathRef, type Routes, type RoutesRef, type SiteDataRef, type SiteLocaleData, type SiteLocaleDataRef, type UpdateHead, clientDataSymbol, resolveRoute, resolveRoutePath, resolvers, updateHeadSymbol, useClientData, useLayouts, usePageComponent, usePageData, usePageFrontmatter, usePageHead, usePageLang, usePageLayout, useRedirects, useRouteLocale, useRoutePath, useRoutes, useSiteData, useSiteLocaleData, useUpdateHead, withBase };
+export { 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 Route, RouteLink, type RouteLinkProps, type RouteLocale, type RouteLocaleRef, type RouteMeta, type RoutePath, type RoutePathRef, type Routes, type RoutesRef, type SiteDataRef, type SiteLocaleData, 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 };

package/dist/index.js

@@ -3,6 +3,7 @@ import {
   Content,
   RouteLink,
   clientDataSymbol,
+  defineClientConfig,
   resolveRoute,
   resolveRoutePath,
   resolvers,
@@ -25,12 +26,13 @@ import {
   useSiteLocaleData,
   useUpdateHead,
   withBase
-} from "./chunk-VWNFZFFH.js";
+} from "./chunk-FJNK2BS7.js";
 export {
   ClientOnly,
   Content,
   RouteLink,
   clientDataSymbol,
+  defineClientConfig,
   resolveRoute,
   resolveRoutePath,
   resolvers,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/client",
-  "version": "2.0.0-rc.7",
+  "version": "2.0.0-rc.9",
   "description": "Client package of VuePress",
   "keywords": [
     "vuepress",
@@ -33,11 +33,10 @@
     "types.d.ts"
   ],
   "dependencies": {
-    "@vue/devtools-api": "^6.5.1",
-    "@vueuse/core": "^10.7.2",
-    "vue": "^3.4.15",
-    "vue-router": "^4.2.5",
-    "@vuepress/shared": "2.0.0-rc.7"
+    "@vue/devtools-api": "^6.6.1",
+    "vue": "^3.4.21",
+    "vue-router": "^4.3.0",
+    "@vuepress/shared": "2.0.0-rc.9"
   },
   "publishConfig": {
     "access": "public"