Skip to content

Commit 51ddb4f

Browse files
committed
AG-41223 update node to v22 and pnpm to v10
Squashed commit of the following: commit e6a5605 Author: Slava Leleka <[email protected]> Date: Fri Apr 4 17:50:48 2025 -0400 cleanup commit ffc166e Author: Slava Leleka <[email protected]> Date: Fri Apr 4 17:44:39 2025 -0400 use pnpm v10 and node v22, update deps and specs commit 403ec27 Author: Slava Leleka <[email protected]> Date: Fri Apr 4 17:31:18 2025 -0400 cleanup
1 parent 83aa91b commit 51ddb4f

File tree

11 files changed

+6154
-4807
lines changed

11 files changed

+6154
-4807
lines changed

.github/workflows/release.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
name: Github Release
22

33
env:
4-
NODE_VERSION: 20
4+
NODE_VERSION: 22
5+
PNPM_VERSION: 10.7.1
56

67
# Workflow need write access to the repository to create a GitHub release
78
permissions:
@@ -34,10 +35,11 @@ jobs:
3435
- name: Check out the repository
3536
uses: actions/checkout@v4
3637

37-
- name: Install pnpm
38+
- name: Setup pnpm
3839
uses: pnpm/action-setup@v4
3940
with:
40-
version: 8
41+
version: ${{ env.PNPM_VERSION }}
42+
run_install: false
4143

4244
- name: Set up Node.js
4345
uses: actions/setup-node@v4

.github/workflows/test.yaml

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
name: Test Scriptlets
22

33
env:
4-
NODE_VERSION: 20
4+
NODE_VERSION: 22
5+
PNPM_VERSION: 10.7.1
56

67
on:
78
push:
@@ -17,10 +18,11 @@ jobs:
1718
steps:
1819
- uses: actions/checkout@v4
1920

20-
- name: Install pnpm
21+
- name: Setup pnpm
2122
uses: pnpm/action-setup@v4
2223
with:
23-
version: 8
24+
version: ${{ env.PNPM_VERSION }}
25+
run_install: false
2426

2527
- name: Use Node.jobs
2628
uses: actions/setup-node@v4

.gitignore

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
.idea/
44
.vscode/
55
*.iml
6-
yarn-error.log
7-
node_modules
6+
node_modules/
87
private
9-
/tmp
8+
tmp/
109
output.md
11-
tests/dist
10+
tests/dist/
1211
browserstack.err
1312
local.log
1413

1514
# linters cache
1615
.eslintcache
16+
1717
tsconfig.tsbuildinfo
18-
.pnpm-store
19-
/dist
18+
.pnpm-store/
19+
dist/

README.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -218,19 +218,20 @@ lerna bootstrap
218218
pnpm link --global "@adguard/scriptlets"
219219

220220
cd ./packages/tsurlfilter
221+
221222
pnpm build
222-
yarn link
223+
224+
pnpm link --global
223225
```
224226

225227
In extension directory install dependencies, link packages and build
226228

227229
``` bash
228-
yarn
230+
pnpm install
229231

230-
yarn link @adguard/scriptlets
231-
yarn link @adguard/tsurlfilter
232+
pnpm link --global "@adguard/scriptlets"
232233

233-
yarn dev
234+
# run build script
234235
```
235236

236237
### <a name="how-to-test"></a> How to test

bamboo-specs/build.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ plan:
55
key: SCRIPTLETSBUILD
66
name: scriptlets - build
77
variables:
8-
dockerContainer: adguard/puppeteer-runner:23.3--1
8+
dockerContainer: adguard/node-ssh:22.14--0
99

1010
stages:
1111
- Build:
12-
manual: 'false'
13-
final: 'false'
12+
manual: false
13+
final: false
1414
jobs:
1515
- Build
1616

@@ -24,7 +24,7 @@ Build:
2424
${system.PNPM_DIR}: "${bamboo.cachePnpm}"
2525
tasks:
2626
- checkout:
27-
force-clean-build: 'true'
27+
force-clean-build: true
2828
- script:
2929
interpreter: SHELL
3030
scripts:
@@ -72,7 +72,7 @@ triggers: []
7272
branches:
7373
create: manually
7474
delete: never
75-
link-to-jira: 'true'
75+
link-to-jira: true
7676

7777
notifications:
7878
- events:

bamboo-specs/deploy.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ deployment:
44
name: scriptlets - deploy
55
source-plan: AJL-SCRIPTLETSBUILD
66
release-naming: ${bamboo.inject.version}
7+
78
environments:
89
- npmjs
910
- npmjs • alpha
1011
- npmjs • beta
1112

1213
npmjs: &npmjs
1314
docker:
14-
image: adguard/puppeteer-runner:23.3--1
15+
image: adguard/node-ssh:22.14--0
1516
volumes:
1617
${system.PNPM_DIR}: "${bamboo.cachePnpm}"
1718
variables: &npmjs-variables

bamboo-specs/increment.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plan:
55
key: SCRIPTLETSINCR
66
name: scriptlets - increment
77
variables:
8-
dockerContainer: adguard/node-ssh:18.19--0
8+
dockerContainer: adguard/node-ssh:22.14--0
99

1010
stages:
1111
- Increment:
@@ -24,7 +24,7 @@ Increment:
2424
clean-working-dir: true
2525
tasks:
2626
- checkout:
27-
force-clean-build: 'true'
27+
force-clean-build: true
2828
- script:
2929
interpreter: SHELL
3030
scripts:
@@ -54,7 +54,7 @@ Increment:
5454
branches:
5555
create: manually
5656
delete: never
57-
link-to-jira: 'true'
57+
link-to-jira: true
5858

5959
labels: []
6060
other:

bamboo-specs/test.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ plan:
55
key: SCRIPTLETSTEST
66
name: scriptlets - test new
77
variables:
8-
dockerPuppeteer: adguard/puppeteer-runner:23.3--1
8+
dockerPuppeteer: adguard/puppeteer-runner:22.14--24.5--0
99

1010
stages:
1111
- Build:
12-
manual: 'false'
13-
final: 'false'
12+
manual: false
13+
final: false
1414
jobs:
1515
- Build
1616

@@ -22,7 +22,7 @@ Build:
2222
${system.PNPM_DIR}: "${bamboo.cachePnpm}"
2323
tasks:
2424
- checkout:
25-
force-clean-build: 'true'
25+
force-clean-build: true
2626
- script:
2727
interpreter: SHELL
2828
scripts:
@@ -75,7 +75,7 @@ branches:
7575
delete:
7676
after-deleted-days: '1'
7777
after-inactive-days: '5'
78-
link-to-jira: 'true'
78+
link-to-jira: true
7979

8080
notifications:
8181
- events:

package.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@
6060
"import": "./dist/validators/index.js"
6161
}
6262
},
63+
"pnpm": {
64+
"neverBuiltDependencies": []
65+
},
6366
"dependencies": {
6467
"@adguard/agtree": "3.1.0",
6568
"js-yaml": "^3.14.1"
@@ -96,7 +99,7 @@
9699
"crypto-js": "^4.2.0",
97100
"dotenv": "^8.2.0",
98101
"dox": "^0.9.0",
99-
"eslint": "^8.57.1",
102+
"eslint": "8.57.1",
100103
"eslint-config-airbnb-base": "^15.0.0",
101104
"eslint-config-airbnb-typescript": "^17.0.0",
102105
"eslint-import-resolver-typescript": "^3.5.5",
@@ -111,9 +114,9 @@
111114
"lint-staged": "^12.1.2",
112115
"markdownlint": "^0.28.2",
113116
"markdownlint-cli": "^0.34.0",
114-
"node-qunit-puppeteer": "^2.2.0",
117+
"node-qunit-puppeteer": "^2.2.1",
115118
"openurl": "^1.1.1",
116-
"puppeteer": "^23.7.1",
119+
"puppeteer": "^24.5.0",
117120
"qunit": "^2.22.0",
118121
"rimraf": "^6.0.1",
119122
"rollup": "^4.28.1",

0 commit comments

Comments
 (0)