chore: dev api server port

Guillaume Chau · Guillaume Chau · commit e8189b5eddc9 · 2018-09-24T13:52:47.000+02:00
diff --git a/packages/@vue/cli-ui/apollo-server/connectors/client-addons.js b/packages/@vue/cli-ui/apollo-server/connectors/client-addons.js
@@ -8,7 +8,7 @@ let addons = []
 
 let baseUrl = process.env.VUE_APP_CLI_UI_URL
 if (typeof baseUrl === 'undefined') {
-  baseUrl = 'http://localhost:4000'
+  baseUrl = `http://localhost:${process.env.VUE_APP_GRAPHQL_PORT}`
 } else {
   baseUrl = baseUrl.replace(/ws:\/\/([a-z0-9_-]+:\d+).*/i, 'http://$1')
 }
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
@@ -2,10 +2,10 @@
   "name": "@vue/cli-ui",
   "version": "3.0.3",
   "scripts": {
-    "serve": "cross-env VUE_APP_CLI_UI_URL=ws://localhost:4000/graphql vue-cli-service serve",
+    "serve": "cross-env VUE_APP_CLI_UI_URL=ws://localhost:4030/graphql VUE_APP_GRAPHQL_PORT=4030 vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint",
-    "apollo": "cross-env VUE_APP_CLI_UI_DEV=true VUE_APP_GRAPHQL_PORT=4000 vue-cli-service apollo:watch",
+    "apollo": "cross-env VUE_APP_CLI_UI_DEV=true VUE_APP_GRAPHQL_PORT=4030 vue-cli-service apollo:watch",
     "apollo:run": "cross-env VUE_CLI_DEBUG=true VUE_CLI_IPC=vue-cli-dev vue-cli-service apollo:run",
     "apollo:run:test": "cross-env VUE_CLI_UI_TEST=true VUE_APP_GRAPHQL_PORT=4040 VUE_APP_CLI_UI_URL=ws://localhost:4040/graphql VUE_CLI_IPC=vue-cli-test vue-cli-service apollo:watch",
     "prepublishOnly": "yarn run lint --no-fix && yarn run build",
diff --git a/packages/@vue/cli-ui/src/components/ItemLogo.vue b/packages/@vue/cli-ui/src/components/ItemLogo.vue
@@ -77,7 +77,7 @@ export default {
     imageUrl () {
       // Fix images in development
       if (process.env.VUE_APP_CLI_UI_DEV && this.image.charAt(0) === '/') {
-        return `http://localhost:4000${this.image}`
+        return `http://localhost:${process.env.VUE_APP_GRAPHQL_PORT}${this.image}`
       }
       return this.image
     }
diff --git a/packages/@vue/cli-ui/src/components/ProjectNavButton.vue b/packages/@vue/cli-ui/src/components/ProjectNavButton.vue
@@ -77,7 +77,7 @@ export default {
   methods: {
     imageSrc (url) {
       if (process.env.VUE_APP_CLI_UI_DEV && url.charAt(0) === '/') {
-        return `http://localhost:4000${url}`
+        return `http://localhost:${process.env.VUE_APP_GRAPHQL_PORT}${url}`
       }
       return url
     }
diff --git a/packages/@vue/cli-ui/src/vue-apollo.js b/packages/@vue/cli-ui/src/vue-apollo.js
@@ -15,7 +15,7 @@ Vue.use(VueApollo)
 
 let endpoint = process.env.VUE_APP_CLI_UI_URL
 if (typeof endpoint === 'undefined') {
-  endpoint = 'ws://localhost:4000/graphql'
+  endpoint = `ws://localhost:${process.env.VUE_APP_GRAPHQL_PORT}/graphql`
 } else if (endpoint === '') {
   endpoint = window.location.origin.replace('http', 'ws') + '/graphql'
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ let addons = []`
`8`	`8`
`9`	`9`	`let baseUrl = process.env.VUE_APP_CLI_UI_URL`
`10`	`10`	`if (typeof baseUrl === 'undefined') {`
`11`		`- baseUrl = 'http://localhost:4000'`
	`11`	+ baseUrl = `http://localhost:${process.env.VUE_APP_GRAPHQL_PORT}`
`12`	`12`	`} else {`
`13`	`13`	`baseUrl = baseUrl.replace(/ws:\/\/([a-z0-9_-]+:\d+).*/i, 'http://$1')`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ export default {`
`77`	`77`	`imageUrl () {`
`78`	`78`	`// Fix images in development`
`79`	`79`	`if (process.env.VUE_APP_CLI_UI_DEV && this.image.charAt(0) === '/') {`
`80`		- return `http://localhost:4000${this.image}`
	`80`	+ return `http://localhost:${process.env.VUE_APP_GRAPHQL_PORT}${this.image}`
`81`	`81`	`}`
`82`	`82`	`return this.image`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ Vue.use(VueApollo)`
`15`	`15`
`16`	`16`	`let endpoint = process.env.VUE_APP_CLI_UI_URL`
`17`	`17`	`if (typeof endpoint === 'undefined') {`
`18`		`- endpoint = 'ws://localhost:4000/graphql'`
	`18`	+ endpoint = `ws://localhost:${process.env.VUE_APP_GRAPHQL_PORT}/graphql`
`19`	`19`	`} else if (endpoint === '') {`
`20`	`20`	`endpoint = window.location.origin.replace('http', 'ws') + '/graphql'`
`21`	`21`	`}`