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

Merge pull request #515 from embark-framework/jsonfix 

fix support for .json file in embark.json
This commit is contained in:
Iuri Matias 2018-06-12 18:03:43 -04:00 committed by GitHub
parent aa01bd37a8 4131cf42ef
commit 735e72703b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/config.js
View File

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