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

Merge pull request #778 from embark-framework/fix_deploy 

Fix issue with changes in config file not causing a proper reload
This commit is contained in:
Iuri Matias 2018-09-04 14:02:54 -04:00 committed by GitHub
parent 7ee02525a7 c3f7c58b8d
commit bf8183cf76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/core/config.js
View File

@ -148,6 +148,7 @@ Config.prototype._mergeConfig = function(configFilePath, defaultConfig, env, ena
let config;
if (fs.existsSync(configFilePath + '.js')) {
delete require.cache[fs.dappPath(configFilePath + '.js')];
config = require(fs.dappPath(configFilePath + '.js'));
} else {
config = fs.readJSONSync(configFilePath + '.json');

2
lib/modules/specialconfigs/index.js
View File

@ -84,7 +84,7 @@ class SpecialConfigs {
this.embark.registerActionForEvent("deploy:contract:deployed", (params, cb) => {
let contract = params.contract;
if (!contract.onDeploy) {
if (!contract.onDeploy || contract.deploy === false) {
return cb();
}
if (!contract.silent) {