Merge pull request #32 from ulkajs/0.6.4

0.6.4
ulkajs-zz · Oct 20, 2020 · b5ff754 · b5ff754
2 parents a80e360 + 6c1c48d
commit b5ff754
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 9 deletions.
diff --git a/.npmignore b/.npmignore
@@ -6,7 +6,9 @@
 .prettierrc
 .prettierignore
 .eslintignore
+.gitattributes
 .eslintrc.json
+jsconfig.json
 jest.config.js
 .huskyrc.json
 CODE_OF_CONDUCT.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.6.4
+
+- Removed cache from ulka render
+- Allow plugin to add renderer to info.
+
 ## v0.6.3
 
 - Bug fix for async plugins

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ulka",
-  "version": "0.6.4-rc.2",
+  "version": "0.6.4",
   "description": "Ulka - A simpler static site generator written in JavaScript",
   "main": "./src/index.js",
   "bin": {

diff --git a/src/utils/build-utils.js b/src/utils/build-utils.js
@@ -292,12 +292,22 @@ async function contentToHtml(contentData, contents, info) {
       }
     }
 
-    const html = renderUlka(
-      contentData.template,
-      context,
-      contentData.templatePath || filePath,
-      info
-    )
+    const ext = path.parse(contentData.templatePath || "").ext
+
+    const useUlka =
+      ext === "" || ext === ".ulka" || typeof info.renderer[ext] !== "function"
+
+    let html = ""
+    if (useUlka) {
+      html = renderUlka(
+        contentData.template,
+        context,
+        contentData.templatePath || filePath,
+        info
+      )
+    } else {
+      html = info.renderer[ext](contentData.template, context, info)
+    }
 
     mkdir(path.parse(contentData.buildPath).dir)
 
@@ -336,7 +346,16 @@ async function pageToHtml(pageData, pages, contents, info) {
     if (pageData.type === "raw") {
       const context = { ...pageData, contents, pages, info }
       const filePath = pageData.source || info.cwd
-      pageData.html = renderUlka(pageData.content, context, filePath, info)
+
+      const ext = path.parse(filePath).ext
+
+      const extRenderer = info.renderer[ext]
+
+      if (ext === "" || ext === ".ulka" || typeof extRenderer !== "function") {
+        pageData.html = renderUlka(pageData.content, context, filePath, info)
+      } else {
+        pageData.html = extRenderer(pageData.content, context, info)
+      }
     } else {
       pageData.html = pageData.content
     }
@@ -373,7 +392,8 @@ function createInfo(cwd, task) {
     return {
       configs: getConfigs(cwd),
       cwd,
-      task
+      task,
+      renderer: {}
     }
   } catch (e) {
     log.error(e.message, true)