@tenjuu99/blog 0.2.8 → 0.2.9

package/README.md

@@ -89,7 +89,7 @@ blog.json を開いて、 `site_name` を変更します。
   "src_dir": "src",
   "dist_dir": "dist",
   "distribute_raw": "image",
-  "helper": "helper/index.js"
+  "helper": "index.js"
 }
 ```
 

package/bin/dev-server

@@ -50,6 +50,7 @@ const proceed = () => {
   })
   child.on('exit', (code, signal) => {
     console.error(`process exit: ${code}, SIGNAL: ${signal}`);
+    child.kill('SIGINT')
   })
 
   return child

package/lib/filter.js

@@ -1,7 +1,4 @@
 import helper from '../lib/helper.js'
-import { srcDir } from './dir.js'
-import config from './config.js'
-import replaceVariablesFilter from './replaceVariablesFilter.js'
 
 /**
  * @param {string} condition
@@ -84,30 +81,6 @@ const replaceIfFilter = (text, variables) => {
   return text
 }
 
-/**
- * 配列を再帰的に順不同リストに変換する
- * @param {Array|string} arrayOrText
- * @returns {mixed}
- */
-const arrayToList = (arrayOrText) => {
-  if (typeof arrayOrText === 'string') {
-    return `<li>${arrayOrText}</li>`
-  }
-  if (Array.isArray(arrayOrText)) {
-    let resultListText = '<ul>'
-    for (const item of arrayOrText) {
-      if (Array.isArray(item)) {
-        resultListText += `<li>${arrayToList(item)}</li>`
-      } else {
-        resultListText += `<li>${item}</li>`
-      }
-    }
-    resultListText += '</ul>'
-    arrayOrText = resultListText
-  }
-  return arrayOrText
-}
-
 const replaceScriptFilter = async (text, variables) => {
   let replaced = text
   const scriptRegexp = new RegExp(/({script}|\<script\s.*type="ssg".*>)(?<script>[\s\S]*?)(\{\/script}|\<\/script>)/g)
@@ -127,9 +100,6 @@ const replaceScriptFilter = async (text, variables) => {
       case 'null':
         result = ''
     }
-    if (Array.isArray(result)) {
-      result = helper.arrayToList(result)
-    }
     replaced = replaced.replace(script.replace, result)
   }
   return replaced
@@ -137,6 +107,5 @@ const replaceScriptFilter = async (text, variables) => {
 
 export {
   replaceIfFilter,
-  replaceScriptFilter,
-  replaceVariablesFilter
+  replaceScriptFilter
 }

package/lib/render.js

@@ -1,8 +1,8 @@
 import {
   replaceIfFilter,
-  replaceScriptFilter,
-  replaceVariablesFilter
+  replaceScriptFilter
 } from './filter.js'
+import replaceVariablesFilter from './replaceVariablesFilter.js'
 import includeFilter from './includeFilter.js'
 import { marked } from "marked";
 import { applyTemplate } from './applyTemplate.js'

package/package.json

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

package/src-sample/helper/add.js

@@ -0,0 +1,3 @@
+export function additionalHelper() {
+  return 'これは追加ヘルパーによって出力されているメッセージです。'
+}

package/src-sample/helper/index.js

@@ -1,5 +1,5 @@
 import { allData } from '@tenjuu99/blog/lib/indexer.js'
-import { replaceVariablesFilter } from "@tenjuu99/blog/lib/filter.js";
+import replaceVariablesFilter from '@tenjuu99/blog/lib/replaceVariablesFilter.js'
 import config from '@tenjuu99/blog/lib/config.js'
 
 export function readIndex (filter = null) {
@@ -115,10 +115,6 @@ export function renderIndex(pages, nodate = 'nodate', headingTag = 'h3') {
   return resultText.join('\n')
 }
 
-export function additionalHelper() {
-  return 'これは追加ヘルパーによって出力されているメッセージです。'
-}
-
 export function isEditorEnabled() {
   return allData.editor && allData.editor.distribute
 }