resolve merge conflicts

AdguardTeam · Sep 5, 2023 · 3d283a7 · 3d283a7
2 parents f61e5b7 + a624bfa
commit 3d283a7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/packages/agtree/CHANGELOG.md b/packages/agtree/CHANGELOG.md
@@ -5,13 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog][keepachangelog], and this project adheres to [Semantic Versioning][semver].
 
 
-## Unreleased
+## 1.1.5 - 2023-09-05
 
 ### Changed
 
 - Validation of `$csp` and `$permissions` modifiers value
   by custom pre-defined validator instead of regular expression
 
+### Added
+
+- Exports to `package.json`
+
 ## 1.1.4 - 2023-08-30
 
 ### Fixed

diff --git a/packages/tswebextension/CHANGELOG.md b/packages/tswebextension/CHANGELOG.md
@@ -24,8 +24,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.3.14] - 2023-09-05
 
 ### Fixed
-- Domains from the allowlist were not properly escaped before being passed into the regular expression rules. [#2461](https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2461).
-- Cosmetic rule false positive applying when tab context changed while injection retry [#2459](https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2459).
+- Domains from the allowlist are not properly escaped before being passed into the regular expression rules
+  [#2461](https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2461).
+- Cosmetic rule false positive applying when tab context changed while injection retry
+  [#2459](https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2459).
 
 
 ## [0.3.13] - 2023-08-25

diff --git a/packages/tswebextension/src/lib/mv2/background/request/request-blocking-api.ts b/packages/tswebextension/src/lib/mv2/background/request/request-blocking-api.ts
@@ -125,6 +125,10 @@ export class RequestBlockingApi {
             const redirectUrl = redirectsService.createRedirectUrl(rule.getAdvancedModifierValue(), requestUrl);
             if (redirectUrl) {
                 RequestBlockingApi.logRuleApplying(eventId, rule, tabId);
+                // redirects should be considered as blocked for the tab blocked request count
+                // which is displayed on the extension badge
+                // https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2443
+                tabsApi.incrementTabBlockedRequestCount(tabId);
                 return { redirectUrl };
             }
         }