Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@MosleyTheMalO
MosleyTheMalO committed Feb 18, 2023
2 parents 25bd81d + 5c50c04 commit a3fd8c6
Show file tree
Hide file tree
Showing 4 changed files with 896 additions and 75 deletions.
873 changes: 873 additions & 0 deletions tgui/.yarn/releases/yarn-3.4.1.cjs
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tgui/.yarnrc.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ preferAggregateCacheInfo: true

preferInteractive: true

yarnPath: .yarn/releases/yarn-3.2.3.cjs
yarnPath: .yarn/releases/yarn-3.4.1.cjs
2 changes: 1 addition & 1 deletion tgui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"style-loader": "^3.3.1",
"terser-webpack-plugin": "^5.3.1",
"typescript": "^4.6.4",
"webpack": "^5.72.1",
"webpack": "^5.75.0",
"webpack-bundle-analyzer": "^4.5.0",
"webpack-cli": "^4.9.2"
}
Expand Down
94 changes: 21 additions & 73 deletions tgui/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2074,14 +2074,7 @@ __metadata:
languageName: node
linkType: hard

"@types/estree@npm:*":
version: 0.0.50
resolution: "@types/estree@npm:0.0.50"
checksum: 9a2b6a4a8c117f34d08fbda5e8f69b1dfb109f7d149b60b00fd7a9fb6ac545c078bc590aa4ec2f0a256d680cf72c88b3b28b60c326ee38a7bc8ee1ee95624922
languageName: node
linkType: hard

"@types/estree@npm:^0.0.51":
"@types/estree@npm:*, @types/estree@npm:^0.0.51":
version: 0.0.51
resolution: "@types/estree@npm:0.0.51"
checksum: e56a3bcf759fd9185e992e7fdb3c6a5f81e8ff120e871641607581fb3728d16c811702a7d40fa5f869b7f7b4437ab6a87eb8d98ffafeee51e85bbe955932a189
Expand Down Expand Up @@ -2581,21 +2574,12 @@ __metadata:
languageName: node
linkType: hard

"acorn@npm:^8.0.4":
version: 8.4.1
resolution: "acorn@npm:8.4.1"
bin:
acorn: bin/acorn
checksum: 0a8fd264349285aa36194b26a5a9d70c3641e78ad459ec44b9a9a5738e0ce6d86ec120ca2c0f04477165cee912fdeb158f62d6582697185c82278bdbf71187f8
languageName: node
linkType: hard

"acorn@npm:^8.5.0, acorn@npm:^8.7.1, acorn@npm:^8.8.0":
version: 8.8.1
resolution: "acorn@npm:8.8.1"
"acorn@npm:^8.0.4, acorn@npm:^8.5.0, acorn@npm:^8.7.1, acorn@npm:^8.8.0":
version: 8.8.2
resolution: "acorn@npm:8.8.2"
bin:
acorn: bin/acorn
checksum: 4079b67283b94935157698831967642f24a075c52ce3feaaaafe095776dfbe15d86a1b33b1e53860fc0d062ed6c83f4284a5c87c85b9ad51853a01173da6097f
checksum: f790b99a1bf63ef160c967e23c46feea7787e531292bb827126334612c234ed489a0dc2c7ba33156416f0ffa8d25bf2b0fdb7f35c2ba60eb3e960572bece4001
languageName: node
linkType: hard

Expand Down Expand Up @@ -3894,12 +3878,12 @@ __metadata:
linkType: hard

"enhanced-resolve@npm:^5.10.0":
version: 5.10.0
resolution: "enhanced-resolve@npm:5.10.0"
version: 5.12.0
resolution: "enhanced-resolve@npm:5.12.0"
dependencies:
graceful-fs: ^4.2.4
tapable: ^2.2.0
checksum: 0bb9830704db271610f900e8d79d70a740ea16f251263362b0c91af545576d09fe50103496606c1300a05e588372d6f9780a9bc2e30ce8ef9b827ec8f44687ff
checksum: bf3f787facaf4ce3439bef59d148646344e372bef5557f0d37ea8aa02c51f50a925cd1f07b8d338f18992c29f544ec235a8c64bcdb56030196c48832a5494174
languageName: node
linkType: hard

Expand Down Expand Up @@ -4640,7 +4624,7 @@ __metadata:

"fsevents@patch:fsevents@^2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
version: 2.3.2
resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=18f3a7"
resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=df0bf1"
dependencies:
node-gyp: latest
conditions: os=darwin
Expand Down Expand Up @@ -4786,21 +4770,7 @@ __metadata:
languageName: node
linkType: hard

"glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6":
version: 7.1.7
resolution: "glob@npm:7.1.7"
dependencies:
fs.realpath: ^1.0.0
inflight: ^1.0.4
inherits: 2
minimatch: ^3.0.4
once: ^1.3.0
path-is-absolute: ^1.0.0
checksum: b61f48973bbdcf5159997b0874a2165db572b368b931135832599875919c237fc05c12984e38fe828e69aa8a921eb0e8a4997266211c517c9cfaae8a93988bb8
languageName: node
linkType: hard

"glob@npm:^7.1.7, glob@npm:^7.2.0":
"glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.1.7, glob@npm:^7.2.0":
version: 7.2.0
resolution: "glob@npm:7.2.0"
dependencies:
Expand Down Expand Up @@ -4844,14 +4814,7 @@ __metadata:
languageName: node
linkType: hard

"graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.2.3, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6":
version: 4.2.8
resolution: "graceful-fs@npm:4.2.8"
checksum: 5d224c8969ad0581d551dfabdb06882706b31af2561bd5e2034b4097e67cc27d05232849b8643866585fd0a41c7af152950f8776f4dd5579e9853733f31461c6
languageName: node
linkType: hard

"graceful-fs@npm:^4.2.9":
"graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.2.3, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
version: 4.2.10
resolution: "graceful-fs@npm:4.2.10"
checksum: 3f109d70ae123951905d85032ebeae3c2a5a7a997430df00ea30df0e3a6c60cf6689b109654d6fdacd28810a053348c4d14642da1d075049e6be1ba5216218da
Expand Down Expand Up @@ -7703,7 +7666,7 @@ resolve@^2.0.0-next.3:

"resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.9.0#~builtin<compat/resolve>":
version: 1.20.0
resolution: "resolve@patch:resolve@npm%3A1.20.0#~builtin<compat/resolve>::version=1.20.0&hash=07638b"
resolution: "resolve@patch:resolve@npm%3A1.20.0#~builtin<compat/resolve>::version=1.20.0&hash=c3c19d"
dependencies:
is-core-module: ^2.2.0
path-parse: ^1.0.6
Expand All @@ -7713,7 +7676,7 @@ resolve@^2.0.0-next.3:

"resolve@patch:resolve@^2.0.0-next.3#~builtin<compat/resolve>":
version: 2.0.0-next.3
resolution: "resolve@patch:resolve@npm%3A2.0.0-next.3#~builtin<compat/resolve>::version=2.0.0-next.3&hash=07638b"
resolution: "resolve@patch:resolve@npm%3A2.0.0-next.3#~builtin<compat/resolve>::version=2.0.0-next.3&hash=c3c19d"
dependencies:
is-core-module: ^2.2.0
path-parse: ^1.0.6
Expand Down Expand Up @@ -8644,7 +8607,7 @@ resolve@^2.0.0-next.3:
style-loader: ^3.3.1
terser-webpack-plugin: ^5.3.1
typescript: ^4.6.4
webpack: ^5.72.1
webpack: ^5.75.0
webpack-bundle-analyzer: ^4.5.0
webpack-cli: ^4.9.2
languageName: unknown
Expand Down Expand Up @@ -8889,11 +8852,11 @@ resolve@^2.0.0-next.3:

"typescript@patch:typescript@^4.6.4#~builtin<compat/typescript>":
version: 4.8.2
resolution: "typescript@patch:typescript@npm%3A4.8.2#~builtin<compat/typescript>::version=4.8.2&hash=a1c5e5"
resolution: "typescript@patch:typescript@npm%3A4.8.2#~builtin<compat/typescript>::version=4.8.2&hash=3b564f"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 5cb0f02f414f5405f4b0e7ee1fd7fa9177b6a8783c9017b6cad85f56ce4c4f93e0e6f2ce37e863cb597d44227cd009474c9fbd85bf7a50004e5557426cb58079
checksum: 28e130a49d9330b64b8229ad336247bf980e9a705c5850f30a859a68c051e8e68e367b3275f119da4a825dca71ad0fe315964a1315d4a381c0021bca5eeeb62e
languageName: node
linkType: hard

Expand Down Expand Up @@ -9235,9 +9198,9 @@ resolve@^2.0.0-next.3:
languageName: node
linkType: hard

"webpack@npm:^5, webpack@npm:^5.72.1":
version: 5.74.0
resolution: "webpack@npm:5.74.0"
"webpack@npm:^5, webpack@npm:^5.75.0":
version: 5.75.0
resolution: "webpack@npm:5.75.0"
dependencies:
"@types/eslint-scope": ^3.7.3
"@types/estree": ^0.0.51
Expand Down Expand Up @@ -9268,7 +9231,7 @@ resolve@^2.0.0-next.3:
optional: true
bin:
webpack: bin/webpack.js
checksum: 320c41369a75051b19e18c63f408b3dcc481852e992f83d311771c5ec0f05f2946385e8ebef62030cf3587f0a3d2f12779ffdb191569a966847289ba7313f946
checksum: 2bcc5f3c195f375944e8af2f00bf2feea39cb9fda5f763b0d1b00077f1c51783db25c94d3fae96a07dead9fa085e6ae7474417e5ab31719c9776ea5969ceb83a
languageName: node
linkType: hard

Expand Down Expand Up @@ -9390,22 +9353,7 @@ resolve@^2.0.0-next.3:
languageName: node
linkType: hard

"ws@npm:^7.3.1":
version: 7.5.3
resolution: "ws@npm:7.5.3"
peerDependencies:
bufferutil: ^4.0.1
utf-8-validate: ^5.0.2
peerDependenciesMeta:
bufferutil:
optional: true
utf-8-validate:
optional: true
checksum: 423dc0d859fa74020f5555140905b862470a60ea1567bb9ad55a087263d7718b9c94f69678be1cee9868925c570f1e6fc79d09f90c39057bc63fa2edbb2c547b
languageName: node
linkType: hard

"ws@npm:^7.5.3":
"ws@npm:^7.3.1, ws@npm:^7.5.3":
version: 7.5.5
resolution: "ws@npm:7.5.5"
peerDependencies:
Expand Down

0 comments on commit a3fd8c6

Please sign in to comment.