From 2b73f7dab4f1c74cb70a8c255c9db9bc580c9a8f Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Fri, 23 Jan 2026 09:45:01 +0100 Subject: [PATCH 1/2] Introduce mise-en-place --- .github/workflows/check_build.yml | 4 ++-- .github/workflows/release.yml | 6 +++--- demo/package-lock.json | 8 ++++---- demo/package.json | 2 +- mise.toml | 3 +++ package-lock.json | 8 ++++---- package.json | 4 ++-- 7 files changed, 19 insertions(+), 16 deletions(-) create mode 100644 mise.toml diff --git a/.github/workflows/check_build.yml b/.github/workflows/check_build.yml index e4a9b3ca..b695cc1c 100644 --- a/.github/workflows/check_build.yml +++ b/.github/workflows/check_build.yml @@ -28,8 +28,8 @@ jobs: run: | sudo apt-get update sudo apt-get install libkrb5-dev libxkbfile-dev libx11-6 - - name: Volta - uses: volta-cli/action@v4 + - name: mise-en-place + uses: jdx/mise-action@v2 - name: Install dependencies run: npm ci - name: Build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fbdd41e8..03adb255 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,9 +24,9 @@ jobs: - name: Install build dependencies run: | sudo apt-get update - sudo apt-get install libkrb5-dev libxkbfile-dev libx11-6 - - name: Volta - uses: volta-cli/action@v4 + sudo apt-get install libkrb5-dev libxkbfile-dev libx11-6 pkg-config + - name: mise-en-place + uses: jdx/mise-action@v2 - name: Install dependencies run: npm ci - name: Build diff --git a/demo/package-lock.json b/demo/package-lock.json index 02c5447a..297bcac6 100644 --- a/demo/package-lock.json +++ b/demo/package-lock.json @@ -201,7 +201,7 @@ "@codingame/monaco-vscode-rollup-vsix-plugin": "file:../dist/packages/monaco-vscode-rollup-vsix-plugin", "@types/dockerode": "^3.3.47", "@types/express": "^5.0.6", - "@types/node": "^20.11.4", + "@types/node": "^22.19.7", "@types/wicg-file-system-access": "^2023.10.7", "@types/ws": "^8.18.1", "typescript": "~5.9.3", @@ -3097,9 +3097,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "20.19.27", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.27.tgz", - "integrity": "sha512-N2clP5pJhB2YnZJ3PIHFk5RkygRX5WO/5f0WC08tp0wd+sv0rsJk3MqWn3CbNmT2J505a5336jaQj4ph1AdMug==", + "version": "22.19.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.7.tgz", + "integrity": "sha512-MciR4AKGHWl7xwxkBa6xUGxQJ4VBOmPTF7sL+iGzuahOFaO0jHCsuEfS80pan1ef4gWId1oWOweIhrDEYLuaOw==", "license": "MIT", "dependencies": { "undici-types": "~6.21.0" diff --git a/demo/package.json b/demo/package.json index adb17528..b9219aa6 100644 --- a/demo/package.json +++ b/demo/package.json @@ -19,7 +19,7 @@ "@codingame/esbuild-import-meta-url-plugin": "^1.0.3", "@types/dockerode": "^3.3.47", "@types/express": "^5.0.6", - "@types/node": "^20.11.4", + "@types/node": "^22.19.7", "@types/wicg-file-system-access": "^2023.10.7", "@types/ws": "^8.18.1", "typescript": "~5.9.3", diff --git a/mise.toml b/mise.toml new file mode 100644 index 00000000..f2abf422 --- /dev/null +++ b/mise.toml @@ -0,0 +1,3 @@ +[tools] +node = "22.22.0" +npm = "11.6.2" diff --git a/package-lock.json b/package-lock.json index 90bf2a4d..76d73a88 100644 --- a/package-lock.json +++ b/package-lock.json @@ -71,7 +71,7 @@ "@rollup/plugin-replace": "^6.0.3", "@rollup/plugin-typescript": "^12.3.0", "@types/mime-types": "^3.0.1", - "@types/node": "22.x", + "@types/node": "^22.19.7", "@types/postcss-url": "^10.0.4", "@types/vscode-semver": "npm:@types/semver@=5.5.0", "@types/yargs": "^17.0.35", @@ -4153,9 +4153,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.19.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.3.tgz", - "integrity": "sha512-1N9SBnWYOJTrNZCdh/yJE+t910Y128BoyY+zBLWhL3r0TYzlTmFdXrPwHL9DyFZmlEXNQQolTZh3KHV31QDhyA==", + "version": "22.19.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.7.tgz", + "integrity": "sha512-MciR4AKGHWl7xwxkBa6xUGxQJ4VBOmPTF7sL+iGzuahOFaO0jHCsuEfS80pan1ef4gWId1oWOweIhrDEYLuaOw==", "dev": true, "license": "MIT", "peer": true, diff --git a/package.json b/package.json index b128394a..4ec1b0dd 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "@rollup/plugin-replace": "^6.0.3", "@rollup/plugin-typescript": "^12.3.0", "@types/mime-types": "^3.0.1", - "@types/node": "22.x", + "@types/node": "^22.19.7", "@types/postcss-url": "^10.0.4", "@types/vscode-semver": "npm:@types/semver@=5.5.0", "@types/yargs": "^17.0.35", @@ -140,7 +140,7 @@ "cross-spawn": "7.0.6" }, "volta": { - "node": "22.21.1", + "node": "22.22.0", "npm": "11.6.2" } } From aede9846dc3d83c3b69cbc1be712d17f11b0b898 Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Mon, 26 Jan 2026 11:47:24 +0100 Subject: [PATCH 2/2] Implented review comment: Change back node version --- mise.toml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mise.toml b/mise.toml index f2abf422..0524b5f4 100644 --- a/mise.toml +++ b/mise.toml @@ -1,3 +1,3 @@ [tools] -node = "22.22.0" +node = "22.21.1" npm = "11.6.2" diff --git a/package.json b/package.json index 4ec1b0dd..3dbcec20 100644 --- a/package.json +++ b/package.json @@ -140,7 +140,7 @@ "cross-spawn": "7.0.6" }, "volta": { - "node": "22.22.0", + "node": "22.21.1", "npm": "11.6.2" } }