merge master into the branch, resolve conflicts

AdguardTeam · Feb 13, 2024 · 3bf3f92 · 3bf3f92
2 parents 04e4d36 + dd6963d
commit 3bf3f92
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/packages/tsurlfilter/CHANGELOG.md b/packages/tsurlfilter/CHANGELOG.md
@@ -8,15 +8,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <!-- TODO: manually add compare links for version changes -->
 <!-- e.g. [1.0.77]: https://github.com/AdguardTeam/tsurlfilter/compare/tsurlfilter-v1.0.76...tsurlfilter-v1.0.77 -->
 
-## [Unreleased]
+## [2.2.14] - 2024-02-13
 
-- Added a new `BufferRuleList` class that is supposed to replace
-  `StringRuleList`. It provides the same performance, but at the same time uses
-  less memory as the original filter list is stored as a UTF-8 encoded byte
-  array. In addition to that, it solves the problem of leaking links to the
-  original leaking strings that in turn was leading to higher memory usage.
+### Added
 
-[Unreleased]: https://github.com/AdguardTeam/tsurlfilter/compare/tsurlfilter-v2.2.13...HEAD
+- New `BufferRuleList` class that is supposed to replace `StringRuleList`.
+  It provides the same performance, but at the same time uses less memory
+  as the original filter list is stored as a UTF-8 encoded byte array.
+  In addition to that, it solves the problem of leaking links to the original leaking strings
+  that in turn was leading to higher memory usage.
 
 ## [2.2.13] - 2024-02-13
 

diff --git a/packages/tsurlfilter/package.json b/packages/tsurlfilter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@adguard/tsurlfilter",
-  "version": "2.2.13",
+  "version": "2.2.14",
   "description": "This is a TypeScript library that implements AdGuard's content blocking rules",
   "main": "dist/es/index.js",
   "module": "dist/es/index.js",

diff --git a/packages/tswebextension/CHANGELOG.md b/packages/tswebextension/CHANGELOG.md
@@ -8,12 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <!-- TODO: manually add compare links for version changes -->
 <!-- e.g. [0.1.2]: https://github.com/AdguardTeam/tsurlfilter/compare/tswebextension-v0.1.1...tswebextension-v0.1.2 -->
 
-## [Unreleased]
+## [1.0.14] - 2024-02-13
 
-- Filtering engine now uses the new `BufferRuleList` provided by
-  `@adguard/tsurlfilter` to improve performance and memory usage.
+### Changed
 
-[Unreleased]: https://github.com/AdguardTeam/tsurlfilter/compare/tswebextension-v1.0.13...HEAD
+- Filtering engine now uses the new `BufferRuleList` provided by `@adguard/tsurlfilter`
+  to improve performance and memory usage.
 
 ## [1.0.13] - 2024-02-13
 

diff --git a/packages/tswebextension/package.json b/packages/tswebextension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@adguard/tswebextension",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "This is a TypeScript library that implements AdGuard's extension API",
   "main": "dist/index.js",
   "typings": "dist/types/src/lib/mv2/background/index.d.ts",
@@ -85,7 +85,7 @@
     "@adguard/assistant": "^4.3.70",
     "@adguard/extended-css": "^2.0.56",
     "@adguard/scriptlets": "^1.10.1",
-    "@adguard/tsurlfilter": "^2.2.13",
+    "@adguard/tsurlfilter": "^2.2.14",
     "bowser": "2.11.0",
     "commander": "11.0.0",
     "fs-extra": "11.1.1",