diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 87f94d809e..6efa56f3f9 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -12993,7 +12993,7 @@ repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { kind = exactVersion; - version = 152.0.0; + version = 152.0.1; }; }; 9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index d7d10dd71c..850e4da4bc 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/BrowserServicesKit", "state" : { - "revision" : "e32733e0e0b03bbac2fec160a2f967a15ed1794b", - "version" : "152.0.0" + "revision" : "43d6c090699ddc1b92c0c016dc31b923fb06f59f", + "version" : "152.0.1" } }, { @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/content-scope-scripts", "state" : { - "revision" : "fa861c4eccb21d235e34070b208b78bdc32ece08", - "version" : "5.17.0" + "revision" : "ba2ad0c3a14a8c07d7be8b50a20b47efea207e86", + "version" : "5.19.0" } }, { diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift index 37ad4bb25c..c6c69d600e 100644 --- a/LocalPackages/DataBrokerProtection/Package.swift +++ b/LocalPackages/DataBrokerProtection/Package.swift @@ -29,7 +29,7 @@ let package = Package( targets: ["DataBrokerProtection"]) ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "152.0.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "152.0.1"), .package(path: "../SwiftUIExtensions"), .package(path: "../XPCHelper"), ], diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/Actions/Extract.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/Actions/Extract.swift index 97dcfea382..f1b8c195cf 100644 --- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/Actions/Extract.swift +++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/Actions/Extract.swift @@ -20,6 +20,7 @@ struct ExtractAction: Action { let id: String let actionType: ActionType let selector: String + let noResultsSelector: String? let profile: ExtractProfileSelectors let dataSource: DataSource? } diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswhizr.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswhizr.com.json index 39bee21f02..2bea79b774 100644 --- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswhizr.com.json +++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswhizr.com.json @@ -1,7 +1,7 @@ { "name": "PeoplesWhizr", "url": "peopleswhizr.com", - "version": "0.1.7", + "version": "0.2.0", "parent": "peoplewhiz.com", "addedDatetime": 1709445600000, "steps": [ @@ -18,6 +18,7 @@ "actionType": "extract", "id": "bc952139-373b-4461-8e24-83661038f657", "selector": "[class^='ResultsTable__Record-sc']", + "noResultsSelector": "div[class^=ResultNotFound__NoResults]", "profile": { "name": { "selector": "[class^='ResultsTable__Name-sc']" diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswiz.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswiz.com.json index 18ac36c128..3d88a0b760 100644 --- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswiz.com.json +++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswiz.com.json @@ -1,7 +1,7 @@ { "name": "PeoplesWiz", "url": "peopleswiz.com", - "version": "0.1.7", + "version": "0.2.0", "parent": "peoplewhiz.com", "addedDatetime": 1709445600000, "steps": [ @@ -18,6 +18,7 @@ "actionType": "extract", "id": "9e1e6ff5-cb99-49aa-a37c-b3dc80012f19", "selector": "[class^='ResultsTable__Record-sc']", + "noResultsSelector": "div[class^=ResultNotFound__NoResults]", "profile": { "name": { "selector": "[class^='ResultsTable__Name-sc']" diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswizard.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswizard.com.json index 28e592c7cb..96a8049550 100644 --- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswizard.com.json +++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswizard.com.json @@ -1,7 +1,7 @@ { "name": "PeoplesWizard", "url": "peopleswizard.com", - "version": "0.1.7", + "version": "0.2.0", "parent": "peoplewhiz.com", "addedDatetime": 1709445600000, "steps": [ @@ -18,6 +18,7 @@ "actionType": "extract", "id": "c538d04e-85ce-46a5-bbbd-3f9bd0fae078", "selector": "[class^='ResultsTable__Record-sc']", + "noResultsSelector": "div[class^=ResultNotFound__NoResults]", "profile": { "name": { "selector": "[class^='ResultsTable__Name-sc']" diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.com.json index 9560a08e76..f51b86a541 100644 --- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.com.json +++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.com.json @@ -1,7 +1,7 @@ { "name": "PeopleWhiz.com", "url": "peoplewhiz.com", - "version": "0.1.7", + "version": "0.2.0", "addedDatetime": 1676160000000, "steps": [ { @@ -17,6 +17,7 @@ "actionType": "extract", "id": "efa321f2-f214-411f-a87b-bc42feff7931", "selector": "[class^='ResultsTable__Record-sc']", + "noResultsSelector": "div[class^=ResultNotFound__NoResults]", "profile": { "name": { "selector": "[class^='ResultsTable__Name-sc']" diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.net.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.net.json index af5e43e553..cd7f9b1b23 100644 --- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.net.json +++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.net.json @@ -1,7 +1,7 @@ { "name": "PeopleWhiz.net", "url": "peoplewhiz.net", - "version": "0.1.7", + "version": "0.2.0", "parent": "peoplewhiz.com", "addedDatetime": 1709424000000, "steps": [ @@ -18,6 +18,7 @@ "actionType": "extract", "id": "9e0d566b-dd31-40a7-9315-ec6fba8d6233", "selector": "[class^='ResultsTable__Record-sc']", + "noResultsSelector": "div[class^=ResultNotFound__NoResults]", "profile": { "name": { "selector": "[class^='ResultsTable__Name-sc']" diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.com.json index 0e5c402651..18f4023df7 100644 --- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.com.json +++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.com.json @@ -1,7 +1,7 @@ { "name": "PeopleWhized.com", "url": "peoplewhized.com", - "version": "0.1.7", + "version": "0.2.0", "parent": "peoplewhiz.com", "addedDatetime": 1709424000000, "steps": [ @@ -18,6 +18,7 @@ "actionType": "extract", "id": "77517554-f1e7-4e73-b0d1-92f56a0f247c", "selector": "[class^='ResultsTable__Record-sc']", + "noResultsSelector": "div[class^=ResultNotFound__NoResults]", "profile": { "name": { "selector": "[class^='ResultsTable__Name-sc']" diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.net.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.net.json index 66b7eec1d9..37b4f1d0ea 100644 --- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.net.json +++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.net.json @@ -1,7 +1,7 @@ { "name": "PeopleWhized.net", "url": "peoplewhized.net", - "version": "0.1.7", + "version": "0.2.0", "parent": "peoplewhiz.com", "addedDatetime": 1709445600000, "steps": [ @@ -18,6 +18,7 @@ "actionType": "extract", "id": "440406f6-bd8a-4af7-b509-43eb24c79e4c", "selector": "[class^='ResultsTable__Record-sc']", + "noResultsSelector": "div[class^=ResultNotFound__NoResults]", "profile": { "name": { "selector": "[class^='ResultsTable__Name-sc']" diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.com.json index 6efb536b08..c2bb799576 100644 --- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.com.json +++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.com.json @@ -1,7 +1,7 @@ { "name": "PeopleWhizr.com", "url": "peoplewhizr.com", - "version": "0.1.7", + "version": "0.2.0", "parent": "peoplewhiz.com", "addedDatetime": 1709445600000, "steps": [ @@ -18,6 +18,7 @@ "actionType": "extract", "id": "21a783ce-7a7e-4a97-8dc2-ee4c2f3dc63a", "selector": "[class^='ResultsTable__Record-sc']", + "noResultsSelector": "div[class^=ResultNotFound__NoResults]", "profile": { "name": { "selector": "[class^='ResultsTable__Name-sc']" diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.net.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.net.json index 6faef5be13..7afddb9410 100644 --- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.net.json +++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.net.json @@ -1,7 +1,7 @@ { "name": "PeopleWhizr.net", "url": "peoplewhizr.net", - "version": "0.1.7", + "version": "0.2.0", "parent": "peoplewhiz.com", "addedDatetime": 1709445600000, "steps": [ @@ -18,6 +18,7 @@ "actionType": "extract", "id": "2955fb45-374e-42f2-a72a-f7a2ffe4ebe5", "selector": "[class^='ResultsTable__Record-sc']", + "noResultsSelector": "div[class^=ResultNotFound__NoResults]", "profile": { "name": { "selector": "[class^='ResultsTable__Name-sc']" diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewiz.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewiz.com.json index 5e3459100f..25e6637ad9 100644 --- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewiz.com.json +++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewiz.com.json @@ -1,7 +1,7 @@ { "name": "PeopleWiz", "url": "peoplewiz.com", - "version": "0.1.7", + "version": "0.2.0", "parent": "peoplewhiz.com", "addedDatetime": 1709445600000, "steps": [ @@ -18,6 +18,7 @@ "actionType": "extract", "id": "36ba376d-03c1-4ecc-92ed-2fe12bd79d6f", "selector": "[class^='ResultsTable__Record-sc']", + "noResultsSelector": "div[class^=ResultNotFound__NoResults]", "profile": { "name": { "selector": "[class^='ResultsTable__Name-sc']" diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizard.net.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizard.net.json index c912e7886e..b318e39d57 100644 --- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizard.net.json +++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizard.net.json @@ -1,7 +1,7 @@ { "name": "PeopleWizard.net", "url": "peoplewizard.net", - "version": "0.1.7", + "version": "0.2.0", "parent": "peoplewhiz.com", "addedDatetime": 1709445600000, "steps": [ @@ -18,6 +18,7 @@ "actionType": "extract", "id": "f6d41239-9208-419e-b101-c58e52a71d42", "selector": "[class^='ResultsTable__Record-sc']", + "noResultsSelector": "div[class^=ResultNotFound__NoResults]", "profile": { "name": { "selector": "[class^='ResultsTable__Name-sc']" diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizr.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizr.com.json index e6a7d1638c..bda74021eb 100644 --- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizr.com.json +++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizr.com.json @@ -1,7 +1,7 @@ { "name": "PeopleWizr", "url": "peoplewizr.com", - "version": "0.1.7", + "version": "0.2.0", "parent": "peoplewhiz.com", "addedDatetime": 1709445600000, "steps": [ @@ -18,6 +18,7 @@ "actionType": "extract", "id": "53c86c5d-3960-44a9-91a3-143b71d1e07f", "selector": "[class^='ResultsTable__Record-sc']", + "noResultsSelector": "div[class^=ResultNotFound__NoResults]", "profile": { "name": { "selector": "[class^='ResultsTable__Name-sc']" diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift index ac27880407..393ebc0a17 100644 --- a/LocalPackages/NetworkProtectionMac/Package.swift +++ b/LocalPackages/NetworkProtectionMac/Package.swift @@ -32,7 +32,7 @@ let package = Package( .library(name: "VPNAppLauncher", targets: ["VPNAppLauncher"]), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "152.0.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "152.0.1"), .package(url: "https://github.com/airbnb/lottie-spm", exact: "4.4.1"), .package(path: "../AppLauncher"), .package(path: "../XPCHelper"), diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift index 8fab267539..adb58da787 100644 --- a/LocalPackages/SubscriptionUI/Package.swift +++ b/LocalPackages/SubscriptionUI/Package.swift @@ -12,7 +12,7 @@ let package = Package( targets: ["SubscriptionUI"]), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "152.0.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "152.0.1"), .package(path: "../SwiftUIExtensions") ], targets: [