@vuepress/client 2.0.0-beta.45 → 2.0.0-beta.48

package/dist/app.js

@@ -1,6 +1,7 @@
 import {
   ClientOnly,
   Content,
+  Vuepress,
   pageData,
   pageFrontmatterSymbol,
   pageHeadSymbol,
@@ -14,7 +15,7 @@ import {
   usePageHead,
   usePageLang,
   withBase
-} from "./chunk-RTLFYRTT.js";
+} from "./chunk-OOQFWU6B.js";
 
 // src/app.ts
 import { clientConfigs } from "@internal/clientConfigs";
@@ -23,7 +24,6 @@ import { RouterView } from "vue-router";
 
 // src/router.ts
 import { pagesComponents } from "@internal/pagesComponents";
-import { pagesRoutes } from "@internal/pagesRoutes";
 import { removeEndingSlash } from "@vuepress/shared";
 import {
   createMemoryHistory,
@@ -31,11 +31,34 @@ import {
   createWebHistory,
   START_LOCATION
 } from "vue-router";
+
+// src/routes.ts
+import { pagesRoutes } from "@internal/pagesRoutes";
+var createRoutes = () => pagesRoutes.reduce((result, [name, path, meta, redirects]) => {
+  result.push({
+    name,
+    path,
+    component: Vuepress,
+    meta
+  }, ...redirects.map((item) => ({
+    path: 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({
     history: historyCreator(removeEndingSlash(siteData.value.base)),
-    routes: pagesRoutes,
+    routes: createRoutes(),
     scrollBehavior: (to, from, savedPosition) => {
       if (savedPosition)
         return savedPosition;
@@ -58,6 +81,7 @@ var createVueRouter = () => {
 
 // src/setupDevtools.ts
 import { setupDevtoolsPlugin } from "@vue/devtools-api";
+var COMPONENT_STATE_TYPE = "VuePress";
 var setupDevtools = (app, globalComputed) => {
   setupDevtoolsPlugin({
     app,
@@ -66,11 +90,11 @@ var setupDevtools = (app, globalComputed) => {
     packageName: "@vuepress/client",
     homepage: "https://v2.vuepress.vuejs.org",
     logo: "https://v2.vuepress.vuejs.org/images/hero.png",
-    componentStateTypes: ["VuePress"]
+    componentStateTypes: [COMPONENT_STATE_TYPE]
   }, (api) => {
     api.on.inspectComponent((payload) => {
       payload.instanceData.state.push(...Object.entries(globalComputed).map(([name, item]) => ({
-        type: "VuePress",
+        type: COMPONENT_STATE_TYPE,
         key: name,
         editable: false,
         value: item.value

package/dist/{chunk-RTLFYRTT.js → chunk-OOQFWU6B.js}

@@ -151,6 +151,7 @@ var resolvers = reactive({
 // src/components/ClientOnly.ts
 import { defineComponent, onMounted, ref as ref4 } from "vue";
 var ClientOnly = defineComponent({
+  name: "ClientOnly",
   setup(_, ctx) {
     const isMounted = ref4(false);
     onMounted(() => {
@@ -162,38 +163,32 @@ var ClientOnly = defineComponent({
 
 // src/components/Content.ts
 import { pagesComponents } from "@internal/pagesComponents";
-import { h } from "vue";
-var Content = (props) => {
-  let key;
-  if (props.pageKey) {
-    key = props.pageKey;
-  } else {
+import { computed, defineComponent as defineComponent2, h } from "vue";
+var Content = defineComponent2({
+  name: "Content",
+  props: {
+    pageKey: {
+      type: String,
+      required: false,
+      default: ""
+    }
+  },
+  setup(props) {
     const page = usePageData();
-    key = page.value.key;
+    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");
   }
-  const component = pagesComponents[key];
-  if (component) {
-    return h(component);
-  }
-  return h("div", __VUEPRESS_DEV__ ? "Page does not exist. This is a fallback content." : "404 Not Found");
-};
-Content.displayName = "Content";
-Content.props = {
-  pageKey: {
-    type: String,
-    required: false
-  }
-};
+});
 
 // src/components/Vuepress.ts
 import { layoutComponents } from "@internal/layoutComponents";
 import { isString as isString2 } from "@vuepress/shared";
-import { computed, defineComponent as defineComponent2, h as h2, resolveComponent } from "vue";
-var Vuepress = defineComponent2({
+import { computed as computed2, defineComponent as defineComponent3, h as h2, resolveComponent } from "vue";
+var Vuepress = defineComponent3({
   name: "Vuepress",
   setup() {
     const page = usePageData();
-    const layoutComponent = computed(() => {
+    const layoutComponent = computed2(() => {
       let layoutName;
       if (page.value.path) {
         const frontmatterLayout = page.value.frontmatter.layout;

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import { PageData, PageFrontmatter, HeadConfig, SiteData } from '@vuepress/shared';
 export { PageData, PageFrontmatter, PageHeader, SiteData } from '@vuepress/shared';
 import * as vue from 'vue';
-import { Ref, ComputedRef, InjectionKey, App, ComponentOptions, FunctionalComponent } from 'vue';
-import { Router } from 'vue-router';
+import { Ref, ComputedRef, InjectionKey, App, Component } from 'vue';
+import { Router, RouteMeta } from 'vue-router';
 export { C as CreateVueAppFunction } from './createVueAppFunction-c8e67ca1.js';
 
 /**
@@ -186,9 +186,16 @@ interface ClientConfig {
     /**
      * Components to be placed directly into the root node of vue app
      */
-    rootComponents?: ComponentOptions[];
+    rootComponents?: Component[];
 }
 
+declare type PageRouteItem = [
+    name: string,
+    path: string,
+    meta: RouteMeta,
+    redirects: string[]
+];
+
 declare const ClientOnly: vue.DefineComponent<{}, () => vue.VNode<vue.RendererNode, vue.RendererElement, {
     [key: string]: any;
 }>[] | null | undefined, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, vue.EmitsOptions, string, vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps, Readonly<vue.ExtractPropTypes<{}>>, {}>;
@@ -196,8 +203,22 @@ declare const ClientOnly: vue.DefineComponent<{}, () => vue.VNode<vue.RendererNo
 /**
  * Markdown rendered content
  */
-declare const Content: FunctionalComponent<{
-    pageKey?: string;
+declare const Content: vue.DefineComponent<{
+    pageKey: {
+        type: StringConstructor;
+        required: false;
+        default: string;
+    };
+}, () => vue.VNode<vue.RendererNode, vue.RendererElement, {
+    [key: string]: any;
+}>, unknown, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, Record<string, any>, string, vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps, Readonly<vue.ExtractPropTypes<{
+    pageKey: {
+        type: StringConstructor;
+        required: false;
+        default: string;
+    };
+}>>, {
+    pageKey: string;
 }>;
 
 /**
@@ -232,4 +253,4 @@ declare const resolvers: {
  */
 declare const withBase: (url: string) => string;
 
-export { ClientConfig, ClientOnly, Content, PageDataRef, PageFrontmatterRef, PageHead, PageHeadRef, PageHeadTitle, PageHeadTitleRef, PageLang, PageLangRef, PagesData, PagesDataRef, RouteLocale, RouteLocaleRef, SiteDataRef, SiteLocaleData, SiteLocaleDataRef, UpdateHead, Vuepress, defineClientConfig, pageData, pageDataEmpty, pageFrontmatterSymbol, pageHeadSymbol, pageHeadTitleSymbol, pageLangSymbol, pagesData, resolvers, routeLocaleSymbol, siteData, siteLocaleDataSymbol, updateHeadSymbol, usePageData, usePageFrontmatter, usePageHead, usePageHeadTitle, usePageLang, usePagesData, useRouteLocale, useSiteData, useSiteLocaleData, useUpdateHead, withBase };
+export { ClientConfig, ClientOnly, Content, PageDataRef, PageFrontmatterRef, PageHead, PageHeadRef, PageHeadTitle, PageHeadTitleRef, PageLang, PageLangRef, PageRouteItem, PagesData, PagesDataRef, RouteLocale, RouteLocaleRef, SiteDataRef, SiteLocaleData, SiteLocaleDataRef, UpdateHead, Vuepress, defineClientConfig, pageData, pageDataEmpty, pageFrontmatterSymbol, pageHeadSymbol, pageHeadTitleSymbol, pageLangSymbol, pagesData, resolvers, routeLocaleSymbol, siteData, siteLocaleDataSymbol, updateHeadSymbol, usePageData, usePageFrontmatter, usePageHead, usePageHeadTitle, usePageLang, usePagesData, useRouteLocale, useSiteData, useSiteLocaleData, useUpdateHead, withBase };

package/dist/index.js

@@ -25,7 +25,7 @@ import {
   useSiteLocaleData,
   useUpdateHead,
   withBase
-} from "./chunk-RTLFYRTT.js";
+} from "./chunk-OOQFWU6B.js";
 
 // src/helpers/defineClientConfig.ts
 var defineClientConfig = (clientConfig) => clientConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/client",
-  "version": "2.0.0-beta.45",
+  "version": "2.0.0-beta.48",
   "description": "Client package of VuePress",
   "keywords": [
     "vuepress",
@@ -34,8 +34,8 @@
   ],
   "dependencies": {
     "@vue/devtools-api": "^6.1.4",
-    "@vuepress/shared": "2.0.0-beta.45",
-    "vue": "^3.2.33",
+    "@vuepress/shared": "2.0.0-beta.48",
+    "vue": "^3.2.36",
     "vue-router": "^4.0.15"
   },
   "publishConfig": {