Skip to content

Commit 1cadd4d

Browse files
BYKBYK
authored
ref: Upgrade Node to v22.12 (#576)
* ref: Upgrade Node to v22.12 * one more place * fix type error * lol * still build and test for node20 * revert formatting changes
1 parent 9eb7ea5 commit 1cadd4d

File tree

6 files changed

+176
-20
lines changed

6 files changed

+176
-20
lines changed

‎.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
node: ['20']
14+
node: ['20','22']
1515
name: Node ${{ matrix.node }}
1616
steps:
1717
- uses: actions/checkout@v3

‎Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:20-bookworm-slim as builder
1+
FROM node:22-bookworm-slim as builder
22

33
WORKDIR /usr/local/lib
44

@@ -10,12 +10,12 @@ RUN export YARN_CACHE_FOLDER="$(mktemp -d)" \
1010
COPY . .
1111

1212
RUN \
13-
NODE_ENV=production \
13+
NODE_ENV=production \
1414
NODE_PATH=/usr/local/lib/node_modules \
1515
PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/lib/node_modules/.bin" \
1616
yarn --modules-folder /usr/local/lib/node_modules build
1717

18-
FROM node:20-bookworm
18+
FROM node:22-bookworm
1919

2020
ENV DEBIAN_FRONTEND=noninteractive \
2121
DOTNET_CLI_TELEMETRY_OPTOUT=1 \

‎package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@types/jest": "^29.5.2",
3939
"@types/js-yaml": "^4.0.5",
4040
"@types/mkdirp": "^1.0.0",
41-
"@types/node": "^12.11.1",
41+
"@types/node": "^22.10.1",
4242
"@types/node-fetch": "^2.5.10",
4343
"@types/ora": "^1.3.4",
4444
"@types/prompts": "^2.0.11",
@@ -55,7 +55,7 @@
5555
"chalk": "4.1.1",
5656
"cli-table": "0.3.1",
5757
"consola": "2.15.3",
58-
"esbuild": "^0.11.6",
58+
"esbuild": "^0.24.0",
5959
"eslint": "^7.2.0",
6060
"eslint-config-prettier": "^6.11.0",
6161
"eslint-formatter-github-annotations": "^0.1.0",
@@ -89,7 +89,7 @@
8989
"scripts": {
9090
"build:fat": "yarn run compile-config-schema && tsc -p tsconfig.build.json",
9191
"build:watch": "yarn run compile-config-schema && tsc -p tsconfig.build.json --watch",
92-
"build": "yarn compile-config-schema && esbuild src/index.ts --sourcemap --bundle --platform=node --target=node14.17 --outfile=dist/craft --minify",
92+
"build": "yarn compile-config-schema && esbuild src/index.ts --sourcemap --bundle --platform=node --target=node20 --outfile=dist/craft --minify",
9393
"precli": "yarn build",
9494
"cli": "node -r source-map-support/register dist/craft",
9595
"clean": "rimraf dist coverage",
@@ -100,7 +100,7 @@
100100
"compile-config-schema": "node ./scripts/config-json-schema-to-ts.js"
101101
},
102102
"volta": {
103-
"node": "20.11.1",
103+
"node": "22.12.0",
104104
"yarn": "1.22.19"
105105
}
106106
}

‎src/targets/sentryPypi.ts

+7-3
Original file line numberDiff line numberDiff line change
@@ -89,20 +89,24 @@ export class SentryPypiTarget extends BaseTarget {
8989
);
9090

9191
const contents = fs.readFileSync(path.join(directory, 'packages.ini'), {
92-
encoding: 'UTF-8',
92+
encoding: 'utf-8',
9393
});
9494
const tree = ((await spawnProcess(
9595
'git',
9696
['-C', directory, 'rev-parse', 'HEAD:'],
9797
{},
9898
{ enableInDryRunMode: true }
99-
)) as Buffer).toString('UTF-8').trim();
99+
)) as Buffer)
100+
.toString('utf-8')
101+
.trim();
100102
const commit = ((await spawnProcess(
101103
'git',
102104
['-C', directory, 'rev-parse', 'HEAD'],
103105
{},
104106
{ enableInDryRunMode: true }
105-
)) as Buffer).toString('UTF-8').trim();
107+
)) as Buffer)
108+
.toString('utf-8')
109+
.trim();
106110
return [contents, tree, commit];
107111
});
108112

‎src/utils/system.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ export async function calculateChecksum(
214214
const hash = createHash(algorithm);
215215

216216
return new Promise<string>((resolve, reject) => {
217-
stream.on('data', data => hash.update(data, 'utf8'));
217+
stream.on('data', data => hash.update(data));
218218
stream.on('end', () => resolve(formatDigest(hash, format)));
219219
stream.on('error', reject);
220220
});

‎yarn.lock

+160-8
Original file line numberDiff line numberDiff line change
@@ -857,6 +857,126 @@
857857
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
858858
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
859859

860+
"@esbuild/[email protected]":
861+
version "0.24.0"
862+
resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.24.0.tgz#b57697945b50e99007b4c2521507dc613d4a648c"
863+
integrity sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==
864+
865+
"@esbuild/[email protected]":
866+
version "0.24.0"
867+
resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.24.0.tgz#1add7e0af67acefd556e407f8497e81fddad79c0"
868+
integrity sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==
869+
870+
"@esbuild/[email protected]":
871+
version "0.24.0"
872+
resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.24.0.tgz#ab7263045fa8e090833a8e3c393b60d59a789810"
873+
integrity sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==
874+
875+
"@esbuild/[email protected]":
876+
version "0.24.0"
877+
resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.24.0.tgz#e8f8b196cfdfdd5aeaebbdb0110983460440e705"
878+
integrity sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==
879+
880+
"@esbuild/[email protected]":
881+
version "0.24.0"
882+
resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.24.0.tgz#2d0d9414f2acbffd2d86e98253914fca603a53dd"
883+
integrity sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==
884+
885+
"@esbuild/[email protected]":
886+
version "0.24.0"
887+
resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.24.0.tgz#33087aab31a1eb64c89daf3d2cf8ce1775656107"
888+
integrity sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==
889+
890+
"@esbuild/[email protected]":
891+
version "0.24.0"
892+
resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.0.tgz#bb76e5ea9e97fa3c753472f19421075d3a33e8a7"
893+
integrity sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==
894+
895+
"@esbuild/[email protected]":
896+
version "0.24.0"
897+
resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.24.0.tgz#e0e2ce9249fdf6ee29e5dc3d420c7007fa579b93"
898+
integrity sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==
899+
900+
"@esbuild/[email protected]":
901+
version "0.24.0"
902+
resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz#d1b2aa58085f73ecf45533c07c82d81235388e75"
903+
integrity sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==
904+
905+
"@esbuild/[email protected]":
906+
version "0.24.0"
907+
resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.24.0.tgz#8e4915df8ea3e12b690a057e77a47b1d5935ef6d"
908+
integrity sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==
909+
910+
"@esbuild/[email protected]":
911+
version "0.24.0"
912+
resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.24.0.tgz#8200b1110666c39ab316572324b7af63d82013fb"
913+
integrity sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==
914+
915+
"@esbuild/[email protected]":
916+
version "0.24.0"
917+
resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.24.0.tgz#6ff0c99cf647504df321d0640f0d32e557da745c"
918+
integrity sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==
919+
920+
"@esbuild/[email protected]":
921+
version "0.24.0"
922+
resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.24.0.tgz#3f720ccd4d59bfeb4c2ce276a46b77ad380fa1f3"
923+
integrity sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==
924+
925+
"@esbuild/[email protected]":
926+
version "0.24.0"
927+
resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.24.0.tgz#9d6b188b15c25afd2e213474bf5f31e42e3aa09e"
928+
integrity sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==
929+
930+
"@esbuild/[email protected]":
931+
version "0.24.0"
932+
resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.24.0.tgz#f989fdc9752dfda286c9cd87c46248e4dfecbc25"
933+
integrity sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==
934+
935+
"@esbuild/[email protected]":
936+
version "0.24.0"
937+
resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.24.0.tgz#29ebf87e4132ea659c1489fce63cd8509d1c7319"
938+
integrity sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==
939+
940+
"@esbuild/[email protected]":
941+
version "0.24.0"
942+
resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.24.0.tgz#4af48c5c0479569b1f359ffbce22d15f261c0cef"
943+
integrity sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==
944+
945+
"@esbuild/[email protected]":
946+
version "0.24.0"
947+
resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.24.0.tgz#1ae73d23cc044a0ebd4f198334416fb26c31366c"
948+
integrity sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==
949+
950+
"@esbuild/[email protected]":
951+
version "0.24.0"
952+
resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.0.tgz#5d904a4f5158c89859fd902c427f96d6a9e632e2"
953+
integrity sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==
954+
955+
"@esbuild/[email protected]":
956+
version "0.24.0"
957+
resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.24.0.tgz#4c8aa88c49187c601bae2971e71c6dc5e0ad1cdf"
958+
integrity sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==
959+
960+
"@esbuild/[email protected]":
961+
version "0.24.0"
962+
resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.24.0.tgz#8ddc35a0ea38575fa44eda30a5ee01ae2fa54dd4"
963+
integrity sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==
964+
965+
"@esbuild/[email protected]":
966+
version "0.24.0"
967+
resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.24.0.tgz#6e79c8543f282c4539db684a207ae0e174a9007b"
968+
integrity sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==
969+
970+
"@esbuild/[email protected]":
971+
version "0.24.0"
972+
resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.24.0.tgz#057af345da256b7192d18b676a02e95d0fa39103"
973+
integrity sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==
974+
975+
"@esbuild/[email protected]":
976+
version "0.24.0"
977+
resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.24.0.tgz#168ab1c7e1c318b922637fad8f339d48b01e1244"
978+
integrity sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==
979+
860980
"@eslint/eslintrc@^0.4.1":
861981
version "0.4.1"
862982
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz#442763b88cecbe3ee0ec7ca6d6dd6168550cbf14"
@@ -1644,10 +1764,12 @@
16441764
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.50.tgz#7a20902af591282aa9176baefc37d4372131c32d"
16451765
integrity sha512-vwX+/ija9xKc/z9VqMCdbf4WYcMTGsI0I/L/6shIF3qXURxZOhPQlPRHtjTpiNhAwn0paMJzlOQqw6mAGEQnTA==
16461766

1647-
"@types/node@^12.11.1":
1648-
version "12.19.13"
1649-
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.13.tgz#888e2b34159fb91496589484ec169618212b51b7"
1650-
integrity sha512-qdixo2f0U7z6m0UJUugTJqVF94GNDkdgQhfBtMs8t5898JE7G/D2kJYw4rc1nzjIPLVAsDkY2MdABnLAP5lM1w==
1767+
"@types/node@^22.10.1":
1768+
version "22.10.1"
1769+
resolved "https://registry.yarnpkg.com/@types/node/-/node-22.10.1.tgz#41ffeee127b8975a05f8c4f83fb89bcb2987d766"
1770+
integrity sha512-qKgsUwfHZV2WCWLAnVP1JqnpE6Im6h3Y0+fYgMTasNQ7V++CBX5OT1as0g0f+OyubbFqhf6XVNIsmN4IIhEgGQ==
1771+
dependencies:
1772+
undici-types "~6.20.0"
16511773

16521774
"@types/ora@^1.3.4":
16531775
version "1.3.5"
@@ -2542,10 +2664,35 @@ es6-weak-map@^2.0.3:
25422664
es6-iterator "^2.0.3"
25432665
es6-symbol "^3.1.1"
25442666

2545-
esbuild@^0.11.6:
2546-
version "0.11.6"
2547-
resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.11.6.tgz#20961309c4cfed00b71027e18806150358d0cbb0"
2548-
integrity sha512-L+nKW9ftVS/N2CVJMR9YmXHbkm+vHzlNYuo09rzipQhF7dYNvRLfWoEPSDRTl10and4owFBV9rJ2CTFNtLIOiw==
2667+
esbuild@^0.24.0:
2668+
version "0.24.0"
2669+
resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.24.0.tgz#f2d470596885fcb2e91c21eb3da3b3c89c0b55e7"
2670+
integrity sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==
2671+
optionalDependencies:
2672+
"@esbuild/aix-ppc64" "0.24.0"
2673+
"@esbuild/android-arm" "0.24.0"
2674+
"@esbuild/android-arm64" "0.24.0"
2675+
"@esbuild/android-x64" "0.24.0"
2676+
"@esbuild/darwin-arm64" "0.24.0"
2677+
"@esbuild/darwin-x64" "0.24.0"
2678+
"@esbuild/freebsd-arm64" "0.24.0"
2679+
"@esbuild/freebsd-x64" "0.24.0"
2680+
"@esbuild/linux-arm" "0.24.0"
2681+
"@esbuild/linux-arm64" "0.24.0"
2682+
"@esbuild/linux-ia32" "0.24.0"
2683+
"@esbuild/linux-loong64" "0.24.0"
2684+
"@esbuild/linux-mips64el" "0.24.0"
2685+
"@esbuild/linux-ppc64" "0.24.0"
2686+
"@esbuild/linux-riscv64" "0.24.0"
2687+
"@esbuild/linux-s390x" "0.24.0"
2688+
"@esbuild/linux-x64" "0.24.0"
2689+
"@esbuild/netbsd-x64" "0.24.0"
2690+
"@esbuild/openbsd-arm64" "0.24.0"
2691+
"@esbuild/openbsd-x64" "0.24.0"
2692+
"@esbuild/sunos-x64" "0.24.0"
2693+
"@esbuild/win32-arm64" "0.24.0"
2694+
"@esbuild/win32-ia32" "0.24.0"
2695+
"@esbuild/win32-x64" "0.24.0"
25492696

25502697
escalade@^3.1.1:
25512698
version "3.1.1"
@@ -5037,6 +5184,11 @@ typescript@^5.1.6:
50375184
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274"
50385185
integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==
50395186

5187+
undici-types@~6.20.0:
5188+
version "6.20.0"
5189+
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433"
5190+
integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==
5191+
50405192
unique-string@^2.0.0:
50415193
version "2.0.0"
50425194
resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"

0 commit comments

Comments
 (0)