Skip to content

Commit 4aa2f9d

Browse files
vaibhavsingh97vaibhavsingh97
committed
chore: dev merge
2 parents 4404ccf + ae7c5a5 commit 4aa2f9d

File tree

41 files changed

+496
-116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+496
-116
lines changed

‎CHANGELOG.md

+32
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,36 @@
11

2+
## 5.0.0-beta.2 (2021-06-09)
3+
4+
#### :rocket: New Features
5+
* `@vue/cli-plugin-typescript`, `@vue/cli-service`, `@vue/cli-shared-utils`, `@vue/cli`
6+
* [#6411](https://github.com/vuejs/vue-cli/pull/6411) feat: implement plugin execution order ([@fangbinwei](https://github.com/fangbinwei))
7+
8+
#### :bug: Bug Fix
9+
* `@vue/cli-plugin-pwa`
10+
* [#6518](https://github.com/vuejs/vue-cli/pull/6518) fix(pwa): Replace closeTag parameter with voidTag for HtmlWebpackPlugin ([@tcitworld](https://github.com/tcitworld))
11+
* `@vue/cli-service`
12+
* [#6506](https://github.com/vuejs/vue-cli/pull/6506) fix(webpack): slash on publicPath: 'auto' ([@tomicakr](https://github.com/tomicakr))
13+
* `@vue/cli-plugin-unit-mocha`
14+
* [#6478](https://github.com/vuejs/vue-cli/pull/6478) fix(mocha): set mode to `none` to avoid DefinePlugin conflict ([@sodatea](https://github.com/sodatea))
15+
16+
#### :memo: Documentation
17+
* [#6493](https://github.com/vuejs/vue-cli/pull/6493) Fixed some minor typos ([@Ashikpaul](https://github.com/Ashikpaul))
18+
* [#6487](https://github.com/vuejs/vue-cli/pull/6487) update deployment.md ([@andydodo](https://github.com/andydodo))
19+
20+
#### :house: Internal
21+
* `@vue/cli-service`
22+
* [#6519](https://github.com/vuejs/vue-cli/pull/6519) chore: use scoped package names for aliases ([@sodatea](https://github.com/sodatea))
23+
24+
#### Committers: 6
25+
- Andy Do ([@andydodo](https://github.com/andydodo))
26+
- Ashik Paul ([@Ashikpaul](https://github.com/Ashikpaul))
27+
- Binwei Fang ([@fangbinwei](https://github.com/fangbinwei))
28+
- Haoqun Jiang ([@sodatea](https://github.com/sodatea))
29+
- Thomas Citharel ([@tcitworld](https://github.com/tcitworld))
30+
- tomica ([@tomicakr](https://github.com/tomicakr))
31+
32+
33+
234
## 5.0.0-beta.1 (2021-05-14)
335

436
#### :rocket: New Features

‎docs/migrations/migrate-from-v4.md

+7-3
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,27 @@ sidebar: auto
77
First, install the latest Vue CLI globally:
88

99
```sh
10-
npm install -g @vue/cli
10+
npm install -g @vue/cli@next
1111
# OR
12-
yarn global add @vue/cli
12+
yarn global add @vue/cli@next
1313
```
1414

1515
## Upgrade All Plugins at Once
1616

1717
In your existing projects, run:
1818

1919
```sh
20-
vue upgrade
20+
vue upgrade --next
2121
```
2222

2323
And then follow the command line instructions.
2424

2525
See the following section for detailed breaking changes introduced in each package.
2626

27+
::: tip Note
28+
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.
29+
:::
30+
2731
------
2832

2933
## One-By-One Manual Migration

‎lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"npmClient": "yarn",
33
"useWorkspaces": true,
4-
"version": "5.0.0-beta.1",
4+
"version": "5.0.0-beta.2",
55
"packages": [
66
"packages/@vue/babel-preset-app",
77
"packages/@vue/cli*",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/babel-preset-app",
3-
"version": "5.0.0-beta.1",
3+
"version": "5.0.0-beta.2",
44
"description": "babel-preset-app for vue-cli",
55
"main": "index.js",
66
"publishConfig": {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-init",
3-
"version": "5.0.0-beta.1",
3+
"version": "5.0.0-beta.2",
44
"description": "init addon for vue-cli",
55
"main": "index.js",
66
"publishConfig": {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-overlay",
3-
"version": "5.0.0-beta.1",
3+
"version": "5.0.0-beta.2",
44
"description": "error overlay & dev server middleware for vue-cli",
55
"main": "dist/client.js",
66
"files": [

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-babel",
3-
"version": "5.0.0-beta.1",
3+
"version": "5.0.0-beta.2",
44
"description": "babel plugin for vue-cli",
55
"main": "index.js",
66
"repository": {
@@ -21,8 +21,8 @@
2121
"homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-plugin-babel#readme",
2222
"dependencies": {
2323
"@babel/core": "^7.12.16",
24-
"@vue/babel-preset-app": "^5.0.0-beta.1",
25-
"@vue/cli-shared-utils": "^5.0.0-beta.1",
24+
"@vue/babel-preset-app": "^5.0.0-beta.2",
25+
"@vue/cli-shared-utils": "^5.0.0-beta.2",
2626
"babel-loader": "^8.2.2",
2727
"thread-loader": "^3.0.0",
2828
"webpack": "^5.22.0"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-e2e-cypress",
3-
"version": "5.0.0-beta.1",
3+
"version": "5.0.0-beta.2",
44
"description": "e2e-cypress plugin for vue-cli",
55
"main": "index.js",
66
"repository": {
@@ -23,7 +23,7 @@
2323
"access": "public"
2424
},
2525
"dependencies": {
26-
"@vue/cli-shared-utils": "^5.0.0-beta.1",
26+
"@vue/cli-shared-utils": "^5.0.0-beta.2",
2727
"cypress": "^7.1.0",
2828
"eslint-plugin-cypress": "^2.11.2"
2929
},

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-e2e-nightwatch",
3-
"version": "5.0.0-beta.1",
3+
"version": "5.0.0-beta.2",
44
"description": "e2e-nightwatch plugin for vue-cli",
55
"main": "index.js",
66
"repository": {
@@ -23,7 +23,7 @@
2323
"access": "public"
2424
},
2525
"dependencies": {
26-
"@vue/cli-shared-utils": "^5.0.0-beta.1",
26+
"@vue/cli-shared-utils": "^5.0.0-beta.2",
2727
"deepmerge": "^4.2.2",
2828
"nightwatch": "^1.7.3"
2929
},

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-e2e-webdriverio",
3-
"version": "5.0.0-beta.1",
3+
"version": "5.0.0-beta.2",
44
"description": "e2e-webdriverio plugin for vue-cli",
55
"main": "index.js",
66
"repository": {
@@ -26,7 +26,7 @@
2626
},
2727
"dependencies": {
2828
"@types/mocha": "^8.2.1",
29-
"@vue/cli-shared-utils": "^5.0.0-beta.1",
29+
"@vue/cli-shared-utils": "^5.0.0-beta.2",
3030
"@wdio/cli": "^7.0.7",
3131
"@wdio/local-runner": "^7.0.7",
3232
"@wdio/mocha-framework": "^7.0.7",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-eslint",
3-
"version": "5.0.0-beta.1",
3+
"version": "5.0.0-beta.2",
44
"description": "eslint plugin for vue-cli",
55
"main": "index.js",
66
"repository": {
@@ -23,7 +23,7 @@
2323
"access": "public"
2424
},
2525
"dependencies": {
26-
"@vue/cli-shared-utils": "^5.0.0-beta.1",
26+
"@vue/cli-shared-utils": "^5.0.0-beta.2",
2727
"eslint-webpack-plugin": "2.4.3",
2828
"globby": "^11.0.2",
2929
"inquirer": "^8.0.0",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,10 @@ module.exports = class HtmlPwaPlugin {
225225
}
226226
}
227227

228-
function makeTag (tagName, attributes, closeTag = false) {
228+
function makeTag (tagName, attributes, voidTag = true) {
229229
return {
230230
tagName,
231-
closeTag,
231+
voidTag,
232232
attributes
233233
}
234234
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-pwa",
3-
"version": "5.0.0-beta.1",
3+
"version": "5.0.0-beta.2",
44
"description": "pwa plugin for vue-cli",
55
"main": "index.js",
66
"repository": {
@@ -23,7 +23,7 @@
2323
"access": "public"
2424
},
2525
"dependencies": {
26-
"@vue/cli-shared-utils": "^5.0.0-beta.1",
26+
"@vue/cli-shared-utils": "^5.0.0-beta.2",
2727
"html-webpack-plugin": "^5.1.0",
2828
"webpack": "^5.22.0",
2929
"workbox-webpack-plugin": "^6.1.0"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-router",
3-
"version": "5.0.0-beta.1",
3+
"version": "5.0.0-beta.2",
44
"description": "router plugin for vue-cli",
55
"main": "index.js",
66
"repository": {
@@ -23,10 +23,10 @@
2323
"access": "public"
2424
},
2525
"dependencies": {
26-
"@vue/cli-shared-utils": "^5.0.0-beta.1"
26+
"@vue/cli-shared-utils": "^5.0.0-beta.2"
2727
},
2828
"devDependencies": {
29-
"@vue/cli-test-utils": "^5.0.0-beta.1"
29+
"@vue/cli-test-utils": "^5.0.0-beta.2"
3030
},
3131
"peerDependencies": {
3232
"@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"

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

+20-5
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,34 @@ test('use with Babel', async () => {
6565
})
6666

6767
test('use with router', async () => {
68+
const tsApply = require('../generator')
69+
70+
expect(tsApply.after).toBe('@vue/cli-plugin-router')
71+
6872
const { files } = await generateWithPlugin([
6973
{
70-
id: '@vue/cli-plugin-router',
71-
apply: require('@vue/cli-plugin-router/generator'),
74+
id: '@vue/cli-service',
75+
apply: require('@vue/cli-service/generator'),
76+
options: {
77+
plugins: {
78+
'@vue/cli-service': {},
79+
'@vue/cli-plugin-router': {},
80+
'@vue/cli-plugin-typescript': {}
81+
}
82+
}
83+
},
84+
{
85+
id: '@vue/cli-plugin-typescript',
86+
apply: tsApply,
7287
options: {}
7388
},
7489
{
75-
id: 'ts',
76-
apply: require('../generator'),
90+
id: '@vue/cli-plugin-router',
91+
apply: require('@vue/cli-plugin-router/generator'),
7792
options: {}
7893
}
7994
])
80-
expect(files['src/views/Home.vue']).toMatch('<div class="home">')
95+
expect(files['src/views/Home.vue']).toMatch('Welcome to Your Vue.js + TypeScript App')
8196
})
8297

8398
test('tsconfig.json should be valid json', async () => {

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

+2
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,5 @@ module.exports = (
7171

7272
require('./convert')(api, { convertJsToTs })
7373
}
74+
75+
module.exports.after = '@vue/cli-plugin-router'

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-typescript",
3-
"version": "5.0.0-beta.1",
3+
"version": "5.0.0-beta.2",
44
"description": "typescript plugin for vue-cli",
55
"main": "index.js",
66
"repository": {
@@ -25,7 +25,7 @@
2525
"dependencies": {
2626
"@babel/core": "^7.12.16",
2727
"@types/webpack-env": "^1.15.2",
28-
"@vue/cli-shared-utils": "^5.0.0-beta.1",
28+
"@vue/cli-shared-utils": "^5.0.0-beta.2",
2929
"babel-loader": "^8.2.2",
3030
"cache-loader": "^4.1.0",
3131
"fork-ts-checker-webpack-plugin": "^6.1.0",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-unit-jest",
3-
"version": "5.0.0-beta.1",
3+
"version": "5.0.0-beta.2",
44
"description": "unit-jest plugin for vue-cli",
55
"main": "index.js",
66
"repository": {
@@ -26,7 +26,7 @@
2626
"@babel/core": "^7.12.16",
2727
"@babel/plugin-transform-modules-commonjs": "^7.12.13",
2828
"@types/jest": "^26.0.20",
29-
"@vue/cli-shared-utils": "^5.0.0-beta.1",
29+
"@vue/cli-shared-utils": "^5.0.0-beta.2",
3030
"babel-jest": "^26.6.3",
3131
"deepmerge": "^4.2.2",
3232
"jest": "^26.6.3",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-unit-mocha",
3-
"version": "5.0.0-beta.1",
3+
"version": "5.0.0-beta.2",
44
"description": "mocha unit testing plugin for vue-cli",
55
"main": "index.js",
66
"repository": {
@@ -22,7 +22,7 @@
2222
},
2323
"homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-plugin-unit-mocha#readme",
2424
"dependencies": {
25-
"@vue/cli-shared-utils": "^5.0.0-beta.1",
25+
"@vue/cli-shared-utils": "^5.0.0-beta.2",
2626
"jsdom": "^16.4.0",
2727
"jsdom-global": "^3.0.2",
2828
"mocha": "^8.3.0",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-vuex",
3-
"version": "5.0.0-beta.1",
3+
"version": "5.0.0-beta.2",
44
"description": "Vuex plugin for vue-cli",
55
"main": "index.js",
66
"repository": {
@@ -23,7 +23,7 @@
2323
"access": "public"
2424
},
2525
"devDependencies": {
26-
"@vue/cli-test-utils": "^5.0.0-beta.1"
26+
"@vue/cli-test-utils": "^5.0.0-beta.2"
2727
},
2828
"peerDependencies": {
2929
"@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-webpack-4",
3-
"version": "5.0.0-beta.1",
3+
"version": "5.0.0-beta.2",
44
"description": "webpack-4 plugin for @vue/cli v5",
55
"main": "index.js",
66
"repository": {
@@ -23,7 +23,7 @@
2323
"access": "public"
2424
},
2525
"dependencies": {
26-
"@vue/cli-shared-utils": "^5.0.0-beta.1",
26+
"@vue/cli-shared-utils": "^5.0.0-beta.2",
2727
"copy-webpack-plugin": "^6.4.1",
2828
"css-minimizer-webpack-plugin": "^1.2.0",
2929
"hash-sum": "^2.0.0",

0 commit comments

Comments
 (0)