diff --git a/package.json b/package.json index cfe821e3..12602a18 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "npm": "Please use yarn and not npm" }, "dependencies": { - "@cliqz/adblocker-electron": "^1.20.5", + "@cliqz/adblocker-electron": "^1.22.0", "@ffmpeg/core": "^0.9.0", "@ffmpeg/ffmpeg": "^0.9.8", "YoutubeNonStop": "git://github.com/lawfx/YoutubeNonStop.git#v0.9.0", diff --git a/plugins/adblocker/blocker.js b/plugins/adblocker/blocker.js index f1b73b7b..81d6ec5f 100644 --- a/plugins/adblocker/blocker.js +++ b/plugins/adblocker/blocker.js @@ -8,7 +8,9 @@ const SOURCES = [ "https://raw.githubusercontent.com/kbinani/adblock-youtube-ads/master/signed.txt", // uBlock Origin "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt", - "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2020.txt", + "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2021.txt", + // Fanboy Annoyances + "https://secure.fanboy.co.nz/fanboy-annoyance_ubo.txt", ]; const loadAdBlockerEngine = ( diff --git a/yarn.lock b/yarn.lock index a81d2429..26ee2ded 100644 --- a/yarn.lock +++ b/yarn.lock @@ -439,45 +439,45 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cliqz/adblocker-content@^1.20.6": - version "1.20.6" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.20.6.tgz#1bfbdb1e5757fc610f3d5d9921bba9d166d687a7" - integrity sha512-KRo8EjIbiuAHBQHJcgs0oefJlp/lw93KQL1Rv9CeMFdKqVZV8IReGqe/V+ipoaOQFVgLZ8gWPOzEkLAQ4P2ZBQ== +"@cliqz/adblocker-content@^1.22.0": + version "1.22.0" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.0.tgz#4a625ddfcefa203d98e27f16c16328c655842b8c" + integrity sha512-M6L6OVcuxdu1YA7sSjTtU1CV+taMx+fCd5Wqqfepp2o8eEo9HxNdWrKRfnOG6O0vmpvdRLtdVMPvd74wPr2vvQ== dependencies: - "@cliqz/adblocker-extended-selectors" "^1.20.6" + "@cliqz/adblocker-extended-selectors" "^1.22.0" -"@cliqz/adblocker-electron-preload@^1.20.6": - version "1.20.6" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.20.6.tgz#c2804edb8c4dd5ce226a2a5ef95b9e6cd3745767" - integrity sha512-2dF6aaTZftwUXswHRSIlSIop4SQGmtpzp3FHVQvB3lCCE2ssONT38nCY0b4PREooZ35tzZTZNyYcOboaear3UQ== +"@cliqz/adblocker-electron-preload@^1.22.0": + version "1.22.0" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.0.tgz#ea04db27572b8be4c34457ecf91f9f6d6d9e470f" + integrity sha512-LwdRIslyPW0tkAua2pqSDCGC89gjTOUToY2/1i6Hdm3ErTw2H3YbIl5/xZJd2pmU56kPtojDsREHowzdxvsXXw== dependencies: - "@cliqz/adblocker-content" "^1.20.6" + "@cliqz/adblocker-content" "^1.22.0" -"@cliqz/adblocker-electron@^1.20.5": - version "1.20.6" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.20.6.tgz#870ff1ba7765f545fee70327d3c7e08adadc7764" - integrity sha512-//fdnVxuab6nfx/Eq9u6r8EbgHl/wOGGIUu/ueaYEstR+m3Re22zJDtbj8AwmN75aDynQ7jhUz81GLqH4o4pzg== +"@cliqz/adblocker-electron@^1.22.0": + version "1.22.0" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.0.tgz#6648a5c0e648f95eaa12481593b0acafbeb6621a" + integrity sha512-eEv3Y6fKu7529ZDZknVla3PmdsEuychQP+S/d1Ck5s5S0xumnIoh4s9VW5u7XoJJ1dRqy+hUd03la2xoiueQVA== dependencies: - "@cliqz/adblocker" "^1.20.6" - "@cliqz/adblocker-electron-preload" "^1.20.6" + "@cliqz/adblocker" "^1.22.0" + "@cliqz/adblocker-electron-preload" "^1.22.0" tldts-experimental "^5.6.21" -"@cliqz/adblocker-extended-selectors@^1.20.6": - version "1.20.6" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.20.6.tgz#964d3b96e419778c6e4c8ecf5c2b94599dfbdcd7" - integrity sha512-EuGLyv00GeRFr2PKZLaWgnRpKSFLdezqXTJFaljtvb0iieR7yNdjfEdoEJmctRmslTrlcMmpOlNhAOpJavY4bw== +"@cliqz/adblocker-extended-selectors@^1.22.0": + version "1.22.0" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.22.0.tgz#29d7f615db8b7bf79e1cdcbd4526f39355230a19" + integrity sha512-tZVPySwPFjYwiUU9wFWbn1VtT3B0BSSdeQT2HjB9CF5EvU33RxywIiF7Kg8gQ3JWwbCeONcmDNQybyOv5hMXQw== -"@cliqz/adblocker@^1.20.6": - version "1.20.6" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.20.6.tgz#3428d3c066dbaafa98644fadfd28dd206f8691e2" - integrity sha512-BhYna9gkQnqQfFJy4FOW3cER2oO0IwZzvYQaQEMP5Y/ETUzMq5WBHq5X4dOU+hiJdbkgogIS5L73uPUHDK01Hw== +"@cliqz/adblocker@^1.22.0": + version "1.22.0" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.0.tgz#4588ea79d9493638c8babec128e78947d92fee0b" + integrity sha512-vZuZlG0q8+AaEBsfI/b/CvgpSPR5Ipg8GfSZcD/UxtiHHP3otkVDSMKP65T8ypzxh47VdXXEJx950vfDpqjfgA== dependencies: - "@cliqz/adblocker-content" "^1.20.6" - "@cliqz/adblocker-extended-selectors" "^1.20.6" + "@cliqz/adblocker-content" "^1.22.0" + "@cliqz/adblocker-extended-selectors" "^1.22.0" "@remusao/guess-url-type" "^1.1.2" "@remusao/small" "^1.1.2" "@remusao/smaz" "^1.7.1" - "@types/chrome" "^0.0.136" + "@types/chrome" "^0.0.143" "@types/firefox-webext-browser" "^82.0.0" tldts-experimental "^5.6.21" @@ -1193,10 +1193,10 @@ "@types/node" "*" "@types/responselike" "*" -"@types/chrome@^0.0.136": - version "0.0.136" - resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.136.tgz#7c011b9f997b0156f25a140188a0c5689d3f368f" - integrity sha512-XDEiRhLkMd+SB7Iw3ZUIj/fov3wLd4HyTdLltVszkgl1dBfc3Rb7oPMVZ2Mz2TLqnF7Ow+StbR8E7r9lqpb4DA== +"@types/chrome@^0.0.143": + version "0.0.143" + resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.143.tgz#0722fd6c76a73003fa220d869d2dbc8afd581810" + integrity sha512-tkPDutWjEl/9hPnfR48IJLpH2Xg1Zs/vxfODRp7duY5a4frkULOHvEED8moJsELTrFkiEciwCxAjxVk2XhKSsA== dependencies: "@types/filesystem" "*" "@types/har-format" "*"