refactor: switch to mustache for simpler render

Author: barelyhuman

lib/publish.mjs

@@ -9,9 +9,23 @@ import postcssrc from 'postcss-load-config'
 import posthtml from 'posthtml'
 import posthtmlBaseURL from 'posthtml-base-url'
 import { transform as sucraseTransform } from 'sucrase'
-import { compile as templateCompile } from 'tempura'
+import Mustache from 'mustache'
 import glob from 'tiny-glob'
 
+const compileTemplate = (layout) => (vars) => Mustache.render(layout, vars)
+
+const htmlProcessor = async (baseHTML, options) => {
+    return (
+        await posthtml([
+            posthtmlBaseURL({
+                url: options.baseUrl,
+                allTags: true,
+            }),
+            htmlnano(),
+        ]).process(baseHTML)
+    ).html
+}
+
 const markdownTransfomer = (options) => ({
     transform: async (code, file) => {
         const { frontmatter, content } = getFrontmatter(code)
@@ -33,11 +47,11 @@ const markdownTransfomer = (options) => ({
                             vars,
                         )
                     :   options.layoutTemplate
-
                 baseHTML = await layoutTemplate(vars)
             } else if (options.layoutTemplate) {
                 baseHTML = await options.layoutTemplate({
                     content: sourceHTML,
+                    ...vars,
                 })
             }
         } else {
@@ -46,14 +60,7 @@ const markdownTransfomer = (options) => ({
             })
         }
 
-        const output = await posthtml([
-            posthtmlBaseURL({
-                url: options.baseUrl,
-                allTags: true,
-            }),
-            htmlnano(),
-        ]).process(baseHTML)
-        return output.html
+        return htmlProcessor(baseHTML, options)
     },
     ext: '.html',
 })
@@ -66,14 +73,7 @@ const htmlTranformer = (options) => ({
                 content: code,
             })
         }
-        const output = await posthtml([
-            posthtmlBaseURL({
-                url: options.baseUrl,
-                allTags: true,
-            }),
-            htmlnano(),
-        ]).process(toCompile)
-        return output.html
+        return htmlProcessor(toCompile, options)
     },
     ext: '.html',
 })
@@ -130,17 +130,15 @@ export async function compile(basePath, distPath, options) {
         baseUrl: options.baseUrl,
         jsxImportSource: options.jsxImportSource,
     }
-    const layoutSource = options.layoutFile ?? join(basePath, '_layout.hbs')
+    const layoutSource =
+        options.layoutFile ?? join(basePath, '_layout.mustache')
     const layoutExists = await fs.promises
         .access(layoutSource)
         .then((_) => true)
         .catch((_) => false)
     if (layoutExists) {
-        const templateContent = `
-{{#expect content}}        
-${await fs.promises.readFile(layoutSource, 'utf8')}            
-        `
-        transformerOptions.layoutTemplate = templateCompile(templateContent)
+        const templateContent = `${await fs.promises.readFile(layoutSource, 'utf8')}`
+        transformerOptions.layoutTemplate = compileTemplate(templateContent)
     }
 
     const files = (
@@ -152,7 +150,7 @@ ${await fs.promises.readFile(layoutSource, 'utf8')}
     ).filter(
         (d) =>
             d != resolve(layoutSource) &&
-            !d.endsWith('.hbs') &&
+            !d.endsWith('.mustache') &&
             !d.startsWith(resolve('node_modules')) &&
             (distPath ? !d.startsWith(resolve(distPath)) : true),
     )
@@ -227,10 +225,7 @@ async function prepareFrontmatterTemplate(pathToFile, file, vars) {
         throw new Error(`Invalid layout provided for file:${file}`)
     }
     const layout = await fs.promises.readFile(pathToFile, 'utf8')
-    const withExpects = `{{#expect ${Object.keys(vars).filter(Boolean).join(', ')}}}
-${layout}`
-
-    return templateCompile(withExpects)
+    return compileTemplate(layout)
 }
 
 function getFrontmatter(code) {

package.json

@@ -40,6 +40,7 @@
         "kleur": "^4.1.5",
         "marked": "^15.0.2",
         "mrmime": "^2.0.0",
+        "mustache": "^4.2.0",
         "postcss": "^8.4.49",
         "postcss-import": "^16.1.0",
         "postcss-load-config": "^6.0.1",
@@ -50,7 +51,6 @@
         "sirv": "^3.0.0",
         "sucrase": "^3.35.0",
         "svgo": "^3.3.2",
-        "tempura": "^0.4.1",
         "terser": "^5.36.0",
         "tiny-glob": "^0.2.9"
     },