@vuepress/client 2.0.0-beta.43 → 2.0.0-beta.46

package/dist/app.js

@@ -14,12 +14,10 @@ import {
   usePageHead,
   usePageLang,
   withBase
-} from "./chunk-RTLFYRTT.js";
+} from "./chunk-HEGD2UVF.js";
 
 // src/app.ts
-import { clientAppEnhances } from "@internal/clientAppEnhances";
-import { clientAppRootComponents } from "@internal/clientAppRootComponents";
-import { clientAppSetups } from "@internal/clientAppSetups";
+import { clientConfigs } from "@internal/clientConfigs";
 import { createApp, createSSRApp, h } from "vue";
 import { RouterView } from "vue-router";
 
@@ -223,12 +221,12 @@ var createVueApp = async () => {
     name: "VuepressApp",
     setup() {
       setupUpdateHead();
-      for (const clientAppSetup of clientAppSetups) {
-        clientAppSetup();
+      for (const clientConfig of clientConfigs) {
+        clientConfig.setup?.();
       }
       return () => [
         h(RouterView),
-        ...clientAppRootComponents.map((comp) => h(comp))
+        ...clientConfigs.flatMap(({ rootComponents = [] }) => rootComponents.map((component) => h(component)))
       ];
     }
   });
@@ -238,8 +236,8 @@ var createVueApp = async () => {
   if (__VUEPRESS_DEV__ || __VUE_PROD_DEVTOOLS__) {
     setupDevtools(app, globalComputed);
   }
-  for (const clientAppEnhance of clientAppEnhances) {
-    await clientAppEnhance({ app, router, siteData });
+  for (const clientConfig of clientConfigs) {
+    await clientConfig.enhance?.({ app, router, siteData });
   }
   app.use(router);
   return {

package/dist/{chunk-RTLFYRTT.js → chunk-HEGD2UVF.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,7 +1,7 @@
 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, FunctionalComponent } from 'vue';
+import { Ref, ComputedRef, InjectionKey, App, ComponentOptions } from 'vue';
 import { Router } from 'vue-router';
 export { C as CreateVueAppFunction } from './createVueAppFunction-c8e67ca1.js';
 
@@ -166,13 +166,28 @@ declare const updateHeadSymbol: InjectionKey<UpdateHead>;
  */
 declare const useUpdateHead: () => UpdateHead;
 
-declare type ClientAppEnhance = (context: {
-    app: App;
-    router: Router;
-    siteData: SiteDataRef;
-}) => void | Promise<void>;
-
-declare type ClientAppSetup = () => void;
+/**
+ * Configure vuepress client
+ */
+interface ClientConfig {
+    /**
+     * An enhance function to be called after vue app instance and
+     * vue-router instance has been created
+     */
+    enhance?: (context: {
+        app: App;
+        router: Router;
+        siteData: SiteDataRef;
+    }) => void | Promise<void>;
+    /**
+     * A function to be called inside the setup function of vue app
+     */
+    setup?: () => void;
+    /**
+     * Components to be placed directly into the root node of vue app
+     */
+    rootComponents?: ComponentOptions[];
+}
 
 declare const ClientOnly: vue.DefineComponent<{}, () => vue.VNode<vue.RendererNode, vue.RendererElement, {
     [key: string]: any;
@@ -181,8 +196,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;
 }>;
 
 /**
@@ -192,9 +221,10 @@ declare const Vuepress: vue.DefineComponent<{}, () => vue.VNode<vue.RendererNode
     [key: string]: any;
 }>, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, vue.EmitsOptions, string, vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps, Readonly<vue.ExtractPropTypes<{}>>, {}>;
 
-declare const defineClientAppEnhance: (clientAppEnhance: ClientAppEnhance) => ClientAppEnhance;
-
-declare const defineClientAppSetup: (clientAppSetup: ClientAppSetup) => ClientAppSetup;
+/**
+ * A helper function to help you define vuepress client config file
+ */
+declare const defineClientConfig: (clientConfig: ClientConfig) => ClientConfig;
 
 /**
  * Resolver methods to get global computed
@@ -216,4 +246,4 @@ declare const resolvers: {
  */
 declare const withBase: (url: string) => string;
 
-export { ClientAppEnhance, ClientAppSetup, ClientOnly, Content, PageDataRef, PageFrontmatterRef, PageHead, PageHeadRef, PageHeadTitle, PageHeadTitleRef, PageLang, PageLangRef, PagesData, PagesDataRef, RouteLocale, RouteLocaleRef, SiteDataRef, SiteLocaleData, SiteLocaleDataRef, UpdateHead, Vuepress, defineClientAppEnhance, defineClientAppSetup, 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, 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,19 +25,15 @@ import {
   useSiteLocaleData,
   useUpdateHead,
   withBase
-} from "./chunk-RTLFYRTT.js";
+} from "./chunk-HEGD2UVF.js";
 
-// src/helpers/defineClientAppEnhance.ts
-var defineClientAppEnhance = (clientAppEnhance) => clientAppEnhance;
-
-// src/helpers/defineClientAppSetup.ts
-var defineClientAppSetup = (clientAppSetup) => clientAppSetup;
+// src/helpers/defineClientConfig.ts
+var defineClientConfig = (clientConfig) => clientConfig;
 export {
   ClientOnly,
   Content,
   Vuepress,
-  defineClientAppEnhance,
-  defineClientAppSetup,
+  defineClientConfig,
   pageData,
   pageDataEmpty,
   pageFrontmatterSymbol,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/client",
-  "version": "2.0.0-beta.43",
+  "version": "2.0.0-beta.46",
   "description": "Client package of VuePress",
   "keywords": [
     "vuepress",
@@ -20,7 +20,6 @@
   "exports": {
     ".": "./dist/index.js",
     "./app": "./dist/app.js",
-    "./helpers": "./helpers/index.js",
     "./package.json": "./package.json",
     "./templates/*": "./templates/*",
     "./types": "./types.d.ts"
@@ -35,9 +34,9 @@
   ],
   "dependencies": {
     "@vue/devtools-api": "^6.1.4",
-    "@vuepress/shared": "2.0.0-beta.43",
-    "vue": "^3.2.33",
-    "vue-router": "^4.0.14"
+    "@vuepress/shared": "2.0.0-beta.46",
+    "vue": "^3.2.35",
+    "vue-router": "^4.0.15"
   },
   "publishConfig": {
     "access": "public"
@@ -52,9 +51,7 @@
       "src/index.ts"
     ],
     "external": [
-      "@internal/clientAppEnhances",
-      "@internal/clientAppRootComponents",
-      "@internal/clientAppSetups",
+      "@internal/clientConfigs",
       "@internal/layoutComponents",
       "@internal/pagesComponents",
       "@internal/pagesData",