From ad26533f4a10fbcd84d107be39bc35d0bf51a9e6 Mon Sep 17 00:00:00 2001
From: emizzle <ericmastro@status.im>
Date: Thu, 5 Dec 2019 15:13:47 +1100
Subject: [PATCH] chore(@embark/core): Set DApp plugins to load last

DApp plugins were already been setup to load last for run and test. This PR sets updates `console`, `build`, `graph`, and `upload` to do the same.
---
 packages/embark/src/cmd/cmd_controller.js | 47 ++++++++++++++---------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/packages/embark/src/cmd/cmd_controller.js b/packages/embark/src/cmd/cmd_controller.js
index f2ac0e687..9ebd5c17c 100644
--- a/packages/embark/src/cmd/cmd_controller.js
+++ b/packages/embark/src/cmd/cmd_controller.js
@@ -270,11 +270,6 @@ class EmbarkController {
         engine.init({}, callback);
       },
       callback => {
-        let pluginList = engine.plugins.listPlugins();
-        if (pluginList.length > 0) {
-          engine.logger.info(__("loaded plugins") + ": " + pluginList.join(", "));
-        }
-
         engine.registerModuleGroup("coreComponents");
         engine.registerModuleGroup("stackComponents");
 
@@ -291,6 +286,13 @@ class EmbarkController {
           engine.registerModuleGroup("storage");
         }
 
+        // load custom plugins
+        engine.loadDappPlugins();
+        let pluginList = engine.plugins.listPlugins();
+        if (pluginList.length > 0) {
+          engine.logger.info(__("loaded plugins") + ": " + pluginList.join(", "));
+        }
+
         engine.events.on('deployment:deployContracts:afterAll', () => {
           engine.events.request('pipeline:generateAll', () => {
             engine.events.emit('outputDone');
@@ -369,11 +371,6 @@ class EmbarkController {
         engine.init({}, callback);
       },
       callback => {
-        let pluginList = engine.plugins.listPlugins();
-        if (pluginList.length > 0) {
-          engine.logger.info(__("loaded plugins") + ": " + pluginList.join(", "));
-        }
-
         engine.registerModuleGroup("coreComponents");
         engine.registerModuleGroup("stackComponents");
         engine.registerModuleGroup("consoleComponents");
@@ -394,6 +391,13 @@ class EmbarkController {
         engine.registerModulePackage('embark-deploy-tracker', { plugins: engine.plugins });
         engine.registerModulePackage("embark-debugger");
 
+        // load custom plugins
+        engine.loadDappPlugins();
+        let pluginList = engine.plugins.listPlugins();
+        if (pluginList.length > 0) {
+          engine.logger.info(__("loaded plugins") + ": " + pluginList.join(", "));
+        }
+
         callback();
       },
       callback => {
@@ -472,11 +476,6 @@ class EmbarkController {
         engine.init({}, callback);
       },
       function (callback) {
-        let pluginList = engine.plugins.listPlugins();
-        if (pluginList.length > 0) {
-          engine.logger.info(__("loaded plugins") + ": " + pluginList.join(", "));
-        }
-
         engine.registerModuleGroup("coreComponents");
         engine.registerModuleGroup("stackComponents");
 
@@ -484,6 +483,13 @@ class EmbarkController {
         engine.registerModuleGroup("contracts");
         engine.registerModulePackage("embark-graph");
 
+        // load custom plugins
+        engine.loadDappPlugins();
+        let pluginList = engine.plugins.listPlugins();
+        if (pluginList.length > 0) {
+          engine.logger.info(__("loaded plugins") + ": " + pluginList.join(", "));
+        }
+
         engine.startEngine(async () => {
           let contractsFiles = await engine.events.request2("config:contractsFiles");
           let compiledContracts = await engine.events.request2("compiler:contracts:compile", contractsFiles);
@@ -662,10 +668,6 @@ class EmbarkController {
         });
       },
       function startServices(callback) {
-        let pluginList = engine.plugins.listPlugins();
-        if (pluginList.length > 0) {
-          engine.logger.info(__("loaded plugins") + ": " + pluginList.join(", "));
-        }
         engine.registerModuleGroup("coreComponents");
         engine.registerModuleGroup("stackComponents");
 
@@ -680,6 +682,13 @@ class EmbarkController {
         engine.registerModuleGroup("storage");
         engine.registerModulePackage('embark-deploy-tracker', { plugins: engine.plugins });
 
+        // load custom plugins
+        engine.loadDappPlugins();
+        let pluginList = engine.plugins.listPlugins();
+        if (pluginList.length > 0) {
+          engine.logger.info(__("loaded plugins") + ": " + pluginList.join(", "));
+        }
+
         const plugin = engine.plugins.createPlugin('cmdcontrollerplugin', {});
         plugin.registerActionForEvent("embark:engine:started", async (_params, cb) => {
           try {