@duckduckgo/autoconsent 6.0.0 → 6.1.1

package/CHANGELOG.md

@@ -1,3 +1,45 @@
+# v6.1.1 (Thu Sep 14 2023)
+
+#### 🐛 Bug Fix
+
+- Update test site domain [#252](https://github.com/duckduckgo/autoconsent/pull/252) ([@sammacbeth](https://github.com/sammacbeth))
+
+#### Authors: 1
+
+- Sam Macbeth ([@sammacbeth](https://github.com/sammacbeth))
+
+---
+
+# v6.1.0 (Tue Sep 12 2023)
+
+#### 🚀 Enhancement
+
+- Bump web-ext from 7.6.2 to 7.7.0 [#249](https://github.com/duckduckgo/autoconsent/pull/249) ([@dependabot[bot]](https://github.com/dependabot[bot]))
+
+#### 🐛 Bug Fix
+
+- Add rule for activobank.pt [#244](https://github.com/duckduckgo/autoconsent/pull/244) ([@muodov](https://github.com/muodov))
+- Update trustarc-frame.ts [#235](https://github.com/duckduckgo/autoconsent/pull/235) ([@hyebahi](https://github.com/hyebahi))
+
+#### 🔩 Dependency Updates
+
+- Bump @types/chrome from 0.0.243 to 0.0.245 [#245](https://github.com/duckduckgo/autoconsent/pull/245) ([@dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump tslib from 2.6.1 to 2.6.2 [#242](https://github.com/duckduckgo/autoconsent/pull/242) ([@dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump chai from 4.3.7 to 4.3.8 [#241](https://github.com/duckduckgo/autoconsent/pull/241) ([@dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump @playwright/test from 1.36.2 to 1.37.1 [#239](https://github.com/duckduckgo/autoconsent/pull/239) ([@dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump esbuild from 0.18.11 to 0.19.2 [#234](https://github.com/duckduckgo/autoconsent/pull/234) ([@dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump @puppeteer/replay from 2.13.2 to 2.13.3 [#222](https://github.com/duckduckgo/autoconsent/pull/222) ([@dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump @types/chrome from 0.0.242 to 0.0.243 [#221](https://github.com/duckduckgo/autoconsent/pull/221) ([@dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump auto from 10.46.0 to 11.0.1 [#233](https://github.com/duckduckgo/autoconsent/pull/233) ([@dependabot[bot]](https://github.com/dependabot[bot]))
+
+#### Authors: 3
+
+- [@dependabot[bot]](https://github.com/dependabot[bot])
+- [@hyebahi](https://github.com/hyebahi)
+- Maxim Tsoy ([@muodov](https://github.com/muodov))
+
+---
+
 # v6.0.0 (Tue Aug 22 2023)
 
 #### 💥 Breaking Change

package/dist/addon-firefox/content.bundle.js

@@ -502,7 +502,7 @@
       interval
     );
   }
-  async function waitForThenClick(selector, timeout = 1e4, all = false) {
+  async function waitForThenClick2(selector, timeout = 1e4, all = false) {
     await waitForElement(selector, timeout);
     return click(selector, all);
   }
@@ -889,7 +889,7 @@
         results.push(click(rule.click, rule.all));
       }
       if (rule.waitForThenClick) {
-        results.push(waitForThenClick(rule.waitForThenClick, rule.timeout, rule.all));
+        results.push(waitForThenClick2(rule.waitForThenClick, rule.timeout, rule.all));
       }
       if (rule.wait) {
         results.push(wait(rule.wait));
@@ -1140,17 +1140,17 @@
       }
       if (click("#catDetails0")) {
         click(".submit");
+        waitForThenClick("#gwt-debug-close_id", 5e3);
         return true;
       }
       if (click(".required")) {
+        waitForThenClick("#gwt-debug-close_id", 5e3);
         return true;
       }
       await this.navigateToSettings();
       click(".switch span:nth-child(1):not(.active)", true);
       click(".submit");
-      waitForElement("#gwt-debug-close_id", 3e5).then(() => {
-        click("#gwt-debug-close_id");
-      });
+      waitForThenClick("#gwt-debug-close_id", 3e5);
       return true;
     }
     async optIn() {
@@ -1609,7 +1609,7 @@
       return false;
     }
     async optIn() {
-      return waitForThenClick(".unic #unic-agree");
+      return waitForThenClick2(".unic #unic-agree");
     }
     async test() {
       await wait(1e3);
@@ -1641,14 +1641,14 @@
       return elementVisible(".cmp-root .cmp-receptacle", "any");
     }
     async optOut() {
-      if (!await waitForThenClick(".cmp-main-button:not(.cmp-main-button--primary)")) {
+      if (!await waitForThenClick2(".cmp-main-button:not(.cmp-main-button--primary)")) {
         return false;
       }
       if (!await waitForElement(".cmp-view-tab-tabs")) {
         return false;
       }
-      await waitForThenClick(".cmp-view-tab-tabs > :first-child");
-      await waitForThenClick(".cmp-view-tab-tabs > .cmp-view-tab--active:first-child");
+      await waitForThenClick2(".cmp-view-tab-tabs > :first-child");
+      await waitForThenClick2(".cmp-view-tab-tabs > .cmp-view-tab--active:first-child");
       for (const item of Array.from(document.querySelectorAll(".cmp-accordion-item"))) {
         item.querySelector(".cmp-accordion-item-title").click();
         await waitFor(() => !!item.querySelector(".cmp-accordion-item-content.cmp-active"), 10, 50);
@@ -1660,7 +1660,7 @@
       return true;
     }
     async optIn() {
-      return waitForThenClick(".cmp-main-button.cmp-main-button--primary");
+      return waitForThenClick2(".cmp-main-button.cmp-main-button--primary");
     }
     async test() {
       return document.cookie.includes("cmp-data=0");
@@ -1759,15 +1759,15 @@
       return elementVisible("div[data-testid=main-cookies-banner-container", "any");
     }
     async optOut() {
-      await waitForThenClick("div[data-testid=main-cookies-banner-container] button._snbhip0");
+      await waitForThenClick2("div[data-testid=main-cookies-banner-container] button._snbhip0");
       let check;
       while (check = document.querySelector("[data-testid=modal-container] button[aria-checked=true]:not([disabled])")) {
         check.click();
       }
-      return waitForThenClick("button[data-testid=save-btn]");
+      return waitForThenClick2("button[data-testid=save-btn]");
     }
     async optIn() {
-      return waitForThenClick("div[data-testid=main-cookies-banner-container] button._148dgdpk");
+      return waitForThenClick2("div[data-testid=main-cookies-banner-container] button._148dgdpk");
     }
     async test() {
       return await waitFor(

package/dist/addon-firefox/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Autoconsent",
-  "version": "2023.8.9",
+  "version": "2023.9.12",
   "background": {
     "scripts": [
       "background.bundle.js"

package/dist/addon-firefox/rules.json

@@ -60,6 +60,35 @@
         }
       ]
     },
+    {
+      "name": "activobank.pt",
+      "runContext": {
+        "urlPattern": "^https://(www\\.)?activobank\\.pt"
+      },
+      "prehideSelectors": [
+        "aside#cookies,.overlay-cookies"
+      ],
+      "detectCmp": [
+        {
+          "exists": "#cookies .cookies-btn"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": "#cookies #submitCookies"
+        }
+      ],
+      "optIn": [
+        {
+          "waitForThenClick": "#cookies #submitCookies"
+        }
+      ],
+      "optOut": [
+        {
+          "waitForThenClick": "#cookies #rejectCookies"
+        }
+      ]
+    },
     {
       "name": "Adroll",
       "prehideSelectors": [

package/dist/addon-mv3/content.bundle.js

@@ -502,7 +502,7 @@
       interval
     );
   }
-  async function waitForThenClick(selector, timeout = 1e4, all = false) {
+  async function waitForThenClick2(selector, timeout = 1e4, all = false) {
     await waitForElement(selector, timeout);
     return click(selector, all);
   }
@@ -889,7 +889,7 @@
         results.push(click(rule.click, rule.all));
       }
       if (rule.waitForThenClick) {
-        results.push(waitForThenClick(rule.waitForThenClick, rule.timeout, rule.all));
+        results.push(waitForThenClick2(rule.waitForThenClick, rule.timeout, rule.all));
       }
       if (rule.wait) {
         results.push(wait(rule.wait));
@@ -1140,17 +1140,17 @@
       }
       if (click("#catDetails0")) {
         click(".submit");
+        waitForThenClick("#gwt-debug-close_id", 5e3);
         return true;
       }
       if (click(".required")) {
+        waitForThenClick("#gwt-debug-close_id", 5e3);
         return true;
       }
       await this.navigateToSettings();
       click(".switch span:nth-child(1):not(.active)", true);
       click(".submit");
-      waitForElement("#gwt-debug-close_id", 3e5).then(() => {
-        click("#gwt-debug-close_id");
-      });
+      waitForThenClick("#gwt-debug-close_id", 3e5);
       return true;
     }
     async optIn() {
@@ -1609,7 +1609,7 @@
       return false;
     }
     async optIn() {
-      return waitForThenClick(".unic #unic-agree");
+      return waitForThenClick2(".unic #unic-agree");
     }
     async test() {
       await wait(1e3);
@@ -1641,14 +1641,14 @@
       return elementVisible(".cmp-root .cmp-receptacle", "any");
     }
     async optOut() {
-      if (!await waitForThenClick(".cmp-main-button:not(.cmp-main-button--primary)")) {
+      if (!await waitForThenClick2(".cmp-main-button:not(.cmp-main-button--primary)")) {
         return false;
       }
       if (!await waitForElement(".cmp-view-tab-tabs")) {
         return false;
       }
-      await waitForThenClick(".cmp-view-tab-tabs > :first-child");
-      await waitForThenClick(".cmp-view-tab-tabs > .cmp-view-tab--active:first-child");
+      await waitForThenClick2(".cmp-view-tab-tabs > :first-child");
+      await waitForThenClick2(".cmp-view-tab-tabs > .cmp-view-tab--active:first-child");
       for (const item of Array.from(document.querySelectorAll(".cmp-accordion-item"))) {
         item.querySelector(".cmp-accordion-item-title").click();
         await waitFor(() => !!item.querySelector(".cmp-accordion-item-content.cmp-active"), 10, 50);
@@ -1660,7 +1660,7 @@
       return true;
     }
     async optIn() {
-      return waitForThenClick(".cmp-main-button.cmp-main-button--primary");
+      return waitForThenClick2(".cmp-main-button.cmp-main-button--primary");
     }
     async test() {
       return document.cookie.includes("cmp-data=0");
@@ -1759,15 +1759,15 @@
       return elementVisible("div[data-testid=main-cookies-banner-container", "any");
     }
     async optOut() {
-      await waitForThenClick("div[data-testid=main-cookies-banner-container] button._snbhip0");
+      await waitForThenClick2("div[data-testid=main-cookies-banner-container] button._snbhip0");
       let check;
       while (check = document.querySelector("[data-testid=modal-container] button[aria-checked=true]:not([disabled])")) {
         check.click();
       }
-      return waitForThenClick("button[data-testid=save-btn]");
+      return waitForThenClick2("button[data-testid=save-btn]");
     }
     async optIn() {
-      return waitForThenClick("div[data-testid=main-cookies-banner-container] button._148dgdpk");
+      return waitForThenClick2("div[data-testid=main-cookies-banner-container] button._148dgdpk");
     }
     async test() {
       return await waitFor(

package/dist/addon-mv3/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Autoconsent",
-  "version": "2023.8.9",
+  "version": "2023.9.12",
   "background": {
     "service_worker": "background.bundle.js"
   },

package/dist/addon-mv3/rules.json

@@ -60,6 +60,35 @@
         }
       ]
     },
+    {
+      "name": "activobank.pt",
+      "runContext": {
+        "urlPattern": "^https://(www\\.)?activobank\\.pt"
+      },
+      "prehideSelectors": [
+        "aside#cookies,.overlay-cookies"
+      ],
+      "detectCmp": [
+        {
+          "exists": "#cookies .cookies-btn"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": "#cookies #submitCookies"
+        }
+      ],
+      "optIn": [
+        {
+          "waitForThenClick": "#cookies #submitCookies"
+        }
+      ],
+      "optOut": [
+        {
+          "waitForThenClick": "#cookies #rejectCookies"
+        }
+      ]
+    },
     {
       "name": "Adroll",
       "prehideSelectors": [

package/dist/autoconsent.cjs.js

@@ -525,7 +525,7 @@ function waitForVisible(selector, timeout = 1e4, check = "any") {
     interval
   );
 }
-async function waitForThenClick(selector, timeout = 1e4, all = false) {
+async function waitForThenClick2(selector, timeout = 1e4, all = false) {
   await waitForElement(selector, timeout);
   return click(selector, all);
 }
@@ -912,7 +912,7 @@ var AutoConsentCMP = class extends AutoConsentCMPBase {
       results.push(click(rule.click, rule.all));
     }
     if (rule.waitForThenClick) {
-      results.push(waitForThenClick(rule.waitForThenClick, rule.timeout, rule.all));
+      results.push(waitForThenClick2(rule.waitForThenClick, rule.timeout, rule.all));
     }
     if (rule.wait) {
       results.push(wait(rule.wait));
@@ -1163,17 +1163,17 @@ var TrustArcFrame = class extends AutoConsentCMPBase {
     }
     if (click("#catDetails0")) {
       click(".submit");
+      waitForThenClick("#gwt-debug-close_id", 5e3);
       return true;
     }
     if (click(".required")) {
+      waitForThenClick("#gwt-debug-close_id", 5e3);
       return true;
     }
     await this.navigateToSettings();
     click(".switch span:nth-child(1):not(.active)", true);
     click(".submit");
-    waitForElement("#gwt-debug-close_id", 3e5).then(() => {
-      click("#gwt-debug-close_id");
-    });
+    waitForThenClick("#gwt-debug-close_id", 3e5);
     return true;
   }
   async optIn() {
@@ -1632,7 +1632,7 @@ var Uniconsent = class extends AutoConsentCMPBase {
     return false;
   }
   async optIn() {
-    return waitForThenClick(".unic #unic-agree");
+    return waitForThenClick2(".unic #unic-agree");
   }
   async test() {
     await wait(1e3);
@@ -1664,14 +1664,14 @@ var Conversant = class extends AutoConsentCMPBase {
     return elementVisible(".cmp-root .cmp-receptacle", "any");
   }
   async optOut() {
-    if (!await waitForThenClick(".cmp-main-button:not(.cmp-main-button--primary)")) {
+    if (!await waitForThenClick2(".cmp-main-button:not(.cmp-main-button--primary)")) {
       return false;
     }
     if (!await waitForElement(".cmp-view-tab-tabs")) {
       return false;
     }
-    await waitForThenClick(".cmp-view-tab-tabs > :first-child");
-    await waitForThenClick(".cmp-view-tab-tabs > .cmp-view-tab--active:first-child");
+    await waitForThenClick2(".cmp-view-tab-tabs > :first-child");
+    await waitForThenClick2(".cmp-view-tab-tabs > .cmp-view-tab--active:first-child");
     for (const item of Array.from(document.querySelectorAll(".cmp-accordion-item"))) {
       item.querySelector(".cmp-accordion-item-title").click();
       await waitFor(() => !!item.querySelector(".cmp-accordion-item-content.cmp-active"), 10, 50);
@@ -1683,7 +1683,7 @@ var Conversant = class extends AutoConsentCMPBase {
     return true;
   }
   async optIn() {
-    return waitForThenClick(".cmp-main-button.cmp-main-button--primary");
+    return waitForThenClick2(".cmp-main-button.cmp-main-button--primary");
   }
   async test() {
     return document.cookie.includes("cmp-data=0");
@@ -1782,15 +1782,15 @@ var Airbnb = class extends AutoConsentCMPBase {
     return elementVisible("div[data-testid=main-cookies-banner-container", "any");
   }
   async optOut() {
-    await waitForThenClick("div[data-testid=main-cookies-banner-container] button._snbhip0");
+    await waitForThenClick2("div[data-testid=main-cookies-banner-container] button._snbhip0");
     let check;
     while (check = document.querySelector("[data-testid=modal-container] button[aria-checked=true]:not([disabled])")) {
       check.click();
     }
-    return waitForThenClick("button[data-testid=save-btn]");
+    return waitForThenClick2("button[data-testid=save-btn]");
   }
   async optIn() {
-    return waitForThenClick("div[data-testid=main-cookies-banner-container] button._148dgdpk");
+    return waitForThenClick2("div[data-testid=main-cookies-banner-container] button._148dgdpk");
   }
   async test() {
     return await waitFor(

package/dist/autoconsent.esm.js

@@ -500,7 +500,7 @@ function waitForVisible(selector, timeout = 1e4, check = "any") {
     interval
   );
 }
-async function waitForThenClick(selector, timeout = 1e4, all = false) {
+async function waitForThenClick2(selector, timeout = 1e4, all = false) {
   await waitForElement(selector, timeout);
   return click(selector, all);
 }
@@ -887,7 +887,7 @@ var AutoConsentCMP = class extends AutoConsentCMPBase {
       results.push(click(rule.click, rule.all));
     }
     if (rule.waitForThenClick) {
-      results.push(waitForThenClick(rule.waitForThenClick, rule.timeout, rule.all));
+      results.push(waitForThenClick2(rule.waitForThenClick, rule.timeout, rule.all));
     }
     if (rule.wait) {
       results.push(wait(rule.wait));
@@ -1138,17 +1138,17 @@ var TrustArcFrame = class extends AutoConsentCMPBase {
     }
     if (click("#catDetails0")) {
       click(".submit");
+      waitForThenClick("#gwt-debug-close_id", 5e3);
       return true;
     }
     if (click(".required")) {
+      waitForThenClick("#gwt-debug-close_id", 5e3);
       return true;
     }
     await this.navigateToSettings();
     click(".switch span:nth-child(1):not(.active)", true);
     click(".submit");
-    waitForElement("#gwt-debug-close_id", 3e5).then(() => {
-      click("#gwt-debug-close_id");
-    });
+    waitForThenClick("#gwt-debug-close_id", 3e5);
     return true;
   }
   async optIn() {
@@ -1607,7 +1607,7 @@ var Uniconsent = class extends AutoConsentCMPBase {
     return false;
   }
   async optIn() {
-    return waitForThenClick(".unic #unic-agree");
+    return waitForThenClick2(".unic #unic-agree");
   }
   async test() {
     await wait(1e3);
@@ -1639,14 +1639,14 @@ var Conversant = class extends AutoConsentCMPBase {
     return elementVisible(".cmp-root .cmp-receptacle", "any");
   }
   async optOut() {
-    if (!await waitForThenClick(".cmp-main-button:not(.cmp-main-button--primary)")) {
+    if (!await waitForThenClick2(".cmp-main-button:not(.cmp-main-button--primary)")) {
       return false;
     }
     if (!await waitForElement(".cmp-view-tab-tabs")) {
       return false;
     }
-    await waitForThenClick(".cmp-view-tab-tabs > :first-child");
-    await waitForThenClick(".cmp-view-tab-tabs > .cmp-view-tab--active:first-child");
+    await waitForThenClick2(".cmp-view-tab-tabs > :first-child");
+    await waitForThenClick2(".cmp-view-tab-tabs > .cmp-view-tab--active:first-child");
     for (const item of Array.from(document.querySelectorAll(".cmp-accordion-item"))) {
       item.querySelector(".cmp-accordion-item-title").click();
       await waitFor(() => !!item.querySelector(".cmp-accordion-item-content.cmp-active"), 10, 50);
@@ -1658,7 +1658,7 @@ var Conversant = class extends AutoConsentCMPBase {
     return true;
   }
   async optIn() {
-    return waitForThenClick(".cmp-main-button.cmp-main-button--primary");
+    return waitForThenClick2(".cmp-main-button.cmp-main-button--primary");
   }
   async test() {
     return document.cookie.includes("cmp-data=0");
@@ -1757,15 +1757,15 @@ var Airbnb = class extends AutoConsentCMPBase {
     return elementVisible("div[data-testid=main-cookies-banner-container", "any");
   }
   async optOut() {
-    await waitForThenClick("div[data-testid=main-cookies-banner-container] button._snbhip0");
+    await waitForThenClick2("div[data-testid=main-cookies-banner-container] button._snbhip0");
     let check;
     while (check = document.querySelector("[data-testid=modal-container] button[aria-checked=true]:not([disabled])")) {
       check.click();
     }
-    return waitForThenClick("button[data-testid=save-btn]");
+    return waitForThenClick2("button[data-testid=save-btn]");
   }
   async optIn() {
-    return waitForThenClick("div[data-testid=main-cookies-banner-container] button._148dgdpk");
+    return waitForThenClick2("div[data-testid=main-cookies-banner-container] button._148dgdpk");
   }
   async test() {
     return await waitFor(