@vuepress/client 2.0.0-beta.60 → 2.0.0-beta.61

package/dist/app.js

@@ -17,7 +17,7 @@ import {
   usePageLang,
   usePageLayout,
   withBase
-} from "./chunk-E44UNXTX.js";
+} from "./chunk-X6BS2PXP.js";
 
 // src/app.ts
 import { clientConfigs } from "@internal/clientConfigs";
@@ -77,6 +77,7 @@ var createRoutes = () => pagesRoutes.reduce(
 var historyCreator = __VUEPRESS_SSR__ ? createMemoryHistory : createWebHistory;
 var createVueRouter = () => {
   const router = createRouter({
+    // it might be an issue of vue-router that have to remove the ending slash
     history: historyCreator(removeEndingSlash(__VUEPRESS_BASE__)),
     routes: createRoutes(),
     scrollBehavior: (to, from, savedPosition) => {
@@ -106,14 +107,16 @@ var setupGlobalComponents = (app) => {
 };
 
 // src/setupGlobalComputed.ts
-import { computed } from "vue";
+import { computed, ref, watch } from "vue";
 var setupGlobalComputed = (app, router, clientConfigs2) => {
+  const routePath = ref(router.currentRoute.value.path);
+  watch(
+    () => router.currentRoute.value.path,
+    (value) => routePath.value = value
+  );
   const layouts = computed(() => resolvers.resolveLayouts(clientConfigs2));
   const routeLocale = computed(
-    () => resolvers.resolveRouteLocale(
-      siteData.value.locales,
-      router.currentRoute.value.path
-    )
+    () => resolvers.resolveRouteLocale(siteData.value.locales, routePath.value)
   );
   const siteLocaleData = computed(
     () => resolvers.resolveSiteLocaleData(siteData.value, routeLocale.value)
@@ -170,10 +173,8 @@ var setupGlobalComputed = (app, router, clientConfigs2) => {
 
 // src/setupUpdateHead.ts
 import { isPlainObject, isString } from "@vuepress/shared";
-import { onMounted, provide, ref, useSSRContext, watch } from "vue";
-import { useRoute } from "vue-router";
+import { onMounted, provide, ref as ref2, useSSRContext, watch as watch2 } from "vue";
 var setupUpdateHead = () => {
-  const route = useRoute();
   const head = usePageHead();
   const lang = usePageLang();
   if (__VUEPRESS_SSR__) {
@@ -184,7 +185,7 @@ var setupUpdateHead = () => {
     }
     return;
   }
-  const headTags = ref([]);
+  const headTags = ref2([]);
   const loadHead = () => {
     head.value.forEach((item) => {
       const tag = queryHeadTag(item);
@@ -213,8 +214,8 @@ var setupUpdateHead = () => {
   onMounted(() => {
     loadHead();
     updateHead();
-    watch(
-      () => __VUEPRESS_DEV__ ? head.value : route.path,
+    watch2(
+      () => head.value,
       () => updateHead()
     );
   });
@@ -284,7 +285,7 @@ var createVueApp = async () => {
   setupGlobalComponents(app);
   const globalComputed = setupGlobalComputed(app, router, clientConfigs);
   if (__VUEPRESS_DEV__ || __VUE_PROD_DEVTOOLS__) {
-    const { setupDevtools } = await import("./setupDevtools-EXVHPMXB.js");
+    const { setupDevtools } = await import("./setupDevtools-X4YFRK4B.js");
     setupDevtools(app, globalComputed);
   }
   for (const clientConfig of clientConfigs) {

package/dist/{chunk-E44UNXTX.js → chunk-X6BS2PXP.js}

@@ -170,6 +170,9 @@ var LAYOUT_NAME_NOT_FOUND = "NotFound";
 
 // src/resolvers.ts
 var resolvers = reactive({
+  /**
+   * Resolve layouts component map
+   */
   resolveLayouts: (clientConfigs) => clientConfigs.reduce(
     (prev, item) => ({
       ...prev,
@@ -177,12 +180,23 @@ var resolvers = reactive({
     }),
     {}
   ),
+  /**
+   * Resolve page data according to page key
+   */
   resolvePageData: async (pageKey) => {
     const pageDataResolver = pagesData.value[pageKey];
     const pageData2 = await pageDataResolver?.();
     return pageData2 ?? pageDataEmpty;
   },
+  /**
+   * Resolve page frontmatter from page data
+   */
   resolvePageFrontmatter: (pageData2) => pageData2.frontmatter,
+  /**
+   * Merge the head config in frontmatter and site locale
+   *
+   * Frontmatter should take priority over site locale
+   */
   resolvePageHead: (headTitle, frontmatter, siteLocale) => {
     const description = isString(frontmatter.description) ? frontmatter.description : siteLocale.description;
     const head = [
@@ -193,8 +207,21 @@ var resolvers = reactive({
     ];
     return dedupeHead(head);
   },
+  /**
+   * Resolve the content of page head title
+   *
+   * It would be used as the content of the `<title>` tag
+   */
   resolvePageHeadTitle: (page, siteLocale) => [page.title, siteLocale.title].filter((item) => !!item).join(" | "),
+  /**
+   * Resolve page language from page data
+   *
+   * It would be used as the `lang` attribute of `<html>` tag
+   */
   resolvePageLang: (page) => page.lang || "en",
+  /**
+   * Resolve layout component of current page
+   */
   resolvePageLayout: (page, layouts) => {
     let layoutName;
     if (page.path) {
@@ -209,7 +236,15 @@ var resolvers = reactive({
     }
     return layouts[layoutName];
   },
+  /**
+   * Resolve locale path according to route path and locales config
+   */
   resolveRouteLocale: (locales, routePath) => resolveLocalePath(locales, routePath),
+  /**
+   * Resolve site data for specific locale
+   *
+   * It would merge the locales fields to the root fields
+   */
   resolveSiteLocaleData: (site, routeLocale) => ({
     ...site,
     ...site.locales[routeLocale]
@@ -233,6 +268,7 @@ var ClientOnly = defineComponent({
 import { pagesComponents } from "@internal/pagesComponents";
 import { computed, defineComponent as defineComponent2, h } from "vue";
 var Content = defineComponent2({
+  // eslint-disable-next-line vue/no-reserved-component-names
   name: "Content",
   props: {
     pageKey: {
@@ -246,9 +282,15 @@ var Content = defineComponent2({
     const pageComponent = computed(
       () => pagesComponents[props.pageKey || page.value.key]
     );
-    return () => pageComponent.value ? h(pageComponent.value) : h(
-      "div",
-      __VUEPRESS_DEV__ ? "Page does not exist. This is a fallback content." : "404 Not Found"
+    return () => pageComponent.value ? (
+      // use page component
+      h(pageComponent.value)
+    ) : (
+      // fallback content
+      h(
+        "div",
+        __VUEPRESS_DEV__ ? "Page does not exist. This is a fallback content." : "404 Not Found"
+      )
     );
   }
 });

package/dist/index.js

@@ -29,7 +29,7 @@ import {
   useSiteLocaleData,
   useUpdateHead,
   withBase
-} from "./chunk-E44UNXTX.js";
+} from "./chunk-X6BS2PXP.js";
 export {
   ClientOnly,
   Content,

package/dist/{setupDevtools-EXVHPMXB.js → setupDevtools-X4YFRK4B.js}

@@ -11,6 +11,7 @@ var INSPECTOR_GLOBAL_COMPUTED_LABEL = "Global Computed";
 var setupDevtools = (app, globalComputed) => {
   setupDevtoolsPlugin(
     {
+      // fix recursive reference
       app,
       id: PLUGIN_ID,
       label: PLUGIN_LABEL,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/client",
-  "version": "2.0.0-beta.60",
+  "version": "2.0.0-beta.61",
   "description": "Client package of VuePress",
   "keywords": [
     "vuepress",
@@ -33,10 +33,10 @@
     "types.d.ts"
   ],
   "dependencies": {
-    "@vue/devtools-api": "^6.4.5",
-    "vue": "^3.2.45",
+    "@vue/devtools-api": "^6.5.0",
+    "vue": "^3.2.47",
     "vue-router": "^4.1.6",
-    "@vuepress/shared": "2.0.0-beta.60"
+    "@vuepress/shared": "2.0.0-beta.61"
   },
   "publishConfig": {
     "access": "public"