@vuepress/core 2.0.0-beta.23 → 2.0.0-beta.27

package/lib/app/appInit.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.appInit = void 0;
 const utils_1 = require("@vuepress/utils");
 const createAppPages_1 = require("./createAppPages");
-const log = utils_1.debug('vuepress:core/app');
+const log = (0, utils_1.debug)('vuepress:core/app');
 /**
  * Initialize a vuepress app
  *
@@ -18,7 +18,7 @@ const appInit = async (app) => {
     // plugin hook: extendsMarkdown
     await app.pluginApi.hooks.extendsMarkdown.process(app.markdown, app);
     // create pages
-    app.pages = await createAppPages_1.createAppPages(app);
+    app.pages = await (0, createAppPages_1.createAppPages)(app);
     // plugin hook: onInitialized
     await app.pluginApi.hooks.onInitialized.process(app);
     log('init finish');

package/lib/app/appPrepare.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.appPrepare = void 0;
 const utils_1 = require("@vuepress/utils");
 const prepare_1 = require("./prepare");
-const log = utils_1.debug('vuepress:core/app');
+const log = (0, utils_1.debug)('vuepress:core/app');
 /**
  * Prepare files for development or build
  *
@@ -16,26 +16,26 @@ const appPrepare = async (app) => {
     log('prepare start');
     // generate page component files
     for (const page of app.pages) {
-        await prepare_1.preparePageComponent(app, page);
+        await (0, prepare_1.preparePageComponent)(app, page);
     }
-    await prepare_1.preparePagesComponents(app);
+    await (0, prepare_1.preparePagesComponents)(app);
     // generate page data files
     for (const page of app.pages) {
-        await prepare_1.preparePageData(app, page);
+        await (0, prepare_1.preparePageData)(app, page);
     }
-    await prepare_1.preparePagesData(app);
+    await (0, prepare_1.preparePagesData)(app);
     // generate routes file
-    await prepare_1.preparePagesRoutes(app);
+    await (0, prepare_1.preparePagesRoutes)(app);
     // generate layout components map file
-    await prepare_1.prepareLayoutComponents(app);
+    await (0, prepare_1.prepareLayoutComponents)(app);
     // generate site data file
-    await prepare_1.prepareSiteData(app);
+    await (0, prepare_1.prepareSiteData)(app);
     // generate client app enhances file
-    await prepare_1.prepareClientAppEnhances(app);
+    await (0, prepare_1.prepareClientAppEnhances)(app);
     // generate client app root components file
-    await prepare_1.prepareClientAppRootComponents(app);
+    await (0, prepare_1.prepareClientAppRootComponents)(app);
     // generate client app setups file
-    await prepare_1.prepareClientAppSetups(app);
+    await (0, prepare_1.prepareClientAppSetups)(app);
     // plugin hook: onPrepared
     await app.pluginApi.hooks.onPrepared.process(app);
     log('prepare finish');

package/lib/app/appUse.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.appUse = void 0;
 const utils_1 = require("@vuepress/utils");
 const resolvePlugin_1 = require("./resolvePlugin");
-const log = utils_1.debug('vuepress:core/app');
+const log = (0, utils_1.debug)('vuepress:core/app');
 const appUse = (app, rawPlugin, config) => {
-    const plugin = resolvePlugin_1.resolvePlugin(app, rawPlugin, config);
+    const plugin = (0, resolvePlugin_1.resolvePlugin)(app, rawPlugin, config);
     log(`use plugin ${utils_1.chalk.magenta(plugin.name)}`);
     if (plugin.multiple !== true) {
         // remove duplicated plugin
@@ -13,7 +13,7 @@ const appUse = (app, rawPlugin, config) => {
         if (duplicateIndex !== -1) {
             app.pluginApi.plugins.splice(duplicateIndex, 1);
             // show warning when duplicate plugins are detected
-            utils_1.warn(`plugin ${utils_1.chalk.magenta(plugin.name)} has been used multiple times, only the last one will take effect`);
+            (0, utils_1.warn)(`plugin ${utils_1.chalk.magenta(plugin.name)} has been used multiple times, only the last one will take effect`);
         }
     }
     // use plugin

package/lib/app/createAppDir.js

@@ -13,13 +13,13 @@ exports.createAppDirFunction = createAppDirFunction;
  * Create directory utils for vuepress app
  */
 const createAppDir = (options) => {
-    const cache = exports.createAppDirFunction(options.cache);
-    const temp = exports.createAppDirFunction(options.temp);
-    const source = exports.createAppDirFunction(options.source);
-    const dest = exports.createAppDirFunction(options.dest);
-    const publicDir = exports.createAppDirFunction(options.public);
+    const cache = (0, exports.createAppDirFunction)(options.cache);
+    const temp = (0, exports.createAppDirFunction)(options.temp);
+    const source = (0, exports.createAppDirFunction)(options.source);
+    const dest = (0, exports.createAppDirFunction)(options.dest);
+    const publicDir = (0, exports.createAppDirFunction)(options.public);
     // @vuepress/client
-    const client = exports.createAppDirFunction(utils_1.path.resolve(require.resolve('@vuepress/client/package.json'), '..'));
+    const client = (0, exports.createAppDirFunction)(utils_1.path.resolve(require.resolve('@vuepress/client/package.json'), '..'));
     return {
         cache,
         temp,

package/lib/app/createAppPages.js

@@ -3,21 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAppPages = void 0;
 const utils_1 = require("@vuepress/utils");
 const page_1 = require("../page");
-const log = utils_1.debug('vuepress:core/app');
+const log = (0, utils_1.debug)('vuepress:core/app');
 /**
  * Create pages for vuepress app
  */
 const createAppPages = async (app) => {
     log('createAppPages start');
-    // resolve page file paths according to the page patterns
-    const pagePaths = await utils_1.globby(app.options.pagePatterns, {
+    // resolve page absolute file paths according to the page patterns
+    const pageFilePaths = await (0, utils_1.globby)(app.options.pagePatterns, {
+        absolute: true,
         cwd: app.dir.source(),
     });
     // create pages from files
-    const pages = await Promise.all(pagePaths.map((filePath) => page_1.createPage(app, { filePath })));
+    const pages = await Promise.all(pageFilePaths.map((filePath) => (0, page_1.createPage)(app, { filePath })));
     // if there is no 404 page, add one
     if (!pages.some((page) => page.path === '/404.html')) {
-        pages.push(await page_1.createPage(app, {
+        pages.push(await (0, page_1.createPage)(app, {
             path: '/404.html',
             frontmatter: {
                 layout: '404',

package/lib/app/createBaseApp.js

@@ -13,19 +13,19 @@ const createAppSiteData_1 = require("./createAppSiteData");
 const createAppVersion_1 = require("./createAppVersion");
 const createAppWriteTemp_1 = require("./createAppWriteTemp");
 const resolvePluginsFromConfig_1 = require("./resolvePluginsFromConfig");
-const resolveThemeApi_1 = require("./resolveThemeApi");
+const resolveThemeInfo_1 = require("./resolveThemeInfo");
 /**
  * Create vuepress app
  */
 const createBaseApp = (config, isBuild = false) => {
-    const version = createAppVersion_1.createAppVersion();
-    const options = createAppOptions_1.createAppOptions(config);
-    const dir = createAppDir_1.createAppDir(options);
-    const env = createAppEnv_1.createAppEnv(options, isBuild);
-    const siteData = createAppSiteData_1.createAppSiteData(options);
-    const markdown = markdown_1.createMarkdown(options.markdown);
-    const pluginApi = pluginApi_1.createPluginApi();
-    const writeTemp = createAppWriteTemp_1.createAppWriteTemp(dir);
+    const version = (0, createAppVersion_1.createAppVersion)();
+    const options = (0, createAppOptions_1.createAppOptions)(config);
+    const dir = (0, createAppDir_1.createAppDir)(options);
+    const env = (0, createAppEnv_1.createAppEnv)(options, isBuild);
+    const siteData = (0, createAppSiteData_1.createAppSiteData)(options);
+    const markdown = (0, markdown_1.createMarkdown)(options.markdown);
+    const pluginApi = (0, pluginApi_1.createPluginApi)();
+    const writeTemp = (0, createAppWriteTemp_1.createAppWriteTemp)(dir);
     const app = {
         version,
         options,
@@ -35,16 +35,16 @@ const createBaseApp = (config, isBuild = false) => {
         markdown,
         pluginApi,
         writeTemp,
-        use: (...args) => appUse_1.appUse(app, ...args),
-        init: () => appInit_1.appInit(app),
-        prepare: () => appPrepare_1.appPrepare(app),
+        use: (...args) => (0, appUse_1.appUse)(app, ...args),
+        init: () => (0, appInit_1.appInit)(app),
+        prepare: () => (0, appPrepare_1.appPrepare)(app),
     };
-    // resolve theme plugins and layouts
-    const themeApi = resolveThemeApi_1.resolveThemeApi(app, options.theme);
-    themeApi.plugins.forEach((plugin) => app.use(plugin));
-    app.layouts = themeApi.layouts;
+    // resolve theme info and use theme plugins
+    const themeInfo = (0, resolveThemeInfo_1.resolveThemeInfo)(app, options.theme);
+    themeInfo.plugins.forEach((plugin) => app.use(plugin));
+    app.layouts = themeInfo.layouts;
     // resolve plugins
-    const plugins = resolvePluginsFromConfig_1.resolvePluginsFromConfig(app, options.plugins);
+    const plugins = (0, resolvePluginsFromConfig_1.resolvePluginsFromConfig)(app, options.plugins);
     plugins.forEach((plugin) => app.use(plugin));
     return app;
 };

package/lib/app/createBuildApp.d.ts

@@ -1,4 +1,4 @@
-import type { BuildApp, AppConfig } from '../types';
+import type { AppConfig, BuildApp } from '../types';
 /**
  * Create vuepress build app
  */

package/lib/app/createBuildApp.js

@@ -7,8 +7,8 @@ const resolveBundler_1 = require("./resolveBundler");
  * Create vuepress build app
  */
 const createBuildApp = (config) => {
-    const app = createBaseApp_1.createBaseApp(config, true);
-    app.build = () => resolveBundler_1.resolveBundler(app.options).build(app);
+    const app = (0, createBaseApp_1.createBaseApp)(config, true);
+    app.build = () => (0, resolveBundler_1.resolveBundler)(app.options).build(app);
     return app;
 };
 exports.createBuildApp = createBuildApp;

package/lib/app/createDevApp.d.ts

@@ -1,4 +1,4 @@
-import type { DevApp, AppConfig } from '../types';
+import type { AppConfig, DevApp } from '../types';
 /**
  * Create vuepress dev app
  */

package/lib/app/createDevApp.js

@@ -7,8 +7,8 @@ const resolveBundler_1 = require("./resolveBundler");
  * Create vuepress dev app
  */
 const createDevApp = (config) => {
-    const app = createBaseApp_1.createBaseApp(config, false);
-    app.dev = () => resolveBundler_1.resolveBundler(app.options).dev(app);
+    const app = (0, createBaseApp_1.createBaseApp)(config, false);
+    app.dev = () => (0, resolveBundler_1.resolveBundler)(app.options).dev(app);
     return app;
 };
 exports.createDevApp = createDevApp;

package/lib/app/index.d.ts

@@ -18,5 +18,5 @@ export * from './resolvePlugin';
 export * from './resolvePluginModule';
 export * from './resolvePluginsFromConfig';
 export * from './resolveTheme';
-export * from './resolveThemeApi';
+export * from './resolveThemeInfo';
 export * from './resolveThemeLayouts';

package/lib/app/index.js

@@ -30,5 +30,5 @@ __exportStar(require("./resolvePlugin"), exports);
 __exportStar(require("./resolvePluginModule"), exports);
 __exportStar(require("./resolvePluginsFromConfig"), exports);
 __exportStar(require("./resolveTheme"), exports);
-__exportStar(require("./resolveThemeApi"), exports);
+__exportStar(require("./resolveThemeInfo"), exports);
 __exportStar(require("./resolveThemeLayouts"), exports);

package/lib/app/normalizePluginConfig.d.ts

@@ -1,2 +1,2 @@
-import type { PluginOptions, PluginConfig, PluginConfigNormalized } from '../types';
+import type { PluginConfig, PluginConfigNormalized, PluginOptions } from '../types';
 export declare const normalizePluginConfig: <T extends PluginOptions>(pluginConfig: PluginConfig<T>) => PluginConfigNormalized<T>;

package/lib/app/normalizePluginConfig.js

@@ -6,7 +6,7 @@ const normalizePluginConfig = (pluginConfig) => {
     var _a;
     // ['container'] -> ['container', true]
     // ['container', options] -> ['container', options]
-    if (shared_1.isArray(pluginConfig)) {
+    if ((0, shared_1.isArray)(pluginConfig)) {
         return [pluginConfig[0], (_a = pluginConfig[1]) !== null && _a !== void 0 ? _a : true];
     }
     // 'container' -> ['container', true]

package/lib/app/prepare/preparePagesRoutes.js

@@ -33,7 +33,7 @@ ${app.pages
         }
         // redirect from filename path
         if (filePathRelative !== null) {
-            const filenamePath = shared_1.ensureLeadingSlash(filePathRelative);
+            const filenamePath = (0, shared_1.ensureLeadingSlash)(filePathRelative);
             redirectsSet.add(filenamePath);
             redirectsSet.add(encodeURI(filenamePath));
         }

package/lib/app/resolveBundler.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveBundler = void 0;
 const shared_1 = require("@vuepress/shared");
 const resolveBundler = ({ bundler, bundlerConfig, }) => {
-    const bundlerPackage = shared_1.normalizePackageName(bundler, 'vuepress', 'bundler');
+    const bundlerPackage = (0, shared_1.normalizePackageName)(bundler, 'vuepress', 'bundler');
     const { createBundler } = require(bundlerPackage);
     return createBundler(bundlerConfig);
 };

package/lib/app/resolvePlugin.js

@@ -8,13 +8,13 @@ const resolvePluginModule_1 = require("./resolvePluginModule");
  * Resolve a plugin according to name / path / module and config
  */
 const resolvePlugin = (app, plugin, config = {}) => {
-    const pluginModule = shared_1.isString(plugin)
-        ? resolvePluginModule_1.resolvePluginModule(plugin)
+    const pluginModule = (0, shared_1.isString)(plugin)
+        ? (0, resolvePluginModule_1.resolvePluginModule)(plugin)
         : plugin;
     if (pluginModule === null) {
         throw utils_1.logger.createError(`plugin is not found: ${utils_1.chalk.magenta(plugin)}`);
     }
-    const pluginObject = shared_1.isFunction(pluginModule)
+    const pluginObject = (0, shared_1.isFunction)(pluginModule)
         ? pluginModule(config, app)
         : pluginModule;
     return pluginObject;

package/lib/app/resolvePluginModule.js

@@ -9,12 +9,12 @@ const utils_1 = require("@vuepress/utils");
 const resolvePluginModule = (pluginName) => {
     const pluginEntry = utils_1.path.isAbsolute(pluginName)
         ? pluginName
-        : utils_1.requireResolve(shared_1.normalizePackageName(pluginName, 'vuepress', 'plugin'));
+        : (0, utils_1.requireResolve)((0, shared_1.normalizePackageName)(pluginName, 'vuepress', 'plugin'));
     if (pluginEntry === null) {
         return null;
     }
     const pluginModule = require(pluginEntry);
     // allow default export
-    return utils_1.hasExportDefault(pluginModule) ? pluginModule.default : pluginModule;
+    return (0, utils_1.hasExportDefault)(pluginModule) ? pluginModule.default : pluginModule;
 };
 exports.resolvePluginModule = resolvePluginModule;

package/lib/app/resolvePluginsFromConfig.js

@@ -7,9 +7,9 @@ const resolvePlugin_1 = require("./resolvePlugin");
  * Resolve plugins from plugin config array
  */
 const resolvePluginsFromConfig = (app, plugins = []) => plugins.reduce((prev, item) => {
-    const [plugin, config] = normalizePluginConfig_1.normalizePluginConfig(item);
+    const [plugin, config] = (0, normalizePluginConfig_1.normalizePluginConfig)(item);
     if (config !== false) {
-        prev.push(resolvePlugin_1.resolvePlugin(app, plugin, config === true ? {} : config));
+        prev.push((0, resolvePlugin_1.resolvePlugin)(app, plugin, config === true ? {} : config));
     }
     return prev;
 }, []);

package/lib/app/resolveTheme.js

@@ -9,14 +9,14 @@ const resolvePlugin_1 = require("./resolvePlugin");
  */
 const resolveTheme = (app, themeName) => {
     // resolve theme entry according to theme name
-    const themeEntry = utils_1.requireResolve(utils_1.path.isAbsolute(themeName)
+    const themeEntry = (0, utils_1.requireResolve)(utils_1.path.isAbsolute(themeName)
         ? themeName
-        : shared_1.normalizePackageName(themeName, 'vuepress', 'theme'));
+        : (0, shared_1.normalizePackageName)(themeName, 'vuepress', 'theme'));
     if (themeEntry === null) {
         throw utils_1.logger.createError(`theme is not found: ${utils_1.chalk.magenta(themeName)}`);
     }
     // resolve theme from theme entry
-    const theme = resolvePlugin_1.resolvePlugin(app, themeEntry, app.options.themeConfig);
+    const theme = (0, resolvePlugin_1.resolvePlugin)(app, themeEntry, app.options.themeConfig);
     return theme;
 };
 exports.resolveTheme = resolveTheme;

package/lib/app/resolveThemeInfo.d.ts

@@ -0,0 +1,5 @@
+import type { App, ThemeInfo } from '../types';
+/**
+ * Resolve theme info and its parent theme info
+ */
+export declare const resolveThemeInfo: (app: App, themeName: string) => ThemeInfo;

package/lib/app/resolveThemeInfo.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveThemeInfo = void 0;
+const resolvePluginsFromConfig_1 = require("./resolvePluginsFromConfig");
+const resolveTheme_1 = require("./resolveTheme");
+const resolveThemeLayouts_1 = require("./resolveThemeLayouts");
+/**
+ * Resolve theme info and its parent theme info
+ */
+const resolveThemeInfo = (app, themeName) => {
+    // resolve current theme info
+    const theme = (0, resolveTheme_1.resolveTheme)(app, themeName);
+    const themeInfo = {
+        layouts: (0, resolveThemeLayouts_1.resolveThemeLayouts)(theme.layouts),
+        plugins: [theme, ...(0, resolvePluginsFromConfig_1.resolvePluginsFromConfig)(app, theme.plugins)],
+    };
+    // return if current theme does not have a parent theme
+    if (!theme.extends) {
+        return themeInfo;
+    }
+    // resolve parent theme info recursively
+    const parentThemeInfo = (0, exports.resolveThemeInfo)(app, theme.extends);
+    return {
+        layouts: { ...parentThemeInfo.layouts, ...themeInfo.layouts },
+        plugins: [...parentThemeInfo.plugins, ...themeInfo.plugins],
+    };
+};
+exports.resolveThemeInfo = resolveThemeInfo;

package/lib/app/resolveThemeLayouts.js

@@ -8,7 +8,7 @@ const utils_1 = require("@vuepress/utils");
  */
 const resolveThemeLayouts = (layouts = {}) => {
     // use the layouts component map directly
-    if (shared_1.isPlainObject(layouts)) {
+    if ((0, shared_1.isPlainObject)(layouts)) {
         return layouts;
     }
     // resolve the layouts directory

package/lib/page/createPage.js

@@ -6,8 +6,8 @@ const renderPageContent_1 = require("./renderPageContent");
 const renderPageExcerpt_1 = require("./renderPageExcerpt");
 const resolvePageComponentInfo_1 = require("./resolvePageComponentInfo");
 const resolvePageContent_1 = require("./resolvePageContent");
-const resolvePageDataInfo_1 = require("./resolvePageDataInfo");
 const resolvePageData_1 = require("./resolvePageData");
+const resolvePageDataInfo_1 = require("./resolvePageDataInfo");
 const resolvePageDate_1 = require("./resolvePageDate");
 const resolvePageFileContent_1 = require("./resolvePageFileContent");
 const resolvePageFilePath_1 = require("./resolvePageFilePath");
@@ -21,22 +21,22 @@ const resolvePagePermalink_1 = require("./resolvePagePermalink");
 const resolvePageSlug_1 = require("./resolvePageSlug");
 const createPage = async (app, optionsRaw) => {
     // resolve page options from raw options
-    const options = await resolvePageOptions_1.resolvePageOptions({ app, optionsRaw });
+    const options = await (0, resolvePageOptions_1.resolvePageOptions)({ app, optionsRaw });
     // resolve page file absolute path and relative path
-    const { filePath, filePathRelative } = resolvePageFilePath_1.resolvePageFilePath({
+    const { filePath, filePathRelative } = (0, resolvePageFilePath_1.resolvePageFilePath)({
         app,
         options,
     });
     // read the raw file content according to the absolute file path
-    const contentRaw = await resolvePageFileContent_1.resolvePageFileContent({ filePath, options });
+    const contentRaw = await (0, resolvePageFileContent_1.resolvePageFileContent)({ filePath, options });
     // resolve content & frontmatter & raw excerpt from raw content
-    const { content, frontmatterRaw, excerptRaw } = resolvePageContent_1.resolvePageContent({
+    const { content, frontmatterRaw, excerptRaw } = (0, resolvePageContent_1.resolvePageContent)({
         contentRaw,
     });
     // resolve frontmatter from raw frontmatter and page options
-    const frontmatter = resolvePageFrontmatter_1.resolvePageFrontmatter({ frontmatterRaw, options });
+    const frontmatter = (0, resolvePageFrontmatter_1.resolvePageFrontmatter)({ frontmatterRaw, options });
     // render excerpt
-    const excerpt = renderPageExcerpt_1.renderPageExcerpt({
+    const excerpt = (0, renderPageExcerpt_1.renderPageExcerpt)({
         app,
         excerptRaw,
         filePath,
@@ -44,7 +44,7 @@ const createPage = async (app, optionsRaw) => {
         frontmatter,
     });
     // render page content and extract information
-    const { contentRendered, deps, headers, hoistedTags, links, title, } = await renderPageContent_1.renderPageContent({
+    const { contentRendered, deps, headers, hoistedTags, links, title, } = await (0, renderPageContent_1.renderPageContent)({
         app,
         content,
         filePath,
@@ -52,15 +52,15 @@ const createPage = async (app, optionsRaw) => {
         frontmatter,
     });
     // resolve slug from file path
-    const slug = resolvePageSlug_1.resolvePageSlug({ filePathRelative });
+    const slug = (0, resolvePageSlug_1.resolvePageSlug)({ filePathRelative });
     // resolve date from file path
-    const date = resolvePageDate_1.resolvePageDate({ frontmatter, filePathRelative });
+    const date = (0, resolvePageDate_1.resolvePageDate)({ frontmatter, filePathRelative });
     // infer page path according to file path
-    const { pathInferred, pathLocale } = inferPagePath_1.inferPagePath({ app, filePathRelative });
+    const { pathInferred, pathLocale } = (0, inferPagePath_1.inferPagePath)({ app, filePathRelative });
     // resolve language from frontmatter and site options
-    const lang = resolvePageLang_1.resolvePageLang({ app, frontmatter, pathLocale });
+    const lang = (0, resolvePageLang_1.resolvePageLang)({ app, frontmatter, pathLocale });
     // resolve page permalink
-    const permalink = resolvePagePermalink_1.resolvePagePermalink({
+    const permalink = (0, resolvePagePermalink_1.resolvePagePermalink)({
         frontmatter,
         slug,
         date,
@@ -68,22 +68,22 @@ const createPage = async (app, optionsRaw) => {
         pathLocale,
     });
     // resolve page path
-    const path = resolvePagePath_1.resolvePagePath({ permalink, pathInferred, options });
+    const path = (0, resolvePagePath_1.resolvePagePath)({ permalink, pathInferred, options });
     // resolve path key
-    const key = resolvePageKey_1.resolvePageKey({ path });
+    const key = (0, resolvePageKey_1.resolvePageKey)({ path });
     // resolve page rendered html file path
-    const { htmlFilePath, htmlFilePathRelative } = resolvePageHtmlInfo_1.resolvePageHtmlInfo({
+    const { htmlFilePath, htmlFilePathRelative } = (0, resolvePageHtmlInfo_1.resolvePageHtmlInfo)({
         app,
         path,
     });
     // resolve page component and extract headers & links
-    const { componentFilePath, componentFilePathRelative, componentFileChunkName, } = await resolvePageComponentInfo_1.resolvePageComponentInfo({
+    const { componentFilePath, componentFilePathRelative, componentFileChunkName, } = await (0, resolvePageComponentInfo_1.resolvePageComponentInfo)({
         app,
         hoistedTags,
         htmlFilePathRelative,
         key,
     });
-    const { dataFilePath, dataFilePathRelative, dataFileChunkName, } = resolvePageDataInfo_1.resolvePageDataInfo({ app, htmlFilePathRelative, key });
+    const { dataFilePath, dataFilePathRelative, dataFileChunkName, } = (0, resolvePageDataInfo_1.resolvePageDataInfo)({ app, htmlFilePathRelative, key });
     const page = {
         // base fields
         key,
@@ -117,7 +117,7 @@ const createPage = async (app, optionsRaw) => {
         htmlFilePathRelative,
     };
     // resolve page data
-    page.data = await resolvePageData_1.resolvePageData({ app, page });
+    page.data = await (0, resolvePageData_1.resolvePageData)({ app, page });
     return page;
 };
 exports.createPage = createPage;

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/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/resolvePageOptions.js

@@ -5,9 +5,10 @@ exports.resolvePageOptions = void 0;
  * Render page content and extract related info
  */
 const resolvePageOptions = async ({ app, optionsRaw, }) => {
+    // avoid mutating the original options object provided by user
     const options = { ...optionsRaw };
     // plugin hook: extendsPageOptions
-    const extendsPageOptions = await app.pluginApi.hooks.extendsPageOptions.process(optionsRaw, app);
+    const extendsPageOptions = await app.pluginApi.hooks.extendsPageOptions.process(options, app);
     extendsPageOptions.forEach((item) => Object.assign(options, item));
     return options;
 };

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/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'),
+    onInitialized: (0, createHookQueue_1.createHookQueue)('onInitialized'),
+    onPrepared: (0, createHookQueue_1.createHookQueue)('onPrepared'),
+    onWatched: (0, createHookQueue_1.createHookQueue)('onWatched'),
+    onGenerated: (0, createHookQueue_1.createHookQueue)('onGenerated'),
     // page hooks
-    extendsPageOptions: createHookQueue_1.createHookQueue('extendsPageOptions'),
-    extendsPageData: createHookQueue_1.createHookQueue('extendsPageData'),
+    extendsPageOptions: (0, createHookQueue_1.createHookQueue)('extendsPageOptions'),
+    extendsPageData: (0, createHookQueue_1.createHookQueue)('extendsPageData'),
     // markdown hooks
-    extendsMarkdown: createHookQueue_1.createHookQueue('extendsMarkdown'),
+    extendsMarkdown: (0, createHookQueue_1.createHookQueue)('extendsMarkdown'),
     // 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';

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

@@ -113,8 +113,26 @@ export interface Page<T extends PageData = PageData> extends PageData {
  * 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/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.23",
+  "version": "2.0.0-beta.27",
   "description": "Core package of VuePress",
   "keywords": [
     "vuepress",
@@ -26,15 +26,15 @@
     "clean": "rimraf lib *.tsbuildinfo"
   },
   "dependencies": {
-    "@vuepress/client": "2.0.0-beta.23",
-    "@vuepress/markdown": "2.0.0-beta.23",
-    "@vuepress/shared": "2.0.0-beta.23",
-    "@vuepress/utils": "2.0.0-beta.23",
+    "@vuepress/client": "2.0.0-beta.27",
+    "@vuepress/markdown": "2.0.0-beta.27",
+    "@vuepress/shared": "2.0.0-beta.27",
+    "@vuepress/utils": "2.0.0-beta.27",
     "gray-matter": "^4.0.3",
     "toml": "^3.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a8fde04c51473d9b7aef1a49550f9c8f3483b645"
+  "gitHead": "2671a94fe6864e215eb84f318b7e657744a0bc5d"
 }

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;