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

fix: re-enable plugin command module and clean up engine (#1961)

This commit is contained in:
Jonathan Rainville 2019-10-11 23:06:29 -04:00 committed by Iuri Matias
parent 6f90099d47
commit 5b72620c92
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,8 @@ class EmbarkController {
}); });
}); });
} }
simulator(_options) {
simulator(_options) {
// this.context = options.context || [constants.contexts.simulator, constants.contexts.blockchain]; // this.context = options.context || [constants.contexts.simulator, constants.contexts.blockchain];
// let simulator = new Simulator({ // let simulator = new Simulator({
// blockchainConfig: this.config.blockchainConfig, // blockchainConfig: this.config.blockchainConfig,
@ -150,6 +151,7 @@ simulator(_options) {
engine.registerModuleGroup("coreComponents"); engine.registerModuleGroup("coreComponents");
engine.registerModuleGroup("stackComponents"); engine.registerModuleGroup("stackComponents");
engine.registerModuleGroup("consoleComponents");
// TODO: replace with individual plugins // TODO: replace with individual plugins
engine.registerModuleGroup("namesystem"); engine.registerModuleGroup("namesystem");
@ -362,6 +364,7 @@ simulator(_options) {
engine.registerModuleGroup("coreComponents"); engine.registerModuleGroup("coreComponents");
engine.registerModuleGroup("stackComponents"); engine.registerModuleGroup("stackComponents");
engine.registerModuleGroup("consoleComponents");
// TODO: replace with individual plugins // TODO: replace with individual plugins
engine.registerModuleGroup("namesystem"); engine.registerModuleGroup("namesystem");

12
packages/embark/src/lib/core/engine.js
View File

@ -80,6 +80,7 @@ class Engine {
blockchain: this.blockchainComponents, blockchain: this.blockchainComponents,
coreComponents: this.coreComponents, coreComponents: this.coreComponents,
stackComponents: this.stackComponents, stackComponents: this.stackComponents,
consoleComponents: this.consoleComponents,
blockchainStackComponents: this.blockchainStackComponents, blockchainStackComponents: this.blockchainStackComponents,
compiler: this.compilerComponents, compiler: this.compilerComponents,
contracts: this.contractsComponents, contracts: this.contractsComponents,
@ -140,6 +141,12 @@ class Engine {
cb(); cb();
}); });
this.registerModulePackage('embark-code-runner', {ipc: this.ipc}); this.registerModulePackage('embark-code-runner', {ipc: this.ipc});
// TODO: we shouldn't need useDashboard
this.registerModulePackage('embark-library-manager', {useDashboard: this.useDashboard});
}
consoleComponents() {
// TODO: suggestions should be moved to their own module // TODO: suggestions should be moved to their own module
this.registerModulePackage('embark-console', { this.registerModulePackage('embark-console', {
events: this.events, events: this.events,
@ -149,10 +156,7 @@ class Engine {
logger: this.logger, logger: this.logger,
config: this.config config: this.config
}); });
this.registerModulePackage('embark-plugin-cmd');
// TODO: we shouldn't need useDashboard
this.registerModulePackage('embark-library-manager', {useDashboard: this.useDashboard});
} }
blockchainStackComponents() { blockchainStackComponents() {