From 6c4a0bf4f80c279f825322c29780b18c354d529e Mon Sep 17 00:00:00 2001
From: Thomas Kint <thomaskint.pro@gmail.com>
Date: Tue, 12 Nov 2019 15:33:18 +0100
Subject: [PATCH] feat: allow use of full url for pwa manifest and icons
 (#4736)

---
 .../@vue/cli-plugin-pwa/lib/HtmlPwaPlugin.js  | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/packages/@vue/cli-plugin-pwa/lib/HtmlPwaPlugin.js b/packages/@vue/cli-plugin-pwa/lib/HtmlPwaPlugin.js
index 8f114e6c45..a42852960e 100644
--- a/packages/@vue/cli-plugin-pwa/lib/HtmlPwaPlugin.js
+++ b/packages/@vue/cli-plugin-pwa/lib/HtmlPwaPlugin.js
@@ -75,25 +75,25 @@ module.exports = class HtmlPwaPlugin {
             rel: 'icon',
             type: 'image/png',
             sizes: '32x32',
-            href: `${publicPath}${iconPaths.favicon32}${assetsVersionStr}`
+            href: getTagHref(publicPath, iconPaths.favicon32, assetsVersionStr)
           }),
           makeTag('link', {
             rel: 'icon',
             type: 'image/png',
             sizes: '16x16',
-            href: `${publicPath}${iconPaths.favicon16}${assetsVersionStr}`
+            href: getTagHref(publicPath, iconPaths.favicon16, assetsVersionStr)
           }),
 
           // Add to home screen for Android and modern mobile browsers
           makeTag('link', manifestCrossorigin
             ? {
               rel: 'manifest',
-              href: `${publicPath}${manifestPath}${assetsVersionStr}`,
+              href: getTagHref(publicPath, manifestPath, assetsVersionStr),
               crossorigin: manifestCrossorigin
             }
             : {
               rel: 'manifest',
-              href: `${publicPath}${manifestPath}${assetsVersionStr}`
+              href: getTagHref(publicPath, manifestPath, assetsVersionStr)
             }
           ),
           makeTag('meta', {
@@ -116,18 +116,18 @@ module.exports = class HtmlPwaPlugin {
           }),
           makeTag('link', {
             rel: 'apple-touch-icon',
-            href: `${publicPath}${iconPaths.appleTouchIcon}${assetsVersionStr}`
+            href: getTagHref(publicPath, iconPaths.appleTouchIcon, assetsVersionStr)
           }),
           makeTag('link', {
             rel: 'mask-icon',
-            href: `${publicPath}${iconPaths.maskIcon}${assetsVersionStr}`,
+            href: getTagHref(publicPath, iconPaths.maskIcon, assetsVersionStr),
             color: themeColor
           }),
 
           // Add to home screen for Windows
           makeTag('meta', {
             name: 'msapplication-TileImage',
-            content: `${publicPath}${iconPaths.msTileImage}${assetsVersionStr}`
+            content: getTagHref(publicPath, iconPaths.msTileImage, assetsVersionStr)
           }),
           makeTag('meta', {
             name: 'msapplication-TileColor',
@@ -170,3 +170,11 @@ function makeTag (tagName, attributes, closeTag = false) {
     attributes
   }
 }
+
+function getTagHref (publicPath, href, assetsVersionStr) {
+  let tagHref = `${href}${assetsVersionStr}`
+  if (!(/(http(s?)):\/\//gi.test(href))) {
+    tagHref = `${publicPath}${tagHref}`
+  }
+  return tagHref
+}