AG-30810: $popup disables simple blocking rule

Merge in EXTENSIONS/browser-extension from fix/AG-30810 to master

Squashed commit of the following:

commit 6adffc6
Merge: b4cead3 cdf6680
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Sun Mar 3 19:13:25 2024 +0300

    Merge branch 'master' into fix/AG-30810

commit b4cead3
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Sat Mar 2 22:57:13 2024 +0300

    update changelog

commit f41a177
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Fri Mar 1 17:07:05 2024 +0300

    fixed deps

commit 0100a19
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Fri Mar 1 14:51:52 2024 +0300

    AG-30810: $popup disables simple blocking rule

CHANGELOG.md

@@ -9,21 +9,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Check diff updates once in a hour.
-- Updated `@adguard/tswebextension` to [v1.0.15](https://github.com/AdguardTeam/tsurlfilter/blob/master/packages/tswebextension/CHANGELOG.md).
-- Updated `@adguard/tsurlfilter` to [v2.2.14](https://github.com/AdguardTeam/tsurlfilter/blob/master/packages/tsurlfilter/CHANGELOG.md).
-- Updated `@adguard/scriptlets` to [v1.10.1](https://github.com/AdguardTeam/Scriptlets/blob/master/CHANGELOG.md).
+- Updated `@adguard/tswebextension` to [v1.0.16].
+- Updated `@adguard/tsurlfilter` to [v2.2.15].
+- Updated `@adguard/scriptlets` to [v1.10.1].
+
+[v1.0.16]: https://github.com/AdguardTeam/tsurlfilter/blob/master/packages/tswebextension/CHANGELOG.md
+[v2.2.15]: https://github.com/AdguardTeam/tsurlfilter/blob/master/packages/tsurlfilter/CHANGELOG.md
+[v1.10.1]: https://github.com/AdguardTeam/Scriptlets/blob/master/CHANGELOG.md
 
 ### Fixed
 - Memory leak with parsed tags from filter rules.
-- Applying of `$all` modifier rules [#2620](https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2620).
-- Settings fail to open on the very first attempt [#2712](https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2712)
-- All groups and filters are disabled after installation [#2713](https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2713)
-- Custom filter adding modal
-  [#2715](https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2715)
-- Send `stealth.block_trackers` during issues reporting
-  [#2721](https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2721)
-- `$popup` modifier block other types of resources
-  [#2723](https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2723)
+- Applying of `$all` modifier rules [#2620].
+- Settings fail to open on the very first attempt [#2712].
+- All groups and filters are disabled after installation [#2713].
+- Custom filter adding modal [#2715].
+- Send `stealth.block_trackers` during issues reporting [#2721].
+- `$popup` modifier block other types of resources [#2723].
+- `$popup` should not disable simple blocking rule [#2728].
+
+[#2620]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2620
+[#2712]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2712
+[#2713]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2713
+[#2715]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2715
+[#2721]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2721
+[#2723]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2723
+[#2728]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2728
 
 ## [4.3.14] - 2024-06-02
 

package.json

@@ -93,8 +93,8 @@
     "@adguard/filters-downloader": "^2.0.7",
     "@adguard/scriptlets": "^1.10.1",
     "@adguard/translate": "^1.0.2",
-    "@adguard/tsurlfilter": "^2.2.14",
-    "@adguard/tswebextension": "^1.0.15",
+    "@adguard/tsurlfilter": "^2.2.15",
+    "@adguard/tswebextension": "^1.0.16",
     "@xstate/react": "^1.5.1",
     "ace-builds": "^1.8.1",
     "assert": "^2.0.0",

yarn.lock

@@ -42,10 +42,10 @@
   resolved "https://registry.yarnpkg.com/@adguard/translate/-/translate-1.0.2.tgz#e8076902f0950a62d40519d6eb389778516928a0"
   integrity sha512-TeQV4ngse/fcpFDCrtU5VqjZfQsdytSuGT8wF4biIM6c6v6W/tkUdrTDhNItq126hAZe65V8QgipTAp8qHdeZw==
 
-"@adguard/tsurlfilter@^2.2.14":
-  version "2.2.14"
-  resolved "https://registry.yarnpkg.com/@adguard/tsurlfilter/-/tsurlfilter-2.2.14.tgz#b20e1474750406cc71f19b9470581433bed22bcc"
-  integrity sha512-or6JG8Edq66XLYMgKgYKWfYdDnqNgAUy0xMpHIiE3EXd6+XAyJecTkCCMo328TZ62qcRBODtxgFSc45TQDGNJQ==
+"@adguard/tsurlfilter@^2.2.14", "@adguard/tsurlfilter@^2.2.15":
+  version "2.2.15"
+  resolved "https://registry.yarnpkg.com/@adguard/tsurlfilter/-/tsurlfilter-2.2.15.tgz#ed5ee02c2807cf81b1b9b5968171d0713d3ee4ea"
+  integrity sha512-3AojTw/+5rYs4t04FyxC/U9ngDIMk7i/+yan2/aOhC+SUxvZ9FXEIl4PuVsY/pAjkhgtU85MtMHSQZlyxbLEWQ==
   dependencies:
     "@adguard/scriptlets" "^1.10.1"
     cidr-tools "^6.4.1"
@@ -57,10 +57,10 @@
     tldts "5.6.45"
     zod "3.19.1"
 
-"@adguard/tswebextension@^1.0.15":
-  version "1.0.15"
-  resolved "https://registry.yarnpkg.com/@adguard/tswebextension/-/tswebextension-1.0.15.tgz#cb5da5ed414b0962afa67f38d3f963511afbddab"
-  integrity sha512-cKjvR8lZSHyZpwJNtdpbWd1azBhtza0sVLT2gYoMhfId2S6wt1b8LynDyNf/6ILGkw2GxCAnKgTRsnCwg0XE6Q==
+"@adguard/tswebextension@^1.0.16":
+  version "1.0.16"
+  resolved "https://registry.yarnpkg.com/@adguard/tswebextension/-/tswebextension-1.0.16.tgz#6700970274f935abada5ac3f22824d415fbc1502"
+  integrity sha512-wdZ8g91W4vPcrloq3HK711PdzYEWjEO58SoC0B4nvdAY9toSRgNrAM7ixyPXRj4IX25PS0zW5rVWxpHVjrZQnA==
   dependencies:
     "@adguard/assistant" "^4.3.70"
     "@adguard/extended-css" "^2.0.56"