Skip to content

Commit

Permalink
Pull request #656: AG-25330 Do not inject cosmetic rules to extension…
Browse files Browse the repository at this point in the history
… pages

Merge in ADGUARD-FILTERS/tsurlfilter from fix/AG-25330-1 to master

Squashed commit of the following:

commit 3d283a7
Merge: f61e5b7 a624bfa
Author: Vladimir Zhelvis <v.zhelvis@adguard.com>
Date:   Tue Sep 5 18:58:08 2023 +0300

    resolve merge conflicts

commit f61e5b7
Author: Vladimir Zhelvis <v.zhelvis@adguard.com>
Date:   Tue Sep 5 18:45:43 2023 +0300

    do not inject cosmetic to extension pages
  • Loading branch information
zhelvis committed Sep 5, 2023
1 parent a624bfa commit b1e75f7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions packages/tswebextension/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
<!-- TODO: manually add compare links for version to the end of the file -->
<!-- e.g. [0.1.2]: https://github.com/AdguardTeam/tsurlfilter/compare/tswebextension-v0.1.1...tswebextension-v0.1.2 -->

## [0.3.16] - 2023-09-05

### Fixed
- Do not apply cosmetic rules to extension pages while fallback processing
[#2459](https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2459).


## [0.3.15] - 2023-09-05

Expand Down
2 changes: 1 addition & 1 deletion packages/tswebextension/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@adguard/tswebextension",
"version": "0.3.15",
"version": "0.3.16",
"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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ export class WebRequestApi {
* Cosmetic result may not be committed to frame context during worker request processing.
* We use engine request as a fallback for this case.
*/
if (!frame.cosmeticResult) {
if (!frame.cosmeticResult && isHttpOrWsRequest(url)) {
frame.cosmeticResult = engineApi.matchCosmetic({
requestUrl: url,
frameUrl: url,
Expand Down

0 comments on commit b1e75f7

Please sign in to comment.