embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix for when config is specified in embark.json

This commit is contained in:
Iuri Matias 2018-05-11 19:09:38 -04:00
parent cc3b748232
commit e8210607b7
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/config.js
View File

@ -75,6 +75,8 @@ Config.prototype._mergeConfig = function(configFilePath, defaultConfig, env, ena
return configToReturn;
}
// due to embark.json; TODO: refactor this
configFilePath = configFilePath.replace('.js', '').replace('.json','');
if (!fs.existsSync(configFilePath + '.js') && !fs.existsSync(configFilePath + '.json')) {
// TODO: remove this if
if (this.logger) {