Skip to content

Commit df232dd

Browse files
committed
fix: allow tsc selection in Makefile
1 parent a58de19 commit df232dd

File tree

3 files changed

+55
-53
lines changed

3 files changed

+55
-53
lines changed

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,16 @@ build_dir := $(shell node -e "console.log(require('./package.json').exports.repl
2828
src_files := $(shell find src -name '*.ts')
2929
build_files := $(patsubst src/%.ts,$(build_dir)/%.js,$(src_files))
3030
camel_case_name := $(shell echo $(SERVICE_NAME) | awk -F- '{result=""; for(i=1; i<=NF; i++) result = result toupper(substr($$i,1,1)) substr($$i,2); print result}' | tr -d '\n')
31+
# tsgo is pretty cool. Maybe you should try it?
32+
TSC ?= tsc
3133

3234
ts: $(word 1, $(build_files))
3335

3436
clean:
3537
yarn dlx rimraf ./$(build_dir) src/generated tsconfig.build.tsbuildinfo
3638

3739
$(word 1, $(build_files)): $(src_files)
38-
yarn tsc -p tsconfig.build.json
40+
yarn $(TSC) -p tsconfig.build.json
3941
@if yarn info tsc-alias name --silent > /dev/null 2>&1; then \
4042
yarn tsc-alias --project tsconfig.build.json; \
4143
fi

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
"tsconfig-paths": "^4.2.0",
132132
"tsx": "^4.20.6",
133133
"typescript": "^5.9.3",
134-
"vitest": "^4.0.6"
134+
"vitest": "^4.0.7"
135135
},
136136
"resolutions": {
137137
"qs": "^6.11.0"

yarn.lock

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ __metadata:
855855
tsconfig-paths: ^4.2.0
856856
tsx: ^4.20.6
857857
typescript: ^5.9.3
858-
vitest: ^4.0.6
858+
vitest: ^4.0.7
859859
bin:
860860
start-service: ./build/bin/start-service.js
861861
languageName: unknown
@@ -2942,25 +2942,25 @@ __metadata:
29422942
languageName: node
29432943
linkType: hard
29442944

2945-
"@vitest/expect@npm:4.0.6":
2946-
version: 4.0.6
2947-
resolution: "@vitest/expect@npm:4.0.6"
2945+
"@vitest/expect@npm:4.0.7":
2946+
version: 4.0.7
2947+
resolution: "@vitest/expect@npm:4.0.7"
29482948
dependencies:
29492949
"@standard-schema/spec": ^1.0.0
29502950
"@types/chai": ^5.2.2
2951-
"@vitest/spy": 4.0.6
2952-
"@vitest/utils": 4.0.6
2951+
"@vitest/spy": 4.0.7
2952+
"@vitest/utils": 4.0.7
29532953
chai: ^6.0.1
29542954
tinyrainbow: ^3.0.3
2955-
checksum: e3dd212cad3dc40ae3925ed52bf865df318be7aae4391aa4cca8fad07ec369e7d222064ef0656a420c5fa66d32eeaf74f81753308dd2c91db1a2e6ccd2fc890b
2955+
checksum: f458b1bee144e1b4b4459c86add2fc9a61e589b4d9c02c2251c5a54763e26abcef2f5010a9deaca70ca35893feacc20d5d6090c656fae61c2afcf83119bba4f8
29562956
languageName: node
29572957
linkType: hard
29582958

2959-
"@vitest/mocker@npm:4.0.6":
2960-
version: 4.0.6
2961-
resolution: "@vitest/mocker@npm:4.0.6"
2959+
"@vitest/mocker@npm:4.0.7":
2960+
version: 4.0.7
2961+
resolution: "@vitest/mocker@npm:4.0.7"
29622962
dependencies:
2963-
"@vitest/spy": 4.0.6
2963+
"@vitest/spy": 4.0.7
29642964
estree-walker: ^3.0.3
29652965
magic-string: ^0.30.19
29662966
peerDependencies:
@@ -2971,54 +2971,54 @@ __metadata:
29712971
optional: true
29722972
vite:
29732973
optional: true
2974-
checksum: 8c21497a54fef86f6c0ab250fd57e56bff22bf4512c943e434fc41ecb107bbb8a47c21664f7187c736e1016fed9e75cab19ef527a191151b76a224827b7062bb
2974+
checksum: a7594e74bfeed7d32be028171873f0d28c3fa2be250ef21931ebd6eeb8d2b0d9e58615880eb31d24921292def2f71ca81263d10518807b398ee7043a6dd0df76
29752975
languageName: node
29762976
linkType: hard
29772977

2978-
"@vitest/pretty-format@npm:4.0.6":
2979-
version: 4.0.6
2980-
resolution: "@vitest/pretty-format@npm:4.0.6"
2978+
"@vitest/pretty-format@npm:4.0.7":
2979+
version: 4.0.7
2980+
resolution: "@vitest/pretty-format@npm:4.0.7"
29812981
dependencies:
29822982
tinyrainbow: ^3.0.3
2983-
checksum: 86719a113ec6160373b682b848dcab83b7ec7b551c1ba890fb55262b92bf048931b638242090837849abde8098a2ca9d109425ad409a2172c214c71bc62cdcf3
2983+
checksum: 5a4006d337eb616e5dc418a3858656fd9339f2aabfebf9f6d017979bc4c1183ab986b7cff6b5b03a736ebc24e0f2f2db8b49772ff4cbc93a36d1cc24a1148bac
29842984
languageName: node
29852985
linkType: hard
29862986

2987-
"@vitest/runner@npm:4.0.6":
2988-
version: 4.0.6
2989-
resolution: "@vitest/runner@npm:4.0.6"
2987+
"@vitest/runner@npm:4.0.7":
2988+
version: 4.0.7
2989+
resolution: "@vitest/runner@npm:4.0.7"
29902990
dependencies:
2991-
"@vitest/utils": 4.0.6
2991+
"@vitest/utils": 4.0.7
29922992
pathe: ^2.0.3
2993-
checksum: 44c9071c4c8cbcc07546bd11ffde4af646ea9459e61fa2456db35800d57171eedfe9721da404a3c6d6f2456947d586a9fb2fe3d850c10a96a7b20ff6dffa7e36
2993+
checksum: 8dc67e6ac932a0767d9a31f5f6401fd5d4a58e633789f26bea50335291648acd1e8a97e351bfdfaebb4c23c401122c66d4308feae7043a3dd8998fc8e88e6103
29942994
languageName: node
29952995
linkType: hard
29962996

2997-
"@vitest/snapshot@npm:4.0.6":
2998-
version: 4.0.6
2999-
resolution: "@vitest/snapshot@npm:4.0.6"
2997+
"@vitest/snapshot@npm:4.0.7":
2998+
version: 4.0.7
2999+
resolution: "@vitest/snapshot@npm:4.0.7"
30003000
dependencies:
3001-
"@vitest/pretty-format": 4.0.6
3001+
"@vitest/pretty-format": 4.0.7
30023002
magic-string: ^0.30.19
30033003
pathe: ^2.0.3
3004-
checksum: 85a65d0d20709fd66218d0901ec74e32106e4c5b5b5e5352523edcdb70a9270bb622a20ac9d412a64ccfd8b094132c9aee973a2503c6545aefc2efe20b453a42
3004+
checksum: 13e77c96fafe4e57146642d879f07d80cea0095982e1f1d5b42718265969666c27e9fec68b753eb51ffc782ffdad4b270dcd1a51e3897be29cfa8bafff95d57a
30053005
languageName: node
30063006
linkType: hard
30073007

3008-
"@vitest/spy@npm:4.0.6":
3009-
version: 4.0.6
3010-
resolution: "@vitest/spy@npm:4.0.6"
3011-
checksum: 52b78683b56acbfdb4ca47beeb7b9e8bf74a984ced5aa921f8e8583f6d4285b984a9ebf24f7d7f3d9b6f7a9b84b640c1990f4799d23600a3580204b5bb470fa7
3008+
"@vitest/spy@npm:4.0.7":
3009+
version: 4.0.7
3010+
resolution: "@vitest/spy@npm:4.0.7"
3011+
checksum: b6258198a98ba133a57a246cc04de66fc055e5eafa5a5ec9df264e6150984d4e99c9d3c32f0d78dbd1120b858a74b1b5a972802f222d1c13f8fe26d60ceb2a23
30123012
languageName: node
30133013
linkType: hard
30143014

3015-
"@vitest/utils@npm:4.0.6":
3016-
version: 4.0.6
3017-
resolution: "@vitest/utils@npm:4.0.6"
3015+
"@vitest/utils@npm:4.0.7":
3016+
version: 4.0.7
3017+
resolution: "@vitest/utils@npm:4.0.7"
30183018
dependencies:
3019-
"@vitest/pretty-format": 4.0.6
3019+
"@vitest/pretty-format": 4.0.7
30203020
tinyrainbow: ^3.0.3
3021-
checksum: 4a5ff1266b8c7cfdf9a92ab3ffd19f82950c0cd9292ab237d5bfd064e637bfb520d53a6c798744e9633a70da73fd010100490fdd3680e55985dcd19a9222d463
3021+
checksum: f641eab84e85b615d2eeaad56f04e44b12e8365272ccb1ba81c46a69e393b9ad8ce2118e5bf3a64adaa806b72c91a86e46a1a2543799f6e1b0c4a7f1a3a269af
30223022
languageName: node
30233023
linkType: hard
30243024

@@ -9003,17 +9003,17 @@ __metadata:
90039003
languageName: node
90049004
linkType: hard
90059005

9006-
"vitest@npm:^4.0.6":
9007-
version: 4.0.6
9008-
resolution: "vitest@npm:4.0.6"
9009-
dependencies:
9010-
"@vitest/expect": 4.0.6
9011-
"@vitest/mocker": 4.0.6
9012-
"@vitest/pretty-format": 4.0.6
9013-
"@vitest/runner": 4.0.6
9014-
"@vitest/snapshot": 4.0.6
9015-
"@vitest/spy": 4.0.6
9016-
"@vitest/utils": 4.0.6
9006+
"vitest@npm:^4.0.7":
9007+
version: 4.0.7
9008+
resolution: "vitest@npm:4.0.7"
9009+
dependencies:
9010+
"@vitest/expect": 4.0.7
9011+
"@vitest/mocker": 4.0.7
9012+
"@vitest/pretty-format": 4.0.7
9013+
"@vitest/runner": 4.0.7
9014+
"@vitest/snapshot": 4.0.7
9015+
"@vitest/spy": 4.0.7
9016+
"@vitest/utils": 4.0.7
90179017
debug: ^4.4.3
90189018
es-module-lexer: ^1.7.0
90199019
expect-type: ^1.2.2
@@ -9031,10 +9031,10 @@ __metadata:
90319031
"@edge-runtime/vm": "*"
90329032
"@types/debug": ^4.1.12
90339033
"@types/node": ^20.0.0 || ^22.0.0 || >=24.0.0
9034-
"@vitest/browser-playwright": 4.0.6
9035-
"@vitest/browser-preview": 4.0.6
9036-
"@vitest/browser-webdriverio": 4.0.6
9037-
"@vitest/ui": 4.0.6
9034+
"@vitest/browser-playwright": 4.0.7
9035+
"@vitest/browser-preview": 4.0.7
9036+
"@vitest/browser-webdriverio": 4.0.7
9037+
"@vitest/ui": 4.0.7
90389038
happy-dom: "*"
90399039
jsdom: "*"
90409040
peerDependenciesMeta:
@@ -9058,7 +9058,7 @@ __metadata:
90589058
optional: true
90599059
bin:
90609060
vitest: vitest.mjs
9061-
checksum: e25ab037617697d8ac9d09e4a7fec612cc2c8b513515524b2443053ab16b11a3653721745ff3d2fffb92309e4d5aab33b43d7d3bde4d710cf3b2baba2952f936
9061+
checksum: 76cb524debdae1a648ce4bf28936032496c06453079c442327c797f6e768c9d733d22be7c044d69697eee9bc462bd9394cbbc5b992de94ce7f536604b3a36076
90629062
languageName: node
90639063
linkType: hard
90649064

0 commit comments

Comments
 (0)