@duckduckgo/autoconsent 16.2.0 → 16.4.0

package/scripts/check-pr-release-labels.ts

@@ -1,23 +1,23 @@
 import fs from 'fs';
 import { Octokit } from '@octokit/rest';
 
-const RELEASE_IMPACT_LABELS = ['major', 'minor', 'patch'] as const;
+const VERSION_LABELS = ['version: major', 'version: minor', 'version: patch'] as const;
 const CATEGORY_LABELS = [
-    'rules',
-    'bug',
-    'enhancement',
-    'performance',
-    'dependencies',
-    'ci',
-    'ai',
-    'documentation',
-    'tests',
-    'internal',
-    'other',
+    'category: rules',
+    'category: bug',
+    'category: enhancement',
+    'category: performance',
+    'category: dependencies',
+    'category: ci',
+    'category: ai',
+    'category: documentation',
+    'category: tests',
+    'category: internal',
+    'category: other',
 ] as const;
 const COMMENT_MARKER = '<!-- autoconsent-release-label-check -->';
 
-type LabelName = (typeof RELEASE_IMPACT_LABELS)[number] | (typeof CATEGORY_LABELS)[number];
+type LabelName = (typeof VERSION_LABELS)[number] | (typeof CATEGORY_LABELS)[number];
 
 interface Args {
     event?: string;
@@ -44,7 +44,7 @@ interface PullRequestEvent {
 interface ValidationResult {
     ok: boolean;
     labels: string[];
-    releaseImpactLabels: string[];
+    versionLabels: string[];
     categoryLabels: string[];
     errors: string[];
     comment?: string;
@@ -119,18 +119,18 @@ function isKnownLabel(labelSet: readonly LabelName[], label: string): boolean {
 
 export function validateLabels(labels: string[]): ValidationResult {
     const currentLabels = uniqueLabels(labels);
-    const releaseImpactLabels = currentLabels.filter((label) => isKnownLabel(RELEASE_IMPACT_LABELS, label));
+    const versionLabels = currentLabels.filter((label) => isKnownLabel(VERSION_LABELS, label));
     const categoryLabels = currentLabels.filter((label) => isKnownLabel(CATEGORY_LABELS, label));
     const errors: string[] = [];
 
-    if (releaseImpactLabels.length === 0) {
-        errors.push(`Add exactly one release impact label: ${RELEASE_IMPACT_LABELS.join(', ')}.`);
-    } else if (releaseImpactLabels.length > 1) {
-        errors.push(`Keep exactly one release impact label; found ${releaseImpactLabels.join(', ')}.`);
+    if (versionLabels.length === 0) {
+        errors.push('Add exactly one version label with the `version:` prefix.');
+    } else if (versionLabels.length > 1) {
+        errors.push(`Keep exactly one version label; found ${versionLabels.join(', ')}.`);
     }
 
     if (categoryLabels.length === 0) {
-        errors.push(`Add exactly one release-note category label: ${CATEGORY_LABELS.join(', ')}.`);
+        errors.push('Add exactly one release-note category label with the `category:` prefix.');
     } else if (categoryLabels.length > 1) {
         errors.push(`Keep exactly one release-note category label; found ${categoryLabels.join(', ')}.`);
     }
@@ -138,7 +138,7 @@ export function validateLabels(labels: string[]): ValidationResult {
     return {
         ok: errors.length === 0,
         labels: currentLabels,
-        releaseImpactLabels,
+        versionLabels,
         categoryLabels,
         errors,
     };
@@ -171,8 +171,8 @@ Problems:
 ${result.errors.map((error) => `- ${error}`).join('\n')}
 
 Required labels:
-- One release impact label: ${formatLabels(RELEASE_IMPACT_LABELS)}
-- One release-note category label: ${formatLabels(CATEGORY_LABELS)}
+- One version label using the \`version:\` prefix, for example \`version: patch\`
+- One release-note category label using the \`category:\` prefix, for example \`category: rules\`
 
 See [docs/release-notes.md](https://github.com/duckduckgo/autoconsent/blob/main/docs/release-notes.md) for examples.`;
 }
@@ -252,4 +252,4 @@ if (require.main === module) {
     });
 }
 
-export { CATEGORY_LABELS, RELEASE_IMPACT_LABELS };
+export { CATEGORY_LABELS, VERSION_LABELS };

package/standalone/content.ts

@@ -55,7 +55,7 @@ if (!window.autoconsentReceiveMessage) {
     const config: Partial<Config> = {
         isMainWorld: true,
         enableHeuristicDetection: true,
-        enableHeuristicAction: true,
+        heuristicMode: 'tier2',
         enablePopupMutationObserver: false,
         logs: {
             lifecycle: true,

package/tests/ketch.spec.ts

@@ -1,21 +1,35 @@
 import generateCMPTests from '../playwright/runner';
 
-generateCMPTests('ketch', [
-    'https://time.com/',
-    'https://www.rover.com/nl/',
-    'https://purple.com/',
-    'https://www.ncsasports.org/',
-    'https://www.pret.co.uk/en-GB',
-    'https://www.greatpetcare.com/',
-    'https://www.smartsheet.com/',
-    'https://www.ketch.com/',
-    'https://www.forbes.com/',
-    'https://yumearth.com/products/variety-pack-30ct',
-    // Disclosure-only banner variant (US/CCPA): the standard banner ships with
-    // a single acknowledge button (e.g. "I understand"/"Learn more") and no
-    // reject option — consent is decided by Ketch's jurisdiction defaults.
-    'https://shift.com/state-of-browsing/',
-    'https://www.altec.com/',
-    'https://www.akro-mils.com/',
-    'https://www.ascensus.com/',
-]);
+generateCMPTests(
+    'ketch',
+    [
+        'https://www.rover.com/nl/',
+        'https://purple.com/',
+        'https://www.ncsasports.org/',
+        'https://www.pret.co.uk/en-GB',
+        'https://www.greatpetcare.com/',
+        'https://www.smartsheet.com/',
+        'https://www.ketch.com/',
+        'https://www.forbes.com/',
+        'https://yumearth.com/products/variety-pack-30ct',
+        // Disclosure-only banner variant (US/CCPA): the standard banner ships with
+        // a single acknowledge button (e.g. "I understand"/"Learn more") and no
+        // reject option — consent is decided by Ketch's jurisdiction defaults.
+        'https://shift.com/state-of-browsing/',
+        'https://www.altec.com/',
+        'https://www.akro-mils.com/',
+        'https://www.ascensus.com/',
+        // Banner with "Manage Cookie Settings" + "Accept All Cookies" only (no
+        // direct reject); preferences modal has per-purpose toggles and a
+        // "Save Settings" button but no "Reject All".
+        'https://my.equifax.ca/login',
+        // 3-button banner where the direct reject (aria-label="Reject
+        // Optional Cookies") is #ketch-banner-button-secondary while
+        // #ketch-banner-button-tertiary is "Cookie Settings" — verifies we
+        // prefer the aria-label-based direct reject over id-position guesses.
+        'https://www.pbs.org/newshour/economy/tomatoes-become-latest-symbol-of-americas-affordability-squeeze',
+    ],
+    {
+        onlyRegions: ['US', 'DE'],
+    },
+);

package/tests/msn.spec.ts

@@ -0,0 +1,5 @@
+import generateCMPTests from '../playwright/runner';
+
+generateCMPTests('msn', ['https://www.msn.com/en-gb', 'https://www.msn.com/de-de', 'https://www.msn.com/fr-fr'], {
+    onlyRegions: ['UK', 'DE', 'FR'],
+});

package/tests-wtr/lifecycle/find-cmp.ts

@@ -5,7 +5,7 @@ import Onetrust from '../../lib/cmps/onetrust';
 describe('Autoconsent.findCmp', () => {
     let autoconsent: Autoconsent;
 
-    describe('enableHeuristicAction = false', () => {
+    describe('heuristicMode = off', () => {
         beforeEach(() => {
             autoconsent = new Autoconsent((msg) => Promise.resolve(), {
                 enabled: false, // bypass initialization
@@ -135,7 +135,7 @@ describe('Autoconsent.findCmp', () => {
         });
     });
 
-    describe('enableHeuristicAction = true', () => {
+    describe('heuristicMode = reject', () => {
         beforeEach(() => {
             autoconsent = new Autoconsent((msg) => Promise.resolve(), {
                 enabled: false,

package/tests-wtr/web/do-opt-in.test.ts

@@ -19,7 +19,7 @@ function createTestConfig(overrides: Partial<Config> = {}): Config {
         isMainWorld: false,
         prehideTimeout: 2000,
         enableHeuristicDetection: false,
-        enableHeuristicAction: false,
+        heuristicMode: 'off',
         visualTest: false,
         logs: {
             lifecycle: false,

package/tests-wtr/web/do-opt-out.test.ts

@@ -19,7 +19,7 @@ function createTestConfig(overrides: Partial<Config> = {}): Config {
         isMainWorld: false,
         prehideTimeout: 2000,
         enableHeuristicDetection: false,
-        enableHeuristicAction: false,
+        heuristicMode: 'off',
         visualTest: false,
         logs: {
             lifecycle: false,

package/tests-wtr/web/do-self-test.test.ts

@@ -19,7 +19,7 @@ function createTestConfig(overrides: Partial<Config> = {}): Config {
         isMainWorld: false,
         prehideTimeout: 2000,
         enableHeuristicDetection: false,
-        enableHeuristicAction: false,
+        heuristicMode: 'off',
         visualTest: false,
         logs: {
             lifecycle: false,

package/tests-wtr/web/filter-cmps.test.ts

@@ -41,7 +41,7 @@ function createTestConfig(overrides: Partial<Config> = {}): Config {
         isMainWorld: false,
         prehideTimeout: 2000,
         enableHeuristicDetection: false,
-        enableHeuristicAction: false,
+        heuristicMode: 'off',
         visualTest: false,
         logs: {
             lifecycle: false,

package/tests-wtr/web/receive-message-callback.test.ts

@@ -18,7 +18,7 @@ function createTestConfig(overrides: Partial<Config> = {}): Config {
         isMainWorld: false,
         prehideTimeout: 2000,
         enableHeuristicDetection: false,
-        enableHeuristicAction: false,
+        heuristicMode: 'off',
         visualTest: false,
         logs: {
             lifecycle: false,

package/tests-wtr/web/update-state.test.ts

@@ -18,7 +18,7 @@ function createTestConfig(overrides: Partial<Config> = {}): Config {
         isMainWorld: false,
         prehideTimeout: 2000,
         enableHeuristicDetection: false,
-        enableHeuristicAction: false,
+        heuristicMode: 'off',
         visualTest: false,
         logs: {
             lifecycle: false,

package/rules/autoconsent/theverge.json

@@ -1,36 +0,0 @@
-{
-    "name": "theverge",
-    "runContext": {
-        "frame": false,
-        "main": true,
-        "urlPattern": "^https://(www)?\\.theverge\\.com"
-    },
-    "intermediate": false,
-    "prehideSelectors": [".duet--cta--cookie-banner"],
-    "detectCmp": [
-        {
-            "exists": ".duet--cta--cookie-banner"
-        }
-    ],
-    "detectPopup": [
-        {
-            "visible": ".duet--cta--cookie-banner"
-        }
-    ],
-    "optIn": [
-        {
-            "click": ".duet--cta--cookie-banner button.tracking-12",
-            "all": false
-        }
-    ],
-    "optOut": [
-        {
-            "click": ".duet--cta--cookie-banner button.tracking-12 > span"
-        }
-    ],
-    "test": [
-        {
-            "cookieContains": "_duet_gdpr_acknowledged=1"
-        }
-    ]
-}

package/tests/theverge.spec.ts

@@ -1,3 +0,0 @@
-import generateCMPTests from '../playwright/runner';
-
-generateCMPTests('theverge', ['https://www.theverge.com/']);