Skip to content

Commit ba81d81

Browse files
committed
Treat all entries with .html extension as of raw html type
Let the free html flow in
1 parent 3181ed4 commit ba81d81

4 files changed

Lines changed: 18 additions & 4 deletions

File tree

src/compiler/contentModel/models/category.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ const parseTemplate = require('../parseTemplate')
77
const { isPost } = require('./post')
88
const { isLocalAsset } = require('./localAsset')
99

10+
const DEFAULT_TYPE = 'basic'
11+
1012
const isCategoryIndex = (fsObject) => {
1113
return fsObject.type === contentTypes.CATEGORY_INDEX
1214
}
@@ -36,11 +38,13 @@ const createCategory = (fsObject) => {
3638
attributes: {}
3739
}
3840

41+
const type = indexFile?.extension === '.html' ? 'raw-index-html' : DEFAULT_TYPE
42+
3943
return {
4044
..._.omit(fsObject, 'children'),
4145
type: contentTypes.CATEGORY,
4246
data: {
43-
type: metadata.type || 'basic',
47+
type: metadata.type || type,
4448
name: metadata.title || fsObject.name,
4549
content: metadata.content || '',
4650
summary: metadata.summary || '',

src/compiler/contentModel/models/homepage.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ const contentTypes = require('../contentTypes')
44
const parseTemplate = require('../parseTemplate')
55
const { isLocalAsset } = require('./localAsset')
66

7+
const DEFAULT_TYPE = 'basic'
8+
79
const isFolderedHomepageIndex = (fsObject) => {
810
return fsObject.type === contentTypes.FOLDERED_HOMEPAGE_INDEX
911
}
@@ -24,7 +26,7 @@ const _createHomepage = (fsObject, { foldered }) => {
2426
localAssets
2527
})
2628

27-
const type = indexFile.extension === '.html' ? 'raw-index-html' : 'basic'
29+
const type = indexFile?.extension === '.html' ? 'raw-index-html' : DEFAULT_TYPE
2830

2931
return {
3032
..._.omit(fsObject, 'children'),

src/compiler/contentModel/models/post.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ const contentTypes = require('../contentTypes')
77
const parseTemplate = require('../parseTemplate')
88
const { isLocalAsset } = require('./localAsset')
99

10+
const DEFAULT_TYPE = 'text'
11+
1012
const isPost = (fsObject) => {
1113
return fsObject.type === contentTypes.POST
1214
}
@@ -91,11 +93,13 @@ const _createPost = (fsObject, { categorized, foldered }) => {
9193
permalink
9294
})
9395

96+
const type = postFile?.extension === '.html' ? 'raw-index-html' : DEFAULT_TYPE
97+
9498
return {
9599
..._.omit(fsObject, 'children'),
96100
type: contentTypes.POST,
97101
data: {
98-
type: metadata.type || 'text',
102+
type: metadata.type || type,
99103
title: metadata.title || removeExtension(fsObject.name),
100104
cover: metadata.cover ? [permalink, metadata.cover].join('/') : '',
101105
media: metadata.media ? [permalink, metadata.media].join('/') : '',

src/compiler/contentModel/models/subpage.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ const contentTypes = require('../contentTypes')
66
const parseTemplate = require('../parseTemplate')
77
const { isLocalAsset } = require('./localAsset')
88

9+
const DEFAULT_TYPE = 'basic'
10+
911
const isSubpage = (fsObject) => {
1012
return fsObject.type === contentTypes.SUBPAGE
1113
}
@@ -65,11 +67,13 @@ const _createSubpage = (fsObject, { foldered }) => {
6567
const permalink = getSubpagePermalink(fsObject, foldered)
6668
const metadata = parseTemplate(pageFile)
6769

70+
const type = pageFile?.extension === '.html' ? 'raw-index-html' : DEFAULT_TYPE
71+
6872
return {
6973
..._.omit(fsObject, 'children'),
7074
type: contentTypes.SUBPAGE,
7175
data: {
72-
type: metadata.type || 'basic',
76+
type: metadata.type || type,
7377
title: metadata.title || removeExtension(fsObject.name),
7478
cover: metadata.cover ? [permalink, metadata.cover].join('/') : '',
7579
media: metadata.media ? [permalink, metadata.media].join('/') : '',

0 commit comments

Comments
 (0)