Skip to content

Commit 421defa

Browse files
authored
Merge branch 'master220' into optimisation_2
2 parents 18a0ab2 + 54187f7 commit 421defa

2 files changed

Lines changed: 3 additions & 207 deletions

File tree

tgui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"swc-loader": "^0.2.3",
4545
"terser-webpack-plugin": "^5.3.10",
4646
"typescript": "^5.6.3",
47-
"webpack": "^5.104.1",
47+
"webpack": "^5.96.1",
4848
"webpack-bundle-analyzer": "^4.10.2",
4949
"webpack-cli": "^5.1.4"
5050
}

tgui/yarn.lock

Lines changed: 2 additions & 206 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,13 +1593,6 @@ __metadata:
15931593
languageName: node
15941594
linkType: hard
15951595

1596-
"@types/estree@npm:^1.0.8":
1597-
version: 1.0.8
1598-
resolution: "@types/estree@npm:1.0.8"
1599-
checksum: 10/25a4c16a6752538ffde2826c2cc0c6491d90e69cd6187bef4a006dd2c3c45469f049e643d7e516c515f21484dc3d48fd5c870be158a5beb72f5baf3dc43e4099
1600-
languageName: node
1601-
linkType: hard
1602-
16031596
"@types/graceful-fs@npm:^4.1.3":
16041597
version: 4.1.9
16051598
resolution: "@types/graceful-fs@npm:4.1.9"
@@ -2078,15 +2071,6 @@ __metadata:
20782071
languageName: node
20792072
linkType: hard
20802073

2081-
"acorn-import-phases@npm:^1.0.3":
2082-
version: 1.0.4
2083-
resolution: "acorn-import-phases@npm:1.0.4"
2084-
peerDependencies:
2085-
acorn: ^8.14.0
2086-
checksum: 10/471050ac7d9b61909c837b426de9eeef2958997f6277ad7dea88d5894fd9b3245d8ed4a225c2ca44f814dbb20688009db7a80e525e8196fc9e98c5285b66161d
2087-
languageName: node
2088-
linkType: hard
2089-
20902074
"acorn-jsx@npm:^5.3.2":
20912075
version: 5.3.2
20922076
resolution: "acorn-jsx@npm:5.3.2"
@@ -2114,15 +2098,6 @@ __metadata:
21142098
languageName: node
21152099
linkType: hard
21162100

2117-
"acorn@npm:^8.15.0":
2118-
version: 8.15.0
2119-
resolution: "acorn@npm:8.15.0"
2120-
bin:
2121-
acorn: bin/acorn
2122-
checksum: 10/77f2de5051a631cf1729c090e5759148459cdb76b5f5c70f890503d629cf5052357b0ce783c0f976dd8a93c5150f59f6d18df1def3f502396a20f81282482fa4
2123-
languageName: node
2124-
linkType: hard
2125-
21262101
"agent-base@npm:6":
21272102
version: 6.0.2
21282103
resolution: "agent-base@npm:6.0.2"
@@ -2479,15 +2454,6 @@ __metadata:
24792454
languageName: node
24802455
linkType: hard
24812456

2482-
"baseline-browser-mapping@npm:^2.9.0":
2483-
version: 2.9.19
2484-
resolution: "baseline-browser-mapping@npm:2.9.19"
2485-
bin:
2486-
baseline-browser-mapping: dist/cli.js
2487-
checksum: 10/8d7bbb7fe3d1ad50e04b127c819ba6d059c01ed0d2a7a5fc3327e23a8c42855fa3a8b510550c1fe1e37916147e6a390243566d3ef85bf6130c8ddfe5cc3db530
2488-
languageName: node
2489-
linkType: hard
2490-
24912457
"big.js@npm:^5.2.2":
24922458
version: 5.2.2
24932459
resolution: "big.js@npm:5.2.2"
@@ -2554,21 +2520,6 @@ __metadata:
25542520
languageName: node
25552521
linkType: hard
25562522

2557-
"browserslist@npm:^4.28.1":
2558-
version: 4.28.1
2559-
resolution: "browserslist@npm:4.28.1"
2560-
dependencies:
2561-
baseline-browser-mapping: "npm:^2.9.0"
2562-
caniuse-lite: "npm:^1.0.30001759"
2563-
electron-to-chromium: "npm:^1.5.263"
2564-
node-releases: "npm:^2.0.27"
2565-
update-browserslist-db: "npm:^1.2.0"
2566-
bin:
2567-
browserslist: cli.js
2568-
checksum: 10/64f2a97de4bce8473c0e5ae0af8d76d1ead07a5b05fc6bc87b848678bb9c3a91ae787b27aa98cdd33fc00779607e6c156000bed58fefb9cf8e4c5a183b994cdb
2569-
languageName: node
2570-
linkType: hard
2571-
25722523
"bser@npm:2.1.1":
25732524
version: 2.1.1
25742525
resolution: "bser@npm:2.1.1"
@@ -2672,13 +2623,6 @@ __metadata:
26722623
languageName: node
26732624
linkType: hard
26742625

2675-
"caniuse-lite@npm:^1.0.30001759":
2676-
version: 1.0.30001769
2677-
resolution: "caniuse-lite@npm:1.0.30001769"
2678-
checksum: 10/4b7d087832d4330a8b1fa02cd9455bdb068ea67f1735f2aa6324d5b64b24f5079cf6349b13d209f268ffa59644b9f4f784266b780bafd877ceb83c9797ca80ba
2679-
languageName: node
2680-
linkType: hard
2681-
26822626
"chalk@npm:^4.0.0":
26832627
version: 4.1.2
26842628
resolution: "chalk@npm:4.1.2"
@@ -3219,13 +3163,6 @@ __metadata:
32193163
languageName: node
32203164
linkType: hard
32213165

3222-
"electron-to-chromium@npm:^1.5.263":
3223-
version: 1.5.286
3224-
resolution: "electron-to-chromium@npm:1.5.286"
3225-
checksum: 10/530ae36571f3f737431dc1f97ab176d9ec38d78e7a14a78fff78540769ef139e9011200a886864111ee26d64e647136531ff004f368f5df8cdd755c45ad97649
3226-
languageName: node
3227-
linkType: hard
3228-
32293166
"emittery@npm:^0.13.1":
32303167
version: 0.13.1
32313168
resolution: "emittery@npm:0.13.1"
@@ -3280,16 +3217,6 @@ __metadata:
32803217
languageName: node
32813218
linkType: hard
32823219

3283-
"enhanced-resolve@npm:^5.19.0":
3284-
version: 5.19.0
3285-
resolution: "enhanced-resolve@npm:5.19.0"
3286-
dependencies:
3287-
graceful-fs: "npm:^4.2.4"
3288-
tapable: "npm:^2.3.0"
3289-
checksum: 10/b537d52173bf1ba903c623f96a43ea3b51466ee2b606b2fcca30d73d453fd79c8683dccbb83523de27cd02763c906f11486e2591a4335e6afe49fa5ad6e67b83
3290-
languageName: node
3291-
linkType: hard
3292-
32933220
"entities@npm:^6.0.0":
32943221
version: 6.0.0
32953222
resolution: "entities@npm:6.0.0"
@@ -3433,13 +3360,6 @@ __metadata:
34333360
languageName: node
34343361
linkType: hard
34353362

3436-
"es-module-lexer@npm:^2.0.0":
3437-
version: 2.0.0
3438-
resolution: "es-module-lexer@npm:2.0.0"
3439-
checksum: 10/b075855289b5f40ee496f3d7525c5c501d029c3da15c22298a0030d625bf36d1da0768b26278f7f4bada2a602459b505888e20b77c414fba5da5619b0e84dbd1
3440-
languageName: node
3441-
linkType: hard
3442-
34433363
"es-object-atoms@npm:^1.0.0, es-object-atoms@npm:^1.1.1":
34443364
version: 1.1.1
34453365
resolution: "es-object-atoms@npm:1.1.1"
@@ -5848,13 +5768,6 @@ __metadata:
58485768
languageName: node
58495769
linkType: hard
58505770

5851-
"loader-runner@npm:^4.3.1":
5852-
version: 4.3.1
5853-
resolution: "loader-runner@npm:4.3.1"
5854-
checksum: 10/d77127497c3f91fdba351e3e91156034e6e590e9f050b40df6c38ac16c54b5c903f7e2e141e09fefd046ee96b26fb50773c695ebc0aa205a4918683b124b04ba
5855-
languageName: node
5856-
linkType: hard
5857-
58585771
"loader-utils@npm:^2.0.0, loader-utils@npm:^2.0.4":
58595772
version: 2.0.4
58605773
resolution: "loader-utils@npm:2.0.4"
@@ -6286,13 +6199,6 @@ __metadata:
62866199
languageName: node
62876200
linkType: hard
62886201

6289-
"node-releases@npm:^2.0.27":
6290-
version: 2.0.27
6291-
resolution: "node-releases@npm:2.0.27"
6292-
checksum: 10/f6c78ddb392ae500719644afcbe68a9ea533242c02312eb6a34e8478506eb7482a3fb709c70235b01c32fe65625b68dfa9665113f816d87f163bc3819b62b106
6293-
languageName: node
6294-
linkType: hard
6295-
62966202
"nopt@npm:^8.0.0":
62976203
version: 8.1.0
62986204
resolution: "nopt@npm:8.1.0"
@@ -7290,18 +7196,6 @@ __metadata:
72907196
languageName: node
72917197
linkType: hard
72927198

7293-
"schema-utils@npm:^4.3.3":
7294-
version: 4.3.3
7295-
resolution: "schema-utils@npm:4.3.3"
7296-
dependencies:
7297-
"@types/json-schema": "npm:^7.0.9"
7298-
ajv: "npm:^8.9.0"
7299-
ajv-formats: "npm:^2.1.1"
7300-
ajv-keywords: "npm:^5.1.0"
7301-
checksum: 10/dba77a46ad7ff0c906f7f09a1a61109e6cb56388f15a68070b93c47a691f516c6a3eb454f81a8cceb0a0e55b87f8b05770a02bfb1f4e0a3143b5887488b2f900
7302-
languageName: node
7303-
linkType: hard
7304-
73057199
"semver@npm:^6.3.0, semver@npm:^6.3.1":
73067200
version: 6.3.1
73077201
resolution: "semver@npm:6.3.1"
@@ -7860,13 +7754,6 @@ __metadata:
78607754
languageName: node
78617755
linkType: hard
78627756

7863-
"tapable@npm:^2.3.0":
7864-
version: 2.3.0
7865-
resolution: "tapable@npm:2.3.0"
7866-
checksum: 10/496a841039960533bb6e44816a01fffc2a1eb428bb2051ecab9e87adf07f19e1f937566cbbbb09dceff31163c0ffd81baafcad84db900b601f0155dd0b37e9f2
7867-
languageName: node
7868-
linkType: hard
7869-
78707757
"tar@npm:^7.4.3":
78717758
version: 7.4.3
78727759
resolution: "tar@npm:7.4.3"
@@ -7903,28 +7790,6 @@ __metadata:
79037790
languageName: node
79047791
linkType: hard
79057792

7906-
"terser-webpack-plugin@npm:^5.3.16":
7907-
version: 5.3.16
7908-
resolution: "terser-webpack-plugin@npm:5.3.16"
7909-
dependencies:
7910-
"@jridgewell/trace-mapping": "npm:^0.3.25"
7911-
jest-worker: "npm:^27.4.5"
7912-
schema-utils: "npm:^4.3.0"
7913-
serialize-javascript: "npm:^6.0.2"
7914-
terser: "npm:^5.31.1"
7915-
peerDependencies:
7916-
webpack: ^5.1.0
7917-
peerDependenciesMeta:
7918-
"@swc/core":
7919-
optional: true
7920-
esbuild:
7921-
optional: true
7922-
uglify-js:
7923-
optional: true
7924-
checksum: 10/09dfbff602acfa114cdd174254b69a04adbc47856021ab351e37982202fd1ec85e0b62ffd5864c98beb8e96aef2f43da490b3448b4541db539c2cff6607394a6
7925-
languageName: node
7926-
linkType: hard
7927-
79287793
"terser@npm:^5.31.1":
79297794
version: 5.39.0
79307795
resolution: "terser@npm:5.39.0"
@@ -8031,7 +7896,7 @@ __metadata:
80317896
swc-loader: "npm:^0.2.3"
80327897
terser-webpack-plugin: "npm:^5.3.10"
80337898
typescript: "npm:^5.6.3"
8034-
webpack: "npm:^5.104.1"
7899+
webpack: "npm:^5.96.1"
80357900
webpack-bundle-analyzer: "npm:^4.10.2"
80367901
webpack-cli: "npm:^5.1.4"
80377902
languageName: unknown
@@ -8356,20 +8221,6 @@ __metadata:
83568221
languageName: node
83578222
linkType: hard
83588223

8359-
"update-browserslist-db@npm:^1.2.0":
8360-
version: 1.2.3
8361-
resolution: "update-browserslist-db@npm:1.2.3"
8362-
dependencies:
8363-
escalade: "npm:^3.2.0"
8364-
picocolors: "npm:^1.1.1"
8365-
peerDependencies:
8366-
browserslist: ">= 4.21.0"
8367-
bin:
8368-
update-browserslist-db: cli.js
8369-
checksum: 10/059f774300efb4b084a49293143c511f3ae946d40397b5c30914e900cd5691a12b8e61b41dd54ed73d3b56c8204165a0333107dd784ccf8f8c81790bcc423175
8370-
languageName: node
8371-
linkType: hard
8372-
83738224
"uri-js@npm:^4.2.2":
83748225
version: 4.4.1
83758226
resolution: "uri-js@npm:4.4.1"
@@ -8460,16 +8311,6 @@ __metadata:
84608311
languageName: node
84618312
linkType: hard
84628313

8463-
"watchpack@npm:^2.5.1":
8464-
version: 2.5.1
8465-
resolution: "watchpack@npm:2.5.1"
8466-
dependencies:
8467-
glob-to-regexp: "npm:^0.4.1"
8468-
graceful-fs: "npm:^4.1.2"
8469-
checksum: 10/9c9cdd4a9f9ae146b10d15387f383f52589e4cc27b324da6be8e7e3e755255b062a69dd7f00eef2ce67b2c01e546aae353456e74f8c1350bba00462cc6375549
8470-
languageName: node
8471-
linkType: hard
8472-
84738314
"webidl-conversions@npm:^7.0.0":
84748315
version: 7.0.0
84758316
resolution: "webidl-conversions@npm:7.0.0"
@@ -8559,14 +8400,7 @@ __metadata:
85598400
languageName: node
85608401
linkType: hard
85618402

8562-
"webpack-sources@npm:^3.3.3":
8563-
version: 3.3.3
8564-
resolution: "webpack-sources@npm:3.3.3"
8565-
checksum: 10/ec5d72607e8068467370abccbfff855c596c098baedbe9d198a557ccf198e8546a322836a6f74241492576adba06100286592993a62b63196832cdb53c8bae91
8566-
languageName: node
8567-
linkType: hard
8568-
8569-
"webpack@npm:^5":
8403+
"webpack@npm:^5, webpack@npm:^5.96.1":
85708404
version: 5.99.8
85718405
resolution: "webpack@npm:5.99.8"
85728406
dependencies:
@@ -8603,44 +8437,6 @@ __metadata:
86038437
languageName: node
86048438
linkType: hard
86058439

8606-
"webpack@npm:^5.104.1":
8607-
version: 5.105.0
8608-
resolution: "webpack@npm:5.105.0"
8609-
dependencies:
8610-
"@types/eslint-scope": "npm:^3.7.7"
8611-
"@types/estree": "npm:^1.0.8"
8612-
"@types/json-schema": "npm:^7.0.15"
8613-
"@webassemblyjs/ast": "npm:^1.14.1"
8614-
"@webassemblyjs/wasm-edit": "npm:^1.14.1"
8615-
"@webassemblyjs/wasm-parser": "npm:^1.14.1"
8616-
acorn: "npm:^8.15.0"
8617-
acorn-import-phases: "npm:^1.0.3"
8618-
browserslist: "npm:^4.28.1"
8619-
chrome-trace-event: "npm:^1.0.2"
8620-
enhanced-resolve: "npm:^5.19.0"
8621-
es-module-lexer: "npm:^2.0.0"
8622-
eslint-scope: "npm:5.1.1"
8623-
events: "npm:^3.2.0"
8624-
glob-to-regexp: "npm:^0.4.1"
8625-
graceful-fs: "npm:^4.2.11"
8626-
json-parse-even-better-errors: "npm:^2.3.1"
8627-
loader-runner: "npm:^4.3.1"
8628-
mime-types: "npm:^2.1.27"
8629-
neo-async: "npm:^2.6.2"
8630-
schema-utils: "npm:^4.3.3"
8631-
tapable: "npm:^2.3.0"
8632-
terser-webpack-plugin: "npm:^5.3.16"
8633-
watchpack: "npm:^2.5.1"
8634-
webpack-sources: "npm:^3.3.3"
8635-
peerDependenciesMeta:
8636-
webpack-cli:
8637-
optional: true
8638-
bin:
8639-
webpack: bin/webpack.js
8640-
checksum: 10/95e0a0f04fc324e0e3b378a81d111b1739579cda7224cbf904f894e8c4f3a8edce35a26bc06d2e6d558b335e6e0315f50a62fb1bef410053b965a5985fe38bd8
8641-
languageName: node
8642-
linkType: hard
8643-
86448440
"whatwg-encoding@npm:^2.0.0":
86458441
version: 2.0.0
86468442
resolution: "whatwg-encoding@npm:2.0.0"

0 commit comments

Comments
 (0)