Merge pull request #539 from embark-framework/bug_fix/simple-app-watch

fix watch for simple apps
This commit is contained in:
Iuri Matias 2018-06-15 17:24:55 -04:00 committed by GitHub
commit 440593f9f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions

View File

@ -99,12 +99,17 @@ class Watch {
watchConfigs(embarkConfig, callback) { watchConfigs(embarkConfig, callback) {
let self = this; let self = this;
let configFolder = embarkConfig.config.replace(/\\/g, '/'); let contractsConfig;
if (configFolder.charAt(configFolder.length - 1) !== '/') { if (typeof embarkConfig.config === 'object' || embarkConfig.config.contracts) {
configFolder += '/'; contractsConfig = embarkConfig.config.contracts;
} else {
let contractsFolder = embarkConfig.config.replace(/\\/g, '/');
if (contractsFolder.charAt(contractsFolder.length - 1) !== '/') {
contractsFolder += '/';
} }
this.watchFiles( contractsConfig = [`${contractsFolder}**/contracts.json`, `${contractsFolder}**/contracts.js`];
[`${configFolder}**/contracts.json`, `${configFolder}**/contracts.js`], }
this.watchFiles(contractsConfig,
function (eventName, path) { function (eventName, path) {
self.logger.info(`${eventName}: ${path}`); self.logger.info(`${eventName}: ${path}`);
self.events.emit('file-' + eventName, 'config', path); self.events.emit('file-' + eventName, 'config', path);