Skip to content

Commit

Permalink
update scriptlets to v1.7.14. AG-18366
Browse files Browse the repository at this point in the history
related: uBlockOrigin/uBlock-issues#2411

Squashed commit of the following:

commit a77002f
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Fri Dec 16 21:55:31 2022 +0200

    update changelog

commit 786830f
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Fri Dec 16 21:54:48 2022 +0200

    fix changelog style

commit da136a6
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Fri Dec 16 21:52:48 2022 +0200

    update scriptlets to v1.7.14, tsurlfilter to v1.0.64

commit 5a4676b
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Fri Dec 16 21:51:42 2022 +0200

    add few scrpitlets conversion tests
  • Loading branch information
slavaleleka committed Dec 19, 2022
1 parent b4690d0 commit 1123f99
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 26 deletions.
43 changes: 28 additions & 15 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,37 +1,50 @@
# Filters Compiler Changelog


## v1.1.69

### Changed

- Updated Scriptlets to v1.7.14
- Updated TSUrlFilter to 1.0.64


## v1.1.68

### Updated
### Changed

- Updated Scriptlets to v1.7.13
- Updated TSUrlFilter to 1.0.63

* Scriptlets to v1.7.13
* TSUrlFilter to 1.0.63

## v1.1.67

### Updated
### Changed

- Updated ExtendedCss to v2.0.24
- Updated Scriptlets to v1.7.10
- Updated TSUrlFilter to 1.0.57

* ExtendedCss to v2.0.24
* Scriptlets to v1.7.10
* TSUrlFilter to 1.0.57

## v1.1.66

### Updated
### Changed

- Updated ExtendedCss to v2.0.18

* ExtendedCss to v2.0.18

## v1.1.65

### Updated
### Changed

- Updated ExtendedCss to v2.0.15

* ExtendedCss to v2.0.15

## v1.1.64

### Updated
### Changed

* ExtendedCss to v2.0.12
- Updated ExtendedCss to v2.0.12


## v1.1.63
Expand All @@ -40,6 +53,6 @@

* Support of Trusted scriptlets and their exclusion from list which trust-level is not `full`

### Updated
### Changed

* TSUrlFilter to v1.0.51, Scriptlets to v1.7.3
- Updated TSUrlFilter to v1.0.51, Scriptlets to v1.7.3
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
},
"dependencies": {
"@adguard/extended-css": "^2.0.24",
"@adguard/scriptlets": "^1.7.13",
"@adguard/tsurlfilter": "^1.0.63",
"@adguard/scriptlets": "^1.7.14",
"@adguard/tsurlfilter": "^1.0.64",
"ajv": "^8.11.0",
"child_process": ">=1.0.2",
"filters-downloader": "git+https://github.com/AdguardTeam/FiltersDownloader.git#v1.1.12",
Expand Down
8 changes: 8 additions & 0 deletions src/test/converter.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,14 @@ describe('converter', () => {
expected = 'example.org##+js(abort-on-property-write, adblock.check)';
expect(actual).toBe(expected);

actual = scriptlets.convertAdgToUbo("example.org#%#//scriptlet('set-constant', 'dataLayer', 'emptyArr')");
expected = 'example.org##+js(set-constant, dataLayer, [])';
expect(actual).toBe(expected);

actual = scriptlets.convertAdgToUbo("example.org#%#//scriptlet('set-constant', 'dataLayer', 'emptyObj')");
expected = 'example.org##+js(set-constant, dataLayer, {})';
expect(actual).toBe(expected);

actual = scriptlets.convertAbpToAdg('test.com#$#abort-on-property-read adsShown');
expected = "test.com#%#//scriptlet('abp-abort-on-property-read', 'adsShown')";
expect(actual[0]).toBe(expected);
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
resolved "https://registry.yarnpkg.com/@adguard/extended-css/-/extended-css-2.0.26.tgz#f41a32b542fca3bc43240f8fba5b839c9e4c61ae"
integrity sha512-bc7MWURvdBQchOSc4ZFZis1yhwVTWHH+RAORQ6ljNMJXhf1BFpe98vdPiUn3fuKMmlKtwApZIdUCNww0HsaH+w==

"@adguard/scriptlets@^1.7.13":
version "1.7.13"
resolved "https://registry.yarnpkg.com/@adguard/scriptlets/-/scriptlets-1.7.13.tgz#9f45d15c9c2944c95844e7857188244757a26733"
integrity sha512-kV23/RUQInWnuzK2cfT6RppbGDrJABGpPta3N6/uhjnFhqUlx7vLU9LKi/AD9xFsclyqlXLn3qG9bY65LtBSvw==
"@adguard/scriptlets@^1.7.14":
version "1.7.14"
resolved "https://registry.yarnpkg.com/@adguard/scriptlets/-/scriptlets-1.7.14.tgz#3623c7d4b779b0038400b99ae9abe342ac8ec725"
integrity sha512-cI3f2Yjg1KSVl7uWdu2IPe8uS4ljDsVxypaZ0nWHlL2wvTndSPuvR+KMb0CnmcknP+83fu/Si3I257i+VMz1sw==
dependencies:
"@babel/runtime" "^7.7.2"
js-yaml "^3.13.1"

"@adguard/tsurlfilter@^1.0.63":
version "1.0.63"
resolved "https://registry.yarnpkg.com/@adguard/tsurlfilter/-/tsurlfilter-1.0.63.tgz#e755ed09bb120eb6da672098a3d530894c39adb2"
integrity sha512-jO2p+CAOhvWBJFRoS+30SjJUc76/PG9GzloHTWBvhzcqGnG6UO1xpobWpV/DaSdxsM3Ay6kmGTxlA7NBAycMuQ==
"@adguard/tsurlfilter@^1.0.64":
version "1.0.64"
resolved "https://registry.yarnpkg.com/@adguard/tsurlfilter/-/tsurlfilter-1.0.64.tgz#aa2cae6bc45ccb63849ae99b4056d5d86d437df9"
integrity sha512-J32BkXFoi0RNYtFlPdz1fK7Y3FGO5Bmk4D0oEX0YEL05gJVTtvytT7duwFXBLD2GJ+PjQh0u0h96tCPqnE5HnQ==
dependencies:
"@adguard/extended-css" "^2.0.26"
"@adguard/scriptlets" "^1.7.13"
"@adguard/scriptlets" "^1.7.14"
ip6addr "^0.2.3"
is-cidr "^4.0.2"
is-ip "^3.1.0"
Expand Down

0 comments on commit 1123f99

Please sign in to comment.