embarklabs/embark
2
0
Fork 0
mirror of https://github.com/embarklabs/embark.git synced 2025-01-11 22:34:24 +00:00
Code Issues Projects Releases Wiki Activity

fix getting .json config file

Browse Source
This commit is contained in:
Iuri Matias 2018-05-11 18:22:03 -04:00
parent 2793432b87
commit b804f51de5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/config.js
View File

@ -87,7 +87,7 @@ Config.prototype._mergeConfig = function(configFilePath, defaultConfig, env, ena
if (fs.existsSync(configFilePath + '.js')) {
config = require(fs.dappPath(configFilePath + '.js'));
} else {
config = fs.readJSONSync(configFilePath);
config = fs.readJSONSync(configFilePath + '.json');
}
let configObject = utils.recursiveMerge(defaultConfig, config);