fix: set favicon icon to CDN if prefix is set (#1553)

Unleash · May 10, 2022 · 9c4b4c9 · 9c4b4c9
1 parent 8763b96
commit 9c4b4c9
Show file tree

Hide file tree

Showing 3 changed files with 2,445 additions and 1,454 deletions.
diff --git a/src/lib/util/rewriteHTML.test.ts b/src/lib/util/rewriteHTML.test.ts
@@ -4,7 +4,7 @@ const input = `<!DOCTYPE html>
 <html lang="en">
     <head>
         <meta charset="utf-8" />
-        <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+        <link rel="icon" href="::faviconPrefix::/favicon.ico" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
         <meta name="baseUriPath" content="::baseUriPath::" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -14,7 +14,7 @@ const input = `<!DOCTYPE html>
         <link
             href="https://fonts.googleapis.com/icon?family=Material+Icons"
             rel="stylesheet"
-        />
+        /> 
         <link
             href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700"
             rel="stylesheet"
@@ -68,3 +68,20 @@ test('rewriteHTML substitutes asset paths correctly without baseUriPath', () =>
         ),
     ).toBe(true);
 });
+
+test('rewriteHTML swaps out faviconPath if cdnPrefix is set', () => {
+    const result = rewriteHTML(input, '', 'https://cdn.getunleash.io/v4.1.0');
+    expect(
+        result.includes(
+            '<link rel="icon" href="https://cdn.getunleash.io/favicon.ico" />',
+        ),
+    ).toBe(true);
+});
+
+test('rewriteHTML sets favicon path to root', () => {
+    const result = rewriteHTML(input, '');
+    console.log(result);
+    expect(result.includes('<link rel="icon" href="/favicon.ico" />')).toBe(
+        true,
+    );
+});
diff --git a/src/lib/util/rewriteHTML.ts b/src/lib/util/rewriteHTML.ts
@@ -6,6 +6,10 @@ export const rewriteHTML = (
     let result = input;
     result = result.replace(/::baseUriPath::/gi, rewriteValue);
     result = result.replace(/::cdnPrefix::/gi, cdnPrefix || '');
+
+    const faviconPrefix = cdnPrefix ? 'https://cdn.getunleash.io' : '';
+    result = result.replace(/::faviconPrefix::/gi, faviconPrefix);
+
     result = result.replace(
         /\/static/gi,
         `${cdnPrefix || rewriteValue}/static`,