Skip to content

Commit 56337a4

Browse files
committed
AG-42625 fix docs build while new version releasing
Squashed commit of the following: commit fc0d89f Author: Slava Leleka <[email protected]> Date: Fri May 23 09:20:03 2025 -0400 prepare release v2.2.2 commit abe1c95 Author: Slava Leleka <[email protected]> Date: Fri May 23 09:19:43 2025 -0400 update agtree to v3.2.0 commit 848c73b Merge: 35440f3 66a35bf Author: Slava Leleka <[email protected]> Date: Fri May 23 09:12:05 2025 -0400 Merge branch 'master' into fix/AG-42625 commit 35440f3 Author: Slava Leleka <[email protected]> Date: Fri May 23 09:11:53 2025 -0400 fix specs to build docs on new release deployment
1 parent 66a35bf commit 56337a4

File tree

5 files changed

+34
-11
lines changed

5 files changed

+34
-11
lines changed

CHANGELOG.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,27 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
1010
<!-- TODO: change `@added unknown` tag due to the actual version -->
1111
<!-- during new scriptlets or redirects releasing -->
1212

13+
## [v2.2.2] - 2025-05-23
14+
15+
### Changed
16+
17+
- Updated [@adguard/agtree] to `3.2.0`.
18+
19+
### Fixed
20+
21+
- `spoof-css` scriptlet — incorrect `DOMRect` setting [#498].
22+
23+
[v2.2.2]: https://github.com/AdguardTeam/Scriptlets/compare/v2.2.1...v2.2.2
24+
[#498]: https://github.com/AdguardTeam/Scriptlets/issues/498
25+
1326
## [v2.2.1] - 2025-05-21
1427

1528
### Fixed
1629

1730
- Trusted types bundle.
1831

32+
[v2.2.1]: https://github.com/AdguardTeam/Scriptlets/compare/v2.2.0...v2.2.1
33+
1934
## [v2.2.0] - 2025-05-21
2035

2136
### Added
@@ -33,7 +48,6 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
3348

3449
### Fixed
3550

36-
- `spoof-css` scriptlet — incorrect `DOMRect` setting [#498].
3751
- Escaping quotes in `trusted-replace-node-text` scriptlet [#440].
3852
- `trusted-suppress-native-method` scriptlet, `isMatchingSuspended` was not reset when the stack does not match,
3953
so in some cases given method was not prevented [#496].
@@ -45,7 +59,6 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
4559
[#477]: https://github.com/AdguardTeam/Scriptlets/issues/477
4660
[#496]: https://github.com/AdguardTeam/Scriptlets/issues/496
4761
[#497]: https://github.com/AdguardTeam/Scriptlets/issues/497
48-
[#498]: https://github.com/AdguardTeam/Scriptlets/issues/498
4962

5063
## [v2.1.7] - 2025-04-03
5164

bamboo-specs/build.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ Build:
4545
pnpm build
4646
4747
pnpm pack --out scriptlets.tgz
48-
49-
pnpm wiki
5048
- inject-variables:
5149
file: dist/build.txt
5250
scope: RESULT

bamboo-specs/deploy.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,24 @@ npmjs: &npmjs
3030
- |-
3131
set -e
3232
set -x
33+
34+
# Fix mixed logs
35+
exec 2>&1
36+
3337
ls -alt
3438
3539
export NPM_TOKEN=${bamboo.npmSecretToken}
3640
echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc
3741
3842
npm publish scriptlets.tgz ${bamboo_publishArgs}
43+
44+
pnpm wiki
45+
- any-task:
46+
plugin-key: com.atlassian.bamboo.plugins.vcs:task.vcs.commit
47+
configuration:
48+
# do not change commitMessage
49+
commitMessage: 'deploy: update docs for v${bamboo.inject.version}'
50+
selectedRepository: defaultRepository
3951
- any-task:
4052
plugin-key: com.atlassian.bamboo.plugins.vcs:task.vcs.tagging
4153
configuration:

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@adguard/scriptlets",
3-
"version": "2.2.1",
3+
"version": "2.2.2",
44
"description": "AdGuard's JavaScript library of Scriptlets and Redirect resources",
55
"type": "module",
66
"scripts": {
@@ -64,7 +64,7 @@
6464
"neverBuiltDependencies": []
6565
},
6666
"dependencies": {
67-
"@adguard/agtree": "3.1.5",
67+
"@adguard/agtree": "3.2.0",
6868
"@types/trusted-types": "^2.0.7",
6969
"js-yaml": "^3.14.1"
7070
},

pnpm-lock.yaml

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)