@duckduckgo/autoconsent 10.1.0 → 10.3.0

package/ci/release-utils.js

@@ -0,0 +1,61 @@
+/**
+ * Execs a string.replace and ensures the searchRegex is found
+ * @param {string} string
+ * @param {RegExp} searchRegex - Use groupings for more complex operations
+ * @param {string} replace
+ * @returns {string}
+ * @throws {Error} - If the string does not contain the searchRegex
+ */
+function replaceInString (string, searchRegex, replace) {
+  if (!searchRegex.test(string)) {
+    const errorMsg = 'No match found in the string. Check both string and regex.'
+    console.log(errorMsg)
+    console.log(string)
+    throw new Error(errorMsg)
+  }
+  return string.replaceAll(
+    new RegExp(searchRegex.source, 'gi'),
+    replace
+  )
+}
+
+/**
+ * Execs multiple string.replace and ensures the searchRegexes are found
+ * @param {string} string
+ * @param {[searchRegex: RegExp, replace?: string][]} changes
+ * @returns {string}
+ * @throws {Error} - If the string does not contain the searchRegex
+ */
+function replaceAllInString (string, changes) {
+  let updatedFile = string
+  for (const [searchRegex, replace = ''] of changes) {
+    updatedFile = replaceInString(updatedFile, searchRegex, replace)
+  }
+  return updatedFile
+}
+
+/**
+ * Creates an html <a> tag from a url and an optional anchor text
+ * @param {string} url
+ * @param {string} [anchor]
+ * @returns {string}
+ */
+function getLink (url, anchor) {
+  return `<a href="${url}">${anchor || url}</a>`
+}
+
+/**
+ * Wraps the passed content string within a <li></li>
+ * @param {string} content
+ * @returns {string}
+ */
+function wrapInLi (content) {
+  return `<li>${content}</li>`
+}
+
+module.exports = {
+  replaceInString,
+  replaceAllInString,
+  getLink,
+  wrapInLi
+}

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

@@ -1436,14 +1436,14 @@
       return false;
     }
     async detectCmp() {
-      return this.elementExists("#onetrust-banner-sdk");
+      return this.elementExists("#onetrust-banner-sdk,#onetrust-pc-sdk");
     }
     async detectPopup() {
-      return this.elementVisible("#onetrust-banner-sdk", "all");
+      return this.elementVisible("#onetrust-banner-sdk,#onetrust-pc-sdk", "any");
     }
     async optOut() {
-      if (this.elementVisible("#onetrust-reject-all-handler,.js-reject-cookies", "any")) {
-        return this.click("#onetrust-reject-all-handler,.js-reject-cookies");
+      if (this.elementVisible("#onetrust-reject-all-handler,.ot-pc-refuse-all-handler,.js-reject-cookies", "any")) {
+        return this.click("#onetrust-reject-all-handler,.ot-pc-refuse-all-handler,.js-reject-cookies");
       }
       if (this.elementExists("#onetrust-pc-btn-handler")) {
         this.click("#onetrust-pc-btn-handler");
@@ -1460,7 +1460,7 @@
       return true;
     }
     async optIn() {
-      return this.click("#onetrust-accept-btn-handler,.js-accept-cookies");
+      return this.click("#onetrust-accept-btn-handler,#accept-recommended-btn-handler,.js-accept-cookies");
     }
     async test() {
       return await waitFor(

package/dist/addon-firefox/manifest.json

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

package/dist/addon-firefox/rules.json

@@ -5201,7 +5201,7 @@
     },
     {
       "name": "Sirdata",
-      "cosmetic": true,
+      "cosmetic": false,
       "prehideSelectors": [
         "#sd-cmp"
       ],
@@ -5222,10 +5222,10 @@
       ],
       "optOut": [
         {
-          "hide": "#sd-cmp"
-        },
-        {
-          "eval": "EVAL_SIRDATA_UNBLOCK_SCROLL"
+          "waitForThenClick": [
+            "#sd-cmp",
+            "xpath///span[contains(., 'Do not accept') or contains(., 'Acceptera inte') or contains(., 'No aceptar') or contains(., 'Ikke acceptere') or contains(., 'Nicht akzeptieren') or contains(., 'Не приемам') or contains(., 'Να μην γίνει αποδοχή') or contains(., 'Niet accepteren') or contains(., 'Nepřijímat') or contains(., 'Nie akceptuj') or contains(., 'Nu acceptați') or contains(., 'Não aceitar') or contains(., 'Continuer sans accepter') or contains(., 'Non accettare') or contains(., 'Nem fogad el')]"
+          ]
         }
       ]
     },

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

@@ -1436,14 +1436,14 @@
       return false;
     }
     async detectCmp() {
-      return this.elementExists("#onetrust-banner-sdk");
+      return this.elementExists("#onetrust-banner-sdk,#onetrust-pc-sdk");
     }
     async detectPopup() {
-      return this.elementVisible("#onetrust-banner-sdk", "all");
+      return this.elementVisible("#onetrust-banner-sdk,#onetrust-pc-sdk", "any");
     }
     async optOut() {
-      if (this.elementVisible("#onetrust-reject-all-handler,.js-reject-cookies", "any")) {
-        return this.click("#onetrust-reject-all-handler,.js-reject-cookies");
+      if (this.elementVisible("#onetrust-reject-all-handler,.ot-pc-refuse-all-handler,.js-reject-cookies", "any")) {
+        return this.click("#onetrust-reject-all-handler,.ot-pc-refuse-all-handler,.js-reject-cookies");
       }
       if (this.elementExists("#onetrust-pc-btn-handler")) {
         this.click("#onetrust-pc-btn-handler");
@@ -1460,7 +1460,7 @@
       return true;
     }
     async optIn() {
-      return this.click("#onetrust-accept-btn-handler,.js-accept-cookies");
+      return this.click("#onetrust-accept-btn-handler,#accept-recommended-btn-handler,.js-accept-cookies");
     }
     async test() {
       return await waitFor(

package/dist/addon-mv3/manifest.json

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

package/dist/addon-mv3/rules.json

@@ -5201,7 +5201,7 @@
     },
     {
       "name": "Sirdata",
-      "cosmetic": true,
+      "cosmetic": false,
       "prehideSelectors": [
         "#sd-cmp"
       ],
@@ -5222,10 +5222,10 @@
       ],
       "optOut": [
         {
-          "hide": "#sd-cmp"
-        },
-        {
-          "eval": "EVAL_SIRDATA_UNBLOCK_SCROLL"
+          "waitForThenClick": [
+            "#sd-cmp",
+            "xpath///span[contains(., 'Do not accept') or contains(., 'Acceptera inte') or contains(., 'No aceptar') or contains(., 'Ikke acceptere') or contains(., 'Nicht akzeptieren') or contains(., 'Не приемам') or contains(., 'Να μην γίνει αποδοχή') or contains(., 'Niet accepteren') or contains(., 'Nepřijímat') or contains(., 'Nie akceptuj') or contains(., 'Nu acceptați') or contains(., 'Não aceitar') or contains(., 'Continuer sans accepter') or contains(., 'Non accettare') or contains(., 'Nem fogad el')]"
+          ]
         }
       ]
     },

package/dist/autoconsent.cjs.js

@@ -1459,14 +1459,14 @@ var Onetrust = class extends AutoConsentCMPBase {
     return false;
   }
   async detectCmp() {
-    return this.elementExists("#onetrust-banner-sdk");
+    return this.elementExists("#onetrust-banner-sdk,#onetrust-pc-sdk");
   }
   async detectPopup() {
-    return this.elementVisible("#onetrust-banner-sdk", "all");
+    return this.elementVisible("#onetrust-banner-sdk,#onetrust-pc-sdk", "any");
   }
   async optOut() {
-    if (this.elementVisible("#onetrust-reject-all-handler,.js-reject-cookies", "any")) {
-      return this.click("#onetrust-reject-all-handler,.js-reject-cookies");
+    if (this.elementVisible("#onetrust-reject-all-handler,.ot-pc-refuse-all-handler,.js-reject-cookies", "any")) {
+      return this.click("#onetrust-reject-all-handler,.ot-pc-refuse-all-handler,.js-reject-cookies");
     }
     if (this.elementExists("#onetrust-pc-btn-handler")) {
       this.click("#onetrust-pc-btn-handler");
@@ -1483,7 +1483,7 @@ var Onetrust = class extends AutoConsentCMPBase {
     return true;
   }
   async optIn() {
-    return this.click("#onetrust-accept-btn-handler,.js-accept-cookies");
+    return this.click("#onetrust-accept-btn-handler,#accept-recommended-btn-handler,.js-accept-cookies");
   }
   async test() {
     return await waitFor(

package/dist/autoconsent.esm.js

@@ -1434,14 +1434,14 @@ var Onetrust = class extends AutoConsentCMPBase {
     return false;
   }
   async detectCmp() {
-    return this.elementExists("#onetrust-banner-sdk");
+    return this.elementExists("#onetrust-banner-sdk,#onetrust-pc-sdk");
   }
   async detectPopup() {
-    return this.elementVisible("#onetrust-banner-sdk", "all");
+    return this.elementVisible("#onetrust-banner-sdk,#onetrust-pc-sdk", "any");
   }
   async optOut() {
-    if (this.elementVisible("#onetrust-reject-all-handler,.js-reject-cookies", "any")) {
-      return this.click("#onetrust-reject-all-handler,.js-reject-cookies");
+    if (this.elementVisible("#onetrust-reject-all-handler,.ot-pc-refuse-all-handler,.js-reject-cookies", "any")) {
+      return this.click("#onetrust-reject-all-handler,.ot-pc-refuse-all-handler,.js-reject-cookies");
     }
     if (this.elementExists("#onetrust-pc-btn-handler")) {
       this.click("#onetrust-pc-btn-handler");
@@ -1458,7 +1458,7 @@ var Onetrust = class extends AutoConsentCMPBase {
     return true;
   }
   async optIn() {
-    return this.click("#onetrust-accept-btn-handler,.js-accept-cookies");
+    return this.click("#onetrust-accept-btn-handler,#accept-recommended-btn-handler,.js-accept-cookies");
   }
   async test() {
     return await waitFor(