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

package/lib/app/createBaseApp.js

@@ -11,8 +11,8 @@ 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");
+const setupAppPlugins_1 = require("./setupAppPlugins");
+const setupAppTheme_1 = require("./setupAppTheme");
 /**
  * Create vuepress app
  */
@@ -38,12 +38,11 @@ const createBaseApp = (config, isBuild = false) => {
         init: () => (0, appInit_1.appInit)(app),
         prepare: () => (0, appPrepare_1.appPrepare)(app),
     };
-    // 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);
-    [...themeInfo.plugins, ...plugins].forEach((plugin) => app.use(plugin));
+    // 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);
     return app;
 };
 exports.createBaseApp = createBaseApp;

package/lib/app/resolveAppPages.js

@@ -15,15 +15,7 @@ const resolveAppPages = async (app) => {
         cwd: app.dir.source(),
     });
     // create pages from files
-    const pages = await Promise.all(pageFilePaths.map(async (filePath) => {
-        const pageOptions = { filePath };
-        // plugin hook: extendsPageOptions
-        await app.pluginApi.hooks.extendsPageOptions.process(pageOptions, app);
-        const page = await (0, page_1.createPage)(app, pageOptions);
-        // plugin hook: extendsPage
-        await app.pluginApi.hooks.extendsPage.process(page, app);
-        return page;
-    }));
+    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 (0, page_1.createPage)(app, {

package/lib/app/resolveThemeInfo.js

@@ -8,6 +8,7 @@ const resolveThemeObject_1 = require("./resolveThemeObject");
  * Resolve theme info and its parent theme info
  */
 const resolveThemeInfo = (app, theme, themeConfig) => {
+    var _a, _b;
     // resolve current theme info
     const themeObject = (0, resolveThemeObject_1.resolveThemeObject)(app, theme, themeConfig);
     const themeInfo = {
@@ -16,6 +17,8 @@ const resolveThemeInfo = (app, theme, themeConfig) => {
             ...(0, resolvePluginsFromConfig_1.resolvePluginsFromConfig)(app, themeObject.plugins),
             themeObject,
         ],
+        templateBuild: themeObject.templateBuild,
+        templateDev: themeObject.templateDev,
     };
     // return if current theme does not have a parent theme
     if (!themeObject.extends) {
@@ -26,6 +29,8 @@ const resolveThemeInfo = (app, theme, themeConfig) => {
     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,
     };
 };
 exports.resolveThemeInfo = resolveThemeInfo;

package/lib/app/setupAppPlugins.d.ts

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

package/lib/app/setupAppPlugins.js

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

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

package/lib/app/setupAppTheme.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupAppTheme = void 0;
+const resolveThemeInfo_1 = require("./resolveThemeInfo");
+/**
+ * Setup theme for vuepress app
+ */
+const setupAppTheme = (app, config) => {
+    var _a, _b, _c, _d;
+    // recursively resolve theme info
+    const themeInfo = (0, resolveThemeInfo_1.resolveThemeInfo)(app, app.options.theme, app.options.themeConfig);
+    // 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));
+};
+exports.setupAppTheme = setupAppTheme;

package/lib/page/createPage.js

@@ -19,6 +19,8 @@ const resolvePagePermalink_1 = require("./resolvePagePermalink");
 const resolvePageRouteMeta_1 = require("./resolvePageRouteMeta");
 const resolvePageSlug_1 = require("./resolvePageSlug");
 const createPage = async (app, options) => {
+    // plugin hook: extendsPageOptions
+    await app.pluginApi.hooks.extendsPageOptions.process(options, app);
     // resolve page file absolute path and relative path
     const { filePath, filePathRelative } = (0, resolvePageFilePath_1.resolvePageFilePath)({
         app,
@@ -126,6 +128,8 @@ const createPage = async (app, options) => {
         htmlFilePath,
         htmlFilePathRelative,
     };
+    // plugin hook: extendsPage
+    await app.pluginApi.hooks.extendsPage.process(page, app);
     return page;
 };
 exports.createPage = createPage;

package/lib/pluginApi/createHookQueue.js

@@ -22,7 +22,7 @@ const createHookQueue = (name) => {
                 log(`process ${utils_1.chalk.magenta(name)} from ${utils_1.chalk.magenta(item.pluginName)}`);
                 try {
                     // process and get the result of the the hook item
-                    // @ts-ignore
+                    // @ts-expect-error: the types could not be narrowed correctly
                     const result = (await item.hook(...args));
                     // push the result to results array
                     if (result !== undefined) {

package/lib/types/theme.d.ts

@@ -17,10 +17,30 @@ export declare type ThemeFunction<T extends ThemeConfig = ThemeConfig> = PluginF
  * Vuepress theme object
  */
 export interface ThemeObject extends PluginObject {
+    /**
+     * Theme plugin should never be multiple
+     */
     multiple?: false;
+    /**
+     * Extended parent theme
+     */
     extends?: string;
+    /**
+     * Specify the layouts directory or components map
+     */
     layouts?: string | Record<string, string>;
+    /**
+     * Allow using plugins in theme
+     */
     plugins?: PluginConfig[];
+    /**
+     * Allow overriding default templateBuild
+     */
+    templateBuild?: string;
+    /**
+     * Allow overriding default templateDev
+     */
+    templateDev?: string;
 }
 /**
  * Theme config to be used in user config file
@@ -44,4 +64,12 @@ export interface ThemeInfo {
      * Plugins, including theme itself and plugins used by theme
      */
     plugins: PluginObject[];
+    /**
+     * Default build template
+     */
+    templateBuild?: string;
+    /**
+     * Default dev template
+     */
+    templateDev?: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/core",
-  "version": "2.0.0-beta.32",
+  "version": "2.0.0-beta.33",
   "description": "Core package of VuePress",
   "keywords": [
     "vuepress",
@@ -26,15 +26,15 @@
     "clean": "rimraf lib *.tsbuildinfo"
   },
   "dependencies": {
-    "@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",
+    "@vuepress/client": "2.0.0-beta.33",
+    "@vuepress/markdown": "2.0.0-beta.33",
+    "@vuepress/shared": "2.0.0-beta.33",
+    "@vuepress/utils": "2.0.0-beta.33",
     "gray-matter": "^4.0.3",
     "toml": "^3.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8ffa71313607fe78f3956e3ccb886fcae0ddf5e9"
+  "gitHead": "0934a5d6685922e0dc6391622b00a3b89140492c"
 }