Skip to content

Commit

Permalink
AG-37298: Open non-allowlisted website in allowlisted tab inherits al…
Browse files Browse the repository at this point in the history
…lowlist status
  • Loading branch information
neolite committed Nov 5, 2024
1 parent 06eb62e commit ee3b55e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 31 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- When you open not allowlisted website on allowlisted website tab it will be treated as allowlisted [AdguardBrowserExtension#3020].

[AdguardBrowserExtension#3020]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/3020

- A rule from a disabled filter list disables another rule [AdguardBrowserExtension#3002].

[AdguardBrowserExtension#3002]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/3002
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"@adguard/scriptlets": "^1.12.1",
"@adguard/translate": "^1.0.2",
"@adguard/tsurlfilter": "https://github.com/AdguardTeam/tsurlfilter/raw/399884044316e655cb22819676707d8aafeea823/packages/tsurlfilter/tsurlfilter.tgz",
"@adguard/tswebextension": "https://github.com/AdguardTeam/tsurlfilter/raw/399884044316e655cb22819676707d8aafeea823/packages/tswebextension/tswebextension.tgz",
"@adguard/tswebextension": "https://github.com/AdguardTeam/tsurlfilter/raw/ff31fdc1dd18b54ff49767f925827149f94ab6f8/packages/tswebextension/tswebextension.tgz",
"@xstate/react": "^4.1.1",
"ace-builds": "^1.8.1",
"assert": "^2.0.0",
Expand Down
35 changes: 5 additions & 30 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@
tldts "5.6.45"
zod "3.21.4"

"@adguard/tswebextension@https://github.com/AdguardTeam/tsurlfilter/raw/399884044316e655cb22819676707d8aafeea823/packages/tswebextension/tswebextension.tgz":
"@adguard/tswebextension@https://github.com/AdguardTeam/tsurlfilter/raw/ff31fdc1dd18b54ff49767f925827149f94ab6f8/packages/tswebextension/tswebextension.tgz":
version "2.4.0-alpha.6"
resolved "https://github.com/AdguardTeam/tsurlfilter/raw/399884044316e655cb22819676707d8aafeea823/packages/tswebextension/tswebextension.tgz#ad3587f86ae537b12bca159f3d9d4d5e0bfcad47"
resolved "https://github.com/AdguardTeam/tsurlfilter/raw/ff31fdc1dd18b54ff49767f925827149f94ab6f8/packages/tswebextension/tswebextension.tgz#e4e124c011a3ddbaf32682cca193e8f8c72c2cbb"
dependencies:
"@adguard/agtree" "^2.1.2"
"@adguard/assistant" "^4.3.70"
Expand Down Expand Up @@ -7633,16 +7633,7 @@ string-natural-compare@3.0.1:
resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4"
integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==

"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand Down Expand Up @@ -7736,14 +7727,7 @@ string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"

strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand Down Expand Up @@ -8512,16 +8496,7 @@ word-wrap@^1.2.5:
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^7.0.0:
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand Down

0 comments on commit ee3b55e

Please sign in to comment.