@duckduckgo/autoconsent 9.5.0 → 9.6.0

package/dist/autoconsent.unit.js

@@ -2070,8 +2070,14 @@
       }
       return foundCMPs;
     }
+    /**
+     * Detect if a CMP has a popup open. Fullfils with the CMP if a popup is open, otherwise rejects.
+     */
     async detectPopup(cmp) {
-      const isOpen = await this.waitForPopup(cmp);
+      const isOpen = await this.waitForPopup(cmp).catch((error) => {
+        this.config.logs.errors && console.warn(`error waiting for a popup for ${cmp.name}`, error);
+        return false;
+      });
       if (isOpen) {
         this.updateState({ detectedPopups: this.state.detectedPopups.concat([cmp.name]) });
         this.sendContentMessage({
@@ -2079,15 +2085,16 @@
           cmp: cmp.name,
           url: location.href
         });
+        return cmp;
       }
-      return cmp;
+      throw new Error("Popup is not shown");
     }
+    /**
+     * Detect if any of the CMPs has a popup open. Returns a list of CMPs with open popups.
+     */
     async detectPopups(cmps, onFirstPopupAppears) {
       const tasks = cmps.map(
-        (cmp) => this.detectPopup(cmp).catch((error) => {
-          this.config.logs.errors && console.warn(`error waiting for a popup for ${cmp.name}`, error);
-          throw error;
-        })
+        (cmp) => this.detectPopup(cmp)
       );
       await Promise.any(tasks).then((cmp) => {
         onFirstPopupAppears(cmp);
@@ -6599,26 +6606,32 @@
         urlPattern: "^https://www\\.reddit\\.com/"
       },
       prehideSelectors: [
-        'section:has(a[href^="https://www.reddit.com/policies/cookies"])'
+        "[bundlename=reddit_cookie_banner]"
       ],
       detectCmp: [
         {
-          exists: 'section:has(a[href^="https://www.reddit.com/policies/cookies"])'
+          exists: "reddit-cookie-banner"
         }
       ],
       detectPopup: [
         {
-          visible: 'section:has(a[href^="https://www.reddit.com/policies/cookies"])'
+          visible: "reddit-cookie-banner"
         }
       ],
       optIn: [
         {
-          waitForThenClick: `section:has(a[href^="https://www.reddit.com/policies/cookies"]) section[class^='_'] > section:first-child form button`
+          waitForThenClick: [
+            "reddit-cookie-banner",
+            "#accept-all-cookies-button > button"
+          ]
         }
       ],
       optOut: [
         {
-          waitForThenClick: `section:has(a[href^="https://www.reddit.com/policies/cookies"]) section[class^='_'] > section:last-child form button`
+          waitForThenClick: [
+            "reddit-cookie-banner",
+            "#reject-nonessential-cookies-button > button"
+          ]
         }
       ],
       test: [
@@ -7008,11 +7021,11 @@
     {
       name: "Tealium",
       prehideSelectors: [
-        "#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs,#consent-layer"
+        "#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs,#__tealiumImplicitmodal,#consent-layer"
       ],
       detectCmp: [
         {
-          exists: "#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *"
+          exists: "#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *,#__tealiumImplicitmodal *"
         },
         {
           eval: "EVAL_TEALIUM_0"
@@ -7020,7 +7033,7 @@
       ],
       detectPopup: [
         {
-          visible: "#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *",
+          visible: "#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *,#__tealiumImplicitmodal *",
           check: "any"
         }
       ],
@@ -7032,7 +7045,7 @@
           eval: "EVAL_TEALIUM_DONOTSELL"
         },
         {
-          hide: "#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs"
+          hide: "#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs,#__tealiumImplicitmodal"
         },
         {
           waitForThenClick: "#cm-acceptNone,.js-accept-essential-cookies",
@@ -7996,6 +8009,42 @@
         }
       ]
     },
+    {
+      name: "webflow",
+      vendorUrl: "https://webflow.com/",
+      prehideSelectors: [
+        ".fs-cc-components"
+      ],
+      detectCmp: [
+        {
+          exists: ".fs-cc-components"
+        }
+      ],
+      detectPopup: [
+        {
+          visible: ".fs-cc-components"
+        },
+        {
+          visible: "[fs-cc=banner]"
+        }
+      ],
+      optIn: [
+        {
+          wait: 500
+        },
+        {
+          waitForThenClick: "[fs-cc=banner] [fs-cc=allow]"
+        }
+      ],
+      optOut: [
+        {
+          wait: 500
+        },
+        {
+          waitForThenClick: "[fs-cc=banner] [fs-cc=deny]"
+        }
+      ]
+    },
     {
       name: "wetransfer.com",
       detectCmp: [

package/lib/web.ts

@@ -223,8 +223,14 @@ export default class AutoConsent {
     return foundCMPs;
   }
 
+  /**
+   * Detect if a CMP has a popup open. Fullfils with the CMP if a popup is open, otherwise rejects.
+   */
   async detectPopup(cmp: AutoCMP): Promise<AutoCMP> {
-    const isOpen = await this.waitForPopup(cmp);
+    const isOpen = await this.waitForPopup(cmp).catch(error => {
+      this.config.logs.errors && console.warn(`error waiting for a popup for ${cmp.name}`, error);
+      return false;
+    });
 
     if (isOpen) {
       this.updateState({ detectedPopups: this.state.detectedPopups.concat([cmp.name]) });
@@ -233,21 +239,18 @@ export default class AutoConsent {
         cmp: cmp.name,
         url: location.href,
       }); // notify the browser
+      return cmp;
     }
-
-    return cmp
+    throw new Error('Popup is not shown');
   }
 
+  /**
+   * Detect if any of the CMPs has a popup open. Returns a list of CMPs with open popups.
+   */
   async detectPopups(cmps: AutoCMP[], onFirstPopupAppears: (cmp: AutoCMP) => Promise<unknown>) {
     const tasks = cmps.map(
       cmp => this.detectPopup(cmp)
-        // Handle errors immediately and propagate the error to next handler: Promise.allSettled
-        .catch(error => {
-          this.config.logs.errors && console.warn(`error waiting for a popup for ${cmp.name}`, error)
-
-          throw error
-        })
-    )
+    );
 
     await Promise.any(tasks)
       .then(cmp => {

package/package.json

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

package/rules/autoconsent/reddit.json

@@ -3,18 +3,32 @@
   "runContext": {
     "urlPattern": "^https://www\\.reddit\\.com/"
   },
-  "prehideSelectors": ["section:has(a[href^=\"https://www.reddit.com/policies/cookies\"])"],
+  "prehideSelectors": ["[bundlename=reddit_cookie_banner]"],
   "detectCmp": [
-    { "exists": "section:has(a[href^=\"https://www.reddit.com/policies/cookies\"])" }
+    {
+      "exists": "reddit-cookie-banner"
+    }
   ],
   "detectPopup": [
-    { "visible": "section:has(a[href^=\"https://www.reddit.com/policies/cookies\"])" }
+    {
+      "visible": "reddit-cookie-banner"
+    }
   ],
   "optIn": [
-    { "waitForThenClick": "section:has(a[href^=\"https://www.reddit.com/policies/cookies\"]) section[class^='_'] > section:first-child form button" }
+    {
+      "waitForThenClick": [
+        "reddit-cookie-banner",
+        "#accept-all-cookies-button > button"
+      ]
+    }
   ],
   "optOut": [
-    { "waitForThenClick": "section:has(a[href^=\"https://www.reddit.com/policies/cookies\"]) section[class^='_'] > section:last-child form button" }
+    {
+      "waitForThenClick": [
+        "reddit-cookie-banner",
+        "#reject-nonessential-cookies-button > button"
+      ]
+    }
   ],
   "test": [
     {"eval": "EVAL_REDDIT_0"}

package/rules/autoconsent/tealium.json

@@ -1,17 +1,17 @@
 {
     "name": "Tealium",
-    "prehideSelectors": ["#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs,#consent-layer"],
+    "prehideSelectors": ["#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs,#__tealiumImplicitmodal,#consent-layer"],
     "detectCmp": [
-      { "exists": "#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *" },
+      { "exists": "#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *,#__tealiumImplicitmodal *" },
       { "eval": "EVAL_TEALIUM_0" }
     ],
     "detectPopup": [
-      { "visible": "#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *", "check": "any" }
+      { "visible": "#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *,#__tealiumImplicitmodal *", "check": "any" }
     ],
     "optOut": [
       { "eval": "EVAL_TEALIUM_1" },
       { "eval": "EVAL_TEALIUM_DONOTSELL" },
-      { "hide": "#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs" },
+      { "hide": "#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs,#__tealiumImplicitmodal" },
       {
         "waitForThenClick": "#cm-acceptNone,.js-accept-essential-cookies",
         "timeout": 1000,

package/rules/autoconsent/webflow.json

@@ -0,0 +1,34 @@
+{
+  "name": "webflow",
+  "vendorUrl": "https://webflow.com/",
+  "prehideSelectors": [".fs-cc-components"],
+  "detectCmp": [
+    {
+      "exists": ".fs-cc-components"
+    }
+  ],
+  "detectPopup": [
+    {
+      "visible": ".fs-cc-components"
+    },
+    {
+      "visible": "[fs-cc=banner]"
+    }
+  ],
+  "optIn": [
+    {
+      "wait": 500
+    },
+    {
+      "waitForThenClick": "[fs-cc=banner] [fs-cc=allow]"
+    }
+  ],
+  "optOut": [
+    {
+      "wait": 500
+    },
+    {
+      "waitForThenClick": "[fs-cc=banner] [fs-cc=deny]"
+    }
+  ]
+}

package/rules/rules.json

@@ -4312,26 +4312,32 @@
         "urlPattern": "^https://www\\.reddit\\.com/"
       },
       "prehideSelectors": [
-        "section:has(a[href^=\"https://www.reddit.com/policies/cookies\"])"
+        "[bundlename=reddit_cookie_banner]"
       ],
       "detectCmp": [
         {
-          "exists": "section:has(a[href^=\"https://www.reddit.com/policies/cookies\"])"
+          "exists": "reddit-cookie-banner"
         }
       ],
       "detectPopup": [
         {
-          "visible": "section:has(a[href^=\"https://www.reddit.com/policies/cookies\"])"
+          "visible": "reddit-cookie-banner"
         }
       ],
       "optIn": [
         {
-          "waitForThenClick": "section:has(a[href^=\"https://www.reddit.com/policies/cookies\"]) section[class^='_'] > section:first-child form button"
+          "waitForThenClick": [
+            "reddit-cookie-banner",
+            "#accept-all-cookies-button > button"
+          ]
         }
       ],
       "optOut": [
         {
-          "waitForThenClick": "section:has(a[href^=\"https://www.reddit.com/policies/cookies\"]) section[class^='_'] > section:last-child form button"
+          "waitForThenClick": [
+            "reddit-cookie-banner",
+            "#reject-nonessential-cookies-button > button"
+          ]
         }
       ],
       "test": [
@@ -4721,11 +4727,11 @@
     {
       "name": "Tealium",
       "prehideSelectors": [
-        "#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs,#consent-layer"
+        "#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs,#__tealiumImplicitmodal,#consent-layer"
       ],
       "detectCmp": [
         {
-          "exists": "#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *"
+          "exists": "#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *,#__tealiumImplicitmodal *"
         },
         {
           "eval": "EVAL_TEALIUM_0"
@@ -4733,7 +4739,7 @@
       ],
       "detectPopup": [
         {
-          "visible": "#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *",
+          "visible": "#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *,#__tealiumImplicitmodal *",
           "check": "any"
         }
       ],
@@ -4745,7 +4751,7 @@
           "eval": "EVAL_TEALIUM_DONOTSELL"
         },
         {
-          "hide": "#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs"
+          "hide": "#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs,#__tealiumImplicitmodal"
         },
         {
           "waitForThenClick": "#cm-acceptNone,.js-accept-essential-cookies",
@@ -5709,6 +5715,42 @@
         }
       ]
     },
+    {
+      "name": "webflow",
+      "vendorUrl": "https://webflow.com/",
+      "prehideSelectors": [
+        ".fs-cc-components"
+      ],
+      "detectCmp": [
+        {
+          "exists": ".fs-cc-components"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": ".fs-cc-components"
+        },
+        {
+          "visible": "[fs-cc=banner]"
+        }
+      ],
+      "optIn": [
+        {
+          "wait": 500
+        },
+        {
+          "waitForThenClick": "[fs-cc=banner] [fs-cc=allow]"
+        }
+      ],
+      "optOut": [
+        {
+          "wait": 500
+        },
+        {
+          "waitForThenClick": "[fs-cc=banner] [fs-cc=deny]"
+        }
+      ]
+    },
     {
       "name": "wetransfer.com",
       "detectCmp": [

package/tests/webflow.spec.ts

@@ -0,0 +1,7 @@
+import generateCMPTests from "../playwright/runner";
+
+generateCMPTests('webflow', [
+  'https://www.nexaas.com/',
+  'https://www.boltive.com/',
+  'https://www.hk.co/',
+]);