@vuepress/core 2.0.0-beta.24 → 2.0.0-beta.28

package/lib/page/index.js

@@ -17,7 +17,6 @@ __exportStar(require("./renderPageExcerpt"), exports);
 __exportStar(require("./resolvePageComponentInfo"), exports);
 __exportStar(require("./resolvePageContent"), exports);
 __exportStar(require("./resolvePageDataInfo"), exports);
-__exportStar(require("./resolvePageData"), exports);
 __exportStar(require("./resolvePageDate"), exports);
 __exportStar(require("./resolvePageFileContent"), exports);
 __exportStar(require("./resolvePageFilePath"), exports);
@@ -25,7 +24,7 @@ __exportStar(require("./resolvePageFrontmatter"), exports);
 __exportStar(require("./resolvePageHtmlInfo"), exports);
 __exportStar(require("./resolvePageKey"), exports);
 __exportStar(require("./resolvePageLang"), exports);
-__exportStar(require("./resolvePageOptions"), exports);
 __exportStar(require("./resolvePagePath"), exports);
 __exportStar(require("./resolvePagePermalink"), exports);
+__exportStar(require("./resolvePageRouteMeta"), exports);
 __exportStar(require("./resolvePageSlug"), exports);

package/lib/page/inferPagePath.js

@@ -14,11 +14,11 @@ const inferPagePath = ({ app, filePathRelative, }) => {
     }
     // infer page route path from file path
     // foo/bar.md -> /foo/bar.html
-    const pathInferred = shared_1.ensureLeadingSlash(filePathRelative)
+    const pathInferred = (0, shared_1.ensureLeadingSlash)(filePathRelative)
         .replace(/\.md$/, '.html')
         .replace(/\/(README|index).html$/i, '/');
     // resolve page locale path
-    const pathLocale = shared_1.resolveLocalePath(app.siteData.locales, pathInferred);
+    const pathLocale = (0, shared_1.resolveLocalePath)(app.siteData.locales, pathInferred);
     return {
         pathInferred,
         pathLocale,

package/lib/page/resolvePageContent.js

@@ -15,7 +15,7 @@ const resolvePageContent = ({ contentRaw, }) => {
         };
     }
     /* istanbul ignore next */
-    const { data, content, excerpt = '' } = matter(contentRaw, {
+    const { data, content, excerpt = '', } = matter(contentRaw, {
         excerpt_separator: '<!-- more -->',
         engines: {
             toml: toml.parse.bind(toml),

package/lib/page/resolvePageDate.d.ts

@@ -1,4 +1,4 @@
-import { PageFrontmatter } from '../types';
+import type { PageFrontmatter } from '../types';
 /**
  * Resolve page date according to frontmatter or file path
  *

package/lib/page/resolvePageDate.js

@@ -15,14 +15,14 @@ const resolvePageDate = ({ frontmatter, filePathRelative, }) => {
     var _a, _b;
     // `frontmatter.date` could be parsed as UTC Date directly
     if (frontmatter.date instanceof Date) {
-        return shared_1.formatDateString([
+        return (0, shared_1.formatDateString)([
             frontmatter.date.getUTCFullYear(),
             frontmatter.date.getUTCMonth() + 1,
             frontmatter.date.getUTCDate(),
         ].join('-'), DEFAULT_DATE);
     }
-    if (shared_1.isString(frontmatter.date)) {
-        return shared_1.formatDateString(frontmatter.date, DEFAULT_DATE);
+    if ((0, shared_1.isString)(frontmatter.date)) {
+        return (0, shared_1.formatDateString)(frontmatter.date, DEFAULT_DATE);
     }
     if (filePathRelative === null) {
         return DEFAULT_DATE;
@@ -31,14 +31,14 @@ const resolvePageDate = ({ frontmatter, filePathRelative, }) => {
     if (filename) {
         const matches = filename.match(FILENAME_DATE_RE);
         if (matches) {
-            return shared_1.formatDateString(`${matches[1]}-${matches[2]}-${(_a = matches[3]) !== null && _a !== void 0 ? _a : '01'}`, DEFAULT_DATE);
+            return (0, shared_1.formatDateString)(`${matches[1]}-${matches[2]}-${(_a = matches[3]) !== null && _a !== void 0 ? _a : '01'}`, DEFAULT_DATE);
         }
     }
     const dirname = utils_1.path.dirname(filePathRelative);
     if (dirname !== '.') {
         const matches = dirname.match(DIRNAME_DATE_RE);
         if (matches) {
-            return shared_1.formatDateString(`${matches[1]}-${matches[2]}-${(_b = matches[3]) !== null && _b !== void 0 ? _b : '01'}`, DEFAULT_DATE);
+            return (0, shared_1.formatDateString)(`${matches[1]}-${matches[2]}-${(_b = matches[3]) !== null && _b !== void 0 ? _b : '01'}`, DEFAULT_DATE);
         }
     }
     return DEFAULT_DATE;

package/lib/page/resolvePageFileContent.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolvePageFileContent = void 0;
 const utils_1 = require("@vuepress/utils");
-const log = utils_1.debug('vuepress:core/page');
+const log = (0, utils_1.debug)('vuepress:core/page');
 /**
  * Resolve page file content according to filePath or options content
  */
@@ -15,7 +15,7 @@ const resolvePageFileContent = async ({ filePath, options, }) => {
             return content;
         }
         catch (e) {
-            log(e.message);
+            log(e instanceof Error ? e.message : e);
         }
     }
     // load raw content from options

package/lib/page/resolvePageFilePath.d.ts

@@ -2,7 +2,7 @@ import type { App, PageOptions } from '../types';
 /**
  * Resolve absolute and relative path of page file
  */
-export declare const resolvePageFilePath: ({ app, options: { filePath }, }: {
+export declare const resolvePageFilePath: ({ app, options, }: {
     app: App;
     options: PageOptions;
 }) => {

package/lib/page/resolvePageFilePath.js

@@ -5,25 +5,20 @@ const utils_1 = require("@vuepress/utils");
 /**
  * Resolve absolute and relative path of page file
  */
-const resolvePageFilePath = ({ app, options: { filePath }, }) => {
+const resolvePageFilePath = ({ app, options, }) => {
     // empty file path
-    if (!filePath) {
+    if (!options.filePath) {
         return {
             filePath: null,
             filePathRelative: null,
         };
     }
-    // absolute file path
-    if (utils_1.path.isAbsolute(filePath)) {
-        return {
-            filePath,
-            filePathRelative: utils_1.path.relative(app.dir.source(), filePath),
-        };
+    if (!utils_1.path.isAbsolute(options.filePath)) {
+        throw utils_1.logger.createError(`filePath is not absolute file path: ${options.filePath}}`);
     }
-    // relative file path
     return {
-        filePath: app.dir.source(filePath),
-        filePathRelative: filePath,
+        filePath: options.filePath,
+        filePathRelative: utils_1.path.relative(app.dir.source(), options.filePath),
     };
 };
 exports.resolvePageFilePath = resolvePageFilePath;

package/lib/page/resolvePageHtmlInfo.js

@@ -8,7 +8,7 @@ const shared_1 = require("@vuepress/shared");
 const resolvePageHtmlInfo = ({ app, path: pagePath, }) => {
     // /foo.html -> foo.html
     // /foo/ -> foo/index.html
-    const htmlFilePathRelative = shared_1.removeLeadingSlash(decodeURI(pagePath.replace(/\/$/, '/index.html')));
+    const htmlFilePathRelative = (0, shared_1.removeLeadingSlash)(decodeURI(pagePath.replace(/\/$/, '/index.html')));
     const htmlFilePath = app.dir.dest(htmlFilePathRelative);
     return {
         htmlFilePath,

package/lib/page/resolvePageKey.js

@@ -5,5 +5,5 @@ const utils_1 = require("@vuepress/utils");
 /**
  * Resolve page key to identify the page
  */
-const resolvePageKey = ({ path }) => `v-${utils_1.hash(path)}`;
+const resolvePageKey = ({ path }) => `v-${(0, utils_1.hash)(path)}`;
 exports.resolvePageKey = resolvePageKey;

package/lib/page/resolvePageLang.js

@@ -7,7 +7,7 @@ const shared_1 = require("@vuepress/shared");
  */
 const resolvePageLang = ({ app, frontmatter, pathLocale, }) => {
     var _a, _b;
-    if (shared_1.isString(frontmatter.lang) && frontmatter.lang) {
+    if ((0, shared_1.isString)(frontmatter.lang) && frontmatter.lang) {
         return frontmatter.lang;
     }
     return (_b = (_a = app.siteData.locales[pathLocale]) === null || _a === void 0 ? void 0 : _a.lang) !== null && _b !== void 0 ? _b : app.siteData.lang;

package/lib/page/resolvePagePath.js

@@ -9,10 +9,10 @@ const utils_1 = require("@vuepress/utils");
 const resolvePagePath = ({ permalink, pathInferred, options, }) => {
     let pagePath = options.path || permalink || pathInferred;
     if (!pagePath) {
-        throw utils_1.logger.createError(`page path is empty, page options: ${JSON.stringify(options)}`);
+        throw utils_1.logger.createError(`page path is empty, page options: ${JSON.stringify(options, null, 2)}`);
     }
     if (!pagePath.endsWith('.html')) {
-        pagePath = shared_1.ensureEndingSlash(pagePath);
+        pagePath = (0, shared_1.ensureEndingSlash)(pagePath);
     }
     return encodeURI(pagePath);
 };

package/lib/page/resolvePagePermalink.js

@@ -9,11 +9,11 @@ const utils_1 = require("@vuepress/utils");
 const resolvePagePermalink = ({ frontmatter, slug, date, pathInferred, pathLocale, }) => {
     var _a;
     // use permalink in frontmatter directly
-    if (shared_1.isString(frontmatter.permalink)) {
+    if ((0, shared_1.isString)(frontmatter.permalink)) {
         return frontmatter.permalink;
     }
     // get permalink pattern from frontmatter or options
-    const pattern = shared_1.isString(frontmatter.permalinkPattern)
+    const pattern = (0, shared_1.isString)(frontmatter.permalinkPattern)
         ? frontmatter.permalinkPattern
         : null;
     if (!pattern) {
@@ -27,6 +27,6 @@ const resolvePagePermalink = ({ frontmatter, slug, date, pathInferred, pathLocal
         .replace(/:day/, day)
         .replace(/:slug/, slug)
         .replace(/:raw/, (_a = pathInferred === null || pathInferred === void 0 ? void 0 : pathInferred.replace(/^\//, '')) !== null && _a !== void 0 ? _a : ''));
-    return shared_1.ensureLeadingSlash(link);
+    return (0, shared_1.ensureLeadingSlash)(link);
 };
 exports.resolvePagePermalink = resolvePagePermalink;

package/lib/page/resolvePageRouteMeta.d.ts

@@ -0,0 +1,7 @@
+import type { PageFrontmatter } from '../types';
+/**
+ * Resolve page route meta
+ */
+export declare const resolvePageRouteMeta: ({ frontmatter, }: {
+    frontmatter: PageFrontmatter;
+}) => Record<string, unknown>;

package/lib/page/resolvePageRouteMeta.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolvePageRouteMeta = void 0;
+/**
+ * Resolve page route meta
+ */
+const resolvePageRouteMeta = ({ frontmatter, }) => { var _a; return (_a = frontmatter.routeMeta) !== null && _a !== void 0 ? _a : {}; };
+exports.resolvePageRouteMeta = resolvePageRouteMeta;

package/lib/pluginApi/createHookQueue.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createHookQueue = void 0;
 const utils_1 = require("@vuepress/utils");
-const log = utils_1.debug('vuepress:core/plugin-api');
+const log = (0, utils_1.debug)('vuepress:core/plugin-api');
 /**
  * Create hook queue for plugin system
  */
@@ -29,9 +29,9 @@ const createHookQueue = (name) => {
                         results.push(result);
                     }
                 }
-                catch (error) {
+                catch (e) {
                     utils_1.logger.error(`error in hook ${utils_1.chalk.magenta(name)} from ${utils_1.chalk.magenta(item.pluginName)}`);
-                    throw error;
+                    throw e;
                 }
             }
             return results;

package/lib/pluginApi/createPluginApi.js

@@ -5,8 +5,8 @@ const createPluginApiHooks_1 = require("./createPluginApiHooks");
 const createPluginApiRegisterHooks_1 = require("./createPluginApiRegisterHooks");
 const createPluginApi = () => {
     const plugins = [];
-    const hooks = createPluginApiHooks_1.createPluginApiHooks();
-    const registerHooks = createPluginApiRegisterHooks_1.createPluginApiRegisterHooks(plugins, hooks);
+    const hooks = (0, createPluginApiHooks_1.createPluginApiHooks)();
+    const registerHooks = (0, createPluginApiRegisterHooks_1.createPluginApiRegisterHooks)(plugins, hooks);
     return {
         plugins,
         hooks,

package/lib/pluginApi/createPluginApiHooks.js

@@ -4,21 +4,21 @@ exports.createPluginApiHooks = void 0;
 const createHookQueue_1 = require("./createHookQueue");
 const createPluginApiHooks = () => ({
     // life cycle hooks
-    onInitialized: createHookQueue_1.createHookQueue('onInitialized'),
-    onPrepared: createHookQueue_1.createHookQueue('onPrepared'),
-    onWatched: createHookQueue_1.createHookQueue('onWatched'),
-    onGenerated: createHookQueue_1.createHookQueue('onGenerated'),
-    // page hooks
-    extendsPageOptions: createHookQueue_1.createHookQueue('extendsPageOptions'),
-    extendsPageData: createHookQueue_1.createHookQueue('extendsPageData'),
-    // markdown hooks
-    extendsMarkdown: createHookQueue_1.createHookQueue('extendsMarkdown'),
+    onInitialized: (0, createHookQueue_1.createHookQueue)('onInitialized'),
+    onPrepared: (0, createHookQueue_1.createHookQueue)('onPrepared'),
+    onWatched: (0, createHookQueue_1.createHookQueue)('onWatched'),
+    onGenerated: (0, createHookQueue_1.createHookQueue)('onGenerated'),
+    // extends hooks
+    extendsMarkdownOptions: (0, createHookQueue_1.createHookQueue)('extendsMarkdownOptions'),
+    extendsMarkdown: (0, createHookQueue_1.createHookQueue)('extendsMarkdown'),
+    extendsPageOptions: (0, createHookQueue_1.createHookQueue)('extendsPageOptions'),
+    extendsPage: (0, createHookQueue_1.createHookQueue)('extendsPage'),
     // client files hooks
-    clientAppEnhanceFiles: createHookQueue_1.createHookQueue('clientAppEnhanceFiles'),
-    clientAppRootComponentFiles: createHookQueue_1.createHookQueue('clientAppRootComponentFiles'),
-    clientAppSetupFiles: createHookQueue_1.createHookQueue('clientAppSetupFiles'),
+    clientAppEnhanceFiles: (0, createHookQueue_1.createHookQueue)('clientAppEnhanceFiles'),
+    clientAppRootComponentFiles: (0, createHookQueue_1.createHookQueue)('clientAppRootComponentFiles'),
+    clientAppSetupFiles: (0, createHookQueue_1.createHookQueue)('clientAppSetupFiles'),
     // bundler hooks
-    alias: createHookQueue_1.createHookQueue('alias'),
-    define: createHookQueue_1.createHookQueue('define'),
+    alias: (0, createHookQueue_1.createHookQueue)('alias'),
+    define: (0, createHookQueue_1.createHookQueue)('define'),
 });
 exports.createPluginApiHooks = createPluginApiHooks;

package/lib/pluginApi/createPluginApiRegisterHooks.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPluginApiRegisterHooks = void 0;
-const normalizeReturnObjectHook_1 = require("./normalizeReturnObjectHook");
 const normalizeClientFilesHook_1 = require("./normalizeClientFilesHook");
+const normalizeReturnObjectHook_1 = require("./normalizeReturnObjectHook");
 const createPluginApiRegisterHooks = (plugins, hooks) => () => {
     plugins.forEach(({ name: pluginName, alias, define, clientAppEnhanceFiles, clientAppRootComponentFiles, clientAppSetupFiles, ...commonHooks }) => {
         /**
@@ -11,31 +11,31 @@ const createPluginApiRegisterHooks = (plugins, hooks) => () => {
         if (alias) {
             hooks.alias.add({
                 pluginName,
-                hook: normalizeReturnObjectHook_1.normalizeReturnObjectHook(alias),
+                hook: (0, normalizeReturnObjectHook_1.normalizeReturnObjectHook)(alias),
             });
         }
         if (define) {
             hooks.define.add({
                 pluginName,
-                hook: normalizeReturnObjectHook_1.normalizeReturnObjectHook(define),
+                hook: (0, normalizeReturnObjectHook_1.normalizeReturnObjectHook)(define),
             });
         }
         if (clientAppEnhanceFiles) {
             hooks.clientAppEnhanceFiles.add({
                 pluginName,
-                hook: normalizeClientFilesHook_1.normalizeClientFilesHook(clientAppEnhanceFiles),
+                hook: (0, normalizeClientFilesHook_1.normalizeClientFilesHook)(clientAppEnhanceFiles),
             });
         }
         if (clientAppRootComponentFiles) {
             hooks.clientAppRootComponentFiles.add({
                 pluginName,
-                hook: normalizeClientFilesHook_1.normalizeClientFilesHook(clientAppRootComponentFiles),
+                hook: (0, normalizeClientFilesHook_1.normalizeClientFilesHook)(clientAppRootComponentFiles),
             });
         }
         if (clientAppSetupFiles) {
             hooks.clientAppSetupFiles.add({
                 pluginName,
-                hook: normalizeClientFilesHook_1.normalizeClientFilesHook(clientAppSetupFiles),
+                hook: (0, normalizeClientFilesHook_1.normalizeClientFilesHook)(clientAppSetupFiles),
             });
         }
         /**

package/lib/pluginApi/normalizeClientFilesHook.js

@@ -8,8 +8,8 @@ const utils_1 = require("@vuepress/utils");
  */
 const normalizeClientFilesHook = (hook) => async (app) => {
     // resolve clientFiles result
-    const clientFilesResult = shared_1.isFunction(hook) ? await hook(app) : hook;
-    const clientFiles = shared_1.isArray(clientFilesResult)
+    const clientFilesResult = (0, shared_1.isFunction)(hook) ? await hook(app) : hook;
+    const clientFiles = (0, shared_1.isArray)(clientFilesResult)
         ? clientFilesResult
         : [clientFilesResult];
     // filter files that do not exist

package/lib/pluginApi/normalizeReturnObjectHook.js

@@ -5,5 +5,5 @@ const shared_1 = require("@vuepress/shared");
 /**
  * Normalize hook that returns an object
  */
-const normalizeReturnObjectHook = (hook) => async (app) => shared_1.isFunction(hook) ? hook(app) : hook;
+const normalizeReturnObjectHook = (hook) => async (app) => (0, shared_1.isFunction)(hook) ? hook(app) : hook;
 exports.normalizeReturnObjectHook = normalizeReturnObjectHook;

package/lib/types/app/app.d.ts

@@ -1,6 +1,6 @@
 import type { Markdown } from '@vuepress/markdown';
 import type { SiteData } from '@vuepress/shared';
-import type { BundlerDev, BundlerBuild } from '../bundler';
+import type { BundlerBuild, BundlerDev } from '../bundler';
 import type { Page } from '../page';
 import type { Plugin, PluginOptions } from '../plugin';
 import type { PluginApi } from '../pluginApi';
@@ -30,10 +30,6 @@ export interface App {
      * Site data, which will be used in client side
      */
     siteData: SiteData;
-    /**
-     * Markdown-it instance
-     */
-    markdown: Markdown;
     /**
      * Plugin system
      */
@@ -65,6 +61,12 @@ export interface App {
      * Only available after initialization
      */
     layouts: Record<string, string>;
+    /**
+     * Markdown-it instance.
+     *
+     * Only available after initialization
+     */
+    markdown: Markdown;
     /**
      * Page objects.
      *

package/lib/types/index.d.ts

@@ -1,4 +1,4 @@
-import type { HeadConfig, HeadTag, HeadTagEmpty, HeadTagNonEmpty, HeadAttrsConfig, LocaleConfig, LocaleData, PageData, PageFrontmatter, PageHeader, SiteData, SiteLocaleConfig } from '@vuepress/shared';
+import type { HeadAttrsConfig, HeadConfig, HeadTag, HeadTagEmpty, HeadTagNonEmpty, LocaleConfig, LocaleData, PageData, PageFrontmatter, PageHeader, SiteData, SiteLocaleConfig } from '@vuepress/shared';
 export type { HeadConfig, HeadTag, HeadTagEmpty, HeadTagNonEmpty, HeadAttrsConfig, LocaleConfig, LocaleData, PageData, PageFrontmatter, PageHeader, SiteData, SiteLocaleConfig, };
 export * from './app';
 export * from './bundler';

package/lib/types/page.d.ts

@@ -3,11 +3,11 @@ import type { PageData, PageFrontmatter } from '@vuepress/shared';
 /**
  * Vuepress Page
  */
-export interface Page<T extends PageData = PageData> extends PageData {
+export declare type Page<ExtraPageData extends Record<any, any> = Record<never, never>, ExtraPageFields extends Record<any, any> = Record<never, never>> = PageData & ExtraPageFields & {
     /**
      * Data of the page, which will be available in client code
      */
-    data: T;
+    data: PageData<ExtraPageData>;
     /**
      * Raw Content of the page
      */
@@ -56,6 +56,12 @@ export interface Page<T extends PageData = PageData> extends PageData {
      * If the page does not have a permalink, it would be `null`
      */
     permalink: string | null;
+    /**
+     * Custom data to be attached to the page route record of vue-router
+     *
+     * @see https://next.router.vuejs.org/api/#meta
+     */
+    routeMeta: Record<string, unknown>;
     /**
      * Slug of the page
      */
@@ -108,13 +114,31 @@ export interface Page<T extends PageData = PageData> extends PageData {
      * Rendered html file path relative to dest directory
      */
     htmlFilePathRelative: string;
-}
+};
 /**
  * Options to create vuepress page
  */
 export interface PageOptions {
-    path?: string;
+    /**
+     * If `filePath` is not set, this option will be used as the raw
+     * markdown content of the page.
+     *
+     * If `filePath` is set, this option will be ignored, while the
+     * content of the file will be used.
+     */
+    content?: string;
+    /**
+     * Absolute file path of the markdown source file.
+     */
     filePath?: string;
+    /**
+     * Default frontmatter of the page, which could be overridden by
+     * the frontmatter of the markdown content.
+     */
     frontmatter?: PageFrontmatter;
-    content?: string;
+    /**
+     * If this option is set, it will be used as the final route path
+     * of the page, ignoring the relative path and permalink.
+     */
+    path?: string;
 }

package/lib/types/pluginApi/hooks.d.ts

@@ -1,4 +1,4 @@
-import type { Markdown } from '@vuepress/markdown';
+import type { Markdown, MarkdownOptions } from '@vuepress/markdown';
 import type { App } from '../app';
 import type { Page, PageOptions } from '../page';
 declare type PromiseOrNot<T> = Promise<T> | T;
@@ -11,11 +11,9 @@ export declare type Hook<Exposed, Normalized = Exposed, Result = Normalized exte
     result: Result;
 };
 export declare type LifeCycleHook<T extends unknown[] = []> = Hook<(app: App, ...args: T) => PromiseOrNot<void>>;
+export declare type ExtendsHook<T> = Hook<(extendable: T, app: App) => PromiseOrNot<void>>;
 export declare type ClientFilesHook = Hook<string | string[] | ((app: App) => PromiseOrNot<string | string[]>), (app: App) => Promise<string[]>>;
 export declare type ReturnObjectHook = Hook<Record<string, any> | ((app: App) => PromiseOrNot<Record<string, any>>), (app: App) => Promise<Record<string, any>>>;
-export declare type ExtendsMarkdownHook = Hook<(md: Markdown, app: App) => PromiseOrNot<void>>;
-export declare type ExtendsPageOptionsHook = Hook<(options: PageOptions, app: App) => PromiseOrNot<PageOptions>>;
-export declare type ExtendsPageDataHook = Hook<(page: Omit<Page, 'data'>, app: App) => PromiseOrNot<Record<string, any>>>;
 /**
  * List of hooks
  */
@@ -24,9 +22,10 @@ export interface Hooks {
     onPrepared: LifeCycleHook;
     onWatched: LifeCycleHook<[watchers: Closable[], restart: () => Promise<void>]>;
     onGenerated: LifeCycleHook;
-    extendsMarkdown: ExtendsMarkdownHook;
-    extendsPageOptions: ExtendsPageOptionsHook;
-    extendsPageData: ExtendsPageDataHook;
+    extendsMarkdownOptions: ExtendsHook<MarkdownOptions>;
+    extendsMarkdown: ExtendsHook<Markdown>;
+    extendsPageOptions: ExtendsHook<PageOptions>;
+    extendsPage: ExtendsHook<Page>;
     clientAppEnhanceFiles: ClientFilesHook;
     clientAppRootComponentFiles: ClientFilesHook;
     clientAppSetupFiles: ClientFilesHook;

package/lib/types/theme.d.ts

@@ -32,3 +32,16 @@ export interface ThemeObject extends PluginObject {
  * @remark suffix `Config` means this is for user config
  */
 export declare type ThemeConfig = Record<string, any>;
+/**
+ * Resolved theme info
+ */
+export interface ThemeInfo {
+    /**
+     * Layout components
+     */
+    layouts: Record<string, string>;
+    /**
+     * Plugins, including theme itself and plugins used by theme
+     */
+    plugins: PluginObject[];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/core",
-  "version": "2.0.0-beta.24",
+  "version": "2.0.0-beta.28",
   "description": "Core package of VuePress",
   "keywords": [
     "vuepress",
@@ -26,15 +26,15 @@
     "clean": "rimraf lib *.tsbuildinfo"
   },
   "dependencies": {
-    "@vuepress/client": "2.0.0-beta.24",
-    "@vuepress/markdown": "2.0.0-beta.24",
-    "@vuepress/shared": "2.0.0-beta.24",
-    "@vuepress/utils": "2.0.0-beta.24",
+    "@vuepress/client": "2.0.0-beta.28",
+    "@vuepress/markdown": "2.0.0-beta.28",
+    "@vuepress/shared": "2.0.0-beta.28",
+    "@vuepress/utils": "2.0.0-beta.28",
     "gray-matter": "^4.0.3",
     "toml": "^3.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "dd9588128c4b8e62bb96ed8581322e8901e22b90"
+  "gitHead": "71c34816a79263c7dcba3ff0c103e264abdbf0d2"
 }

package/lib/app/resolveThemeApi.d.ts

@@ -1,8 +0,0 @@
-import type { App, PluginObject } from '../types';
-/**
- * Recursively resolve plugins and layouts of theme and its parent theme
- */
-export declare const resolveThemeApi: (app: App, themeName: string) => {
-    layouts: Record<string, string>;
-    plugins: PluginObject[];
-};

package/lib/app/resolveThemeApi.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveThemeApi = void 0;
-const resolvePluginsFromConfig_1 = require("./resolvePluginsFromConfig");
-const resolveTheme_1 = require("./resolveTheme");
-const resolveThemeLayouts_1 = require("./resolveThemeLayouts");
-/**
- * Recursively resolve plugins and layouts of theme and its parent theme
- */
-const resolveThemeApi = (app, themeName) => {
-    const theme = resolveTheme_1.resolveTheme(app, themeName);
-    const themeLayouts = resolveThemeLayouts_1.resolveThemeLayouts(theme.layouts);
-    const themePlugins = resolvePluginsFromConfig_1.resolvePluginsFromConfig(app, theme.plugins);
-    if (!theme.extends) {
-        return {
-            layouts: themeLayouts,
-            plugins: [theme, ...themePlugins],
-        };
-    }
-    const parentThemeApi = exports.resolveThemeApi(app, theme.extends);
-    return {
-        layouts: {
-            ...parentThemeApi.layouts,
-            ...themeLayouts,
-        },
-        plugins: [...parentThemeApi.plugins, theme, ...themePlugins],
-    };
-};
-exports.resolveThemeApi = resolveThemeApi;

package/lib/page/resolvePageData.d.ts

@@ -1,8 +0,0 @@
-import type { App, Page, PageData } from '../types';
-/**
- * Resolve page data
- */
-export declare const resolvePageData: ({ app, page, }: {
-    app: App;
-    page: Page;
-}) => Promise<PageData>;

package/lib/page/resolvePageData.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvePageData = void 0;
-/**
- * Resolve page data
- */
-const resolvePageData = async ({ app, page, }) => {
-    const { key, path, title, lang, frontmatter, excerpt, headers } = page;
-    const data = {
-        key,
-        path,
-        title,
-        lang,
-        frontmatter,
-        excerpt,
-        headers,
-    };
-    // plugin hook: extendsPageData
-    const extendsPageData = await app.pluginApi.hooks.extendsPageData.process(page, app);
-    extendsPageData.forEach((item) => Object.assign(data, item));
-    return data;
-};
-exports.resolvePageData = resolvePageData;

package/lib/page/resolvePageOptions.d.ts

@@ -1,8 +0,0 @@
-import type { App, PageOptions } from '../types';
-/**
- * Render page content and extract related info
- */
-export declare const resolvePageOptions: ({ app, optionsRaw, }: {
-    app: App;
-    optionsRaw: PageOptions;
-}) => Promise<PageOptions>;