From ad0252dec3a42e8dc0dd74659c59d671ec3decb8 Mon Sep 17 00:00:00 2001
From: Daniel Schep <dschep@gmail.com>
Date: Mon, 16 Sep 2019 14:59:59 -0400
Subject: [PATCH] do async plugin init in load all plugins

---
 lib/Serverless.js            | 3 +--
 lib/Serverless.test.js       | 1 -
 lib/classes/PluginManager.js | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index e43241b11..86921a8e6 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -75,8 +75,7 @@ class Serverless {
       })
       .then(() => {
         // load all plugins
-        this.pluginManager.loadAllPlugins(this.service.plugins);
-        return this.pluginManager.asyncPluginInit();
+        return this.pluginManager.loadAllPlugins(this.service.plugins);
       })
       .then(() => {
         // give the CLI the plugins and commands so that it can print out
diff --git a/lib/Serverless.test.js b/lib/Serverless.test.js
index 83a66606d..9da8a02d1 100644
--- a/lib/Serverless.test.js
+++ b/lib/Serverless.test.js
@@ -185,7 +185,6 @@ describe('Serverless', () => {
 
       return serverless.init().then(() => {
         expect(loadAllPluginsStub.calledOnce).to.equal(true);
-        expect(asyncPluginInitStub.calledOnce).to.equal(true);
         expect(updateAutocompleteCacheFileStub.calledOnce).to.equal(true);
       });
     });
diff --git a/lib/classes/PluginManager.js b/lib/classes/PluginManager.js
index 673f7e2ad..adc43d4e9 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/PluginManager.js
@@ -96,6 +96,7 @@ class PluginManager {
     this.loadCorePlugins();
     this.loadServicePlugins(servicePlugins);
     this.loadEnterprisePlugin();
+    return this.asyncPluginInit();
   }
 
   loadPlugins(plugins) {