From e591ea4c2016717ba104783f06e2067b5e141c30 Mon Sep 17 00:00:00 2001
From: Guillaume Chau <alphadelta.fg@gmail.com>
Date: Mon, 23 Apr 2018 19:10:22 +0200
Subject: [PATCH] fix(ui): Plugin actions

---
 packages/@vue/cli-ui/src/graphql-api/api/PluginApi.js | 2 +-
 packages/@vue/cli-ui/src/util/plugin-action.js        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@vue/cli-ui/src/graphql-api/api/PluginApi.js b/packages/@vue/cli-ui/src/graphql-api/api/PluginApi.js
index 672cfb25c..0d5b20c78 100644
--- a/packages/@vue/cli-ui/src/graphql-api/api/PluginApi.js
+++ b/packages/@vue/cli-ui/src/graphql-api/api/PluginApi.js
@@ -1,6 +1,5 @@
 // Connectors
 const logs = require('../connectors/logs')
-const plugins = require('../connectors/plugins')
 const sharedData = require('../connectors/shared-data')
 const views = require('../connectors/views')
 // Utils
@@ -235,6 +234,7 @@ class PluginApi {
    * @returns {Promise}
    */
   callAction (id, params) {
+    const plugins = require('../connectors/plugins')
     return plugins.callAction({ id, params }, this.context)
   }
 
diff --git a/packages/@vue/cli-ui/src/util/plugin-action.js b/packages/@vue/cli-ui/src/util/plugin-action.js
index efcc7ed3f..f1471ebec 100644
--- a/packages/@vue/cli-ui/src/util/plugin-action.js
+++ b/packages/@vue/cli-ui/src/util/plugin-action.js
@@ -20,13 +20,13 @@ export default {
         $onPluginActionCalled (cb) {
           return this.$apollo.addSmartSubscription(`plugin-action-called-${uid++}`, {
             query: PLUGIN_ACTION_CALLED,
-            result: cb
+            result: ({ data }) => cb(data.pluginActionCalled)
           })
         },
         $onPluginActionResolved (cb) {
           return this.$apollo.addSmartSubscription(`plugin-action-resolved-${uid++}`, {
             query: PLUGIN_ACTION_RESOLVED,
-            result: cb
+            result: ({ data }) => cb(data.pluginActionResolved)
           })
         }
       }