fix: minor updates to the build script and assets (#2113)

ghostery · Dec 2, 2024 · 7bf56c2 · 7bf56c2
1 parent 0e551f5
commit 7bf56c2
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 14 deletions.
diff --git a/scripts/build.js b/scripts/build.js
@@ -62,9 +62,19 @@ const manifest = JSON.parse(
   readFileSync(resolve(options.srcDir, `manifest.${argv.target}.json`), 'utf8'),
 );
 
-// Add flags to manifest
-if (argv.debug) manifest.debug = true;
-if (argv.staging) manifest.staging = true;
+// --- Add flags ---
+
+if (argv.debug) {
+  manifest.debug = true;
+}
+
+if (argv.staging) {
+  // Force re-download of resources to be sure we have the latest version
+  // when building with staging CDN
+  argv.clean = true;
+
+  manifest.staging = true;
+}
 
 // --- Download rule resources ---
 
@@ -104,8 +114,17 @@ if (!existsSync(licensesPath)) {
       .toString()
       .replace(
         '<html>',
-        '<html lang="en">\n<head>\n<meta charset="utf-8">\n</head>\n',
-      ),
+        `
+<html lang="en">
+  <head>
+    <title>Software Licenses</title>
+    <meta charset="utf-8">
+    <link rel="icon" type="image/png" href="/assets/favicon.png" />
+    <link rel="icon" type="image/svg+xml" href="/assets/favicon.svg" />
+  </head>
+`,
+      )
+      .trim(),
   );
 }
 

diff --git a/src/pages/notifications/opera-serp.html b/src/pages/notifications/opera-serp.html
@@ -1,9 +1,11 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
+    <title>More ad blocking available</title>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width" />
-    <title>More ad blocking available</title>
+    <link rel="icon" type="image/png" href="/ui/assets/favicon.png" />
+    <link rel="icon" type="image/svg+xml" href="/ui/assets/favicon.svg" />
     <script src="./opera-serp.js" type="module" async></script>
   </head>
   <body></body>

diff --git a/src/pages/notifications/youtube.html b/src/pages/notifications/youtube.html
@@ -1,9 +1,11 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
+    <title>Youtube Wall</title>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width" />
-    <title>Youtube Wall</title>
+    <link rel="icon" type="image/png" href="/ui/assets/favicon.png" />
+    <link rel="icon" type="image/svg+xml" href="/ui/assets/favicon.svg" />
     <script src="./youtube.js" type="module" async></script>
   </head>
   <body></body>

diff --git a/src/pages/onboarding/index.html b/src/pages/onboarding/index.html
@@ -1,9 +1,11 @@
 <!doctype html>
 <html lang="en">
   <head>
+    <title>Welcome to Ghostery</title>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width" />
-    <title>Welcome to Ghostery</title>
+    <link rel="icon" type="image/png" href="/ui/assets/favicon.png" />
+    <link rel="icon" type="image/svg+xml" href="/ui/assets/favicon.svg" />
     <script src="./index.js" type="module"></script>
   </head>
   <body></body>

diff --git a/src/pages/panel/index.html b/src/pages/panel/index.html
@@ -1,11 +1,13 @@
 <!doctype html>
 <html lang="en">
   <head>
+    <title>Ghostery panel</title>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width" />
-    <title>Ghostery panel</title>
-    <script type="module" src="./index.js"></script>
     <meta content="light dark" name="color-scheme" />
+    <link rel="icon" type="image/png" href="/ui/assets/favicon.png" />
+    <link rel="icon" type="image/svg+xml" href="/ui/assets/favicon.svg" />
+    <script type="module" src="./index.js"></script>
   </head>
   <body tabindex="0"></body>
 </html>
diff --git a/src/pages/settings/index.html b/src/pages/settings/index.html
@@ -1,9 +1,11 @@
 <!doctype html>
 <html lang="en">
   <head>
+    <title>Ghostery settings</title>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width" />
-    <title>Ghostery settings</title>
+    <link rel="icon" type="image/png" href="/ui/assets/favicon.png" />
+    <link rel="icon" type="image/svg+xml" href="/ui/assets/favicon.svg" />
     <script type="module" src="./index.js"></script>
   </head>
   <body></body>

diff --git a/src/pages/trackers-preview/index.html b/src/pages/trackers-preview/index.html
@@ -1,9 +1,11 @@
 <!doctype html>
 <html lang="en">
   <head>
+    <title>Trackers Preview</title>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width" />
-    <title>Trackers Preview</title>
+    <link rel="icon" type="image/png" href="/ui/assets/favicon.png" />
+    <link rel="icon" type="image/svg+xml" href="/ui/assets/favicon.svg" />
     <script src="./index.js" type="module"></script>
   </head>
   <body></body>

diff --git a/src/ui/assets/favicon.png b/src/ui/assets/favicon.png
diff --git a/src/ui/assets/favicon.svg b/src/ui/assets/favicon.svg