Skip to content

Commit 2e6623d

Browse files
committed
AG-40452 update agtree to v3.1.5 [scriptlets]
Squashed commit of the following: commit 3070938 Author: Slava Leleka <v.leleka@adguard.com> Date: Wed May 21 17:12:54 2025 -0400 fix changelog commit b9fe47e Author: Slava Leleka <v.leleka@adguard.com> Date: Wed May 21 09:44:18 2025 -0400 clean up commit 584957f Author: Slava Leleka <v.leleka@adguard.com> Date: Tue May 20 20:27:52 2025 -0400 update agtree to v3.1.5 commit f3c7bcf Author: Slava Leleka <v.leleka@adguard.com> Date: Tue May 20 16:59:59 2025 -0400 fix docs typo commit bd91d88 Author: Slava Leleka <v.leleka@adguard.com> Date: Tue May 20 16:34:12 2025 -0400 fix docs examples commit c970b03 Merge: 60c83d4 3e94dd0 Author: Slava Leleka <v.leleka@adguard.com> Date: Tue May 20 15:56:22 2025 -0400 Merge branch 'master' into feature/AG-40452 commit 60c83d4 Author: Slava Leleka <v.leleka@adguard.com> Date: Tue May 20 15:56:07 2025 -0400 update changelog commit a4eb157 Author: Slava Leleka <v.leleka@adguard.com> Date: Tue May 20 15:49:51 2025 -0400 use temp agtree commit 17a6023 Author: Slava Leleka <v.leleka@adguard.com> Date: Tue May 20 15:49:32 2025 -0400 revert test separation commit 024af7e Author: Slava Leleka <v.leleka@adguard.com> Date: Tue May 20 15:32:44 2025 -0400 fix ubo link commit 6f3a0d9 Author: Slava Leleka <v.leleka@adguard.com> Date: Tue May 6 18:23:45 2025 -0400 add fixme commit 51d2bb3 Author: Slava Leleka <v.leleka@adguard.com> Date: Tue May 6 18:23:18 2025 -0400 separate problematic test commit d112568 Author: Slava Leleka <v.leleka@adguard.com> Date: Tue May 6 18:08:04 2025 -0400 fix changelog commit 6003ad3 Author: Slava Leleka <v.leleka@adguard.com> Date: Tue May 6 18:06:48 2025 -0400 Revert "update types/js-yaml" This reverts commit 5d4da51. commit 0675f18 Author: Slava Leleka <v.leleka@adguard.com> Date: Tue May 6 18:01:02 2025 -0400 revert js-yaml update commit 5d4da51 Author: Slava Leleka <v.leleka@adguard.com> Date: Tue May 6 17:39:02 2025 -0400 update types/js-yaml commit 52fddf9 Author: Slava Leleka <v.leleka@adguard.com> Date: Tue May 6 17:12:36 2025 -0400 update agtree and js-yaml
1 parent 3e94dd0 commit 2e6623d

File tree

8 files changed

+21
-20
lines changed

8 files changed

+21
-20
lines changed

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
1010
<!-- TODO: change `@added unknown` tag due to the actual version -->
1111
<!-- during new scriptlets or redirects releasing -->
1212

13-
## [Unreleased]
13+
## [v2.2.0] - 2025-05-21
1414

1515
### Added
1616

@@ -23,14 +23,15 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
2323
### Changed
2424

2525
- Improved docs for `json-prune`, `xml-prune` and `trusted-prune-inbound-object` scriptlets [#392].
26+
- Updated [@adguard/agtree] to `3.1.5`.
2627

2728
### Fixed
2829

2930
- Escaping quotes in `trusted-replace-node-text` scriptlet [#440].
3031
- `trusted-suppress-native-method` scriptlet, `isMatchingSuspended` was not reset when the stack does not match,
3132
so in some cases given method was not prevented [#496].
3233

33-
[Unreleased]: https://github.com/AdguardTeam/Scriptlets/compare/v2.1.7...HEAD
34+
[v2.2.0]: https://github.com/AdguardTeam/Scriptlets/compare/v2.1.7...v2.2.0
3435
[#392]: https://github.com/AdguardTeam/Scriptlets/issues/392
3536
[#416]: https://github.com/AdguardTeam/Scriptlets/issues/416
3637
[#440]: https://github.com/AdguardTeam/Scriptlets/issues/440

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"neverBuiltDependencies": []
6565
},
6666
"dependencies": {
67-
"@adguard/agtree": "3.1.0",
67+
"@adguard/agtree": "3.1.5",
6868
"js-yaml": "^3.14.1"
6969
},
7070
"devDependencies": {

pnpm-lock.yaml

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/scriptlets/prevent-fab-3.2.0.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { hit, noopFunc, noopThis } from '../helpers';
88
* Prevents execution of the FAB script v3.2.0.
99
*
1010
* Related UBO scriptlet:
11-
* https://github.com/gorhill/uBlock/wiki/Resources-Library#fuckadblockjs-320-
11+
* https://github.com/gorhill/uBlock/wiki/Resources-Library#nofabjs-
1212
*
1313
* ### Syntax
1414
*

src/scriptlets/set-attr.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import {
3939
* 1. Set attribute by selector
4040
*
4141
* ```adblock
42-
* example.org#%#//scriptlet('set-attr', 'div.class > a.class', 'test-attribute', '0')
42+
* example.org#%#//scriptlet('set-attr', 'div > a.class', 'test-attribute', '0')
4343
* ```
4444
*
4545
* ```html

src/scriptlets/spoof-css.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { hit } from '../helpers';
1313
* ### Syntax
1414
*
1515
* ```text
16-
* example.org#%#//scriptlet('spoof-css', selectors, cssNameProperty, cssNameValue)
16+
* example.org#%#//scriptlet('spoof-css', selectors, cssPropertyName, cssPropertyValue)
1717
* ```
1818
*
1919
* - `selectors` — string of comma-separated selectors to match

src/scriptlets/trusted-set-attr.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import {
3131
* 1. Set attribute by selector
3232
*
3333
* ```adblock
34-
* example.org#%#//scriptlet('trusted-set-attr', 'div.class > a.class', 'test-attribute', '[true, true]')
34+
* example.org#%#//scriptlet('trusted-set-attr', 'div > a.class', 'test-attribute', '[true, true]')
3535
* ```
3636
*
3737
* ```html

tests/api/converters.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ describe('converters', () => {
285285
{
286286
// scriptlet with no parameters
287287
actual: 'example.com#%#//scriptlet("prevent-fab-3.2.0")',
288-
expected: 'example.com##+js(prevent-fab-3.2.0)',
288+
expected: 'example.com##+js(nofab)',
289289
},
290290
{
291291
actual: 'example.org#@%#//scriptlet(\'prevent-setTimeout\', \'[native code]\', \'8000\')',

0 commit comments

Comments
 (0)