@vuepress/client 2.0.0-beta.63 → 2.0.0-beta.65

package/dist/app.js

@@ -17,7 +17,7 @@ import {
   usePageLang,
   usePageLayout,
   withBase
-} from "./chunk-X6BS2PXP.js";
+} from "./chunk-IKARB3UY.js";
 
 // src/app.ts
 import { clientConfigs } from "@internal/clientConfigs";
@@ -57,8 +57,21 @@ var createRoutes = () => pagesRoutes.reduce(
         component: Vuepress,
         meta
       },
+      {
+        path: path.endsWith("/") ? (
+          // redirect from `/index.html` to `/`
+          path + "index.html"
+        ) : (
+          // redirect from `/foo` to `/foo.html`
+          path.substring(0, path.length - 5)
+        ),
+        redirect: path
+      },
       ...redirects.map((item) => ({
-        path: item,
+        path: item === ":md" ? (
+          // redirect from `/foo.md` to `/foo.html`
+          path.substring(0, path.length - 5) + ".md"
+        ) : item,
         redirect: path
       }))
     );
@@ -88,13 +101,21 @@ var createVueRouter = () => {
       return { top: 0 };
     }
   });
+  let pendingPageData;
+  let pendingToPath;
   router.beforeResolve(async (to, from) => {
     if (to.path !== from.path || from === START_LOCATION) {
       ;
-      [pageData.value] = await Promise.all([
+      [pendingPageData] = await Promise.all([
         resolvers.resolvePageData(to.name),
         pagesComponents[to.name]?.__asyncLoader()
       ]);
+      pendingToPath = to.path;
+    }
+  });
+  router.afterEach((to, from) => {
+    if (to.path !== from.path && to.path === pendingToPath) {
+      pageData.value = pendingPageData;
     }
   });
   return router;
@@ -107,15 +128,12 @@ var setupGlobalComponents = (app) => {
 };
 
 // src/setupGlobalComputed.ts
-import { computed, ref, watch } from "vue";
+import { computedEager } from "@vueuse/core";
+import { computed } 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(
+  const routePath = computedEager(() => router.currentRoute.value.path);
+  const routeLocale = computedEager(
     () => resolvers.resolveRouteLocale(siteData.value.locales, routePath.value)
   );
   const siteLocaleData = computed(
@@ -134,7 +152,9 @@ var setupGlobalComputed = (app, router, clientConfigs2) => {
       siteLocaleData.value
     )
   );
-  const pageLang = computed(() => resolvers.resolvePageLang(pageData.value));
+  const pageLang = computed(
+    () => resolvers.resolvePageLang(pageData.value, siteLocaleData.value)
+  );
   const pageLayout = computed(
     () => resolvers.resolvePageLayout(pageData.value, layouts.value)
   );
@@ -173,7 +193,7 @@ var setupGlobalComputed = (app, router, clientConfigs2) => {
 
 // src/setupUpdateHead.ts
 import { isPlainObject, isString } from "@vuepress/shared";
-import { onMounted, provide, ref as ref2, useSSRContext, watch as watch2 } from "vue";
+import { onMounted, provide, ref, useSSRContext, watch } from "vue";
 var setupUpdateHead = () => {
   const head = usePageHead();
   const lang = usePageLang();
@@ -185,7 +205,7 @@ var setupUpdateHead = () => {
     }
     return;
   }
-  const headTags = ref2([]);
+  const headTags = ref([]);
   const loadHead = () => {
     head.value.forEach((item) => {
       const tag = queryHeadTag(item);
@@ -214,10 +234,7 @@ var setupUpdateHead = () => {
   onMounted(() => {
     loadHead();
     updateHead();
-    watch2(
-      () => head.value,
-      () => updateHead()
-    );
+    watch(() => head.value, updateHead);
   });
 };
 var queryHeadTag = ([

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

@@ -218,7 +218,7 @@ var resolvers = reactive({
    *
    * It would be used as the `lang` attribute of `<html>` tag
    */
-  resolvePageLang: (page) => page.lang || "en",
+  resolvePageLang: (page, siteLocale) => page.lang || siteLocale.lang || "en-US",
   /**
    * Resolve layout component of current page
    */

package/dist/index.d.ts

@@ -204,7 +204,7 @@ type RouteLocale = string;
 /**
  * Ref wrapper of `RouteLocale`
  */
-type RouteLocaleRef = ComputedRef<RouteLocale>;
+type RouteLocaleRef = Readonly<Ref<RouteLocale>>;
 /**
  * Injection key for page route locale path
  */
@@ -278,7 +278,7 @@ declare const resolvers: {
     resolvePageFrontmatter: (pageData: PageData) => PageFrontmatter;
     resolvePageHead: (headTitle: PageHeadTitle, frontmatter: PageFrontmatter, siteLocale: SiteLocaleData) => PageHead;
     resolvePageHeadTitle: (page: PageData, siteLocale: SiteLocaleData) => PageHeadTitle;
-    resolvePageLang: (page: PageData) => PageLang;
+    resolvePageLang: (page: PageData, siteLocale: SiteLocaleData) => PageLang;
     resolvePageLayout: (page: PageData, layouts: Layouts) => Component;
     resolveRouteLocale: (locales: SiteData['locales'], routePath: string) => RouteLocale;
     resolveSiteLocaleData: (site: SiteData, routeLocale: RouteLocale) => SiteLocaleData;

package/dist/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/client",
-  "version": "2.0.0-beta.63",
+  "version": "2.0.0-beta.65",
   "description": "Client package of VuePress",
   "keywords": [
     "vuepress",
@@ -34,9 +34,10 @@
   ],
   "dependencies": {
     "@vue/devtools-api": "^6.5.0",
+    "@vueuse/core": "^10.2.1",
     "vue": "^3.3.4",
-    "vue-router": "^4.2.2",
-    "@vuepress/shared": "2.0.0-beta.63"
+    "vue-router": "^4.2.4",
+    "@vuepress/shared": "2.0.0-beta.65"
   },
   "publishConfig": {
     "access": "public"