chore: merge branch 'dev'

Author: haoqunjiang

.github/CONTRIBUTING.md

@@ -1,3 +1,5 @@
+# Contributing to Vue CLI
+
 ## Workflow
 
 The Git workflow used in this project is largely inspired by [Gitflow workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow).
@@ -66,4 +68,4 @@ Note that `jest --onlyChanged` isn't always accurate because some tests spawn ch
 
 ### Plugin Development
 
-See [dedicated section in docs](https://github.com/vuejs/vue-cli/blob/dev/docs/dev-guide/plugin-dev.md).
+See [dedicated section in docs](https://cli.vuejs.org/dev-guide/plugin-dev.html).

README.md

@@ -1,4 +1,4 @@
-# vue-cli [![Build Status](https://circleci.com/gh/vuejs/vue-cli/tree/dev.svg?style=shield)](https://circleci.com/gh/vuejs/vue-cli/tree/dev) [![Windows Build status](https://ci.appveyor.com/api/projects/status/rkpafdpdwie9lqx0/branch/dev?svg=true)](https://ci.appveyor.com/project/yyx990803/vue-cli/branch/dev) [![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lerna.js.org/)
+# Vue CLI [![Build Status](https://circleci.com/gh/vuejs/vue-cli/tree/dev.svg?style=shield)](https://circleci.com/gh/vuejs/vue-cli/tree/dev) [![Windows Build status](https://ci.appveyor.com/api/projects/status/rkpafdpdwie9lqx0/branch/dev?svg=true)](https://ci.appveyor.com/project/yyx990803/vue-cli/branch/dev) [![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lerna.js.org/)
 
 
 > Vue CLI is the Standard Tooling for Vue.js Development.

docs/zh/guide/deployment.md

@@ -281,7 +281,7 @@ now
 
 你的站点会开始部署，你将获得一个形如 [https://vue.now-examples.now.sh/](https://vue.now-examples.now.sh/) 的链接。
 
-开箱即用地，请求会被自动改写到 `index.html` (除了自定义的静态文件) 并带有合适的缓存请求头。你可以[改写](https://zeit.co/docs/v2/advanced/routes/)这些规则。
+开箱即用地，请求会被自动改写到 `index.html` (除了自定义的静态文件) 并带有合适的缓存请求头。
 
 ### Stdlib
 

packages/@vue/cli-service-global/lib/globalConfigPlugin.js

@@ -115,7 +115,7 @@ module.exports = function createConfigPlugin (context, entry, asLib) {
                   },
                   rules: {
                     'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-                    'no-debugger': `process.env.NODE_ENV === 'production' ? 'error' : 'off'`
+                    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
                   }
                 }
               }))

packages/@vue/cli/__tests__/Creator.spec.js

@@ -5,7 +5,7 @@ const { defaults } = require('../lib/options')
 const assertPromptModule = require('@vue/cli-test-utils/assertPromptModule')
 
 test('default', async () => {
-  const epxectedPrompts = [
+  const expectedPrompts = [
     {
       message: 'pick a preset',
       choices: [
@@ -20,7 +20,7 @@ test('default', async () => {
       choose: 0
     }
   ]
-  await assertPromptModule([], epxectedPrompts, defaults.presets.default)
+  await assertPromptModule([], expectedPrompts, defaults.presets.default)
 })
 
 test('manual + PromptModuleAPI', async () => {

packages/@vue/cli/__tests__/Generator.spec.js

@@ -457,6 +457,9 @@ test('api: extendPackage + { prune: true }', async () => {
 
   await generator.generate()
 
+  // should not warn about the null versions
+  expect(logs.warn.length).toBe(0)
+
   const pkg = JSON.parse(fs.readFileSync('/package.json', 'utf-8'))
   expect(pkg).toEqual({
     version: '0.0.0',

packages/@vue/cli/bin/vue.js

@@ -5,10 +5,7 @@
 
 const { chalk, semver } = require('@vue/cli-shared-utils')
 const requiredVersion = require('../package.json').engines.node
-const didYouMean = require('didyoumean')
-
-// Setting edit distance to 60% of the input string's length
-didYouMean.threshold = 0.6
+const leven = require('leven')
 
 function checkNodeVersion (wanted, id) {
   if (!semver.satisfies(process.version, wanted)) {
@@ -261,7 +258,15 @@ if (!process.argv.slice(2).length) {
 function suggestCommands (unknownCommand) {
   const availableCommands = program.commands.map(cmd => cmd._name)
 
-  const suggestion = didYouMean(unknownCommand, availableCommands)
+  let suggestion
+
+  availableCommands.forEach(cmd => {
+    const isBestMatch = leven(cmd, unknownCommand) < leven(suggestion || '', unknownCommand)
+    if (leven(cmd, unknownCommand) < 3 && isBestMatch) {
+      suggestion = cmd
+    }
+  })
+
   if (suggestion) {
     console.log(`  ` + chalk.red(`Did you mean ${chalk.yellow(suggestion)}?`))
   }

packages/@vue/cli/lib/promptModules/__tests__/e2e.spec.js

@@ -13,7 +13,7 @@ test('cypress', async () => {
       check: [0]
     },
     {
-      message: 'Pick a E2E testing solution',
+      message: 'Pick an E2E testing solution',
       choices: ['Cypress', 'Nightwatch'],
       choose: 0
     }
@@ -41,7 +41,7 @@ test('nightwatch', async () => {
       check: [0]
     },
     {
-      message: 'Pick a E2E testing solution',
+      message: 'Pick an E2E testing solution',
       choices: ['Cypress', 'Nightwatch'],
       choose: 1
     },

packages/@vue/cli/lib/promptModules/e2e.js

@@ -14,7 +14,7 @@ module.exports = cli => {
     name: 'e2e',
     when: answers => answers.features.includes('e2e'),
     type: 'list',
-    message: 'Pick a E2E testing solution:',
+    message: 'Pick an E2E testing solution:',
     choices: [
       {
         name: 'Cypress (Chrome only)',

packages/@vue/cli/lib/util/mergeDeps.js

@@ -42,6 +42,7 @@ module.exports = function mergeDeps (
 
     if (prune && injectingRange == null) {
       delete result[depName]
+      continue
     }
 
     if (!isValidRange(injectingRange)) {