Treat handlebars extensions same as .html

Author: scriptype

src/compiler/contentModel/models/category.js

@@ -1,7 +1,7 @@
 const { join } = require('path')
 const _ = require('lodash')
 const Settings = require('../../../settings')
-const { getSlug, makePermalink } = require('../../../helpers')
+const { getSlug, makePermalink, maybeRawHTMLType } = require('../../../helpers')
 const contentTypes = require('../contentTypes')
 const parseTemplate = require('../parseTemplate')
 const { isPost } = require('./post')
@@ -38,13 +38,11 @@ const createCategory = (fsObject) => {
       attributes: {}
     }
 
-  const type = indexFile?.extension === '.html' ? 'raw-index-html' : DEFAULT_TYPE
-
   return {
     ..._.omit(fsObject, 'children'),
     type: contentTypes.CATEGORY,
     data: {
-      type: metadata.type || type,
+      type: metadata.type || maybeRawHTMLType(indexFile?.extension) || DEFAULT_TYPE,
       name: metadata.title || fsObject.name,
       content: metadata.content || '',
       summary: metadata.summary || '',

src/compiler/contentModel/models/homepage.js

@@ -1,5 +1,6 @@
 const _ = require('lodash')
 const Settings = require('../../../settings')
+const { maybeRawHTMLType } = require('../../../helpers')
 const contentTypes = require('../contentTypes')
 const parseTemplate = require('../parseTemplate')
 const { isLocalAsset } = require('./localAsset')
@@ -26,13 +27,11 @@ const _createHomepage = (fsObject, { foldered }) => {
     localAssets
   })
 
-  const type = indexFile?.extension === '.html' ? 'raw-index-html' : DEFAULT_TYPE
-
   return {
     ..._.omit(fsObject, 'children'),
     type: contentTypes.HOMEPAGE,
     data: {
-      type: metadata.type || type,
+      type: metadata.type || maybeRawHTMLType(indexFile?.extension) || DEFAULT_TYPE,
       title: metadata.title || '',
       content: metadata.content || '',
       mentions: metadata.mentions || [],

src/compiler/contentModel/models/post.js

@@ -2,7 +2,7 @@ const _ = require('lodash')
 const { dirname, join } = require('path')
 const Settings = require('../../../settings')
 const Dictionary = require('../../../dictionary')
-const { getSlug, makePermalink, removeExtension } = require('../../../helpers')
+const { getSlug, makePermalink, removeExtension, maybeRawHTMLType } = require('../../../helpers')
 const contentTypes = require('../contentTypes')
 const parseTemplate = require('../parseTemplate')
 const { isLocalAsset } = require('./localAsset')
@@ -93,13 +93,11 @@ const _createPost = (fsObject, { categorized, foldered }) => {
     permalink
   })
 
-  const type = postFile?.extension === '.html' ? 'raw-index-html' : DEFAULT_TYPE
-
   return {
     ..._.omit(fsObject, 'children'),
     type: contentTypes.POST,
     data: {
-      type: metadata.type || type,
+      type: metadata.type || maybeRawHTMLType(postFile?.extension) || DEFAULT_TYPE,
       title: metadata.title || removeExtension(fsObject.name),
       cover: metadata.cover ? [permalink, metadata.cover].join('/') : '',
       media: metadata.media ? [permalink, metadata.media].join('/') : '',

src/compiler/contentModel/models/subpage.js

@@ -1,7 +1,7 @@
 const _ = require('lodash')
 const { join } = require('path')
 const Settings = require('../../../settings')
-const { getSlug, makePermalink, removeExtension } = require('../../../helpers')
+const { getSlug, makePermalink, removeExtension, maybeRawHTMLType } = require('../../../helpers')
 const contentTypes = require('../contentTypes')
 const parseTemplate = require('../parseTemplate')
 const { isLocalAsset } = require('./localAsset')
@@ -67,13 +67,11 @@ const _createSubpage = (fsObject, { foldered }) => {
   const permalink = getSubpagePermalink(fsObject, foldered)
   const metadata = parseTemplate(pageFile)
 
-  const type = pageFile?.extension === '.html' ? 'raw-index-html' : DEFAULT_TYPE
-
   return {
     ..._.omit(fsObject, 'children'),
     type: contentTypes.SUBPAGE,
     data: {
-      type: metadata.type || type,
+      type: metadata.type || maybeRawHTMLType(pageFile?.extension) || DEFAULT_TYPE,
       title: metadata.title || removeExtension(fsObject.name),
       cover: metadata.cover ? [permalink, metadata.cover].join('/') : '',
       media: metadata.media ? [permalink, metadata.media].join('/') : '',

src/helpers.js

@@ -55,6 +55,13 @@ const makePermalink = ({ prefix, parts, addHTMLExtension }) => {
   return addHTMLExtension ? permalink + '.html' : permalink
 }
 
+const maybeRawHTMLType = (extension) => {
+  if (!extension || !extension.match(/^\.(html|hbs|handlebars)$/i)) {
+    return null
+  }
+  return 'raw-html-type'
+}
+
 const removeExtension = (fileName) => {
   return fileName.replace(extname(fileName), '')
 }
@@ -90,6 +97,7 @@ module.exports = {
   ensureDirectory,
   getSlug,
   makePermalink,
+  maybeRawHTMLType,
   removeExtension,
   replaceExtension,
   pipe,