Skip to content
This repository was archived by the owner on Sep 28, 2025. It is now read-only.

Commit bb7a8c3

Browse files
DaanV2DaanV2
authored
Merge branch 'main' into dependabot/npm_and_yarn/test-9c013633a9
2 parents 7bc1f53 + 0796cb7 commit bb7a8c3

File tree

4 files changed

+57
-74
lines changed

4 files changed

+57
-74
lines changed

‎client/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@blockception/shared": "^0.0.1",
2727
"bc-minecraft-bedrock-project": "^1.21.44-2",
2828
"bc-minecraft-bedrock-vanilla-data": "^1.21.44",
29-
"node": "^23.4.0",
29+
"node": "^23.5.0",
3030
"vscode-languageclient": "^9.0.1"
3131
},
3232
"devDependencies": {
@@ -39,6 +39,6 @@
3939
"ts-node": "^10.9.2",
4040
"typescript": "^5.7.2",
4141
"webpack": "^5.97.1",
42-
"webpack-cli": "^5.1.4"
42+
"webpack-cli": "^6.0.1"
4343
}
4444
}

‎package-lock.json‎

Lines changed: 52 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"typescript": "^5.7.2",
2929
"typescript-eslint": "^8.18.2",
3030
"webpack": "^5.97.1",
31-
"webpack-cli": "^5.0.1"
31+
"webpack-cli": "^6.0.1"
3232
},
3333
"engines": {
3434
"vscode": "^1.69.2"
@@ -42,7 +42,7 @@
4242
"@blockception/shared": "^0.0.1",
4343
"bc-minecraft-bedrock-project": "^1.21.44-2",
4444
"bc-minecraft-bedrock-vanilla-data": "^1.21.44",
45-
"node": "^23.4.0",
45+
"node": "^23.5.0",
4646
"vscode-languageclient": "^9.0.1"
4747
},
4848
"devDependencies": {
@@ -55,7 +55,7 @@
5555
"ts-node": "^10.9.2",
5656
"typescript": "^5.7.2",
5757
"webpack": "^5.97.1",
58-
"webpack-cli": "^5.1.4"
58+
"webpack-cli": "^6.0.1"
5959
},
6060
"engines": {
6161
"vscode": "^1.69.2"
@@ -852,13 +852,12 @@
852852
"license": "MIT"
853853
},
854854
"node_modules/@discoveryjs/json-ext": {
855-
"version": "0.5.7",
856-
"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
857-
"integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
855+
"version": "0.6.3",
856+
"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.3.tgz",
857+
"integrity": "sha512-4B4OijXeVNOPZlYA2oEwWOTkzyltLao+xbotHQeqN++Rv27Y6s818+n2Qkp8q+Fxhn0t/5lA5X1Mxktud8eayQ==",
858858
"dev": true,
859-
"license": "MIT",
860859
"engines": {
861-
"node": ">=10.0.0"
860+
"node": ">=14.17.0"
862861
}
863862
},
864863
"node_modules/@eslint-community/eslint-utils": {
@@ -2871,45 +2870,42 @@
28712870
}
28722871
},
28732872
"node_modules/@webpack-cli/configtest": {
2874-
"version": "2.1.1",
2875-
"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz",
2876-
"integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==",
2873+
"version": "3.0.1",
2874+
"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-3.0.1.tgz",
2875+
"integrity": "sha512-u8d0pJ5YFgneF/GuvEiDA61Tf1VDomHHYMjv/wc9XzYj7nopltpG96nXN5dJRstxZhcNpV1g+nT6CydO7pHbjA==",
28772876
"dev": true,
2878-
"license": "MIT",
28792877
"engines": {
2880-
"node": ">=14.15.0"
2878+
"node": ">=18.12.0"
28812879
},
28822880
"peerDependencies": {
2883-
"webpack": "5.x.x",
2884-
"webpack-cli": "5.x.x"
2881+
"webpack": "^5.82.0",
2882+
"webpack-cli": "6.x.x"
28852883
}
28862884
},
28872885
"node_modules/@webpack-cli/info": {
2888-
"version": "2.0.2",
2889-
"resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz",
2890-
"integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==",
2886+
"version": "3.0.1",
2887+
"resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-3.0.1.tgz",
2888+
"integrity": "sha512-coEmDzc2u/ffMvuW9aCjoRzNSPDl/XLuhPdlFRpT9tZHmJ/039az33CE7uH+8s0uL1j5ZNtfdv0HkfaKRBGJsQ==",
28912889
"dev": true,
2892-
"license": "MIT",
28932890
"engines": {
2894-
"node": ">=14.15.0"
2891+
"node": ">=18.12.0"
28952892
},
28962893
"peerDependencies": {
2897-
"webpack": "5.x.x",
2898-
"webpack-cli": "5.x.x"
2894+
"webpack": "^5.82.0",
2895+
"webpack-cli": "6.x.x"
28992896
}
29002897
},
29012898
"node_modules/@webpack-cli/serve": {
2902-
"version": "2.0.5",
2903-
"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz",
2904-
"integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==",
2899+
"version": "3.0.1",
2900+
"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-3.0.1.tgz",
2901+
"integrity": "sha512-sbgw03xQaCLiT6gcY/6u3qBDn01CWw/nbaXl3gTdTFuJJ75Gffv3E3DBpgvY2fkkrdS1fpjaXNOmJlnbtKauKg==",
29052902
"dev": true,
2906-
"license": "MIT",
29072903
"engines": {
2908-
"node": ">=14.15.0"
2904+
"node": ">=18.12.0"
29092905
},
29102906
"peerDependencies": {
2911-
"webpack": "5.x.x",
2912-
"webpack-cli": "5.x.x"
2907+
"webpack": "^5.82.0",
2908+
"webpack-cli": "6.x.x"
29132909
},
29142910
"peerDependenciesMeta": {
29152911
"webpack-dev-server": {
@@ -3923,7 +3919,6 @@
39233919
"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
39243920
"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
39253921
"dev": true,
3926-
"license": "MIT",
39273922
"dependencies": {
39283923
"is-plain-object": "^2.0.4",
39293924
"kind-of": "^6.0.2",
@@ -5140,7 +5135,6 @@
51405135
"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
51415136
"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
51425137
"dev": true,
5143-
"license": "BSD-3-Clause",
51445138
"bin": {
51455139
"flat": "cli.js"
51465140
}
@@ -5797,7 +5791,6 @@
57975791
"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
57985792
"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
57995793
"dev": true,
5800-
"license": "MIT",
58015794
"dependencies": {
58025795
"isobject": "^3.0.1"
58035796
},
@@ -5844,7 +5837,6 @@
58445837
"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
58455838
"integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
58465839
"dev": true,
5847-
"license": "MIT",
58485840
"engines": {
58495841
"node": ">=0.10.0"
58505842
}
@@ -8075,7 +8067,6 @@
80758067
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
80768068
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
80778069
"dev": true,
8078-
"license": "MIT",
80798070
"engines": {
80808071
"node": ">=0.10.0"
80818072
}
@@ -8474,9 +8465,9 @@
84748465
"license": "MIT"
84758466
},
84768467
"node_modules/node": {
8477-
"version": "23.4.0",
8478-
"resolved": "https://registry.npmjs.org/node/-/node-23.4.0.tgz",
8479-
"integrity": "sha512-uzDNv0OyY8xC7x1/CuYx2c9G3g33GznkhPFs89Q2trrk7M9JzYFj8nlEbv9E666ihJdop+WaeCQST2Hbm/iKuw==",
8468+
"version": "23.5.0",
8469+
"resolved": "https://registry.npmjs.org/node/-/node-23.5.0.tgz",
8470+
"integrity": "sha512-Wco8qYfFUAotVJJoMbB30cYdPbTqFd9QtzC528GvTCYWMldnPUu1pLNz4sKNKxal+dgBuAyUu8tRkeLVx1VT8Q==",
84808471
"hasInstallScript": true,
84818472
"dependencies": {
84828473
"node-bin-setup": "^1.0.0"
@@ -9417,7 +9408,6 @@
94179408
"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
94189409
"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
94199410
"dev": true,
9420-
"license": "MIT",
94219411
"dependencies": {
94229412
"kind-of": "^6.0.2"
94239413
},
@@ -10652,43 +10642,39 @@
1065210642
}
1065310643
},
1065410644
"node_modules/webpack-cli": {
10655-
"version": "5.1.4",
10656-
"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz",
10657-
"integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==",
10645+
"version": "6.0.1",
10646+
"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-6.0.1.tgz",
10647+
"integrity": "sha512-MfwFQ6SfwinsUVi0rNJm7rHZ31GyTcpVE5pgVA3hwFRb7COD4TzjUUwhGWKfO50+xdc2MQPuEBBJoqIMGt3JDw==",
1065810648
"dev": true,
10659-
"license": "MIT",
1066010649
"dependencies": {
10661-
"@discoveryjs/json-ext": "^0.5.0",
10662-
"@webpack-cli/configtest": "^2.1.1",
10663-
"@webpack-cli/info": "^2.0.2",
10664-
"@webpack-cli/serve": "^2.0.5",
10650+
"@discoveryjs/json-ext": "^0.6.1",
10651+
"@webpack-cli/configtest": "^3.0.1",
10652+
"@webpack-cli/info": "^3.0.1",
10653+
"@webpack-cli/serve": "^3.0.1",
1066510654
"colorette": "^2.0.14",
10666-
"commander": "^10.0.1",
10655+
"commander": "^12.1.0",
1066710656
"cross-spawn": "^7.0.3",
10668-
"envinfo": "^7.7.3",
10657+
"envinfo": "^7.14.0",
1066910658
"fastest-levenshtein": "^1.0.12",
1067010659
"import-local": "^3.0.2",
1067110660
"interpret": "^3.1.1",
1067210661
"rechoir": "^0.8.0",
10673-
"webpack-merge": "^5.7.3"
10662+
"webpack-merge": "^6.0.1"
1067410663
},
1067510664
"bin": {
1067610665
"webpack-cli": "bin/cli.js"
1067710666
},
1067810667
"engines": {
10679-
"node": ">=14.15.0"
10668+
"node": ">=18.12.0"
1068010669
},
1068110670
"funding": {
1068210671
"type": "opencollective",
1068310672
"url": "https://opencollective.com/webpack"
1068410673
},
1068510674
"peerDependencies": {
10686-
"webpack": "5.x.x"
10675+
"webpack": "^5.82.0"
1068710676
},
1068810677
"peerDependenciesMeta": {
10689-
"@webpack-cli/generators": {
10690-
"optional": true
10691-
},
1069210678
"webpack-bundle-analyzer": {
1069310679
"optional": true
1069410680
},
@@ -10698,28 +10684,26 @@
1069810684
}
1069910685
},
1070010686
"node_modules/webpack-cli/node_modules/commander": {
10701-
"version": "10.0.1",
10702-
"resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
10703-
"integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
10687+
"version": "12.1.0",
10688+
"resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
10689+
"integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
1070410690
"dev": true,
10705-
"license": "MIT",
1070610691
"engines": {
10707-
"node": ">=14"
10692+
"node": ">=18"
1070810693
}
1070910694
},
1071010695
"node_modules/webpack-merge": {
10711-
"version": "5.10.0",
10712-
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
10713-
"integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
10696+
"version": "6.0.1",
10697+
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz",
10698+
"integrity": "sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==",
1071410699
"dev": true,
10715-
"license": "MIT",
1071610700
"dependencies": {
1071710701
"clone-deep": "^4.0.1",
1071810702
"flat": "^5.0.2",
10719-
"wildcard": "^2.0.0"
10703+
"wildcard": "^2.0.1"
1072010704
},
1072110705
"engines": {
10722-
"node": ">=10.0.0"
10706+
"node": ">=18.0.0"
1072310707
}
1072410708
},
1072510709
"node_modules/webpack-sources": {
@@ -10799,8 +10783,7 @@
1079910783
"version": "2.0.1",
1080010784
"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
1080110785
"integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
10802-
"dev": true,
10803-
"license": "MIT"
10786+
"dev": true
1080410787
},
1080510788
"node_modules/word-wrap": {
1080610789
"version": "1.2.5",
@@ -11158,7 +11141,7 @@
1115811141
"fast-glob": "^3.3.2",
1115911142
"fastest-levenshtein": "^1.0.16",
1116011143
"jsonc-parser": "^3.3.1",
11161-
"node": "^23.4.0",
11144+
"node": "^23.5.0",
1116211145
"picomatch": "^4.0.2",
1116311146
"vscode-languageserver": "^9.0.1",
1116411147
"vscode-languageserver-protocol": "^3.17.5",
@@ -11176,7 +11159,7 @@
1117611159
"ts-node": "^10.9.2",
1117711160
"typescript": "^5.7.2",
1117811161
"webpack": "^5.97.1",
11179-
"webpack-cli": "^5.0.2"
11162+
"webpack-cli": "^6.0.1"
1118011163
},
1118111164
"engines": {
1118211165
"node": "*"

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"typescript": "^5.7.2",
6767
"typescript-eslint": "^8.18.2",
6868
"webpack": "^5.97.1",
69-
"webpack-cli": "^5.0.1"
69+
"webpack-cli": "^6.0.1"
7070
},
7171
"maintainers": [
7272
{

‎server/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"fast-glob": "^3.3.2",
4040
"fastest-levenshtein": "^1.0.16",
4141
"jsonc-parser": "^3.3.1",
42-
"node": "^23.4.0",
42+
"node": "^23.5.0",
4343
"picomatch": "^4.0.2",
4444
"vscode-languageserver": "^9.0.1",
4545
"vscode-languageserver-protocol": "^3.17.5",
@@ -57,6 +57,6 @@
5757
"ts-node": "^10.9.2",
5858
"typescript": "^5.7.2",
5959
"webpack": "^5.97.1",
60-
"webpack-cli": "^5.0.2"
60+
"webpack-cli": "^6.0.1"
6161
}
6262
}

0 commit comments

Comments
 (0)