@duckduckgo/autoconsent 10.6.1 → 10.6.2

package/dist/autoconsent.unit.js

@@ -565,7 +565,6 @@
     EVAL_PRIMEBOX_0: () => !document.cookie.includes("cb-enabled=accepted"),
     EVAL_PUBTECH_0: () => document.cookie.includes("euconsent-v2") && (document.cookie.match(/.YAAAAAAAAAAA/) || document.cookie.match(/.aAAAAAAAAAAA/) || document.cookie.match(/.YAAACFgAAAAA/)),
     EVAL_REDDIT_0: () => document.cookie.includes("eu_cookie={%22opted%22:true%2C%22nonessential%22:false}"),
-    EVAL_SIBBO_0: () => !!window.localStorage.getItem("euconsent-v2"),
     EVAL_SIRDATA_UNBLOCK_SCROLL: () => {
       document.documentElement.classList.forEach((cls) => {
         if (cls.startsWith("sd-cmp-"))
@@ -4767,7 +4766,10 @@
           all: true
         },
         {
-          waitForThenClick: '[data-project="mol-fe-cmp"] button[class*=white]'
+          waitForThenClick: [
+            '[data-project="mol-fe-cmp"] [class*=footer]',
+            "xpath///button[contains(., 'Save & Exit')]"
+          ]
         }
       ]
     },
@@ -7641,48 +7643,17 @@
       ],
       detectPopup: [
         {
-          visible: "sibbo-cmp-layout"
+          visible: "#rejectAllMain"
         }
       ],
       optIn: [
         {
-          click: "sibbo-cmp-layout [data-accept-all]"
+          click: "#acceptAllMain"
         }
       ],
       optOut: [
         {
-          click: '.sibbo-panel__aside__buttons a[data-nav="purposes"]'
-        },
-        {
-          click: '.sibbo-panel__main__header__actions a[data-focusable="reject-all"]'
-        },
-        {
-          if: {
-            exists: "[data-view=purposes] .sibbo-panel__main__footer__actions [data-save-and-exit]"
-          },
-          then: [],
-          else: [
-            {
-              waitFor: '.sibbo-panel__main__footer__actions a[data-focusable="next"]:not(.sibbo-cmp-button--disabled)'
-            },
-            {
-              click: '.sibbo-panel__main__footer__actions a[data-focusable="next"]'
-            },
-            {
-              click: '.sibbo-panel__main div[data-view="purposesLegInt"] a[data-focusable="reject-all"]'
-            }
-          ]
-        },
-        {
-          waitFor: ".sibbo-panel__main__footer__actions [data-save-and-exit]:not(.sibbo-cmp-button--disabled)"
-        },
-        {
-          click: ".sibbo-panel__main__footer__actions [data-save-and-exit]:not(.sibbo-cmp-button--disabled)"
-        }
-      ],
-      test: [
-        {
-          eval: "EVAL_SIBBO_0"
+          click: "#rejectAllMain"
         }
       ]
     },

package/lib/eval-snippets.ts

@@ -109,7 +109,6 @@ export const snippets = {
   EVAL_PRIMEBOX_0: () => !document.cookie.includes('cb-enabled=accepted'),
   EVAL_PUBTECH_0: () => document.cookie.includes('euconsent-v2') && (document.cookie.match(/.YAAAAAAAAAAA/) || document.cookie.match(/.aAAAAAAAAAAA/) || document.cookie.match(/.YAAACFgAAAAA/)) ,
   EVAL_REDDIT_0: () => document.cookie.includes('eu_cookie={%22opted%22:true%2C%22nonessential%22:false}'),
-  EVAL_SIBBO_0: () => !!window.localStorage.getItem('euconsent-v2'),
   EVAL_SIRDATA_UNBLOCK_SCROLL: () => {
     document.documentElement.classList.forEach(cls => {
       if (cls.startsWith('sd-cmp-')) document.documentElement.classList.remove(cls)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duckduckgo/autoconsent",
-  "version": "10.6.1",
+  "version": "10.6.2",
   "description": "",
   "main": "dist/autoconsent.cjs.js",
   "module": "dist/autoconsent.esm.js",

package/readme.md

@@ -22,7 +22,7 @@ The extension-specific code can be found in the `addon` directory. There are two
 addon (found under `dist/addon` after building), one for `mv3` version for Chromium-based browsers, and a `firefox` version for Firefox.
 You can load these in [Chrome](https://developer.chrome.com/docs/extensions/mv3/getstarted/#unpacked)
 in developer mode, and in [Firefox](https://extensionworkshop.com/documentation/develop/temporary-installation-in-firefox/)
-as a tempoary addon.
+as a temporary addon.
 
 ## Rules
 
@@ -225,4 +225,4 @@ MPLv2.
 
 ## Manual Testing
 
-To test the extension / addon with Firefox, open the `about:debugging`, navigate to "This Firefox" on the menu and under "Temporary Extensions" click on "Load Temporary Addon". Select the `manifest.json` file from the `dist/firefox` directory. You will need to build the extension before as described above. The extension should then be active and you can test it manually by simply visiting websites.
+To test the extension / addon with Firefox, open the `about:debugging`, navigate to "This Firefox" on the menu and under "Temporary Extensions" click on "Load Temporary Addon". Select the `manifest.json` file from the `dist/firefox` directory. You will need to build the extension before as described above. The extension should then be active and you can test it manually by simply visiting websites.

package/rules/autoconsent/dmgmedia.json

@@ -14,6 +14,10 @@
     { "waitForThenClick": "[data-project=\"mol-fe-cmp\"] button[class*=basic]" },
     { "waitForVisible": "[data-project=\"mol-fe-cmp\"] div[class*=\"tabContent\"]" },
     { "waitForThenClick": "[data-project=\"mol-fe-cmp\"] div[class*=\"toggle\"][class*=\"enabled\"]", "all": true },
-    { "waitForThenClick": "[data-project=\"mol-fe-cmp\"] button[class*=white]" }
+    { "waitForThenClick": [
+      "[data-project=\"mol-fe-cmp\"] [class*=footer]", 
+      "xpath///button[contains(., 'Save & Exit')]"
+      ]
+    }
   ]
 }

package/rules/autoconsent/sibbo.json

@@ -2,42 +2,15 @@
   "name": "sibbo",
   "prehideSelectors": ["sibbo-cmp-layout"],
   "detectCmp": [{ "exists": "sibbo-cmp-layout" }],
-  "detectPopup": [{ "visible": "sibbo-cmp-layout" }],
-  "optIn": [{ "click": "sibbo-cmp-layout [data-accept-all]" }],
-  "optOut": [
-    { 
-      "click": ".sibbo-panel__aside__buttons a[data-nav=\"purposes\"]"
-    },
-    { 
-      "click": ".sibbo-panel__main__header__actions a[data-focusable=\"reject-all\"]" 
-    },
-    {
-      "if": { 
-        "exists": "[data-view=purposes] .sibbo-panel__main__footer__actions [data-save-and-exit]"
-      },
-      "then": [],
-      "else": [
-        { 
-          "waitFor": ".sibbo-panel__main__footer__actions a[data-focusable=\"next\"]:not(.sibbo-cmp-button--disabled)"
-        },
-        { 
-          "click": ".sibbo-panel__main__footer__actions a[data-focusable=\"next\"]"
-        },
-        { 
-          "click": ".sibbo-panel__main div[data-view=\"purposesLegInt\"] a[data-focusable=\"reject-all\"]" 
-        }
-      ]
-    },
+  "detectPopup": [{ "visible": "#rejectAllMain" }],
+  "optIn": [
     { 
-      "waitFor": ".sibbo-panel__main__footer__actions [data-save-and-exit]:not(.sibbo-cmp-button--disabled)"
-    },
-    {
-      "click": ".sibbo-panel__main__footer__actions [data-save-and-exit]:not(.sibbo-cmp-button--disabled)"
-    }
+      "click": "#acceptAllMain" 
+      }
   ],
-  "test": [
+  "optOut": [
     {
-      "eval": "EVAL_SIBBO_0"
+      "click": "#rejectAllMain"
     }
   ]
 }

package/rules/rules.json

@@ -2391,7 +2391,10 @@
           "all": true
         },
         {
-          "waitForThenClick": "[data-project=\"mol-fe-cmp\"] button[class*=white]"
+          "waitForThenClick": [
+            "[data-project=\"mol-fe-cmp\"] [class*=footer]",
+            "xpath///button[contains(., 'Save & Exit')]"
+          ]
         }
       ]
     },
@@ -5265,48 +5268,17 @@
       ],
       "detectPopup": [
         {
-          "visible": "sibbo-cmp-layout"
+          "visible": "#rejectAllMain"
         }
       ],
       "optIn": [
         {
-          "click": "sibbo-cmp-layout [data-accept-all]"
+          "click": "#acceptAllMain"
         }
       ],
       "optOut": [
         {
-          "click": ".sibbo-panel__aside__buttons a[data-nav=\"purposes\"]"
-        },
-        {
-          "click": ".sibbo-panel__main__header__actions a[data-focusable=\"reject-all\"]"
-        },
-        {
-          "if": {
-            "exists": "[data-view=purposes] .sibbo-panel__main__footer__actions [data-save-and-exit]"
-          },
-          "then": [],
-          "else": [
-            {
-              "waitFor": ".sibbo-panel__main__footer__actions a[data-focusable=\"next\"]:not(.sibbo-cmp-button--disabled)"
-            },
-            {
-              "click": ".sibbo-panel__main__footer__actions a[data-focusable=\"next\"]"
-            },
-            {
-              "click": ".sibbo-panel__main div[data-view=\"purposesLegInt\"] a[data-focusable=\"reject-all\"]"
-            }
-          ]
-        },
-        {
-          "waitFor": ".sibbo-panel__main__footer__actions [data-save-and-exit]:not(.sibbo-cmp-button--disabled)"
-        },
-        {
-          "click": ".sibbo-panel__main__footer__actions [data-save-and-exit]:not(.sibbo-cmp-button--disabled)"
-        }
-      ],
-      "test": [
-        {
-          "eval": "EVAL_SIBBO_0"
+          "click": "#rejectAllMain"
         }
       ]
     },

package/tests/sibbo.spec.ts

@@ -3,7 +3,6 @@ import generateCMPTests from "../playwright/runner";
 generateCMPTests('sibbo', [
   'https://www.europafm.com/',
   'https://sibboventures.com/',
-  'https://www.estadiodeportivo.com/',
   'https://www.atresmediapublicidad.com/',
   'https://www.eitb.eus/',
   'https://beteve.cat/',