From 562b0533300ad5ad8cf4695aa7fc2b844b918169 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Fri, 30 Jun 2017 17:37:20 +0200 Subject: feat: load config from cwd and merge with defaults --- src/modules/config.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/modules/config.js b/src/modules/config.js index 461945d..72d1b1a 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -1,10 +1,14 @@ -'use strict' +"use strict"; -const TOML = require('toml') -const config = require('configly') +const path = require("path"); +const TOML = require("toml"); +const config = require("configly"); -module.exports = config({ - parsers: { - toml: TOML.parse +module.exports = config( + ["./config", path.resolve(__dirname, "../../config/")], + { + parsers: { + toml: TOML.parse + } } -}) +); -- cgit 1.4.1