From 8ef7f43d9d880ce1c7da687c3c0bf2caf44bcbcd Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 20 Jun 2024 06:02:43 +0200 Subject: Merging upstream version 127.0.1. Signed-off-by: Daniel Baumann --- .../main/devtools-compatibility-browsers.json | 301 +++++++------ .../settings/dumps/main/search-telemetry-v2.json | 478 +++++++++++---------- 2 files changed, 406 insertions(+), 373 deletions(-) (limited to 'services/settings/dumps/main') diff --git a/services/settings/dumps/main/devtools-compatibility-browsers.json b/services/settings/dumps/main/devtools-compatibility-browsers.json index 0f422a8f37..ccb7f43884 100644 --- a/services/settings/dumps/main/devtools-compatibility-browsers.json +++ b/services/settings/dumps/main/devtools-compatibility-browsers.json @@ -1,202 +1,247 @@ { "data": [ { - "name": "Edge", - "schema": 1716941107417, - "status": "current", - "version": "125", - "browserid": "edge", - "id": "f1147d5f-d690-43d0-879d-117c6ca24a16", - "last_modified": 1716966331501 + "name": "Chrome Android", + "schema": 1718237106974, + "status": "beta", + "version": "127", + "browserid": "chrome_android", + "id": "cd12d517-e366-4857-88e5-bfcf60d9d538", + "last_modified": 1718606078088 }, { "name": "Firefox", - "schema": 1715731507143, + "schema": 1718237107359, "status": "planned", - "version": "129", + "version": "130", "browserid": "firefox", - "id": "aed9aeed-2d00-44d3-9b04-065a3df6af27", - "last_modified": 1715839095932 + "id": "010b69b4-e137-4a3c-8d98-b22d532d0b6a", + "last_modified": 1718606078085 }, { "name": "Firefox for Android", - "schema": 1715731507714, + "schema": 1718237107716, "status": "planned", - "version": "129", + "version": "130", "browserid": "firefox_android", - "id": "0e014c85-acab-44d6-8108-3441175573e2", - "last_modified": 1715839095930 + "id": "232a420f-0598-4544-85b1-c72805873b55", + "last_modified": 1718606078082 + }, + { + "name": "Safari", + "schema": 1718237107783, + "status": "beta", + "version": "18", + "browserid": "safari", + "id": "f2e90b45-68bd-4a1c-8470-6d5c8d934e14", + "last_modified": 1718606078080 }, { "name": "Safari on iOS", - "schema": 1715731507984, - "status": "current", - "version": "17.5", + "schema": 1718237107850, + "status": "beta", + "version": "18", "browserid": "safari_ios", - "id": "4375a82d-f2f1-4883-8da7-0aedfb05b8f9", - "last_modified": 1715839095923 + "id": "12c2ba11-079f-439f-b326-3350f7999b38", + "last_modified": 1718606078077 }, { - "name": "Safari", - "schema": 1715731507854, + "name": "WebView Android", + "schema": 1718237108052, + "status": "beta", + "version": "127", + "browserid": "webview_android", + "id": "51d69a2e-b706-44ca-802d-121d29285060", + "last_modified": 1718606078074 + }, + { + "name": "WebView Android", + "schema": 1718237107985, "status": "current", - "version": "17.5", - "browserid": "safari", - "id": "24e30aff-fbf8-4a96-a036-84f970447d4b", - "last_modified": 1715839095920 + "version": "126", + "browserid": "webview_android", + "id": "97b0b530-34a9-4e02-949f-d525bf6bc793", + "last_modified": 1718606078065 + }, + { + "name": "Chrome Android", + "schema": 1718237106898, + "status": "current", + "version": "126", + "browserid": "chrome_android", + "id": "e8108829-a3d5-4363-86c9-7e9f1015c2fd", + "last_modified": 1718606078062 + }, + { + "name": "Chrome", + "schema": 1718237106686, + "status": "current", + "version": "126", + "browserid": "chrome", + "id": "329bb17c-2556-40a6-8e88-eb2fe353913a", + "last_modified": 1718606078060 }, { "name": "Firefox", - "schema": 1715731506990, + "schema": 1718237107202, "status": "beta", - "version": "127", + "version": "128", "browserid": "firefox", - "id": "1477a1c3-a8be-4e6f-916e-8cf8eb789e3f", - "last_modified": 1715839095918 + "id": "565161dc-52d8-4cb1-8cf3-8171b960f9e4", + "last_modified": 1718606078057 }, { "name": "Firefox for Android", - "schema": 1715731507415, + "schema": 1718237107577, "status": "beta", - "version": "127", + "version": "128", "browserid": "firefox_android", - "id": "13f02b93-14c9-4ca4-937d-0a83fb7fb3a5", - "last_modified": 1715839095915 + "id": "05aa43eb-3966-4fc1-8b33-53c493448d2d", + "last_modified": 1718606078055 }, { "name": "Firefox for Android", - "schema": 1715731507341, + "schema": 1718237107506, "status": "current", - "version": "126", + "version": "127", "browserid": "firefox_android", - "id": "b77524e9-58dc-4196-acbd-41dddc4daea2", - "last_modified": 1715839095908 + "id": "13f02b93-14c9-4ca4-937d-0a83fb7fb3a5", + "last_modified": 1718606078048 }, { "name": "Firefox", - "schema": 1715731506911, + "schema": 1718237107126, "status": "current", - "version": "126", + "version": "127", "browserid": "firefox", - "id": "70b05b0b-bbef-486c-901a-ea3221a28fc1", - "last_modified": 1715839095906 + "id": "1477a1c3-a8be-4e6f-916e-8cf8eb789e3f", + "last_modified": 1718606078046 }, { "name": "Firefox for Android", - "schema": 1715731507485, + "schema": 1718237107649, "status": "nightly", - "version": "128", + "version": "129", "browserid": "firefox_android", - "id": "05aa43eb-3966-4fc1-8b33-53c493448d2d", - "last_modified": 1715839095903 + "id": "0e014c85-acab-44d6-8108-3441175573e2", + "last_modified": 1718606078044 }, { "name": "Firefox", - "schema": 1715731507063, + "schema": 1718237107286, "status": "nightly", - "version": "128", + "version": "129", "browserid": "firefox", - "id": "565161dc-52d8-4cb1-8cf3-8171b960f9e4", - "last_modified": 1715839095900 - }, - { - "name": "Node.js", - "schema": 1715126727137, - "status": "current", - "version": "22.0.0", - "browserid": "nodejs", - "id": "c28dfac7-c7de-4e20-8212-abc7c0de635a", - "last_modified": 1715589742262 + "id": "aed9aeed-2d00-44d3-9b04-065a3df6af27", + "last_modified": 1718606078041 }, { "name": "Chrome", - "schema": 1715385903539, + "schema": 1718237106760, "status": "beta", - "version": "126", + "version": "127", "browserid": "chrome", - "id": "329bb17c-2556-40a6-8e88-eb2fe353913a", - "last_modified": 1715589742259 + "id": "0e69f9d7-19f6-4c6e-bc36-731da4cee6e3", + "last_modified": 1718606078039 }, { - "name": "Chrome Android", - "schema": 1715385903774, - "status": "beta", - "version": "126", - "browserid": "chrome_android", - "id": "e8108829-a3d5-4363-86c9-7e9f1015c2fd", - "last_modified": 1715589742256 + "name": "Edge", + "schema": 1717286706296, + "status": "planned", + "version": "128", + "browserid": "edge", + "id": "edad0482-a612-4019-a601-53dc349514b8", + "last_modified": 1718005312987 }, { - "name": "Opera", - "schema": 1715385903851, - "status": "nightly", - "version": "111", - "browserid": "opera", - "id": "880cc50c-e430-43ac-aa57-d1f02fae0e30", - "last_modified": 1715589742254 + "name": "Node.js", + "schema": 1717286706438, + "status": "esr", + "version": "20.12.0", + "browserid": "nodejs", + "id": "93175823-df25-4102-bda0-e45955132cb5", + "last_modified": 1718005312984 }, { - "name": "Opera Android", - "schema": 1715385904000, + "name": "Deno", + "schema": 1717805106873, "status": "current", - "version": "82", - "browserid": "opera_android", - "id": "dad8a164-2e60-4363-a9b2-169aa15ea735", - "last_modified": 1715589742251 + "version": "1.44", + "browserid": "deno", + "id": "ea6c817d-237b-498b-964e-a8ca4668580a", + "last_modified": 1718005312981 }, { - "name": "WebView Android", - "schema": 1715385904222, + "name": "Edge", + "schema": 1717286706151, "status": "beta", "version": "126", - "browserid": "webview_android", - "id": "97b0b530-34a9-4e02-949f-d525bf6bc793", - "last_modified": 1715589742248 + "browserid": "edge", + "id": "c8bf4918-03b7-4be2-bf75-4d6139dbd7c9", + "last_modified": 1718005312974 }, { - "name": "WebView Android", - "schema": 1715385904147, + "name": "Edge", + "schema": 1717286706227, + "status": "nightly", + "version": "127", + "browserid": "edge", + "id": "9e227c6c-b6ca-4c69-868c-e133a0ee9dbd", + "last_modified": 1718005312971 + }, + { + "name": "Edge", + "schema": 1716941107417, "status": "current", "version": "125", - "browserid": "webview_android", - "id": "c9ec1a0b-5d6d-4727-9f93-fb4dd3f1979f", - "last_modified": 1715589742235 + "browserid": "edge", + "id": "f1147d5f-d690-43d0-879d-117c6ca24a16", + "last_modified": 1716966331501 }, { - "name": "Chrome Android", - "schema": 1715385903692, + "name": "Safari on iOS", + "schema": 1715731507984, "status": "current", - "version": "125", - "browserid": "chrome_android", - "id": "7cb3db05-b658-4c6c-a57a-c17a1ceefd38", - "last_modified": 1715589742230 + "version": "17.5", + "browserid": "safari_ios", + "id": "4375a82d-f2f1-4883-8da7-0aedfb05b8f9", + "last_modified": 1715839095923 }, { - "name": "Chrome", - "schema": 1715385903420, + "name": "Safari", + "schema": 1715731507854, "status": "current", - "version": "125", - "browserid": "chrome", - "id": "98f20ad9-f47a-476b-b376-be58dbcc76ff", - "last_modified": 1715589742227 + "version": "17.5", + "browserid": "safari", + "id": "24e30aff-fbf8-4a96-a036-84f970447d4b", + "last_modified": 1715839095920 }, { - "name": "Edge", - "schema": 1714867506498, - "status": "planned", - "version": "127", - "browserid": "edge", - "id": "9e227c6c-b6ca-4c69-868c-e133a0ee9dbd", - "last_modified": 1715003394961 + "name": "Node.js", + "schema": 1715126727137, + "status": "current", + "version": "22.0.0", + "browserid": "nodejs", + "id": "c28dfac7-c7de-4e20-8212-abc7c0de635a", + "last_modified": 1715589742262 }, { - "name": "Edge", - "schema": 1714867506401, + "name": "Opera", + "schema": 1715385903851, "status": "nightly", - "version": "126", - "browserid": "edge", - "id": "c8bf4918-03b7-4be2-bf75-4d6139dbd7c9", - "last_modified": 1715003394956 + "version": "111", + "browserid": "opera", + "id": "880cc50c-e430-43ac-aa57-d1f02fae0e30", + "last_modified": 1715589742254 + }, + { + "name": "Opera Android", + "schema": 1715385904000, + "status": "current", + "version": "82", + "browserid": "opera_android", + "id": "dad8a164-2e60-4363-a9b2-169aa15ea735", + "last_modified": 1715589742251 }, { "name": "Samsung Internet", @@ -225,24 +270,6 @@ "id": "08a3849f-52fd-40ae-9054-b0e33272d279", "last_modified": 1713943930228 }, - { - "name": "Deno", - "schema": 1712707507752, - "status": "current", - "version": "1.42", - "browserid": "deno", - "id": "a308f3c2-cc19-4a1e-825f-898696606328", - "last_modified": 1712840749681 - }, - { - "name": "Node.js", - "schema": 1702685107693, - "status": "esr", - "version": "20.10.0", - "browserid": "nodejs", - "id": "0d78585f-e9e0-41e8-816a-22461158e36d", - "last_modified": 1702890886929 - }, { "name": "Firefox for Android", "schema": 1698797104411, @@ -280,5 +307,5 @@ "last_modified": 1665656484764 } ], - "timestamp": 1716966331504 + "timestamp": 1718606078088 } diff --git a/services/settings/dumps/main/search-telemetry-v2.json b/services/settings/dumps/main/search-telemetry-v2.json index 1a1708529c..4fc276d018 100644 --- a/services/settings/dumps/main/search-telemetry-v2.json +++ b/services/settings/dumps/main/search-telemetry-v2.json @@ -1,95 +1,55 @@ { "data": [ { - "isSPA": true, - "schema": 1712762409532, + "schema": 1717765743694, "components": [ { - "type": "ad_image_row", + "type": "ad_carousel", "included": { "parent": { - "selector": "[data-testid='pam.container']" + "selector": ".pla-exp-container" + }, + "related": { + "selector": "g-right-button, g-left-button, .exp-button" }, "children": [ { - "selector": "[data-slide-index]", + "selector": "[data-dtld]", "countChildren": true } ] } }, { - "type": "ad_link", - "included": { - "parent": { - "selector": "[data-testid='adResult']" - } - } - }, - { - "type": "incontent_searchbox", - "topDown": true, + "type": "ad_carousel", "included": { "parent": { - "selector": "._1zdrb._1cR1n" + "selector": ".sh-sr__shop-result-group" }, "related": { - "selector": "#search-suggestions" + "selector": "g-right-button, g-left-button" }, "children": [ { - "selector": "input[type='search']" + "selector": ".sh-np__click-target", + "countChildren": true } ] } }, { - "type": "ad_link", - "default": true - } - ], - "taggedCodes": [ - "brz-moz", - "firefoxqwant" - ], - "telemetryId": "qwant", - "organicCodes": [], - "codeParamName": "client", - "queryParamName": "q", - "queryParamNames": [ - "q" - ], - "searchPageRegexp": "^https://www\\.qwant\\.com/", - "filter_expression": "env.version|versionCompare(\"124.0a1\")>=0", - "followOnParamNames": [], - "defaultPageQueryParam": { - "key": "t", - "value": "web" - }, - "extraAdServersRegexps": [ - "^https://www\\.bing\\.com/acli?c?k", - "^https://api\\.qwant\\.com/v3/r/", - "^https://fdn\\.qwant\\.com/v3/r/" - ], - "id": "19c434a3-d173-4871-9743-290ac92a3f6b", - "last_modified": 1713187389066 - }, - { - "schema": 1712582517430, - "components": [ - { - "type": "ad_carousel", + "type": "refined_search_buttons", + "topDown": true, "included": { "parent": { - "selector": ".adsMvCarousel" + "selector": "#appbar g-scrolling-carousel" }, "related": { - "selector": ".cr" + "selector": "g-right-button, g-left-button" }, "children": [ { - "selector": ".pa_item", - "countChildren": true + "selector": "a" } ] } @@ -98,17 +58,17 @@ "type": "ad_link", "excluded": { "parent": { - "selector": "aside" + "selector": "#rhs" } }, "included": { "parent": { - "selector": ".sb_adTA" + "selector": "[data-text-ad='1']" }, "children": [ { "type": "ad_sitelink", - "selector": ".b_vlist2col" + "selector": "[role='list']" } ] } @@ -117,11 +77,11 @@ "type": "ad_sidebar", "included": { "parent": { - "selector": "aside" + "selector": "#rhs" }, "children": [ { - "selector": ".pa_item, .sb_adTA", + "selector": ".pla-unit, .mnr-c", "countChildren": true } ] @@ -132,14 +92,36 @@ "topDown": true, "included": { "parent": { - "selector": "form#sb_form" + "selector": "form[role='search']" }, "related": { - "selector": "#sw_as" + "selector": "div.logo + div + div" }, "children": [ { - "selector": "input[name='q']" + "selector": "input[type='text']" + }, + { + "selector": "textarea[name='q']" + } + ] + } + }, + { + "type": "ad_image_row", + "excluded": { + "parent": { + "selector": ".pla-exp-container" + } + }, + "included": { + "parent": { + "selector": ".top-pla-group-inner" + }, + "children": [ + { + "selector": "[data-dtld]", + "countChildren": true } ] } @@ -149,11 +131,11 @@ "topDown": true, "included": { "parent": { - "selector": "div#bnp_cookie_banner" + "selector": "div.spoKVd" }, "children": [ { - "selector": "button#bnp_btn_accept", + "selector": "button#L2AGLb", "eventListeners": [ { "action": "clicked_accept", @@ -162,7 +144,7 @@ ] }, { - "selector": "button#bnp_btn_reject", + "selector": "button#W0wltc", "eventListeners": [ { "action": "clicked_reject", @@ -171,7 +153,7 @@ ] }, { - "selector": "a#bnp_btn_preference", + "selector": "button#VnjCcb", "eventListeners": [ { "action": "clicked_more_options", @@ -188,121 +170,200 @@ } ], "shoppingTab": { - "regexp": "^/shop?", - "selector": "#b-scopeListItem-shop a" + "regexp": "&tbm=shop", + "selector": "div[role='navigation'] a", + "inspectRegexpInSERP": true }, "taggedCodes": [ - "MOZ2", - "MOZ4", - "MOZ5", - "MOZA", - "MOZB", - "MOZD", - "MOZE", - "MOZI", - "MOZL", - "MOZM", - "MOZO", - "MOZR", - "MOZT", - "MOZW", - "MOZX", - "MZSL01", - "MZSL02", - "MZSL03" + "firefox-a", + "firefox-b", + "firefox-b-1", + "firefox-b-ab", + "firefox-b-1-ab", + "firefox-b-d", + "firefox-b-1-d", + "firefox-b-e", + "firefox-b-1-e", + "firefox-b-m", + "firefox-b-1-m", + "firefox-b-o", + "firefox-b-1-o", + "firefox-b-lm", + "firefox-b-1-lm", + "firefox-b-lg", + "firefox-b-huawei-h1611", + "firefox-b-is-oem1", + "firefox-b-oem1", + "firefox-b-oem2", + "firefox-b-tinno", + "firefox-b-pn-wt", + "firefox-b-pn-wt-us", + "ubuntu", + "ubuntu-sn" ], - "telemetryId": "bing", + "telemetryId": "google", "organicCodes": [], - "codeParamName": "pc", + "codeParamName": "client", "queryParamName": "q", - "followOnCookies": [ - { - "host": "www.bing.com", - "name": "SRCHS", - "codeParamName": "PC", - "extraCodePrefixes": [ - "QBRE" - ], - "extraCodeParamName": "form" - } - ], "queryParamNames": [ "q" ], + "signedInCookies": [ + { + "host": "accounts.google.com", + "name": "SID" + } + ], "domainExtraction": { "ads": [ { "method": "textContent", - "selectors": "#b_results .b_ad .b_attribution cite, .adsMvCarousel cite, aside cite" + "selectors": ".sh-np__seller-container" + }, + { + "method": "dataAttribute", + "options": { + "dataAttributeKey": "dtld" + }, + "selectors": "[data-dtld]" } ], "nonAds": [ { - "method": "textContent", - "selectors": "#b_results .b_algo .b_attribution cite" + "method": "href", + "options": { + "queryParamKey": "url", + "queryParamValueIsHref": true + }, + "selectors": ".mnIHsc > a:first-child" + }, + { + "method": "href", + "selectors": "a[jsname='UWckNb']" + }, + { + "method": "dataAttribute", + "options": { + "dataAttributeKey": "lpage" + }, + "selectors": "[data-id='mosaic'] [data-lpage]" } ] }, - "searchPageRegexp": "^https://www\\.bing\\.com/search", + "searchPageRegexp": "^https://www\\.google\\.(?:.+)/search", + "ignoreLinkRegexps": [ + "^https?://consent\\.google\\.(?:.+)/d\\?continue\\=" + ], "nonAdsLinkRegexps": [ - "^https://www.bing.com/ck/a" + "^https?://www\\.google\\.(?:.+)/url?(?:.+)&url=" + ], + "adServerAttributes": [ + "rw" + ], + "followOnParamNames": [ + "oq", + "ved", + "ei" ], "extraAdServersRegexps": [ - "^https://www\\.bing\\.com/acli?c?k" + "^https?://www\\.google(?:adservices)?\\.com/(?:pagead/)?aclk" ], - "id": "e1eec461-f1f3-40de-b94b-3b670b78108c", - "last_modified": 1712762409389 + "nonAdsLinkQueryParamNames": [ + "url" + ], + "id": "635a3325-1995-42d6-be09-dbe4b2a95453", + "last_modified": 1718041017650 }, { - "schema": 1712243919540, + "isSPA": true, + "schema": 1712762409532, "components": [ { - "type": "ad_carousel", + "type": "ad_image_row", "included": { "parent": { - "selector": ".pla-exp-container" - }, - "related": { - "selector": "g-right-button, g-left-button, .exp-button" + "selector": "[data-testid='pam.container']" }, "children": [ { - "selector": "[data-dtld]", + "selector": "[data-slide-index]", "countChildren": true } ] } }, { - "type": "ad_carousel", + "type": "ad_link", "included": { "parent": { - "selector": ".sh-sr__shop-result-group" + "selector": "[data-testid='adResult']" + } + } + }, + { + "type": "incontent_searchbox", + "topDown": true, + "included": { + "parent": { + "selector": "._1zdrb._1cR1n" }, "related": { - "selector": "g-right-button, g-left-button" + "selector": "#search-suggestions" }, "children": [ { - "selector": ".sh-np__click-target", - "countChildren": true + "selector": "input[type='search']" } ] } }, { - "type": "refined_search_buttons", - "topDown": true, + "type": "ad_link", + "default": true + } + ], + "taggedCodes": [ + "brz-moz", + "firefoxqwant" + ], + "telemetryId": "qwant", + "organicCodes": [], + "codeParamName": "client", + "queryParamName": "q", + "queryParamNames": [ + "q" + ], + "searchPageRegexp": "^https://www\\.qwant\\.com/", + "filter_expression": "env.version|versionCompare(\"124.0a1\")>=0", + "followOnParamNames": [], + "defaultPageQueryParam": { + "key": "t", + "value": "web" + }, + "extraAdServersRegexps": [ + "^https://www\\.bing\\.com/acli?c?k", + "^https://api\\.qwant\\.com/v3/r/", + "^https://fdn\\.qwant\\.com/v3/r/" + ], + "id": "19c434a3-d173-4871-9743-290ac92a3f6b", + "last_modified": 1713187389066 + }, + { + "schema": 1712582517430, + "components": [ + { + "type": "ad_carousel", "included": { "parent": { - "selector": "#appbar g-scrolling-carousel" + "selector": ".adsMvCarousel" }, "related": { - "selector": "g-right-button, g-left-button" + "selector": ".cr" }, "children": [ { - "selector": "a" + "selector": ".pa_item", + "countChildren": true } ] } @@ -311,17 +372,17 @@ "type": "ad_link", "excluded": { "parent": { - "selector": "#rhs" + "selector": "aside" } }, "included": { "parent": { - "selector": "[data-text-ad='1']" + "selector": ".sb_adTA" }, "children": [ { "type": "ad_sitelink", - "selector": "[role='list']" + "selector": ".b_vlist2col" } ] } @@ -330,11 +391,11 @@ "type": "ad_sidebar", "included": { "parent": { - "selector": "#rhs" + "selector": "aside" }, "children": [ { - "selector": ".pla-unit, .mnr-c", + "selector": ".pa_item, .sb_adTA", "countChildren": true } ] @@ -345,36 +406,14 @@ "topDown": true, "included": { "parent": { - "selector": "form[role='search']" + "selector": "form#sb_form" }, "related": { - "selector": "div.logo + div + div" - }, - "children": [ - { - "selector": "input[type='text']" - }, - { - "selector": "textarea[name='q']" - } - ] - } - }, - { - "type": "ad_image_row", - "excluded": { - "parent": { - "selector": ".pla-exp-container" - } - }, - "included": { - "parent": { - "selector": ".top-pla-group-inner" + "selector": "#sw_as" }, "children": [ { - "selector": "[data-dtld]", - "countChildren": true + "selector": "input[name='q']" } ] } @@ -384,11 +423,11 @@ "topDown": true, "included": { "parent": { - "selector": "div.spoKVd" + "selector": "div#bnp_cookie_banner" }, "children": [ { - "selector": "button#L2AGLb", + "selector": "button#bnp_btn_accept", "eventListeners": [ { "action": "clicked_accept", @@ -397,7 +436,7 @@ ] }, { - "selector": "button#W0wltc", + "selector": "button#bnp_btn_reject", "eventListeners": [ { "action": "clicked_reject", @@ -406,7 +445,7 @@ ] }, { - "selector": "button#VnjCcb", + "selector": "a#bnp_btn_preference", "eventListeners": [ { "action": "clicked_more_options", @@ -423,41 +462,44 @@ } ], "shoppingTab": { - "regexp": "&tbm=shop", - "selector": "div[role='navigation'] a", - "inspectRegexpInSERP": true + "regexp": "^/shop?", + "selector": "#b-scopeListItem-shop a" }, "taggedCodes": [ - "firefox-a", - "firefox-b", - "firefox-b-1", - "firefox-b-ab", - "firefox-b-1-ab", - "firefox-b-d", - "firefox-b-1-d", - "firefox-b-e", - "firefox-b-1-e", - "firefox-b-m", - "firefox-b-1-m", - "firefox-b-o", - "firefox-b-1-o", - "firefox-b-lm", - "firefox-b-1-lm", - "firefox-b-lg", - "firefox-b-huawei-h1611", - "firefox-b-is-oem1", - "firefox-b-oem1", - "firefox-b-oem2", - "firefox-b-tinno", - "firefox-b-pn-wt", - "firefox-b-pn-wt-us", - "ubuntu", - "ubuntu-sn" + "MOZ2", + "MOZ4", + "MOZ5", + "MOZA", + "MOZB", + "MOZD", + "MOZE", + "MOZI", + "MOZL", + "MOZM", + "MOZO", + "MOZR", + "MOZT", + "MOZW", + "MOZX", + "MZSL01", + "MZSL02", + "MZSL03" ], - "telemetryId": "google", + "telemetryId": "bing", "organicCodes": [], - "codeParamName": "client", + "codeParamName": "pc", "queryParamName": "q", + "followOnCookies": [ + { + "host": "www.bing.com", + "name": "SRCHS", + "codeParamName": "PC", + "extraCodePrefixes": [ + "QBRE" + ], + "extraCodeParamName": "form" + } + ], "queryParamNames": [ "q" ], @@ -465,61 +507,25 @@ "ads": [ { "method": "textContent", - "selectors": ".sh-np__seller-container" - }, - { - "method": "dataAttribute", - "options": { - "dataAttributeKey": "dtld" - }, - "selectors": "[data-dtld]" + "selectors": "#b_results .b_ad .b_attribution cite, .adsMvCarousel cite, aside cite" } ], "nonAds": [ { - "method": "href", - "options": { - "queryParamKey": "url", - "queryParamValueIsHref": true - }, - "selectors": ".mnIHsc > a:first-child" - }, - { - "method": "href", - "selectors": "a[jsname='UWckNb']" - }, - { - "method": "dataAttribute", - "options": { - "dataAttributeKey": "lpage" - }, - "selectors": "[data-id='mosaic'] [data-lpage]" + "method": "textContent", + "selectors": "#b_results .b_algo .b_attribution cite" } ] }, - "searchPageRegexp": "^https://www\\.google\\.(?:.+)/search", - "ignoreLinkRegexps": [ - "^https?://consent\\.google\\.(?:.+)/d\\?continue\\=" - ], + "searchPageRegexp": "^https://www\\.bing\\.com/search", "nonAdsLinkRegexps": [ - "^https?://www\\.google\\.(?:.+)/url?(?:.+)&url=" - ], - "adServerAttributes": [ - "rw" - ], - "followOnParamNames": [ - "oq", - "ved", - "ei" + "^https://www.bing.com/ck/a" ], "extraAdServersRegexps": [ - "^https?://www\\.google(?:adservices)?\\.com/(?:pagead/)?aclk" - ], - "nonAdsLinkQueryParamNames": [ - "url" + "^https://www\\.bing\\.com/acli?c?k" ], - "id": "635a3325-1995-42d6-be09-dbe4b2a95453", - "last_modified": 1712582517281 + "id": "e1eec461-f1f3-40de-b94b-3b670b78108c", + "last_modified": 1712762409389 }, { "schema": 1705363206938, @@ -786,5 +792,5 @@ "last_modified": 1698666532324 } ], - "timestamp": 1713187389066 + "timestamp": 1718041017650 } -- cgit v1.2.3