Merge pull request '8.0.5' (#228) from v8.0.5 into main

Reviewed-on: #228

packages/browser-extension/README.md

@@ -12,7 +12,8 @@
 
 - [Chrome Web Store](https://chrome.google.com/webstore/detail/djcbfpkdhdkaflcigibkbpboflaplabg)
 - [Edge Add-ons](https://microsoftedge.microsoft.com/addons/detail/hbogodfciblakeneadpcolhmfckmjcii)
-- [Mozilla Firefox (.xpi)](https://www.cookie-dialog-monster.com/releases/latest.xpi)
+- [Mozilla Firefox](https://www.cookie-dialog-monster.com/releases/mozilla/latest.xpi)
+- [Mozilla Firefox Mobile](https://www.cookie-dialog-monster.com/releases/mozilla-mobile/latest.xpi)
 
 ## Installation
 

packages/browser-extension/src/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Cookie Dialog Monster",
-  "version": "8.0.4",
+  "version": "8.0.5",
   "default_locale": "en",
   "description": "__MSG_appDesc__",
   "icons": {
@@ -24,7 +24,7 @@
     "gecko": {
       "id": "{77e2c00b-e173-4604-863d-01645d8d2826}",
       "strict_min_version": "126.0",
-      "update_url": "https://www.cookie-dialog-monster.com/mozilla/updates.json"
+      "update_url": "https://www.cookie-dialog-monster.com/releases/mozilla/updates.json"
     }
   },
   "content_scripts": [

packages/browser-extension/src/popup.html

@@ -121,7 +121,7 @@
           </svg>
         </a>
       </p>
-      <div class="grid">
+      <div class="content">
         <button class="popup-button" disabled id="power-option">
           <svg
             aria-hidden="true"

packages/browser-extension/src/scripts/popup.js

@@ -124,7 +124,7 @@ async function handleContentLoaded() {
   const { exclusions } = (await dispatch({ hostname, type: 'GET_DATA' })) ?? {};
   const currentVersion = browser.runtime.getManifest().version;
   const latestVersion = await dispatch({ type: 'GET_LATEST_VERSION' });
-  const updateAvailable = currentVersion !== latestVersion;
+  const updateAvailable = latestVersion && currentVersion !== latestVersion;
 
   if (updateAvailable) {
     const updateBanner = document.getElementById('update-banner');

packages/browser-extension/src/styles/popup.css

@@ -96,7 +96,7 @@ header {
   }
 }
 
-.grid {
+.content {
   display: grid;
   grid-template-columns: repeat(2, 1fr);
   gap: 16px;

packages/web/src/index.html

@@ -492,7 +492,7 @@
           </a>
           <a
             class="bg-gradient-to-r button from-firefox-1 md:hover:animate-gradient to-firefox-3 via-firefox-2"
-            href="/releases/latest.xpi"
+            href="/releases/mozilla/latest.xpi"
             id="firefox-link"
             target="_blank"
           >
@@ -514,7 +514,7 @@
           </a>
           <a
             class="bg-gradient-to-r button from-yellow-400 via-brown-500 to-yellow-600 md:hover:animate-gradient"
-            href="/releases/latest.zip"
+            href="/releases/chromium/latest.zip"
             target="_blank"
           >
             <span aria-hidden="true" class="icon" role="img">📦</span>
@@ -589,7 +589,7 @@
         if (isMobile) {
           firefoxGuideLink.href =
             'https://git.wanhose.dev/wanhose/cookie-dialog-monster/wiki/Step-by-step+installation+guide+for+Mozilla+Firefox+Mobile.-';
-          firefoxLink.href = '/releases/latest-mozilla-mobile.xpi';
+          firefoxLink.href = '/releases/mozilla-mobile/latest.xpi';
         }
       });
     </script>

packages/web/src/mozilla-mobile/updates.json

@@ -4,43 +4,43 @@
       "updates": [
         {
           "version": "7.2.2",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/7.2.2-mozilla-mobile.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.2.2.xpi"
         },
         {
           "version": "7.2.3",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/7.2.3-mozilla-mobile.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.2.3.xpi"
         },
         {
           "version": "7.2.4",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/7.2.4-mozilla-mobile.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.2.4.xpi"
         },
         {
           "version": "7.3.0",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/7.3.0-mozilla-mobile.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.3.0.xpi"
         },
         {
           "version": "7.3.1",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/7.3.1-mozilla-mobile.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.3.1.xpi"
         },
         {
           "version": "7.3.2",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/7.3.2-mozilla-mobile.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.3.2.xpi"
         },
         {
           "version": "8.0.1",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/8.0.1-mozilla-mobile.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/8.0.1.xpi"
         },
         {
           "version": "8.0.2",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/8.0.2-mozilla-mobile.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/8.0.2.xpi"
         },
         {
           "version": "8.0.3",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/8.0.3-mozilla-mobile.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/8.0.3.xpi"
         },
         {
           "version": "8.0.4",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/8.0.4-mozilla-mobile.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/8.0.4.xpi"
         }
       ]
     }

packages/web/src/mozilla/updates.json

@@ -4,75 +4,75 @@
       "updates": [
         {
           "version": "7.0.4",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/7.0.4.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.0.4.xpi"
         },
         {
           "version": "7.1.0",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/7.1.0.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.0.xpi"
         },
         {
           "version": "7.1.1",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/7.1.1.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.1.xpi"
         },
         {
           "version": "7.1.2",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/7.1.2.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.2.xpi"
         },
         {
           "version": "7.1.3",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/7.1.3.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.3.xpi"
         },
         {
           "version": "7.1.4",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/7.1.4.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.4.xpi"
         },
         {
           "version": "7.1.5",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/7.1.5.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.5.xpi"
         },
         {
           "version": "7.2.1",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/7.2.1.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.2.1.xpi"
         },
         {
           "version": "7.2.2",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/7.2.2.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.2.2.xpi"
         },
         {
           "version": "7.2.3",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/7.2.3.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.2.3.xpi"
         },
         {
           "version": "7.2.4",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/7.2.4.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.2.4.xpi"
         },
         {
           "version": "7.3.0",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/7.3.0.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.3.0.xpi"
         },
         {
           "version": "7.3.1",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/7.3.1.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.3.1.xpi"
         },
         {
           "version": "7.3.2",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/7.3.2.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.3.2.xpi"
         },
         {
           "version": "8.0.1",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/8.0.1.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/8.0.1.xpi"
         },
         {
           "version": "8.0.2",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/8.0.2.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/8.0.2.xpi"
         },
         {
           "version": "8.0.3",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/8.0.3.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/8.0.3.xpi"
         },
         {
           "version": "8.0.4",
-          "update_link": "https://www.cookie-dialog-monster.com/releases/8.0.4.xpi"
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/8.0.4.xpi"
         }
       ]
     }

packages/web/src/releases/mozilla-mobile/updates.json

@@ -0,0 +1,48 @@
+{
+  "addons": {
+    "{108d0aea-9bbd-4719-a793-0bc73c1d0064}": {
+      "updates": [
+        {
+          "version": "7.2.2",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.2.2.xpi"
+        },
+        {
+          "version": "7.2.3",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.2.3.xpi"
+        },
+        {
+          "version": "7.2.4",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.2.4.xpi"
+        },
+        {
+          "version": "7.3.0",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.3.0.xpi"
+        },
+        {
+          "version": "7.3.1",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.3.1.xpi"
+        },
+        {
+          "version": "7.3.2",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.3.2.xpi"
+        },
+        {
+          "version": "8.0.1",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/8.0.1.xpi"
+        },
+        {
+          "version": "8.0.2",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/8.0.2.xpi"
+        },
+        {
+          "version": "8.0.3",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/8.0.3.xpi"
+        },
+        {
+          "version": "8.0.4",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/8.0.4.xpi"
+        }
+      ]
+    }
+  }
+}

packages/web/src/releases/mozilla/updates.json

@@ -0,0 +1,80 @@
+{
+  "addons": {
+    "{77e2c00b-e173-4604-863d-01645d8d2826}": {
+      "updates": [
+        {
+          "version": "7.0.4",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.0.4.xpi"
+        },
+        {
+          "version": "7.1.0",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.0.xpi"
+        },
+        {
+          "version": "7.1.1",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.1.xpi"
+        },
+        {
+          "version": "7.1.2",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.2.xpi"
+        },
+        {
+          "version": "7.1.3",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.3.xpi"
+        },
+        {
+          "version": "7.1.4",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.4.xpi"
+        },
+        {
+          "version": "7.1.5",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.5.xpi"
+        },
+        {
+          "version": "7.2.1",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.2.1.xpi"
+        },
+        {
+          "version": "7.2.2",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.2.2.xpi"
+        },
+        {
+          "version": "7.2.3",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.2.3.xpi"
+        },
+        {
+          "version": "7.2.4",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.2.4.xpi"
+        },
+        {
+          "version": "7.3.0",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.3.0.xpi"
+        },
+        {
+          "version": "7.3.1",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.3.1.xpi"
+        },
+        {
+          "version": "7.3.2",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.3.2.xpi"
+        },
+        {
+          "version": "8.0.1",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/8.0.1.xpi"
+        },
+        {
+          "version": "8.0.2",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/8.0.2.xpi"
+        },
+        {
+          "version": "8.0.3",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/8.0.3.xpi"
+        },
+        {
+          "version": "8.0.4",
+          "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/8.0.4.xpi"
+        }
+      ]
+    }
+  }
+}