From 0cba5128e957afc0bcb7d1f32ddf755782883cea Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Sat, 28 Dec 2019 15:21:55 +0800
Subject: [PATCH] fix: fix several bugs in the PWA plugin UI, make it usable
 again (#4974)

closes #4903
---
 packages/@vue/cli-plugin-pwa/ui.js | 68 +++++++++++++++++++-----------
 1 file changed, 43 insertions(+), 25 deletions(-)

diff --git a/packages/@vue/cli-plugin-pwa/ui.js b/packages/@vue/cli-plugin-pwa/ui.js
index ec4b45cf76..f3c7a9a056 100644
--- a/packages/@vue/cli-plugin-pwa/ui.js
+++ b/packages/@vue/cli-plugin-pwa/ui.js
@@ -15,7 +15,13 @@ module.exports = api => {
         json: ['public/manifest.json']
       }
     },
-    onRead: ({ data, cwd }) => {
+    onRead: ({ data }) => {
+      // Dirty hack here: only in onRead can we delete files from the original data.
+      // Remove (or, don't create the file) manifest.json if no actual content in it.
+      if (!data.manifest || !Object.keys(data.manifest).length) {
+        delete data.manifest
+      }
+
       return {
         prompts: [
           {
@@ -58,7 +64,12 @@ module.exports = api => {
             message: 'org.vue.pwa.config.pwa.backgroundColor.message',
             description: 'org.vue.pwa.config.pwa.backgroundColor.description',
             default: '#000000',
-            value: data.manifest && data.manifest.background_color,
+            value:
+              (data.vue &&
+                data.vue.pwa &&
+                data.vue.pwa.manifestOptions &&
+                data.vue.pwa.manifestOptions.background_color) ||
+              (data.manifest && data.manifest.background_color),
             skipSave: true
           },
           {
@@ -82,12 +93,12 @@ module.exports = api => {
             type: 'list',
             message: 'org.vue.pwa.config.pwa.manifestCrossorigin.message',
             description: 'org.vue.pwa.config.pwa.manifestCrossorigin.description',
-            default: undefined,
+            default: null,
             value: data.vue && data.vue.pwa && data.vue.pwa.manifestCrossorigin,
             choices: [
               {
                 name: 'none',
-                value: undefined
+                value: null
               },
               {
                 name: 'anonymous',
@@ -102,35 +113,42 @@ module.exports = api => {
         ]
       }
     },
-    onWrite: async ({ onWriteApi, prompts, cwd }) => {
+    onWrite: async ({ api: onWriteApi, data, prompts }) => {
       const result = {}
       for (const prompt of prompts.filter(p => !p.raw.skipSave)) {
         result[`pwa.${prompt.id}`] = await onWriteApi.getAnswer(prompt.id)
       }
-      onWriteApi.setData('vue', result)
-
-      // Update app manifest
 
-      const name = result['name']
-      if (name) {
-        onWriteApi.setData('manifest', {
-          name,
-          short_name: name
-        })
+      const backgroundColor = await onWriteApi.getAnswer('backgroundColor')
+      if (!data.manifest && backgroundColor) {
+        result['pwa.manifestOptions.background_color'] = backgroundColor
       }
 
-      const themeColor = result['themeColor']
-      if (themeColor) {
-        onWriteApi.setData('manifest', {
-          theme_color: themeColor
-        })
-      }
+      onWriteApi.setData('vue', result)
 
-      const backgroundColor = await onWriteApi.getAnswer('backgroundColor')
-      if (backgroundColor) {
-        onWriteApi.setData('manifest', {
-          background_color: backgroundColor
-        })
+      // Update app manifest (only when there's a manifest.json file,
+      // otherwise it will be inferred from options in vue.config.js)
+      if (data.manifest) {
+        const name = result['name']
+        if (name) {
+          onWriteApi.setData('manifest', {
+            name,
+            short_name: name
+          })
+        }
+
+        const themeColor = result['themeColor']
+        if (themeColor) {
+          onWriteApi.setData('manifest', {
+            theme_color: themeColor
+          })
+        }
+
+        if (backgroundColor) {
+          onWriteApi.setData('manifest', {
+            background_color: backgroundColor
+          })
+        }
       }
     }
   })