Skip to content

Commit b94da37

Browse files
haoqunjianghaoqunjiang
committed
chore: Merge branch 'dev' into master
2 parents 94f6e89 + f77b4d3 commit b94da37

File tree

54 files changed

+600
-157
lines changed

Some content is hidden

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

54 files changed

+600
-157
lines changed

Diff for: ‎CHANGELOG.md

+37
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,41 @@
11

2+
## 4.5.5 (2020-09-10)
3+
4+
#### :bug: Bug Fix
5+
* `@vue/cli-service`
6+
* [#5868](https://github.com/vuejs/vue-cli/pull/5868) fix: enable some syntax extensions by default for vue script compiler ([@sodatea](https://github.com/sodatea))
7+
* `@vue/cli-plugin-router`, `@vue/cli-service`
8+
* [#5852](https://github.com/vuejs/vue-cli/pull/5852) fix: fix duplicate id="app" in Vue 3 project template ([@sodatea](https://github.com/sodatea))
9+
* `@vue/cli-plugin-unit-jest`, `@vue/cli-plugin-unit-mocha`
10+
* [#5591](https://github.com/vuejs/vue-cli/pull/5591) fix(unit-jest, unit-mocha): generate passing tests when `bare` option is used with router enabled (#3544) ([@IwalkAlone](https://github.com/IwalkAlone))
11+
* `@vue/cli-plugin-pwa`
12+
* [#5820](https://github.com/vuejs/vue-cli/pull/5820) fix: allow turning off theme color tags ([@GabrielGMartinsBr](https://github.com/GabrielGMartinsBr))
13+
* `@vue/cli`
14+
* [#5827](https://github.com/vuejs/vue-cli/pull/5827) fix: fix support for Node.js v8 and deprecate it ([@sodatea](https://github.com/sodatea))
15+
* [#5823](https://github.com/vuejs/vue-cli/pull/5823) Handle GPG sign git config for initial commit ([@spenserblack](https://github.com/spenserblack))
16+
* [#5808](https://github.com/vuejs/vue-cli/pull/5808) fix: strip non-ansi characters from registry config ([@sodatea](https://github.com/sodatea))
17+
* [#5801](https://github.com/vuejs/vue-cli/pull/5801) fix: do not throw when api.render is called from an anonymous function ([@sodatea](https://github.com/sodatea))
18+
19+
#### :house: Internal
20+
* `@vue/cli-ui`
21+
* [#3687](https://github.com/vuejs/vue-cli/pull/3687) perf(ui): improve get folder list to use Promises instead of sync ([@pikax](https://github.com/pikax))
22+
23+
#### :hammer: Underlying Tools
24+
* `@vue/babel-preset-app`
25+
* [#5831](https://github.com/vuejs/vue-cli/pull/5831) chore: rename jsx package scope from ant-design-vue to vue ([@Amour1688](https://github.com/Amour1688))
26+
27+
#### Committers: 8
28+
- Booker Zhao ([@binggg](https://github.com/binggg))
29+
- Carlos Rodrigues ([@pikax](https://github.com/pikax))
30+
- Haoqun Jiang ([@sodatea](https://github.com/sodatea))
31+
- Renan Cidale Assumpcao ([@rcidaleassumpo](https://github.com/rcidaleassumpo))
32+
- Sergey Skrynnikov ([@IwalkAlone](https://github.com/IwalkAlone))
33+
- Spenser Black ([@spenserblack](https://github.com/spenserblack))
34+
- [@GabrielGMartinsBr](https://github.com/GabrielGMartinsBr)
35+
- 天泽 ([@Amour1688](https://github.com/Amour1688))
36+
37+
38+
239
## 4.5.4 (2020-08-18)
340

441
#### :bug: Bug Fix

Diff for: ‎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": "4.5.4",
4+
"version": "4.5.5",
55
"packages": [
66
"packages/@vue/babel-preset-app",
77
"packages/@vue/cli*",

Diff for: ‎packages/@vue/babel-preset-app/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Use this option when you have 3rd party dependencies that are not processed by B
8888

8989
- Default: `true`.
9090

91-
Set to `false` to disable JSX support. Or you can toggle [@vue/babel-preset-jsx](https://github.com/vuejs/jsx/tree/dev/packages/babel-preset-jsx) (or [@ant-design-vue/babel-plugin-jsx](https://github.com/vueComponent/jsx) for Vue 3 projects) features here.
91+
Set to `false` to disable JSX support. Or you can toggle [@vue/babel-preset-jsx](https://github.com/vuejs/jsx/tree/dev/packages/babel-preset-jsx) (or [@vue/babel-plugin-jsx](https://github.com/vuejs/jsx-next) for Vue 3 projects) features here.
9292

9393
### loose
9494

Diff for: ‎packages/@vue/babel-preset-app/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ module.exports = (context, options = {}) => {
126126
if (vueVersion === 2) {
127127
presets.push([require('@vue/babel-preset-jsx'), jsxOptions])
128128
} else if (vueVersion === 3) {
129-
plugins.push([require('@ant-design-vue/babel-plugin-jsx'), jsxOptions])
129+
plugins.push([require('@vue/babel-plugin-jsx'), jsxOptions])
130130
}
131131
}
132132

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/babel-preset-app",
3-
"version": "4.5.4",
3+
"version": "4.5.5",
44
"description": "babel-preset-app for vue-cli",
55
"main": "index.js",
66
"publishConfig": {
@@ -22,7 +22,6 @@
2222
},
2323
"homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/babel-preset-app#readme",
2424
"dependencies": {
25-
"@ant-design-vue/babel-plugin-jsx": "^1.0.0-0",
2625
"@babel/core": "^7.11.0",
2726
"@babel/helper-compilation-targets": "^7.9.6",
2827
"@babel/helper-module-imports": "^7.8.3",
@@ -33,6 +32,7 @@
3332
"@babel/plugin-transform-runtime": "^7.11.0",
3433
"@babel/preset-env": "^7.11.0",
3534
"@babel/runtime": "^7.11.0",
35+
"@vue/babel-plugin-jsx": "^1.0.0-0",
3636
"@vue/babel-preset-jsx": "^1.1.2",
3737
"babel-plugin-dynamic-import-node": "^2.3.3",
3838
"core-js": "^3.6.5",

Diff for: ‎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": "4.5.4",
3+
"version": "4.5.5",
44
"description": "init addon for vue-cli",
55
"main": "index.js",
66
"publishConfig": {

Diff for: ‎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": "4.5.4",
3+
"version": "4.5.5",
44
"description": "error overlay & dev server middleware for vue-cli",
55
"main": "dist/client.js",
66
"files": [

Diff for: ‎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": "4.5.4",
3+
"version": "4.5.5",
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.11.0",
24-
"@vue/babel-preset-app": "^4.5.4",
25-
"@vue/cli-shared-utils": "^4.5.4",
24+
"@vue/babel-preset-app": "^4.5.5",
25+
"@vue/cli-shared-utils": "^4.5.5",
2626
"babel-loader": "^8.1.0",
2727
"cache-loader": "^4.1.0",
2828
"thread-loader": "^2.1.3",

Diff for: ‎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": "4.5.4",
3+
"version": "4.5.5",
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": "^4.5.4",
26+
"@vue/cli-shared-utils": "^4.5.5",
2727
"cypress": "^3.8.3",
2828
"eslint-plugin-cypress": "^2.10.3"
2929
},

Diff for: ‎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": "4.5.4",
3+
"version": "4.5.5",
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": "^4.5.4",
26+
"@vue/cli-shared-utils": "^4.5.5",
2727
"deepmerge": "^4.2.2",
2828
"nightwatch": "^1.3.5"
2929
},

Diff for: ‎packages/@vue/cli-plugin-e2e-webdriverio/__tests__/wdioPlugin.spec.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ test('should work', async () => {
66
const project = await create('e2e-webdriverio', {
77
plugins: {
88
'@vue/cli-plugin-babel': {},
9-
'@vue/cli-plugin-e2e-webdriverio': {},
9+
'@vue/cli-plugin-e2e-webdriverio': {
10+
webdrivers: ['chrome']
11+
},
1012
'@vue/cli-plugin-eslint': {
1113
config: 'airbnb',
1214
lintOn: 'save'
@@ -29,7 +31,9 @@ test('should work with TS', async () => {
2931
'tsLint': true,
3032
'lintOn': ['save']
3133
},
32-
'@vue/cli-plugin-e2e-webdriverio': {}
34+
'@vue/cli-plugin-e2e-webdriverio': {
35+
webdrivers: ['chrome']
36+
}
3337
}
3438
})
3539

Diff for: ‎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": "4.5.4",
3+
"version": "4.5.5",
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.0.1",
29-
"@vue/cli-shared-utils": "^4.5.4",
29+
"@vue/cli-shared-utils": "^4.5.5",
3030
"@wdio/cli": "^6.1.11",
3131
"@wdio/local-runner": "^6.1.11",
3232
"@wdio/mocha-framework": "^6.1.8",

Diff for: ‎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": "4.5.4",
3+
"version": "4.5.5",
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": "^4.5.4",
26+
"@vue/cli-shared-utils": "^4.5.5",
2727
"eslint-loader": "^2.2.1",
2828
"globby": "^9.2.0",
2929
"inquirer": "^7.1.0",

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

+18-11
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,18 @@ module.exports = class HtmlPwaPlugin {
111111
rel: 'manifest',
112112
href: getTagHref(publicPath, manifestPath, assetsVersionStr)
113113
}
114-
),
115-
makeTag('meta', {
116-
name: 'theme-color',
117-
content: themeColor
118-
})
114+
)
119115
)
120116

117+
if (themeColor != null) {
118+
data.head.push(
119+
makeTag('meta', {
120+
name: 'theme-color',
121+
content: themeColor
122+
})
123+
)
124+
}
125+
121126
// Add to home screen for Safari on iOS
122127
data.head.push(
123128
makeTag('meta', {
@@ -154,12 +159,14 @@ module.exports = class HtmlPwaPlugin {
154159
content: getTagHref(publicPath, iconPaths.msTileImage, assetsVersionStr)
155160
}))
156161
}
157-
data.head.push(
158-
makeTag('meta', {
159-
name: 'msapplication-TileColor',
160-
content: msTileColor
161-
})
162-
)
162+
if (msTileColor != null) {
163+
data.head.push(
164+
makeTag('meta', {
165+
name: 'msapplication-TileColor',
166+
content: msTileColor
167+
})
168+
)
169+
}
163170

164171
cb(null, data)
165172
})

Diff for: ‎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": "4.5.4",
3+
"version": "4.5.5",
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": "^4.5.4",
26+
"@vue/cli-shared-utils": "^4.5.5",
2727
"webpack": "^4.0.0",
2828
"workbox-webpack-plugin": "^4.3.1"
2929
},

Diff for: ‎packages/@vue/cli-plugin-router/__tests__/routerGenerator.spec.js

+2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ test('use with Vue 3', async () => {
8585

8686
expect(files['src/main.js']).toMatch('.use(router)')
8787

88+
expect(files['src/App.vue']).not.toMatch('<div id="app">')
89+
8890
expect(pkg.dependencies).toHaveProperty('vue-router')
8991
expect(pkg.dependencies['vue-router']).toMatch('^4')
9092
})

Diff for: ‎packages/@vue/cli-plugin-router/generator/template-vue3/src/App.vue

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
---
2+
extend: '@vue/cli-service/generator/template/src/App.vue'
3+
replace:
4+
- !!js/regexp /<template>[^]*?<\/template>/
5+
- !!js/regexp /\n<script>[^]*?<\/script>\n/
6+
- !!js/regexp / margin-top[^]*?<\/style>/
7+
---
8+
9+
<%# REPLACE %>
10+
<template>
11+
<div id="nav">
12+
<router-link to="/">Home</router-link> |
13+
<router-link to="/about">About</router-link>
14+
</div>
15+
<router-view/>
16+
</template>
17+
<%# END_REPLACE %>
18+
19+
<%# REPLACE %>
20+
<%# END_REPLACE %>
21+
22+
<%# REPLACE %>
23+
}
24+
25+
<%_ if (rootOptions.cssPreprocessor !== 'stylus') { _%>
26+
<%_ if (!rootOptions.cssPreprocessor) { _%>
27+
#nav {
28+
padding: 30px;
29+
}
30+
31+
#nav a {
32+
font-weight: bold;
33+
color: #2c3e50;
34+
}
35+
36+
#nav a.router-link-exact-active {
37+
color: #42b983;
38+
}
39+
<%_ } else { _%>
40+
#nav {
41+
padding: 30px;
42+
43+
a {
44+
font-weight: bold;
45+
color: #2c3e50;
46+
47+
&.router-link-exact-active {
48+
color: #42b983;
49+
}
50+
}
51+
}
52+
<%_ } _%>
53+
<%_ } else { _%>
54+
#nav
55+
padding 30px
56+
a
57+
font-weight bold
58+
color #2c3e50
59+
&.router-link-exact-active
60+
color #42b983
61+
<%_ } _%>
62+
</style>
63+
<%# END_REPLACE %>

Diff for: ‎packages/@vue/cli-plugin-router/generator/template/src/router/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import Home from '../views/Home.vue'
99
Vue.use(VueRouter)
1010

1111
<%_ if (hasTypeScript) { _%>
12-
const routes: Array<RouteConfig> = [
12+
const routes: Array<RouteConfig> = [
1313
<%_ } else { _%>
14-
const routes = [
14+
const routes = [
1515
<%_ } _%>
1616
{
1717
path: '/',

Diff for: ‎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": "4.5.4",
3+
"version": "4.5.5",
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": "^4.5.4"
26+
"@vue/cli-shared-utils": "^4.5.5"
2727
},
2828
"devDependencies": {
29-
"@vue/cli-test-utils": "^4.5.4"
29+
"@vue/cli-test-utils": "^4.5.5"
3030
},
3131
"peerDependencies": {
3232
"@vue/cli-service": "^3.0.0 || ^4.0.0-0"

0 commit comments

Comments
 (0)