chore: merge branch 'master' into dev

vuejs · Dec 28, 2019 · 95ae2a1 · 95ae2a1
2 parents 0cba512 + 9e73907
commit 95ae2a1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/docs/core-plugins/pwa.md b/docs/core-plugins/pwa.md
@@ -31,6 +31,11 @@ file, or the `"vue"` field in `package.json`.
 
   These options are passed on through to the underlying `workbox-webpack-plugin`.
 
+  If you're using the App Shell pattern with the `GenerateSW` mode, you can configure your entry point like this to make sure all your pages load offline:
+  ```js
+  navigateFallback: 'index.html'
+  ```
+
   For more information on what values are supported, please see the guide for
   [`GenerateSW`](https://developers.google.com/web/tools/workbox/modules/workbox-webpack-plugin#full_generatesw_config)
   or for [`InjectManifest`](https://developers.google.com/web/tools/workbox/modules/workbox-webpack-plugin#full_injectmanifest_config).
@@ -112,6 +117,13 @@ module.exports = {
     msTileColor: '#000000',
     appleMobileWebAppCapable: 'yes',
     appleMobileWebAppStatusBarStyle: 'black',
+
+    // configure the manifest options
+    manifestOptions: {
+      display: 'landscape',
+      background_color: '#42B883'
+      // ...other Manifest options...
+    },
 
     // configure the workbox plugin
     workboxPluginMode: 'InjectManifest',

diff --git a/docs/dev-guide/ui-api.md b/docs/dev-guide/ui-api.md
@@ -146,7 +146,7 @@ See [Prompts](#prompts) for more info.
 
 The `data` object contains the JSON result of each config file content.
 
-For example, let's say the user has the following `vue.config.js` in his project:
+For example, let's say the user has the following `vue.config.js` in their project:
 
 ```js
 module.exports = {