From 7bf56c2b638e1c566b95f2d5b72a3763289a81f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Luba=C5=84ski?= Date: Mon, 2 Dec 2024 15:15:20 +0100 Subject: [PATCH] fix: minor updates to the build script and assets (#2113) --- scripts/build.js | 29 ++++++++++++++++++++---- src/pages/notifications/opera-serp.html | 6 +++-- src/pages/notifications/youtube.html | 6 +++-- src/pages/onboarding/index.html | 4 +++- src/pages/panel/index.html | 6 +++-- src/pages/settings/index.html | 4 +++- src/pages/trackers-preview/index.html | 4 +++- src/ui/assets/favicon.png | Bin 0 -> 2837 bytes src/ui/assets/favicon.svg | 12 ++++++++++ 9 files changed, 57 insertions(+), 14 deletions(-) create mode 100644 src/ui/assets/favicon.png create mode 100644 src/ui/assets/favicon.svg diff --git a/scripts/build.js b/scripts/build.js index 5eb8375bd..5127a2b5a 100644 --- 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( '', - '\n\n\n\n', - ), + ` + + + Software Licenses + + + + +`, + ) + .trim(), ); } diff --git a/src/pages/notifications/opera-serp.html b/src/pages/notifications/opera-serp.html index 27f2f6896..e13228dee 100644 --- a/src/pages/notifications/opera-serp.html +++ b/src/pages/notifications/opera-serp.html @@ -1,9 +1,11 @@ - + + More ad blocking available - More ad blocking available + + diff --git a/src/pages/notifications/youtube.html b/src/pages/notifications/youtube.html index 5330852b3..28a5dd5a6 100644 --- a/src/pages/notifications/youtube.html +++ b/src/pages/notifications/youtube.html @@ -1,9 +1,11 @@ - + + Youtube Wall - Youtube Wall + + diff --git a/src/pages/onboarding/index.html b/src/pages/onboarding/index.html index 05a74fb31..260316e4c 100644 --- a/src/pages/onboarding/index.html +++ b/src/pages/onboarding/index.html @@ -1,9 +1,11 @@ + Welcome to Ghostery - Welcome to Ghostery + + diff --git a/src/pages/panel/index.html b/src/pages/panel/index.html index d2dbc828e..78d8ccbc2 100644 --- a/src/pages/panel/index.html +++ b/src/pages/panel/index.html @@ -1,11 +1,13 @@ + Ghostery panel - Ghostery panel - + + + diff --git a/src/pages/settings/index.html b/src/pages/settings/index.html index 0d8ecce2c..537060bc6 100644 --- a/src/pages/settings/index.html +++ b/src/pages/settings/index.html @@ -1,9 +1,11 @@ + Ghostery settings - Ghostery settings + + diff --git a/src/pages/trackers-preview/index.html b/src/pages/trackers-preview/index.html index e557836b0..21825580e 100644 --- a/src/pages/trackers-preview/index.html +++ b/src/pages/trackers-preview/index.html @@ -1,9 +1,11 @@ + Trackers Preview - Trackers Preview + + diff --git a/src/ui/assets/favicon.png b/src/ui/assets/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..462693fad9bfc21fc0b1c5aaa088b14511ddbac0 GIT binary patch literal 2837 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 literal 0 HcmV?d00001 diff --git a/src/ui/assets/favicon.svg b/src/ui/assets/favicon.svg new file mode 100644 index 000000000..3d3627f93 --- /dev/null +++ b/src/ui/assets/favicon.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + +