From 5d9b47980789fe22345d857974ddbbed82d53bf1 Mon Sep 17 00:00:00 2001 From: Slava Leleka Date: Tue, 5 Sep 2023 12:45:40 +0300 Subject: [PATCH 1/4] fix badge's tab blocked count for redirects. AG-25087 Squashed commit of the following: commit 70a7983ae6290916195b583b7bf69d16f25ff755 Merge: c648057b fd4ff3a8 Author: Slava Leleka Date: Tue Sep 5 12:30:10 2023 +0300 merge master into the branch commit c648057b719c0d6d1ddfba714a917a206e75894d Author: Slava Leleka Date: Mon Sep 4 23:46:52 2023 +0300 update changelog commit e61064b129e697e58e7bf9ec38368a6059749cdf Author: Slava Leleka Date: Mon Sep 4 23:46:48 2023 +0300 fix bange count for redirects commit 29539cb6532d66d06c108a038a06dd2c83799685 Author: Slava Leleka Date: Mon Sep 4 23:16:29 2023 +0300 fix changelog typo --- packages/tswebextension/CHANGELOG.md | 14 ++++++++++++-- .../mv2/background/request/request-blocking-api.ts | 4 ++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/packages/tswebextension/CHANGELOG.md b/packages/tswebextension/CHANGELOG.md index dc68aeed45..28f251ac29 100644 --- a/packages/tswebextension/CHANGELOG.md +++ b/packages/tswebextension/CHANGELOG.md @@ -7,11 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 + +## Unreleased + +### Fixed +- Redirects are not included into tab's blocked requests count + [#2443](https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2443). + + ## [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 index df88e1ba47..36dabd25f0 100644 --- 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 }; } } From ca37cf3e76e71aa229cb5742ee4503115120e5ae Mon Sep 17 00:00:00 2001 From: Slava Leleka Date: Tue, 5 Sep 2023 13:06:46 +0300 Subject: [PATCH 2/4] update changelog for tswebextension v0.3.15 Squashed commit of the following: commit b7ed29561f5a2458cfd0188711818694d02c1805 Author: Slava Leleka Date: Tue Sep 5 12:55:06 2023 +0300 update changelog commit 5d5451e70126d00613e5eeb147bd0772d2508470 Author: Slava Leleka Date: Tue Sep 5 12:54:58 2023 +0300 bump version --- packages/tswebextension/CHANGELOG.md | 2 +- packages/tswebextension/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tswebextension/CHANGELOG.md b/packages/tswebextension/CHANGELOG.md index 28f251ac29..062453523c 100644 --- a/packages/tswebextension/CHANGELOG.md +++ b/packages/tswebextension/CHANGELOG.md @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 -## Unreleased +## [0.3.15] - 2023-09-05 ### Fixed - Redirects are not included into tab's blocked requests count diff --git a/packages/tswebextension/package.json b/packages/tswebextension/package.json index 6e0f66b8da..949d74697c 100644 --- a/packages/tswebextension/package.json +++ b/packages/tswebextension/package.json @@ -1,6 +1,6 @@ { "name": "@adguard/tswebextension", - "version": "0.3.14", + "version": "0.3.15", "description": "This is a TypeScript library that implements AdGuard's extension API", "main": "dist/index.js", "typings": "dist/types/lib/mv2/background/index.d.ts", From 234abda739b5fe57b7f22991173b742e973b27ab Mon Sep 17 00:00:00 2001 From: David Tota Date: Tue, 5 Sep 2023 17:53:33 +0300 Subject: [PATCH 3/4] Update AGTree changelog Merge in ADGUARD-FILTERS/tsurlfilter from changelog-1.1.5 to master Squashed commit of the following: commit 90e2a5dd04f24d132e18471e8b504ca7e806e27a Author: scripthunter7 Date: Tue Sep 5 16:01:28 2023 +0200 Update changelog --- packages/agtree/CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/agtree/CHANGELOG.md b/packages/agtree/CHANGELOG.md index 353599d429..0b8ddfbe9a 100644 --- 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 From a624bfa81dca171f6b62928483cac58d74662b2f Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Tue, 5 Sep 2023 18:09:07 +0300 Subject: [PATCH 4/4] skipci: Automatic increment build number --- packages/agtree/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/agtree/package.json b/packages/agtree/package.json index 59dec40829..f4fdb9c2e8 100644 --- a/packages/agtree/package.json +++ b/packages/agtree/package.json @@ -1,6 +1,6 @@ { "name": "@adguard/agtree", - "version": "1.1.4", + "version": "1.1.5", "description": "Universal adblock filter list parser.", "keywords": [ "adblock",