From 34b58c0f6246ddbd34784ac49fb0c2807cbf986e Mon Sep 17 00:00:00 2001
From: GabrielGMartinsBr <gabrielgmartinsbr@gmail.com>
Date: Sun, 30 Aug 2020 22:52:39 -0300
Subject: [PATCH] fix: allow turning off theme color tags (#5820)

Co-authored-by: Haoqun Jiang <haoqunjiang@gmail.com>
---
 .../@vue/cli-plugin-pwa/lib/HtmlPwaPlugin.js  | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/packages/@vue/cli-plugin-pwa/lib/HtmlPwaPlugin.js b/packages/@vue/cli-plugin-pwa/lib/HtmlPwaPlugin.js
index 25b4bfbe2a..f6683ef47e 100644
--- a/packages/@vue/cli-plugin-pwa/lib/HtmlPwaPlugin.js
+++ b/packages/@vue/cli-plugin-pwa/lib/HtmlPwaPlugin.js
@@ -111,13 +111,18 @@ module.exports = class HtmlPwaPlugin {
               rel: 'manifest',
               href: getTagHref(publicPath, manifestPath, assetsVersionStr)
             }
-          ),
-          makeTag('meta', {
-            name: 'theme-color',
-            content: themeColor
-          })
+          )
         )
 
+        if (themeColor != null) {
+          data.head.push(
+            makeTag('meta', {
+              name: 'theme-color',
+              content: themeColor
+            })
+          )
+        }
+
         // Add to home screen for Safari on iOS
         data.head.push(
           makeTag('meta', {
@@ -154,12 +159,14 @@ module.exports = class HtmlPwaPlugin {
             content: getTagHref(publicPath, iconPaths.msTileImage, assetsVersionStr)
           }))
         }
-        data.head.push(
-          makeTag('meta', {
-            name: 'msapplication-TileColor',
-            content: msTileColor
-          })
-        )
+        if (msTileColor != null) {
+          data.head.push(
+            makeTag('meta', {
+              name: 'msapplication-TileColor',
+              content: msTileColor
+            })
+          )
+        }
 
         cb(null, data)
       })