@vuepress/core 2.0.0-beta.46 → 2.0.0-beta.47

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, source, dest, temp, cache, public: publicDir, host, port, open, templateDev, shouldPreload, shouldPrefetch, templateBuild, bundler, debug, markdown, pagePatterns, plugins, theme, }: 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, permalinkPattern, plugins, theme, }: AppConfig) => AppOptions;

package/lib/app/resolveAppOptions.js

@@ -15,7 +15,7 @@ host = '0.0.0.0', port = 8080, open = false, templateDev = utils_1.path.normaliz
 // 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, }) => ({
+bundler, debug = false, markdown = {}, pagePatterns = ['**/*.md', '!.vuepress', '!node_modules'], permalinkPattern = null, plugins = [], theme, }) => ({
     base,
     lang,
     title,
@@ -38,6 +38,7 @@ bundler, debug = false, markdown = {}, pagePatterns = ['**/*.md', '!.vuepress',
     debug,
     markdown,
     pagePatterns,
+    permalinkPattern,
     plugins,
     theme,
 });

package/lib/page/createPage.js

@@ -62,6 +62,7 @@ const createPage = async (app, options) => {
     const lang = (0, resolvePageLang_1.resolvePageLang)({ app, frontmatter, pathLocale });
     // resolve page permalink
     const permalink = (0, resolvePagePermalink_1.resolvePagePermalink)({
+        app,
         frontmatter,
         slug,
         date,

package/lib/page/resolvePagePermalink.d.ts

@@ -1,8 +1,9 @@
-import type { PageFrontmatter } from '../types';
+import type { App, PageFrontmatter } from '../types';
 /**
  * Resolve page permalink from frontmatter / options / pattern
  */
-export declare const resolvePagePermalink: ({ frontmatter, slug, date, pathInferred, pathLocale, }: {
+export declare const resolvePagePermalink: ({ app, frontmatter, slug, date, pathInferred, pathLocale, }: {
+    app: App;
     frontmatter: PageFrontmatter;
     slug: string;
     date: string;

package/lib/page/resolvePagePermalink.js

@@ -6,21 +6,19 @@ const utils_1 = require("@vuepress/utils");
 /**
  * Resolve page permalink from frontmatter / options / pattern
  */
-const resolvePagePermalink = ({ frontmatter, slug, date, pathInferred, pathLocale, }) => {
+const resolvePagePermalink = ({ app, frontmatter, slug, date, pathInferred, pathLocale, }) => {
     // use permalink in frontmatter directly
     if ((0, shared_1.isString)(frontmatter.permalink)) {
         return frontmatter.permalink;
     }
-    // get permalink pattern from frontmatter or options
-    const pattern = (0, shared_1.isString)(frontmatter.permalinkPattern)
-        ? frontmatter.permalinkPattern
-        : null;
-    if (!pattern) {
+    // get permalink pattern
+    const permalinkPattern = getPermalinkPattern({ app, frontmatter });
+    if (permalinkPattern === null) {
         return null;
     }
     // resolve permalink according to the pattern
     const [year, month, day] = date.split('-');
-    const link = utils_1.path.join(pathLocale, pattern
+    const link = utils_1.path.join(pathLocale, permalinkPattern
         .replace(/:year/, year)
         .replace(/:month/, month)
         .replace(/:day/, day)
@@ -29,3 +27,15 @@ const resolvePagePermalink = ({ frontmatter, slug, date, pathInferred, pathLocal
     return (0, shared_1.ensureLeadingSlash)(link);
 };
 exports.resolvePagePermalink = resolvePagePermalink;
+/**
+ * Get permalink pattern from frontmatter or app options
+ */
+const getPermalinkPattern = ({ app, frontmatter, }) => {
+    if (frontmatter.permalinkPattern === null) {
+        return null;
+    }
+    if ((0, shared_1.isString)(frontmatter.permalinkPattern)) {
+        return frontmatter.permalinkPattern;
+    }
+    return app.options.permalinkPattern;
+};

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

@@ -15,6 +15,7 @@ export interface AppConfigCommon extends Partial<SiteData> {
     debug?: boolean;
     markdown?: MarkdownOptions;
     pagePatterns?: string[];
+    permalinkPattern?: string | null;
     bundler: Bundler;
     theme: Theme;
     plugins?: PluginConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/core",
-  "version": "2.0.0-beta.46",
+  "version": "2.0.0-beta.47",
   "description": "Core package of VuePress",
   "keywords": [
     "vuepress",
@@ -22,13 +22,13 @@
     "lib"
   ],
   "dependencies": {
-    "@vuepress/client": "2.0.0-beta.46",
-    "@vuepress/markdown": "2.0.0-beta.46",
-    "@vuepress/shared": "2.0.0-beta.46",
-    "@vuepress/utils": "2.0.0-beta.46",
+    "@vuepress/client": "2.0.0-beta.47",
+    "@vuepress/markdown": "2.0.0-beta.47",
+    "@vuepress/shared": "2.0.0-beta.47",
+    "@vuepress/utils": "2.0.0-beta.47",
     "gray-matter": "^4.0.3",
     "toml": "^3.0.0",
-    "vue": "^3.2.35"
+    "vue": "^3.2.36"
   },
   "publishConfig": {
     "access": "public"