File tree Expand file tree Collapse file tree 2 files changed +9
-22
lines changed Expand file tree Collapse file tree 2 files changed +9
-22
lines changed Original file line number Diff line number Diff line change @@ -25,9 +25,15 @@ export const resolvePagePermalink = ({
25
25
return frontmatter . permalink
26
26
}
27
27
28
+ if ( frontmatter . permalink === null || frontmatter . permalinkPattern === null ) {
29
+ return null
30
+ }
31
+
28
32
// get permalink pattern
29
- const permalinkPattern = getPermalinkPattern ( { app, frontmatter } )
30
- if ( permalinkPattern === null ) {
33
+ const permalinkPattern =
34
+ frontmatter . permalinkPattern || app . options . permalinkPattern
35
+
36
+ if ( ! permalinkPattern ) {
31
37
return null
32
38
}
33
39
@@ -45,22 +51,3 @@ export const resolvePagePermalink = ({
45
51
46
52
return ensureLeadingSlash ( link )
47
53
}
48
-
49
- /**
50
- * Get permalink pattern from frontmatter or app options
51
- */
52
- const getPermalinkPattern = ( {
53
- app,
54
- frontmatter,
55
- } : {
56
- app : App
57
- frontmatter : PageFrontmatter
58
- } ) : string | null => {
59
- if ( frontmatter . permalinkPattern === null ) {
60
- return null
61
- }
62
- if ( isString ( frontmatter . permalinkPattern ) ) {
63
- return frontmatter . permalinkPattern
64
- }
65
- return app . options . permalinkPattern
66
- }
Original file line number Diff line number Diff line change @@ -62,7 +62,7 @@ export type PageFrontmatter<
62
62
head ?: HeadConfig [ ]
63
63
lang ?: string
64
64
layout ?: string
65
- permalink ?: string
65
+ permalink ?: string | null
66
66
permalinkPattern ?: string | null
67
67
routeMeta ?: Record < string , unknown >
68
68
title ?: string
You can’t perform that action at this time.
0 commit comments