Skip to content

Commit 6175671

Browse files
authored
Merge branch 'master' into react-19
2 parents f91299f + fc636e8 commit 6175671

File tree

2 files changed

+23
-43
lines changed

2 files changed

+23
-43
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
"https-browserify": "^1.0.0",
164164
"husky": "^9.0.0",
165165
"identity-obj-proxy": "^3.0.0",
166-
"jsdom": "^25.0.1",
166+
"jsdom": "^26.0.0",
167167
"npm-run-all2": "^8.0.0",
168168
"os-browserify": "^0.3.0",
169169
"path": "^0.12.7",

yarn.lock

Lines changed: 22 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5627,7 +5627,7 @@ __metadata:
56275627
languageName: node
56285628
linkType: hard
56295629

5630-
"combined-stream@npm:^1.0.6, combined-stream@npm:^1.0.8, combined-stream@npm:~1.0.6":
5630+
"combined-stream@npm:^1.0.6, combined-stream@npm:~1.0.6":
56315631
version: 1.0.8
56325632
resolution: "combined-stream@npm:1.0.8"
56335633
dependencies:
@@ -6034,7 +6034,7 @@ __metadata:
60346034
languageName: node
60356035
linkType: hard
60366036

6037-
"cssstyle@npm:^4.1.0":
6037+
"cssstyle@npm:^4.2.1":
60386038
version: 4.6.0
60396039
resolution: "cssstyle@npm:4.6.0"
60406040
dependencies:
@@ -6247,7 +6247,7 @@ __metadata:
62476247
languageName: node
62486248
linkType: hard
62496249

6250-
"decimal.js@npm:^10.4.3":
6250+
"decimal.js@npm:^10.5.0":
62516251
version: 10.6.0
62526252
resolution: "decimal.js@npm:10.6.0"
62536253
checksum: 10c0/07d69fbcc54167a340d2d97de95f546f9ff1f69d2b45a02fd7a5292412df3cd9eb7e23065e532a318f5474a2e1bccf8392fdf0443ef467f97f3bf8cb0477e5aa
@@ -7445,18 +7445,6 @@ __metadata:
74457445
languageName: node
74467446
linkType: hard
74477447

7448-
"form-data@npm:^4.0.0":
7449-
version: 4.0.2
7450-
resolution: "form-data@npm:4.0.2"
7451-
dependencies:
7452-
asynckit: "npm:^0.4.0"
7453-
combined-stream: "npm:^1.0.8"
7454-
es-set-tostringtag: "npm:^2.1.0"
7455-
mime-types: "npm:^2.1.12"
7456-
checksum: 10c0/e534b0cf025c831a0929bf4b9bbe1a9a6b03e273a8161f9947286b9b13bf8fb279c6944aae0070c4c311100c6d6dbb815cd955dc217728caf73fad8dc5b8ee9c
7457-
languageName: node
7458-
linkType: hard
7459-
74607448
"form-data@npm:~2.3.2":
74617449
version: 2.3.3
74627450
resolution: "form-data@npm:2.3.3"
@@ -7565,7 +7553,7 @@ __metadata:
75657553
js-cookie: "npm:^3.0.5"
75667554
js-slang: "npm:^1.0.84"
75677555
js-yaml: "npm:^4.1.0"
7568-
jsdom: "npm:^25.0.1"
7556+
jsdom: "npm:^26.0.0"
75697557
konva: "npm:^9.2.0"
75707558
language-directory: "https://github.com/source-academy/language-directory.git"
75717559
lodash: "npm:^4.17.21"
@@ -8208,7 +8196,7 @@ __metadata:
82088196
languageName: node
82098197
linkType: hard
82108198

8211-
"https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.5":
8199+
"https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.6":
82128200
version: 7.0.6
82138201
resolution: "https-proxy-agent@npm:7.0.6"
82148202
dependencies:
@@ -9038,37 +9026,36 @@ __metadata:
90389026
languageName: node
90399027
linkType: hard
90409028

9041-
"jsdom@npm:^25.0.1":
9042-
version: 25.0.1
9043-
resolution: "jsdom@npm:25.0.1"
9029+
"jsdom@npm:^26.0.0":
9030+
version: 26.1.0
9031+
resolution: "jsdom@npm:26.1.0"
90449032
dependencies:
9045-
cssstyle: "npm:^4.1.0"
9033+
cssstyle: "npm:^4.2.1"
90469034
data-urls: "npm:^5.0.0"
9047-
decimal.js: "npm:^10.4.3"
9048-
form-data: "npm:^4.0.0"
9035+
decimal.js: "npm:^10.5.0"
90499036
html-encoding-sniffer: "npm:^4.0.0"
90509037
http-proxy-agent: "npm:^7.0.2"
9051-
https-proxy-agent: "npm:^7.0.5"
9038+
https-proxy-agent: "npm:^7.0.6"
90529039
is-potential-custom-element-name: "npm:^1.0.1"
9053-
nwsapi: "npm:^2.2.12"
9054-
parse5: "npm:^7.1.2"
9055-
rrweb-cssom: "npm:^0.7.1"
9040+
nwsapi: "npm:^2.2.16"
9041+
parse5: "npm:^7.2.1"
9042+
rrweb-cssom: "npm:^0.8.0"
90569043
saxes: "npm:^6.0.0"
90579044
symbol-tree: "npm:^3.2.4"
9058-
tough-cookie: "npm:^5.0.0"
9045+
tough-cookie: "npm:^5.1.1"
90599046
w3c-xmlserializer: "npm:^5.0.0"
90609047
webidl-conversions: "npm:^7.0.0"
90619048
whatwg-encoding: "npm:^3.1.1"
90629049
whatwg-mimetype: "npm:^4.0.0"
9063-
whatwg-url: "npm:^14.0.0"
9050+
whatwg-url: "npm:^14.1.1"
90649051
ws: "npm:^8.18.0"
90659052
xml-name-validator: "npm:^5.0.0"
90669053
peerDependencies:
9067-
canvas: ^2.11.2
9054+
canvas: ^3.0.0
90689055
peerDependenciesMeta:
90699056
canvas:
90709057
optional: true
9071-
checksum: 10c0/6bda32a6dfe4e37a30568bf51136bdb3ba9c0b72aadd6356280404275a34c9e097c8c25b5eb3c742e602623741e172da977ff456684befd77c9042ed9bf8c2b4
9058+
checksum: 10c0/5b14a5bc32ce077a06fb42d1ab95b1191afa5cbbce8859e3b96831c5143becbbcbf0511d4d4934e922d2901443ced2cdc3b734c1cf30b5f73b3e067ce457d0f4
90729059
languageName: node
90739060
linkType: hard
90749061

@@ -10267,7 +10254,7 @@ __metadata:
1026710254
languageName: node
1026810255
linkType: hard
1026910256

10270-
"nwsapi@npm:^2.2.12":
10257+
"nwsapi@npm:^2.2.16":
1027110258
version: 2.2.21
1027210259
resolution: "nwsapi@npm:2.2.21"
1027310260
checksum: 10c0/dd330cabb886fd417624bd3af368d86c3d507c002c05fb2f7981874204298deec9e8bd5103d8a0c4a0e0dc280276dc4a59a059e1045eeb7a628f79e6cefba6a3
@@ -10524,7 +10511,7 @@ __metadata:
1052410511
languageName: node
1052510512
linkType: hard
1052610513

10527-
"parse5@npm:^7.1.2":
10514+
"parse5@npm:^7.2.1":
1052810515
version: 7.3.0
1052910516
resolution: "parse5@npm:7.3.0"
1053010517
dependencies:
@@ -12052,13 +12039,6 @@ __metadata:
1205212039
languageName: node
1205312040
linkType: hard
1205412041

12055-
"rrweb-cssom@npm:^0.7.1":
12056-
version: 0.7.1
12057-
resolution: "rrweb-cssom@npm:0.7.1"
12058-
checksum: 10c0/127b8ca6c8aac45e2755abbae6138d4a813b1bedc2caabf79466ae83ab3cfc84b5bfab513b7033f0aa4561c7753edf787d0dd01163ceacdee2e8eb1b6bf7237e
12059-
languageName: node
12060-
linkType: hard
12061-
1206212042
"rrweb-cssom@npm:^0.8.0":
1206312043
version: 0.8.0
1206412044
resolution: "rrweb-cssom@npm:0.8.0"
@@ -13394,7 +13374,7 @@ __metadata:
1339413374
languageName: node
1339513375
linkType: hard
1339613376

13397-
"tough-cookie@npm:^5.0.0":
13377+
"tough-cookie@npm:^5.1.1":
1339813378
version: 5.1.2
1339913379
resolution: "tough-cookie@npm:5.1.2"
1340013380
dependencies:
@@ -14225,7 +14205,7 @@ __metadata:
1422514205
languageName: node
1422614206
linkType: hard
1422714207

14228-
"whatwg-url@npm:^14.0.0":
14208+
"whatwg-url@npm:^14.0.0, whatwg-url@npm:^14.1.1":
1422914209
version: 14.2.0
1423014210
resolution: "whatwg-url@npm:14.2.0"
1423114211
dependencies:

0 commit comments

Comments
 (0)