chore: merge dev

Author: robertkruis

package.json

@@ -60,7 +60,7 @@
     "request": "^2.83.0",
     "request-promise-native": "^1.0.5",
     "rimraf": "^2.6.2",
-    "vuepress": "^0.10.0",
+    "vuepress": "^0.10.1",
     "vuepress-theme-vue": "^1.0.3",
     "yorkie": "^1.0.2"
   },

packages/@vue/cli-plugin-eslint/package.json

@@ -26,6 +26,7 @@
     "babel-eslint": "^8.2.3",
     "eslint": "^4.19.1",
     "eslint-loader": "^2.0.0",
-    "eslint-plugin-vue": "^4.5.0"
+    "eslint-plugin-vue": "^4.5.0",
+    "launch-editor": "^2.2.1"
   }
 }

packages/@vue/cli-plugin-eslint/ui.js

@@ -1,7 +1,9 @@
 module.exports = api => {
+  const CONFIG = 'eslintrc'
+
   // Config file
   api.describeConfig({
-    id: 'eslintrc',
+    id: CONFIG,
     name: 'ESLint configuration',
     description: 'eslint.config.eslint.description',
     link: 'https://github.com/vuejs/eslint-plugin-vue',
@@ -226,4 +228,37 @@ module.exports = api => {
       if (answers.noFix) args.push('--no-fix')
     }
   })
+
+  const OPEN_ESLINTRC = 'vue-eslint-open-eslintrc'
+
+  api.onViewOpen(({ view }) => {
+    if (view.id !== 'vue-project-configurations') {
+      removeSuggestions()
+    }
+  })
+
+  api.onConfigRead(({ config }) => {
+    if (config.id === CONFIG) {
+      api.addSuggestion({
+        id: OPEN_ESLINTRC,
+        type: 'action',
+        label: 'eslint.suggestions.open-eslintrc.label',
+        handler () {
+          const file = config.foundFiles.eslint.path
+          console.log('open', file)
+          const launch = require('launch-editor')
+          launch(file)
+          return {
+            keep: true
+          }
+        }
+      })
+    } else {
+      removeSuggestions()
+    }
+  })
+
+  function removeSuggestions () {
+    [OPEN_ESLINTRC].forEach(id => api.removeSuggestion(id))
+  }
 }

packages/@vue/cli-plugin-pwa/package.json

@@ -22,7 +22,8 @@
     "access": "public"
   },
   "dependencies": {
-    "workbox-webpack-plugin": "^3.2.0"
+    "workbox-webpack-plugin": "^3.2.0",
+    "launch-editor": "^2.2.1"
   },
   "devDependencies": {
     "register-service-worker": "^1.0.0"

packages/@vue/cli-plugin-pwa/ui.js

@@ -1,7 +1,9 @@
 module.exports = api => {
+  const CONFIG = 'pwa'
+
   // Config file
   api.describeConfig({
-    id: 'pwa',
+    id: CONFIG,
     name: 'PWA',
     description: 'pwa.config.pwa.description',
     link: 'https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-pwa#configuration',
@@ -110,4 +112,60 @@ module.exports = api => {
       }
     }
   })
+
+  const OPEN_VUE = 'vue-pwa-open-vue'
+  const OPEN_MANIFEST = 'vue-pwa-open-manifest'
+
+  api.onViewOpen(({ view }) => {
+    if (view.id !== 'vue-project-configurations') {
+      removeSuggestions()
+    }
+  })
+
+  api.onConfigRead(({ config }) => {
+    if (config.id === CONFIG) {
+      if (config.foundFiles.vue) {
+        api.addSuggestion({
+          id: OPEN_VUE,
+          type: 'action',
+          label: 'pwa.suggestions.open-vue.label',
+          handler () {
+            const file = config.foundFiles.vue.path
+            console.log('open', file)
+            const launch = require('launch-editor')
+            launch(file)
+            return {
+              keep: true
+            }
+          }
+        })
+      } else {
+        api.removeSuggestion(OPEN_VUE)
+      }
+      if (config.foundFiles.manifest) {
+        api.addSuggestion({
+          id: OPEN_MANIFEST,
+          type: 'action',
+          label: 'pwa.suggestions.open-manifest.label',
+          handler () {
+            const file = config.foundFiles.manifest.path
+            console.log('open', file)
+            const launch = require('launch-editor')
+            launch(file)
+            return {
+              keep: true
+            }
+          }
+        })
+      } else {
+        api.removeSuggestion(OPEN_MANIFEST)
+      }
+    } else {
+      removeSuggestions()
+    }
+  })
+
+  function removeSuggestions () {
+    [OPEN_VUE, OPEN_MANIFEST].forEach(id => api.removeSuggestion(id))
+  }
 }

packages/@vue/cli-service/lib/commands/serve.js

@@ -83,7 +83,8 @@ module.exports = (api, options) => {
 
     // inject dev & hot-reload middleware entries
     if (!isProduction) {
-      const sockjsUrl = url.format({
+      const publicOpt = projectDevServerOptions.public
+      const sockjsUrl = publicOpt ? `//${publicOpt}/sockjs-node` : url.format({
         protocol,
         port,
         hostname: urls.lanUrlForConfig || 'localhost',

packages/@vue/cli-service/lib/util/getAssetPath.js

@@ -3,7 +3,11 @@ const path = require('path')
 module.exports = function getAssetPath (options, filePath, placeAtRootIfRelative) {
   // if the user is using a relative URL, place js & css at dist root to ensure
   // relative paths work properly
-  if (placeAtRootIfRelative && options.baseUrl.charAt(0) !== '/') {
+  if (
+    placeAtRootIfRelative &&
+    !(/^https?:/.test(options.baseUrl)) &&
+    options.baseUrl.charAt(0) !== '/'
+  ) {
     return filePath.replace(/^\w+\//, '')
   }
   return options.assetsDir

packages/@vue/cli-ui/locales/en.json

@@ -461,6 +461,11 @@
         "description": "Lints and fixes files",
         "noFix": "Do not fix errors"
       }
+    },
+    "suggestions": {
+      "open-eslintrc": {
+        "label": "Open eslintrc"
+      }
     }
   },
   "pwa": {
@@ -492,6 +497,14 @@
           "description": "Style for the web app status bar on iOS"
         }
       }
+    },
+    "suggestions": {
+      "open-vue": {
+        "label": "Open vue config"
+      },
+      "open-manifest": {
+        "label": "Open manifest"
+      }
     }
   },
   "cypress": {

packages/@vue/cli-ui/src/components/SuggestionBar.vue

@@ -5,12 +5,18 @@
   >
     <ApolloSubscribeToMore
       :document="require('../graphql/suggestionAdded.gql')"
-      :updateQuery="(previousResult, { subscriptionData }) => ({
-        suggestions: [
-          ...previousResult.suggestions,
-          subscriptionData.data.suggestionAdded
-        ]
-      })"
+      :updateQuery="(previousResult, { subscriptionData }) => {
+        const newSuggestion = subscriptionData.data.suggestionAdded
+        if (previousResult.suggestions.find(s => s.id === newSuggestion.id)) {
+          return previousResult
+        }
+        return {
+          suggestions: [
+            ...previousResult.suggestions,
+            newSuggestion
+          ]
+        }
+      }"
     />
 
     <ApolloSubscribeToMore

packages/@vue/cli-ui/src/graphql-api/connectors/suggestions.js

@@ -1,5 +1,7 @@
 // Subs
 const channels = require('../channels')
+// Connectors
+const { log } = require('../utils/logger')
 
 const suggestions = []
 
@@ -25,18 +27,23 @@ function add (suggestion, context) {
     suggestionAdded: suggestion
   })
 
+  log('Suggestion added', suggestion.id)
+
   return suggestion
 }
 
 function remove (id, context) {
   const suggestion = findOne(id)
+  if (!suggestion) return
   const index = suggestions.indexOf(suggestion)
   suggestions.splice(index, 1)
 
   context.pubsub.publish(channels.SUGGESTION_REMOVED, {
     suggestionRemoved: suggestion
   })
 
+  log('Suggestion removed', suggestion.id)
+
   return suggestion
 }
 
@@ -55,6 +62,8 @@ function update (data, context) {
     suggestionUpdated: suggestion
   })
 
+  log('Suggestion updated', suggestion.id)
+
   return suggestion
 }