chore: dev merge

CHANGELOG.md

@@ -1,4 +1,36 @@
 
+## 5.0.0-beta.2 (2021-06-09)
+
+#### :rocket: New Features
+* `@vue/cli-plugin-typescript`, `@vue/cli-service`, `@vue/cli-shared-utils`, `@vue/cli`
+  * [#6411](https://github.com/vuejs/vue-cli/pull/6411) feat: implement plugin execution order ([@fangbinwei](https://github.com/fangbinwei))
+
+#### :bug: Bug Fix
+* `@vue/cli-plugin-pwa`
+  * [#6518](https://github.com/vuejs/vue-cli/pull/6518) fix(pwa): Replace closeTag parameter with voidTag for HtmlWebpackPlugin ([@tcitworld](https://github.com/tcitworld))
+* `@vue/cli-service`
+  * [#6506](https://github.com/vuejs/vue-cli/pull/6506) fix(webpack): slash on publicPath: 'auto' ([@tomicakr](https://github.com/tomicakr))
+* `@vue/cli-plugin-unit-mocha`
+  * [#6478](https://github.com/vuejs/vue-cli/pull/6478) fix(mocha): set mode to `none` to avoid DefinePlugin conflict ([@sodatea](https://github.com/sodatea))
+
+#### :memo: Documentation
+* [#6493](https://github.com/vuejs/vue-cli/pull/6493) Fixed some minor typos ([@Ashikpaul](https://github.com/Ashikpaul))
+* [#6487](https://github.com/vuejs/vue-cli/pull/6487) update deployment.md ([@andydodo](https://github.com/andydodo))
+
+#### :house: Internal
+* `@vue/cli-service`
+  * [#6519](https://github.com/vuejs/vue-cli/pull/6519) chore: use scoped package names for aliases ([@sodatea](https://github.com/sodatea))
+
+#### Committers: 6
+- Andy Do ([@andydodo](https://github.com/andydodo))
+- Ashik Paul ([@Ashikpaul](https://github.com/Ashikpaul))
+- Binwei Fang ([@fangbinwei](https://github.com/fangbinwei))
+- Haoqun Jiang ([@sodatea](https://github.com/sodatea))
+- Thomas Citharel ([@tcitworld](https://github.com/tcitworld))
+- tomica ([@tomicakr](https://github.com/tomicakr))
+
+
+
 ## 5.0.0-beta.1 (2021-05-14)
 
 #### :rocket: New Features

docs/migrations/migrate-from-v4.md

@@ -7,23 +7,27 @@ sidebar: auto
 First, install the latest Vue CLI globally:
 
 ```sh
-npm install -g @vue/cli
+npm install -g @vue/cli@next
 # OR
-yarn global add @vue/cli
+yarn global add @vue/cli@next
 ```
 
 ## Upgrade All Plugins at Once
 
 In your existing projects, run:
 
 ```sh
-vue upgrade
+vue upgrade --next
 ```
 
 And then follow the command line instructions.
 
 See the following section for detailed breaking changes introduced in each package.
 
+::: tip Note
+If you see errors like `setup compilation vue-loader-plugin(node:44156) UnhandledPromiseRejectionWarning: TypeError: The 'compilation' argument must be an instance of Compilation` after upgrading, please remove the lockfile (`yarn.lock` or `package-lock.json`) and `node_modules` in the project and reinstall all the dependencies.
+:::
+
 ------
 
 ## One-By-One Manual Migration

lerna.json

@@ -1,7 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "packages": [
     "packages/@vue/babel-preset-app",
     "packages/@vue/cli*",

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/babel-preset-app",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "description": "babel-preset-app for vue-cli",
   "main": "index.js",
   "publishConfig": {

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-init",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "description": "init addon for vue-cli",
   "main": "index.js",
   "publishConfig": {

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-overlay",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "description": "error overlay & dev server middleware for vue-cli",
   "main": "dist/client.js",
   "files": [

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-babel",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "description": "babel plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-plugin-babel#readme",
   "dependencies": {
     "@babel/core": "^7.12.16",
-    "@vue/babel-preset-app": "^5.0.0-beta.1",
-    "@vue/cli-shared-utils": "^5.0.0-beta.1",
+    "@vue/babel-preset-app": "^5.0.0-beta.2",
+    "@vue/cli-shared-utils": "^5.0.0-beta.2",
     "babel-loader": "^8.2.2",
     "thread-loader": "^3.0.0",
     "webpack": "^5.22.0"

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-e2e-cypress",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "description": "e2e-cypress plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.0-beta.1",
+    "@vue/cli-shared-utils": "^5.0.0-beta.2",
     "cypress": "^7.1.0",
     "eslint-plugin-cypress": "^2.11.2"
   },

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-e2e-nightwatch",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "description": "e2e-nightwatch plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.0-beta.1",
+    "@vue/cli-shared-utils": "^5.0.0-beta.2",
     "deepmerge": "^4.2.2",
     "nightwatch": "^1.7.3"
   },

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-e2e-webdriverio",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "description": "e2e-webdriverio plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@types/mocha": "^8.2.1",
-    "@vue/cli-shared-utils": "^5.0.0-beta.1",
+    "@vue/cli-shared-utils": "^5.0.0-beta.2",
     "@wdio/cli": "^7.0.7",
     "@wdio/local-runner": "^7.0.7",
     "@wdio/mocha-framework": "^7.0.7",

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-eslint",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "description": "eslint plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.0-beta.1",
+    "@vue/cli-shared-utils": "^5.0.0-beta.2",
     "eslint-webpack-plugin": "2.4.3",
     "globby": "^11.0.2",
     "inquirer": "^8.0.0",

packages/@vue/cli-plugin-pwa/lib/HtmlPwaPlugin.js

@@ -225,10 +225,10 @@ module.exports = class HtmlPwaPlugin {
   }
 }
 
-function makeTag (tagName, attributes, closeTag = false) {
+function makeTag (tagName, attributes, voidTag = true) {
   return {
     tagName,
-    closeTag,
+    voidTag,
     attributes
   }
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-pwa",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "description": "pwa plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.0-beta.1",
+    "@vue/cli-shared-utils": "^5.0.0-beta.2",
     "html-webpack-plugin": "^5.1.0",
     "webpack": "^5.22.0",
     "workbox-webpack-plugin": "^6.1.0"

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-router",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "description": "router plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,10 +23,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.0-beta.1"
+    "@vue/cli-shared-utils": "^5.0.0-beta.2"
   },
   "devDependencies": {
-    "@vue/cli-test-utils": "^5.0.0-beta.1"
+    "@vue/cli-test-utils": "^5.0.0-beta.2"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"

packages/@vue/cli-plugin-typescript/__tests__/tsGenerator.spec.js

@@ -65,19 +65,34 @@ test('use with Babel', async () => {
 })
 
 test('use with router', async () => {
+  const tsApply = require('../generator')
+
+  expect(tsApply.after).toBe('@vue/cli-plugin-router')
+
   const { files } = await generateWithPlugin([
     {
-      id: '@vue/cli-plugin-router',
-      apply: require('@vue/cli-plugin-router/generator'),
+      id: '@vue/cli-service',
+      apply: require('@vue/cli-service/generator'),
+      options: {
+        plugins: {
+          '@vue/cli-service': {},
+          '@vue/cli-plugin-router': {},
+          '@vue/cli-plugin-typescript': {}
+        }
+      }
+    },
+    {
+      id: '@vue/cli-plugin-typescript',
+      apply: tsApply,
       options: {}
     },
     {
-      id: 'ts',
-      apply: require('../generator'),
+      id: '@vue/cli-plugin-router',
+      apply: require('@vue/cli-plugin-router/generator'),
       options: {}
     }
   ])
-  expect(files['src/views/Home.vue']).toMatch('<div class="home">')
+  expect(files['src/views/Home.vue']).toMatch('Welcome to Your Vue.js + TypeScript App')
 })
 
 test('tsconfig.json should be valid json', async () => {

packages/@vue/cli-plugin-typescript/generator/index.js

@@ -71,3 +71,5 @@ module.exports = (
 
   require('./convert')(api, { convertJsToTs })
 }
+
+module.exports.after = '@vue/cli-plugin-router'

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-typescript",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "description": "typescript plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@babel/core": "^7.12.16",
     "@types/webpack-env": "^1.15.2",
-    "@vue/cli-shared-utils": "^5.0.0-beta.1",
+    "@vue/cli-shared-utils": "^5.0.0-beta.2",
     "babel-loader": "^8.2.2",
     "cache-loader": "^4.1.0",
     "fork-ts-checker-webpack-plugin": "^6.1.0",

packages/@vue/cli-plugin-unit-jest/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-unit-jest",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "description": "unit-jest plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
     "@babel/core": "^7.12.16",
     "@babel/plugin-transform-modules-commonjs": "^7.12.13",
     "@types/jest": "^26.0.20",
-    "@vue/cli-shared-utils": "^5.0.0-beta.1",
+    "@vue/cli-shared-utils": "^5.0.0-beta.2",
     "babel-jest": "^26.6.3",
     "deepmerge": "^4.2.2",
     "jest": "^26.6.3",

packages/@vue/cli-plugin-unit-mocha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-unit-mocha",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "description": "mocha unit testing plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-plugin-unit-mocha#readme",
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.0-beta.1",
+    "@vue/cli-shared-utils": "^5.0.0-beta.2",
     "jsdom": "^16.4.0",
     "jsdom-global": "^3.0.2",
     "mocha": "^8.3.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-vuex",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "description": "Vuex plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@vue/cli-test-utils": "^5.0.0-beta.1"
+    "@vue/cli-test-utils": "^5.0.0-beta.2"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"

packages/@vue/cli-plugin-webpack-4/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-webpack-4",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "description": "webpack-4 plugin for @vue/cli v5",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.0-beta.1",
+    "@vue/cli-shared-utils": "^5.0.0-beta.2",
     "copy-webpack-plugin": "^6.4.1",
     "css-minimizer-webpack-plugin": "^1.2.0",
     "hash-sum": "^2.0.0",