Skip to content

Commit 09af388

Browse files
authored
Merge branch 'main' into dev
2 parents 513aa8f + 179a285 commit 09af388

17 files changed

+2659
-2084
lines changed

Diff for: .github/workflows/deploy.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@ jobs:
1414
- name: Install shellcheck and shfmt (used for testing)
1515
run: sudo apt-get install -y shellcheck shfmt
1616

17-
- uses: pnpm/action-setup@v2
17+
- uses: pnpm/action-setup@v4
1818
with:
19-
version: 8
19+
version: 9
2020

2121
- uses: actions/setup-node@v4
2222
with:
2323
node-version: 20
2424
registry-url: https://registry.npmjs.org/
25+
cache: "pnpm"
2526

2627
- run: |
2728
git config --local user.email "[email protected]"

Diff for: .github/workflows/upgrade-tree-sitter.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v4
1313

14-
- uses: pnpm/action-setup@v2
14+
- uses: pnpm/action-setup@v4
1515
with:
16-
version: 8
16+
version: 9
1717

1818
- uses: actions/setup-node@v4
1919
with:
2020
node-version: 20
2121
cache: "pnpm"
22-
cache-dependency-path: '**/pnpm-lock.yaml'
2322

2423
- run: pnpm install --frozen-lockfile
2524

Diff for: .github/workflows/verify.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,22 @@ jobs:
99

1010
strategy:
1111
matrix:
12-
node-version: [16.x, 18.x, 20.x]
12+
node-version: [18.x, 20.x]
1313

1414
steps:
1515
- uses: actions/checkout@v4
1616

1717
- name: Install shellcheck and shfmt (used for testing)
1818
run: sudo apt-get install -y shellcheck shfmt
1919

20-
- uses: pnpm/action-setup@v2
20+
- uses: pnpm/action-setup@v4
2121
with:
22-
version: 8
22+
version: 9
2323

2424
- name: Use Node.js ${{ matrix.node-version }}
2525
uses: actions/setup-node@v4
2626
with:
2727
cache: "pnpm"
28-
cache-dependency-path: '**/pnpm-lock.yaml'
2928
node-version: ${{ matrix.node-version }}
3029

3130
- run: pnpm install --frozen-lockfile

Diff for: .tool-versions

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nodejs 18.20.1
1+
nodejs 18.20.5

Diff for: package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,29 @@
1717
"postinstall": "pnpm --dir=vscode-client install --ignore-workspace"
1818
},
1919
"devDependencies": {
20-
"@types/jest": "29.5.12",
21-
"@types/node": "18.19.30",
22-
"@typescript-eslint/eslint-plugin": "7.5.0",
23-
"@typescript-eslint/parser": "7.5.0",
24-
"eslint": "8.57.0",
20+
"@types/jest": "29.5.14",
21+
"@types/node": "18.19.68",
22+
"@typescript-eslint/eslint-plugin": "7.18.0",
23+
"@typescript-eslint/parser": "7.18.0",
24+
"eslint": "8.57.1",
2525
"eslint-config-prettier": "9.1.0",
2626
"eslint-plugin-jest": "27.9.0",
2727
"eslint-plugin-prettier": "4.2.1",
28-
"eslint-plugin-simple-import-sort": "12.0.0",
29-
"eslint-plugin-sort-class-members": "1.20.0",
28+
"eslint-plugin-simple-import-sort": "12.1.1",
29+
"eslint-plugin-sort-class-members": "1.21.0",
3030
"jest": "29.7.0",
3131
"prettier": "2.8.8",
32-
"ts-jest": "29.1.2",
33-
"typescript": "5.4.4",
32+
"ts-jest": "29.2.5",
33+
"typescript": "5.6.3",
3434
"vscode-languageserver": "8.0.2",
35-
"vscode-languageserver-textdocument": "1.0.11"
35+
"vscode-languageserver-textdocument": "1.0.12"
3636
},
3737
"resolutions": {
38-
"@types/vscode": "1.88.0"
38+
"@types/vscode": "1.96.0"
3939
},
4040
"engines": {
4141
"node": ">=16",
42-
"pnpm": ">=8.x"
42+
"pnpm": ">=9.x"
4343
},
4444
"jest": {
4545
"preset": "ts-jest",

0 commit comments

Comments
 (0)