Skip to content

Commit

Permalink
Pull request #241: AG-17981 update tsurlfilter to 1.0.57, scriptlets …
Browse files Browse the repository at this point in the history
…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 0274049
Author: Slava Leleka <[email protected]>
Date:   Tue Dec 6 20:24:43 2022 +0200

    add invalid selector validation test

commit c828f00
Author: Slava Leleka <[email protected]>
Date:   Tue Dec 6 20:23:07 2022 +0200

    update extended-css to v2.0.24

commit 4fc9ea9
Author: Stanislav A <[email protected]>
Date:   Tue Dec 6 21:11:59 2022 +0300

    update change log

commit c76649a
Author: Stanislav A <[email protected]>
Date:   Tue Dec 6 21:00:33 2022 +0300

    update tsurlfilter to 1.0.57 and scriptlets to v1.7.10
  • Loading branch information
stanislav-atr committed Dec 6, 2022
1 parent b1dc2bf commit a67540a
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 17 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions src/test/validator.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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}`];
Expand Down
28 changes: 14 additions & 14 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit a67540a

Please sign in to comment.