@vuepress/client 2.0.0-rc.2 → 2.0.0-rc.21

package/README.md

@@ -5,7 +5,7 @@
 
 ## Documentation
 
-https://v2.vuepress.vuejs.org
+https://vuepress.vuejs.org
 
 ## License
 

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

@@ -1,114 +1,75 @@
 import {
   ClientOnly,
   Content,
-  layoutsSymbol,
-  pageDataSymbol,
-  pageFrontmatterSymbol,
-  pageHeadSymbol,
-  pageHeadTitleSymbol,
-  pageLangSymbol,
-  pageLayoutSymbol,
-  pagesData,
+  RouteLink,
+  clientDataSymbol,
+  redirects,
+  resolveRoute,
   resolvers,
-  routeLocaleSymbol,
-  siteData,
-  siteLocaleDataSymbol,
+  routes,
   updateHeadSymbol,
   usePageHead,
   usePageLang,
   usePageLayout,
   withBase
-} from "./chunk-PEQEPZ75.js";
+} from "./chunk-XDHI2EHH.js";
+import "./chunk-MLKGABMK.js";
 
 // src/app.ts
 import { clientConfigs } from "@internal/clientConfigs";
-import { createApp, createSSRApp, h as h2 } from "vue";
-import { RouterView } from "vue-router";
+import { createApp, createSSRApp, h } from "vue";
 
-// src/router.ts
-import { pagesComponents } from "@internal/pagesComponents";
+// src/internal/siteData.ts
+import { siteData as siteDataRaw } from "@internal/siteData";
+import { shallowRef } from "vue";
+var siteData = shallowRef(siteDataRaw);
+if (__VUEPRESS_DEV__ && (import.meta.webpackHot || import.meta.hot)) {
+  __VUE_HMR_RUNTIME__.updateSiteData = (data) => {
+    siteData.value = data;
+  };
+}
+
+// src/router/createVueRouter.ts
 import { removeEndingSlash } from "@vuepress/shared";
 import {
+  START_LOCATION,
   createMemoryHistory,
   createRouter,
-  createWebHistory,
-  START_LOCATION
+  createWebHistory
 } from "vue-router";
-
-// src/routes.ts
-import { pagesRoutes } from "@internal/pagesRoutes";
-
-// src/components/Vuepress.ts
-import { defineComponent, h } from "vue";
-var Vuepress = defineComponent({
-  name: "Vuepress",
-  setup() {
-    const layout = usePageLayout();
-    return () => h(layout.value);
-  }
-});
-
-// src/routes.ts
-var createRoutes = () => pagesRoutes.reduce(
-  (result, [name, path, meta, redirects]) => {
-    result.push(
-      {
-        name,
-        path,
-        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 === ":md" ? (
-          // redirect from `/foo.md` to `/foo.html`
-          path.substring(0, path.length - 5) + ".md"
-        ) : item,
-        redirect: path
-      }))
-    );
-    return result;
-  },
-  [
-    {
-      name: "404",
-      path: "/:catchAll(.*)",
-      component: Vuepress
-    }
-  ]
-);
-
-// src/router.ts
 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) => {
-      if (savedPosition)
-        return savedPosition;
-      if (to.hash)
-        return { el: to.hash };
+    routes: [
+      {
+        name: "vuepress-route",
+        path: "/:catchAll(.*)",
+        components: {}
+      }
+    ],
+    scrollBehavior: (to, _from, savedPosition) => {
+      if (savedPosition) return savedPosition;
+      if (to.hash) return { el: to.hash };
       return { top: 0 };
     }
   });
   router.beforeResolve(async (to, from) => {
     if (to.path !== from.path || from === START_LOCATION) {
-      ;
-      [to.meta._data] = await Promise.all([
-        resolvers.resolvePageData(to.name),
-        pagesComponents[to.name]?.__asyncLoader()
-      ]);
+      const route = resolveRoute(to.fullPath);
+      if (route.path !== to.fullPath) {
+        return route.path;
+      }
+      const pageChunk = await route.loader();
+      to.meta = {
+        // attach route meta
+        ...route.meta,
+        // attach page chunk route meta
+        _pageChunk: pageChunk
+      };
+    } else if (to.path === from.path) {
+      to.meta = from.meta;
     }
   });
   return router;
@@ -118,23 +79,30 @@ var createVueRouter = () => {
 var setupGlobalComponents = (app) => {
   app.component("ClientOnly", ClientOnly);
   app.component("Content", Content);
+  app.component("RouteLink", RouteLink);
 };
 
 // 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 pageData = computedWithControl(
-    routePath,
-    () => router.currentRoute.value.meta._data
-  );
+  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 = (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();
+    __VUE_HMR_RUNTIME__.updatePageData = async (newPageData) => {
+      const oldPageChunk = await routes.value[newPageData.path].loader();
+      const newPageChunk = { comp: oldPageChunk.comp, data: newPageData };
+      routes.value[newPageData.path].loader = async () => Promise.resolve(newPageChunk);
+      if (newPageData.path === router.currentRoute.value.meta._pageChunk?.data.path) {
+        pageChunk.value = newPageChunk;
       }
     };
   }
@@ -145,9 +113,9 @@ var setupGlobalComputed = (app, router, clientConfigs2) => {
   const siteLocaleData = computed(
     () => resolvers.resolveSiteLocaleData(siteData.value, routeLocale.value)
   );
-  const pageFrontmatter = computed(
-    () => resolvers.resolvePageFrontmatter(pageData.value)
-  );
+  const pageComponent = computed(() => pageChunk.value.comp);
+  const pageData = computed(() => pageChunk.value.data);
+  const pageFrontmatter = computed(() => pageData.value.frontmatter);
   const pageHeadTitle = computed(
     () => resolvers.resolvePageHeadTitle(pageData.value, siteLocaleData.value)
   );
@@ -164,43 +132,86 @@ var setupGlobalComputed = (app, router, clientConfigs2) => {
   const pageLayout = computed(
     () => 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);
-  app.provide(pageLangSymbol, pageLang);
-  app.provide(pageLayoutSymbol, pageLayout);
-  app.provide(routeLocaleSymbol, routeLocale);
-  app.provide(siteLocaleDataSymbol, siteLocaleData);
-  Object.defineProperties(app.config.globalProperties, {
-    $frontmatter: { get: () => pageFrontmatter.value },
-    $head: { get: () => pageHead.value },
-    $headTitle: { get: () => pageHeadTitle.value },
-    $lang: { get: () => pageLang.value },
-    $page: { get: () => pageData.value },
-    $routeLocale: { get: () => routeLocale.value },
-    $site: { get: () => siteData.value },
-    $siteLocale: { get: () => siteLocaleData.value },
-    $withBase: { get: () => withBase }
-  });
-  return {
+  const clientData = {
     layouts,
     pageData,
+    pageComponent,
     pageFrontmatter,
     pageHead,
     pageHeadTitle,
     pageLang,
     pageLayout,
+    redirects,
     routeLocale,
+    routePath,
+    routes,
     siteData,
     siteLocaleData
   };
+  app.provide(clientDataSymbol, clientData);
+  Object.defineProperties(app.config.globalProperties, {
+    $frontmatter: { get: () => pageFrontmatter.value },
+    $head: { get: () => pageHead.value },
+    $headTitle: { get: () => pageHeadTitle.value },
+    $lang: { get: () => pageLang.value },
+    $page: { get: () => pageData.value },
+    $routeLocale: { get: () => routeLocale.value },
+    $site: { get: () => siteData.value },
+    $siteLocale: { get: () => siteLocaleData.value },
+    $withBase: { get: () => withBase }
+  });
+  return clientData;
 };
 
 // src/setupUpdateHead.ts
 import { isPlainObject, isString } from "@vuepress/shared";
 import { onMounted, provide, useSSRContext, watch } from "vue";
+var queryHeadElement = ([
+  tagName,
+  attrs,
+  content = ""
+]) => {
+  const attrsSelector = Object.entries(attrs).map(([key, value]) => {
+    if (isString(value)) {
+      return `[${key}=${JSON.stringify(value)}]`;
+    }
+    if (value) {
+      return `[${key}]`;
+    }
+    return "";
+  }).join("");
+  const selector = `head > ${tagName}${attrsSelector}`;
+  const headElements = Array.from(
+    document.querySelectorAll(selector)
+  );
+  const matchedHeadElement = headElements.find(
+    (item) => item.innerText === content
+  );
+  return matchedHeadElement ?? null;
+};
+var createHeadElement = ([
+  tagName,
+  attrs,
+  content
+]) => {
+  if (!isString(tagName)) {
+    return null;
+  }
+  const headElement = document.createElement(tagName);
+  if (isPlainObject(attrs)) {
+    Object.entries(attrs).forEach(([key, value]) => {
+      if (isString(value)) {
+        headElement.setAttribute(key, value);
+      } else if (value) {
+        headElement.setAttribute(key, "");
+      }
+    });
+  }
+  if (isString(content)) {
+    headElement.appendChild(document.createTextNode(content));
+  }
+  return headElement;
+};
 var setupUpdateHead = () => {
   const head = usePageHead();
   const lang = usePageLang();
@@ -260,76 +271,29 @@ var setupUpdateHead = () => {
     watch(head, updateHead, { immediate: __VUEPRESS_DEV__ });
   });
 };
-var queryHeadElement = ([
-  tagName,
-  attrs,
-  content = ""
-]) => {
-  const attrsSelector = Object.entries(attrs).map(([key, value]) => {
-    if (isString(value)) {
-      return `[${key}=${JSON.stringify(value)}]`;
-    }
-    if (value === true) {
-      return `[${key}]`;
-    }
-    return "";
-  }).join("");
-  const selector = `head > ${tagName}${attrsSelector}`;
-  const headElements = Array.from(
-    document.querySelectorAll(selector)
-  );
-  const matchedHeadElement = headElements.find(
-    (item) => item.innerText === content
-  );
-  return matchedHeadElement || null;
-};
-var createHeadElement = ([
-  tagName,
-  attrs,
-  content
-]) => {
-  if (!isString(tagName)) {
-    return null;
-  }
-  const headElement = document.createElement(tagName);
-  if (isPlainObject(attrs)) {
-    Object.entries(attrs).forEach(([key, value]) => {
-      if (isString(value)) {
-        headElement.setAttribute(key, value);
-      } else if (value === true) {
-        headElement.setAttribute(key, "");
-      }
-    });
-  }
-  if (isString(content)) {
-    headElement.appendChild(document.createTextNode(content));
-  }
-  return headElement;
-};
 
 // src/app.ts
 var appCreator = __VUEPRESS_DEV__ ? createApp : createSSRApp;
 var createVueApp = async () => {
   const app = appCreator({
-    name: "VuepressApp",
+    name: "Vuepress",
     setup() {
       setupUpdateHead();
       for (const clientConfig of clientConfigs) {
         clientConfig.setup?.();
       }
-      return () => [
-        h2(RouterView),
-        ...clientConfigs.flatMap(
-          ({ rootComponents = [] }) => rootComponents.map((component) => h2(component))
-        )
-      ];
+      const clientRootComponents = clientConfigs.flatMap(
+        ({ rootComponents = [] }) => rootComponents.map((component) => h(component))
+      );
+      const pageLayout = usePageLayout();
+      return () => [h(pageLayout.value), clientRootComponents];
     }
   });
   const router = createVueRouter();
   setupGlobalComponents(app);
   const globalComputed = setupGlobalComputed(app, router, clientConfigs);
   if (__VUEPRESS_DEV__ || __VUE_PROD_DEVTOOLS__) {
-    const { setupDevtools } = await import("./setupDevtools-X4YFRK4B.js");
+    const { setupDevtools } = await import("./setupDevtools-QXEOFQJV.js");
     setupDevtools(app, globalComputed);
   }
   for (const clientConfig of clientConfigs) {
@@ -342,8 +306,8 @@ var createVueApp = async () => {
   };
 };
 if (!__VUEPRESS_SSR__) {
-  createVueApp().then(({ app, router }) => {
-    router.isReady().then(() => {
+  void createVueApp().then(({ app, router }) => {
+    void router.isReady().then(() => {
       app.mount("#app");
     });
   });

package/dist/chunk-MLKGABMK.js

@@ -0,0 +1,9 @@
+var __defProp = Object.defineProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+
+export {
+  __export
+};