@duckduckgo/autoconsent 14.94.0 → 14.95.1

package/scripts/bundle-config-rules.ts

@@ -1,6 +1,7 @@
 import fs from 'fs';
 import path from 'path';
-import { encodeRules } from '../lib/encoding';
+import { applyEdits, modify, parse, type JSONPath } from 'jsonc-parser';
+import { encodeRules, type IndexedCMPRuleset } from '../lib/encoding';
 
 if (process.argv.length !== 3) {
     console.log('Usage: npm run bundle-config-rules path/to/privacy-configuration');
@@ -15,19 +16,24 @@ const bundleLocations = [path.join(privacyConfigPath, 'features', 'autoconsent.j
 const autoconsentRules = JSON.parse(fs.readFileSync(path.join(__dirname, '../rules/rules.json'), 'utf-8')).autoconsent;
 
 for (const location of bundleLocations) {
-    const config = JSON.parse(fs.readFileSync(location, 'utf-8'));
+    // privacy-configuration source files may contain comments (JSONC). Parse
+    // leniently and apply a targeted edit so comments and formatting survive.
+    const text = fs.readFileSync(location, 'utf-8');
+    const config = parse(text);
+    let rulePath: JSONPath;
+    let newCompactRuleList: IndexedCMPRuleset;
     if (location.endsWith('autoconsent.json')) {
         console.log(`Existing compact rule list: ${config.settings.compactRuleList.s.slice(0, 10)}`);
         // global config
-        config.settings.compactRuleList = encodeRules(autoconsentRules, config.settings.compactRuleList);
+        newCompactRuleList = encodeRules(autoconsentRules, config.settings.compactRuleList);
+        rulePath = ['settings', 'compactRuleList'];
     } else {
         // platform override
-        config.features.autoconsent.settings.compactRuleList = encodeRules(
-            autoconsentRules,
-            config.features.autoconsent.settings.compactRuleList,
-        );
+        newCompactRuleList = encodeRules(autoconsentRules, config.features.autoconsent.settings.compactRuleList);
+        rulePath = ['features', 'autoconsent', 'settings', 'compactRuleList'];
     }
-    // generate standard pretty-printed output
-    const outputData = JSON.stringify(config, undefined, 4);
-    fs.writeFileSync(location, outputData);
+    const edits = modify(text, rulePath, newCompactRuleList, {
+        formattingOptions: { tabSize: 4, insertSpaces: true },
+    });
+    fs.writeFileSync(location, applyEdits(text, edits));
 }

package/tests/didomi.spec.ts

@@ -4,7 +4,6 @@ generateCMPTests(
     'didomi',
     [
         'https://nothing.tech/',
-        'https://www.planet.fr/',
         'http://www.allocine.fr/',
         'https://www.boursorama.com/',
         'https://www.theoriginalshotels.com/en/hotels/la-villa-vicha',
@@ -15,7 +14,7 @@ generateCMPTests(
         // Self-test is disabled because some sites (e.g. planet.fr) navigate away
         // after clicking the disagree button, which destroys the Didomi state.
         testSelfTest: false,
-        skipRegions: ['US'],
+        onlyRegions: ['US', 'FR'],
     },
 );
 

package/tests/yachtclubgames.spec.ts

@@ -0,0 +1,9 @@
+import generateCMPTests from '../playwright/runner';
+
+const urls = ['https://www.yachtclubgames.com/'];
+
+generateCMPTests('yachtclubgames.com', urls);
+
+generateCMPTests('yachtclubgames.com', urls, {
+    mobile: true,
+});