From 989ac4252beb2fb3be7b5ecac1c3340acfd907a4 Mon Sep 17 00:00:00 2001 From: Sam Macbeth Date: Tue, 16 Jun 2020 16:13:19 +0200 Subject: [PATCH 1/5] Use -lite modules when running on Android. --- src/background.js | 7 ++++--- src/classes/Cliqz.js | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/background.js b/src/background.js index a7f34aa05..e1f19330b 100644 --- a/src/background.js +++ b/src/background.js @@ -16,7 +16,7 @@ */ import { debounce, every, size } from 'underscore'; import moment from 'moment/min/moment-with-locales.min'; -import cliqz from './classes/Cliqz'; +import cliqz, { HUMANWEB_MODULE, HPN_MODULE } from './classes/Cliqz'; // object class import Events from './classes/EventHandlers'; import Policy from './classes/Policy'; @@ -75,8 +75,9 @@ const moduleMock = { isEnabled: false, on: () => {}, }; -const humanweb = cliqz.modules['human-web']; -const { adblocker, antitracking, hpnv2 } = cliqz.modules; +const humanweb = cliqz.modules[HUMANWEB_MODULE]; +const hpnv2 = cliqz.modules[HPN_MODULE]; +const { adblocker, antitracking } = cliqz.modules; const offers = cliqz.modules['offers-v2'] || moduleMock; const insights = cliqz.modules.insights || moduleMock; // add ghostery module to expose ghostery state to cliqz diff --git a/src/classes/Cliqz.js b/src/classes/Cliqz.js index 0d6e05a34..c4861adf2 100644 --- a/src/classes/Cliqz.js +++ b/src/classes/Cliqz.js @@ -15,4 +15,20 @@ import CLIQZ from 'browser-core'; import globals from './Globals'; +const IS_ANDROID = globals.BROWSER_INFO.os === 'android'; +export const HUMANWEB_MODULE = IS_ANDROID ? 'human-web-lite' : 'human-web'; +export const HPN_MODULE = IS_ANDROID ? 'hpn-lite' : 'hpnv2'; +// override the default prefs based on the platform +CLIQZ.config.default_prefs = { + ...CLIQZ.config.default_prefs, + // the following are enabled by default on non-android platforms + 'modules.human-web.enabled': !IS_ANDROID, + 'modules.hpnv2.enabled': !IS_ANDROID, + 'modules.offers-v2.enabled': !IS_ANDROID, + 'modules.offers-banner.enabled': !IS_ANDROID, + // the following are enabled for android only + 'modules.human-web-lite.enabled': IS_ANDROID, + 'modules.hpn-lite.enabled': IS_ANDROID, +}; + export default new (CLIQZ.App)({ debug: globals.DEBUG }); From bbdd570666f5f2294115088633b0b9ca6de4ba49 Mon Sep 17 00:00:00 2001 From: Sam Macbeth Date: Tue, 16 Jun 2020 16:29:45 +0200 Subject: [PATCH 2/5] Use new Geckoview page action popup support Launches info popup in a temporary webview, rather than a full tab. --- src/background.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/background.js b/src/background.js index e1f19330b..a4ea5e6d0 100644 --- a/src/background.js +++ b/src/background.js @@ -1341,11 +1341,8 @@ function getDataForGhosteryTab(callback) { */ function initializePopup() { if (BROWSER_INFO.os === 'android') { - chrome.browserAction.onClicked.addListener((tab) => { - chrome.tabs.create({ - url: chrome.extension.getURL(`app/templates/panel_android.html?tabId=${tab.id}`), - active: true, - }); + chrome.browserAction.setPopup({ + popup: 'app/templates/panel_android.html', }); } else { chrome.browserAction.setPopup({ From 2e41c904ecf63579ca01d56f11c4ef4b375caa83 Mon Sep 17 00:00:00 2001 From: Sam Macbeth Date: Thu, 18 Jun 2020 10:12:02 +0200 Subject: [PATCH 3/5] Override HW_CHANNEL for android. --- src/classes/Cliqz.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/classes/Cliqz.js b/src/classes/Cliqz.js index c4861adf2..7ce2f20a9 100644 --- a/src/classes/Cliqz.js +++ b/src/classes/Cliqz.js @@ -30,5 +30,8 @@ CLIQZ.config.default_prefs = { 'modules.human-web-lite.enabled': IS_ANDROID, 'modules.hpn-lite.enabled': IS_ANDROID, }; +if (IS_ANDROID) { + CLIQZ.config.settings.HW_CHANNEL = 'android'; +} export default new (CLIQZ.App)({ debug: globals.DEBUG }); From 2b733196fbc776ad417067b4967f34dd20f441b8 Mon Sep 17 00:00:00 2001 From: Sam Macbeth Date: Thu, 18 Jun 2020 10:12:49 +0200 Subject: [PATCH 4/5] Update browser-core build. --- package.json | 2 +- yarn.lock | 369 ++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 281 insertions(+), 90 deletions(-) diff --git a/package.json b/package.json index f2d09f4db..bd72f343d 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "dependencies": { "@cliqz/adblocker-circumvention": "^1.12.2", "@cliqz/url-parser": "^1.1.3", - "browser-core": "https://github.com/cliqz-oss/browser-core/releases/download/v7.45.2/browser-core-7.45.2.tgz", + "browser-core": "https://github.com/cliqz-oss/browser-core/releases/download/v7.47.0/browser-core-7.47.0.tgz", "classnames": "^2.2.5", "d3": "^5.16.0", "foundation-sites": "^6.6.2", diff --git a/yarn.lock b/yarn.lock index 90470417a..4d9f4172b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9,6 +9,13 @@ dependencies: "@babel/highlight" "^7.8.3" +"@babel/code-frame@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.1.tgz#d5481c5095daa1c57e16e54c6f9198443afb49ff" + integrity sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw== + dependencies: + "@babel/highlight" "^7.10.1" + "@babel/core@^7.1.0", "@babel/core@^7.7.5", "@babel/core@^7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e" @@ -31,6 +38,16 @@ semver "^5.4.1" source-map "^0.5.0" +"@babel/generator@^7.10.1": + version "7.10.2" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.2.tgz#0fa5b5b2389db8bfdfcc3492b551ee20f5dd69a9" + integrity sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA== + dependencies: + "@babel/types" "^7.10.2" + jsesc "^2.5.1" + lodash "^4.17.13" + source-map "^0.5.0" + "@babel/generator@^7.9.0", "@babel/generator@^7.9.5": version "7.9.5" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.5.tgz#27f0917741acc41e6eaaced6d68f96c3fa9afaf9" @@ -41,6 +58,13 @@ lodash "^4.17.13" source-map "^0.5.0" +"@babel/helper-annotate-as-pure@^7.0.0": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz#f6d08acc6f70bbd59b436262553fb2e259a1a268" + integrity sha512-ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw== + dependencies: + "@babel/types" "^7.10.1" + "@babel/helper-annotate-as-pure@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee" @@ -77,6 +101,15 @@ "@babel/helper-replace-supers" "^7.8.6" "@babel/helper-split-export-declaration" "^7.8.3" +"@babel/helper-function-name@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz#92bd63829bfc9215aca9d9defa85f56b539454f4" + integrity sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ== + dependencies: + "@babel/helper-get-function-arity" "^7.10.1" + "@babel/template" "^7.10.1" + "@babel/types" "^7.10.1" + "@babel/helper-function-name@^7.9.5": version "7.9.5" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c" @@ -86,6 +119,13 @@ "@babel/template" "^7.8.3" "@babel/types" "^7.9.5" +"@babel/helper-get-function-arity@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz#7303390a81ba7cb59613895a192b93850e373f7d" + integrity sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw== + dependencies: + "@babel/types" "^7.10.1" + "@babel/helper-get-function-arity@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5" @@ -100,6 +140,13 @@ dependencies: "@babel/types" "^7.8.3" +"@babel/helper-module-imports@^7.0.0": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz#dd331bd45bccc566ce77004e9d05fe17add13876" + integrity sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg== + dependencies: + "@babel/types" "^7.10.1" + "@babel/helper-module-imports@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498" @@ -150,6 +197,13 @@ "@babel/template" "^7.8.3" "@babel/types" "^7.8.3" +"@babel/helper-split-export-declaration@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz#c6f4be1cbc15e3a868e4c64a17d5d31d754da35f" + integrity sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g== + dependencies: + "@babel/types" "^7.10.1" + "@babel/helper-split-export-declaration@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9" @@ -157,6 +211,11 @@ dependencies: "@babel/types" "^7.8.3" +"@babel/helper-validator-identifier@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz#5770b0c1a826c4f53f5ede5e153163e0318e94b5" + integrity sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw== + "@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5": version "7.9.5" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80" @@ -171,6 +230,15 @@ "@babel/traverse" "^7.9.0" "@babel/types" "^7.9.0" +"@babel/highlight@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.1.tgz#841d098ba613ba1a427a2b383d79e35552c38ae0" + integrity sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg== + dependencies: + "@babel/helper-validator-identifier" "^7.10.1" + chalk "^2.0.0" + js-tokens "^4.0.0" + "@babel/highlight@^7.8.3": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079" @@ -185,6 +253,11 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8" integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA== +"@babel/parser@^7.10.1": + version "7.10.2" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.2.tgz#871807f10442b92ff97e4783b9b54f6a0ca812d0" + integrity sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ== + "@babel/plugin-proposal-class-properties@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz#5e06654af5cd04b608915aada9b2a6788004464e" @@ -366,6 +439,15 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/template@^7.10.1": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.1.tgz#e167154a94cb5f14b28dc58f5356d2162f539811" + integrity sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig== + dependencies: + "@babel/code-frame" "^7.10.1" + "@babel/parser" "^7.10.1" + "@babel/types" "^7.10.1" + "@babel/template@^7.7.4", "@babel/template@^7.8.3", "@babel/template@^7.8.6": version "7.8.6" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b" @@ -390,6 +472,21 @@ globals "^11.1.0" lodash "^4.17.13" +"@babel/traverse@^7.4.5": + version "7.10.1" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.1.tgz#bbcef3031e4152a6c0b50147f4958df54ca0dd27" + integrity sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ== + dependencies: + "@babel/code-frame" "^7.10.1" + "@babel/generator" "^7.10.1" + "@babel/helper-function-name" "^7.10.1" + "@babel/helper-split-export-declaration" "^7.10.1" + "@babel/parser" "^7.10.1" + "@babel/types" "^7.10.1" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.13" + "@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5": version "7.9.5" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.5.tgz#89231f82915a8a566a703b3b20133f73da6b9444" @@ -399,6 +496,15 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" +"@babel/types@^7.10.1", "@babel/types@^7.10.2": + version "7.10.2" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.2.tgz#30283be31cad0dbf6fb00bd40641ca0ea675172d" + integrity sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng== + dependencies: + "@babel/helper-validator-identifier" "^7.10.1" + lodash "^4.17.13" + to-fast-properties "^2.0.0" + "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" @@ -416,49 +522,51 @@ dependencies: "@cliqz/adblocker-content" "^1.12.2" -"@cliqz/adblocker-content@^1.12.2", "@cliqz/adblocker-content@^1.14.1": +"@cliqz/adblocker-content@^1.12.2": version "1.14.1" resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.14.1.tgz#d026a67523a8797af3d6574158887c64c602ed4e" integrity sha512-zQ9eUGp/kgmL4gj8RoskTdZdz5jlFbwIEWlgGZGhJ9ek48roIJRtx0Lzkykc7zvr76umKZfWiqpX4R0UPWICnQ== -"@cliqz/adblocker-webextension-cosmetics@^1.9.2": - version "1.14.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-webextension-cosmetics/-/adblocker-webextension-cosmetics-1.14.1.tgz#b86d9591d55b22b269513d4539a145a2d1bc5f7c" - integrity sha512-ZGKYInPqUU9BtA+2bfEiuLRNQ+YN+zh/F0kCJNhyYCczJyoyMTgwmafUkRgOmlf4LweRiQ7HV7b5VaC9YMkVqA== +"@cliqz/adblocker-content@^1.16.0": + version "1.16.0" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.16.0.tgz#a20ab15af6495354b8c83b69e6914b4e8ec0db7d" + integrity sha512-UnT3xxWCqNpyhQsKsf7q+qZtXP468i+H00avTbsgKrDJcjaupS9rSEesP/2pDXmHn12vcEQtlA/T5GA3ZD9Sgw== + +"@cliqz/adblocker-webextension-cosmetics@^1.14.2": + version "1.16.0" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-webextension-cosmetics/-/adblocker-webextension-cosmetics-1.16.0.tgz#5f8d82178325ab63d699a72663c5e895d64dd443" + integrity sha512-8j0gUwZau8mz7j37tXS6FH7U7gC8bfAC+Evz9yfa8iFu7WLHWnttVNVxngS3+H/QuiCnQUt37aZhSPXrtesvhQ== dependencies: - "@cliqz/adblocker-content" "^1.14.1" + "@cliqz/adblocker-content" "^1.16.0" -"@cliqz/adblocker-webextension@^1.9.2": - version "1.14.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-webextension/-/adblocker-webextension-1.14.1.tgz#7d8a6eddae9008a6eb8ac3ee195a859de71bcc17" - integrity sha512-ZS8flvLOelX8ibsW4VA2ZzbVFmyTre37riOgnYKqkzV9nT+2MwVY/op2EGO3ajryfLbxG9QFZVpARsQSoV1lOg== +"@cliqz/adblocker-webextension@^1.14.2": + version "1.16.0" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-webextension/-/adblocker-webextension-1.16.0.tgz#a10818b854231a205585bb17435f7b3dfc85eb0c" + integrity sha512-D6aWjvIYIfOMT7PKx6gsGtPjUdgnLMFHE5c3yWGMLq7BshjUWxiyyVKmx3b0LxzBdPY+e+he8UhIr2xaRN2wCw== dependencies: - "@cliqz/adblocker" "^1.14.1" - "@cliqz/adblocker-content" "^1.14.1" + "@cliqz/adblocker" "^1.16.0" + "@cliqz/adblocker-content" "^1.16.0" tldts-experimental "^5.6.21" - webextension-polyfill-ts "^0.14.0" + webextension-polyfill-ts "^0.17.0" -"@cliqz/adblocker@^1.14.1": - version "1.14.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.14.1.tgz#e33439a25778d2c42af4aad00267ea0685311f01" - integrity sha512-L/k/qnzw1gNo8zZywMhSGlifUTdi2iUAG09NPY2XfGG2ZCGel3qGZ0nLQbjmU9W0l6t6k8bO52Dlhh825Hqppg== +"@cliqz/adblocker@^1.16.0": + version "1.16.0" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.16.0.tgz#26915786b44a88660e6b20a1c4227ee7f26e93f8" + integrity sha512-aZwNPS6XNgI87eA+IBxski/2XLDMqf0AEhT/pgaAbt7ZaTD0hCZBXHXoO1YfcOp8PcZZyOtZXoGvrIdnSji7FQ== dependencies: "@remusao/guess-url-type" "^1.1.2" "@remusao/small" "^1.1.2" "@remusao/smaz" "^1.7.1" - "@types/chrome" "^0.0.103" + "@types/chrome" "^0.0.114" "@types/firefox-webext-browser" "^70.0.1" tldts-experimental "^5.6.21" -"@cliqz/autoconsent@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@cliqz/autoconsent/-/autoconsent-0.4.0.tgz#43f9d2ab80e9b73be438687b330a95c353542e8c" - integrity sha512-1tt6rgieugLT3bFXD6ok+oMy52QNVsf1SyvOXh25x5fhJy+O+0s6v5LaqbeaBNzlsGo2DFlIbb2hgBcC73SkYw== - dependencies: - consent-string "^1.4.2" - webextension-polyfill "^0.4.0" +"@cliqz/autoconsent@^0.5.1": + version "0.5.1" + resolved "https://registry.yarnpkg.com/@cliqz/autoconsent/-/autoconsent-0.5.1.tgz#951cdb66b599b8a00c713db5a65921321100e94c" + integrity sha512-nxMjghW+90hsBzWJ/b7+8Xt1985rkeT9+vDZVXh1tgysWTD+71rsVEesJzTWsVN48/N3svGc6RJiv6QQQHiJDg== -"@cliqz/url-parser@^1.1.2", "@cliqz/url-parser@^1.1.3": +"@cliqz/url-parser@^1.1.3": version "1.1.3" resolved "https://registry.yarnpkg.com/@cliqz/url-parser/-/url-parser-1.1.3.tgz#71720c2fdf142970445dfcaf9e04a01682f8a065" integrity sha512-WJb5mDJvMf+3RWaK4URVziBrlabjrqycBDz7/JtP613I2lSYKMKHV++xlm+BddDackGXHFfl1+IcmJekhVnzrw== @@ -473,6 +581,28 @@ exec-sh "^0.3.2" minimist "^1.2.0" +"@emotion/is-prop-valid@^0.8.8": + version "0.8.8" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a" + integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA== + dependencies: + "@emotion/memoize" "0.7.4" + +"@emotion/memoize@0.7.4": + version "0.7.4" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" + integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw== + +"@emotion/stylis@^0.8.4": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04" + integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ== + +"@emotion/unitless@^0.7.4": + version "0.7.5" + resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" + integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== + "@istanbuljs/load-nyc-config@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz#10602de5570baea82f8afbfa2630b24e7a8cfe5b" @@ -790,10 +920,10 @@ dependencies: "@babel/types" "^7.3.0" -"@types/chrome@^0.0.103": - version "0.0.103" - resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.103.tgz#604f3d94ab4465cc8cde302c4916f4955eb7e8b6" - integrity sha512-s8So1IG1fIu2dg2MRV3k6W5OjlVaJriNXIxIWDHi+Rdz5dLeuzPKcWzkVlcaVL4gONfn44JKC0RhW+P0UohLfg== +"@types/chrome@^0.0.114": + version "0.0.114" + resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.114.tgz#8ceb33fa261f4b9e307fa7344ba8182d8d410d4e" + integrity sha512-i7qRr74IrxHtbnrZSKUuP5Uvd5EOKwlwJq/yp7+yTPihOXnPhNQO4Z5bqb1XTnrjdbUKEJicaVVbhcgtRijmLA== dependencies: "@types/filesystem" "*" "@types/har-format" "*" @@ -1504,6 +1634,21 @@ babel-plugin-jest-hoist@^25.4.0: dependencies: "@types/babel__traverse" "^7.0.6" +"babel-plugin-styled-components@>= 1": + version "1.10.7" + resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.10.7.tgz#3494e77914e9989b33cc2d7b3b29527a949d635c" + integrity sha512-MBMHGcIA22996n9hZRf/UJLVVgkEOITuR2SvjHLb5dSTUyR4ZRGn+ngITapes36FI3WLxZHfRhkA1ffHxihOrg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.0.0" + "@babel/helper-module-imports" "^7.0.0" + babel-plugin-syntax-jsx "^6.18.0" + lodash "^4.17.11" + +babel-plugin-syntax-jsx@^6.18.0: + version "6.18.0" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" + integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY= + babel-preset-current-node-syntax@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz#fb4a4c51fe38ca60fede1dc74ab35eb843cb41d6" @@ -1538,11 +1683,6 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= -base-64@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/base-64/-/base-64-0.1.0.tgz#780a99c84e7d600260361511c4877613bf24f6bb" - integrity sha1-eAqZyE59YAJgNhURxId2E78k9rs= - base64-js@^1.0.2: version "1.3.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1" @@ -1648,22 +1788,22 @@ brorand@^1.0.1: resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= -"browser-core@https://github.com/cliqz-oss/browser-core/releases/download/v7.45.2/browser-core-7.45.2.tgz": - version "7.45.2" - resolved "https://github.com/cliqz-oss/browser-core/releases/download/v7.45.2/browser-core-7.45.2.tgz#548ff63f47ac7a92be2ffc2bb8edc6de84db7d73" +"browser-core@https://github.com/cliqz-oss/browser-core/releases/download/v7.47.0/browser-core-7.47.0.tgz": + version "7.47.0" + resolved "https://github.com/cliqz-oss/browser-core/releases/download/v7.47.0/browser-core-7.47.0.tgz#0081d128175c640cbc11a5583654deaef15fa6d2" dependencies: "@cliqz-oss/dexie" "^2.0.4" - "@cliqz/adblocker-webextension" "^1.9.2" - "@cliqz/adblocker-webextension-cosmetics" "^1.9.2" - "@cliqz/autoconsent" "^0.4.0" - "@cliqz/url-parser" "^1.1.2" + "@cliqz/adblocker-webextension" "^1.14.2" + "@cliqz/adblocker-webextension-cosmetics" "^1.14.2" + "@cliqz/autoconsent" "^0.5.1" + "@cliqz/url-parser" "^1.1.3" abortcontroller-polyfill "^1.4.0" anonymous-credentials "https://github.com/cliqz-oss/anonymous-credentials/releases/download/1.0.0/anonymous-credentials-1.0.0.tgz" fast-deep-equal "^3.1.1" - handlebars "^4.7.3" - jquery "^3.4.1" + handlebars "^4.7.6" + jquery "^3.5.0" jsep "^0.3.0" - jsonschema "^1.2.4" + jsonschema "^1.2.6" math-expression-evaluator "^1.2.22" moment "^2.24.0" node-fetch "^2.6.0" @@ -1676,17 +1816,18 @@ brorand@^1.0.1: react-dom "^16.13.1" react-modal "3.11.2" rusha "^0.8.13" - rxjs "^6.5.4" + rxjs "^6.5.5" sanitize-filename "^1.6.3" spanan "^2.0.0" spectre.css "^0.5.8" + styled-components "^5.1.0" text-encoding "^0.7.0" - tldts-experimental "^5.6.14" + tldts-experimental "^5.6.24" tooltipster "^4.2.7" ua-parser-js "^0.7.21" - uuid "^7.0.2" + uuid "^7.0.3" webextension-polyfill "^0.6.0" - ytdl-core "^2.0.1" + ytdl-core "^2.1.1" browser-process-hrtime@^1.0.0: version "1.0.0" @@ -1864,6 +2005,11 @@ camelcase@^5.0.0, camelcase@^5.3.1: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== +camelize@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b" + integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs= + capture-exit@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4" @@ -2152,13 +2298,6 @@ confusing-browser-globals@^1.0.9: resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz#72bc13b483c0276801681871d4898516f8f54fdd" integrity sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw== -consent-string@^1.4.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/consent-string/-/consent-string-1.5.2.tgz#cd3615f406a1d7649ebc9722960b5e451cf6a685" - integrity sha512-xzfHnFzHQSupiamNY93UGn8FggPajHYExI45pzadhVpXVaj3ztnhnA7lYjKXl09pKRQKCT4hvjytt+2eoH7Jaw== - dependencies: - base-64 "^0.1.0" - console-browserify@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" @@ -2304,6 +2443,11 @@ crypto-browserify@^3.11.0: randombytes "^2.0.0" randomfill "^1.0.3" +css-color-keywords@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05" + integrity sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU= + css-loader@^3.4.2: version "3.5.2" resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.5.2.tgz#6483ae56f48a7f901fbe07dde2fc96b01eafab3c" @@ -2333,6 +2477,15 @@ css-select@~1.2.0: domutils "1.5.1" nth-check "~1.0.1" +css-to-react-native@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.0.0.tgz#62dbe678072a824a689bcfee011fc96e02a7d756" + integrity sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ== + dependencies: + camelize "^1.0.0" + css-color-keywords "^1.0.0" + postcss-value-parser "^4.0.2" + css-what@2.1: version "2.1.3" resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" @@ -3945,7 +4098,7 @@ gud@^1.0.0: resolved "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0" integrity sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw== -handlebars@^4.7.3: +handlebars@^4.7.6: version "4.7.6" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e" integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA== @@ -4072,7 +4225,7 @@ hmac-drbg@^1.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0: +hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== @@ -4105,7 +4258,7 @@ html-encoding-sniffer@^1.0.2: dependencies: whatwg-encoding "^1.0.1" -html-entities@^1.1.3: +html-entities@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44" integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA== @@ -5105,10 +5258,10 @@ jest@^25.4.0: import-local "^3.0.2" jest-cli "^25.4.0" -jquery@^3.4.1: - version "3.5.0" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9" - integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ== +jquery@^3.5.0: + version "3.5.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5" + integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg== js-base64@^2.1.8: version "2.5.2" @@ -5262,7 +5415,7 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -jsonschema@^1.2.4: +jsonschema@^1.2.6: version "1.2.6" resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.2.6.tgz#52b0a8e9dc06bbae7295249d03e4b9faee8a0c0b" integrity sha512-SqhURKZG07JyKKeo/ir24QnS4/BV7a6gQy93bUSe4lUdNp0QNpIz2c9elWJQ9dpc5cQYY6cvCzgRwy0MQCLyqA== @@ -5505,7 +5658,7 @@ lodash.sortby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= -lodash@^4.0.0, lodash@^4.15.0, lodash@^4.16.3, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@~4.17.12: +lodash@^4.0.0, lodash@^4.15.0, lodash@^4.16.3, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@~4.17.12: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== @@ -5552,10 +5705,10 @@ lru-cache@^5.1.1: dependencies: yallist "^3.0.2" -m3u8stream@^0.6.3: - version "0.6.5" - resolved "https://registry.yarnpkg.com/m3u8stream/-/m3u8stream-0.6.5.tgz#a41713cb7144f8fe1eb944d32a8848be8cb2c951" - integrity sha512-QZCzhcfUliZfsOboi68QkNcMejPKTEhxE+s1TApvHubDeR8ythm4ViWuYFqgUwZeoHe8q0nsPxOvA3lQvdSzyg== +m3u8stream@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/m3u8stream/-/m3u8stream-0.7.1.tgz#74b01a67ca248ac7bbdc263a65d9d8d2c479a65c" + integrity sha512-z6ldnAdhbuWOL6LmMkwptSZGzj+qbRytMKLTbNicwF/bJMjf9U9lqD57RNQUFecvWadEkzy6PDjcNJFFgi19uQ== dependencies: miniget "^1.6.1" sax "^1.2.4" @@ -5775,11 +5928,16 @@ mini-css-extract-plugin@^0.9.0: schema-utils "^1.0.0" webpack-sources "^1.1.0" -miniget@^1.6.1, miniget@^1.7.0: +miniget@^1.6.1: version "1.7.0" resolved "https://registry.yarnpkg.com/miniget/-/miniget-1.7.0.tgz#a29eb79ebff479e9efafd271616981c603987875" integrity sha512-yrgaDSMRzrfYTkudB4Y6xK8pCb7oAH2bvfv6iPY2m6CedZfs9yK4b/ofh0Vzv08hCYXH/HHkoS8an6fkWtOAQA== +miniget@^1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/miniget/-/miniget-1.7.2.tgz#f95eff50b78d798dddee2460c4aa3c72db1aa23a" + integrity sha512-USPNNK2bnHLOplX8BZVMehUkyQizS/DFpBdoH0TS+fM+hQoLNg9tWg4MeY9wE8gfY0pbzmx5UBEODujt3Lz8AA== + minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" @@ -6706,6 +6864,11 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.3: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz#651ff4593aa9eda8d5d0d66593a2417aeaeb325d" integrity sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg== +postcss-value-parser@^4.0.2: + version "4.1.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" + integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== + postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6: version "7.0.27" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9" @@ -7498,7 +7661,7 @@ rw@1: resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q= -rxjs@^6.5.3, rxjs@^6.5.4: +rxjs@^6.5.3, rxjs@^6.5.5: version "6.5.5" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec" integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ== @@ -7680,6 +7843,11 @@ shallow-clone@^3.0.0: dependencies: kind-of "^6.0.2" +shallowequal@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" + integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== + shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -8210,6 +8378,22 @@ strip-json-comments@^3.0.1, strip-json-comments@^3.1.0: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz#7638d31422129ecf4457440009fba03f9f9ac180" integrity sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w== +styled-components@^5.1.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.1.1.tgz#96dfb02a8025794960863b9e8e365e3b6be5518d" + integrity sha512-1ps8ZAYu2Husx+Vz8D+MvXwEwvMwFv+hqqUwhNlDN5ybg6A+3xyW1ECrAgywhvXapNfXiz79jJyU0x22z0FFTg== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/traverse" "^7.4.5" + "@emotion/is-prop-valid" "^0.8.8" + "@emotion/stylis" "^0.8.4" + "@emotion/unitless" "^0.7.4" + babel-plugin-styled-components ">= 1" + css-to-react-native "^3.0.0" + hoist-non-react-statics "^3.0.0" + shallowequal "^1.1.0" + supports-color "^5.5.0" + supports-color@6.1.0, supports-color@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" @@ -8382,13 +8566,25 @@ tldts-core@^5.6.23: resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.6.23.tgz#f25c4ece2bfe49242cba9b27e5ae2a98d8d1e0a7" integrity sha512-Nd4JG/Ar04Yd4zcgGmZfuQaMm9gioPLNKJnSj1nYe2FPRw/OyypPdOl1oD0ZvBOW0n+p8zboy9vADJBBUxmG4g== -tldts-experimental@^5.3.1, tldts-experimental@^5.6.14, tldts-experimental@^5.6.21: +tldts-core@^5.6.34: + version "5.6.34" + resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.6.34.tgz#01d83ac8cfd4a5d3142bc8ad613b97f78e72e186" + integrity sha512-9uL92FJD0sOCSVo2MH6AqLQ32wOe/omgqdEZayp+0ol01CxrNrxRs7y08dtljUVhqFcZ4Srl3BY2VSMgl3WurA== + +tldts-experimental@^5.3.1, tldts-experimental@^5.6.21: version "5.6.23" resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.6.23.tgz#35a85704827b8a82f06dc1a2c2756fc2a2fe6844" integrity sha512-844S0PqiJOdhadDyPjEoxZ+eFDCUrH95gT9t0U3u9BkvIincOp+zMikC0i+rXMDxRySWAmIiIqF1lw3R10aMkw== dependencies: tldts-core "^5.6.23" +tldts-experimental@^5.6.24: + version "5.6.34" + resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.6.34.tgz#69b3e6276b17b0a2d143bd253ad76d5980defeef" + integrity sha512-+kilyxg/UUE/VJIfc4ZoC7nlywJ3dVRnwZutphhGVW2FfczMZqPwsCBuE7s3gQyWOjR8dsToGOx95H+45R+6WA== + dependencies: + tldts-core "^5.6.34" + tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" @@ -8790,7 +8986,7 @@ uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -uuid@^7.0.2: +uuid@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b" integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg== @@ -8910,18 +9106,13 @@ watchpack@^1.6.0: graceful-fs "^4.1.2" neo-async "^2.5.0" -webextension-polyfill-ts@^0.14.0: - version "0.14.0" - resolved "https://registry.yarnpkg.com/webextension-polyfill-ts/-/webextension-polyfill-ts-0.14.0.tgz#37c56852613f9b9fa4992ba673b615d8fcaf1e24" - integrity sha512-eBfjCgF8IvxKCphygM2MxQi1ixtxrzxz3k3cLQ2er2KUDJqWc8qkR5YjOH62PdPI9slJHYV4kHuQN3bG9/sQqw== +webextension-polyfill-ts@^0.17.0: + version "0.17.0" + resolved "https://registry.yarnpkg.com/webextension-polyfill-ts/-/webextension-polyfill-ts-0.17.0.tgz#40c7b82469401527a5cff9c53c88ba08cebf3927" + integrity sha512-VTk36aYicwPCM+qh7LPAWAZMeYASB7GqGcJ+f39kRO6l39NmoIakkX6L9rqAPwDxoIfLK0UpxtfkxXGfB5lEfA== dependencies: webextension-polyfill "^0.6.0" -webextension-polyfill@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/webextension-polyfill/-/webextension-polyfill-0.4.0.tgz#9cc5a60f0f2bf907a6b349fdd7e61701f54956f9" - integrity sha512-oreMp+EoAo1pzRMigx4jB5jInIpx6NTCySPSjGyLLee/dCIPiRqowCEfbFP8o20wz9SOtNwSsfkaJ9D/tRgpag== - webextension-polyfill@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/webextension-polyfill/-/webextension-polyfill-0.6.0.tgz#1afd925f3274a0d4848083579b9c0b649a5c6763" @@ -9246,12 +9437,12 @@ yargs@^7.0.0: y18n "^3.2.1" yargs-parser "^5.0.0" -ytdl-core@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/ytdl-core/-/ytdl-core-2.0.1.tgz#10987476aea27fc87b2053aa59479f5608a6f33f" - integrity sha512-PZBcVzQpkBxi9OQh9I4QIrYNmkbM/zh4QJQuxE8I6RojLUVYkkps5iLYquE3H+pwmBXtEXQMDJfVRajgdiz+iA== +ytdl-core@^2.1.1: + version "2.1.7" + resolved "https://registry.yarnpkg.com/ytdl-core/-/ytdl-core-2.1.7.tgz#d62c74161691a114de211145e645f30f607a5f96" + integrity sha512-ithllxxlt4zmJVTnYtT8/31QLv5MGlK3fSk29lx2S4eKc1BGh+ELKQEAkRJqWIf2P8TYBYrKwijx11xND4JcXw== dependencies: - html-entities "^1.1.3" - m3u8stream "^0.6.3" - miniget "^1.7.0" + html-entities "^1.3.1" + m3u8stream "^0.7.1" + miniget "^1.7.2" sax "^1.1.3" From 320c9a812925a98366f6118a793856eefcbec3ad Mon Sep 17 00:00:00 2001 From: Sam Macbeth Date: Fri, 19 Jun 2020 15:06:11 +0200 Subject: [PATCH 5/5] Update location of tracker_db_v2.json --- app/panel-android/utils/tracker-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/panel-android/utils/tracker-info.js b/app/panel-android/utils/tracker-info.js index 1ea1d2253..9749513fc 100644 --- a/app/panel-android/utils/tracker-info.js +++ b/app/panel-android/utils/tracker-info.js @@ -14,7 +14,7 @@ * @namespace PanelAndroidUtils */ -import { apps } from '../../../cliqz/antitracking/tracker_db_v2.json'; +import { apps } from '../../../cliqz/core/tracker_db_v2.json'; // Link to whotracks.me website export default function getUrlFromTrackerId(id) {