From e8301c089de85604036eff2604ffd5354e0d3707 Mon Sep 17 00:00:00 2001 From: Sam Macbeth Date: Tue, 28 Jan 2020 17:58:01 +0100 Subject: [PATCH] Update browser-core to v7.43 --- package.json | 2 +- src/classes/Module.js | 10 +--- yarn.lock | 112 ++++++++++++++++++++++++++++-------------- 3 files changed, 78 insertions(+), 46 deletions(-) diff --git a/package.json b/package.json index 16c9ac1c9..3b0792238 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "@cliqz/adblocker-circumvention": "^1.3.1", "@cliqz/url-parser": "^1.0.4", "base64-js": "^1.3.1", - "browser-core": "https://github.com/cliqz-oss/browser-core/releases/download/v7.40.2/browser-core-7.40.2.tgz", + "browser-core": "https://github.com/cliqz-oss/browser-core/releases/download/v7.43.0/browser-core-7.43.0.tgz", "classnames": "^2.2.5", "d3": "^5.12.0", "foundation-sites": "^6.4.4-rc1", diff --git a/src/classes/Module.js b/src/classes/Module.js index 3926ee65e..60170f87b 100644 --- a/src/classes/Module.js +++ b/src/classes/Module.js @@ -30,17 +30,9 @@ const background = baseBackground({ }); class GhosteryModule extends Module { - get backgroundModule() { + get _module() { return background; } - - get WindowModule() { - return class { - init() {} - - unload() {} - }; - } } export default GhosteryModule; diff --git a/yarn.lock b/yarn.lock index 1d61e25b4..43fecf993 100644 --- a/yarn.lock +++ b/yarn.lock @@ -337,21 +337,28 @@ tslib "^1.10.0" tsmaz "^1.3.0" -"@cliqz/autoconsent@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@cliqz/autoconsent/-/autoconsent-0.3.0.tgz#4f5d965f2165fc9b82d766dd9ba7ff54d544221f" - integrity sha512-sXbFgL/6A2stR/0h71kY23ivfBTZ3I1YAX8iXom46YXZ3vP2jwqw0nJctaKmqRRg9zYKk7JtZ+0J+DHGIlxnQg== +"@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/url-parser@^1.0.3", "@cliqz/url-parser@^1.0.4": +"@cliqz/url-parser@^1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@cliqz/url-parser/-/url-parser-1.0.4.tgz#46f3228f71643f92da2070153bcbb3638bffea87" integrity sha512-Go5953xah+6qY4Y+gywYKU2/G91JX5yM/lGZ0/MXxkEB/Pr7i7tw4OF8dWuH9wCpXZRoBrbRWOuh8pZuI64WaQ== dependencies: tldts-experimental "^5.3.1" +"@cliqz/url-parser@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@cliqz/url-parser/-/url-parser-1.1.1.tgz#53dbc764e19b509beb55bc7e29f5cb099b297c89" + integrity sha512-qV5ziZF1nioIt7KbS+akm8y+a7mD7Tm390Lh75Ocrf++PBCTac8gpbWnIUb4/bW6FduR/CZNUTjoT0/RqPwGmw== + dependencies: + tldts-experimental "^5.3.1" + "@cnakazawa/watch@^1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef" @@ -926,9 +933,9 @@ amdefine@>=0.0.4: resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= -"anonymous-credentials@https://github.com/cliqz-oss/anonymous-credentials/releases/download/0.1.4/anonymous-credentials-0.1.4.tgz": - version "0.1.4" - resolved "https://github.com/cliqz-oss/anonymous-credentials/releases/download/0.1.4/anonymous-credentials-0.1.4.tgz#d4e0ebf272ac5ec85dea4515c44ec55bdccf03bf" +"anonymous-credentials@https://github.com/cliqz-oss/anonymous-credentials/releases/download/1.0.0/anonymous-credentials-1.0.0.tgz": + version "1.0.0" + resolved "https://github.com/cliqz-oss/anonymous-credentials/releases/download/1.0.0/anonymous-credentials-1.0.0.tgz#8b5b2da908e41866be332e703b3da7e60579007a" dependencies: bindings "1.5.0" @@ -1353,23 +1360,23 @@ 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.40.2/browser-core-7.40.2.tgz": - version "7.40.2" - resolved "https://github.com/cliqz-oss/browser-core/releases/download/v7.40.2/browser-core-7.40.2.tgz#b10ea47c7136685cedf8235677cb8c3df19cc76f" +"browser-core@https://github.com/cliqz-oss/browser-core/releases/download/v7.43.0/browser-core-7.43.0.tgz": + version "7.43.0" + resolved "https://github.com/cliqz-oss/browser-core/releases/download/v7.43.0/browser-core-7.43.0.tgz#0c7b06c576801358ee1a229ca74870d2b7e78486" dependencies: "@cliqz-oss/dexie" "^2.0.4" "@cliqz/adblocker-webextension" "^1.3.0" "@cliqz/adblocker-webextension-cosmetics" "^1.3.0" - "@cliqz/autoconsent" "^0.3.0" - "@cliqz/url-parser" "^1.0.3" + "@cliqz/autoconsent" "^0.4.0" + "@cliqz/url-parser" "^1.1.1" abortcontroller-polyfill "^1.3.0" - ajv "^6.10.0" - anonymous-credentials "https://github.com/cliqz-oss/anonymous-credentials/releases/download/0.1.4/anonymous-credentials-0.1.4.tgz" + anonymous-credentials "https://github.com/cliqz-oss/anonymous-credentials/releases/download/1.0.0/anonymous-credentials-1.0.0.tgz" classnames "^2.2.5" deep-equal "^1.0.1" - handlebars "^4.1.2" + handlebars "^4.5.3" jquery "^3.4.1" jsep "^0.3.0" + jsonschema "^1.2.4" math-expression-evaluator "^1.2.17" moment "^2.22.2" node-fetch "^1.7.1" @@ -1392,12 +1399,12 @@ brorand@^1.0.1: spanan "^2.0.0" spectre.css "^0.5.7" text-encoding "^0.6.4" - tldts-experimental "^5.5.0" + tldts-experimental "^5.6.1" tooltipster "^4.2.6" - ua-parser-js "^0.7.12" + ua-parser-js "^0.7.21" webextension-polyfill "^0.4.0" whatwg-fetch "^3.0.0" - ytdl-core "^0.29.4" + ytdl-core "^1.0.6" browser-process-hrtime@^0.1.2: version "0.1.3" @@ -3550,6 +3557,17 @@ handlebars@^4.1.2: optionalDependencies: uglify-js "^3.1.4" +handlebars@^4.5.3: + version "4.7.2" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.2.tgz#01127b3840156a0927058779482031afe0e730d7" + integrity sha512-4PwqDL2laXtTWZghzzCtunQUTLbo31pcCJrd/B/9JP8XbhVzpS5ZXuKqlOzsd1rtcaLo4KqAn8nl8mkknS4MHw== + dependencies: + neo-async "^2.6.0" + optimist "^0.6.1" + source-map "^0.6.1" + optionalDependencies: + uglify-js "^3.1.4" + har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -4820,6 +4838,11 @@ jsonfile@^5.0.0: optionalDependencies: graceful-fs "^4.1.6" +jsonschema@^1.2.4: + version "1.2.5" + resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.2.5.tgz#bab69d97fa28946aec0a56a9cc266d23fe80ae61" + integrity sha512-kVTF+08x25PQ0CjuVc0gRM9EUPb0Fe9Ln/utFOgcdxEIOHuU7ooBk/UPTd7t1M91pP35m0MU1T8M5P7vP1bRRw== + jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -5083,12 +5106,12 @@ lru-cache@^5.1.1: dependencies: yallist "^3.0.2" -m3u8stream@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/m3u8stream/-/m3u8stream-0.6.2.tgz#c2c62ddce88156d80378dd59be010c8b8e9d120b" - integrity sha512-WsuM2bd5pPN80xvfrB+1DZqr4M7+kJl8byi6+ZCy6cmVjEiHhmr/desN53Ngsa6Hs13kYumeVgT4wL0oIJ+v6g== +m3u8stream@^0.6.3: + version "0.6.4" + resolved "https://registry.yarnpkg.com/m3u8stream/-/m3u8stream-0.6.4.tgz#c2cdeb8401d340cc476029e433177caa089a26e9" + integrity sha512-9WLF1VAtbVij03HWJKbVZ8L0orsoZiP53UljR5EwaDrozQFMsTGRDPe3PbzWV73He8a+j5H/hWZNoI2VkUSsiw== dependencies: - miniget "^1.4.0" + miniget "^1.6.1" sax "^1.2.4" make-dir@^2.0.0, make-dir@^2.1.0: @@ -5298,10 +5321,10 @@ mini-css-extract-plugin@^0.8.0: schema-utils "^1.0.0" webpack-sources "^1.1.0" -miniget@^1.4.0, miniget@^1.5.3: - version "1.6.0" - resolved "https://registry.yarnpkg.com/miniget/-/miniget-1.6.0.tgz#33e4bb46ed2860e15d3a94f9fe99f44f7c275a69" - integrity sha512-CELIsH/oJfnDHixh7j//7H7PyQYkoMxgaTtzdoD08PYjyLW0YuYqxeIZGjLx59WF2/eapCLkQE4N5ppj82DW+A== +miniget@^1.6.0, miniget@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/miniget/-/miniget-1.6.1.tgz#f1ae08a34e06a2b1c3ace568384ea0def2fe5813" + integrity sha512-I5oBwZmcaOuJrjQn7lpS29HM+aAZDbzKbX5ouxVyhFYdg6fA6YKOTwOCgzZQwlHuMek3FlCxz6eNrd4pOXbwOA== minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: version "1.0.1" @@ -7924,13 +7947,25 @@ tldts-core@^5.6.1: resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.6.1.tgz#943fd020b564018fae308c12ec2435e53101c257" integrity sha512-ikhUCHoiRu0QzQpba0f0q1Km5YBnn4qsBzGlYCzT3y3wSCGG2GlV0xeEOcXTzp2pRne6bQaHRry4TINMZpDFKQ== -tldts-experimental@^5.3.0, tldts-experimental@^5.3.1, tldts-experimental@^5.5.0: +tldts-core@^5.6.3: + version "5.6.3" + resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.6.3.tgz#d80ce1e93b58ba0614701c28450360fc6986aaf1" + integrity sha512-E7Jtwgy5ZKXuKm3tb2Z73t0AgiGTnGnVrGfBAJj0nS2tENCclb/Ym5yt+wOdDW+8uJg0bI/BxHmbvUyLAYpcPQ== + +tldts-experimental@^5.3.0, tldts-experimental@^5.3.1: version "5.6.1" resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.6.1.tgz#2c6d4def6b09b878ba307b53a8946b0866617d97" integrity sha512-FKhWJwTI60GMO4bAU+wLQ/aUd9JfPChGJjUXvvV36nEf38Eg/ym8G6rmTY0Hr0FRAcJ3QKFyRiWxcmPU0o16fg== dependencies: tldts-core "^5.6.1" +tldts-experimental@^5.6.1: + version "5.6.3" + resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.6.3.tgz#a59f7751f208202883187c362141b9462544d56a" + integrity sha512-d/gWTSD7O3b11s+OQQj9/PRO/cTFXqSXe5v4Y3damEQP1urFupQE3MPSLoZaWp2iQRJB/hRlPwfOH3TNzoqZRA== + dependencies: + tldts-core "^5.6.3" + tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" @@ -8089,11 +8124,16 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -ua-parser-js@^0.7.12, ua-parser-js@^0.7.18, ua-parser-js@^0.7.20: +ua-parser-js@^0.7.18, ua-parser-js@^0.7.20: version "0.7.20" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.20.tgz#7527178b82f6a62a0f243d1f94fd30e3e3c21098" integrity sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw== +ua-parser-js@^0.7.21: + version "0.7.21" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777" + integrity sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ== + uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" @@ -8710,12 +8750,12 @@ yargs@^7.0.0: y18n "^3.2.1" yargs-parser "^5.0.0" -ytdl-core@^0.29.4: - version "0.29.7" - resolved "https://registry.yarnpkg.com/ytdl-core/-/ytdl-core-0.29.7.tgz#e63ce0b086a4543d827499bed22f53fdf4d16af2" - integrity sha512-mqPuZ1UyspT84lyV1FSU1UAoiQ4H5j52ba3sC1LC43OmL8qNaDIRCGffGlpiakQrc69qsplNWsWEZUF+J5bhJA== +ytdl-core@^1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/ytdl-core/-/ytdl-core-1.0.7.tgz#2cda813e6429eb35aee349656b8f5693314b6992" + integrity sha512-gECPN5g5JnSy8hIq11xHIGe1T/Xzy0mWxQin3zhlJ3nG/YjPcEVEejrdd2XmA4Vv2Zw3+b1ZyDjmt37XfZri6A== dependencies: html-entities "^1.1.3" - m3u8stream "^0.6.2" - miniget "^1.5.3" + m3u8stream "^0.6.3" + miniget "^1.6.0" sax "^1.1.3"