Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit e13f8f8

Browse filesBrowse files
haoqunjianghaoqunjiang
committed
chore: merge branch 'master' into dev
2 parents e096927 + a4839e9 commit e13f8f8
Copy full SHA for e13f8f8

File tree

Expand file treeCollapse file tree

27 files changed

+83
-60
lines changed
Filter options
Expand file treeCollapse file tree

27 files changed

+83
-60
lines changed

‎CHANGELOG.md

Copy file name to clipboardExpand all lines: CHANGELOG.md
+11Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11

2+
## 4.4.2 (2020-06-12)
3+
4+
#### :memo: Documentation
5+
* `@vue/cli-plugin-pwa`
6+
* [#5530](https://github.com/vuejs/vue-cli/pull/5530) docs: mention using `null` to ignore icons ([@qirh](https://github.com/qirh))
7+
8+
#### Committers: 1
9+
- Saleh Alghusson ([@qirh](https://github.com/qirh))
10+
11+
12+
213
## 4.4.1 (2020-05-25)
314

415
#### :bug: Bug Fix

‎docs/core-plugins/pwa.md

Copy file name to clipboardExpand all lines: docs/core-plugins/pwa.md
+7-1Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ file, or the `"vue"` field in `package.json`.
8484
- display: `'standalone'`
8585
- theme_color: `pwa.themeColor`
8686

87+
- **pwa.manifestCrossorigin**
88+
89+
- Default: `undefined`
90+
91+
Value for `crossorigin` attribute in manifest link tag in the generated HTML. You may need to set this if your PWA is behind an authenticated proxy. See [cross-origin values](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/link#attr-crossorigin) for more details.
92+
8793
- **pwa.iconPaths**
8894

8995
- Defaults:
@@ -98,7 +104,7 @@ file, or the `"vue"` field in `package.json`.
98104
}
99105
```
100106

101-
Change these values to use different paths for your icons.
107+
Change these values to use different paths for your icons. As of v4.3.0, you can use `null` as a value and that icon will not be included.
102108

103109
### Example Configuration
104110

‎lerna.json

Copy file name to clipboardExpand all lines: lerna.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"npmClient": "yarn",
33
"useWorkspaces": true,
4-
"version": "4.4.1",
4+
"version": "4.4.2",
55
"packages": [
66
"packages/@vue/babel-preset-app",
77
"packages/@vue/cli*",

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

Copy file name to clipboardExpand all lines: packages/@vue/babel-preset-app/package.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/babel-preset-app",
3-
"version": "4.4.1",
3+
"version": "4.4.2",
44
"description": "babel-preset-app for vue-cli",
55
"main": "index.js",
66
"publishConfig": {

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

Copy file name to clipboardExpand all lines: packages/@vue/cli-init/package.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-init",
3-
"version": "4.4.1",
3+
"version": "4.4.2",
44
"description": "init addon for vue-cli",
55
"main": "index.js",
66
"publishConfig": {

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

Copy file name to clipboardExpand all lines: packages/@vue/cli-overlay/package.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-overlay",
3-
"version": "4.4.1",
3+
"version": "4.4.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

Copy file name to clipboardExpand all lines: packages/@vue/cli-plugin-babel/package.json
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-babel",
3-
"version": "4.4.1",
3+
"version": "4.4.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.9.6",
24-
"@vue/babel-preset-app": "^4.4.1",
25-
"@vue/cli-shared-utils": "^4.4.1",
24+
"@vue/babel-preset-app": "^4.4.2",
25+
"@vue/cli-shared-utils": "^4.4.2",
2626
"babel-loader": "^8.1.0",
2727
"cache-loader": "^4.1.0",
2828
"thread-loader": "^2.1.3",

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

Copy file name to clipboardExpand all lines: packages/@vue/cli-plugin-e2e-cypress/package.json
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-e2e-cypress",
3-
"version": "4.4.1",
3+
"version": "4.4.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": "^4.4.1",
26+
"@vue/cli-shared-utils": "^4.4.2",
2727
"cypress": "^3.8.3",
2828
"eslint-plugin-cypress": "^2.10.3"
2929
},

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

Copy file name to clipboardExpand all lines: packages/@vue/cli-plugin-e2e-nightwatch/package.json
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-e2e-nightwatch",
3-
"version": "4.4.1",
3+
"version": "4.4.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": "^4.4.1",
26+
"@vue/cli-shared-utils": "^4.4.2",
2727
"deepmerge": "^4.2.2",
2828
"nightwatch": "^1.3.5"
2929
},

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

Copy file name to clipboardExpand all lines: packages/@vue/cli-plugin-eslint/package.json
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-eslint",
3-
"version": "4.4.1",
3+
"version": "4.4.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": "^4.4.1",
26+
"@vue/cli-shared-utils": "^4.4.2",
2727
"eslint-loader": "^2.2.1",
2828
"globby": "^9.2.0",
2929
"inquirer": "^7.1.0",

‎packages/@vue/cli-plugin-pwa/README.md

Copy file name to clipboardExpand all lines: packages/@vue/cli-plugin-pwa/README.md
+6Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ file, or the `"vue"` field in `package.json`.
8484
- display: `'standalone'`
8585
- theme_color: `pwa.themeColor`
8686

87+
- **pwa.manifestCrossorigin**
88+
89+
- Default: `undefined`
90+
91+
Value for `crossorigin` attribute in manifest link tag in the generated HTML. You may need to set this if your PWA is behind an authenticated proxy. See [cross-origin values](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/link#attr-crossorigin) for more details.
92+
8793
- **pwa.iconPaths**
8894

8995
- Defaults:

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

Copy file name to clipboardExpand all lines: packages/@vue/cli-plugin-pwa/package.json
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-pwa",
3-
"version": "4.4.1",
3+
"version": "4.4.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": "^4.4.1",
26+
"@vue/cli-shared-utils": "^4.4.2",
2727
"webpack": "^4.0.0",
2828
"workbox-webpack-plugin": "^4.3.1"
2929
},

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

Copy file name to clipboardExpand all lines: packages/@vue/cli-plugin-router/package.json
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-router",
3-
"version": "4.4.1",
3+
"version": "4.4.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": "^4.4.1"
26+
"@vue/cli-shared-utils": "^4.4.2"
2727
},
2828
"devDependencies": {
29-
"@vue/cli-test-utils": "^4.4.1"
29+
"@vue/cli-test-utils": "^4.4.2"
3030
},
3131
"peerDependencies": {
3232
"@vue/cli-service": "^3.0.0 || ^4.0.0-0"

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

Copy file name to clipboardExpand all lines: packages/@vue/cli-plugin-typescript/package.json
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-typescript",
3-
"version": "4.4.1",
3+
"version": "4.4.2",
44
"description": "typescript plugin for vue-cli",
55
"main": "index.js",
66
"repository": {
@@ -24,7 +24,7 @@
2424
},
2525
"dependencies": {
2626
"@types/webpack-env": "^1.15.2",
27-
"@vue/cli-shared-utils": "^4.4.1",
27+
"@vue/cli-shared-utils": "^4.4.2",
2828
"cache-loader": "^4.1.0",
2929
"fork-ts-checker-webpack-plugin": "^3.1.1",
3030
"globby": "^9.2.0",

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

Copy file name to clipboardExpand all lines: packages/@vue/cli-plugin-unit-jest/package.json
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-unit-jest",
3-
"version": "4.4.1",
3+
"version": "4.4.2",
44
"description": "unit-jest plugin for vue-cli",
55
"main": "index.js",
66
"repository": {
@@ -26,7 +26,7 @@
2626
"@babel/core": "^7.9.6",
2727
"@babel/plugin-transform-modules-commonjs": "^7.9.6",
2828
"@types/jest": "^24.0.19",
29-
"@vue/cli-shared-utils": "^4.4.1",
29+
"@vue/cli-shared-utils": "^4.4.2",
3030
"babel-core": "^7.0.0-bridge.0",
3131
"babel-jest": "^24.9.0",
3232
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",

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

Copy file name to clipboardExpand all lines: packages/@vue/cli-plugin-unit-mocha/package.json
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-unit-mocha",
3-
"version": "4.4.1",
3+
"version": "4.4.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": "^4.4.1",
25+
"@vue/cli-shared-utils": "^4.4.2",
2626
"jsdom": "^15.2.1",
2727
"jsdom-global": "^3.0.2",
2828
"mocha": "^6.2.2",

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

Copy file name to clipboardExpand all lines: packages/@vue/cli-plugin-vuex/package.json
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-plugin-vuex",
3-
"version": "4.4.1",
3+
"version": "4.4.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": "^4.4.1"
26+
"@vue/cli-test-utils": "^4.4.2"
2727
},
2828
"peerDependencies": {
2929
"@vue/cli-service": "^3.0.0 || ^4.0.0-0"

‎packages/@vue/cli-service-global/package.json

Copy file name to clipboardExpand all lines: packages/@vue/cli-service-global/package.json
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-service-global",
3-
"version": "4.4.1",
3+
"version": "4.4.2",
44
"description": "vue-cli-service global addon for vue-cli",
55
"main": "index.js",
66
"publishConfig": {
@@ -22,9 +22,9 @@
2222
},
2323
"homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-service-global#readme",
2424
"dependencies": {
25-
"@vue/cli-plugin-babel": "^4.4.1",
26-
"@vue/cli-plugin-eslint": "^4.4.1",
27-
"@vue/cli-service": "^4.4.1",
25+
"@vue/cli-plugin-babel": "^4.4.2",
26+
"@vue/cli-plugin-eslint": "^4.4.2",
27+
"@vue/cli-service": "^4.4.2",
2828
"babel-eslint": "^10.1.0",
2929
"chalk": "^3.0.0",
3030
"core-js": "^3.6.5",

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

Copy file name to clipboardExpand all lines: packages/@vue/cli-service/package.json
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-service",
3-
"version": "4.4.1",
3+
"version": "4.4.2",
44
"description": "local service for vue-cli projects",
55
"main": "lib/Service.js",
66
"typings": "types/index.d.ts",
@@ -26,10 +26,10 @@
2626
"@intervolga/optimize-cssnano-plugin": "^1.0.5",
2727
"@soda/friendly-errors-webpack-plugin": "^1.7.1",
2828
"@soda/get-current-script": "^1.0.0",
29-
"@vue/cli-overlay": "^4.4.1",
30-
"@vue/cli-plugin-router": "^4.4.1",
31-
"@vue/cli-plugin-vuex": "^4.4.1",
32-
"@vue/cli-shared-utils": "^4.4.1",
29+
"@vue/cli-overlay": "^4.4.2",
30+
"@vue/cli-plugin-router": "^4.4.2",
31+
"@vue/cli-plugin-vuex": "^4.4.2",
32+
"@vue/cli-shared-utils": "^4.4.2",
3333
"@vue/component-compiler-utils": "^3.1.2",
3434
"@vue/preload-webpack-plugin": "^1.1.0",
3535
"@vue/web-component-wrapper": "^1.2.0",

‎packages/@vue/cli-shared-utils/package.json

Copy file name to clipboardExpand all lines: packages/@vue/cli-shared-utils/package.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-shared-utils",
3-
"version": "4.4.1",
3+
"version": "4.4.2",
44
"description": "shared utilities for vue-cli packages",
55
"main": "index.js",
66
"repository": {

‎packages/@vue/cli-test-utils/package.json

Copy file name to clipboardExpand all lines: packages/@vue/cli-test-utils/package.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-test-utils",
3-
"version": "4.4.1",
3+
"version": "4.4.2",
44
"description": "test utilities for vue-cli packages",
55
"repository": {
66
"type": "git",

‎packages/@vue/cli-ui-addon-webpack/package.json

Copy file name to clipboardExpand all lines: packages/@vue/cli-ui-addon-webpack/package.json
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-ui-addon-webpack",
3-
"version": "4.4.1",
3+
"version": "4.4.2",
44
"repository": {
55
"type": "git",
66
"url": "git+https://github.com/vuejs/vue-cli.git",
@@ -18,9 +18,9 @@
1818
},
1919
"license": "MIT",
2020
"devDependencies": {
21-
"@vue/cli-plugin-babel": "^4.4.1",
22-
"@vue/cli-plugin-eslint": "^4.4.1",
23-
"@vue/cli-service": "^4.4.1",
21+
"@vue/cli-plugin-babel": "^4.4.2",
22+
"@vue/cli-plugin-eslint": "^4.4.2",
23+
"@vue/cli-service": "^4.4.2",
2424
"@vue/eslint-config-standard": "^5.1.2",
2525
"core-js": "^3.6.5",
2626
"eslint": "^6.7.2",

‎packages/@vue/cli-ui-addon-widgets/package.json

Copy file name to clipboardExpand all lines: packages/@vue/cli-ui-addon-widgets/package.json
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/cli-ui-addon-widgets",
3-
"version": "4.4.1",
3+
"version": "4.4.2",
44
"repository": {
55
"type": "git",
66
"url": "git+https://github.com/vuejs/vue-cli.git",
@@ -18,9 +18,9 @@
1818
},
1919
"license": "MIT",
2020
"devDependencies": {
21-
"@vue/cli-plugin-babel": "^4.4.1",
22-
"@vue/cli-plugin-eslint": "^4.4.1",
23-
"@vue/cli-service": "^4.4.1",
21+
"@vue/cli-plugin-babel": "^4.4.2",
22+
"@vue/cli-plugin-eslint": "^4.4.2",
23+
"@vue/cli-service": "^4.4.2",
2424
"@vue/eslint-config-standard": "^5.1.2",
2525
"core-js": "^3.6.5",
2626
"eslint": "^6.7.2",

‎packages/@vue/cli-ui/locales/en.json

Copy file name to clipboardExpand all lines: packages/@vue/cli-ui/locales/en.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@
720720
},
721721
"manifestCrossorigin": {
722722
"message": "Attribute value for manifest.json link tag's crossorigin attribute",
723-
"description": "Value for `crossoriging` attribute in manifest link tag in the generated HTML, you may need to set this if your pwa is behind an authenticated proxy"
723+
"description": "Value for `crossorigin` attribute in manifest link tag in the generated HTML, you may need to set this if your pwa is behind an authenticated proxy"
724724
}
725725
}
726726
},

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.