From 2eda29a7e1eeacd5e91a536ad4b393e474c72e72 Mon Sep 17 00:00:00 2001 From: Xinyu Liu Date: Sun, 21 Apr 2024 13:20:11 +0800 Subject: [PATCH] Update resolvePagePermalink.ts --- packages/core/src/page/resolvePagePermalink.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/core/src/page/resolvePagePermalink.ts b/packages/core/src/page/resolvePagePermalink.ts index b67d257cf8..6a549085f2 100644 --- a/packages/core/src/page/resolvePagePermalink.ts +++ b/packages/core/src/page/resolvePagePermalink.ts @@ -20,20 +20,23 @@ export const resolvePagePermalink = ({ pathInferred: string | null pathLocale: string }): string | null => { - // use permalink in frontmatter directly + // frontmatter.permalink has the highest priority + if (frontmatter.permalink === null) { + return null + } if (isString(frontmatter.permalink)) { return frontmatter.permalink } - if (frontmatter.permalink === null || frontmatter.permalinkPattern === null) { + // frontmatter.permalinkPattern has higher priority than app.options.permalinkPattern + if (frontmatter.permalinkPattern === null) { return null } - // get permalink pattern const permalinkPattern = frontmatter.permalinkPattern || app.options.permalinkPattern - if (!permalinkPattern) { + if (!isString(permalinkPattern)) { return null }