chore: merge branch 'v3' into docs

Author: haoqunjiang

CHANGELOG.md

@@ -1,3 +1,19 @@
+
+## 3.8.3 (2019-06-13)
+
+#### :bug: Bug Fix
+* `@vue/cli-service`
+  * [#4083](https://github.com/vuejs/vue-cli/pull/4083) fix: display correct address when multiple network adapters present ([@sodatea](https://github.com/sodatea))
+  * [#4095](https://github.com/vuejs/vue-cli/pull/4095) fix: fix resolve project local plugin's file path ([@sodatea](https://github.com/sodatea))
+
+#### :memo: Documentation
+* [#3924](https://github.com/vuejs/vue-cli/pull/3924) docs: add more explanation at prompts ([@kazupon](https://github.com/kazupon))
+
+#### Committers: 2
+- Haoqun Jiang ([@sodatea](https://github.com/sodatea))
+- kazuya kawaguchi ([@kazupon](https://github.com/kazupon))
+
+
 ## 3.8.2 (2019-05-26)
 
 #### :bug: Bug Fix

docs/dev-guide/plugin-dev.md

@@ -102,7 +102,7 @@ A generator should export a function which receives three arguments:
 
 And if the user creates a project using the `foo` preset, then the generator of `@vue/cli-plugin-foo` will receive `{ option: 'bar' }` as its second argument.
 
-For a 3rd party plugin, the options will be resolved from the prompts or command line arguments when the user executes `vue invoke` (see [Prompts for 3rd party plugins](#prompts-for-3rd-party-plugins)).
+For a 3rd party plugin, the options will be resolved from the prompts or command line arguments when the user executes `vue invoke` (see [Prompts](#prompts)).
 
 3. The entire preset (`presets.foo`) will be passed as the third argument.
 
@@ -430,7 +430,56 @@ This is because the command's expected mode needs to be known before loading env
 
 Prompts are required to handle user choices when creating a new project or adding a new plugin to the existing one. All prompts logic is stored inside the `prompts.js` file. The prompts are presented using [inquirer](https://github.com/SBoudrias/Inquirer.js) under the hood.
 
-When user initialize the plugin by calling `vue invoke`, if the plugin contains a `prompts.js` in its root directory, it will be used during invocation. The file should export an array of [Questions](https://github.com/SBoudrias/Inquirer.js#question) that will be handled by Inquirer.js. The resolved answers object will be passed to the plugin's generator as options.
+When user initialize the plugin by calling `vue invoke`, if the plugin contains a `prompts.js` in its root directory, it will be used during invocation. The file should export an array of [Questions](https://github.com/SBoudrias/Inquirer.js#question) that will be handled by Inquirer.js. 
+
+You should export directly array of questions, or export function that return those.
+
+e.g. directly array of questions:
+```js
+// prompts.js
+
+module.exports = [
+  {
+    type: 'input',
+    name: 'locale',
+    message: 'The locale of project localization.',
+    validate: input => !!input,
+    default: 'en'
+  }, 
+  // ...
+]
+```
+
+e.g. function that return array of questions:
+```js
+// prompts.js
+
+// pass `package.json` of project to function argument
+module.exports = pkg => {
+  const prompts = [
+    {
+      type: 'input',
+      name: 'locale',
+      message: 'The locale of project localization.',
+      validate: input => !!input,
+      default: 'en'
+    }
+  ]
+
+  // add dynamically propmpt
+  if ('@vue/cli-plugin-eslint' in (pkg.devDependencies || {})) {
+    prompts.push({
+      type: 'confirm',
+      name: 'useESLintPluginVueI18n',
+      message: 'Use ESLint plugin for Vue I18n ?'
+    })
+  }
+
+  return prompts
+}
+```
+
+The resolved answers object will be passed to the plugin's generator as options.
 
 Alternatively, the user can skip the prompts and directly initialize the plugin by passing options via the command line, e.g.:
 

lerna.json

@@ -1,7 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": false,
-  "version": "3.8.2",
+  "version": "3.8.3",
   "packages": [
     "packages/@vue/babel-preset-app",
     "packages/@vue/cli*"

packages/@vue/cli-service-global/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-service-global",
-  "version": "3.8.0",
+  "version": "3.8.3",
   "description": "vue-cli-service global addon for vue-cli",
   "main": "index.js",
   "publishConfig": {
@@ -25,7 +25,7 @@
     "@vue/babel-preset-app": "^3.8.0",
     "@vue/cli-plugin-babel": "^3.8.0",
     "@vue/cli-plugin-eslint": "^3.8.0",
-    "@vue/cli-service": "^3.8.0",
+    "@vue/cli-service": "^3.8.3",
     "babel-eslint": "^10.0.1",
     "chalk": "^2.4.2",
     "eslint": "^4.19.1",

packages/@vue/cli-service/lib/Service.js

@@ -189,7 +189,7 @@ module.exports = class Service {
       }
       plugins = plugins.concat(files.map(file => ({
         id: `local:${file}`,
-        apply: loadModule(file, this.pkgContext)
+        apply: loadModule(`./${file}`, this.pkgContext)
       })))
     }
 

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

@@ -164,7 +164,9 @@ module.exports = (api, options) => {
         api.service.devServerConfigFns.forEach(fn => fn(app, server))
         // apply in project middlewares
         projectDevServerOptions.before && projectDevServerOptions.before(app, server)
-      }
+      },
+      // avoid opening browser
+      open: false
     }))
 
     ;['SIGINT', 'SIGTERM'].forEach(signal => {

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

@@ -9,6 +9,7 @@
 const url = require('url')
 const chalk = require('chalk')
 const address = require('address')
+const defaultGateway = require('default-gateway')
 
 module.exports = function prepareUrls (protocol, host, port, pathname = '/') {
   const formatUrl = hostname =>
@@ -33,7 +34,8 @@ module.exports = function prepareUrls (protocol, host, port, pathname = '/') {
     prettyHost = 'localhost'
     try {
       // This can only return an IPv4 address
-      lanUrlForConfig = address.ip()
+      const result = defaultGateway.v4.sync()
+      lanUrlForConfig = address.ip(result && result.interface)
       if (lanUrlForConfig) {
         // Check if the address is a private ip
         // https://en.wikipedia.org/wiki/Private_network#Private_IPv4_address_spaces

packages/@vue/cli-service/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-service",
-  "version": "3.8.0",
+  "version": "3.8.3",
   "description": "local service for vue-cli projects",
   "main": "lib/Service.js",
   "typings": "types/index.d.ts",
@@ -46,6 +46,7 @@
     "cssnano": "^4.1.10",
     "current-script-polyfill": "^1.0.0",
     "debug": "^4.1.1",
+    "default-gateway": "^4.2.0",
     "dotenv": "^7.0.0",
     "dotenv-expand": "^5.1.0",
     "escape-string-regexp": "^1.0.5",

packages/@vue/cli-ui-addon-webpack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui-addon-webpack",
-  "version": "3.8.0",
+  "version": "3.8.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -20,7 +20,7 @@
   "devDependencies": {
     "@vue/cli-plugin-babel": "^3.8.0",
     "@vue/cli-plugin-eslint": "^3.8.0",
-    "@vue/cli-service": "^3.8.0",
+    "@vue/cli-service": "^3.8.3",
     "@vue/eslint-config-standard": "^4.0.0",
     "eslint": "^5.16.0",
     "stylus": "^0.54.5",

packages/@vue/cli-ui-addon-widgets/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui-addon-widgets",
-  "version": "3.8.0",
+  "version": "3.8.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -20,7 +20,7 @@
   "devDependencies": {
     "@vue/cli-plugin-babel": "^3.8.0",
     "@vue/cli-plugin-eslint": "^3.8.0",
-    "@vue/cli-service": "^3.8.0",
+    "@vue/cli-service": "^3.8.3",
     "@vue/eslint-config-standard": "^4.0.0",
     "eslint": "^5.16.0",
     "stylus": "^0.54.5",

packages/@vue/cli-ui/apollo-server/util/parse-args.js

@@ -9,11 +9,11 @@ exports.parseArgs = function (args) {
   for (const part of parts) {
     const l = part.length
     if (!arg && part.charAt(0) === '"') {
-      arg = part.substr(1)
+      arg = part
     } else if (part.charAt(l - 1) === '"' && (
       l === 1 || part.charAt(l - 2) !== '\\'
     )) {
-      arg += args.charAt(index - 1) + part.substr(0, l - 1)
+      arg += args.charAt(index - 1) + part.substr(0, l)
       result.push(arg)
       arg = null
     } else if (arg) {

packages/@vue/cli-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui",
-  "version": "3.8.0",
+  "version": "3.8.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -69,7 +69,7 @@
     "@vue/cli-plugin-babel": "^3.8.0",
     "@vue/cli-plugin-e2e-cypress": "^3.8.0",
     "@vue/cli-plugin-eslint": "^3.8.0",
-    "@vue/cli-service": "^3.8.0",
+    "@vue/cli-service": "^3.8.3",
     "@vue/eslint-config-standard": "^4.0.0",
     "@vue/ui": "^0.9.1",
     "ansi_up": "^3.0.0",

packages/@vue/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli",
-  "version": "3.8.2",
+  "version": "3.8.3",
   "description": "Command line interface for rapid Vue.js development",
   "bin": {
     "vue": "bin/vue.js"
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@vue/cli-shared-utils": "^3.8.0",
-    "@vue/cli-ui": "^3.8.0",
-    "@vue/cli-ui-addon-webpack": "^3.8.0",
-    "@vue/cli-ui-addon-widgets": "^3.8.0",
+    "@vue/cli-ui": "^3.8.3",
+    "@vue/cli-ui-addon-webpack": "^3.8.3",
+    "@vue/cli-ui-addon-widgets": "^3.8.3",
     "chalk": "^2.4.1",
     "cmd-shim": "^2.0.2",
     "commander": "^2.20.0",

packages/vue-cli-version-marker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-cli-version-marker",
-  "version": "3.8.2",
+  "version": "3.8.3",
   "description": "version marker for @vue/cli",
   "author": "Evan You",
   "license": "MIT",
@@ -17,14 +17,14 @@
     "@vue/cli-plugin-typescript": "3.8.1",
     "@vue/cli-plugin-unit-jest": "3.8.0",
     "@vue/cli-plugin-unit-mocha": "3.8.0",
-    "@vue/cli-service-global": "3.8.0",
-    "@vue/cli-service": "3.8.0",
+    "@vue/cli-service-global": "3.8.3",
+    "@vue/cli-service": "3.8.3",
     "@vue/cli-shared-utils": "3.8.0",
     "@vue/cli-test-utils": "3.8.0",
-    "@vue/cli-ui-addon-webpack": "3.8.0",
-    "@vue/cli-ui-addon-widgets": "3.8.0",
-    "@vue/cli-ui": "3.8.0",
+    "@vue/cli-ui-addon-webpack": "3.8.3",
+    "@vue/cli-ui-addon-widgets": "3.8.3",
+    "@vue/cli-ui": "3.8.3",
     "@vue/cli-upgrade": "3.8.0",
-    "@vue/cli": "3.8.2"
+    "@vue/cli": "3.8.3"
   }
 }