@tenjuu99/blog 0.2.47 → 0.2.49

package/lib/pageData.js

@@ -50,7 +50,7 @@ const parse = (content, name, ext) => {
   if (metaDataMerged.preview) {
     metaDataMerged.index = false
     metaDataMerged.noindex = true
-    metaDataMerged.url = metaDataMerged.url + '/preview'
+    metaDataMerged.url = '/preview' + metaDataMerged.url
   }
   metaDataMerged.full_url = fullUrl(metaDataMerged)
   metaDataMerged['__output'] = name === 'index' ? '/index.html' : `${metaDataMerged.url}.${metaDataMerged.ext}`
@@ -68,9 +68,9 @@ const parseMetaData = (data) => {
       if (match) {
         key = match[1]
         value = line.slice(line.indexOf(':') + 1).trim()
-        if (value === 'true' || value === 'false') {
+        try {
           value = JSON.parse(value)
-        } else {
+        } catch (e) {
           if (value.startsWith('config.')) {
             const envName = value.split('.').pop()
             eval(`value = config.${envName}`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tenjuu99/blog",
-  "version": "0.2.47",
+  "version": "0.2.49",
   "description": "blog template",
   "main": "index.js",
   "scripts": {

package/packages/breadcrumbs/helper/breadcrumbs.js

@@ -4,22 +4,28 @@ export function breadcrumbList(pageName, topPageName = 'top') {
   const pageData = allData[pageName]
   const entries = Object.entries(allData)
   const breadCrumbs = ['/']
-  pageData.url.split('/').reduce((prev, curr) => {
-    if (curr === 'index') {
-      return
-    }
-    let str = curr
-    if (allData[prev + curr]) {
-      str = allData[prev + curr].title
-    } else {
-      const entry = entries.find(v => `/${prev}${curr}` === v[1].url)
-      if (entry) {
-        str = entry[1].title
+  const urlSplit = pageData.url.split('/')
+  if (pageData.breadcrumbs) {
+    pageData.breadcrumbs.forEach(v => breadCrumbs.push(v))
+    breadCrumbs.push(['', urlSplit[urlSplit.length - 1]])
+  } else {
+    urlSplit.reduce((prev, curr) => {
+      if (curr === 'index') {
+        return
       }
-    }
-    breadCrumbs.push([`/${prev}${curr}/`, str])
-    return `${prev}${curr}/`
-  })
+      let str = curr
+      if (allData[prev + curr]) {
+        str = allData[prev + curr].title
+      } else {
+        const entry = entries.find(v => `/${prev}${curr}` === v[1].url)
+        if (entry) {
+          str = entry[1].title
+        }
+      }
+      breadCrumbs.push([`/${prev}${curr}/`, str])
+      return `${prev}${curr}/`
+    })
+  }
   if (breadCrumbs.length === 1) {
     return ''
   }