Skip to content

Commit

Permalink
chore: Merge branch 'dev' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
sodatea committed Sep 10, 2020
2 parents 94f6e89 + f77b4d3 commit b94da37
Show file tree
Hide file tree
Showing 54 changed files with 600 additions and 157 deletions.
37 changes: 37 additions & 0 deletions CHANGELOG.md
@@ -1,4 +1,41 @@

## 4.5.5 (2020-09-10)

#### :bug: Bug Fix
* `@vue/cli-service`
* [#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))
* `@vue/cli-plugin-router`, `@vue/cli-service`
* [#5852](https://github.com/vuejs/vue-cli/pull/5852) fix: fix duplicate id="app" in Vue 3 project template ([@sodatea](https://github.com/sodatea))
* `@vue/cli-plugin-unit-jest`, `@vue/cli-plugin-unit-mocha`
* [#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))
* `@vue/cli-plugin-pwa`
* [#5820](https://github.com/vuejs/vue-cli/pull/5820) fix: allow turning off theme color tags ([@GabrielGMartinsBr](https://github.com/GabrielGMartinsBr))
* `@vue/cli`
* [#5827](https://github.com/vuejs/vue-cli/pull/5827) fix: fix support for Node.js v8 and deprecate it ([@sodatea](https://github.com/sodatea))
* [#5823](https://github.com/vuejs/vue-cli/pull/5823) Handle GPG sign git config for initial commit ([@spenserblack](https://github.com/spenserblack))
* [#5808](https://github.com/vuejs/vue-cli/pull/5808) fix: strip non-ansi characters from registry config ([@sodatea](https://github.com/sodatea))
* [#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))

#### :house: Internal
* `@vue/cli-ui`
* [#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))

#### :hammer: Underlying Tools
* `@vue/babel-preset-app`
* [#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))

#### Committers: 8
- Booker Zhao ([@binggg](https://github.com/binggg))
- Carlos Rodrigues ([@pikax](https://github.com/pikax))
- Haoqun Jiang ([@sodatea](https://github.com/sodatea))
- Renan Cidale Assumpcao ([@rcidaleassumpo](https://github.com/rcidaleassumpo))
- Sergey Skrynnikov ([@IwalkAlone](https://github.com/IwalkAlone))
- Spenser Black ([@spenserblack](https://github.com/spenserblack))
- [@GabrielGMartinsBr](https://github.com/GabrielGMartinsBr)
- 天泽 ([@Amour1688](https://github.com/Amour1688))



## 4.5.4 (2020-08-18)

#### :bug: Bug Fix
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
@@ -1,7 +1,7 @@
{
"npmClient": "yarn",
"useWorkspaces": true,
"version": "4.5.4",
"version": "4.5.5",
"packages": [
"packages/@vue/babel-preset-app",
"packages/@vue/cli*",
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/babel-preset-app/README.md
Expand Up @@ -88,7 +88,7 @@ Use this option when you have 3rd party dependencies that are not processed by B

- Default: `true`.

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.
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.

### loose

Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/babel-preset-app/index.js
Expand Up @@ -126,7 +126,7 @@ module.exports = (context, options = {}) => {
if (vueVersion === 2) {
presets.push([require('@vue/babel-preset-jsx'), jsxOptions])
} else if (vueVersion === 3) {
plugins.push([require('@ant-design-vue/babel-plugin-jsx'), jsxOptions])
plugins.push([require('@vue/babel-plugin-jsx'), jsxOptions])
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/@vue/babel-preset-app/package.json
@@ -1,6 +1,6 @@
{
"name": "@vue/babel-preset-app",
"version": "4.5.4",
"version": "4.5.5",
"description": "babel-preset-app for vue-cli",
"main": "index.js",
"publishConfig": {
Expand All @@ -22,7 +22,6 @@
},
"homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/babel-preset-app#readme",
"dependencies": {
"@ant-design-vue/babel-plugin-jsx": "^1.0.0-0",
"@babel/core": "^7.11.0",
"@babel/helper-compilation-targets": "^7.9.6",
"@babel/helper-module-imports": "^7.8.3",
Expand All @@ -33,6 +32,7 @@
"@babel/plugin-transform-runtime": "^7.11.0",
"@babel/preset-env": "^7.11.0",
"@babel/runtime": "^7.11.0",
"@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",
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-init/package.json
@@ -1,6 +1,6 @@
{
"name": "@vue/cli-init",
"version": "4.5.4",
"version": "4.5.5",
"description": "init addon for vue-cli",
"main": "index.js",
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-overlay/package.json
@@ -1,6 +1,6 @@
{
"name": "@vue/cli-overlay",
"version": "4.5.4",
"version": "4.5.5",
"description": "error overlay & dev server middleware for vue-cli",
"main": "dist/client.js",
"files": [
Expand Down
6 changes: 3 additions & 3 deletions packages/@vue/cli-plugin-babel/package.json
@@ -1,6 +1,6 @@
{
"name": "@vue/cli-plugin-babel",
"version": "4.5.4",
"version": "4.5.5",
"description": "babel plugin for vue-cli",
"main": "index.js",
"repository": {
Expand All @@ -21,8 +21,8 @@
"homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-plugin-babel#readme",
"dependencies": {
"@babel/core": "^7.11.0",
"@vue/babel-preset-app": "^4.5.4",
"@vue/cli-shared-utils": "^4.5.4",
"@vue/babel-preset-app": "^4.5.5",
"@vue/cli-shared-utils": "^4.5.5",
"babel-loader": "^8.1.0",
"cache-loader": "^4.1.0",
"thread-loader": "^2.1.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/@vue/cli-plugin-e2e-cypress/package.json
@@ -1,6 +1,6 @@
{
"name": "@vue/cli-plugin-e2e-cypress",
"version": "4.5.4",
"version": "4.5.5",
"description": "e2e-cypress plugin for vue-cli",
"main": "index.js",
"repository": {
Expand All @@ -23,7 +23,7 @@
"access": "public"
},
"dependencies": {
"@vue/cli-shared-utils": "^4.5.4",
"@vue/cli-shared-utils": "^4.5.5",
"cypress": "^3.8.3",
"eslint-plugin-cypress": "^2.10.3"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/@vue/cli-plugin-e2e-nightwatch/package.json
@@ -1,6 +1,6 @@
{
"name": "@vue/cli-plugin-e2e-nightwatch",
"version": "4.5.4",
"version": "4.5.5",
"description": "e2e-nightwatch plugin for vue-cli",
"main": "index.js",
"repository": {
Expand All @@ -23,7 +23,7 @@
"access": "public"
},
"dependencies": {
"@vue/cli-shared-utils": "^4.5.4",
"@vue/cli-shared-utils": "^4.5.5",
"deepmerge": "^4.2.2",
"nightwatch": "^1.3.5"
},
Expand Down
Expand Up @@ -6,7 +6,9 @@ test('should work', async () => {
const project = await create('e2e-webdriverio', {
plugins: {
'@vue/cli-plugin-babel': {},
'@vue/cli-plugin-e2e-webdriverio': {},
'@vue/cli-plugin-e2e-webdriverio': {
webdrivers: ['chrome']
},
'@vue/cli-plugin-eslint': {
config: 'airbnb',
lintOn: 'save'
Expand All @@ -29,7 +31,9 @@ test('should work with TS', async () => {
'tsLint': true,
'lintOn': ['save']
},
'@vue/cli-plugin-e2e-webdriverio': {}
'@vue/cli-plugin-e2e-webdriverio': {
webdrivers: ['chrome']
}
}
})

Expand Down
4 changes: 2 additions & 2 deletions packages/@vue/cli-plugin-e2e-webdriverio/package.json
@@ -1,6 +1,6 @@
{
"name": "@vue/cli-plugin-e2e-webdriverio",
"version": "4.5.4",
"version": "4.5.5",
"description": "e2e-webdriverio plugin for vue-cli",
"main": "index.js",
"repository": {
Expand All @@ -26,7 +26,7 @@
},
"dependencies": {
"@types/mocha": "^8.0.1",
"@vue/cli-shared-utils": "^4.5.4",
"@vue/cli-shared-utils": "^4.5.5",
"@wdio/cli": "^6.1.11",
"@wdio/local-runner": "^6.1.11",
"@wdio/mocha-framework": "^6.1.8",
Expand Down
4 changes: 2 additions & 2 deletions packages/@vue/cli-plugin-eslint/package.json
@@ -1,6 +1,6 @@
{
"name": "@vue/cli-plugin-eslint",
"version": "4.5.4",
"version": "4.5.5",
"description": "eslint plugin for vue-cli",
"main": "index.js",
"repository": {
Expand All @@ -23,7 +23,7 @@
"access": "public"
},
"dependencies": {
"@vue/cli-shared-utils": "^4.5.4",
"@vue/cli-shared-utils": "^4.5.5",
"eslint-loader": "^2.2.1",
"globby": "^9.2.0",
"inquirer": "^7.1.0",
Expand Down
29 changes: 18 additions & 11 deletions packages/@vue/cli-plugin-pwa/lib/HtmlPwaPlugin.js
Expand Up @@ -111,13 +111,18 @@ module.exports = class HtmlPwaPlugin {
rel: 'manifest',
href: getTagHref(publicPath, manifestPath, assetsVersionStr)
}
),
makeTag('meta', {
name: 'theme-color',
content: themeColor
})
)
)

if (themeColor != null) {
data.head.push(
makeTag('meta', {
name: 'theme-color',
content: themeColor
})
)
}

// Add to home screen for Safari on iOS
data.head.push(
makeTag('meta', {
Expand Down Expand Up @@ -154,12 +159,14 @@ module.exports = class HtmlPwaPlugin {
content: getTagHref(publicPath, iconPaths.msTileImage, assetsVersionStr)
}))
}
data.head.push(
makeTag('meta', {
name: 'msapplication-TileColor',
content: msTileColor
})
)
if (msTileColor != null) {
data.head.push(
makeTag('meta', {
name: 'msapplication-TileColor',
content: msTileColor
})
)
}

cb(null, data)
})
Expand Down
4 changes: 2 additions & 2 deletions packages/@vue/cli-plugin-pwa/package.json
@@ -1,6 +1,6 @@
{
"name": "@vue/cli-plugin-pwa",
"version": "4.5.4",
"version": "4.5.5",
"description": "pwa plugin for vue-cli",
"main": "index.js",
"repository": {
Expand All @@ -23,7 +23,7 @@
"access": "public"
},
"dependencies": {
"@vue/cli-shared-utils": "^4.5.4",
"@vue/cli-shared-utils": "^4.5.5",
"webpack": "^4.0.0",
"workbox-webpack-plugin": "^4.3.1"
},
Expand Down
Expand Up @@ -85,6 +85,8 @@ test('use with Vue 3', async () => {

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

expect(files['src/App.vue']).not.toMatch('<div id="app">')

expect(pkg.dependencies).toHaveProperty('vue-router')
expect(pkg.dependencies['vue-router']).toMatch('^4')
})
Expand Down
@@ -0,0 +1,63 @@
---
extend: '@vue/cli-service/generator/template/src/App.vue'
replace:
- !!js/regexp /<template>[^]*?<\/template>/
- !!js/regexp /\n<script>[^]*?<\/script>\n/
- !!js/regexp / margin-top[^]*?<\/style>/
---
<%# REPLACE %>
<template>
<div id="nav">
<router-link to="/">Home</router-link> |
<router-link to="/about">About</router-link>
</div>
<router-view/>
</template>
<%# END_REPLACE %>
<%# REPLACE %>
<%# END_REPLACE %>
<%# REPLACE %>
}
<%_ if (rootOptions.cssPreprocessor !== 'stylus') { _%>
<%_ if (!rootOptions.cssPreprocessor) { _%>
#nav {
padding: 30px;
}
#nav a {
font-weight: bold;
color: #2c3e50;
}
#nav a.router-link-exact-active {
color: #42b983;
}
<%_ } else { _%>
#nav {
padding: 30px;
a {
font-weight: bold;
color: #2c3e50;
&.router-link-exact-active {
color: #42b983;
}
}
}
<%_ } _%>
<%_ } else { _%>
#nav
padding 30px
a
font-weight bold
color #2c3e50
&.router-link-exact-active
color #42b983
<%_ } _%>
</style>
<%# END_REPLACE %>
Expand Up @@ -9,9 +9,9 @@ import Home from '../views/Home.vue'
Vue.use(VueRouter)

<%_ if (hasTypeScript) { _%>
const routes: Array<RouteConfig> = [
const routes: Array<RouteConfig> = [
<%_ } else { _%>
const routes = [
const routes = [
<%_ } _%>
{
path: '/',
Expand Down
6 changes: 3 additions & 3 deletions packages/@vue/cli-plugin-router/package.json
@@ -1,6 +1,6 @@
{
"name": "@vue/cli-plugin-router",
"version": "4.5.4",
"version": "4.5.5",
"description": "router plugin for vue-cli",
"main": "index.js",
"repository": {
Expand All @@ -23,10 +23,10 @@
"access": "public"
},
"dependencies": {
"@vue/cli-shared-utils": "^4.5.4"
"@vue/cli-shared-utils": "^4.5.5"
},
"devDependencies": {
"@vue/cli-test-utils": "^4.5.4"
"@vue/cli-test-utils": "^4.5.5"
},
"peerDependencies": {
"@vue/cli-service": "^3.0.0 || ^4.0.0-0"
Expand Down

0 comments on commit b94da37

Please sign in to comment.