update filters-downloader to v2.2.1. #215 AG-31506

Squashed commit of the following: commit 55663ad Author: Slava Leleka <[email protected]> Date: Wed May 22 17:46:23 2024 +0300 update changelog commit 31da42f Author: Slava Leleka <[email protected]> Date: Wed May 22 17:45:52 2024 +0300 update changelog commit 8cafea2 Author: Slava Leleka <[email protected]> Date: Wed May 22 17:44:29 2024 +0300 update filters-downloader to v2.2.1 commit 3962b3e Author: Slava Leleka <[email protected]> Date: Wed May 22 17:31:27 2024 +0300 fix tests commit 8c62f75 Author: Slava Leleka <[email protected]> Date: Wed May 22 16:49:26 2024 +0300 fix tests commit 1a1a0b5 Author: Slava Leleka <[email protected]> Date: Wed May 22 16:49:15 2024 +0300 fix FiltersDownloader imports
AdguardTeam · May 22, 2024 · 52cb5db · 52cb5db
1 parent 285cdff
commit 52cb5db
Show file tree

Hide file tree

Showing 6 changed files with 116 additions and 104 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,16 @@ 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).
 
+
+## [v1.1.136] - 2024-05-22
+
+### Changed
+
+- Updated [@adguard/filters-downloader] to v2.2.1
+
+[v1.1.135]: https://github.com/AdguardTeam/FiltersCompiler/compare/v1.1.135...v1.1.136
+
+
 ## [v1.1.135] - 2024-05-20
 
 ### Added

diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@adguard/extended-css": "^2.0.56",
-    "@adguard/filters-downloader": "^1.1.23",
+    "@adguard/filters-downloader": "^2.2.1",
     "@adguard/scriptlets": "^1.10.25",
     "@adguard/tsurlfilter": "2.2.19",
     "ajv": "^8.11.0",

diff --git a/src/main/builder.js b/src/main/builder.js
@@ -17,7 +17,7 @@ module.exports = (function () {
     const { getFilterIdFromDirName } = require('./utils/utils');
     const { optimizeDomainBlockingRules } = require('./utils/builder-utils');
 
-    const FiltersDownloader = require('@adguard/filters-downloader');
+    const { FiltersDownloader } = require('@adguard/filters-downloader');
 
     const TEMPLATE_FILE = 'template.txt';
     const FILTER_FILE = 'filter.txt';

diff --git a/src/main/platforms/generator.js b/src/main/platforms/generator.js
@@ -14,7 +14,7 @@ module.exports = (() => {
 
     const RuleMasks = require('../rule/rule-masks');
 
-    const FiltersDownloader = require('@adguard/filters-downloader');
+    const { FiltersDownloader } = require('@adguard/filters-downloader');
 
     const RULES_SEPARATOR = '\r\n';
     const filterIdsPool = [];

diff --git a/src/test/builder.test.js b/src/test/builder.test.js
@@ -993,7 +993,7 @@ describe('Test builder', () => {
     it('Resolve bad include inside condition', async () => {
         await expect(
             builder.build(badFiltersDir, null, null, platformsDir, platformsConfigFile, [9]),
-        ).rejects.toThrow(/^ENOENT: no such file or directory, open.*non-existing-file\.txt.*$/);
+        ).rejects.toThrow(/^Failed to resolve the include directive: '!#include non-existing-file\.txt'$/);
     });
 
     it('filters.js and filters_i18n.js as copies of the json files', async () => {