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

package/dist/app.js

@@ -2,12 +2,13 @@ import {
   ClientOnly,
   Content,
   layoutsSymbol,
-  pageData,
+  pageDataSymbol,
   pageFrontmatterSymbol,
   pageHeadSymbol,
   pageHeadTitleSymbol,
   pageLangSymbol,
   pageLayoutSymbol,
+  pagesData,
   resolvers,
   routeLocaleSymbol,
   siteData,
@@ -17,7 +18,7 @@ import {
   usePageLang,
   usePageLayout,
   withBase
-} from "./chunk-IKARB3UY.js";
+} from "./chunk-WOIWBUXI.js";
 
 // src/app.ts
 import { clientConfigs } from "@internal/clientConfigs";
@@ -101,21 +102,13 @@ var createVueRouter = () => {
       return { top: 0 };
     }
   });
-  let pendingPageData;
-  let pendingToPath;
   router.beforeResolve(async (to, from) => {
     if (to.path !== from.path || from === START_LOCATION) {
       ;
-      [pendingPageData] = await Promise.all([
+      [to.meta._data] = 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;
@@ -128,14 +121,27 @@ var setupGlobalComponents = (app) => {
 };
 
 // src/setupGlobalComputed.ts
-import { computedEager } from "@vueuse/core";
+import { computedEager, computedWithControl } from "@vueuse/core";
 import { computed } from "vue";
 var setupGlobalComputed = (app, router, clientConfigs2) => {
-  const layouts = computed(() => resolvers.resolveLayouts(clientConfigs2));
   const routePath = computedEager(() => router.currentRoute.value.path);
   const routeLocale = computedEager(
     () => resolvers.resolveRouteLocale(siteData.value.locales, routePath.value)
   );
+  const pageData = computedWithControl(
+    routePath,
+    () => router.currentRoute.value.meta._data
+  );
+  if (__VUEPRESS_DEV__ && (import.meta.webpackHot || import.meta.hot)) {
+    __VUE_HMR_RUNTIME__.updatePageData = (data) => {
+      pagesData.value[data.key] = () => Promise.resolve(data);
+      if (data.key === router.currentRoute.value.meta._data.key) {
+        router.currentRoute.value.meta._data = data;
+        pageData.trigger();
+      }
+    };
+  }
+  const layouts = computed(() => resolvers.resolveLayouts(clientConfigs2));
   const siteLocaleData = computed(
     () => resolvers.resolveSiteLocaleData(siteData.value, routeLocale.value)
   );
@@ -159,6 +165,7 @@ var setupGlobalComputed = (app, router, clientConfigs2) => {
     () => resolvers.resolvePageLayout(pageData.value, layouts.value)
   );
   app.provide(layoutsSymbol, layouts);
+  app.provide(pageDataSymbol, pageData);
   app.provide(pageFrontmatterSymbol, pageFrontmatter);
   app.provide(pageHeadTitleSymbol, pageHeadTitle);
   app.provide(pageHeadSymbol, pageHead);

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

@@ -11,14 +11,11 @@ var useLayouts = () => {
   return layouts;
 };
 
-// src/composables/pagesData.ts
-import { pagesData as pagesDataRaw } from "@internal/pagesData";
-import { ref } from "vue";
-var pagesData = ref(pagesDataRaw);
-var usePagesData = () => pagesData;
-
 // src/composables/pageData.ts
-import { readonly, ref as ref2 } from "vue";
+import { inject as inject2, readonly } from "vue";
+var pageDataSymbol = Symbol(
+  __VUEPRESS_DEV__ ? "pageData" : ""
+);
 var pageDataEmpty = readonly({
   key: "",
   path: "",
@@ -27,24 +24,21 @@ var pageDataEmpty = readonly({
   frontmatter: {},
   headers: []
 });
-var pageData = ref2(pageDataEmpty);
-var usePageData = () => pageData;
-if (__VUEPRESS_DEV__ && (import.meta.webpackHot || import.meta.hot)) {
-  __VUE_HMR_RUNTIME__.updatePageData = (data) => {
-    pagesData.value[data.key] = () => Promise.resolve(data);
-    if (data.key === pageData.value.key) {
-      pageData.value = data;
-    }
-  };
-}
+var usePageData = () => {
+  const pageData = inject2(pageDataSymbol);
+  if (!pageData) {
+    throw new Error("pageData() is called without provider.");
+  }
+  return pageData;
+};
 
 // src/composables/pageFrontmatter.ts
-import { inject as inject2 } from "vue";
+import { inject as inject3 } from "vue";
 var pageFrontmatterSymbol = Symbol(
   __VUEPRESS_DEV__ ? "pageFrontmatter" : ""
 );
 var usePageFrontmatter = () => {
-  const pageFrontmatter = inject2(pageFrontmatterSymbol);
+  const pageFrontmatter = inject3(pageFrontmatterSymbol);
   if (!pageFrontmatter) {
     throw new Error("usePageFrontmatter() is called without provider.");
   }
@@ -52,12 +46,12 @@ var usePageFrontmatter = () => {
 };
 
 // src/composables/pageHead.ts
-import { inject as inject3 } from "vue";
+import { inject as inject4 } from "vue";
 var pageHeadSymbol = Symbol(
   __VUEPRESS_DEV__ ? "pageHead" : ""
 );
 var usePageHead = () => {
-  const pageHead = inject3(pageHeadSymbol);
+  const pageHead = inject4(pageHeadSymbol);
   if (!pageHead) {
     throw new Error("usePageHead() is called without provider.");
   }
@@ -65,12 +59,12 @@ var usePageHead = () => {
 };
 
 // src/composables/pageHeadTitle.ts
-import { inject as inject4 } from "vue";
+import { inject as inject5 } from "vue";
 var pageHeadTitleSymbol = Symbol(
   __VUEPRESS_DEV__ ? "pageHeadTitle" : ""
 );
 var usePageHeadTitle = () => {
-  const pageHeadTitle = inject4(pageHeadTitleSymbol);
+  const pageHeadTitle = inject5(pageHeadTitleSymbol);
   if (!pageHeadTitle) {
     throw new Error("usePageHeadTitle() is called without provider.");
   }
@@ -78,12 +72,12 @@ var usePageHeadTitle = () => {
 };
 
 // src/composables/pageLang.ts
-import { inject as inject5 } from "vue";
+import { inject as inject6 } from "vue";
 var pageLangSymbol = Symbol(
   __VUEPRESS_DEV__ ? "pageLang" : ""
 );
 var usePageLang = () => {
-  const pageLang = inject5(pageLangSymbol);
+  const pageLang = inject6(pageLangSymbol);
   if (!pageLang) {
     throw new Error("usePageLang() is called without provider.");
   }
@@ -92,26 +86,32 @@ var usePageLang = () => {
 
 // src/composables/pageLayout.ts
 import {
-  inject as inject6
+  inject as inject7
 } from "vue";
 var pageLayoutSymbol = Symbol(
   __VUEPRESS_DEV__ ? "pageLayout" : ""
 );
 var usePageLayout = () => {
-  const pageLayout = inject6(pageLayoutSymbol);
+  const pageLayout = inject7(pageLayoutSymbol);
   if (!pageLayout) {
     throw new Error("usePageLayout() is called without provider.");
   }
   return pageLayout;
 };
 
+// src/composables/pagesData.ts
+import { pagesData as pagesDataRaw } from "@internal/pagesData";
+import { ref } from "vue";
+var pagesData = ref(pagesDataRaw);
+var usePagesData = () => pagesData;
+
 // src/composables/routeLocale.ts
-import { inject as inject7 } from "vue";
+import { inject as inject8 } from "vue";
 var routeLocaleSymbol = Symbol(
   __VUEPRESS_DEV__ ? "routeLocale" : ""
 );
 var useRouteLocale = () => {
-  const routeLocale = inject7(routeLocaleSymbol);
+  const routeLocale = inject8(routeLocaleSymbol);
   if (!routeLocale) {
     throw new Error("useRouteLocale() is called without provider.");
   }
@@ -120,8 +120,8 @@ var useRouteLocale = () => {
 
 // src/composables/siteData.ts
 import { siteData as siteDataRaw } from "@internal/siteData";
-import { ref as ref3 } from "vue";
-var siteData = ref3(siteDataRaw);
+import { ref as ref2 } from "vue";
+var siteData = ref2(siteDataRaw);
 var useSiteData = () => siteData;
 if (__VUEPRESS_DEV__ && (import.meta.webpackHot || import.meta.hot)) {
   __VUE_HMR_RUNTIME__.updateSiteData = (data) => {
@@ -130,12 +130,12 @@ if (__VUEPRESS_DEV__ && (import.meta.webpackHot || import.meta.hot)) {
 }
 
 // src/composables/siteLocaleData.ts
-import { inject as inject8 } from "vue";
+import { inject as inject9 } from "vue";
 var siteLocaleDataSymbol = Symbol(
   __VUEPRESS_DEV__ ? "siteLocaleData" : ""
 );
 var useSiteLocaleData = () => {
-  const siteLocaleData = inject8(siteLocaleDataSymbol);
+  const siteLocaleData = inject9(siteLocaleDataSymbol);
   if (!siteLocaleData) {
     throw new Error("useSiteLocaleData() is called without provider.");
   }
@@ -143,12 +143,12 @@ var useSiteLocaleData = () => {
 };
 
 // src/composables/updateHead.ts
-import { inject as inject9 } from "vue";
+import { inject as inject10 } from "vue";
 var updateHeadSymbol = Symbol(
   __VUEPRESS_DEV__ ? "updateHead" : ""
 );
 var useUpdateHead = () => {
-  const updateHead = inject9(updateHeadSymbol);
+  const updateHead = inject10(updateHeadSymbol);
   if (!updateHead) {
     throw new Error("useUpdateHead() is called without provider.");
   }
@@ -185,13 +185,13 @@ var resolvers = reactive({
    */
   resolvePageData: async (pageKey) => {
     const pageDataResolver = pagesData.value[pageKey];
-    const pageData2 = await pageDataResolver?.();
-    return pageData2 ?? pageDataEmpty;
+    const pageData = await pageDataResolver?.();
+    return pageData ?? pageDataEmpty;
   },
   /**
    * Resolve page frontmatter from page data
    */
-  resolvePageFrontmatter: (pageData2) => pageData2.frontmatter,
+  resolvePageFrontmatter: (pageData) => pageData.frontmatter,
   /**
    * Merge the head config in frontmatter and site locale
    *
@@ -252,11 +252,11 @@ var resolvers = reactive({
 });
 
 // src/components/ClientOnly.ts
-import { defineComponent, onMounted, ref as ref4 } from "vue";
+import { defineComponent, onMounted, ref as ref3 } from "vue";
 var ClientOnly = defineComponent({
   name: "ClientOnly",
   setup(_, ctx) {
-    const isMounted = ref4(false);
+    const isMounted = ref3(false);
     onMounted(() => {
       isMounted.value = true;
     });
@@ -309,10 +309,8 @@ var withBase = (url) => {
 export {
   layoutsSymbol,
   useLayouts,
-  pagesData,
-  usePagesData,
+  pageDataSymbol,
   pageDataEmpty,
-  pageData,
   usePageData,
   pageFrontmatterSymbol,
   usePageFrontmatter,
@@ -324,6 +322,8 @@ export {
   usePageLang,
   pageLayoutSymbol,
   usePageLayout,
+  pagesData,
+  usePagesData,
   routeLocaleSymbol,
   useRouteLocale,
   siteData,

package/dist/index.d.ts

@@ -88,13 +88,13 @@ declare const useLayouts: () => LayoutsRef;
  */
 type PageDataRef<T extends Record<any, any> = Record<never, never>> = Ref<PageData<T>>;
 /**
- * Empty page data to be used as the fallback value
+ * Injection key for page data
  */
-declare const pageDataEmpty: PageData;
+declare const pageDataSymbol: InjectionKey<PageDataRef>;
 /**
- * Global page data ref
+ * Empty page data to be used as the fallback value
  */
-declare const pageData: PageDataRef;
+declare const pageDataEmpty: PageData;
 /**
  * Returns the ref of the data of current page
  */
@@ -284,4 +284,4 @@ declare const resolvers: {
     resolveSiteLocaleData: (site: SiteData, routeLocale: RouteLocale) => SiteLocaleData;
 };
 
-export { ClientConfig, ClientOnly, Content, CreateVueAppFunction, Layouts, LayoutsRef, PageDataRef, PageFrontmatterRef, PageHead, PageHeadRef, PageHeadTitle, PageHeadTitleRef, PageLang, PageLangRef, PageLayoutRef, PageRouteItem, PagesData, PagesDataRef, RouteLocale, RouteLocaleRef, SiteDataRef, SiteLocaleData, SiteLocaleDataRef, UpdateHead, defineClientConfig, layoutsSymbol, pageData, pageDataEmpty, pageFrontmatterSymbol, pageHeadSymbol, pageHeadTitleSymbol, pageLangSymbol, pageLayoutSymbol, pagesData, resolvers, routeLocaleSymbol, siteData, siteLocaleDataSymbol, updateHeadSymbol, useLayouts, usePageData, usePageFrontmatter, usePageHead, usePageHeadTitle, usePageLang, usePageLayout, usePagesData, useRouteLocale, useSiteData, useSiteLocaleData, useUpdateHead, withBase };
+export { ClientConfig, ClientOnly, Content, CreateVueAppFunction, Layouts, LayoutsRef, PageDataRef, PageFrontmatterRef, PageHead, PageHeadRef, PageHeadTitle, PageHeadTitleRef, PageLang, PageLangRef, PageLayoutRef, PageRouteItem, PagesData, PagesDataRef, RouteLocale, RouteLocaleRef, SiteDataRef, SiteLocaleData, SiteLocaleDataRef, UpdateHead, defineClientConfig, layoutsSymbol, pageDataEmpty, pageDataSymbol, pageFrontmatterSymbol, pageHeadSymbol, pageHeadTitleSymbol, pageLangSymbol, pageLayoutSymbol, pagesData, resolvers, routeLocaleSymbol, siteData, siteLocaleDataSymbol, updateHeadSymbol, useLayouts, usePageData, usePageFrontmatter, usePageHead, usePageHeadTitle, usePageLang, usePageLayout, usePagesData, useRouteLocale, useSiteData, useSiteLocaleData, useUpdateHead, withBase };

package/dist/index.js

@@ -3,8 +3,8 @@ import {
   Content,
   defineClientConfig,
   layoutsSymbol,
-  pageData,
   pageDataEmpty,
+  pageDataSymbol,
   pageFrontmatterSymbol,
   pageHeadSymbol,
   pageHeadTitleSymbol,
@@ -29,14 +29,14 @@ import {
   useSiteLocaleData,
   useUpdateHead,
   withBase
-} from "./chunk-IKARB3UY.js";
+} from "./chunk-WOIWBUXI.js";
 export {
   ClientOnly,
   Content,
   defineClientConfig,
   layoutsSymbol,
-  pageData,
   pageDataEmpty,
+  pageDataSymbol,
   pageFrontmatterSymbol,
   pageHeadSymbol,
   pageHeadTitleSymbol,

package/package.json

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