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

fix(@embark/cmd_controller): fix build command to escape on finish

This commit is contained in:
Jonathan Rainville 2020-01-14 13:34:19 -05:00 committed by Iuri Matias
parent 73d04433cf
commit e2767c27a9
1 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
packages/embark/src/cmd/cmd_controller.js
View File

@ -1,7 +1,7 @@
import { Config, Events, fs, TemplateGenerator } from 'embark-core'; import { Config, Events, fs, TemplateGenerator } from 'embark-core';
import { Engine } from 'embark-engine'; import { Engine } from 'embark-engine';
import { __ } from 'embark-i18n'; import { __ } from 'embark-i18n';
import { dappPath, embarkPath, joinPath, setUpEnv } from 'embark-utils'; import { dappPath, joinPath, setUpEnv } from 'embark-utils';
import { Logger, LogLevels } from 'embark-logger'; import { Logger, LogLevels } from 'embark-logger';
let async = require('async'); let async = require('async');
const constants = require('embark-core/constants'); const constants = require('embark-core/constants');
@ -297,12 +297,6 @@ class EmbarkController {
engine.logger.info(__("loaded plugins") + ": " + pluginList.join(", ")); engine.logger.info(__("loaded plugins") + ": " + pluginList.join(", "));
} }
engine.events.on('deployment:deployContracts:afterAll', () => {
engine.events.request('pipeline:generateAll', () => {
engine.events.emit('outputDone');
});
});
let plugin = engine.plugins.createPlugin('cmdcontrollerplugin', {}); let plugin = engine.plugins.createPlugin('cmdcontrollerplugin', {});
plugin.registerActionForEvent("embark:engine:started", async (_, cb) => { plugin.registerActionForEvent("embark:engine:started", async (_, cb) => {
try { try {
@ -319,31 +313,25 @@ class EmbarkController {
engine.startEngine(async () => { engine.startEngine(async () => {
try { try {
if (options.onlyCompile) {
await compileSmartContracts(engine);
engine.logger.info("Finished compiling".underline);
} else {
await compileAndDeploySmartContracts(engine); await compileAndDeploySmartContracts(engine);
engine.logger.info("Finished deploying".underline);
}
} catch (e) { } catch (e) {
return callback(e); return callback(e);
} }
callback(); callback();
}); });
},
function waitForWriteFinish(callback) {
if (options.onlyCompile) {
engine.logger.info("Finished compiling".underline);
return callback(null, true);
} }
engine.logger.info("Finished deploying".underline); ], function(err) {
engine.events.on('outputDone', (err) => {
engine.logger.info(__("Finished building").underline);
callback(err, true);
});
}
], function (err, canExit) {
if (err) { if (err) {
engine.logger.error(err.message || err); engine.logger.error(err.message || err);
} }
// TODO: this should be moved out and determined somewhere else // TODO: this should be moved out and determined somewhere else
if (canExit || !engine.config.contractsConfig.afterDeploy || !engine.config.contractsConfig.afterDeploy.length) { if (!engine.config.contractsConfig.afterDeploy || !engine.config.contractsConfig.afterDeploy.length) {
process.exit(err ? 1 : 0); process.exit(err ? 1 : 0);
} }
engine.logger.info(__('Waiting for after deploy to finish...')); engine.logger.info(__('Waiting for after deploy to finish...'));
@ -630,7 +618,7 @@ class EmbarkController {
return callback(e); return callback(e);
} }
callback(); callback();
})() })();
}, },
function generateUI(callback) { function generateUI(callback) {
if (engine.config.embarkConfig.app) { if (engine.config.embarkConfig.app) {
@ -838,13 +826,17 @@ class EmbarkController {
module.exports = EmbarkController; module.exports = EmbarkController;
async function compileSmartContracts(engine) {
const contractsFiles = await engine.events.request2("config:contractsFiles");
const compiledContracts = await engine.events.request2("compiler:contracts:compile", contractsFiles);
const _contractsConfig = await engine.events.request2("config:contractsConfig");
const contractsConfig = cloneDeep(_contractsConfig);
return engine.events.request2("contracts:build", contractsConfig, compiledContracts);
}
async function compileAndDeploySmartContracts(engine) { async function compileAndDeploySmartContracts(engine) {
try { try {
let contractsFiles = await engine.events.request2("config:contractsFiles"); const [contractsList, contractDependencies] = await compileSmartContracts(engine);
let compiledContracts = await engine.events.request2("compiler:contracts:compile", contractsFiles);
let _contractsConfig = await engine.events.request2("config:contractsConfig");
let contractsConfig = cloneDeep(_contractsConfig);
let [contractsList, contractDependencies] = await engine.events.request2("contracts:build", contractsConfig, compiledContracts);
await engine.events.request2("deployment:contracts:deploy", contractsList, contractDependencies); await engine.events.request2("deployment:contracts:deploy", contractsList, contractDependencies);
await engine.events.request2('pipeline:generateAll'); await engine.events.request2('pipeline:generateAll');
engine.events.emit('outputDone'); engine.events.emit('outputDone');