Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
skovhus authored Jan 2, 2025
2 parents 513aa8f + 179a285 commit 09af388
Show file tree
Hide file tree
Showing 17 changed files with 2,659 additions and 2,084 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@ jobs:
- name: Install shellcheck and shfmt (used for testing)
run: sudo apt-get install -y shellcheck shfmt

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v4
with:
version: 8
version: 9

- uses: actions/setup-node@v4
with:
node-version: 20
registry-url: https://registry.npmjs.org/
cache: "pnpm"

- run: |
git config --local user.email "kenneth.skovhus@gmail.com"
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/upgrade-tree-sitter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v4
with:
version: 8
version: 9

- uses: actions/setup-node@v4
with:
node-version: 20
cache: "pnpm"
cache-dependency-path: '**/pnpm-lock.yaml'

- run: pnpm install --frozen-lockfile

Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,22 @@ jobs:

strategy:
matrix:
node-version: [16.x, 18.x, 20.x]
node-version: [18.x, 20.x]

steps:
- uses: actions/checkout@v4

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

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v4
with:
version: 8
version: 9

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

- run: pnpm install --frozen-lockfile
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodejs 18.20.1
nodejs 18.20.5
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,29 @@
"postinstall": "pnpm --dir=vscode-client install --ignore-workspace"
},
"devDependencies": {
"@types/jest": "29.5.12",
"@types/node": "18.19.30",
"@typescript-eslint/eslint-plugin": "7.5.0",
"@typescript-eslint/parser": "7.5.0",
"eslint": "8.57.0",
"@types/jest": "29.5.14",
"@types/node": "18.19.68",
"@typescript-eslint/eslint-plugin": "7.18.0",
"@typescript-eslint/parser": "7.18.0",
"eslint": "8.57.1",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-jest": "27.9.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-simple-import-sort": "12.0.0",
"eslint-plugin-sort-class-members": "1.20.0",
"eslint-plugin-simple-import-sort": "12.1.1",
"eslint-plugin-sort-class-members": "1.21.0",
"jest": "29.7.0",
"prettier": "2.8.8",
"ts-jest": "29.1.2",
"typescript": "5.4.4",
"ts-jest": "29.2.5",
"typescript": "5.6.3",
"vscode-languageserver": "8.0.2",
"vscode-languageserver-textdocument": "1.0.11"
"vscode-languageserver-textdocument": "1.0.12"
},
"resolutions": {
"@types/vscode": "1.88.0"
"@types/vscode": "1.96.0"
},
"engines": {
"node": ">=16",
"pnpm": ">=8.x"
"pnpm": ">=9.x"
},
"jest": {
"preset": "ts-jest",
Expand Down
Loading

0 comments on commit 09af388

Please sign in to comment.