@vuepress/client 2.0.0-beta.52 → 2.0.0-beta.54

package/dist/app.js

@@ -1,7 +1,6 @@
 import {
   ClientOnly,
   Content,
-  Vuepress,
   pageData,
   pageFrontmatterSymbol,
   pageHeadSymbol,
@@ -12,14 +11,14 @@ import {
   siteData,
   siteLocaleDataSymbol,
   updateHeadSymbol,
+  usePageData,
   usePageHead,
   usePageLang,
   withBase
-} from "./chunk-X6HE2CCA.js";
+} from "./chunk-YRWD2ESJ.js";
 
 // src/app.ts
-import { clientConfigs } from "@internal/clientConfigs";
-import { createApp, createSSRApp, h } from "vue";
+import { createApp, createSSRApp, h as h2 } from "vue";
 import { RouterView } from "vue-router";
 
 // src/router.ts
@@ -34,37 +33,80 @@ import {
 
 // 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/components/Vuepress.ts
+import { isString } from "@vuepress/shared";
+import { computed, defineComponent, h } from "vue";
+var LAYOUT_NAME_DEFAULT = "Layout";
+var LAYOUT_NAME_NOT_FOUND = "NotFound";
+var createVuepressComponent = async () => {
+  const { clientConfigs } = await import("@internal/clientConfigs");
+  const layouts = clientConfigs.reduce(
+    (prev, item) => ({
+      ...prev,
+      ...item.layouts
+    }),
+    {}
+  );
+  const Vuepress = defineComponent({
+    name: "Vuepress",
+    setup() {
+      const page = usePageData();
+      const layoutComponent = computed(() => {
+        let layoutName;
+        if (page.value.path) {
+          const frontmatterLayout = page.value.frontmatter.layout;
+          if (isString(frontmatterLayout)) {
+            layoutName = frontmatterLayout;
+          } else {
+            layoutName = LAYOUT_NAME_DEFAULT;
+          }
+        } else {
+          layoutName = LAYOUT_NAME_NOT_FOUND;
+        }
+        return layouts[layoutName];
+      });
+      return () => h(layoutComponent.value);
     }
-  ]
-);
+  });
+  return Vuepress;
+};
+
+// src/routes.ts
+var createRoutes = async () => {
+  const Vuepress = await createVuepressComponent();
+  return 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 = () => {
+var createVueRouter = async () => {
   const router = createRouter({
     history: historyCreator(removeEndingSlash(siteData.value.base)),
-    routes: createRoutes(),
+    routes: await createRoutes(),
     scrollBehavior: (to, from, savedPosition) => {
       if (savedPosition)
         return savedPosition;
@@ -92,31 +134,31 @@ var setupGlobalComponents = (app) => {
 };
 
 // src/setupGlobalComputed.ts
-import { computed } from "vue";
+import { computed as computed2 } from "vue";
 var setupGlobalComputed = (app, router) => {
-  const routeLocale = computed(
+  const routeLocale = computed2(
     () => resolvers.resolveRouteLocale(
       siteData.value.locales,
       router.currentRoute.value.path
     )
   );
-  const siteLocaleData = computed(
+  const siteLocaleData = computed2(
     () => resolvers.resolveSiteLocaleData(siteData.value, routeLocale.value)
   );
-  const pageFrontmatter = computed(
+  const pageFrontmatter = computed2(
     () => resolvers.resolvePageFrontmatter(pageData.value)
   );
-  const pageHeadTitle = computed(
+  const pageHeadTitle = computed2(
     () => resolvers.resolvePageHeadTitle(pageData.value, siteLocaleData.value)
   );
-  const pageHead = computed(
+  const pageHead = computed2(
     () => resolvers.resolvePageHead(
       pageHeadTitle.value,
       pageFrontmatter.value,
       siteLocaleData.value
     )
   );
-  const pageLang = computed(() => resolvers.resolvePageLang(pageData.value));
+  const pageLang = computed2(() => resolvers.resolvePageLang(pageData.value));
   app.provide(routeLocaleSymbol, routeLocale);
   app.provide(siteLocaleDataSymbol, siteLocaleData);
   app.provide(pageFrontmatterSymbol, pageFrontmatter);
@@ -147,7 +189,7 @@ var setupGlobalComputed = (app, router) => {
 };
 
 // src/setupUpdateHead.ts
-import { isPlainObject, isString } from "@vuepress/shared";
+import { isPlainObject, isString as isString2 } from "@vuepress/shared";
 import { onMounted, provide, ref, useSSRContext, watch } from "vue";
 import { useRoute } from "vue-router";
 var setupUpdateHead = () => {
@@ -203,8 +245,8 @@ var queryHeadTag = ([
   content = ""
 ]) => {
   const attrsSelector = Object.entries(attrs).map(([key, value]) => {
-    if (isString(value)) {
-      return `[${key}="${value}"]`;
+    if (isString2(value)) {
+      return `[${key}=${JSON.stringify(value)}]`;
     }
     if (value === true) {
       return `[${key}]`;
@@ -221,20 +263,20 @@ var createHeadTag = ([
   attrs,
   content
 ]) => {
-  if (!isString(tagName)) {
+  if (!isString2(tagName)) {
     return null;
   }
   const tag = document.createElement(tagName);
   if (isPlainObject(attrs)) {
     Object.entries(attrs).forEach(([key, value]) => {
-      if (isString(value)) {
+      if (isString2(value)) {
         tag.setAttribute(key, value);
       } else if (value === true) {
         tag.setAttribute(key, "");
       }
     });
   }
-  if (isString(content)) {
+  if (isString2(content)) {
     tag.appendChild(document.createTextNode(content));
   }
   return tag;
@@ -243,6 +285,7 @@ var createHeadTag = ([
 // src/app.ts
 var appCreator = __VUEPRESS_DEV__ ? createApp : createSSRApp;
 var createVueApp = async () => {
+  const { clientConfigs } = await import("@internal/clientConfigs");
   const app = appCreator({
     name: "VuepressApp",
     setup() {
@@ -251,14 +294,14 @@ var createVueApp = async () => {
         clientConfig.setup?.();
       }
       return () => [
-        h(RouterView),
+        h2(RouterView),
         ...clientConfigs.flatMap(
-          ({ rootComponents = [] }) => rootComponents.map((component) => h(component))
+          ({ rootComponents = [] }) => rootComponents.map((component) => h2(component))
         )
       ];
     }
   });
-  const router = createVueRouter();
+  const router = await createVueRouter();
   setupGlobalComponents(app);
   const globalComputed = setupGlobalComputed(app, router);
   if (__VUEPRESS_DEV__ || __VUE_PROD_DEVTOOLS__) {

package/dist/{chunk-X6HE2CCA.js → chunk-YRWD2ESJ.js}

@@ -199,41 +199,6 @@ var Content = defineComponent2({
   }
 });
 
-// src/components/Vuepress.ts
-import { clientConfigs } from "@internal/clientConfigs";
-import { isString as isString2 } from "@vuepress/shared";
-import { computed as computed2, defineComponent as defineComponent3, h as h2 } from "vue";
-var LAYOUT_NAME_DEFAULT = "Layout";
-var LAYOUT_NAME_NOT_FOUND = "NotFound";
-var layouts = clientConfigs.reduce(
-  (prev, item) => ({
-    ...prev,
-    ...item.layouts
-  }),
-  {}
-);
-var Vuepress = defineComponent3({
-  name: "Vuepress",
-  setup() {
-    const page = usePageData();
-    const layoutComponent = computed2(() => {
-      let layoutName;
-      if (page.value.path) {
-        const frontmatterLayout = page.value.frontmatter.layout;
-        if (isString2(frontmatterLayout)) {
-          layoutName = frontmatterLayout;
-        } else {
-          layoutName = LAYOUT_NAME_DEFAULT;
-        }
-      } else {
-        layoutName = LAYOUT_NAME_NOT_FOUND;
-      }
-      return layouts[layoutName];
-    });
-    return () => h2(layoutComponent.value);
-  }
-});
-
 // src/withBase.ts
 import { isLinkHttp, removeLeadingSlash } from "@vuepress/shared";
 var withBase = (url) => {
@@ -268,6 +233,5 @@ export {
   resolvers,
   ClientOnly,
   Content,
-  Vuepress,
   withBase
 };

package/dist/index.d.ts

@@ -29,17 +29,10 @@ declare const Content: vue.DefineComponent<{
     pageKey: string;
 }>;
 
-/**
- * Global Layout
- */
-declare const Vuepress: vue.DefineComponent<{}, () => vue.VNode<vue.RendererNode, vue.RendererElement, {
-    [key: string]: any;
-}>, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, string, vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps, Readonly<vue.ExtractPropTypes<{}>>, {}>;
-
 /**
  * Ref wrapper of `PageData`
  */
-declare type PageDataRef<T extends Record<any, any> = Record<never, never>> = Ref<PageData<T>>;
+type PageDataRef<T extends Record<any, any> = Record<never, never>> = Ref<PageData<T>>;
 /**
  * Empty page data to be used as the fallback value
  */
@@ -56,7 +49,7 @@ declare const usePageData: <T extends Record<any, any> = Record<never, never>>()
 /**
  * Ref wrapper of `PageFrontmatter`
  */
-declare type PageFrontmatterRef<T extends Record<any, any> = Record<string, unknown>> = ComputedRef<PageFrontmatter<T>>;
+type PageFrontmatterRef<T extends Record<any, any> = Record<string, unknown>> = ComputedRef<PageFrontmatter<T>>;
 /**
  * Injection key for page frontmatter
  */
@@ -69,11 +62,11 @@ declare const usePageFrontmatter: <T extends Record<any, any> = Record<string, u
 /**
  * Page head config, which would be used for generate html tags in `<head>`
  */
-declare type PageHead = HeadConfig[];
+type PageHead = HeadConfig[];
 /**
  * Ref wrapper of `PageHead`
  */
-declare type PageHeadRef = ComputedRef<PageHead>;
+type PageHeadRef = ComputedRef<PageHead>;
 /**
  * Injection key for page head
  */
@@ -86,11 +79,11 @@ declare const usePageHead: () => PageHeadRef;
 /**
  * Page head title, which would be used as the content of `head > title` tag
  */
-declare type PageHeadTitle = string;
+type PageHeadTitle = string;
 /**
  * Ref wrapper of `PageHeadTitle`
  */
-declare type PageHeadTitleRef = ComputedRef<PageHeadTitle>;
+type PageHeadTitleRef = ComputedRef<PageHeadTitle>;
 /**
  * Injection key for page head title
  */
@@ -103,11 +96,11 @@ declare const usePageHeadTitle: () => PageHeadTitleRef;
 /**
  * Page language
  */
-declare type PageLang = string;
+type PageLang = string;
 /**
  * Ref wrapper of `PageLang`
  */
-declare type PageLangRef = ComputedRef<PageLang>;
+type PageLangRef = ComputedRef<PageLang>;
 /**
  * Injection key for page language
  */
@@ -123,11 +116,11 @@ declare const usePageLang: () => PageLangRef;
  * The key is page key, and the value is an async function that
  * returns the page data
  */
-declare type PagesData = Record<string, (() => Promise<PageData>) | undefined>;
+type PagesData = Record<string, (() => Promise<PageData>) | undefined>;
 /**
  * Ref wrapper of `PagesData`
  */
-declare type PagesDataRef = Ref<PagesData>;
+type PagesDataRef = Ref<PagesData>;
 /**
  * Global pages data ref
  */
@@ -140,11 +133,11 @@ declare const usePagesData: () => PagesDataRef;
 /**
  * Route locale path
  */
-declare type RouteLocale = string;
+type RouteLocale = string;
 /**
  * Ref wrapper of `RouteLocale`
  */
-declare type RouteLocaleRef = ComputedRef<RouteLocale>;
+type RouteLocaleRef = ComputedRef<RouteLocale>;
 /**
  * Injection key for page route locale path
  */
@@ -157,7 +150,7 @@ declare const useRouteLocale: () => RouteLocaleRef;
 /**
  * Ref wrapper of `SiteData`
  */
-declare type SiteDataRef = Ref<SiteData>;
+type SiteDataRef = Ref<SiteData>;
 /**
  * Global site data ref
  */
@@ -170,11 +163,11 @@ declare const useSiteData: () => SiteDataRef;
 /**
  * Site data of current locale
  */
-declare type SiteLocaleData = SiteData;
+type SiteLocaleData = SiteData;
 /**
  * Ref wrapper of `SiteLocaleData`
  */
-declare type SiteLocaleDataRef = ComputedRef<SiteLocaleData>;
+type SiteLocaleDataRef = ComputedRef<SiteLocaleData>;
 /**
  * Injection key for site locale data
  */
@@ -187,7 +180,7 @@ declare const useSiteLocaleData: () => SiteLocaleDataRef;
 /**
  * A util function to force update `<head>` of current page
  */
-declare type UpdateHead = () => void;
+type UpdateHead = () => void;
 /**
  * Injection key for `updateHead` util
  */
@@ -224,12 +217,12 @@ interface ClientConfig {
     rootComponents?: Component[];
 }
 
-declare type CreateVueAppFunction = () => Promise<{
+type CreateVueAppFunction = () => Promise<{
     app: App;
     router: Router;
 }>;
 
-declare type PageRouteItem = [
+type PageRouteItem = [
     name: string,
     path: string,
     meta: RouteMeta,
@@ -261,4 +254,4 @@ declare const resolvers: {
  */
 declare const withBase: (url: string) => string;
 
-export { ClientConfig, ClientOnly, Content, CreateVueAppFunction, 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 };
+export { ClientConfig, ClientOnly, Content, CreateVueAppFunction, PageDataRef, PageFrontmatterRef, PageHead, PageHeadRef, PageHeadTitle, PageHeadTitleRef, PageLang, PageLangRef, PageRouteItem, PagesData, PagesDataRef, RouteLocale, RouteLocaleRef, SiteDataRef, SiteLocaleData, SiteLocaleDataRef, UpdateHead, 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

@@ -1,7 +1,6 @@
 import {
   ClientOnly,
   Content,
-  Vuepress,
   pageData,
   pageDataEmpty,
   pageFrontmatterSymbol,
@@ -25,14 +24,13 @@ import {
   useSiteLocaleData,
   useUpdateHead,
   withBase
-} from "./chunk-X6HE2CCA.js";
+} from "./chunk-YRWD2ESJ.js";
 
 // src/helpers/defineClientConfig.ts
 var defineClientConfig = (clientConfig = {}) => clientConfig;
 export {
   ClientOnly,
   Content,
-  Vuepress,
   defineClientConfig,
   pageData,
   pageDataEmpty,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/client",
-  "version": "2.0.0-beta.52",
+  "version": "2.0.0-beta.54",
   "description": "Client package of VuePress",
   "keywords": [
     "vuepress",
@@ -34,9 +34,9 @@
   ],
   "dependencies": {
     "@vue/devtools-api": "^6.4.5",
-    "@vuepress/shared": "2.0.0-beta.52",
-    "vue": "^3.2.41",
-    "vue-router": "^4.1.5"
+    "vue": "^3.2.45",
+    "vue-router": "^4.1.6",
+    "@vuepress/shared": "2.0.0-beta.54"
   },
   "publishConfig": {
     "access": "public"