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

package/lib/app/resolveThemeInfo.js

@@ -7,12 +7,11 @@ const resolveThemeLayouts_1 = require("./resolveThemeLayouts");
  * Resolve theme info and its parent theme info
  */
 const resolveThemeInfo = (app, theme) => {
-    var _a, _b, _c;
     // resolve current theme info
     const themeObject = (0, resolvePluginObject_1.resolvePluginObject)(app, theme);
     const themeInfo = {
         layouts: (0, resolveThemeLayouts_1.resolveThemeLayouts)(themeObject.layouts),
-        plugins: [...((_a = themeObject.plugins) !== null && _a !== void 0 ? _a : []), themeObject],
+        plugins: [...(themeObject.plugins ?? []), themeObject],
         templateBuild: themeObject.templateBuild,
         templateDev: themeObject.templateDev,
     };
@@ -25,8 +24,8 @@ const resolveThemeInfo = (app, theme) => {
     return {
         layouts: { ...parentThemeInfo.layouts, ...themeInfo.layouts },
         plugins: [...parentThemeInfo.plugins, ...themeInfo.plugins],
-        templateBuild: (_b = themeObject.templateBuild) !== null && _b !== void 0 ? _b : parentThemeInfo.templateBuild,
-        templateDev: (_c = themeObject.templateDev) !== null && _c !== void 0 ? _c : parentThemeInfo.templateDev,
+        templateBuild: themeObject.templateBuild ?? parentThemeInfo.templateBuild,
+        templateDev: themeObject.templateDev ?? parentThemeInfo.templateDev,
     };
 };
 exports.resolveThemeInfo = resolveThemeInfo;

package/lib/app/setupAppThemeAndPlugins.js

@@ -6,15 +6,14 @@ const resolveThemeInfo_1 = require("./resolveThemeInfo");
  * Setup theme and plugins for vuepress app
  */
 const setupAppThemeAndPlugins = (app, config) => {
-    var _a, _b, _c, _d;
     // recursively resolve theme info
     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;
+        config.templateDev ?? themeInfo.templateDev ?? 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;
+        config.templateBuild ?? themeInfo.templateBuild ?? app.options.templateBuild;
     [...themeInfo.plugins, ...app.options.plugins]
         .flat()
         .forEach((plugin) => app.use(plugin));

package/lib/page/resolvePageDate.js

@@ -12,7 +12,6 @@ const DEFAULT_DATE = '0000-00-00';
  * It will be resolved as 'yyyy-MM-dd' format
  */
 const resolvePageDate = ({ frontmatter, filePathRelative, }) => {
-    var _a, _b;
     // `frontmatter.date` could be parsed as UTC Date directly
     if (frontmatter.date instanceof Date) {
         return (0, shared_1.formatDateString)([
@@ -31,14 +30,14 @@ const resolvePageDate = ({ frontmatter, filePathRelative, }) => {
     if (filename) {
         const matches = filename.match(FILENAME_DATE_RE);
         if (matches) {
-            return (0, 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]}-${matches[3] ?? '01'}`, DEFAULT_DATE);
         }
     }
     const dirname = utils_1.path.dirname(filePathRelative);
     if (dirname !== '.') {
         const matches = dirname.match(DIRNAME_DATE_RE);
         if (matches) {
-            return (0, 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]}-${matches[3] ?? '01'}`, DEFAULT_DATE);
         }
     }
     return DEFAULT_DATE;

package/lib/page/resolvePageFileContent.js

@@ -7,7 +7,6 @@ const log = (0, utils_1.debug)('vuepress:core/page');
  * Resolve page file content according to filePath or options content
  */
 const resolvePageFileContent = async ({ filePath, options, }) => {
-    var _a;
     if (filePath) {
         try {
             // read page content from file
@@ -19,6 +18,6 @@ const resolvePageFileContent = async ({ filePath, options, }) => {
         }
     }
     // load raw content from options
-    return (_a = options.content) !== null && _a !== void 0 ? _a : '';
+    return options.content ?? '';
 };
 exports.resolvePageFileContent = resolvePageFileContent;

package/lib/page/resolvePageLang.js

@@ -6,10 +6,9 @@ const shared_1 = require("@vuepress/shared");
  * Resolve language of page
  */
 const resolvePageLang = ({ app, frontmatter, pathLocale, }) => {
-    var _a, _b;
     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;
+    return app.siteData.locales[pathLocale]?.lang ?? app.siteData.lang;
 };
 exports.resolvePageLang = resolvePageLang;

package/lib/page/resolvePagePermalink.js

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

package/lib/page/resolvePageRouteMeta.js

@@ -4,5 +4,5 @@ exports.resolvePageRouteMeta = void 0;
 /**
  * Resolve page route meta
  */
-const resolvePageRouteMeta = ({ frontmatter, }) => { var _a; return (_a = frontmatter.routeMeta) !== null && _a !== void 0 ? _a : {}; };
+const resolvePageRouteMeta = ({ frontmatter, }) => frontmatter.routeMeta ?? {};
 exports.resolvePageRouteMeta = resolvePageRouteMeta;

package/lib/pluginApi/createPluginApiHooks.js

@@ -13,6 +13,7 @@ const createPluginApiHooks = () => ({
     extendsMarkdown: (0, createHookQueue_1.createHookQueue)('extendsMarkdown'),
     extendsPageOptions: (0, createHookQueue_1.createHookQueue)('extendsPageOptions'),
     extendsPage: (0, createHookQueue_1.createHookQueue)('extendsPage'),
+    extendsBundlerOptions: (0, createHookQueue_1.createHookQueue)('extendsBundlerOptions'),
     // client files hooks
     clientAppEnhanceFiles: (0, createHookQueue_1.createHookQueue)('clientAppEnhanceFiles'),
     clientAppRootComponentFiles: (0, createHookQueue_1.createHookQueue)('clientAppRootComponentFiles'),

package/lib/types/page.d.ts

@@ -59,7 +59,7 @@ export declare type Page<ExtraPageData extends Record<any, any> = Record<never,
     /**
      * Custom data to be attached to the page route record of vue-router
      *
-     * @see https://next.router.vuejs.org/api/#meta
+     * @see https://router.vuejs.org/api/#meta
      */
     routeMeta: Record<string, unknown>;
     /**

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

@@ -26,6 +26,7 @@ export interface Hooks {
     extendsMarkdown: ExtendsHook<Markdown>;
     extendsPageOptions: ExtendsHook<PageOptions>;
     extendsPage: ExtendsHook<Page>;
+    extendsBundlerOptions: ExtendsHook<any>;
     clientAppEnhanceFiles: ClientFilesHook;
     clientAppRootComponentFiles: ClientFilesHook;
     clientAppSetupFiles: ClientFilesHook;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/core",
-  "version": "2.0.0-beta.41",
+  "version": "2.0.0-beta.42",
   "description": "Core package of VuePress",
   "keywords": [
     "vuepress",
@@ -22,17 +22,14 @@
     "lib"
   ],
   "dependencies": {
-    "@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",
+    "@vuepress/client": "2.0.0-beta.42",
+    "@vuepress/markdown": "2.0.0-beta.42",
+    "@vuepress/shared": "2.0.0-beta.42",
+    "@vuepress/utils": "2.0.0-beta.42",
     "gray-matter": "^4.0.3",
     "toml": "^3.0.0",
     "vue": "^3.2.33"
   },
-  "peerDependencies": {
-    "vue": "^3.2.33"
-  },
   "publishConfig": {
     "access": "public"
   },