From 6ae6d3382de28220869cdece584ed365322a3ce8 Mon Sep 17 00:00:00 2001 From: NGPixel Date: Sat, 13 May 2017 14:44:04 -0400 Subject: [PATCH] fix: config was not parsed properly --- package.json | 1 + server/libs/config.js | 10 +++++++--- yarn.lock | Bin 247271 -> 247480 bytes 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 8945a8dd..1db21387 100644 --- a/package.json +++ b/package.json @@ -119,6 +119,7 @@ "through2": "^2.0.3", "validator": "^7.0.0", "validator-as-promised": "^1.0.2", + "vue-template-es2015-compiler": "^1.5.2", "winston": "^2.3.1", "yargs": "^8.0.1" }, diff --git a/server/libs/config.js b/server/libs/config.js index bceb7dce..482a8d5c 100644 --- a/server/libs/config.js +++ b/server/libs/config.js @@ -31,9 +31,13 @@ module.exports = (confPaths) => { let appdata = {} try { - appconfig = yaml.safeLoad(_.deepMap(fs.readFileSync(confPaths.config, 'utf8'), c => { - return _.replace(c, (/\$\([A-Z0-9_]+\)/g, (m) => { return process.env[m] })) - })) + appconfig = yaml.safeLoad( + _.replace( + fs.readFileSync(confPaths.config, 'utf8'), + (/\$\([A-Z0-9_]+\)/g, + (m) => { return process.env[m] }) + ) + ) appdata = yaml.safeLoad(fs.readFileSync(confPaths.data, 'utf8')) appdata.regex = require(confPaths.dataRegex) } catch (ex) { diff --git a/yarn.lock b/yarn.lock index 283cc7ede36e7d106befb677aced20e2de6442a8..b06d71b74a87e1ff838c0123417ca5b17edd1379 100644 GIT binary patch delta 170 zcmaFf&A+3UzoCV(g=q_OVD}$tI=-si~HxN?cq(6CL6v*WYy7zIO(*mM#E5sX7Dz delta 28 kcmdnd%m2KazoCV(g=q_O