Merge release/1.110.0 into main

duckduckgo · Oct 14, 2024 · 4d2f84a · 4d2f84a
2 parents f1fe906 + 235ef04
commit 4d2f84a
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 17 deletions.
diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 279
+CURRENT_PROJECT_VERSION = 280
diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 1.109.0
+MARKETING_VERSION = 1.110.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 = "\"ebe354ac4c71b9302b883dffc03934f4\""
-        public static let embeddedDataSHA = "607cd95cd77335a685ff9fa6fd2be98bdae1d32a82ff0562741cd6e233a713c8"
+        public static let embeddedDataETag = "\"46c6d6d4a9f2bffe5e5245e115ec69ba\""
+        public static let embeddedDataSHA = "251c865ec91708d212a58abb79a52caa8fbf4712be153428b602f5a661055874"
     }
 
     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": 1728095993160,
+    "version": 1728900024972,
     "features": {
         "adClickAttribution": {
             "readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection",
@@ -373,10 +373,7 @@
             ],
             "settings": {
                 "disabledCMPs": [
-                    "generic-cosmetic",
-                    "termsfeed3",
-                    "healthline-media",
-                    "ketch"
+                    "healthline-media"
                 ]
             },
             "state": "enabled",
@@ -385,7 +382,7 @@
                     "state": "disabled"
                 }
             },
-            "hash": "a24d4efe9deb2a73284d7beab93c0d32"
+            "hash": "69add087dec44523d540bf49f1ec1b0f"
         },
         "autofillBreakageReporter": {
             "state": "disabled",
@@ -417,9 +414,12 @@
                 },
                 "credentialsImportPromotion": {
                     "state": "enabled"
+                },
+                "credentialsImportPromotionForExistingUsers": {
+                    "state": "enabled"
                 }
             },
-            "hash": "81031a6b86bd68eec102c2ed67f48c1b"
+            "hash": "22709d939c21d127514fd009c54ee987"
         },
         "backgroundAgentPixelTest": {
             "state": "enabled",
@@ -1501,7 +1501,8 @@
                                 ".ytd-video-preview",
                                 "#thumbnail-container",
                                 "#video-title-link",
-                                "#video-title"
+                                "#video-title",
+                                "video.video-stream.html5-main-video"
                             ]
                         },
                         "thumbnailOverlays": {
@@ -1552,7 +1553,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "a22c997161337594616c850542cee336"
+            "hash": "6d2484ffb4609f98336632cdd1487f34"
         },
         "elementHiding": {
             "exceptions": [
@@ -3449,6 +3450,15 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "livebeaches.com",
+                        "rules": [
+                            {
+                                "selector": "[class*='random-ad']",
+                                "type": "hide-empty"
+                            }
+                        ]
+                    },
                     {
                         "domain": "livemint.com",
                         "rules": [
@@ -4865,7 +4875,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "81b9ba9f3245da9eb799ec916e6b916b"
+            "hash": "9cbafdd3b48aabf71f6cfb2f986a7181"
         },
         "exceptionHandler": {
             "exceptions": [
@@ -5319,6 +5329,9 @@
                 {
                     "domain": "jcrew.com"
                 },
+                {
+                    "domain": "pgealerts.alerts.pge.com"
+                },
                 {
                     "domain": "marvel.com"
                 },
@@ -5344,7 +5357,7 @@
                     "privacy-test-pages.site"
                 ]
             },
-            "hash": "70264848cdb2f1e2ac1e21429405319d"
+            "hash": "4df9d206561ea1251d6348865362de63"
         },
         "harmfulApis": {
             "settings": {
@@ -7555,6 +7568,7 @@
                                     "local12.com",
                                     "local21news.com",
                                     "midmichigannow.com",
+                                    "mlb.com",
                                     "my15wtcn.com",
                                     "my24milwaukee.com",
                                     "my48.tv",
@@ -8148,7 +8162,7 @@
                     "nosto.com": {
                         "rules": [
                             {
-                                "rule": "connect.nosto.com/script/shopify/nosto.js",
+                                "rule": "connect.nosto.com",
                                 "domains": [
                                     "<all>"
                                 ]
@@ -8534,6 +8548,7 @@
                                 "rule": "a.pub.network/core/prebid-universal-creative.js",
                                 "domains": [
                                     "signupgenius.com",
+                                    "smithsonianmag.com",
                                     "titantv.com"
                                 ]
                             },
@@ -8678,6 +8693,16 @@
                             }
                         ]
                     },
+                    "sascdn.com": {
+                        "rules": [
+                            {
+                                "rule": "sascdn.com/tag/",
+                                "domains": [
+                                    "filmweb.pl"
+                                ]
+                            }
+                        ]
+                    },
                     "scene7.com": {
                         "rules": [
                             {
@@ -8802,6 +8827,16 @@
                             }
                         ]
                     },
+                    "smartadserver.com": {
+                        "rules": [
+                            {
+                                "rule": "smartadserver.com/genericpost",
+                                "domains": [
+                                    "filmweb.pl"
+                                ]
+                            }
+                        ]
+                    },
                     "snapkit.com": {
                         "rules": [
                             {
@@ -9332,6 +9367,16 @@
                             }
                         ]
                     },
+                    "eltiempo.co": {
+                        "rules": [
+                            {
+                                "rule": "ads.eltiempo.co/genericpost",
+                                "domains": [
+                                    "filmweb.pl"
+                                ]
+                            }
+                        ]
+                    },
                     "yandex.tm": {
                         "rules": [
                             {
@@ -9361,7 +9406,7 @@
                     "domain": "instructure.com"
                 }
             ],
-            "hash": "1cf339c9f618be0304f90f0f48a7b6cf"
+            "hash": "decc4b889c1d10bde764604562463b3c"
         },
         "trackingCookies1p": {
             "settings": {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		CURRENT_PROJECT_VERSION = 279
		CURRENT_PROJECT_VERSION = 280
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		MARKETING_VERSION = 1.109.0
		MARKETING_VERSION = 1.110.0