@vuepress/core 2.0.0-beta.38 → 2.0.0-beta.41

package/lib/app/appUse.d.ts

@@ -1,2 +1,2 @@
-import type { App, Plugin, PluginOptions } from '../types';
-export declare const appUse: <T extends PluginOptions>(app: App, rawPlugin: string | Plugin<T, import("../types").PluginObject>, config?: Partial<T> | undefined) => App;
+import type { App, Plugin } from '../types';
+export declare const appUse: (app: App, rawPlugin: Plugin) => App;

package/lib/app/appUse.js

@@ -4,20 +4,25 @@ exports.appUse = void 0;
 const utils_1 = require("@vuepress/utils");
 const resolvePluginObject_1 = require("./resolvePluginObject");
 const log = (0, utils_1.debug)('vuepress:core/app');
-const appUse = (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
-        const duplicateIndex = app.pluginApi.plugins.findIndex(({ name }) => name === plugin.name);
+const appUse = (app, rawPlugin) => {
+    const pluginObject = (0, resolvePluginObject_1.resolvePluginObject)(app, rawPlugin);
+    // ignore anonymous plugins or theme
+    if (!pluginObject.name) {
+        (0, utils_1.warn)(`an anonymous plugin or theme was detected and ignored`);
+        return app;
+    }
+    log(`use plugin ${utils_1.chalk.magenta(pluginObject.name)}`);
+    // handle duplicated plugins
+    if (pluginObject.multiple !== true) {
+        const duplicateIndex = app.pluginApi.plugins.findIndex(({ name }) => name === pluginObject.name);
         if (duplicateIndex !== -1) {
+            // remove the previous duplicated plugin
             app.pluginApi.plugins.splice(duplicateIndex, 1);
-            // show warning when duplicate plugins are detected
-            (0, 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(pluginObject.name)} has been used multiple times, only the last one will take effect`);
         }
     }
     // use plugin
-    app.pluginApi.plugins.push(plugin);
+    app.pluginApi.plugins.push(pluginObject);
     return app;
 };
 exports.appUse = appUse;

package/lib/app/createBaseApp.js

@@ -11,8 +11,7 @@ const resolveAppOptions_1 = require("./resolveAppOptions");
 const resolveAppSiteData_1 = require("./resolveAppSiteData");
 const resolveAppVersion_1 = require("./resolveAppVersion");
 const resolveAppWriteTemp_1 = require("./resolveAppWriteTemp");
-const setupAppPlugins_1 = require("./setupAppPlugins");
-const setupAppTheme_1 = require("./setupAppTheme");
+const setupAppThemeAndPlugins_1 = require("./setupAppThemeAndPlugins");
 /**
  * Create vuepress app
  */
@@ -41,8 +40,7 @@ const createBaseApp = (config, isBuild = false) => {
     // setup theme and plugins
     // notice that we setup theme before plugins,
     // so user plugins could override theme plugins
-    (0, setupAppTheme_1.setupAppTheme)(app, config);
-    (0, setupAppPlugins_1.setupAppPlugins)(app);
+    (0, setupAppThemeAndPlugins_1.setupAppThemeAndPlugins)(app, config);
     return app;
 };
 exports.createBaseApp = createBaseApp;

package/lib/app/createBuildApp.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBuildApp = void 0;
 const createBaseApp_1 = require("./createBaseApp");
-const resolveBundler_1 = require("./resolveBundler");
 /**
  * Create vuepress build app
  */
 const createBuildApp = (config) => {
     const app = (0, createBaseApp_1.createBaseApp)(config, true);
-    app.build = () => (0, resolveBundler_1.resolveBundler)(app.options).build(app);
+    app.build = () => app.options.bundler.build(app);
     return app;
 };
 exports.createBuildApp = createBuildApp;

package/lib/app/createDevApp.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDevApp = void 0;
 const createBaseApp_1 = require("./createBaseApp");
-const resolveBundler_1 = require("./resolveBundler");
 /**
  * Create vuepress dev app
  */
 const createDevApp = (config) => {
     const app = (0, createBaseApp_1.createBaseApp)(config, false);
-    app.dev = () => (0, resolveBundler_1.resolveBundler)(app.options).dev(app);
+    app.dev = () => app.options.bundler.dev(app);
     return app;
 };
 exports.createDevApp = createDevApp;

package/lib/app/index.d.ts

@@ -5,7 +5,6 @@ export * from './appUse';
 export * from './createBaseApp';
 export * from './createBuildApp';
 export * from './createDevApp';
-export * from './normalizePluginConfig';
 export * from './resolveAppDir';
 export * from './resolveAppEnv';
 export * from './resolveAppOptions';
@@ -13,10 +12,6 @@ export * from './resolveAppPages';
 export * from './resolveAppSiteData';
 export * from './resolveAppVersion';
 export * from './resolveAppWriteTemp';
-export * from './resolveBundler';
 export * from './resolvePluginObject';
-export * from './resolvePluginModule';
-export * from './resolvePluginsFromConfig';
-export * from './resolveThemeObject';
 export * from './resolveThemeInfo';
 export * from './resolveThemeLayouts';

package/lib/app/index.js

@@ -21,7 +21,6 @@ __exportStar(require("./appUse"), 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);
@@ -29,10 +28,6 @@ __exportStar(require("./resolveAppPages"), exports);
 __exportStar(require("./resolveAppSiteData"), exports);
 __exportStar(require("./resolveAppVersion"), exports);
 __exportStar(require("./resolveAppWriteTemp"), exports);
-__exportStar(require("./resolveBundler"), exports);
 __exportStar(require("./resolvePluginObject"), exports);
-__exportStar(require("./resolvePluginModule"), exports);
-__exportStar(require("./resolvePluginsFromConfig"), exports);
-__exportStar(require("./resolveThemeObject"), exports);
 __exportStar(require("./resolveThemeInfo"), exports);
 __exportStar(require("./resolveThemeLayouts"), exports);

package/lib/app/prepare/preparePagesRoutes.js

@@ -2,48 +2,47 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.preparePagesRoutes = void 0;
 const shared_1 = require("@vuepress/shared");
+/**
+ * Transform a page object to a route item
+ */
+const transformPageToRouteItem = ({ key, path, pathInferred, filePathRelative, routeMeta, }) => {
+    // paths that should redirect to this page, use set to dedupe
+    const redirectsSet = new Set();
+    // redirect from decoded path
+    redirectsSet.add(decodeURI(path));
+    if (path.endsWith('/')) {
+        // redirect from index path
+        redirectsSet.add(path + 'index.html');
+    }
+    else {
+        // redirect from the path that does not end with `.html`
+        redirectsSet.add(path.replace(/.html$/, ''));
+    }
+    // redirect from inferred path
+    if (pathInferred !== null) {
+        redirectsSet.add(pathInferred);
+        redirectsSet.add(encodeURI(pathInferred));
+    }
+    // redirect from filename path
+    if (filePathRelative !== null) {
+        const filenamePath = (0, shared_1.ensureLeadingSlash)(filePathRelative);
+        redirectsSet.add(filenamePath);
+        redirectsSet.add(encodeURI(filenamePath));
+    }
+    // avoid redirect from the page path itself
+    redirectsSet.delete(path);
+    return [key, path, routeMeta, [...redirectsSet]];
+};
 /**
  * Generate routes temp file
  */
 const preparePagesRoutes = async (app) => {
+    const routeItems = app.pages.map(transformPageToRouteItem);
     const content = `\
-import { Vuepress } from '@vuepress/client/lib/components/Vuepress'
+import { Vuepress } from '@vuepress/client'
 
 const routeItems = [\
-${app.pages
-        .map(({ key, path, pathInferred, filePathRelative, routeMeta }) => {
-        const redirects = [];
-        const routeItem = [key, path, routeMeta, redirects];
-        // paths that should redirect to this page
-        const redirectsSet = new Set();
-        // redirect from decoded path
-        redirectsSet.add(decodeURI(path));
-        if (path.endsWith('/')) {
-            // redirect from index path
-            redirectsSet.add(path + 'index.html');
-        }
-        else {
-            // redirect from the path that does not end with `.html`
-            redirectsSet.add(path.replace(/.html$/, ''));
-        }
-        // redirect from inferred path
-        if (pathInferred !== null) {
-            redirectsSet.add(pathInferred);
-            redirectsSet.add(encodeURI(pathInferred));
-        }
-        // redirect from filename path
-        if (filePathRelative !== null) {
-            const filenamePath = (0, shared_1.ensureLeadingSlash)(filePathRelative);
-            redirectsSet.add(filenamePath);
-            redirectsSet.add(encodeURI(filenamePath));
-        }
-        // avoid redirect from the page path itself
-        redirectsSet.delete(path);
-        // add redirects to route item
-        redirects.push(...redirectsSet);
-        return `\n  ${JSON.stringify(routeItem)},`;
-    })
-        .join('')}
+${routeItems.map((routeItem) => `\n  ${JSON.stringify(routeItem)},`).join('')}
 ]
 
 export const pagesRoutes = routeItems.reduce(
@@ -64,8 +63,8 @@ export const pagesRoutes = routeItems.reduce(
   },
   [
     {
-      name: "404",
-      path: "/:catchAll(.*)",
+      name: '404',
+      path: '/:catchAll(.*)',
       component: Vuepress,
     }
   ]

package/lib/app/resolveAppOptions.d.ts

@@ -2,4 +2,4 @@ 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;
+export declare const resolveAppOptions: ({ base, lang, title, description, head, locales, source, dest, temp, cache, public: publicDir, host, port, open, templateDev, shouldPreload, shouldPrefetch, templateBuild, bundler, debug, markdown, pagePatterns, plugins, theme, }: AppConfig) => AppOptions;

package/lib/app/resolveAppOptions.js

@@ -8,43 +8,37 @@ const utils_1 = require("@vuepress/utils");
 const resolveAppOptions = ({ 
 // site config
 base = '/', lang = 'en-US', title = '', description = '', head = [], locales = {}, 
-// theme config
-theme = '@vuepress/theme-default', themeConfig = {}, 
-// bundler config
-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')), templateBuild = utils_1.path.normalize(require.resolve('@vuepress/client/templates/index.build.html')), shouldPreload = true, shouldPrefetch = false, 
-// plugin config
-plugins = [], }) => ({
+// dev config
+host = '0.0.0.0', port = 8080, open = false, templateDev = utils_1.path.normalize(require.resolve('@vuepress/client/templates/dev.html')), 
+// build config
+shouldPreload = true, shouldPrefetch = true, templateBuild = utils_1.path.normalize(require.resolve('@vuepress/client/templates/build.html')), 
+// common config
+bundler, debug = false, markdown = {}, pagePatterns = ['**/*.md', '!.vuepress', '!node_modules'], plugins = [], theme, }) => ({
     base,
     lang,
     title,
     description,
     head,
     locales,
-    theme,
-    themeConfig,
-    bundler,
-    bundlerConfig,
     source,
     dest,
     temp,
     cache,
     public: publicDir,
-    markdown,
-    debug,
     host,
     port,
     open,
-    pagePatterns,
     templateDev,
-    templateBuild,
     shouldPreload,
     shouldPrefetch,
+    templateBuild,
+    bundler,
+    debug,
+    markdown,
+    pagePatterns,
     plugins,
+    theme,
 });
 exports.resolveAppOptions = resolveAppOptions;

package/lib/app/resolvePluginObject.d.ts

@@ -1,5 +1,5 @@
-import type { App, Plugin, PluginObject, PluginOptions } from '../types';
+import type { App, Plugin, PluginObject } 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;
+export declare const resolvePluginObject: <T extends PluginObject = PluginObject>(app: App, plugin: Plugin<T>) => T;

package/lib/app/resolvePluginObject.js

@@ -2,21 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolvePluginObject = void 0;
 const shared_1 = require("@vuepress/shared");
-const utils_1 = require("@vuepress/utils");
-const resolvePluginModule_1 = require("./resolvePluginModule");
 /**
  * Resolve a plugin object according to name / path / module and config
  */
-const resolvePluginObject = (app, plugin, pluginConfig = {}) => {
-    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 = (0, shared_1.isFunction)(pluginModule)
-        ? pluginModule(pluginConfig, app)
-        : pluginModule;
-    return pluginObject;
-};
+const resolvePluginObject = (app, plugin) => ((0, shared_1.isFunction)(plugin) ? plugin(app) : plugin);
 exports.resolvePluginObject = resolvePluginObject;

package/lib/app/resolveThemeInfo.d.ts

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

package/lib/app/resolveThemeInfo.js

@@ -1,22 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveThemeInfo = void 0;
-const resolvePluginsFromConfig_1 = require("./resolvePluginsFromConfig");
+const resolvePluginObject_1 = require("./resolvePluginObject");
 const resolveThemeLayouts_1 = require("./resolveThemeLayouts");
-const resolveThemeObject_1 = require("./resolveThemeObject");
 /**
  * Resolve theme info and its parent theme info
  */
-const resolveThemeInfo = (app, theme, themeConfig) => {
-    var _a, _b;
+const resolveThemeInfo = (app, theme) => {
+    var _a, _b, _c;
     // resolve current theme info
-    const themeObject = (0, resolveThemeObject_1.resolveThemeObject)(app, theme, themeConfig);
+    const themeObject = (0, resolvePluginObject_1.resolvePluginObject)(app, theme);
     const themeInfo = {
         layouts: (0, resolveThemeLayouts_1.resolveThemeLayouts)(themeObject.layouts),
-        plugins: [
-            ...(0, resolvePluginsFromConfig_1.resolvePluginsFromConfig)(app, themeObject.plugins),
-            themeObject,
-        ],
+        plugins: [...((_a = themeObject.plugins) !== null && _a !== void 0 ? _a : []), themeObject],
         templateBuild: themeObject.templateBuild,
         templateDev: themeObject.templateDev,
     };
@@ -25,12 +21,12 @@ const resolveThemeInfo = (app, theme, themeConfig) => {
         return themeInfo;
     }
     // resolve parent theme info recursively
-    const parentThemeInfo = (0, exports.resolveThemeInfo)(app, themeObject.extends, themeConfig);
+    const parentThemeInfo = (0, exports.resolveThemeInfo)(app, themeObject.extends);
     return {
         layouts: { ...parentThemeInfo.layouts, ...themeInfo.layouts },
         plugins: [...parentThemeInfo.plugins, ...themeInfo.plugins],
-        templateBuild: (_a = themeObject.templateBuild) !== null && _a !== void 0 ? _a : parentThemeInfo.templateBuild,
-        templateDev: (_b = themeObject.templateDev) !== null && _b !== void 0 ? _b : parentThemeInfo.templateDev,
+        templateBuild: (_b = themeObject.templateBuild) !== null && _b !== void 0 ? _b : parentThemeInfo.templateBuild,
+        templateDev: (_c = themeObject.templateDev) !== null && _c !== void 0 ? _c : parentThemeInfo.templateDev,
     };
 };
 exports.resolveThemeInfo = resolveThemeInfo;

package/lib/app/setupAppThemeAndPlugins.d.ts

@@ -0,0 +1,5 @@
+import type { App, AppConfig } from '../types';
+/**
+ * Setup theme and plugins for vuepress app
+ */
+export declare const setupAppThemeAndPlugins: (app: App, config: AppConfig) => void;

package/lib/app/{setupAppTheme.js → setupAppThemeAndPlugins.js}

@@ -1,21 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupAppTheme = void 0;
+exports.setupAppThemeAndPlugins = void 0;
 const resolveThemeInfo_1 = require("./resolveThemeInfo");
 /**
- * Setup theme for vuepress app
+ * Setup theme and plugins for vuepress app
  */
-const setupAppTheme = (app, config) => {
+const setupAppThemeAndPlugins = (app, config) => {
     var _a, _b, _c, _d;
     // recursively resolve theme info
-    const themeInfo = (0, resolveThemeInfo_1.resolveThemeInfo)(app, app.options.theme, app.options.themeConfig);
+    const themeInfo = (0, resolveThemeInfo_1.resolveThemeInfo)(app, app.options.theme);
     // set up app layouts and templates
     app.layouts = themeInfo.layouts;
     app.options.templateDev =
         (_b = (_a = config.templateDev) !== null && _a !== void 0 ? _a : themeInfo.templateDev) !== null && _b !== void 0 ? _b : app.options.templateDev;
     app.options.templateBuild =
         (_d = (_c = config.templateBuild) !== null && _c !== void 0 ? _c : themeInfo.templateBuild) !== null && _d !== void 0 ? _d : app.options.templateBuild;
-    // use theme plugins
-    themeInfo.plugins.forEach((plugin) => app.use(plugin));
+    [...themeInfo.plugins, ...app.options.plugins]
+        .flat()
+        .forEach((plugin) => app.use(plugin));
 };
-exports.setupAppTheme = setupAppTheme;
+exports.setupAppThemeAndPlugins = setupAppThemeAndPlugins;

package/lib/page/createPage.js

@@ -80,7 +80,6 @@ const createPage = async (app, options) => {
     // resolve page component and extract headers & links
     const { componentFilePath, componentFilePathRelative, componentFileChunkName, } = await (0, resolvePageComponentInfo_1.resolvePageComponentInfo)({
         app,
-        hoistedTags,
         htmlFilePathRelative,
         key,
     });

package/lib/page/resolvePageComponentInfo.d.ts

@@ -2,9 +2,8 @@ import type { App } from '../types';
 /**
  * Resolve page component and related info
  */
-export declare const resolvePageComponentInfo: ({ app, hoistedTags, htmlFilePathRelative, key, }: {
+export declare const resolvePageComponentInfo: ({ app, htmlFilePathRelative, key, }: {
     app: App;
-    hoistedTags: string[];
     htmlFilePathRelative: string;
     key: string;
 }) => Promise<{

package/lib/page/resolvePageComponentInfo.js

@@ -5,7 +5,7 @@ const utils_1 = require("@vuepress/utils");
 /**
  * Resolve page component and related info
  */
-const resolvePageComponentInfo = async ({ app, hoistedTags, htmlFilePathRelative, key, }) => {
+const resolvePageComponentInfo = async ({ app, htmlFilePathRelative, key, }) => {
     // resolve component file path
     const componentFilePathRelative = utils_1.path.join('pages', `${htmlFilePathRelative}.vue`);
     const componentFilePath = app.dir.temp(componentFilePathRelative);

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

@@ -1,8 +1,8 @@
 import type { Markdown } from '@vuepress/markdown';
 import type { SiteData } from '@vuepress/shared';
-import type { BundlerBuild, BundlerDev } from '../bundler';
+import type { Bundler } from '../bundler';
 import type { Page } from '../page';
-import type { Plugin, PluginOptions } from '../plugin';
+import type { Plugin } from '../plugin';
 import type { PluginApi } from '../pluginApi';
 import type { AppOptions } from './options';
 import type { AppDir, AppEnv, AppWriteTemp } from './utils';
@@ -41,7 +41,7 @@ export interface App {
     /**
      * Use a plugin
      */
-    use: <T extends PluginOptions>(plugin: Plugin<T> | string, config?: Partial<T>) => this;
+    use: (plugin: Plugin) => this;
     /**
      * Initialize app.
      *
@@ -83,7 +83,7 @@ export interface DevApp extends App {
      *
      * Should be called after `app.prepare()`.
      */
-    dev: () => ReturnType<BundlerDev>;
+    dev: () => ReturnType<Bundler['dev']>;
 }
 /**
  * Vuepress build app
@@ -94,5 +94,5 @@ export interface BuildApp extends App {
      *
      * Should be called after `app.prepare()`.
      */
-    build: () => ReturnType<BundlerBuild>;
+    build: () => ReturnType<Bundler['build']>;
 }

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

@@ -1,44 +1,83 @@
 import type { MarkdownOptions } from '@vuepress/markdown';
 import type { SiteData } from '@vuepress/shared';
-import type { BundlerConfig } from '../bundler';
+import type { Bundler } from '../bundler';
 import type { PluginConfig } from '../plugin';
-import type { ThemeConfig } from '../theme';
+import type { Theme } from '../theme';
 /**
- * Config to create vuepress app
+ * Vuepress app common config that shared between dev and build
  */
-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>;
+export interface AppConfigCommon extends Partial<SiteData> {
     source: string;
     dest?: string;
     temp?: string;
     cache?: string;
     public?: string;
     debug?: boolean;
-    pagePatterns?: string[];
     markdown?: MarkdownOptions;
-    plugins?: PluginConfig[];
-};
+    pagePatterns?: string[];
+    bundler: Bundler;
+    theme: Theme;
+    plugins?: PluginConfig;
+}
 /**
  * Vuepress app config for dev
  */
 export interface AppConfigDev {
+    /**
+     * Specify the host to use for the dev server
+     *
+     * @default '0.0.0.0'
+     */
     host?: string;
+    /**
+     * Specify the port to use for the dev server
+     *
+     * @default 8080
+     */
     port?: number;
+    /**
+     * Whether to open the browser after dev-server had been started
+     *
+     * @default false
+     */
     open?: boolean;
+    /**
+     * Specify the path of the HTML template to be used for dev
+     *
+     * @default '@vuepress/client/templates/dev.html'
+     */
     templateDev?: string;
 }
 /**
  * Vuepress app config for build
  */
 export interface AppConfigBuild {
+    /**
+     * Determine what resource files should be preloaded. Use boolean value to
+     * totally enable / disable.
+     *
+     * @default true
+     */
     shouldPreload?: ((file: string, type: string) => boolean) | boolean;
+    /**
+     * Determine what resource files should be prefetched. Use boolean value to
+     * totally enable / disable.
+     *
+     * @default false
+     */
     shouldPrefetch?: ((file: string, type: string) => boolean) | boolean;
+    /**
+     * Specify the path of the HTML template to be used for build
+     *
+     * @default '@vuepress/client/templates/build.html'
+     */
     templateBuild?: string;
 }
+/**
+ * Vuepress app config
+ */
+export declare type AppConfig = AppConfigCommon & AppConfigDev & AppConfigBuild;
 /**
  * Vuepress app options
  */
-export declare type AppOptions<T extends ThemeConfig = ThemeConfig, U extends BundlerConfig = BundlerConfig> = Required<AppConfig<T, U>>;
+export declare type AppOptions = Required<AppConfig>;

package/lib/types/bundler.d.ts

@@ -7,28 +7,7 @@ import type { App } from './app';
  * - build: bundle assets for deployment
  */
 export interface Bundler {
-    dev: BundlerDev;
-    build: BundlerBuild;
-}
-export declare type BundlerDev = (app: App) => Promise<() => Promise<void>>;
-export declare type BundlerBuild = (app: App) => Promise<void>;
-/**
- * A function that returns a bundler instance
- *
- * A bundler package should have a `CreateBundlerFunction` as the default export
- */
-export declare type CreateBundlerFunction<BundlerOptions extends BundlerConfig = Partial<BundlerConfig>> = (options: BundlerOptions) => Bundler;
-/**
- * Bundler entry type
- */
-export interface BundlerEntry {
-    createBundler: CreateBundlerFunction;
-}
-/**
- * User config type of bundler
- *
- * @remark suffix `Config` means this is for user config
- */
-export interface BundlerConfig {
-    [key: string]: any;
+    name: string;
+    dev: (app: App) => Promise<() => Promise<void>>;
+    build: (app: App) => Promise<void>;
 }

package/lib/types/plugin.d.ts

@@ -9,13 +9,13 @@ import type { HooksExposed } from './pluginApi';
  *
  * A plugin package should have a `Plugin` as the default export
  */
-export declare type Plugin<T extends PluginOptions = PluginOptions, U extends PluginObject = PluginObject> = U | PluginFunction<T, U>;
+export declare type Plugin<T extends PluginObject = PluginObject> = T | PluginFunction<T>;
 /**
  * Vuepress plugin function
  *
  * It accepts plugin options and vuepress app, returns plugin object
  */
-export declare type PluginFunction<T extends PluginOptions = PluginOptions, U extends PluginObject = PluginObject> = (pluginConfig: Partial<T>, app: App) => U;
+export declare type PluginFunction<T extends PluginObject = PluginObject> = (app: App) => T;
 /**
  * Vuepress plugin object
  */
@@ -24,22 +24,6 @@ export interface PluginObject extends Partial<HooksExposed> {
     multiple?: boolean;
 }
 /**
- * Vuepress plugin options basic type
+ * Config field for plugins
  */
-export declare type PluginOptions = Record<string, any>;
-/**
- * Plugin config to be used in user config file
- *
- * Users can use this config to control which plugins to be used,
- * and set the plugin options
- *
- * @remark suffix `Config` means this is for user config
- */
-export declare type PluginConfig<T extends PluginOptions = PluginOptions> = string | Plugin<T> | [string | Plugin<T>] | [string | Plugin<T>, Partial<T> | boolean];
-/**
- * Normalized plugin config
- */
-export declare type PluginConfigNormalized<T extends PluginOptions = PluginOptions> = [
-    Plugin<T> | string,
-    Partial<T> | boolean
-];
+export declare type PluginConfig = (Plugin | Plugin[])[];

package/lib/types/theme.d.ts

@@ -8,23 +8,19 @@ import type { Plugin, PluginConfig, PluginFunction, PluginObject } from './plugi
  *
  * A theme package should have a `Theme` as the default export
  */
-export declare type Theme<T extends ThemeConfig = ThemeConfig> = Plugin<T, ThemeObject>;
+export declare type Theme = Plugin<ThemeObject>;
 /**
  * Vuepress theme function
  */
-export declare type ThemeFunction<T extends ThemeConfig = ThemeConfig> = PluginFunction<T, ThemeObject>;
+export declare type ThemeFunction = PluginFunction<ThemeObject>;
 /**
  * Vuepress theme object
  */
-export interface ThemeObject extends PluginObject {
-    /**
-     * Theme plugin should never be multiple
-     */
-    multiple?: false;
+export interface ThemeObject extends Omit<PluginObject, 'multiple'> {
     /**
      * Extended parent theme
      */
-    extends?: string;
+    extends?: Theme;
     /**
      * Specify the layouts directory or components map
      */
@@ -32,7 +28,7 @@ export interface ThemeObject extends PluginObject {
     /**
      * Allow using plugins in theme
      */
-    plugins?: PluginConfig[];
+    plugins?: PluginConfig;
     /**
      * Allow overriding default templateBuild
      */
@@ -42,16 +38,6 @@ export interface ThemeObject extends PluginObject {
      */
     templateDev?: string;
 }
-/**
- * Theme config to be used in user config file
- *
- * It will be used by a theme itself, but not by vuepress.
- *
- * Vuepress will only transfer this config to theme
- *
- * @remark suffix `Config` means this is for user config
- */
-export declare type ThemeConfig = Record<string, any>;
 /**
  * Resolved theme info
  */
@@ -63,7 +49,7 @@ export interface ThemeInfo {
     /**
      * Plugins, including theme itself and plugins used by theme
      */
-    plugins: PluginObject[];
+    plugins: PluginConfig;
     /**
      * Default build template
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/core",
-  "version": "2.0.0-beta.38",
+  "version": "2.0.0-beta.41",
   "description": "Core package of VuePress",
   "keywords": [
     "vuepress",
@@ -15,26 +15,29 @@
     "url": "git+https://github.com/vuepress/vuepress-next.git"
   },
   "license": "MIT",
-  "author": "Evan You",
+  "author": "meteorlxy",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
     "lib"
   ],
-  "scripts": {
-    "build": "tsc -b tsconfig.build.json",
-    "clean": "rimraf lib *.tsbuildinfo"
-  },
   "dependencies": {
-    "@vuepress/client": "2.0.0-beta.38",
-    "@vuepress/markdown": "2.0.0-beta.38",
-    "@vuepress/shared": "2.0.0-beta.38",
-    "@vuepress/utils": "2.0.0-beta.38",
+    "@vuepress/client": "2.0.0-beta.41",
+    "@vuepress/markdown": "2.0.0-beta.41",
+    "@vuepress/shared": "2.0.0-beta.41",
+    "@vuepress/utils": "2.0.0-beta.41",
     "gray-matter": "^4.0.3",
-    "toml": "^3.0.0"
+    "toml": "^3.0.0",
+    "vue": "^3.2.33"
+  },
+  "peerDependencies": {
+    "vue": "^3.2.33"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7cb24eab18628a66371a367090f7c9c33b519136"
-}
+  "scripts": {
+    "build": "tsc -b tsconfig.build.json",
+    "clean": "rimraf lib *.tsbuildinfo"
+  }
+}

package/lib/app/normalizePluginConfig.d.ts

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

package/lib/app/normalizePluginConfig.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizePluginConfig = void 0;
-const shared_1 = require("@vuepress/shared");
-const normalizePluginConfig = (pluginConfig) => {
-    var _a;
-    // ['container'] -> ['container', true]
-    // ['container', options] -> ['container', options]
-    if ((0, shared_1.isArray)(pluginConfig)) {
-        return [pluginConfig[0], (_a = pluginConfig[1]) !== null && _a !== void 0 ? _a : true];
-    }
-    // 'container' -> ['container', true]
-    return [pluginConfig, true];
-};
-exports.normalizePluginConfig = normalizePluginConfig;

package/lib/app/resolveBundler.d.ts

@@ -1,2 +0,0 @@
-import type { AppOptions, Bundler } from '../types';
-export declare const resolveBundler: ({ bundler, bundlerConfig, }: AppOptions) => Bundler;

package/lib/app/resolveBundler.js

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

package/lib/app/resolvePluginModule.d.ts

@@ -1,5 +0,0 @@
-import type { Plugin, PluginObject, PluginOptions } from '../types';
-/**
- * Resolve the module of a plugin according to name or path
- */
-export declare const resolvePluginModule: <T extends PluginOptions = PluginOptions, U extends PluginObject = PluginObject>(pluginName: string) => Plugin<T, U> | null;

package/lib/app/resolvePluginModule.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvePluginModule = void 0;
-const shared_1 = require("@vuepress/shared");
-const utils_1 = require("@vuepress/utils");
-/**
- * Resolve the module of a plugin according to name or path
- */
-const resolvePluginModule = (pluginName) => {
-    const pluginEntry = utils_1.path.isAbsolute(pluginName)
-        ? pluginName
-        : (0, utils_1.requireResolve)((0, shared_1.normalizePackageName)(pluginName, 'vuepress', 'plugin'));
-    if (pluginEntry === null) {
-        return null;
-    }
-    const pluginModule = require(pluginEntry);
-    // allow default export
-    return (0, utils_1.hasExportDefault)(pluginModule) ? pluginModule.default : pluginModule;
-};
-exports.resolvePluginModule = resolvePluginModule;

package/lib/app/resolvePluginsFromConfig.d.ts

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

package/lib/app/resolvePluginsFromConfig.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvePluginsFromConfig = void 0;
-const normalizePluginConfig_1 = require("./normalizePluginConfig");
-const resolvePluginObject_1 = require("./resolvePluginObject");
-/**
- * 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, resolvePluginObject_1.resolvePluginObject)(app, plugin, config === true ? {} : config));
-    }
-    return prev;
-}, []);
-exports.resolvePluginsFromConfig = resolvePluginsFromConfig;

package/lib/app/resolveThemeObject.d.ts

@@ -1,5 +0,0 @@
-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

@@ -1,22 +0,0 @@
-"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/app/setupAppPlugins.d.ts

@@ -1,5 +0,0 @@
-import type { App } from '../types';
-/**
- * Setup plugins for vuepress app
- */
-export declare const setupAppPlugins: (app: App) => void;

package/lib/app/setupAppPlugins.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupAppPlugins = void 0;
-const resolvePluginsFromConfig_1 = require("./resolvePluginsFromConfig");
-/**
- * Setup plugins for vuepress app
- */
-const setupAppPlugins = (app) => {
-    // resolve plugins from options
-    const plugins = (0, resolvePluginsFromConfig_1.resolvePluginsFromConfig)(app, app.options.plugins);
-    // use plugins
-    plugins.forEach((plugin) => app.use(plugin));
-};
-exports.setupAppPlugins = setupAppPlugins;

package/lib/app/setupAppTheme.d.ts

@@ -1,5 +0,0 @@
-import type { App, AppConfig } from '../types';
-/**
- * Setup theme for vuepress app
- */
-export declare const setupAppTheme: (app: App, config: AppConfig) => void;