From 873d14d22dd5fc89e952e51f65fdc101b6602050 Mon Sep 17 00:00:00 2001
From: Guillaume Chau <alphadelta.fg@gmail.com>
Date: Fri, 25 May 2018 01:44:18 +0200
Subject: [PATCH] feat(ui): update to latest vue-cli-plugin-apollo

---
 packages/@vue/cli-ui/.env.production                  |  2 +-
 packages/@vue/cli-ui/package.json                     |  2 +-
 .../src/graphql-api/connectors/client-addons.js       |  2 +-
 packages/@vue/cli-ui/src/vue-apollo.js                |  2 +-
 packages/@vue/cli/lib/ui.js                           | 11 +++++++----
 yarn.lock                                             |  6 +++---
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/@vue/cli-ui/.env.production b/packages/@vue/cli-ui/.env.production
index b043a03b50..5c88ad9a07 100644
--- a/packages/@vue/cli-ui/.env.production
+++ b/packages/@vue/cli-ui/.env.production
@@ -1 +1 @@
-VUE_APP_GRAPHQL_WS=
+VUE_CLI_UI_URL=
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
index 386dd596c8..a547d2372d 100644
--- a/packages/@vue/cli-ui/package.json
+++ b/packages/@vue/cli-ui/package.json
@@ -31,7 +31,7 @@
     "semver": "^5.5.0",
     "shortid": "^2.2.8",
     "terminate": "^2.1.0",
-    "vue-cli-plugin-apollo": "^0.10.0",
+    "vue-cli-plugin-apollo": "^0.11.0",
     "watch": "^1.0.2"
   },
   "devDependencies": {
diff --git a/packages/@vue/cli-ui/src/graphql-api/connectors/client-addons.js b/packages/@vue/cli-ui/src/graphql-api/connectors/client-addons.js
index 6acebbf922..121fdc3f83 100644
--- a/packages/@vue/cli-ui/src/graphql-api/connectors/client-addons.js
+++ b/packages/@vue/cli-ui/src/graphql-api/connectors/client-addons.js
@@ -6,7 +6,7 @@ const { resolveModuleRoot } = require('../utils/resolve-path')
 
 let addons = []
 
-let baseUrl = process.env.VUE_APP_GRAPHQL_WS
+let baseUrl = process.env.VUE_CLI_UI_URL
 if (typeof baseUrl === 'undefined') {
   baseUrl = 'http://localhost:4000'
 } else {
diff --git a/packages/@vue/cli-ui/src/vue-apollo.js b/packages/@vue/cli-ui/src/vue-apollo.js
index c302885312..61fd87857d 100644
--- a/packages/@vue/cli-ui/src/vue-apollo.js
+++ b/packages/@vue/cli-ui/src/vue-apollo.js
@@ -5,7 +5,7 @@ import { createApolloClient } from 'vue-cli-plugin-apollo/graphql-client'
 // Install the vue plugin
 Vue.use(VueApollo)
 
-let endpoint = process.env.VUE_APP_GRAPHQL_WS
+let endpoint = process.env.VUE_CLI_UI_URL
 if (typeof endpoint === 'undefined') {
   endpoint = 'ws://localhost:4000/graphql'
 } else if (endpoint === '') {
diff --git a/packages/@vue/cli/lib/ui.js b/packages/@vue/cli/lib/ui.js
index 99d8effada..51cbec2ffd 100644
--- a/packages/@vue/cli/lib/ui.js
+++ b/packages/@vue/cli/lib/ui.js
@@ -8,9 +8,7 @@ async function ui (options = {}, context = process.cwd()) {
   }
 
   // Config
-  process.env.VUE_APP_GRAPHQL_PORT = port
-  process.env.VUE_APP_GRAPHQL_WS = ''
-  process.env.VUE_APP_GRAPHQL_PLAYGROUND_PATH = '/graphql-playground'
+  process.env.VUE_CLI_UI_URL = ''
 
   if (!options.dev) {
     process.env.NODE_ENV = 'production'
@@ -21,6 +19,11 @@ async function ui (options = {}, context = process.cwd()) {
   server = server.default || server
 
   const opts = {
+    port,
+    graphqlPath: '/graphql',
+    graphqlSubscriptionsPath: '/graphql',
+    graphqlPlaygroundPath: '/graphql-playground',
+    graphqlCors: '*',
     mock: false,
     apolloEngine: false,
     timeout: 1000000,
@@ -35,7 +38,7 @@ async function ui (options = {}, context = process.cwd()) {
   }
 
   server(opts, () => {
-    const url = `http://localhost:${process.env.VUE_APP_GRAPHQL_PORT}`
+    const url = `http://localhost:${port}`
     if (!options.quiet) log(`🌠  Ready on ${url}`)
     if (options.headless) {
       console.log(port)
diff --git a/yarn.lock b/yarn.lock
index e6b8448401..0a8667ebae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11442,9 +11442,9 @@ vue-class-component@^6.0.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/vue-class-component/-/vue-class-component-6.2.0.tgz#7adb1daa9a868c75f30f97f33f4f1b94aee62089"
 
-vue-cli-plugin-apollo@^0.10.0:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/vue-cli-plugin-apollo/-/vue-cli-plugin-apollo-0.10.3.tgz#4b43c33fe64eae21c5b321fe3b0a475e12897f9c"
+vue-cli-plugin-apollo@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/vue-cli-plugin-apollo/-/vue-cli-plugin-apollo-0.11.0.tgz#13d390006fd44245ce4914548a0d4a11bf5198bf"
   dependencies:
     apollo-cache-inmemory "^1.2.1"
     apollo-client "^2.3.1"