From a67540ad2f23f173b77a1bbe13a8bf36553a352b Mon Sep 17 00:00:00 2001 From: Stanislav Atroschenko Date: Tue, 6 Dec 2022 21:29:28 +0300 Subject: [PATCH] Pull request #241: AG-17981 update tsurlfilter to 1.0.57, scriptlets to v1.7.10, and extended-css to v2.0.24 AG-17940 [compiler] Merge in ADGUARD-FILTERS/compiler from feature/AG-17981 to master Squashed commit of the following: commit 02740491af948c6041c71c3957c5f21d67ca53ae Author: Slava Leleka Date: Tue Dec 6 20:24:43 2022 +0200 add invalid selector validation test commit c828f004515fc5153527bbb8a6b408763adb46f7 Author: Slava Leleka Date: Tue Dec 6 20:23:07 2022 +0200 update extended-css to v2.0.24 commit 4fc9ea93892c6d4d2290805bb0d445838bc6bad8 Author: Stanislav A Date: Tue Dec 6 21:11:59 2022 +0300 update change log commit c76649afd7dc514395804448718d4376ac255428 Author: Stanislav A Date: Tue Dec 6 21:00:33 2022 +0300 update tsurlfilter to 1.0.57 and scriptlets to v1.7.10 --- CHANGELOG.md | 8 ++++++++ package.json | 6 +++--- src/test/validator.test.js | 1 + yarn.lock | 28 ++++++++++++++-------------- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af41abf0..4f46915e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Filters Compiler Changelog +## v1.1.67 + +### Updated + +* ExtendedCss to v2.0.24 +* Scriptlets to v1.7.10 +* TSUrlFilter to 1.0.57 + ## v1.1.66 ### Updated diff --git a/package.json b/package.json index 5e237535..8d3b5459 100644 --- a/package.json +++ b/package.json @@ -12,9 +12,9 @@ "prepare": "husky install" }, "dependencies": { - "@adguard/extended-css": "^2.0.18", - "@adguard/scriptlets": "^1.7.3", - "@adguard/tsurlfilter": "^1.0.56", + "@adguard/extended-css": "^2.0.24", + "@adguard/scriptlets": "^1.7.10", + "@adguard/tsurlfilter": "^1.0.57", "ajv": "^8.11.0", "child_process": ">=1.0.2", "filters-downloader": "git+https://github.com/AdguardTeam/FiltersDownloader.git#v1.1.12", diff --git a/src/test/validator.test.js b/src/test/validator.test.js index 3a3b5073..9e231f57 100644 --- a/src/test/validator.test.js +++ b/src/test/validator.test.js @@ -60,6 +60,7 @@ describe('validator', () => { '.\].slidein.\[.box', 'div[class"ads-article"]', 'img[height="60"][width"468"]', + 'table[style*=border: 0px"]', ]; test.each(invalidSelectors)('%s', (selector) => { const rules = [`example.com##${selector}`]; diff --git a/yarn.lock b/yarn.lock index 19429d28..2a58d3c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,26 +2,26 @@ # yarn lockfile v1 -"@adguard/extended-css@^2.0.18": - version "2.0.18" - resolved "https://registry.yarnpkg.com/@adguard/extended-css/-/extended-css-2.0.18.tgz#669f5ad297425184fd4946e76d1a3a110e413a44" - integrity sha512-IxuzXYPwH4gG1MRm5b08jVbgCIRi49SIhHN6EtciNSpR7+vnTh7nU2eA/Bsupt2XB8LBaco84yLetSxnA6nETQ== +"@adguard/extended-css@^2.0.24": + version "2.0.24" + resolved "https://registry.yarnpkg.com/@adguard/extended-css/-/extended-css-2.0.24.tgz#8bb4e31dcf746c1573288fa1bfee190407cea89b" + integrity sha512-qkQyH+5/oKDw9JvTeZcfBUbJJj8TV+/3G9ECDKdehJy8vUCbIuKg6rqBDxqGXBnUQcTZPKrnf7JUgSJE3GzE6Q== -"@adguard/scriptlets@^1.7.3": - version "1.7.3" - resolved "https://registry.yarnpkg.com/@adguard/scriptlets/-/scriptlets-1.7.3.tgz#63df428f136635ea8395bd911c1697561d32ca1f" - integrity sha512-6qRjUQGr2Ga5mF9cbrhbcibum7pMSyCWP5wK5xEviyemwvcLAQQvCvzChzgVeBmfpCFjuEV9ufCj9oGfkMCpSw== +"@adguard/scriptlets@^1.7.10": + version "1.7.10" + resolved "https://registry.yarnpkg.com/@adguard/scriptlets/-/scriptlets-1.7.10.tgz#3831032cf4b92024160e68fd456addd1b02965f3" + integrity sha512-+G9eDgZZpcvcbdm8PBE0MuQwoYwuLHtX7eYFbX+rFsgMLaM5R0nhhvBQw0a2njVbs8oI1qs9sGDcvX+Clh8slg== dependencies: "@babel/runtime" "^7.7.2" js-yaml "^3.13.1" -"@adguard/tsurlfilter@^1.0.56": - version "1.0.56" - resolved "https://registry.yarnpkg.com/@adguard/tsurlfilter/-/tsurlfilter-1.0.56.tgz#16f6878ef18a5e45b2bcd060e1c6b4103415436c" - integrity sha512-8cFxoIo6NZnhgv9fW+fxP9H3xMlnbddyK8t25IUJJw+F3ZUN5Sjr4RkCwGC7lCqtpwgGWnoP6pe/Lv0f9mSAEg== +"@adguard/tsurlfilter@^1.0.57": + version "1.0.57" + resolved "https://registry.yarnpkg.com/@adguard/tsurlfilter/-/tsurlfilter-1.0.57.tgz#d27c13426149637599413abb414614a5bff3d8f7" + integrity sha512-QN80uMQyq5azE57sf3P5O39iAOrWy/zbZqy96wQ0QA1CYBYybvB3N0JYTnRQrC3gVMYFfFx0H2ndrMIfgfkLKg== dependencies: - "@adguard/extended-css" "^2.0.18" - "@adguard/scriptlets" "^1.7.3" + "@adguard/extended-css" "^2.0.24" + "@adguard/scriptlets" "^1.7.10" ip6addr "^0.2.3" is-cidr "^4.0.2" is-ip "^3.1.0"