From 5eca5c90cc5121cbe09c842b4289b4aa5d47f2d2 Mon Sep 17 00:00:00 2001 From: hsupu Date: Tue, 7 Aug 2018 18:36:26 +0800 Subject: [PATCH 1/3] fix: skip format data.head if not exist while loading toml config --- lib/prepare/loadConfig.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/prepare/loadConfig.js b/lib/prepare/loadConfig.js index 23e1ec8cb9..3ecbd5925e 100644 --- a/lib/prepare/loadConfig.js +++ b/lib/prepare/loadConfig.js @@ -40,13 +40,15 @@ function parseConfig (file) { data = tomlParser.parse(content) // reformat to match config since TOML does not allow different data type // https://github.com/toml-lang/toml#array - const format = [] - Object.keys(data.head).forEach(meta => { - data.head[meta].forEach(values => { - format.push([meta, values]) + if (data.head) { + const format = [] + Object.keys(data.head).forEach(meta => { + data.head[meta].forEach(values => { + format.push([meta, values]) + }) }) - }) - data.head = format + data.head = format + } break } From fa1f592766a1cf4b1719dfb5dba5c6f404fff184 Mon Sep 17 00:00:00 2001 From: ULIVZ <472590061@qq.com> Date: Thu, 9 Aug 2018 01:00:45 +0800 Subject: [PATCH 2/3] chore: ensure data.head is an array --- lib/prepare/loadConfig.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/prepare/loadConfig.js b/lib/prepare/loadConfig.js index 3ecbd5925e..e2b044edd2 100644 --- a/lib/prepare/loadConfig.js +++ b/lib/prepare/loadConfig.js @@ -40,15 +40,15 @@ function parseConfig (file) { data = tomlParser.parse(content) // reformat to match config since TOML does not allow different data type // https://github.com/toml-lang/toml#array + const format = [] if (data.head) { - const format = [] Object.keys(data.head).forEach(meta => { data.head[meta].forEach(values => { format.push([meta, values]) }) }) - data.head = format } + data.head = format break } From a7c159cd50a22256057768ccfe796430b30c62fd Mon Sep 17 00:00:00 2001 From: ULIVZ <472590061@qq.com> Date: Thu, 9 Aug 2018 01:01:16 +0800 Subject: [PATCH 3/3] chore: remove tail space --- lib/prepare/loadConfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/prepare/loadConfig.js b/lib/prepare/loadConfig.js index e2b044edd2..aa913ba013 100644 --- a/lib/prepare/loadConfig.js +++ b/lib/prepare/loadConfig.js @@ -40,7 +40,7 @@ function parseConfig (file) { data = tomlParser.parse(content) // reformat to match config since TOML does not allow different data type // https://github.com/toml-lang/toml#array - const format = [] + const format = [] if (data.head) { Object.keys(data.head).forEach(meta => { data.head[meta].forEach(values => {