feat: improve compatibility with v3 plugin usage (#4664)

haoqunjiang · web-flow · commit 617dd04cb427 · 2019-10-10T09:59:49.000+08:00
1. `public/manifest.json` will be used when no `pwa.manifestOptions`
present;
2. warn user when there are both the file &amp; the config field present.
diff --git a/packages/@vue/cli-plugin-pwa/index.js b/packages/@vue/cli-plugin-pwa/index.js
@@ -1,12 +1,27 @@
+const fs = require('fs')
+const { chalk, warn } = require('@vue/cli-shared-utils')
+
 module.exports = (api, options) => {
+  const userOptions = options.pwa || {}
+
+  const manifestPath = api.resolve('public/manifest.json')
+  if (fs.existsSync(manifestPath)) {
+    if (!userOptions.manifestOptions) {
+      userOptions.manifestOptions = require(manifestPath)
+    } else {
+      warn(
+        `The ${chalk.red('public/manifest.json')} file will be ignored in favor of ${chalk.cyan('pwa.manifestOptions')}`
+      )
+    }
+  }
+
   api.chainWebpack(webpackConfig => {
     const target = process.env.VUE_CLI_BUILD_TARGET
     if (target && target !== 'app') {
       return
     }
 
     const name = api.service.pkg.name
-    const userOptions = options.pwa || {}
 
     // the pwa plugin hooks on to html-webpack-plugin
     // and injects icons, manifest links & other PWA related tags into <head>
