chore: merge branch 'master' into dev

Author: haoqunjiang

CHANGELOG.md

@@ -1,4 +1,15 @@
 
+## 4.4.2 (2020-06-12)
+
+#### :memo: Documentation
+* `@vue/cli-plugin-pwa`
+  * [#5530](https://github.com/vuejs/vue-cli/pull/5530) docs: mention using `null` to ignore icons ([@qirh](https://github.com/qirh))
+
+#### Committers: 1
+- Saleh Alghusson ([@qirh](https://github.com/qirh))
+
+
+
 ## 4.4.1 (2020-05-25)
 
 #### :bug: Bug Fix

docs/core-plugins/pwa.md

@@ -84,6 +84,12 @@ file, or the `"vue"` field in `package.json`.
       - display: `'standalone'`
       - theme_color: `pwa.themeColor`
 
+- **pwa.manifestCrossorigin**
+
+  - Default: `undefined`
+
+    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.
+
 - **pwa.iconPaths**
 
   - Defaults:
@@ -98,7 +104,7 @@ file, or the `"vue"` field in `package.json`.
     }
     ```
 
-    Change these values to use different paths for your icons.
+    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.
 
 ### Example Configuration
 

lerna.json

@@ -1,7 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "4.4.1",
+  "version": "4.4.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": "4.4.1",
+  "version": "4.4.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": "4.4.1",
+  "version": "4.4.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": "4.4.1",
+  "version": "4.4.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": "4.4.1",
+  "version": "4.4.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.9.6",
-    "@vue/babel-preset-app": "^4.4.1",
-    "@vue/cli-shared-utils": "^4.4.1",
+    "@vue/babel-preset-app": "^4.4.2",
+    "@vue/cli-shared-utils": "^4.4.2",
     "babel-loader": "^8.1.0",
     "cache-loader": "^4.1.0",
     "thread-loader": "^2.1.3",

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-e2e-cypress",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "description": "e2e-cypress plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^4.4.1",
+    "@vue/cli-shared-utils": "^4.4.2",
     "cypress": "^3.8.3",
     "eslint-plugin-cypress": "^2.10.3"
   },

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-eslint",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "description": "eslint plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^4.4.1",
+    "@vue/cli-shared-utils": "^4.4.2",
     "eslint-loader": "^2.2.1",
     "globby": "^9.2.0",
     "inquirer": "^7.1.0",

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

@@ -84,6 +84,12 @@ file, or the `"vue"` field in `package.json`.
       - display: `'standalone'`
       - theme_color: `pwa.themeColor`
 
+- **pwa.manifestCrossorigin**
+
+  - Default: `undefined`
+
+    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.
+
 - **pwa.iconPaths**
 
   - Defaults:

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-pwa",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "description": "pwa plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^4.4.1",
+    "@vue/cli-shared-utils": "^4.4.2",
     "webpack": "^4.0.0",
     "workbox-webpack-plugin": "^4.3.1"
   },

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-typescript",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "description": "typescript plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@types/webpack-env": "^1.15.2",
-    "@vue/cli-shared-utils": "^4.4.1",
+    "@vue/cli-shared-utils": "^4.4.2",
     "cache-loader": "^4.1.0",
     "fork-ts-checker-webpack-plugin": "^3.1.1",
     "globby": "^9.2.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-unit-jest",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "description": "unit-jest plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
     "@babel/core": "^7.9.6",
     "@babel/plugin-transform-modules-commonjs": "^7.9.6",
     "@types/jest": "^24.0.19",
-    "@vue/cli-shared-utils": "^4.4.1",
+    "@vue/cli-shared-utils": "^4.4.2",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^24.9.0",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-unit-mocha",
-  "version": "4.4.1",
+  "version": "4.4.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": "^4.4.1",
+    "@vue/cli-shared-utils": "^4.4.2",
     "jsdom": "^15.2.1",
     "jsdom-global": "^3.0.2",
     "mocha": "^6.2.2",

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-service-global",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "description": "vue-cli-service global addon for vue-cli",
   "main": "index.js",
   "publishConfig": {
@@ -22,9 +22,9 @@
   },
   "homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-service-global#readme",
   "dependencies": {
-    "@vue/cli-plugin-babel": "^4.4.1",
-    "@vue/cli-plugin-eslint": "^4.4.1",
-    "@vue/cli-service": "^4.4.1",
+    "@vue/cli-plugin-babel": "^4.4.2",
+    "@vue/cli-plugin-eslint": "^4.4.2",
+    "@vue/cli-service": "^4.4.2",
     "babel-eslint": "^10.1.0",
     "chalk": "^3.0.0",
     "core-js": "^3.6.5",

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-service",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "description": "local service for vue-cli projects",
   "main": "lib/Service.js",
   "typings": "types/index.d.ts",
@@ -26,10 +26,10 @@
     "@intervolga/optimize-cssnano-plugin": "^1.0.5",
     "@soda/friendly-errors-webpack-plugin": "^1.7.1",
     "@soda/get-current-script": "^1.0.0",
-    "@vue/cli-overlay": "^4.4.1",
-    "@vue/cli-plugin-router": "^4.4.1",
-    "@vue/cli-plugin-vuex": "^4.4.1",
-    "@vue/cli-shared-utils": "^4.4.1",
+    "@vue/cli-overlay": "^4.4.2",
+    "@vue/cli-plugin-router": "^4.4.2",
+    "@vue/cli-plugin-vuex": "^4.4.2",
+    "@vue/cli-shared-utils": "^4.4.2",
     "@vue/component-compiler-utils": "^3.1.2",
     "@vue/preload-webpack-plugin": "^1.1.0",
     "@vue/web-component-wrapper": "^1.2.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-shared-utils",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "description": "shared utilities for vue-cli packages",
   "main": "index.js",
   "repository": {

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-test-utils",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "description": "test utilities for vue-cli packages",
   "repository": {
     "type": "git",

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui-addon-webpack",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -18,9 +18,9 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.4.1",
-    "@vue/cli-plugin-eslint": "^4.4.1",
-    "@vue/cli-service": "^4.4.1",
+    "@vue/cli-plugin-babel": "^4.4.2",
+    "@vue/cli-plugin-eslint": "^4.4.2",
+    "@vue/cli-service": "^4.4.2",
     "@vue/eslint-config-standard": "^5.1.2",
     "core-js": "^3.6.5",
     "eslint": "^6.7.2",

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui-addon-widgets",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -18,9 +18,9 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.4.1",
-    "@vue/cli-plugin-eslint": "^4.4.1",
-    "@vue/cli-service": "^4.4.1",
+    "@vue/cli-plugin-babel": "^4.4.2",
+    "@vue/cli-plugin-eslint": "^4.4.2",
+    "@vue/cli-service": "^4.4.2",
     "@vue/eslint-config-standard": "^5.1.2",
     "core-js": "^3.6.5",
     "eslint": "^6.7.2",

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

@@ -720,7 +720,7 @@
             },
             "manifestCrossorigin": {
               "message": "Attribute value for manifest.json link tag's crossorigin attribute",
-              "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"
+              "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"
             }
           }
         },