@vuepress/core 2.0.0-beta.29 → 2.0.0-beta.32

package/lib/app/appInit.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.appInit = void 0;
 const utils_1 = require("@vuepress/utils");
-const createAppMarkdown_1 = require("./createAppMarkdown");
-const createAppPages_1 = require("./createAppPages");
+const resolveAppMarkdown_1 = require("./resolveAppMarkdown");
+const resolveAppPages_1 = require("./resolveAppPages");
 const log = (0, utils_1.debug)('vuepress:core/app');
 /**
  * Initialize a vuepress app
@@ -17,9 +17,9 @@ const appInit = async (app) => {
     // hooks in plugins will take effect after `registerHooks()`
     app.pluginApi.registerHooks();
     // create markdown
-    app.markdown = await (0, createAppMarkdown_1.createAppMarkdown)(app);
+    app.markdown = await (0, resolveAppMarkdown_1.resolveAppMarkdown)(app);
     // create pages
-    app.pages = await (0, createAppPages_1.createAppPages)(app);
+    app.pages = await (0, resolveAppPages_1.resolveAppPages)(app);
     // plugin hook: onInitialized
     await app.pluginApi.hooks.onInitialized.process(app);
     log('init finish');

package/lib/app/appUse.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.appUse = void 0;
 const utils_1 = require("@vuepress/utils");
-const resolvePlugin_1 = require("./resolvePlugin");
+const resolvePluginObject_1 = require("./resolvePluginObject");
 const log = (0, utils_1.debug)('vuepress:core/app');
 const appUse = (app, rawPlugin, config) => {
-    const plugin = (0, resolvePlugin_1.resolvePlugin)(app, rawPlugin, config);
+    const plugin = (0, resolvePluginObject_1.resolvePluginObject)(app, rawPlugin, config);
     log(`use plugin ${utils_1.chalk.magenta(plugin.name)}`);
     if (plugin.multiple !== true) {
         // remove duplicated plugin

package/lib/app/createBaseApp.js

@@ -5,44 +5,45 @@ const pluginApi_1 = require("../pluginApi");
 const appInit_1 = require("./appInit");
 const appPrepare_1 = require("./appPrepare");
 const appUse_1 = require("./appUse");
-const createAppDir_1 = require("./createAppDir");
-const createAppEnv_1 = require("./createAppEnv");
-const createAppOptions_1 = require("./createAppOptions");
-const createAppSiteData_1 = require("./createAppSiteData");
-const createAppVersion_1 = require("./createAppVersion");
-const createAppWriteTemp_1 = require("./createAppWriteTemp");
+const resolveAppDir_1 = require("./resolveAppDir");
+const resolveAppEnv_1 = require("./resolveAppEnv");
+const resolveAppOptions_1 = require("./resolveAppOptions");
+const resolveAppSiteData_1 = require("./resolveAppSiteData");
+const resolveAppVersion_1 = require("./resolveAppVersion");
+const resolveAppWriteTemp_1 = require("./resolveAppWriteTemp");
 const resolvePluginsFromConfig_1 = require("./resolvePluginsFromConfig");
 const resolveThemeInfo_1 = require("./resolveThemeInfo");
 /**
  * Create vuepress app
  */
 const createBaseApp = (config, isBuild = false) => {
-    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 options = (0, resolveAppOptions_1.resolveAppOptions)(config);
+    const dir = (0, resolveAppDir_1.resolveAppDir)(options);
+    const env = (0, resolveAppEnv_1.resolveAppEnv)(options, isBuild);
     const pluginApi = (0, pluginApi_1.createPluginApi)();
-    const writeTemp = (0, createAppWriteTemp_1.createAppWriteTemp)(dir);
+    const siteData = (0, resolveAppSiteData_1.resolveAppSiteData)(options);
+    const version = (0, resolveAppVersion_1.resolveAppVersion)();
+    const writeTemp = (0, resolveAppWriteTemp_1.resolveAppWriteTemp)(dir);
     const app = {
-        version,
         options,
+        siteData,
+        version,
+        // utils
         dir,
         env,
-        siteData,
         pluginApi,
         writeTemp,
+        // methods
         use: (...args) => (0, appUse_1.appUse)(app, ...args),
         init: () => (0, appInit_1.appInit)(app),
         prepare: () => (0, appPrepare_1.appPrepare)(app),
     };
-    // resolve theme info and use theme plugins
-    const themeInfo = (0, resolveThemeInfo_1.resolveThemeInfo)(app, options.theme);
-    themeInfo.plugins.forEach((plugin) => app.use(plugin));
+    // resolve theme info and set app layouts
+    const themeInfo = (0, resolveThemeInfo_1.resolveThemeInfo)(app, options.theme, options.themeConfig);
     app.layouts = themeInfo.layouts;
     // resolve plugins
     const plugins = (0, resolvePluginsFromConfig_1.resolvePluginsFromConfig)(app, options.plugins);
-    plugins.forEach((plugin) => app.use(plugin));
+    [...themeInfo.plugins, ...plugins].forEach((plugin) => app.use(plugin));
     return app;
 };
 exports.createBaseApp = createBaseApp;

package/lib/app/index.d.ts

@@ -2,21 +2,21 @@ export * from './prepare';
 export * from './appInit';
 export * from './appPrepare';
 export * from './appUse';
-export * from './createAppDir';
-export * from './createAppEnv';
-export * from './createAppOptions';
-export * from './createAppPages';
-export * from './createAppSiteData';
-export * from './createAppVersion';
-export * from './createAppWriteTemp';
 export * from './createBaseApp';
 export * from './createBuildApp';
 export * from './createDevApp';
 export * from './normalizePluginConfig';
+export * from './resolveAppDir';
+export * from './resolveAppEnv';
+export * from './resolveAppOptions';
+export * from './resolveAppPages';
+export * from './resolveAppSiteData';
+export * from './resolveAppVersion';
+export * from './resolveAppWriteTemp';
 export * from './resolveBundler';
-export * from './resolvePlugin';
+export * from './resolvePluginObject';
 export * from './resolvePluginModule';
 export * from './resolvePluginsFromConfig';
-export * from './resolveTheme';
+export * from './resolveThemeObject';
 export * from './resolveThemeInfo';
 export * from './resolveThemeLayouts';

package/lib/app/index.js

@@ -14,21 +14,21 @@ __exportStar(require("./prepare"), exports);
 __exportStar(require("./appInit"), exports);
 __exportStar(require("./appPrepare"), exports);
 __exportStar(require("./appUse"), exports);
-__exportStar(require("./createAppDir"), exports);
-__exportStar(require("./createAppEnv"), exports);
-__exportStar(require("./createAppOptions"), exports);
-__exportStar(require("./createAppPages"), exports);
-__exportStar(require("./createAppSiteData"), exports);
-__exportStar(require("./createAppVersion"), exports);
-__exportStar(require("./createAppWriteTemp"), exports);
 __exportStar(require("./createBaseApp"), exports);
 __exportStar(require("./createBuildApp"), exports);
 __exportStar(require("./createDevApp"), exports);
 __exportStar(require("./normalizePluginConfig"), exports);
+__exportStar(require("./resolveAppDir"), exports);
+__exportStar(require("./resolveAppEnv"), exports);
+__exportStar(require("./resolveAppOptions"), exports);
+__exportStar(require("./resolveAppPages"), exports);
+__exportStar(require("./resolveAppSiteData"), exports);
+__exportStar(require("./resolveAppVersion"), exports);
+__exportStar(require("./resolveAppWriteTemp"), exports);
 __exportStar(require("./resolveBundler"), exports);
-__exportStar(require("./resolvePlugin"), exports);
+__exportStar(require("./resolvePluginObject"), exports);
 __exportStar(require("./resolvePluginModule"), exports);
 __exportStar(require("./resolvePluginsFromConfig"), exports);
-__exportStar(require("./resolveTheme"), exports);
+__exportStar(require("./resolveThemeObject"), exports);
 __exportStar(require("./resolveThemeInfo"), exports);
 __exportStar(require("./resolveThemeLayouts"), exports);

package/lib/app/{createAppDir.d.ts → resolveAppDir.d.ts}

@@ -4,6 +4,6 @@ import type { AppDir, AppDirFunction, AppOptions } from '../types';
  */
 export declare const createAppDirFunction: (baseDir: string) => AppDirFunction;
 /**
- * Create directory utils for vuepress app
+ * Resolve directory utils for vuepress app
  */
-export declare const createAppDir: (options: AppOptions) => AppDir;
+export declare const resolveAppDir: (options: AppOptions) => AppDir;

package/lib/app/{createAppDir.js → resolveAppDir.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAppDir = exports.createAppDirFunction = void 0;
+exports.resolveAppDir = exports.createAppDirFunction = void 0;
 const utils_1 = require("@vuepress/utils");
 /**
  * Create directory util function
@@ -10,9 +10,9 @@ const createAppDirFunction = (baseDir) => {
 };
 exports.createAppDirFunction = createAppDirFunction;
 /**
- * Create directory utils for vuepress app
+ * Resolve directory utils for vuepress app
  */
-const createAppDir = (options) => {
+const resolveAppDir = (options) => {
     const cache = (0, exports.createAppDirFunction)(options.cache);
     const temp = (0, exports.createAppDirFunction)(options.temp);
     const source = (0, exports.createAppDirFunction)(options.source);
@@ -29,4 +29,4 @@ const createAppDir = (options) => {
         public: publicDir,
     };
 };
-exports.createAppDir = createAppDir;
+exports.resolveAppDir = resolveAppDir;

package/lib/app/resolveAppEnv.d.ts

@@ -0,0 +1,5 @@
+import type { AppEnv, AppOptions } from '../types';
+/**
+ * Resolve environment flags for vuepress app
+ */
+export declare const resolveAppEnv: (options: AppOptions, isBuild: boolean) => AppEnv;

package/lib/app/resolveAppEnv.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveAppEnv = void 0;
+/**
+ * Resolve environment flags for vuepress app
+ */
+const resolveAppEnv = (options, isBuild) => ({
+    isBuild,
+    isDev: !isBuild,
+    isDebug: options.debug,
+});
+exports.resolveAppEnv = resolveAppEnv;

package/lib/app/resolveAppMarkdown.d.ts

@@ -0,0 +1,6 @@
+import type { Markdown } from '@vuepress/markdown';
+import type { App } from '../types';
+/**
+ * Resolve markdown-it instance for vuepress app
+ */
+export declare const resolveAppMarkdown: (app: App) => Promise<Markdown>;

package/lib/app/{createAppMarkdown.js → resolveAppMarkdown.js}

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAppMarkdown = void 0;
+exports.resolveAppMarkdown = void 0;
 const markdown_1 = require("@vuepress/markdown");
 /**
- * Create markdown-it instance for vuepress app
+ * Resolve markdown-it instance for vuepress app
  */
-const createAppMarkdown = async (app) => {
+const resolveAppMarkdown = async (app) => {
     // plugin hook: extendsMarkdownOptions
     await app.pluginApi.hooks.extendsMarkdownOptions.process(app.options.markdown, app);
     const markdown = (0, markdown_1.createMarkdown)(app.options.markdown);
@@ -13,4 +13,4 @@ const createAppMarkdown = async (app) => {
     await app.pluginApi.hooks.extendsMarkdown.process(markdown, app);
     return markdown;
 };
-exports.createAppMarkdown = createAppMarkdown;
+exports.resolveAppMarkdown = resolveAppMarkdown;

package/lib/app/resolveAppOptions.d.ts

@@ -0,0 +1,5 @@
+import type { AppConfig, AppOptions } from '../types';
+/**
+ * Create app options with default values
+ */
+export declare const resolveAppOptions: ({ base, lang, title, description, head, locales, theme, themeConfig, bundler, bundlerConfig, source, dest, temp, cache, public: publicDir, markdown, host, port, debug, open, pagePatterns, templateDev, templateBuild, shouldPreload, shouldPrefetch, plugins, }: AppConfig) => AppOptions;

package/lib/app/{createAppOptions.js → resolveAppOptions.js}

@@ -1,23 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAppOptions = void 0;
+exports.resolveAppOptions = void 0;
 const utils_1 = require("@vuepress/utils");
 /**
  * Create app options with default values
  */
-const createAppOptions = ({ 
+const resolveAppOptions = ({ 
 // site config
 base = '/', lang = 'en-US', title = '', description = '', head = [], locales = {}, 
 // theme config
-theme = '@vuepress/default', themeConfig = {}, 
+theme = '@vuepress/theme-default', themeConfig = {}, 
 // bundler config
-bundler = '@vuepress/vite', bundlerConfig = {}, 
+bundler = '@vuepress/bundler-vite', bundlerConfig = {}, 
 // directory config
 source, dest = utils_1.path.resolve(source, '.vuepress/dist'), temp = utils_1.path.resolve(source, '.vuepress/.temp'), cache = utils_1.path.resolve(source, '.vuepress/.cache'), public: publicDir = utils_1.path.resolve(source, '.vuepress/public'), 
 // markdown config
 markdown = {}, 
 // development config
-host = '0.0.0.0', port = 8080, debug = false, open = false, pagePatterns = ['**/*.md', '!.vuepress', '!node_modules'], templateDev = utils_1.path.normalize(require.resolve('@vuepress/client/templates/index.dev.html')), templateSSR = utils_1.path.normalize(require.resolve('@vuepress/client/templates/index.ssr.html')), shouldPreload = true, shouldPrefetch = false, 
+host = '0.0.0.0', port = 8080, debug = false, open = false, pagePatterns = ['**/*.md', '!.vuepress', '!node_modules'], templateDev = utils_1.path.normalize(require.resolve('@vuepress/client/templates/index.dev.html')), templateBuild = utils_1.path.normalize(require.resolve('@vuepress/client/templates/index.build.html')), shouldPreload = true, shouldPrefetch = false, 
 // plugin config
 plugins = [], }) => ({
     base,
@@ -42,9 +42,9 @@ plugins = [], }) => ({
     open,
     pagePatterns,
     templateDev,
-    templateSSR,
+    templateBuild,
     shouldPreload,
     shouldPrefetch,
     plugins,
 });
-exports.createAppOptions = createAppOptions;
+exports.resolveAppOptions = resolveAppOptions;

package/lib/app/resolveAppPages.d.ts

@@ -0,0 +1,5 @@
+import type { App, Page } from '../types';
+/**
+ * Resolve pages for vuepress app
+ */
+export declare const resolveAppPages: (app: App) => Promise<Page[]>;

package/lib/app/{createAppPages.js → resolveAppPages.js}

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAppPages = void 0;
+exports.resolveAppPages = void 0;
 const utils_1 = require("@vuepress/utils");
 const page_1 = require("../page");
 const log = (0, utils_1.debug)('vuepress:core/app');
 /**
- * Create pages for vuepress app
+ * Resolve pages for vuepress app
  */
-const createAppPages = async (app) => {
-    log('createAppPages start');
+const resolveAppPages = async (app) => {
+    log('resolveAppPages start');
     // resolve page absolute file paths according to the page patterns
     const pageFilePaths = await (0, utils_1.globby)(app.options.pagePatterns, {
         absolute: true,
@@ -33,7 +33,7 @@ const createAppPages = async (app) => {
             },
         }));
     }
-    log('createAppPages finish');
+    log('resolveAppPages finish');
     return pages;
 };
-exports.createAppPages = createAppPages;
+exports.resolveAppPages = resolveAppPages;

package/lib/app/resolveAppSiteData.d.ts

@@ -0,0 +1,7 @@
+import type { AppOptions, SiteData } from '../types';
+/**
+ * Resolve site data for vuepress app
+ *
+ * Site data will also be used in client
+ */
+export declare const resolveAppSiteData: (options: AppOptions) => SiteData;

package/lib/app/{createAppSiteData.js → resolveAppSiteData.js}

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAppSiteData = void 0;
+exports.resolveAppSiteData = void 0;
 /**
- * Create site data for vuepress app
+ * Resolve site data for vuepress app
  *
  * Site data will also be used in client
  */
-const createAppSiteData = (options) => ({
+const resolveAppSiteData = (options) => ({
     base: options.base,
     lang: options.lang,
     title: options.title,
@@ -14,4 +14,4 @@ const createAppSiteData = (options) => ({
     head: options.head,
     locales: options.locales,
 });
-exports.createAppSiteData = createAppSiteData;
+exports.resolveAppSiteData = resolveAppSiteData;

package/lib/app/resolveAppVersion.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Resolve version of vuepress app
+ */
+export declare const resolveAppVersion: () => string;

package/lib/app/resolveAppVersion.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveAppVersion = void 0;
+/**
+ * Resolve version of vuepress app
+ */
+const resolveAppVersion = () => {
+    return require('../../package.json').version;
+};
+exports.resolveAppVersion = resolveAppVersion;

package/lib/app/resolveAppWriteTemp.d.ts

@@ -0,0 +1,5 @@
+import type { AppDir, AppWriteTemp } from '../types';
+/**
+ * Resolve write temp file util for vuepress app
+ */
+export declare const resolveAppWriteTemp: (dir: AppDir) => AppWriteTemp;

package/lib/app/{createAppWriteTemp.js → resolveAppWriteTemp.js}

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAppWriteTemp = void 0;
+exports.resolveAppWriteTemp = void 0;
 const utils_1 = require("@vuepress/utils");
 /**
- * Create write temp file util for vuepress app
+ * Resolve write temp file util for vuepress app
  */
-const createAppWriteTemp = (dir) => {
+const resolveAppWriteTemp = (dir) => {
     const tempCache = new Map();
     const writeTemp = async (file, content) => {
         const filePath = dir.temp(file);
@@ -18,4 +18,4 @@ const createAppWriteTemp = (dir) => {
     };
     return writeTemp;
 };
-exports.createAppWriteTemp = createAppWriteTemp;
+exports.resolveAppWriteTemp = resolveAppWriteTemp;

package/lib/app/resolvePluginObject.d.ts

@@ -0,0 +1,5 @@
+import type { App, Plugin, PluginObject, PluginOptions } from '../types';
+/**
+ * Resolve a plugin object according to name / path / module and config
+ */
+export declare const resolvePluginObject: <T extends PluginOptions = PluginOptions, U extends PluginObject = PluginObject>(app: App, plugin: string | Plugin<T, U>, pluginConfig?: Partial<T>) => U;

package/lib/app/{resolvePlugin.js → resolvePluginObject.js}

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvePlugin = void 0;
+exports.resolvePluginObject = void 0;
 const shared_1 = require("@vuepress/shared");
 const utils_1 = require("@vuepress/utils");
 const resolvePluginModule_1 = require("./resolvePluginModule");
 /**
- * Resolve a plugin according to name / path / module and config
+ * Resolve a plugin object according to name / path / module and config
  */
-const resolvePlugin = (app, plugin, config = {}) => {
+const resolvePluginObject = (app, plugin, pluginConfig = {}) => {
     const pluginModule = (0, shared_1.isString)(plugin)
         ? (0, resolvePluginModule_1.resolvePluginModule)(plugin)
         : plugin;
@@ -15,8 +15,8 @@ const resolvePlugin = (app, plugin, config = {}) => {
         throw utils_1.logger.createError(`plugin is not found: ${utils_1.chalk.magenta(plugin)}`);
     }
     const pluginObject = (0, shared_1.isFunction)(pluginModule)
-        ? pluginModule(config, app)
+        ? pluginModule(pluginConfig, app)
         : pluginModule;
     return pluginObject;
 };
-exports.resolvePlugin = resolvePlugin;
+exports.resolvePluginObject = resolvePluginObject;

package/lib/app/resolvePluginsFromConfig.d.ts

@@ -1,5 +1,5 @@
 import type { App, PluginConfig, PluginObject } from '../types';
 /**
- * Resolve plugins from plugin config array
+ * Resolve plugin objects from plugin config array
  */
 export declare const resolvePluginsFromConfig: (app: App, plugins?: PluginConfig[]) => PluginObject[];

package/lib/app/resolvePluginsFromConfig.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolvePluginsFromConfig = void 0;
 const normalizePluginConfig_1 = require("./normalizePluginConfig");
-const resolvePlugin_1 = require("./resolvePlugin");
+const resolvePluginObject_1 = require("./resolvePluginObject");
 /**
- * Resolve plugins from plugin config array
+ * Resolve plugin objects from plugin config array
  */
 const resolvePluginsFromConfig = (app, plugins = []) => plugins.reduce((prev, item) => {
     const [plugin, config] = (0, normalizePluginConfig_1.normalizePluginConfig)(item);
     if (config !== false) {
-        prev.push((0, resolvePlugin_1.resolvePlugin)(app, plugin, config === true ? {} : config));
+        prev.push((0, resolvePluginObject_1.resolvePluginObject)(app, plugin, config === true ? {} : config));
     }
     return prev;
 }, []);

package/lib/app/resolveThemeInfo.d.ts

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

package/lib/app/resolveThemeInfo.js

@@ -2,24 +2,27 @@
 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");
+const resolveThemeObject_1 = require("./resolveThemeObject");
 /**
  * Resolve theme info and its parent theme info
  */
-const resolveThemeInfo = (app, themeName) => {
+const resolveThemeInfo = (app, theme, themeConfig) => {
     // resolve current theme info
-    const theme = (0, resolveTheme_1.resolveTheme)(app, themeName);
+    const themeObject = (0, resolveThemeObject_1.resolveThemeObject)(app, theme, themeConfig);
     const themeInfo = {
-        layouts: (0, resolveThemeLayouts_1.resolveThemeLayouts)(theme.layouts),
-        plugins: [...(0, resolvePluginsFromConfig_1.resolvePluginsFromConfig)(app, theme.plugins), theme],
+        layouts: (0, resolveThemeLayouts_1.resolveThemeLayouts)(themeObject.layouts),
+        plugins: [
+            ...(0, resolvePluginsFromConfig_1.resolvePluginsFromConfig)(app, themeObject.plugins),
+            themeObject,
+        ],
     };
     // return if current theme does not have a parent theme
-    if (!theme.extends) {
+    if (!themeObject.extends) {
         return themeInfo;
     }
     // resolve parent theme info recursively
-    const parentThemeInfo = (0, exports.resolveThemeInfo)(app, theme.extends);
+    const parentThemeInfo = (0, exports.resolveThemeInfo)(app, themeObject.extends, themeConfig);
     return {
         layouts: { ...parentThemeInfo.layouts, ...themeInfo.layouts },
         plugins: [...parentThemeInfo.plugins, ...themeInfo.plugins],

package/lib/app/resolveThemeObject.d.ts

@@ -0,0 +1,5 @@
+import type { App, ThemeConfig, ThemeObject } from '../types';
+/**
+ * Resolve a theme object according to the theme name
+ */
+export declare const resolveThemeObject: (app: App, theme: string, themeConfig: ThemeConfig) => ThemeObject;

package/lib/app/resolveThemeObject.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveThemeObject = void 0;
+const shared_1 = require("@vuepress/shared");
+const utils_1 = require("@vuepress/utils");
+const resolvePluginObject_1 = require("./resolvePluginObject");
+/**
+ * Resolve a theme object according to the theme name
+ */
+const resolveThemeObject = (app, theme, themeConfig) => {
+    // resolve theme entry according to theme name
+    const themeEntry = (0, utils_1.requireResolve)(utils_1.path.isAbsolute(theme)
+        ? theme
+        : (0, shared_1.normalizePackageName)(theme, 'vuepress', 'theme'));
+    if (themeEntry === null) {
+        throw utils_1.logger.createError(`theme is not found: ${utils_1.chalk.magenta(theme)}`);
+    }
+    // resolve theme object from theme entry
+    const themeObject = (0, resolvePluginObject_1.resolvePluginObject)(app, themeEntry, themeConfig);
+    return themeObject;
+};
+exports.resolveThemeObject = resolveThemeObject;

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

@@ -10,14 +10,6 @@ import type { AppDir, AppEnv, AppWriteTemp } from './utils';
  * Vuepress app
  */
 export interface App {
-    /**
-     * Version of vuepress core
-     */
-    version: string;
-    /**
-     * Options that filled all optional fields with a default value
-     */
-    options: AppOptions;
     /**
      * Directory utils
      */
@@ -27,13 +19,21 @@ export interface App {
      */
     env: AppEnv;
     /**
-     * Site data, which will be used in client side
+     * Options that filled all optional fields with a default value
      */
-    siteData: SiteData;
+    options: AppOptions;
     /**
      * Plugin system
      */
     pluginApi: PluginApi;
+    /**
+     * Site data, which will be used in client side
+     */
+    siteData: SiteData;
+    /**
+     * Version of vuepress core
+     */
+    version: string;
     /**
      * Write temp file
      */

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

@@ -4,28 +4,41 @@ import type { BundlerConfig } from '../bundler';
 import type { PluginConfig } from '../plugin';
 import type { ThemeConfig } from '../theme';
 /**
- * Vuepress app options
+ * Config to create vuepress app
  */
-export interface AppOptions<T extends ThemeConfig = ThemeConfig, U extends BundlerConfig = BundlerConfig> extends SiteData {
-    theme: string;
-    themeConfig: Partial<T>;
-    bundler: string;
-    bundlerConfig: Partial<U>;
+export declare type AppConfig<T extends ThemeConfig = ThemeConfig, U extends BundlerConfig = BundlerConfig> = Partial<SiteData> & AppConfigDev & AppConfigBuild & {
+    theme?: string;
+    themeConfig?: Partial<T>;
+    bundler?: string;
+    bundlerConfig?: Partial<U>;
     source: string;
-    dest: string;
-    temp: string;
-    cache: string;
-    public: string;
-    debug: boolean;
-    markdown: MarkdownOptions;
-    pagePatterns: string[];
-    plugins: PluginConfig[];
-    host: string;
-    port: number;
-    open: boolean;
-    templateDev: string;
-    shouldPreload: ((file: string, type: string) => boolean) | boolean;
-    shouldPrefetch: ((file: string, type: string) => boolean) | boolean;
-    templateSSR: string;
+    dest?: string;
+    temp?: string;
+    cache?: string;
+    public?: string;
+    debug?: boolean;
+    pagePatterns?: string[];
+    markdown?: MarkdownOptions;
+    plugins?: PluginConfig[];
+};
+/**
+ * Vuepress app config for dev
+ */
+export interface AppConfigDev {
+    host?: string;
+    port?: number;
+    open?: boolean;
+    templateDev?: string;
 }
-export declare type AppConfig<T extends ThemeConfig = ThemeConfig, U extends BundlerConfig = BundlerConfig> = Partial<AppOptions<T, U>> & Pick<AppOptions<T, U>, 'source'>;
+/**
+ * Vuepress app config for build
+ */
+export interface AppConfigBuild {
+    shouldPreload?: ((file: string, type: string) => boolean) | boolean;
+    shouldPrefetch?: ((file: string, type: string) => boolean) | boolean;
+    templateBuild?: string;
+}
+/**
+ * Vuepress app options
+ */
+export declare type AppOptions<T extends ThemeConfig = ThemeConfig, U extends BundlerConfig = BundlerConfig> = Required<AppConfig<T, U>>;

package/package.json

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

package/lib/app/createAppEnv.d.ts

@@ -1,5 +0,0 @@
-import type { AppEnv, AppOptions } from '../types';
-/**
- * Create environment flags for vuepress app
- */
-export declare const createAppEnv: (options: AppOptions, isBuild: boolean) => AppEnv;

package/lib/app/createAppEnv.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAppEnv = void 0;
-/**
- * Create environment flags for vuepress app
- */
-const createAppEnv = (options, isBuild) => ({
-    isBuild,
-    isDev: !isBuild,
-    isDebug: options.debug,
-});
-exports.createAppEnv = createAppEnv;

package/lib/app/createAppMarkdown.d.ts

@@ -1,6 +0,0 @@
-import type { Markdown } from '@vuepress/markdown';
-import type { App } from '../types';
-/**
- * Create markdown-it instance for vuepress app
- */
-export declare const createAppMarkdown: (app: App) => Promise<Markdown>;

package/lib/app/createAppOptions.d.ts

@@ -1,5 +0,0 @@
-import type { AppConfig, AppOptions } from '../types';
-/**
- * Create app options with default values
- */
-export declare const createAppOptions: ({ base, lang, title, description, head, locales, theme, themeConfig, bundler, bundlerConfig, source, dest, temp, cache, public: publicDir, markdown, host, port, debug, open, pagePatterns, templateDev, templateSSR, shouldPreload, shouldPrefetch, plugins, }: AppConfig) => AppOptions;

package/lib/app/createAppPages.d.ts

@@ -1,5 +0,0 @@
-import type { App, Page } from '../types';
-/**
- * Create pages for vuepress app
- */
-export declare const createAppPages: (app: App) => Promise<Page[]>;

package/lib/app/createAppSiteData.d.ts

@@ -1,7 +0,0 @@
-import type { AppOptions, SiteData } from '../types';
-/**
- * Create site data for vuepress app
- *
- * Site data will also be used in client
- */
-export declare const createAppSiteData: (options: AppOptions) => SiteData;

package/lib/app/createAppVersion.d.ts

@@ -1,4 +0,0 @@
-/**
- * Create version of vuepress app
- */
-export declare const createAppVersion: () => string;

package/lib/app/createAppVersion.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAppVersion = void 0;
-/**
- * Create version of vuepress app
- */
-const createAppVersion = () => {
-    return require('../../package.json').version;
-};
-exports.createAppVersion = createAppVersion;

package/lib/app/createAppWriteTemp.d.ts

@@ -1,5 +0,0 @@
-import type { AppDir, AppWriteTemp } from '../types';
-/**
- * Create write temp file util for vuepress app
- */
-export declare const createAppWriteTemp: (dir: AppDir) => AppWriteTemp;

package/lib/app/resolvePlugin.d.ts

@@ -1,5 +0,0 @@
-import type { App, Plugin, PluginObject, PluginOptions } from '../types';
-/**
- * Resolve a plugin according to name / path / module and config
- */
-export declare const resolvePlugin: <T extends PluginOptions = PluginOptions, U extends PluginObject = PluginObject>(app: App, plugin: string | Plugin<T, U>, config?: Partial<T>) => U;

package/lib/app/resolveTheme.d.ts

@@ -1,5 +0,0 @@
-import type { App, ThemeObject } from '../types';
-/**
- * Resolve a theme according to the theme name
- */
-export declare const resolveTheme: (app: App, themeName: string) => ThemeObject;

package/lib/app/resolveTheme.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveTheme = void 0;
-const shared_1 = require("@vuepress/shared");
-const utils_1 = require("@vuepress/utils");
-const resolvePlugin_1 = require("./resolvePlugin");
-/**
- * Resolve a theme according to the theme name
- */
-const resolveTheme = (app, themeName) => {
-    // resolve theme entry according to theme name
-    const themeEntry = (0, utils_1.requireResolve)(utils_1.path.isAbsolute(themeName)
-        ? themeName
-        : (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 = (0, resolvePlugin_1.resolvePlugin)(app, themeEntry, app.options.themeConfig);
-    return theme;
-};
-exports.resolveTheme = resolveTheme;