Skip to content

Commit

Permalink
AG-31412 Update filters-downloader to 2.2.4
Browse files Browse the repository at this point in the history
Squashed commit of the following:

commit 05c4a51af19cccaf985d6cdb0b58446bf1aef580
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Mon Dec 9 18:20:20 2024 +0300

    Applied suggestion

commit e11c607258e889a0d06434662299af3f5de1ee39
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Mon Dec 9 18:18:23 2024 +0300

    Applied suggestion

commit d96c34046ff76d4d2468f2eb790de3edd6caf0ed
Author: jellizaveta <e.egorova@adguard.com>
Date:   Mon Dec 9 16:39:50 2024 +0300

    update changelog

commit 26a01caf4b03ea19f71f36ddb65f43c43e1599c9
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Mon Dec 9 16:37:43 2024 +0300

    Applied suggestion

commit 9e07ebecfce5a3db3c1fd05e5016fb20ae1a5a68
Author: jellizaveta <e.egorova@adguard.com>
Date:   Mon Dec 9 14:49:03 2024 +0300

    AG-31412 Update filters-downloader to 2.2.4
  • Loading branch information
jellizaveta committed Dec 9, 2024
1 parent 1b11eb8 commit 674c946
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 6 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.149] - 2024-12-09

### Changed

- Print more details when build failed because of invalid directives [#213]
- Updated [@adguard/filters-downloader] to v2.2.4

[v1.1.149]: https://github.com/AdguardTeam/FiltersCompiler/compare/v1.1.148...v1.1.149
[#213]: https://github.com/AdguardTeam/FiltersCompiler/issues/213

## [v1.1.148] - 2024-10-02

### Changed
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"dependencies": {
"@adguard/extended-css": "^2.0.56",
"@adguard/filters-downloader": "^2.2.2",
"@adguard/filters-downloader": "^2.2.4",
"@adguard/scriptlets": "^1.11.16",
"@adguard/tsurlfilter": "2.2.23",
"ajv": "^8.11.0",
Expand Down
14 changes: 13 additions & 1 deletion src/test/builder.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1052,9 +1052,21 @@ describe('Test builder', () => {
});

it('Resolve bad include inside condition', async () => {
const filterURL = path.join(badFiltersDir, 'filter_9_Includes');
const fileURL = path.join(filterURL, 'non-existing-file.txt');
const errorMessages = [
"Failed to resolve the include directive '!#include non-existing-file.txt'",
`URL: '${filterURL}'`,
'Context:',
'\t! License: http://creativecommons.org/licenses/by-sa/3.0/',
'\t!',
'\t!#if adguard',
'\t!#include non-existing-file.txt',
`\tError: ENOENT: no such file or directory, open '${fileURL}'`,
];
await expect(
builder.build(badFiltersDir, null, null, platformsDir, platformsConfigFile, [9]),
).rejects.toThrow(/^Failed to resolve the include directive: '!#include non-existing-file\.txt'$/);
).rejects.toThrow(`${errorMessages.join('\n')}\n`);
});

it('filters.js and filters_i18n.js as copies of the json files', async () => {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
resolved "https://registry.npmjs.org/@adguard/extended-css/-/extended-css-2.0.56.tgz"
integrity sha512-RMPRGZ80kM6KiKRR0K2DUOD0+2CiadBk+G6zYBrRmzk4lD71Cipv2b9/rRy9Fdh41ipoApZsQdbJZozXFsM8RA==

"@adguard/filters-downloader@^2.2.2":
version "2.2.2"
resolved "https://registry.yarnpkg.com/@adguard/filters-downloader/-/filters-downloader-2.2.2.tgz#ec4c9a5a2cbbaf5c3cd974c3f4b94b11b86c57a5"
integrity sha512-7seM81E2QvvgfgC0uiK1ayYLBuRHiRedqQO4xAwpC7x+d1UOyu+pDZxOy3eYW7TMTv+Nd8KrpINPI5RrCZbZ0w==
"@adguard/filters-downloader@^2.2.4":
version "2.2.4"
resolved "https://registry.yarnpkg.com/@adguard/filters-downloader/-/filters-downloader-2.2.4.tgz#b69b5340c243eb366f4156c5b3f0fec8fe0bb7ba"
integrity sha512-3I7Bi4CvRcZCV0wQvtixhHKZeT4SzyWyPedCHLxXvc1MSsSUmAqkonchn2Aje7wT3zI8f+wHQX7oZTE6jT1lKg==
dependencies:
"@adguard/diff-builder" "1.0.17"
axios "1.6.2"
Expand Down

1 comment on commit 674c946

@slavaleleka
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.