Merge release/1.113.0 into main

duckduckgo · Nov 4, 2024 · b8b2792 · b8b2792
2 parents f21203d + 2235f85
commit b8b2792
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 15 deletions.
diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 296
+CURRENT_PROJECT_VERSION = 297
diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 1.112.0
+MARKETING_VERSION = 1.113.0
diff --git a/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift b/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift
@@ -22,8 +22,8 @@ import BrowserServicesKit
 final class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"a06e6995a04c4bbe99961dbd0aa88a78\""
-        public static let embeddedDataSHA = "6be5a8f1e62e37da16ab37b2d0a527ab5d852740ea01157f26144a9533608177"
+        public static let embeddedDataETag = "\"21f35ad1ca62ce64edf7c077d7f886e6\""
+        public static let embeddedDataSHA = "a084112d239479c361626fe6d71b46a41e075a1bf9fcd7af29ea7264e32ed740"
     }
 
     var embeddedDataEtag: String {

diff --git a/DuckDuckGo/ContentBlocker/macos-config.json b/DuckDuckGo/ContentBlocker/macos-config.json
@@ -1,6 +1,6 @@
 {
     "readme": "https://github.com/duckduckgo/privacy-configuration",
-    "version": 1730109523334,
+    "version": 1730728849681,
     "features": {
         "adClickAttribution": {
             "readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection",
@@ -378,6 +378,36 @@
                 {
                     "domain": "la-becanerie.com"
                 },
+                {
+                    "domain": "thrifty.com"
+                },
+                {
+                    "domain": "dollar.com"
+                },
+                {
+                    "domain": "ethicalconsumer.org"
+                },
+                {
+                    "domain": "diroots.com"
+                },
+                {
+                    "domain": "arbeitsagentur.de"
+                },
+                {
+                    "domain": "melawear.de"
+                },
+                {
+                    "domain": "dnb.com"
+                },
+                {
+                    "domain": "bookings.ltmuseum.co.uk"
+                },
+                {
+                    "domain": "famillemary.fr"
+                },
+                {
+                    "domain": "manoloblahnik.com"
+                },
                 {
                     "domain": "marvel.com"
                 },
@@ -405,7 +435,7 @@
                     "state": "enabled"
                 }
             },
-            "hash": "419e42a27cc5daa895b567f1e3c1bd6b"
+            "hash": "7a4965df30b37cc6667c92a477757058"
         },
         "autofillBreakageReporter": {
             "state": "disabled",
@@ -454,12 +484,15 @@
                         "steps": [
                             {
                                 "percent": 10
+                            },
+                            {
+                                "percent": 50
                             }
                         ]
                     }
                 }
             },
-            "hash": "75ff21cf9a4181783c06965edd6fe746"
+            "hash": "9de8e4b066aa23f7c20ca638ee0d9f1a"
         },
         "bookmarks": {
             "state": "enabled",
@@ -1313,6 +1346,10 @@
                     {
                         "domain": "payments.google.com",
                         "reason": "After sign-in for Google Pay flows (after flickering is resolved), blocking this causes the loading spinner to spin indefinitely, and the payment flow cannot proceed."
+                    },
+                    {
+                        "domain": "docs.google.com",
+                        "reason": "Embedded Google docs get into redirect loop if signed into a Google account"
                     }
                 ],
                 "firstPartyTrackerCookiePolicy": {
@@ -1363,7 +1400,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "6b4d2cef180104c5c84f5687479b8492"
+            "hash": "fce0a9ccd7ae060d25e7debe4d8905fb"
         },
         "customUserAgent": {
             "settings": {
@@ -1424,13 +1461,17 @@
                     {
                         "domain": "adobe.com",
                         "reason": "https://github.com/duckduckgo/privacy-configuration/pull/2289"
-                    }
-                ],
-                "webViewDefault": [
+                    },
                     {
                         "domain": "accounts.google.com",
                         "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1295"
                     },
+                    {
+                        "domain": "mail.google.com",
+                        "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1295"
+                    }
+                ],
+                "webViewDefault": [
                     {
                         "domain": "flysas.com",
                         "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1347"
@@ -1451,7 +1492,7 @@
             },
             "exceptions": [],
             "state": "enabled",
-            "hash": "6e1e9af5fb146e16b5f9f3090b41ca89"
+            "hash": "748cc5de2bc4b6b5e77c9c80b91efc2c"
         },
         "dbp": {
             "state": "enabled",
@@ -4154,6 +4195,15 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "salon.com",
+                        "rules": [
+                            {
+                                "selector": ".fc-ab-root",
+                                "type": "hide"
+                            }
+                        ]
+                    },
                     {
                         "domain": "scmp.com",
                         "rules": [
@@ -4924,7 +4974,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "f91fcec45cd63f074ee31f3e276cc6e9"
+            "hash": "485beac7762b316d685395a55537e0b7"
         },
         "exceptionHandler": {
             "exceptions": [
@@ -6011,6 +6061,11 @@
             "minSupportedVersion": "1.70.0",
             "hash": "0a35f748d63fc61a777ea5e712728fa3"
         },
+        "textZoom": {
+            "exceptions": [],
+            "state": "disabled",
+            "hash": "728493ef7a1488e4781656d3f9db84aa"
+        },
         "toggleReports": {
             "state": "enabled",
             "exceptions": [],
@@ -6859,6 +6914,13 @@
                                     "history.com"
                                 ]
                             },
+                            {
+                                "rule": "doubleclick.net/ondemand/dash/content/",
+                                "domains": [
+                                    "cbs.com",
+                                    "paramountplus.com"
+                                ]
+                            },
                             {
                                 "rule": "securepubads.g.doubleclick.net/gampad/ads",
                                 "domains": [
@@ -7495,7 +7557,8 @@
                                     "experian.com",
                                     "thesimsresource.com",
                                     "tradersync.com",
-                                    "vanguardplan.com"
+                                    "vanguardplan.com",
+                                    "xpn.org"
                                 ]
                             }
                         ]
@@ -9442,7 +9505,7 @@
                     "domain": "instructure.com"
                 }
             ],
-            "hash": "4a71922e4eb31060dced0b091ad797e7"
+            "hash": "7d4f56d34c41ddfde274e4aa23a8b74b"
         },
         "trackingCookies1p": {
             "settings": {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		CURRENT_PROJECT_VERSION = 296
		CURRENT_PROJECT_VERSION = 297
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		MARKETING_VERSION = 1.112.0
		MARKETING_VERSION = 1.113.0