Skip to content

Commit

Permalink
AG-36969 fix allowlist determination for a new tab
Browse files Browse the repository at this point in the history
Merge in ADGUARD-FILTERS/tsurlfilter from fix/AG-36969 to release/v3.1

Squashed commit of the following:

commit c58c034
Author: Maxim Topciu <mtopciu@adguard.com>
Date:   Thu Oct 17 16:11:00 2024 +0300

    AG-36969 update pnpm-lock

commit 3ef89ea
Author: Maxim Topciu <mtopciu@adguard.com>
Date:   Thu Oct 17 16:09:29 2024 +0300

    AG-36969 update version of the tswebextension in the adguard/api-mv3

commit 20a3187
Author: Maxim Topciu <mtopciu@adguard.com>
Date:   Thu Oct 17 16:04:56 2024 +0300

    AG-36969 update CHANGELOG.md

commit a3408ce
Author: Maxim Topciu <mtopciu@adguard.com>
Date:   Thu Oct 17 15:56:21 2024 +0300

    AG-36969 fix allowlist determination for a new tab
  • Loading branch information
maximtop committed Oct 17, 2024
1 parent e7fd10f commit 9474100
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 4 deletions.
6 changes: 6 additions & 0 deletions packages/adguard-api-mv3/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ 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).

## 0.2.2 - 2024-10-17

### Changed

- Updated [@adguard/tswebextension] to `v2.4.0-alpha.5`.

## 0.2.1 - 2024-10-15

### Changed
Expand Down
4 changes: 2 additions & 2 deletions packages/adguard-api-mv3/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@adguard/api-mv3",
"version": "0.2.1",
"version": "0.2.2",
"description": "This is a TypeScript library that implements AdGuard's extension API for MV3",
"main": "dist/adguard-api.js",
"files": [
Expand Down Expand Up @@ -37,7 +37,7 @@
"license": "GPL-3.0-only",
"dependencies": {
"@adguard/logger": "1.1.0",
"@adguard/tswebextension": "2.4.0-alpha.3",
"@adguard/tswebextension": "2.4.0-alpha.5",
"zod": "3.22.4"
},
"devDependencies": {
Expand Down
8 changes: 8 additions & 0 deletions packages/tswebextension/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ 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 -->

## [2.4.0-alpha.5] - 2024-10-17

### Fixed

- Allowlist determination for a new tab

[2.4.0-alpha.5]: https://github.com/AdguardTeam/tsurlfilter/releases/tag/tswebextension-v2.4.0-alpha.5

## [2.4.0-alpha.4] - 2024-10-16

### Changed
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": "2.4.0-alpha.4",
"version": "2.4.0-alpha.5",
"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",
Expand Down
4 changes: 4 additions & 0 deletions packages/tswebextension/src/lib/mv3/tabs/tabs-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,10 @@ export class TabsApi {
return;
}

if (frameId === MAIN_FRAME_ID && partialFrameContext.frameRule) {
tabContext.mainFrameRule = partialFrameContext.frameRule;
}

const frameContext = tabContext?.getFrameContext(frameId);

if (!frameContext) {
Expand Down
2 changes: 1 addition & 1 deletion pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9474100

Please sign in to comment.