@duckduckgo/autoconsent 4.0.0 → 4.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duckduckgo/autoconsent",
-  "version": "4.0.0",
+  "version": "4.1.1",
   "description": "",
   "main": "dist/autoconsent.cjs.js",
   "module": "dist/autoconsent.esm.js",
@@ -29,14 +29,15 @@
   "license": "MPL-2.0",
   "devDependencies": {
     "@playwright/test": "^1.17.1",
-    "@rollup/plugin-json": "^5.0.2",
+    "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-typescript": "^10.0.1",
     "@types/chai": "^4.3.1",
-    "@types/chrome": "^0.0.204",
+    "@types/chrome": "^0.0.206",
     "@types/mocha": "^10.0.1",
     "@typescript-eslint/eslint-plugin": "^5.42.1",
     "@typescript-eslint/parser": "^5.42.1",
     "auto": "^10.37.6",
+    "bulma": "^0.9.4",
     "chai": "^4.2.0",
     "eslint": "^8.27.0",
     "eslint-plugin-json": "^3.1.0",

package/playwright/runner.ts

@@ -88,6 +88,7 @@ export function generateTest(
               disabledCmps: [],
               enablePrehide: true,
               detectRetries: 20,
+              enableCosmeticRules: true,
             })} })`);
             break;
           }

package/rollup.config.js

@@ -40,15 +40,17 @@ export default [{
   }],
   plugins: [
     typescript(),
-    terser(),
     copy({
       targets: [
         {
-          src: ['./addon/icons', './rules/rules.json'],
+          src: [
+            './addon/icons', 
+            './rules/rules.json'
+          ],
           dest: ['./dist/addon-firefox/', './dist/addon-mv3/']
         },
         {
-          src: ['./addon/popup.html'],
+          src: ['./addon/popup.html', './addon/devtools'],
           dest: ['./dist/addon-mv3/']
         },
         {
@@ -61,6 +63,10 @@ export default [{
           dest: './dist/addon-firefox',
           rename: 'manifest.json',
         },
+        {
+          src: './node_modules/bulma/css/bulma.min.css',
+          dest: './dist/addon-mv3/devtools/'
+        }
       ]
     })
   ]
@@ -75,7 +81,6 @@ export default [{
   }],
   plugins: [
     typescript(),
-    terser(),
   ],
 }, {
   input: './addon/popup.ts',
@@ -85,6 +90,14 @@ export default [{
   }],
   plugins: [
     typescript(),
-    terser(),
+  ],
+}, {
+  input: './addon/devtools/panel.ts',
+  output: [{
+    file: './dist/addon-mv3/devtools/panel.js',
+    format: 'iife',
+  }],
+  plugins: [
+    typescript(),
   ],
 }];

package/rules/autoconsent/ausopen.json

@@ -1,8 +1,8 @@
 {
   "name": "ausopen.com",
-  "isHidingRule": true,
+  "cosmetic": true,
   "detectCmp": [{ "exists": ".gdpr-popup__message" }],
   "detectPopup": [{ "visible": ".gdpr-popup__message" }],
   "optOut": [{ "hide": [".gdpr-popup__message"]}],
-  "optIn": [{ "click": [".gdpr-popup__message button"]}]
+  "optIn": [{ "click": ".gdpr-popup__message button"}]
 }

package/rules/autoconsent/baden-wuerttemberg-de.json

@@ -1,6 +1,7 @@
 {
   "name": "baden-wuerttemberg.de",
   "prehideSelectors": [".cookie-alert.t-dark"],
+  "cosmetic": true,
   "detectCmp": [{ "exists": ".cookie-alert.t-dark" }],
   "detectPopup": [{ "visible": ".cookie-alert.t-dark" }],
   "optIn": [

package/rules/autoconsent/cc-banner.json

@@ -1,5 +1,6 @@
 {
   "name": "cc_banner",
+  "cosmetic": true,
   "prehideSelectors": [".cc_banner-wrapper"],
   "detectCmp": [{ "exists": ".cc_banner-wrapper" }],
   "detectPopup": [{ "visible": ".cc_banner" }],

package/rules/autoconsent/complianz-notice.json

@@ -1,6 +1,7 @@
 {
     "name": "Complianz notice",
     "prehideSelectors": [".cc-type-info[aria-describedby=\"cookieconsent:desc\"]"],
+    "cosmetic": true,
     "detectCmp": [{ "exists": ".cc-type-info[aria-describedby=\"cookieconsent:desc\"]" }],
     "detectPopup": [{ "visible": ".cc-type-info[aria-describedby=\"cookieconsent:desc\"]" }],
     "optIn": [

package/rules/autoconsent/cookie-notice.json

@@ -1,10 +1,11 @@
 {
   "name": "cookie-notice",
   "prehideSelectors": ["#cookie-notice"],
+  "cosmetic": true,
   "detectCmp": [
     { "visible": "#cookie-notice .cookie-notice-container" }
   ],
   "detectPopup": [{ "visible": "#cookie-notice" }],
-  "optIn": [{ "click": ["#cn-accept-cookie"] }],
+  "optIn": [{ "click": "#cn-accept-cookie" }],
   "optOut": [{ "hide": ["#cookie-notice"] }]
 }

package/rules/autoconsent/dsgvo.json

@@ -2,6 +2,7 @@
   "name": "WP DSGVO Tools",
   "link": "https://wordpress.org/plugins/shapepress-dsgvo/",
   "prehideSelectors": [".sp-dsgvo"],
+  "cosmetic": true,
   "detectCmp": [{ "exists": ".sp-dsgvo.sp-dsgvo-popup-overlay" }],
   "detectPopup": [{ "visible": ".sp-dsgvo.sp-dsgvo-popup-overlay", "check": "any" }],
   "optIn": [

package/rules/autoconsent/eu-cookie-compliance.json

@@ -1,7 +1,7 @@
 {
   "name": "eu-cookie-compliance-banner",
   "detectCmp": [{ "exists": ".eu-cookie-compliance-banner-info" }],
-  "detectPopup": [{ "visible": ".eu-cookie-compliance-banner-info" }],
+  "detectPopup": [{ "exists": ".eu-cookie-compliance-popup-open" }],
   "optIn": [{ "click": ".agree-button" }],
   "optOut": [
     { "click": ".decline-button,.eu-cookie-compliance-save-preferences-button", "optional": true },

package/rules/autoconsent/eu-cookie-law.json

@@ -1,6 +1,7 @@
 {
   "name": "EU Cookie Law",
   "prehideSelectors": [".pea_cook_wrapper,.pea_cook_more_info_popover"],
+  "cosmetic": true,
   "detectCmp": [{ "exists": ".pea_cook_wrapper" }],
   "detectPopup": [
     { "wait": 500 },

package/rules/autoconsent/ezoic.json

@@ -8,6 +8,7 @@
     { "eval": "ezCMP.handleAcceptAllClick()", "optional": true }
   ],
   "optOut": [
+    { "wait": 500 },
     { "click": "#ez-manage-settings" },
     { "waitFor": "#ez-cookie-dialog input[type=checkbox]" },
     { "click": "#ez-cookie-dialog input[type=checkbox][checked]", "all": true },

package/rules/autoconsent/generic-cosmetic.json

@@ -0,0 +1,9 @@
+{
+  "name": "generic-cosmetic",
+  "cosmetic": true,
+  "prehideSelectors": ["#js-cookie-banner,.js-cookie-banner,.cookie-banner,#cookie-banner"],
+  "detectCmp": [{ "exists": "#js-cookie-banner,.js-cookie-banner,.cookie-banner,#cookie-banner" }],
+  "detectPopup": [{ "visible": "#js-cookie-banner,.js-cookie-banner,.cookie-banner,#cookie-banner" }],
+  "optIn": [],
+  "optOut": [{ "hide": ["#js-cookie-banner,.js-cookie-banner,.cookie-banner,#cookie-banner"] }]
+}

package/rules/autoconsent/indeed-com.json

@@ -0,0 +1,9 @@
+{
+  "name": "indeed.com",
+  "cosmetic": true,
+  "prehideSelectors": ["#CookiePrivacyNotice"],
+  "detectCmp": [{ "exists": "#CookiePrivacyNotice" }],
+  "detectPopup": [{ "visible": "#CookiePrivacyNotice" }],
+  "optIn": [{ "click": "#CookiePrivacyNotice button[data-gnav-element-name=CookiePrivacyNoticeOk]" }],
+  "optOut": [{ "hide": ["#CookiePrivacyNotice"] }]
+}

package/rules/autoconsent/jquery-cookiebar.json

@@ -2,6 +2,7 @@
   "name": "jquery.cookieBar",
   "comment": "https://github.com/kovarp/jquery.cookieBar",
   "prehideSelectors": [".cookie-bar"],
+  "cosmetic": true,
   "detectCmp": [{ "exists": ".cookie-bar .cookie-bar__message,.cookie-bar .cookie-bar__buttons" }],
   "detectPopup": [{
     "visible": ".cookie-bar .cookie-bar__message,.cookie-bar .cookie-bar__buttons",

package/rules/autoconsent/marksandspencer.json

@@ -1,8 +1,8 @@
 {
   "name": "marksandspencer.com",
-  "isHidingRule": true,
+  "cosmetic": true,
   "detectCmp": [{ "exists": ".navigation-cookiebbanner" }],
   "detectPopup": [{ "visible": ".navigation-cookiebbanner" }],
   "optOut": [{ "hide": [".navigation-cookiebbanner"]}],
-  "optIn": [{ "click": [".navigation-cookiebbanner__submit"]}]
+  "optIn": [{ "click": ".navigation-cookiebbanner__submit"}]
 }

package/rules/autoconsent/notice-cookie.json

@@ -1,6 +1,7 @@
 {
   "name": "notice-cookie",
   "prehideSelectors": [".button--notice"],
+  "cosmetic": true,
   "detectCmp": [{ "exists": ".notice--cookie" }],
   "detectPopup": [{ "visible": ".notice--cookie" }],
   "optIn": [{ "click": ".button--notice" }],

package/rules/autoconsent/osano.json

@@ -1,6 +1,7 @@
 {
     "name": "osano",
     "prehideSelectors": [".osano-cm-window"],
+    "cosmetic": true,
     "detectCmp": [{ "exists": ".osano-cm-window" }],
     "detectPopup": [{ "visible": ".osano-cm-dialog" }],
     "optIn": [{

package/rules/autoconsent/pornhub.json

@@ -0,0 +1,12 @@
+{
+  "name": "pornhub.com",
+  "runContext": {
+    "urlPattern": "^https://(www\\.)?pornhub\\.com/"
+  },
+  "cosmetic": true,
+  "prehideSelectors": [".cookiesBanner"],
+  "detectCmp": [{ "exists": ".cookiesBanner" }],
+  "detectPopup": [{ "visible": ".cookiesBanner" }],
+  "optIn": [{ "click": ".cookiesBanner .okButton" }],
+  "optOut": [{ "hide": [".cookiesBanner"] }]
+}

package/rules/autoconsent/testcmp-cosmetic.json

@@ -0,0 +1,18 @@
+{
+    "name": "Test page cosmetic CMP",
+    "cosmetic": true,
+    "prehideSelectors": ["#privacy-test-page-cmp-test-prehide"],
+    "detectCmp": [{ "exists": "#privacy-test-page-cmp-test-banner" }],
+    "detectPopup": [{ "visible": "#privacy-test-page-cmp-test-banner" }],
+    "optIn": [
+      { "waitFor": "#accept-all" },
+      { "click": "#accept-all" }
+    ],
+    "optOut": [
+      { "hide": ["#privacy-test-page-cmp-test-banner"] }
+    ],
+    "test": [
+      { "wait": 500 },
+      { "eval": "window.results.results[0] === 'banner_hidden'" }
+    ]
+  }

package/rules/autoconsent/uk-cookie-consent.json

@@ -1,6 +1,7 @@
 {
   "name": "UK Cookie Consent",
   "prehideSelectors": ["#catapult-cookie-bar"],
+  "cosmetic": true,
   "detectCmp": [{ "exists": "#catapult-cookie-bar" }],
   "detectPopup": [{ "exists": ".has-cookie-bar #catapult-cookie-bar" }],
   "optIn": [

package/rules/autoconsent/xnxx-com.json

@@ -0,0 +1,9 @@
+{
+  "name": "xnxx-com",
+  "cosmetic": true,
+  "prehideSelectors": ["#cookies-use-alert"],
+  "detectCmp": [{ "exists": "#cookies-use-alert" }],
+  "detectPopup": [{ "visible": "#cookies-use-alert" }],
+  "optIn": [{ "click": "#cookies-use-alert .close" }],
+  "optOut": [{ "hide": ["#cookies-use-alert"] }]
+}

package/rules/rules.json

@@ -169,7 +169,7 @@
     },
     {
       "name": "ausopen.com",
-      "isHidingRule": true,
+      "cosmetic": true,
       "detectCmp": [
         {
           "exists": ".gdpr-popup__message"
@@ -189,9 +189,7 @@
       ],
       "optIn": [
         {
-          "click": [
-            ".gdpr-popup__message button"
-          ]
+          "click": ".gdpr-popup__message button"
         }
       ]
     },
@@ -277,6 +275,7 @@
       "prehideSelectors": [
         ".cookie-alert.t-dark"
       ],
+      "cosmetic": true,
       "detectCmp": [
         {
           "exists": ".cookie-alert.t-dark"
@@ -419,6 +418,7 @@
     },
     {
       "name": "cc_banner",
+      "cosmetic": true,
       "prehideSelectors": [
         ".cc_banner-wrapper"
       ],
@@ -570,6 +570,7 @@
       "prehideSelectors": [
         ".cc-type-info[aria-describedby=\"cookieconsent:desc\"]"
       ],
+      "cosmetic": true,
       "detectCmp": [
         {
           "exists": ".cc-type-info[aria-describedby=\"cookieconsent:desc\"]"
@@ -693,6 +694,7 @@
       "prehideSelectors": [
         "#cookie-notice"
       ],
+      "cosmetic": true,
       "detectCmp": [
         {
           "visible": "#cookie-notice .cookie-notice-container"
@@ -705,9 +707,7 @@
       ],
       "optIn": [
         {
-          "click": [
-            "#cn-accept-cookie"
-          ]
+          "click": "#cn-accept-cookie"
         }
       ],
       "optOut": [
@@ -957,6 +957,7 @@
       "prehideSelectors": [
         ".sp-dsgvo"
       ],
+      "cosmetic": true,
       "detectCmp": [
         {
           "exists": ".sp-dsgvo.sp-dsgvo-popup-overlay"
@@ -1070,7 +1071,7 @@
       ],
       "detectPopup": [
         {
-          "visible": ".eu-cookie-compliance-banner-info"
+          "exists": ".eu-cookie-compliance-popup-open"
         }
       ],
       "optIn": [
@@ -1101,6 +1102,7 @@
       "prehideSelectors": [
         ".pea_cook_wrapper,.pea_cook_more_info_popover"
       ],
+      "cosmetic": true,
       "detectCmp": [
         {
           "exists": ".pea_cook_wrapper"
@@ -1158,6 +1160,9 @@
         }
       ],
       "optOut": [
+        {
+          "wait": 500
+        },
         {
           "click": "#ez-manage-settings"
         },
@@ -1250,6 +1255,31 @@
         }
       ]
     },
+    {
+      "name": "generic-cosmetic",
+      "cosmetic": true,
+      "prehideSelectors": [
+        "#js-cookie-banner,.js-cookie-banner,.cookie-banner,#cookie-banner"
+      ],
+      "detectCmp": [
+        {
+          "exists": "#js-cookie-banner,.js-cookie-banner,.cookie-banner,#cookie-banner"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": "#js-cookie-banner,.js-cookie-banner,.cookie-banner,#cookie-banner"
+        }
+      ],
+      "optIn": [],
+      "optOut": [
+        {
+          "hide": [
+            "#js-cookie-banner,.js-cookie-banner,.cookie-banner,#cookie-banner"
+          ]
+        }
+      ]
+    },
     {
       "name": "google-consent-standalone",
       "prehideSelectors": [],
@@ -1409,6 +1439,35 @@
         }
       ]
     },
+    {
+      "name": "indeed.com",
+      "cosmetic": true,
+      "prehideSelectors": [
+        "#CookiePrivacyNotice"
+      ],
+      "detectCmp": [
+        {
+          "exists": "#CookiePrivacyNotice"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": "#CookiePrivacyNotice"
+        }
+      ],
+      "optIn": [
+        {
+          "click": "#CookiePrivacyNotice button[data-gnav-element-name=CookiePrivacyNoticeOk]"
+        }
+      ],
+      "optOut": [
+        {
+          "hide": [
+            "#CookiePrivacyNotice"
+          ]
+        }
+      ]
+    },
     {
       "name": "ionos.de",
       "prehideSelectors": [
@@ -1519,6 +1578,7 @@
       "prehideSelectors": [
         ".cookie-bar"
       ],
+      "cosmetic": true,
       "detectCmp": [
         {
           "exists": ".cookie-bar .cookie-bar__message,.cookie-bar .cookie-bar__buttons"
@@ -1598,7 +1658,7 @@
     },
     {
       "name": "marksandspencer.com",
-      "isHidingRule": true,
+      "cosmetic": true,
       "detectCmp": [
         {
           "exists": ".navigation-cookiebbanner"
@@ -1618,9 +1678,7 @@
       ],
       "optIn": [
         {
-          "click": [
-            ".navigation-cookiebbanner__submit"
-          ]
+          "click": ".navigation-cookiebbanner__submit"
         }
       ]
     },
@@ -1857,32 +1915,6 @@
         }
       ]
     },
-    {
-      "name": "motor-talk.de",
-      "prehideSelectors": [
-        ".mt-cc-bnnr__wrapper"
-      ],
-      "detectCmp": [
-        {
-          "exists": ".mt-cc-bnnr"
-        }
-      ],
-      "detectPopup": [
-        {
-          "visible": ".mt-cc-bnnr__wrapper"
-        }
-      ],
-      "optIn": [
-        {
-          "click": ".mt-cc-bnnr__button-main"
-        }
-      ],
-      "optOut": [
-        {
-          "click": ".mt-cc-bnnr__decline-link"
-        }
-      ]
-    },
     {
       "name": "national-lottery.co.uk",
       "detectCmp": [
@@ -1973,6 +2005,7 @@
       "prehideSelectors": [
         ".button--notice"
       ],
+      "cosmetic": true,
       "detectCmp": [
         {
           "exists": ".notice--cookie"
@@ -2027,6 +2060,7 @@
       "prehideSelectors": [
         ".osano-cm-window"
       ],
+      "cosmetic": true,
       "detectCmp": [
         {
           "exists": ".osano-cm-window"
@@ -2114,6 +2148,38 @@
         }
       ]
     },
+    {
+      "name": "pornhub.com",
+      "runContext": {
+        "urlPattern": "^https://(www\\.)?pornhub\\.com/"
+      },
+      "cosmetic": true,
+      "prehideSelectors": [
+        ".cookiesBanner"
+      ],
+      "detectCmp": [
+        {
+          "exists": ".cookiesBanner"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": ".cookiesBanner"
+        }
+      ],
+      "optIn": [
+        {
+          "click": ".cookiesBanner .okButton"
+        }
+      ],
+      "optOut": [
+        {
+          "hide": [
+            ".cookiesBanner"
+          ]
+        }
+      ]
+    },
     {
       "name": "PrimeBox CookieBar",
       "prehideSelectors": [
@@ -2621,6 +2687,46 @@
         }
       ]
     },
+    {
+      "name": "Test page cosmetic CMP",
+      "cosmetic": true,
+      "prehideSelectors": [
+        "#privacy-test-page-cmp-test-prehide"
+      ],
+      "detectCmp": [
+        {
+          "exists": "#privacy-test-page-cmp-test-banner"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": "#privacy-test-page-cmp-test-banner"
+        }
+      ],
+      "optIn": [
+        {
+          "waitFor": "#accept-all"
+        },
+        {
+          "click": "#accept-all"
+        }
+      ],
+      "optOut": [
+        {
+          "hide": [
+            "#privacy-test-page-cmp-test-banner"
+          ]
+        }
+      ],
+      "test": [
+        {
+          "wait": 500
+        },
+        {
+          "eval": "window.results.results[0] === 'banner_hidden'"
+        }
+      ]
+    },
     {
       "name": "Test page CMP",
       "prehideSelectors": [
@@ -2749,6 +2855,7 @@
       "prehideSelectors": [
         "#catapult-cookie-bar"
       ],
+      "cosmetic": true,
       "detectCmp": [
         {
           "exists": "#catapult-cookie-bar"
@@ -3025,6 +3132,35 @@
         }
       ]
     },
+    {
+      "name": "xnxx-com",
+      "cosmetic": true,
+      "prehideSelectors": [
+        "#cookies-use-alert"
+      ],
+      "detectCmp": [
+        {
+          "exists": "#cookies-use-alert"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": "#cookies-use-alert"
+        }
+      ],
+      "optIn": [
+        {
+          "click": "#cookies-use-alert .close"
+        }
+      ],
+      "optOut": [
+        {
+          "hide": [
+            "#cookies-use-alert"
+          ]
+        }
+      ]
+    },
     {
       "name": "youtube-desktop",
       "prehideSelectors": [

package/tests/borlabs.spec.ts

@@ -1,7 +1,7 @@
 import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('borlabs', [
-  'https://www.experto.de/', 'https://www.kesselheld.de/'
+  'https://www.kesselheld.de/'
 ], {
   skipRegions: ["US"]
 });

package/tests/complianz-optin.spec.ts

@@ -1,6 +1,6 @@
 import generateCMPTests from "../playwright/runner";
 
-generateCMPTests('Complianz optin', [
-  'https://stetson.com/',
-], {
-});
+// generateCMPTests('Complianz optin', [
+//   'https://stetson.com/',
+// ], {
+// });