chore: merge branch 'next' into dev

Author: haoqunjiang

docs/.vuepress/config.js

@@ -116,12 +116,22 @@ module.exports = {
             ]
           },
           {
-            text: 'Migrating From v3',
-            link: '/migrating-from-v3/'
-          },
-          {
-            text: 'Changelog',
-            link: 'https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md'
+            text: 'Migrate from Older Versions',
+            items:
+            [
+              {
+                text: 'From Vue CLI v3 to v4',
+                link: '/migrations/migrate-from-v3/'
+              },
+              {
+                text: 'From Vue CLI v4 to v5',
+                link: '/migrations/migrate-from-v4/'
+              },
+              {
+                text: 'Full Changelog',
+                link: 'https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md'
+              }
+            ]
           }
         ],
         sidebar: {

docs/core-plugins/typescript.md

@@ -12,10 +12,6 @@ Since `3.0.0-rc.6`, `typescript` is now a peer dependency of this package, so yo
 
 This plugin can be used alongside `@vue/cli-plugin-babel`. When used with Babel, this plugin will output ES2015 and delegate the rest to Babel for auto polyfill based on browser targets.
 
-## Injected Commands
-
-If opted to use [TSLint](https://palantir.github.io/tslint/) during project creation, `vue-cli-service lint` will be injected.
-
 ## Caching
 
 [cache-loader](https://github.com/webpack-contrib/cache-loader) is enabled by default and cache is stored in `<projectRoot>/node_modules/.cache/ts-loader`.

docs/migrating-from-v3/README.md renamed to docs/migrations/migrate-from-v3.md

@@ -2,7 +2,7 @@
 sidebar: auto
 ---
 
-# Migrating from v3
+# Migrate from v3
 
 First, install the latest Vue CLI globally:
 

docs/migrations/migrate-from-v4.md

@@ -0,0 +1,67 @@
+---
+sidebar: auto
+---
+
+# Migrate from v4
+
+First, install the latest Vue CLI globally:
+
+```sh
+npm install -g @vue/cli
+# OR
+yarn global add @vue/cli
+```
+
+## Upgrade All Plugins at Once
+
+In your existing projects, run:
+
+```sh
+vue upgrade
+```
+
+And then follow the command line instructions.
+
+See the following section for detailed breaking changes introduced in each package.
+
+------
+
+## One-By-One Manual Migration
+
+If you want to migrate manually and gradually, you can run `vue upgrade <the-plugin-name>` to upgrade a specific Vue CLI plugin.
+
+------
+
+## Breaking Changes
+
+### For All Packages
+
+* Drop support of Node.js 8, 11, 13
+
+### The `vue` Command (The Global `@vue/cli` Package)
+
+### ESLint Plugin
+
+* `eslint-loader` is upgraded [from v2 to v4](https://github.com/webpack-contrib/eslint-loader/blob/master/CHANGELOG.md). The only major change is that it dropped support for ESLint < v6.
+
+### TypeScript Plugin
+
+#### Dropped TSLint support
+
+As [TSLint has been deprecated](https://github.com/palantir/tslint/issues/4534), we [removed](https://github.com/vuejs/vue-cli/pull/5065) all TSLint-related code in this version.
+Please consider switching to ESLint. You can check out [`tslint-to-eslint-config`](https://github.com/typescript-eslint/tslint-to-eslint-config) for a mostly automatic migration experience.
+
+### E2E-Cypress Plugin
+
+* Cypress is updated from v3 to v5. See <https://docs.cypress.io/guides/references/migration-guide.html> for a detailed migration guide.
+
+### Unit-Mocha Plugin
+
+* Updated `mocha` from v6 to v7, please refer to the release notes of [mocha v7](https://github.com/mochajs/mocha/releases/tag/v7.0.0) for a complete list of breaking changes.
+* Updated `jsdom` from v15 to v16, the breaking changes are listed at <https://github.com/jsdom/jsdom/releases/tag/16.0.0>
+
+### Internal Packages
+
+#### `@vue/cli-shared-utils`
+
+* Bump [chalk](https://github.com/chalk/chalk) from v2 to v4

docs/ru/core-plugins/typescript.md

@@ -12,10 +12,6 @@ TypeScript может быть сконфигурирован через `tsconf
 
 Этот плагин может использоваться вместе с `@vue/cli-plugin-babel`. При использовании вместе с Babel, этот плагин должен генерировать ES2015 и делегировать остальное Babel для автоматического добавления полифилов на основе целевых браузеров.
 
-## Внедряемые команды
-
-При выборе [TSLint](https://palantir.github.io/tslint/) на этапе создания проекта, будет внедряться команда `vue-cli-service lint`.
-
 ## Кэширование
 
 [cache-loader](https://github.com/webpack-contrib/cache-loader) используется по умолчанию, кэш хранится в `<projectRoot>/node_modules/.cache/ts-loader`.

package.json

@@ -44,19 +44,19 @@
     ]
   },
   "devDependencies": {
-    "@babel/core": "^7.11.0",
+    "@babel/core": "^7.11.6",
     "@typescript-eslint/eslint-plugin": "^2.33.0",
     "@typescript-eslint/parser": "^2.33.0",
     "@vue/eslint-config-airbnb": "^5.0.2",
     "@vue/eslint-config-prettier": "^6.0.0",
     "@vue/eslint-config-standard": "^5.1.2",
     "@vue/eslint-config-typescript": "^5.0.2",
-    "@vuepress/plugin-pwa": "^1.5.0",
-    "@vuepress/theme-vue": "^1.5.0",
+    "@vuepress/plugin-pwa": "^1.5.4",
+    "@vuepress/theme-vue": "^1.5.4",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^24.9.0",
-    "chromedriver": "^84.0.1",
+    "chromedriver": "^85.0.0",
     "debug": "^4.1.0",
     "eslint": "^6.7.2",
     "eslint-plugin-graphql": "^3.1.0",
@@ -75,23 +75,23 @@
     "inquirer": "^7.1.0",
     "jest": "^24.9.0",
     "lerna": "^3.22.0",
-    "lerna-changelog": "^0.8.3",
+    "lerna-changelog": "^1.0.1",
     "lint-staged": "^9.5.0",
     "memfs": "^3.2.0",
     "minimist": "^1.2.5",
     "prettier": ">= 1.13.0",
     "request": "^2.88.2",
     "request-promise-native": "^1.0.8",
     "rimraf": "^3.0.2",
-    "semver": "^6.1.0",
+    "semver": "^7.3.2",
     "typescript": "~3.9.3",
-    "vuepress": "^1.5.0",
+    "vuepress": "^1.5.4",
     "webpack": "^4.0.0",
     "yorkie": "^2.0.0"
   },
   "resolutions": {
     "puppeteer": "1.11.0",
-    "vue-template-compiler": "^2.6.11",
-    "vue-server-renderer": "^2.6.11"
+    "vue-template-compiler": "^2.6.12",
+    "vue-server-renderer": "^2.6.12"
   }
 }

packages/@vue/babel-preset-app/package.json

@@ -22,22 +22,22 @@
   },
   "homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/babel-preset-app#readme",
   "dependencies": {
-    "@babel/core": "^7.11.0",
+    "@babel/core": "^7.11.6",
     "@babel/helper-compilation-targets": "^7.9.6",
     "@babel/helper-module-imports": "^7.8.3",
     "@babel/plugin-proposal-class-properties": "^7.8.3",
     "@babel/plugin-proposal-decorators": "^7.8.3",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-syntax-jsx": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.11.0",
-    "@babel/preset-env": "^7.11.0",
-    "@babel/runtime": "^7.11.0",
+    "@babel/plugin-transform-runtime": "^7.11.5",
+    "@babel/preset-env": "^7.11.5",
+    "@babel/runtime": "^7.11.2",
     "@vue/babel-plugin-jsx": "^1.0.0-0",
     "@vue/babel-preset-jsx": "^1.1.2",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "core-js": "^3.6.5",
     "core-js-compat": "^3.6.5",
-    "semver": "^6.1.0"
+    "semver": "^7.3.2"
   },
   "peerDependencies": {
     "@babel/core": "*",

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

@@ -20,7 +20,7 @@
   },
   "homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-plugin-babel#readme",
   "dependencies": {
-    "@babel/core": "^7.11.0",
+    "@babel/core": "^7.11.6",
     "@vue/babel-preset-app": "^4.5.7",
     "@vue/cli-shared-utils": "^4.5.7",
     "babel-loader": "^8.1.0",
@@ -32,7 +32,8 @@
     "@vue/cli-service": "^3.0.0 || ^4.0.0-0"
   },
   "devDependencies": {
-    "jscodeshift": "^0.10.0"
+    "jscodeshift": "^0.10.0",
+    "@babel/preset-env": "^7.11.5"
   },
   "publishConfig": {
     "access": "public"

packages/@vue/cli-plugin-e2e-cypress/README.md

@@ -4,15 +4,17 @@
 
 This adds E2E testing support using [Cypress](https://www.cypress.io/).
 
-Cypress offers a rich interactive interface for running E2E tests, but currently only supports running the tests in Chromium. If you have a hard requirement on E2E testing in multiple browsers, consider using the Selenium-based [@vue/cli-plugin-e2e-nightwatch](https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-e2e-nightwatch).
+Cypress offers a rich interactive interface for running E2E tests in Firefox and Chromium based browsers (Chrome, MS Edge, Brave, Electron). To learn more about cross browser testing, visit the [Cypress Cross Browser Testing Guide](https://on.cypress.io/cross-browser-testing).
+
+> **Note:** If you have a hard requirement on E2E testing in IE or Safari, consider using the Selenium-based [@vue/cli-plugin-e2e-nightwatch](https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-e2e-nightwatch).
 
 ## Injected Commands
 
 - **`vue-cli-service test:e2e`**
 
   Run e2e tests with `cypress run`.
 
-  By default it launches Cypress in interactive mode with a GUI. If you want to run the tests in headless mode (e.g. for CI), you can do so with the `--headless` option.
+  By default it launches Cypress in interactive mode with a GUI (via `cypress open`). If you want to run the tests in headless mode (e.g. for CI), you can do so with the `--headless` option.
 
   The command automatically starts a server in production mode to run the e2e tests against. If you want to run the tests multiple times without having to restart the server every time, you can start the server with `vue-cli-service serve --mode production` in one terminal, and then run e2e tests against that server using the `--url` option.
 

packages/@vue/cli-plugin-e2e-cypress/__tests__/cypressPlugin.spec.js

@@ -30,7 +30,6 @@ test('should work with TS', async () => {
     plugins: {
       '@vue/cli-plugin-typescript': {
         'classComponent': true,
-        'tsLint': true,
         'lintOn': ['save']
       },
       '@vue/cli-plugin-e2e-cypress': {}

packages/@vue/cli-plugin-e2e-cypress/package.json

@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@vue/cli-shared-utils": "^4.5.7",
-    "cypress": "^3.8.3",
+    "cypress": "^5.2.0",
     "eslint-plugin-cypress": "^2.10.3"
   },
   "peerDependencies": {

packages/@vue/cli-plugin-e2e-nightwatch/package.json

@@ -25,10 +25,10 @@
   "dependencies": {
     "@vue/cli-shared-utils": "^4.5.7",
     "deepmerge": "^4.2.2",
-    "nightwatch": "^1.3.5"
+    "nightwatch": "^1.4.1"
   },
   "devDependencies": {
-    "chromedriver": "^84.0.1",
+    "chromedriver": "^85.0.0",
     "geckodriver": "^1.20.0",
     "selenium-server": "^3.141.59"
   },

packages/@vue/cli-plugin-e2e-webdriverio/__tests__/wdioPlugin.spec.js

@@ -28,7 +28,6 @@ test('should work with TS', async () => {
     plugins: {
       '@vue/cli-plugin-typescript': {
         'classComponent': true,
-        'tsLint': true,
         'lintOn': ['save']
       },
       '@vue/cli-plugin-e2e-webdriverio': {

packages/@vue/cli-plugin-e2e-webdriverio/package.json

@@ -27,19 +27,19 @@
   "dependencies": {
     "@types/mocha": "^8.0.1",
     "@vue/cli-shared-utils": "^4.5.7",
-    "@wdio/cli": "^6.1.11",
-    "@wdio/local-runner": "^6.1.11",
-    "@wdio/mocha-framework": "^6.1.8",
-    "@wdio/sauce-service": "^6.1.9",
-    "@wdio/spec-reporter": "^6.1.9",
-    "@wdio/sync": "^6.1.8",
+    "@wdio/cli": "^6.4.6",
+    "@wdio/local-runner": "^6.4.6",
+    "@wdio/mocha-framework": "^6.4.0",
+    "@wdio/sauce-service": "^6.4.6",
+    "@wdio/spec-reporter": "^6.4.0",
+    "@wdio/sync": "^6.4.6",
     "eslint-plugin-wdio": "^6.0.12",
-    "webdriverio": "^6.1.11"
+    "webdriverio": "^6.4.6"
   },
   "peerDependencies": {
     "chromedriver": "*",
     "geckodriver": "*",
-    "wdio-chromedriver-service": "^6.0.3",
+    "wdio-chromedriver-service": "^6.0.4",
     "wdio-geckodriver-service": "^1.1.0"
   },
   "peerDependenciesMeta": {
@@ -57,10 +57,10 @@
     }
   },
   "devDependencies": {
-    "chromedriver": "^84.0.1",
+    "chromedriver": "^85.0.0",
     "geckodriver": "^1.20.0",
-    "ts-node": "^8.10.2",
-    "wdio-chromedriver-service": "^6.0.3",
+    "ts-node": "^9.0.0",
+    "wdio-chromedriver-service": "^6.0.4",
     "wdio-geckodriver-service": "^1.1.0"
   }
 }

packages/@vue/cli-plugin-eslint/__tests__/eslintMigrator.spec.js

@@ -1,8 +1,6 @@
 jest.setTimeout(300000)
-jest.mock('inquirer')
 
 const create = require('@vue/cli-test-utils/createUpgradableProject')
-const { expectPrompts } = require('inquirer')
 
 test('upgrade: should add eslint to devDependencies', async () => {
   const project = await create('plugin-eslint-v3.0', {
@@ -16,17 +14,10 @@ test('upgrade: should add eslint to devDependencies', async () => {
   const pkg = JSON.parse(await project.read('package.json'))
   expect(pkg.devDependencies).not.toHaveProperty('eslint')
 
-  expectPrompts([
-    {
-      message: `Your current ESLint version is v4`,
-      confirm: false
-    }
-  ])
-
   await project.upgrade('eslint')
 
   const updatedPkg = JSON.parse(await project.read('package.json'))
-  expect(updatedPkg.devDependencies.eslint).toMatch('^4')
+  expect(updatedPkg.devDependencies.eslint).toMatch('^6')
 })
 
 test('upgrade: should upgrade eslint from v5 to v6', async () => {
@@ -42,13 +33,6 @@ test('upgrade: should upgrade eslint from v5 to v6', async () => {
   const pkg = JSON.parse(await project.read('package.json'))
   expect(pkg.devDependencies.eslint).toMatch('^5')
 
-  expectPrompts([
-    {
-      message: `Your current ESLint version is v5`,
-      confirm: true
-    }
-  ])
-
   try {
     await project.upgrade('eslint')
   } catch (e) {

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

@@ -20,7 +20,7 @@ const DEPS_MAP = {
     'eslint-plugin-standard': '^4.0.0'
   },
   typescript: {
-    '@vue/eslint-config-typescript': '^5.0.2',
+    '@vue/eslint-config-typescript': '^5.1.0',
     '@typescript-eslint/eslint-plugin': '^2.33.0',
     '@typescript-eslint/parser': '^2.33.0'
   }