Skip to content

Commit 769cf15

Browse files
sbouchetclaude
authored andcommitted
Bump typescript and ts-loader to fix build with css-loader 5.x
css-loader 5.x introduces @types/json-schema as a transitive dependency, which triggers a crash in TypeScript 3.4.5 (__spreadArrays not defined). Upgrade typescript to 4.9.5 and ts-loader to 8.4.0 for compatibility. Signed-off-by: Stephane Bouchet <sbouchet@redhat.com> Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 2d2ee4e commit 769cf15

2 files changed

Lines changed: 100 additions & 29 deletions

File tree

cloud-shell/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"devDependencies": {
1414
"css-loader": "^5.2.7",
1515
"style-loader": "^2.0.0",
16-
"ts-loader": "^5.3.3",
17-
"typescript": "3.4.5",
16+
"ts-loader": "^8.4.0",
17+
"typescript": "4.9.5",
1818
"webpack": "^4.0.0",
1919
"webpack-cli": "^3.2.1"
2020
},

cloud-shell/yarn.lock

Lines changed: 98 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,15 @@ __metadata:
316316
languageName: node
317317
linkType: hard
318318

319+
"ansi-styles@npm:^4.1.0":
320+
version: 4.3.0
321+
resolution: "ansi-styles@npm:4.3.0"
322+
dependencies:
323+
color-convert: "npm:^2.0.1"
324+
checksum: 10c0/895a23929da416f2bd3de7e9cb4eabd340949328ab85ddd6e484a637d8f6820d485f53933446f5291c3b760cbc488beb8e88573dd0f9c7daf83dccc8fe81b041
325+
languageName: node
326+
linkType: hard
327+
319328
"anymatch@npm:^2.0.0":
320329
version: 2.0.0
321330
resolution: "anymatch@npm:2.0.0"
@@ -562,7 +571,7 @@ __metadata:
562571
languageName: node
563572
linkType: hard
564573

565-
"braces@npm:~3.0.2":
574+
"braces@npm:^3.0.3, braces@npm:~3.0.2":
566575
version: 3.0.3
567576
resolution: "braces@npm:3.0.3"
568577
dependencies:
@@ -782,7 +791,7 @@ __metadata:
782791
languageName: node
783792
linkType: hard
784793

785-
"chalk@npm:^2.3.0, chalk@npm:^2.4.2":
794+
"chalk@npm:^2.4.2":
786795
version: 2.4.2
787796
resolution: "chalk@npm:2.4.2"
788797
dependencies:
@@ -793,6 +802,16 @@ __metadata:
793802
languageName: node
794803
linkType: hard
795804

805+
"chalk@npm:^4.1.0":
806+
version: 4.1.2
807+
resolution: "chalk@npm:4.1.2"
808+
dependencies:
809+
ansi-styles: "npm:^4.1.0"
810+
supports-color: "npm:^7.1.0"
811+
checksum: 10c0/4a3fef5cc34975c898ffe77141450f679721df9dde00f6c304353fa9c8b571929123b26a0e4617bde5018977eb655b31970c297b91b63ee83bb82aeb04666880
812+
languageName: node
813+
linkType: hard
814+
796815
"chokidar@npm:^2.1.8":
797816
version: 2.1.8
798817
resolution: "chokidar@npm:2.1.8"
@@ -897,8 +916,8 @@ __metadata:
897916
css-loader: "npm:^5.2.7"
898917
reconnecting-websocket: "npm:^4.2.0"
899918
style-loader: "npm:^2.0.0"
900-
ts-loader: "npm:^5.3.3"
901-
typescript: "npm:3.4.5"
919+
ts-loader: "npm:^8.4.0"
920+
typescript: "npm:4.9.5"
902921
vscode-uri: "npm:^2.1.1"
903922
vscode-ws-jsonrpc: "npm:^0.1.1"
904923
webpack: "npm:^4.0.0"
@@ -927,13 +946,29 @@ __metadata:
927946
languageName: node
928947
linkType: hard
929948

949+
"color-convert@npm:^2.0.1":
950+
version: 2.0.1
951+
resolution: "color-convert@npm:2.0.1"
952+
dependencies:
953+
color-name: "npm:~1.1.4"
954+
checksum: 10c0/37e1150172f2e311fe1b2df62c6293a342ee7380da7b9cfdba67ea539909afbd74da27033208d01d6d5cfc65ee7868a22e18d7e7648e004425441c0f8a15a7d7
955+
languageName: node
956+
linkType: hard
957+
930958
"color-name@npm:1.1.3":
931959
version: 1.1.3
932960
resolution: "color-name@npm:1.1.3"
933961
checksum: 10c0/566a3d42cca25b9b3cd5528cd7754b8e89c0eb646b7f214e8e2eaddb69994ac5f0557d9c175eb5d8f0ad73531140d9c47525085ee752a91a2ab15ab459caf6d6
934962
languageName: node
935963
linkType: hard
936964

965+
"color-name@npm:~1.1.4":
966+
version: 1.1.4
967+
resolution: "color-name@npm:1.1.4"
968+
checksum: 10c0/a1a3f914156960902f46f7f56bc62effc6c94e84b2cae157a526b1c1f74b677a47ec602bf68a61abfa2b42d15b7c5651c6dbe72a43af720bc588dff885b10f95
969+
languageName: node
970+
linkType: hard
971+
937972
"commander@npm:^2.20.0":
938973
version: 2.20.3
939974
resolution: "commander@npm:2.20.3"
@@ -1869,6 +1904,13 @@ __metadata:
18691904
languageName: node
18701905
linkType: hard
18711906

1907+
"has-flag@npm:^4.0.0":
1908+
version: 4.0.0
1909+
resolution: "has-flag@npm:4.0.0"
1910+
checksum: 10c0/2e789c61b7888d66993e14e8331449e525ef42aac53c627cc53d1c3334e768bcb6abdc4f5f0de1478a25beec6f0bd62c7549058b7ac53e924040d4f301f02fd1
1911+
languageName: node
1912+
linkType: hard
1913+
18721914
"has-property-descriptors@npm:^1.0.0, has-property-descriptors@npm:^1.0.2":
18731915
version: 1.0.2
18741916
resolution: "has-property-descriptors@npm:1.0.2"
@@ -2407,7 +2449,7 @@ __metadata:
24072449
languageName: node
24082450
linkType: hard
24092451

2410-
"loader-utils@npm:^1.0.2, loader-utils@npm:^1.2.3, loader-utils@npm:^1.4.0":
2452+
"loader-utils@npm:^1.2.3, loader-utils@npm:^1.4.0":
24112453
version: 1.4.2
24122454
resolution: "loader-utils@npm:1.4.2"
24132455
dependencies:
@@ -2559,6 +2601,16 @@ __metadata:
25592601
languageName: node
25602602
linkType: hard
25612603

2604+
"micromatch@npm:^4.0.0":
2605+
version: 4.0.8
2606+
resolution: "micromatch@npm:4.0.8"
2607+
dependencies:
2608+
braces: "npm:^3.0.3"
2609+
picomatch: "npm:^2.3.1"
2610+
checksum: 10c0/166fa6eb926b9553f32ef81f5f531d27b4ce7da60e5baf8c021d043b27a388fb95e46a8038d5045877881e673f8134122b59624d5cecbd16eb50a42e7a6b5ca8
2611+
languageName: node
2612+
linkType: hard
2613+
25622614
"miller-rabin@npm:^4.0.0":
25632615
version: 4.0.1
25642616
resolution: "miller-rabin@npm:4.0.1"
@@ -3105,7 +3157,7 @@ __metadata:
31053157
languageName: node
31063158
linkType: hard
31073159

3108-
"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1":
3160+
"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.3.1":
31093161
version: 2.3.1
31103162
resolution: "picomatch@npm:2.3.1"
31113163
checksum: 10c0/26c02b8d06f03206fc2ab8d16f19960f2ff9e81a658f831ecb656d8f17d9edc799e8364b1f4a7873e89d9702dff96204be0fa26fe4181f6843f040f819dac4be
@@ -3576,7 +3628,7 @@ __metadata:
35763628
languageName: node
35773629
linkType: hard
35783630

3579-
"semver@npm:^5.0.1, semver@npm:^5.5.0, semver@npm:^5.6.0":
3631+
"semver@npm:^5.5.0, semver@npm:^5.6.0":
35803632
version: 5.7.2
35813633
resolution: "semver@npm:5.7.2"
35823634
bin:
@@ -3585,6 +3637,15 @@ __metadata:
35853637
languageName: node
35863638
linkType: hard
35873639

3640+
"semver@npm:^7.3.4":
3641+
version: 7.7.4
3642+
resolution: "semver@npm:7.7.4"
3643+
bin:
3644+
semver: bin/semver.js
3645+
checksum: 10c0/5215ad0234e2845d4ea5bb9d836d42b03499546ddafb12075566899fc617f68794bb6f146076b6881d755de17d6c6cc73372555879ec7dce2c2feee947866ad2
3646+
languageName: node
3647+
linkType: hard
3648+
35883649
"semver@npm:^7.3.5":
35893650
version: 7.7.3
35903651
resolution: "semver@npm:7.7.3"
@@ -3987,6 +4048,15 @@ __metadata:
39874048
languageName: node
39884049
linkType: hard
39894050

4051+
"supports-color@npm:^7.1.0":
4052+
version: 7.2.0
4053+
resolution: "supports-color@npm:7.2.0"
4054+
dependencies:
4055+
has-flag: "npm:^4.0.0"
4056+
checksum: 10c0/afb4c88521b8b136b5f5f95160c98dee7243dc79d5432db7efc27efb219385bbc7d9427398e43dd6cc730a0f87d5085ce1652af7efbe391327bc0a7d0f7fc124
4057+
languageName: node
4058+
linkType: hard
4059+
39904060
"tapable@npm:^1.0.0, tapable@npm:^1.1.3":
39914061
version: 1.1.3
39924062
resolution: "tapable@npm:1.1.3"
@@ -4126,18 +4196,19 @@ __metadata:
41264196
languageName: node
41274197
linkType: hard
41284198

4129-
"ts-loader@npm:^5.3.3":
4130-
version: 5.4.5
4131-
resolution: "ts-loader@npm:5.4.5"
4199+
"ts-loader@npm:^8.4.0":
4200+
version: 8.4.0
4201+
resolution: "ts-loader@npm:8.4.0"
41324202
dependencies:
4133-
chalk: "npm:^2.3.0"
4203+
chalk: "npm:^4.1.0"
41344204
enhanced-resolve: "npm:^4.0.0"
4135-
loader-utils: "npm:^1.0.2"
4136-
micromatch: "npm:^3.1.4"
4137-
semver: "npm:^5.0.1"
4205+
loader-utils: "npm:^2.0.0"
4206+
micromatch: "npm:^4.0.0"
4207+
semver: "npm:^7.3.4"
41384208
peerDependencies:
41394209
typescript: "*"
4140-
checksum: 10c0/1974fac670ee8fec44d533ed4cf02dc07c6957cfc7c98a52455b74122b68b23d17b761985ddcb9634354a6c1493f518dd80e719a7901ecd664273f080dd3402b
4210+
webpack: "*"
4211+
checksum: 10c0/ee00e9e724aa4692194369201326c3cae870fda304cca24b66e4f0013006804c302899869b3c0cd09ca8efec7488f1d9a55bf1354074018eb1ab4b3984dc6a09
41414212
languageName: node
41424213
linkType: hard
41434214

@@ -4166,23 +4237,23 @@ __metadata:
41664237
languageName: node
41674238
linkType: hard
41684239

4169-
"typescript@npm:3.4.5":
4170-
version: 3.4.5
4171-
resolution: "typescript@npm:3.4.5"
4240+
"typescript@npm:4.9.5":
4241+
version: 4.9.5
4242+
resolution: "typescript@npm:4.9.5"
41724243
bin:
4173-
tsc: ./bin/tsc
4174-
tsserver: ./bin/tsserver
4175-
checksum: 10c0/c15aad7e12ad3824bdd89127b62851197db42e33dc3880b54acd6de6b2f395ea9615e66e388e5ef56708d8080dcdbaa7b1a93e10a79c89a190ed5b498ccea5e3
4244+
tsc: bin/tsc
4245+
tsserver: bin/tsserver
4246+
checksum: 10c0/5f6cad2e728a8a063521328e612d7876e12f0d8a8390d3b3aaa452a6a65e24e9ac8ea22beb72a924fd96ea0a49ea63bb4e251fb922b12eedfb7f7a26475e5c56
41764247
languageName: node
41774248
linkType: hard
41784249

4179-
"typescript@patch:typescript@npm%3A3.4.5#optional!builtin<compat/typescript>":
4180-
version: 3.4.5
4181-
resolution: "typescript@patch:typescript@npm%3A3.4.5#optional!builtin<compat/typescript>::version=3.4.5&hash=9a3324"
4250+
"typescript@patch:typescript@npm%3A4.9.5#optional!builtin<compat/typescript>":
4251+
version: 4.9.5
4252+
resolution: "typescript@patch:typescript@npm%3A4.9.5#optional!builtin<compat/typescript>::version=4.9.5&hash=289587"
41824253
bin:
4183-
tsc: ./bin/tsc
4184-
tsserver: ./bin/tsserver
4185-
checksum: 10c0/53e4d0cfb339eff937912830009da19ca233047958ebb53c1cc625cd0a52f562575e732c2d679c969bab86795cecd74d1cd90eddfc8710585bbbfd5dd3e4d898
4254+
tsc: bin/tsc
4255+
tsserver: bin/tsserver
4256+
checksum: 10c0/e3333f887c6829dfe0ab6c1dbe0dd1e3e2aeb56c66460cb85c5440c566f900c833d370ca34eb47558c0c69e78ced4bfe09b8f4f98b6de7afed9b84b8d1dd06a1
41864257
languageName: node
41874258
linkType: hard
41884259

0 commit comments

Comments
 (0)