@duckduckgo/autoconsent 5.0.0 → 5.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duckduckgo/autoconsent",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "",
   "main": "dist/autoconsent.cjs.js",
   "module": "dist/autoconsent.esm.js",
@@ -10,8 +10,8 @@
   "scripts": {
     "clean": "rm -r dist",
     "lint": "eslint lib/ playwright/ tests/ rules/autoconsent/*.json",
-    "bundle": "rollup -c",
-    "watch": "rollup -c -w",
+    "bundle": "./build.sh",
+    "watch": "chokidar \"lib\" \"addon\" \"rules\" -c \"./build.sh\"",
     "create-rule": "node rules/create-rule.mjs",
     "test": "playwright test",
     "test:webkit": "playwright test --project webkit",
@@ -32,8 +32,6 @@
   "devDependencies": {
     "@playwright/test": "^1.17.1",
     "@puppeteer/replay": "^2.11.0",
-    "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-typescript": "^11.0.0",
     "@types/chai": "^4.3.1",
     "@types/chrome": "^0.0.237",
     "@types/mocha": "^10.0.1",
@@ -42,12 +40,11 @@
     "auto": "^10.37.6",
     "bulma": "^0.9.4",
     "chai": "^4.2.0",
+    "chokidar-cli": "^3.0.0",
+    "esbuild": "^0.18.11",
     "eslint": "^8.27.0",
     "eslint-plugin-json": "^3.1.0",
     "mocha": "^10.0.0",
-    "rollup": "^2.79.1",
-    "rollup-plugin-copy": "^3.4.0",
-    "rollup-plugin-terser": "^7.0.2",
     "tslib": "^2.4.0",
     "typescript": "^5.1.6",
     "web-ext": "^7.3.0"

package/rules/autoconsent/burpee-com.json

@@ -8,6 +8,6 @@
     { "click": "#btn-cookie-allow" }
   ],
   "optOut": [
-    { "hide": ["#html-body #notice-cookie-block"] }
+    { "hide": ["#html-body #notice-cookie-block", "#notice-cookie"] }
   ]
 }

package/rules/autoconsent/cookie-manager-popup.json

@@ -0,0 +1,42 @@
+{
+  "name": "cookie-manager-popup",
+  "cosmetic": false,
+  "runContext": {
+    "main": true,
+    "frame": false
+  },
+  "intermediate": false,
+  "detectCmp": [
+    {
+      "exists": "#notice-cookie-block #allow-functional-cookies, #notice-cookie-block #btn-cookie-settings"
+    }
+  ],
+  "detectPopup": [
+    {
+      "visible": "#notice-cookie-block"
+    }
+  ],
+  "optIn": [
+    {
+      "click": "#btn-cookie-allow"
+    }
+  ],
+  "optOut": [
+    {
+      "if": {
+        "exists": "#allow-functional-cookies"
+      },
+      "then": [{ "click": "#allow-functional-cookies" }],
+      "else": [
+        { "waitForThenClick": "#btn-cookie-settings" },
+        { "waitForVisible": ".modal-body" },
+        { "click": ".modal-body input:checked, .switch[data-switch=\"on\"]", "all": true, "optional": true },
+        { "click": "[role=\"dialog\"] .modal-footer button"}
+      ]
+    }
+  ],
+  "prehideSelectors": ["#btn-cookie-settings"],
+  "test": [{
+    "eval": "JSON.parse(document.cookie.split(';').find(c => c.trim().startsWith('CookieLevel')).split('=')[1]).social === false"
+  }]
+}

package/rules/rules.json

@@ -653,7 +653,8 @@
       "optOut": [
         {
           "hide": [
-            "#html-body #notice-cookie-block"
+            "#html-body #notice-cookie-block",
+            "#notice-cookie"
           ]
         }
       ]
@@ -1134,6 +1135,66 @@
         }
       ]
     },
+    {
+      "name": "cookie-manager-popup",
+      "cosmetic": false,
+      "runContext": {
+        "main": true,
+        "frame": false
+      },
+      "intermediate": false,
+      "detectCmp": [
+        {
+          "exists": "#notice-cookie-block #allow-functional-cookies, #notice-cookie-block #btn-cookie-settings"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": "#notice-cookie-block"
+        }
+      ],
+      "optIn": [
+        {
+          "click": "#btn-cookie-allow"
+        }
+      ],
+      "optOut": [
+        {
+          "if": {
+            "exists": "#allow-functional-cookies"
+          },
+          "then": [
+            {
+              "click": "#allow-functional-cookies"
+            }
+          ],
+          "else": [
+            {
+              "waitForThenClick": "#btn-cookie-settings"
+            },
+            {
+              "waitForVisible": ".modal-body"
+            },
+            {
+              "click": ".modal-body input:checked, .switch[data-switch=\"on\"]",
+              "all": true,
+              "optional": true
+            },
+            {
+              "click": "[role=\"dialog\"] .modal-footer button"
+            }
+          ]
+        }
+      ],
+      "prehideSelectors": [
+        "#btn-cookie-settings"
+      ],
+      "test": [
+        {
+          "eval": "JSON.parse(document.cookie.split(';').find(c => c.trim().startsWith('CookieLevel')).split('=')[1]).social === false"
+        }
+      ]
+    },
     {
       "name": "cookie-notice",
       "prehideSelectors": [

package/tests/burpee-com.spec.ts

@@ -1,5 +1,6 @@
 import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('burpee.com', [
-  'https://www.burpee.com/'
+  'https://www.burpee.com/',
+  'https://granit.com/se'
 ], {});

package/tests/cookie-manager-popup.spec.ts

@@ -0,0 +1,8 @@
+import generateCMPTests from "../playwright/runner";
+
+generateCMPTests('cookie-manager-popup', [
+  'https://www.focus-bikes.com/de_de/',
+  'https://www.gazelle.de/',
+  'https://www.kalkhoff-bikes.com/de_de/'
+], {
+});

package/rollup.config.js

@@ -1,103 +0,0 @@
-import json from '@rollup/plugin-json';
-import typescript from '@rollup/plugin-typescript';
-import copy from 'rollup-plugin-copy';
-import { terser } from "rollup-plugin-terser";
-import pkg from './package.json';
-
-export default [{
-  input: './playwright/content.ts',
-  output: [{
-    file: 'dist/autoconsent.playwright.js',
-    format: 'iife'
-  }],
-  plugins: [
-    json(),
-    typescript(),
-    terser(),
-  ]
-}, {
-  input: './lib/web.ts',
-  output: [{
-    file: pkg.module,
-    format: 'es',
-    globals: ['browser'],
-  }, {
-    file: pkg.main,
-    format: 'cjs',
-  }],
-  plugins: [
-    typescript(),
-    terser(),
-  ],
-}, {
-  input: './addon/background.ts',
-  output: [{
-    file: './dist/addon-mv3/background.bundle.js',
-    format: 'iife',
-  }, {
-    file: './dist/addon-firefox/background.bundle.js',
-    format: 'iife',
-  }],
-  plugins: [
-    typescript(),
-    copy({
-      targets: [
-        {
-          src: [
-            './addon/icons', 
-            './rules/rules.json'
-          ],
-          dest: ['./dist/addon-firefox/', './dist/addon-mv3/']
-        },
-        {
-          src: ['./addon/popup.html', './addon/devtools'],
-          dest: ['./dist/addon-mv3/']
-        },
-        {
-          src: './addon/manifest.mv3.json',
-          dest: './dist/addon-mv3',
-          rename: 'manifest.json',
-        },
-        {
-          src: './addon/manifest.firefox.json',
-          dest: './dist/addon-firefox',
-          rename: 'manifest.json',
-        },
-        {
-          src: './node_modules/bulma/css/bulma.min.css',
-          dest: './dist/addon-mv3/devtools/'
-        }
-      ]
-    })
-  ]
-}, {
-  input: './addon/content.ts',
-  output: [{
-    file: './dist/addon-mv3/content.bundle.js',
-    format: 'iife',
-  }, {
-    file: './dist/addon-firefox/content.bundle.js',
-    format: 'iife',
-  }],
-  plugins: [
-    typescript(),
-  ],
-}, {
-  input: './addon/popup.ts',
-  output: [{
-    file: './dist/addon-mv3/popup.bundle.js',
-    format: 'iife',
-  }],
-  plugins: [
-    typescript(),
-  ],
-}, {
-  input: './addon/devtools/panel.ts',
-  output: [{
-    file: './dist/addon-mv3/devtools/panel.js',
-    format: 'iife',
-  }],
-  plugins: [
-    typescript(),
-  ],
-}];