Skip to content

Commit

Permalink
Pull request #1518: AG-22081 Fix script rules injection
Browse files Browse the repository at this point in the history
Merge in EXTENSIONS/browser-extension from fix/AG-22081 to master

Squashed commit of the following:

commit d7ae2e2
Merge: f219402 ef2d5e1
Author: Vladimir Zhelvis <v.zhelvis@adguard.com>
Date:   Wed May 31 22:34:36 2023 +0300

    Merge branch 'master' into fix/AG-22081

commit f219402
Author: Vladimir Zhelvis <v.zhelvis@adguard.com>
Date:   Wed May 31 13:04:27 2023 +0300

    bump @adguard/tswebextension to 0.2.3
  • Loading branch information
zhelvis committed Jun 1, 2023
1 parent ef2d5e1 commit 32a9d74
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

### Added
- `@adguard/tswebextension` MV2 integration
- [@adguard/tswebextension](https://github.com/AdguardTeam/tsurlfilter/blob/master/packages/tswebextension/README.md) MV2 integration

### Changed
- moved Adguard API to separate package — [@adguard/api](https://www.npmjs.com/package/@adguard/api)
- updated `@adguard/extended-css` to [v2.0.51](https://github.com/AdguardTeam/ExtendedCss/blob/master/CHANGELOG.md#v2051)
- updated `@adguard/tswebextension` to [v0.2.0](https://github.com/AdguardTeam/tsurlfilter/blob/master/packages/tswebextension/CHANGELOG.md#020---2023-05-23)
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@
"@adguard/filters-downloader": "^1.1.15",
"@adguard/scriptlets": "^1.9.7",
"@adguard/translate": "^0.3.0",
"@adguard/tsurlfilter": "^2.0.4",
"@adguard/tswebextension": "^0.2.1",
"@adguard/tsurlfilter": "^2.0.5",
"@adguard/tswebextension": "^0.2.3",
"@xstate/react": "^1.5.1",
"ace-builds": "^1.8.1",
"c3": "0.4.15",
Expand Down
17 changes: 9 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
resolved "https://registry.yarnpkg.com/@adguard/translate/-/translate-0.3.0.tgz#a7a06d1d4847b57a1692ab079fd40939f8b9baff"
integrity sha512-MP74O2BFjW8ez3W+jJQyGNs3e1FTfIYijBHRwmZ/J/IrjCsrYGqER4TnNo7eL9j4Ffpth00ME+wtvsyCCNkRfg==

"@adguard/tsurlfilter@^2.0.4":
version "2.0.4"
resolved "https://registry.yarnpkg.com/@adguard/tsurlfilter/-/tsurlfilter-2.0.4.tgz#1f8c04554bbdfbb44706772422f12af149850af7"
integrity sha512-nWvCIIOkq+XPhoUf+kozY0ajCHfP4RJDnyvqZj5PMaFKV/lhIIRQgLt1Zai65TRqP1DowLgINsyp9NoyTS9DwA==
"@adguard/tsurlfilter@^2.0.1", "@adguard/tsurlfilter@^2.0.5":
version "2.0.5"
resolved "https://registry.yarnpkg.com/@adguard/tsurlfilter/-/tsurlfilter-2.0.5.tgz#aaaae43ce1432abbd6854b303ae89caf391a1204"
integrity sha512-8BugEeRl4OckDjAKUkjnaEUmx3lZAGWsapWWZ+sk8Wzk7QhioYbQJmVHNjOCqAZJcsilnQgTV87+UfjlINDwXg==
dependencies:
"@adguard/scriptlets" "^1.9.7"
commander "9.4.1"
Expand All @@ -48,14 +48,15 @@
tldts "5.6.45"
zod "3.19.1"

"@adguard/tswebextension@^0.2.1":
version "0.2.1"
resolved "https://registry.yarnpkg.com/@adguard/tswebextension/-/tswebextension-0.2.1.tgz#289e1a7bd61bb999de2c6d8350c7e412979816a3"
integrity sha512-+/vkRqY00qkMoC8kBaVPaU4NTvbKpt0A1N35sOvKOtqkOQL3H7i4McPLNQbMXiSgaxS0cUqtVSM+QorlikWjeg==
"@adguard/tswebextension@^0.2.3":
version "0.2.3"
resolved "https://registry.yarnpkg.com/@adguard/tswebextension/-/tswebextension-0.2.3.tgz#b85216c0bcdd1e5e42e73a1e5f3de7bc3f537afc"
integrity sha512-Y4Nhrr/9W43JMRwCSEQi86KYCXe6VNlqf/obIJpyRNjTokbCSbVuH4G6lBe8FbsOo0imcNGBfqMJwfv5iwjygA==
dependencies:
"@adguard/assistant" "^4.3.69"
"@adguard/extended-css" "^2.0.52"
"@adguard/scriptlets" "^1.9.7"
"@adguard/tsurlfilter" "^2.0.1"
bowser "2.11.0"
commander "9.4.1"
fs-extra "10.1.0"
Expand Down

0 comments on commit 32a9d74

Please sign in to comment.