update scriptlets to v1.9.101. AG-28198

Squashed commit of the following:

commit a001b1d
Author: Slava Leleka <[email protected]>
Date:   Wed Dec 6 16:21:55 2023 +0200

    fix changelog

commit 0a866db
Author: Slava Leleka <[email protected]>
Date:   Wed Dec 6 16:20:46 2023 +0200

    add tests

commit fce2754
Author: Slava Leleka <[email protected]>
Date:   Wed Dec 6 16:20:08 2023 +0200

    update scriptlets to v1.9.101

commit 03f84aa
Author: Slava Leleka <[email protected]>
Date:   Wed Dec 6 16:19:27 2023 +0200

    fix changelog

CHANGELOG.md

@@ -5,14 +5,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+
+## [v1.1.119] - 2023-12-06
 
 ### Added
 
-- FiltersCompiler ignore uBO exception rules with $important modifier [#200](https://github.com/AdguardTeam/FiltersCompiler/issues/200)
+- FiltersCompiler ignore uBO exception rules with $important modifier
+  [#200](https://github.com/AdguardTeam/FiltersCompiler/issues/200)
 
 ### Changed
+
 - Updated [@adguard/extended-css] to v2.0.56
+- Updated [@adguard/tsurlfilter] to v2.2.7
+- Updated [@adguard/scriptlets] to v1.9.101
+
 
 ## [v1.1.115] - 2023-11-21
 
@@ -278,7 +284,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Updated [@adguard/tsurlfilter] to v1.0.51, [@adguard/scriptlets] to v1.7.3
 
-[Unreleased]: https://github.com/AdguardTeam/FiltersCompiler/compare/v1.1.115...HEAD
+[v1.1.119]: https://github.com/AdguardTeam/FiltersCompiler/compare/v1.1.115...v1.1.119
 [v1.1.115]: https://github.com/AdguardTeam/FiltersCompiler/compare/v1.1.107...v1.1.115
 [v1.1.107]: https://github.com/AdguardTeam/FiltersCompiler/compare/v1.1.105...v1.1.107
 [v1.1.105]: https://github.com/AdguardTeam/FiltersCompiler/compare/v1.1.104...v1.1.105

package.json

@@ -14,8 +14,8 @@
   "dependencies": {
     "@adguard/extended-css": "^2.0.56",
     "@adguard/filters-downloader": "^1.1.23",
-    "@adguard/scriptlets": "^1.9.91",
-    "@adguard/tsurlfilter": "2.2.5",
+    "@adguard/scriptlets": "^1.9.101",
+    "@adguard/tsurlfilter": "2.2.7",
     "ajv": "^8.11.0",
     "child_process": ">=1.0.2",
     "jsdom": "^21.1.1",

src/test/converter.test.js

@@ -476,6 +476,10 @@ describe('converter', () => {
             actual = converter.convertAdgRedirectsToUbo(['||example.com^$redirect=noopjs']);
             expected = '||example.com^$redirect=noop.js,script';
             expect(actual[0]).toBe(expected);
+            // noopjson
+            actual = converter.convertAdgRedirectsToUbo(['||example.com^$xmlhttprequest,redirect=noopjson']);
+            expected = '||example.com^$xmlhttprequest,redirect=noop.json';
+            expect(actual[0]).toBe(expected);
             // nooptext:
             actual = converter.convertAdgRedirectsToUbo(['||ad.example.com^$redirect=nooptext,important']);
             expected = '||ad.example.com^$redirect=noop.txt,important,image,media,subdocument,stylesheet,script,xmlhttprequest,other';

src/test/validator.test.js

@@ -476,6 +476,7 @@ describe('validator', () => {
                 '||googletagservices.com/test.js$domain=test.com,redirect=googletagservices-gpt',
                 '||podu.me/ads/audio/*.mp3$redirect=noopmp3-0.1s',
                 '||podu.me/ads/audio/*.mp3$media,redirect=noopmp3-0.1s',
+                '||example.com^$redirect=noopjson',
             ];
             test.each(validRules)('%s', (rule) => {
                 expect(validator.validate([rule])).toHaveLength(1);
@@ -528,6 +529,9 @@ describe('validator', () => {
 
             rule = '||googletagmanager.com/gtm.js$script,redirect=googletagmanager-gtm,domain=morningstar.nl';
             expect(redirects.isValidAdgRedirectRule(rule)).toBeTruthy();
+
+            rule = '||example.com^$redirect=noopjson';
+            expect(redirects.isValidAdgRedirectRule(rule)).toBeTruthy();
         });
     });
 

yarn.lock

@@ -14,20 +14,20 @@
   dependencies:
     axios "^0.21.1"
 
-"@adguard/scriptlets@^1.9.91":
-  version "1.9.91"
-  resolved "https://registry.yarnpkg.com/@adguard/scriptlets/-/scriptlets-1.9.91.tgz#6f416b749e9528ceb6ecc4d408b82f914f7b4a6e"
-  integrity sha512-oJDDZgdtnFbVTtQm1ag9MUoiqggp4BvykCyufhdlq72hyDjX7NrBEQ9sU1qQPaxDPQ/VD8Uur45rFFxAPf2WNA==
+"@adguard/scriptlets@^1.9.101":
+  version "1.9.101"
+  resolved "https://registry.yarnpkg.com/@adguard/scriptlets/-/scriptlets-1.9.101.tgz#f18ba3b16b673790e92a6ec66977590cc619ae05"
+  integrity sha512-mqqQ57v/BRVVEYXXmWUPI2S6Fgxj1lj5pC1rA7Sde3QiLyS9CqL29yu9EydXY2QJw9eN9Xw/NsdoXaOEfSd9bA==
   dependencies:
     "@babel/runtime" "^7.20.13"
     js-yaml "^3.13.1"
 
-"@adguard/[email protected].5":
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/@adguard/tsurlfilter/-/tsurlfilter-2.2.5.tgz#fda46d4b08361942cb58b1d7a35921cbd34b5442"
-  integrity sha512-r44FxLH7TcB2GF8kiBTXaoQKSkYYC8udfcV7sLY41kgJYjM05g0TxhGO3UhkrUZ8ps2ctNMKFbghpbrwlJIvmA==
+"@adguard/[email protected].7":
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/@adguard/tsurlfilter/-/tsurlfilter-2.2.7.tgz#283e42fc0e13b84234a606f76ae9eab8ccbbe230"
+  integrity sha512-DgNx6yG2fkcvAMSz6CuB1dQfUiB7mrJytA3fQWYkm335V7m89RMdsORwjL/TA2cBYtNDgV3DDDvwJsy/B+/kAQ==
   dependencies:
-    "@adguard/scriptlets" "^1.9.91"
+    "@adguard/scriptlets" "^1.9.101"
     cidr-tools "^6.4.1"
     commander "9.4.1"
     is-cidr "4.0.2"