diff --git a/packages/embark/src/cmd/cmd_controller.js b/packages/embark/src/cmd/cmd_controller.js index 5c3bb65d3..ad8843934 100644 --- a/packages/embark/src/cmd/cmd_controller.js +++ b/packages/embark/src/cmd/cmd_controller.js @@ -69,7 +69,8 @@ class EmbarkController { }); }); } -simulator(_options) { + + simulator(_options) { // this.context = options.context || [constants.contexts.simulator, constants.contexts.blockchain]; // let simulator = new Simulator({ // blockchainConfig: this.config.blockchainConfig, @@ -150,6 +151,7 @@ simulator(_options) { engine.registerModuleGroup("coreComponents"); engine.registerModuleGroup("stackComponents"); + engine.registerModuleGroup("consoleComponents"); // TODO: replace with individual plugins engine.registerModuleGroup("namesystem"); @@ -362,6 +364,7 @@ simulator(_options) { engine.registerModuleGroup("coreComponents"); engine.registerModuleGroup("stackComponents"); + engine.registerModuleGroup("consoleComponents"); // TODO: replace with individual plugins engine.registerModuleGroup("namesystem"); diff --git a/packages/embark/src/lib/core/engine.js b/packages/embark/src/lib/core/engine.js index 0c9c07669..205ac2551 100644 --- a/packages/embark/src/lib/core/engine.js +++ b/packages/embark/src/lib/core/engine.js @@ -80,6 +80,7 @@ class Engine { blockchain: this.blockchainComponents, coreComponents: this.coreComponents, stackComponents: this.stackComponents, + consoleComponents: this.consoleComponents, blockchainStackComponents: this.blockchainStackComponents, compiler: this.compilerComponents, contracts: this.contractsComponents, @@ -140,6 +141,12 @@ class Engine { cb(); }); 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 this.registerModulePackage('embark-console', { events: this.events, @@ -149,10 +156,7 @@ class Engine { logger: this.logger, config: this.config }); - - - // TODO: we shouldn't need useDashboard - this.registerModulePackage('embark-library-manager', {useDashboard: this.useDashboard}); + this.registerModulePackage('embark-plugin-cmd'); } blockchainStackComponents() {