diff --git a/tgui/.yarn/sdks/eslint/lib/unsupported-api.js b/tgui/.yarn/sdks/eslint/lib/unsupported-api.js new file mode 100644 index 00000000000..30fdf158b47 --- /dev/null +++ b/tgui/.yarn/sdks/eslint/lib/unsupported-api.js @@ -0,0 +1,20 @@ +#!/usr/bin/env node + +const {existsSync} = require(`fs`); +const {createRequire} = require(`module`); +const {resolve} = require(`path`); + +const relPnpApiPath = "../../../../.pnp.cjs"; + +const absPnpApiPath = resolve(__dirname, relPnpApiPath); +const absRequire = createRequire(absPnpApiPath); + +if (existsSync(absPnpApiPath)) { + if (!process.versions.pnp) { + // Setup the environment to be able to require eslint/use-at-your-own-risk + require(absPnpApiPath).setup(); + } +} + +// Defer to the real eslint/use-at-your-own-risk your application uses +module.exports = absRequire(`eslint/use-at-your-own-risk`); diff --git a/tgui/.yarn/sdks/eslint/package.json b/tgui/.yarn/sdks/eslint/package.json index b29322a1ffb..263cd3d500b 100644 --- a/tgui/.yarn/sdks/eslint/package.json +++ b/tgui/.yarn/sdks/eslint/package.json @@ -1,9 +1,14 @@ { "name": "eslint", - "version": "7.32.0-sdk", + "version": "8.57.0-sdk", "main": "./lib/api.js", "type": "commonjs", "bin": { "eslint": "./bin/eslint.js" + }, + "exports": { + "./package.json": "./package.json", + ".": "./lib/api.js", + "./use-at-your-own-risk": "./lib/unsupported-api.js" } } diff --git a/tgui/.yarn/sdks/prettier/package.json b/tgui/.yarn/sdks/prettier/package.json index c61f5117bac..6e68f38b671 100644 --- a/tgui/.yarn/sdks/prettier/package.json +++ b/tgui/.yarn/sdks/prettier/package.json @@ -1,6 +1,6 @@ { "name": "prettier", - "version": "3.1.0-sdk", + "version": "3.2.5-sdk", "main": "./index.cjs", "type": "commonjs", "bin": "./bin/prettier.cjs" diff --git a/tgui/.yarn/sdks/typescript/package.json b/tgui/.yarn/sdks/typescript/package.json index 656833d45b6..bedc3652252 100644 --- a/tgui/.yarn/sdks/typescript/package.json +++ b/tgui/.yarn/sdks/typescript/package.json @@ -1,6 +1,6 @@ { "name": "typescript", - "version": "4.9.4-sdk", + "version": "5.4.3-sdk", "main": "./lib/typescript.js", "type": "commonjs", "bin": { diff --git a/tgui/package.json b/tgui/package.json index bfbc5a34aba..364333a5b27 100644 --- a/tgui/package.json +++ b/tgui/package.json @@ -1,8 +1,13 @@ { "private": true, "name": "tgui-workspace", +<<<<<<< HEAD "version": "5.0.0", "packageManager": "yarn@3.3.1", +======= + "version": "5.0.1", + "packageManager": "yarn@4.1.1", +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) "workspaces": [ "packages/*" ], @@ -22,36 +27,35 @@ "tgui:eslint-fix": "eslint --fix packages --ext .js,.cjs,.ts,.tsx" }, "dependencies": { - "@swc/core": "^1.3.100", - "@swc/jest": "^0.2.29", - "@types/jest": "^29.5.10", - "@types/jsdom": "^21.1.6", - "@types/node": "^14.x", - "@types/webpack": "^5.28.5", + "@swc/core": "^1.4.11", + "@swc/jest": "^0.2.36", + "@types/jest": "^29.5.12", + "@types/node": "^20.12.3", "@types/webpack-env": "^1.18.4", - "@typescript-eslint/parser": "^6.14.0", - "css-loader": "^6.8.1", - "esbuild-loader": "^4.0.2", - "eslint": "^8.56.0", + "@typescript-eslint/parser": "^7.5.0", + "@typescript-eslint/utils": "^7.5.0", + "css-loader": "^6.10.0", + "esbuild-loader": "^4.1.0", + "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", - "eslint-plugin-react": "^7.33.2", - "eslint-plugin-simple-import-sort": "^10.0.0", - "eslint-plugin-sonarjs": "^0.23.0", - "eslint-plugin-unused-imports": "^3.0.0", + "eslint-plugin-react": "^7.34.1", + "eslint-plugin-simple-import-sort": "^12.0.0", + "eslint-plugin-sonarjs": "^0.25.0", + "eslint-plugin-unused-imports": "^3.1.0", "file-loader": "^6.2.0", "jest": "^29.7.0", "jest-circus": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "jsdom": "^22.1.0", - "mini-css-extract-plugin": "^2.7.6", - "prettier": "^3.1.0", - "sass": "^1.69.5", - "sass-loader": "^13.3.2", - "style-loader": "^3.3.3", - "swc-loader": "^0.2.3", - "typescript": "^4.9.4", + "mini-css-extract-plugin": "^2.8.1", + "prettier": "^3.2.5", + "sass": "^1.72.0", + "sass-loader": "^14.1.1", + "style-loader": "^3.3.4", + "swc-loader": "^0.2.6", + "typescript": "^5.4.3", "url-loader": "^4.1.1", - "webpack": "^5.89.0", + "webpack": "^5.91.0", "webpack-bundle-analyzer": "^4.10.1", "webpack-cli": "^5.1.4" } diff --git a/tgui/packages/tgfont/package.json b/tgui/packages/tgfont/package.json index 9459aa12969..56bb38bf68e 100644 --- a/tgui/packages/tgfont/package.json +++ b/tgui/packages/tgfont/package.json @@ -6,6 +6,6 @@ "tgfont:build": "node mkdist.cjs && fantasticon --config config.cjs" }, "dependencies": { - "fantasticon": "^1.2.2" + "fantasticon": "^1.2.3" } } diff --git a/tgui/packages/tgui-bench/package.json b/tgui/packages/tgui-bench/package.json index 47cad082fb9..04c95e44c8f 100644 --- a/tgui/packages/tgui-bench/package.json +++ b/tgui/packages/tgui-bench/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "tgui-bench", - "version": "5.0.0", + "version": "5.0.1", "dependencies": { "@fastify/static": "^6.12.0", "common": "workspace:*", diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json index 496e25c6c18..5f1b5be3e54 100644 --- a/tgui/packages/tgui-dev-server/package.json +++ b/tgui/packages/tgui-dev-server/package.json @@ -1,13 +1,13 @@ { "private": true, "name": "tgui-dev-server", - "version": "5.0.0", + "version": "5.0.1", "type": "module", "dependencies": { - "axios": "^1.6.2", - "glob": "^7.2.0", + "axios": "^1.6.8", + "glob": "^7.2.3", "source-map": "^0.7.4", "stacktrace-parser": "^0.1.10", - "ws": "^8.14.2" + "ws": "^8.16.0" } } diff --git a/tgui/packages/tgui-panel/package.json b/tgui/packages/tgui-panel/package.json index f020764a31b..d435245e3fe 100644 --- a/tgui/packages/tgui-panel/package.json +++ b/tgui/packages/tgui-panel/package.json @@ -1,12 +1,12 @@ { "private": true, "name": "tgui-panel", - "version": "5.0.0", + "version": "5.0.1", "dependencies": { - "@types/node": "^14.x", - "@types/react": "^18.2.42", + "@types/node": "^20.12.3", + "@types/react": "^18.2.74", "common": "workspace:*", - "dompurify": "^2.4.4", + "dompurify": "^2.4.9", "react": "^18.2.0", "react-dom": "^18.2.0", "tgui": "workspace:*", diff --git a/tgui/packages/tgui-polyfill/package.json b/tgui/packages/tgui-polyfill/package.json index 8e43bb87224..30f4b6d9700 100644 --- a/tgui/packages/tgui-polyfill/package.json +++ b/tgui/packages/tgui-polyfill/package.json @@ -1,16 +1,16 @@ { "private": true, "name": "tgui-polyfill", - "version": "5.0.0", + "version": "5.0.1", "scripts": { "tgui-polyfill:build": "terser 1-misc.js -f ascii_only,comments=false -o ../../public/tgui-polyfill.min.js" }, "dependencies": { - "core-js": "^3.33.3", - "regenerator-runtime": "^0.14.0", + "core-js": "^3.36.1", + "regenerator-runtime": "^0.14.1", "unfetch": "^5.0.0" }, "devDependencies": { - "terser": "^5.24.0" + "terser": "^5.30.2" } } diff --git a/tgui/packages/tgui-say/package.json b/tgui/packages/tgui-say/package.json index 6fc66ade82f..da9ff074d4b 100644 --- a/tgui/packages/tgui-say/package.json +++ b/tgui/packages/tgui-say/package.json @@ -3,7 +3,7 @@ "name": "tgui-say", "version": "1.0.0", "dependencies": { - "@types/react": "^18.2.39", + "@types/react": "^18.2.74", "common": "workspace:*", "react": "^18.2.0", "tgui": "workspace:*", diff --git a/tgui/packages/tgui/interfaces/ListInputModal.tsx b/tgui/packages/tgui/interfaces/ListInputModal.tsx index 07273452d0c..8695ac842f7 100644 --- a/tgui/packages/tgui/interfaces/ListInputModal.tsx +++ b/tgui/packages/tgui/interfaces/ListInputModal.tsx @@ -96,8 +96,8 @@ export const ListInputModal = (props) => { setSearchBarVisible(!searchBarVisible); setSearchQuery(''); }; - const filteredItems = items.filter( - (item) => item?.toLowerCase().includes(searchQuery.toLowerCase()), + const filteredItems = items.filter((item) => + item?.toLowerCase().includes(searchQuery.toLowerCase()), ); // Dynamically changes the window height based on the message. const windowHeight = diff --git a/tgui/packages/tgui/interfaces/SmokeMachine.tsx b/tgui/packages/tgui/interfaces/SmokeMachine.tsx index 072a7546876..6832583fd6b 100644 --- a/tgui/packages/tgui/interfaces/SmokeMachine.tsx +++ b/tgui/packages/tgui/interfaces/SmokeMachine.tsx @@ -12,12 +12,12 @@ import { import { Window } from '../layouts'; type Data = { + active: BooleanLike; + maxSetting: number; + setting: number; tankContents: Reagent[]; tankCurrentVolume: number; tankMaxVolume: number; - active: BooleanLike; - setting: number; - maxSetting: number; }; type Reagent = { @@ -33,8 +33,9 @@ export const SmokeMachine = (props) => { tankMaxVolume, active, setting, - maxSetting = [], + maxSetting, } = data; + return ( @@ -44,9 +45,10 @@ export const SmokeMachine = (props) => { } > { {[1, 2, 3, 4, 5].map((amount) => ( ))} @@ -78,7 +81,9 @@ export const SmokeMachine = (props) => {
act('purge')} /> + } > {tankContents.map((chemical) => ( diff --git a/tgui/packages/tgui/interfaces/SyndicateContractor.tsx b/tgui/packages/tgui/interfaces/SyndicateContractor.tsx index cd6b1f8d8d3..81e01d682d7 100644 --- a/tgui/packages/tgui/interfaces/SyndicateContractor.tsx +++ b/tgui/packages/tgui/interfaces/SyndicateContractor.tsx @@ -33,30 +33,30 @@ export const SyndicateContractor = (props) => { }; type Data = { + contracts_completed: number; + contracts: ContractData[]; + dropoff_direction: string; + earned_tc: number; error: string; - logged_in: BooleanLike; + extraction_enroute: BooleanLike; first_load: BooleanLike; info_screen: BooleanLike; - redeemable_tc: Number; - earned_tc: Number; - contracts_completed: Number; - contracts: ContractData[]; + logged_in: BooleanLike; ongoing_contract: BooleanLike; - extraction_enroute: BooleanLike; - dropoff_direction: string; + redeemable_tc: number; }; type ContractData = { - id: Number; - status: Number; - target: string; - target_rank: string; - extraction_enroute: BooleanLike; - message: string; contract: string; dropoff: string; - payout: Number; - payout_bonus: Number; + extraction_enroute: BooleanLike; + id: number; + message: string; + payout_bonus: number; + payout: number; + status: number; + target_rank: string; + target: string; }; export const SyndicateContractorContent = (props) => { diff --git a/tgui/packages/tgui/package.json b/tgui/packages/tgui/package.json index 03b997b7d2a..efe74af8123 100644 --- a/tgui/packages/tgui/package.json +++ b/tgui/packages/tgui/package.json @@ -1,18 +1,18 @@ { "private": true, "name": "tgui", - "version": "5.0.0", + "version": "5.0.1", "dependencies": { "@popperjs/core": "^2.11.8", - "@types/marked": "^4.0.8", - "@types/react": "^18.2.39", - "@types/react-dom": "^18.2.17", + "@types/marked": "4.3.2", + "@types/react": "^18.2.74", "common": "workspace:*", - "dateformat": "^4.6.2", - "dompurify": "^2.4.4", + "dateformat": "^4.6.3", + "dompurify": "^2.4.9", "highlight.js": "^11.9.0", + "jest": "^29.7.0", "js-yaml": "^4.1.0", - "marked": "^4.2.12", + "marked": "^4.3.0", "react": "^18.2.0", "react-dom": "^18.2.0", "react-popper": "^2.3.0", diff --git a/tgui/tsconfig.json b/tgui/tsconfig.json index 9b4c851d971..9241d7bc9cb 100644 --- a/tgui/tsconfig.json +++ b/tgui/tsconfig.json @@ -7,7 +7,12 @@ "forceConsistentCasingInFileNames": true, "isolatedModules": false, "jsx": "preserve", - "lib": ["DOM", "DOM.Iterable", "ESNext", "ScriptHost"], + "lib": [ + "DOM", + "DOM.Iterable", + "ESNext", + "ScriptHost" + ], "module": "ESNext", "moduleResolution": "Node", "noEmit": true, @@ -17,5 +22,8 @@ "strictNullChecks": true, "target": "ES5" }, - "include": ["./*.d.ts", "./packages"] + "include": [ + "./*.d.ts", + "./packages" + ] } diff --git a/tgui/yarn.lock b/tgui/yarn.lock index 1e26886d0c7..8c45db294ca 100644 --- a/tgui/yarn.lock +++ b/tgui/yarn.lock @@ -658,7 +658,7 @@ __metadata: languageName: node linkType: hard -"@eslint-community/eslint-utils@npm:^4.2.0": +"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0": version: 4.4.0 resolution: "@eslint-community/eslint-utils@npm:4.4.0" dependencies: @@ -1356,9 +1356,15 @@ __metadata: languageName: node linkType: hard +<<<<<<< HEAD "@swc/core@npm:^1.3.100": version: 1.3.100 resolution: "@swc/core@npm:1.3.100" +======= +"@swc/core@npm:^1.4.11": + version: 1.4.11 + resolution: "@swc/core@npm:1.4.11" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) dependencies: "@swc/core-darwin-arm64": 1.3.100 "@swc/core-darwin-x64": 1.3.100 @@ -1406,9 +1412,15 @@ __metadata: languageName: node linkType: hard +<<<<<<< HEAD "@swc/jest@npm:^0.2.29": version: 0.2.29 resolution: "@swc/jest@npm:0.2.29" +======= +"@swc/jest@npm:^0.2.36": + version: 0.2.36 + resolution: "@swc/jest@npm:0.2.36" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) dependencies: "@jest/create-cache-key-function": ^27.4.2 jsonc-parser: ^3.2.0 @@ -1548,9 +1560,15 @@ __metadata: languageName: node linkType: hard +<<<<<<< HEAD "@types/jest@npm:^29.5.10": version: 29.5.10 resolution: "@types/jest@npm:29.5.10" +======= +"@types/jest@npm:^29.5.12": + version: 29.5.12 + resolution: "@types/jest@npm:29.5.12" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) dependencies: expect: ^29.0.0 pretty-format: ^29.0.0 @@ -1569,6 +1587,7 @@ __metadata: languageName: node linkType: hard +<<<<<<< HEAD "@types/jsdom@npm:^21.1.6": version: 21.1.6 resolution: "@types/jsdom@npm:21.1.6" @@ -1588,19 +1607,23 @@ __metadata: linkType: hard "@types/json-schema@npm:^7.0.9": +======= +"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) version: 7.0.15 resolution: "@types/json-schema@npm:7.0.15" checksum: 97ed0cb44d4070aecea772b7b2e2ed971e10c81ec87dd4ecc160322ffa55ff330dace1793489540e3e318d90942064bb697cc0f8989391797792d919737b3b98 languageName: node linkType: hard -"@types/marked@npm:^4.0.8": +"@types/marked@npm:4.3.2": version: 4.3.2 resolution: "@types/marked@npm:4.3.2" checksum: c1107079d6c368dd60a668a41aa2101d006cad404b6eb4af6723d419dc869b278928fb769825f11d0d311a8cf437428992729c8a47253b6a3894a6326b1ee4d9 languageName: node linkType: hard +<<<<<<< HEAD "@types/node@npm:*": version: 15.14.9 resolution: "@types/node@npm:15.14.9" @@ -1615,6 +1638,17 @@ __metadata: languageName: node linkType: hard +======= +"@types/node@npm:*, @types/node@npm:^20.12.3": + version: 20.12.3 + resolution: "@types/node@npm:20.12.3" + dependencies: + undici-types: "npm:~5.26.4" + checksum: 10c0/45c8485a0e55276b42c26ba1df6c480e4e1a3a3abbf4ea0ff6b4e2823c4f77e32b7e166d4263d464f207cfea5bd4de8879b8df2c7132a727b0346a30191d6bea + languageName: node + linkType: hard + +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) "@types/prop-types@npm:*": version: 15.7.11 resolution: "@types/prop-types@npm:15.7.11" @@ -1622,6 +1656,7 @@ __metadata: languageName: node linkType: hard +<<<<<<< HEAD "@types/react-dom@npm:^18.2.17": version: 18.2.17 resolution: "@types/react-dom@npm:18.2.17" @@ -1634,6 +1669,11 @@ __metadata: "@types/react@npm:*, @types/react@npm:^18.2.39": version: 18.2.39 resolution: "@types/react@npm:18.2.39" +======= +"@types/react@npm:^18.2.74": + version: 18.2.74 + resolution: "@types/react@npm:18.2.74" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) dependencies: "@types/prop-types": "*" "@types/scheduler": "*" @@ -1660,6 +1700,13 @@ __metadata: languageName: node linkType: hard +"@types/semver@npm:^7.5.0": + version: 7.5.8 + resolution: "@types/semver@npm:7.5.8" + checksum: 10c0/8663ff927234d1c5fcc04b33062cb2b9fcfbe0f5f351ed26c4d1e1581657deebd506b41ff7fdf89e787e3d33ce05854bc01686379b89e9c49b564c4cfa988efa + languageName: node + linkType: hard + "@types/stack-utils@npm:^2.0.0": version: 2.0.0 resolution: "@types/stack-utils@npm:2.0.0" @@ -1681,6 +1728,7 @@ __metadata: languageName: node linkType: hard +<<<<<<< HEAD "@types/webpack@npm:^5.28.5": version: 5.28.5 resolution: "@types/webpack@npm:5.28.5" @@ -1692,6 +1740,8 @@ __metadata: languageName: node linkType: hard +======= +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) "@types/yargs-parser@npm:*": version: 20.2.0 resolution: "@types/yargs-parser@npm:20.2.0" @@ -1717,6 +1767,7 @@ __metadata: languageName: node linkType: hard +<<<<<<< HEAD "@typescript-eslint/parser@npm:^6.14.0": version: 6.14.0 resolution: "@typescript-eslint/parser@npm:6.14.0" @@ -1726,11 +1777,23 @@ __metadata: "@typescript-eslint/typescript-estree": 6.14.0 "@typescript-eslint/visitor-keys": 6.14.0 debug: ^4.3.4 +======= +"@typescript-eslint/parser@npm:^7.5.0": + version: 7.5.0 + resolution: "@typescript-eslint/parser@npm:7.5.0" + dependencies: + "@typescript-eslint/scope-manager": "npm:7.5.0" + "@typescript-eslint/types": "npm:7.5.0" + "@typescript-eslint/typescript-estree": "npm:7.5.0" + "@typescript-eslint/visitor-keys": "npm:7.5.0" + debug: "npm:^4.3.4" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) peerDependencies: - eslint: ^7.0.0 || ^8.0.0 + eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true +<<<<<<< HEAD checksum: 5fbe8d7431654c14ba6c9782d3728026ad5c90e02c9c4319f45df972e653cf5c15ba320dce70cdffa9fb7ce4c4263c37585e7bc1c909d1252d0a599880963063 languageName: node linkType: hard @@ -1777,6 +1840,72 @@ __metadata: "@typescript-eslint/types": 6.14.0 eslint-visitor-keys: ^3.4.1 checksum: fc593c4e94d5739be7bd88e42313a301bc9806fad758b6a0a1bafd296ff41522be602caf4976beec84e363b0f56585bb98df3c157f70de984de721798501fd8a +======= + checksum: 10c0/65521202ff024e79594272fbb7e4731ecf9d2fdd2f58fc81450bfd2bca94ce9c17b0eadd7338c01701f5cf16d38b6c025ed3fc322380b1e4b5424b7484098cda + languageName: node + linkType: hard + +"@typescript-eslint/scope-manager@npm:7.5.0": + version: 7.5.0 + resolution: "@typescript-eslint/scope-manager@npm:7.5.0" + dependencies: + "@typescript-eslint/types": "npm:7.5.0" + "@typescript-eslint/visitor-keys": "npm:7.5.0" + checksum: 10c0/a017b151a6b39ef591f8e2e65598e005e1b4b2d5494e4b91bddb5856b3a4d57dd8a58d2bc7a140e627eb574f93a2c8fe55f1307aa264c928ffd31d9e190bc5dd + languageName: node + linkType: hard + +"@typescript-eslint/types@npm:7.5.0": + version: 7.5.0 + resolution: "@typescript-eslint/types@npm:7.5.0" + checksum: 10c0/f3394f71f422dbd89f63b230f20e9769c12e47a287ff30ca03a80714e57ea21279b6f12a8ab14bafb00b59926f20a88894b2d1e72679f7ff298bae112679d4b3 + languageName: node + linkType: hard + +"@typescript-eslint/typescript-estree@npm:7.5.0": + version: 7.5.0 + resolution: "@typescript-eslint/typescript-estree@npm:7.5.0" + dependencies: + "@typescript-eslint/types": "npm:7.5.0" + "@typescript-eslint/visitor-keys": "npm:7.5.0" + debug: "npm:^4.3.4" + globby: "npm:^11.1.0" + is-glob: "npm:^4.0.3" + minimatch: "npm:9.0.3" + semver: "npm:^7.5.4" + ts-api-utils: "npm:^1.0.1" + peerDependenciesMeta: + typescript: + optional: true + checksum: 10c0/ea3a270c725d6be273188b86110e0393052cd64d1c54a56eb5ea405e6d3fbbe84fb3b1ce1b8496a4078ac1eefd37aedcf12be91876764f6de31d5aa5131c7bcd + languageName: node + linkType: hard + +"@typescript-eslint/utils@npm:^7.5.0": + version: 7.5.0 + resolution: "@typescript-eslint/utils@npm:7.5.0" + dependencies: + "@eslint-community/eslint-utils": "npm:^4.4.0" + "@types/json-schema": "npm:^7.0.12" + "@types/semver": "npm:^7.5.0" + "@typescript-eslint/scope-manager": "npm:7.5.0" + "@typescript-eslint/types": "npm:7.5.0" + "@typescript-eslint/typescript-estree": "npm:7.5.0" + semver: "npm:^7.5.4" + peerDependencies: + eslint: ^8.56.0 + checksum: 10c0/c815ed6909769648953d6963c069038f7cac0c979051b25718feb30e0d3337b9647b75b8de00ac03fe960f0cc8dc4e8a81d4aac4719090a99785e0068712bd24 + languageName: node + linkType: hard + +"@typescript-eslint/visitor-keys@npm:7.5.0": + version: 7.5.0 + resolution: "@typescript-eslint/visitor-keys@npm:7.5.0" + dependencies: + "@typescript-eslint/types": "npm:7.5.0" + eslint-visitor-keys: "npm:^3.4.1" + checksum: 10c0/eecf02b8dd54e83738a143aca87b902af4b357028a90fd34ed7a2f40a3ae2f6a188b9ba53903f23c80e868f1fffbb039e9ddb63525438d659707cc7bfb269317 +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) languageName: node linkType: hard @@ -2581,9 +2710,15 @@ __metadata: languageName: node linkType: hard +<<<<<<< HEAD "axios@npm:^1.6.2": version: 1.6.2 resolution: "axios@npm:1.6.2" +======= +"axios@npm:^1.6.8": + version: 1.6.8 + resolution: "axios@npm:1.6.8" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) dependencies: follow-redirects: ^1.15.0 form-data: ^4.0.0 @@ -3189,10 +3324,17 @@ __metadata: languageName: node linkType: hard +<<<<<<< HEAD "core-js@npm:^3.33.3": version: 3.33.3 resolution: "core-js@npm:3.33.3" checksum: 070b9c696f5a9b22bab0208daf9fcdffbc3b4f4c89ed2be512b7d99d4be363accfbb26fa6eec7261055d89e8ea0a5bcfccad5923fe43f1f2eafca9f568cc5596 +======= +"core-js@npm:^3.36.1": + version: 3.36.1 + resolution: "core-js@npm:3.36.1" + checksum: 10c0/4f0ad2464535d809ba659226feca15bff14b9b5452518bddff8d81b9c94b0227b3027d9838f22f1dce664958acb4107b935cc0037695ae545edc2a303bca98bf +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) languageName: node linkType: hard @@ -3231,9 +3373,15 @@ __metadata: languageName: node linkType: hard +<<<<<<< HEAD "css-loader@npm:^6.8.1": version: 6.8.1 resolution: "css-loader@npm:6.8.1" +======= +"css-loader@npm:^6.10.0": + version: 6.10.0 + resolution: "css-loader@npm:6.10.0" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) dependencies: icss-utils: ^5.1.0 postcss: ^8.4.21 @@ -3345,7 +3493,7 @@ __metadata: languageName: node linkType: hard -"dateformat@npm:^4.6.2": +"dateformat@npm:^4.6.3": version: 4.6.3 resolution: "dateformat@npm:4.6.3" checksum: c3aa0617c0a5b30595122bc8d1bee6276a9221e4d392087b41cbbdf175d9662ae0e50d0d6dcdf45caeac5153c4b5b0844265f8cd2b2245451e3da19e39e3b65d @@ -3520,10 +3668,17 @@ __metadata: languageName: node linkType: hard +<<<<<<< HEAD "dompurify@npm:^2.4.4": version: 2.4.7 resolution: "dompurify@npm:2.4.7" checksum: 13c047e772a1998348191554dda403950d45ef2ec75fa0b9915cc179ccea0a39ef780d283109bd72cf83a2a085af6c77664281d4d0106a737bc5f39906364efe +======= +"dompurify@npm:^2.4.9": + version: 2.4.9 + resolution: "dompurify@npm:2.4.9" + checksum: 10c0/cb847f5eacd9ff326dfc4566875709d050dc78c58837cc3afb83386992f6e7002295358cb9f75d66a9b638fe6da71b7d02ffa82f121713f78f7f3891394dece8 +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) languageName: node linkType: hard @@ -3840,9 +3995,15 @@ __metadata: languageName: node linkType: hard +<<<<<<< HEAD "esbuild-loader@npm:^4.0.2": version: 4.0.2 resolution: "esbuild-loader@npm:4.0.2" +======= +"esbuild-loader@npm:^4.1.0": + version: 4.1.0 + resolution: "esbuild-loader@npm:4.1.0" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) dependencies: esbuild: ^0.19.0 get-tsconfig: ^4.7.0 @@ -3995,9 +4156,15 @@ __metadata: languageName: node linkType: hard +<<<<<<< HEAD "eslint-plugin-react@npm:^7.33.2": version: 7.33.2 resolution: "eslint-plugin-react@npm:7.33.2" +======= +"eslint-plugin-react@npm:^7.34.1": + version: 7.34.1 + resolution: "eslint-plugin-react@npm:7.34.1" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) dependencies: array-includes: ^3.1.6 array.prototype.flatmap: ^1.3.1 @@ -4021,20 +4188,25 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-simple-import-sort@npm:^10.0.0": - version: 10.0.0 - resolution: "eslint-plugin-simple-import-sort@npm:10.0.0" +"eslint-plugin-simple-import-sort@npm:^12.0.0": + version: 12.0.0 + resolution: "eslint-plugin-simple-import-sort@npm:12.0.0" peerDependencies: eslint: ">=5.0.0" +<<<<<<< HEAD checksum: 23221ff63f80f9c52da807d388ee8a51bc36a3b73345f60ec886e7973c28d75eb1d1e47f7f2916a7c1f94a1b5037b1450356a64a8fbd58096fd6bee57c6e3e48 +======= + checksum: 10c0/5405f01e4ca5b3c9a2a1b019e39fa858bb081872eb9602fb85d2e4913356fec0a9b3f997e957b1df0c370908ec124114148491e442d57e911b8249728d474398 +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) languageName: node linkType: hard -"eslint-plugin-sonarjs@npm:^0.23.0": - version: 0.23.0 - resolution: "eslint-plugin-sonarjs@npm:0.23.0" +"eslint-plugin-sonarjs@npm:^0.25.0": + version: 0.25.0 + resolution: "eslint-plugin-sonarjs@npm:0.25.0" peerDependencies: eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 +<<<<<<< HEAD checksum: 4f56557740ab438eee8d98e4d93363a8dadcf8d6d795a5d95e6a0b0d6335273a06c5633fe753271c6a56c14a3b0086014b8278984b5594fad5db274ec7fd7edf languageName: node linkType: hard @@ -4042,6 +4214,15 @@ __metadata: "eslint-plugin-unused-imports@npm:^3.0.0": version: 3.0.0 resolution: "eslint-plugin-unused-imports@npm:3.0.0" +======= + checksum: 10c0/5fc9264f7fda28a2f58b4dcd928d86a9981eca80242e275f11bcd8d8fcecd11da3ee6d709f46e8c4aa644340f939bce46ae0501ff20e2301920d38152935907a + languageName: node + linkType: hard + +"eslint-plugin-unused-imports@npm:^3.1.0": + version: 3.1.0 + resolution: "eslint-plugin-unused-imports@npm:3.1.0" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) dependencies: eslint-rule-composer: ^0.3.0 peerDependencies: @@ -4088,9 +4269,15 @@ __metadata: languageName: node linkType: hard +<<<<<<< HEAD "eslint@npm:^8.56.0": version: 8.56.0 resolution: "eslint@npm:8.56.0" +======= +"eslint@npm:^8.57.0": + version: 8.57.0 + resolution: "eslint@npm:8.57.0" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) dependencies: "@eslint-community/eslint-utils": ^4.2.0 "@eslint-community/regexpp": ^4.6.1 @@ -4300,9 +4487,15 @@ __metadata: languageName: node linkType: hard +<<<<<<< HEAD "fantasticon@npm:^1.2.2": version: 1.2.2 resolution: "fantasticon@npm:1.2.2" +======= +"fantasticon@npm:^1.2.3": + version: 1.2.3 + resolution: "fantasticon@npm:1.2.3" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) dependencies: change-case: ^4.1.2 cli-color: ^2.0.0 @@ -4808,7 +5001,11 @@ __metadata: languageName: node linkType: hard +<<<<<<< HEAD "glob@npm:^7.2.0": +======= +"glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0, glob@npm:^7.2.3": +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) version: 7.2.3 resolution: "glob@npm:7.2.3" dependencies: @@ -6709,7 +6906,7 @@ __metadata: languageName: node linkType: hard -"marked@npm:^4.2.12": +"marked@npm:^4.3.0": version: 4.3.0 resolution: "marked@npm:4.3.0" bin: @@ -6797,9 +6994,15 @@ __metadata: languageName: node linkType: hard +<<<<<<< HEAD "mini-css-extract-plugin@npm:^2.7.6": version: 2.7.6 resolution: "mini-css-extract-plugin@npm:2.7.6" +======= +"mini-css-extract-plugin@npm:^2.8.1": + version: 2.8.1 + resolution: "mini-css-extract-plugin@npm:2.8.1" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) dependencies: schema-utils: ^4.0.0 peerDependencies: @@ -7574,9 +7777,15 @@ __metadata: languageName: node linkType: hard +<<<<<<< HEAD "prettier@npm:^3.1.0": version: 3.1.0 resolution: "prettier@npm:3.1.0" +======= +"prettier@npm:^3.2.5": + version: 3.2.5 + resolution: "prettier@npm:3.2.5" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) bin: prettier: bin/prettier.cjs checksum: 44b556bd56f74d7410974fbb2418bb4e53a894d3e7b42f6f87779f69f27a6c272fa7fc27cec0118cd11730ef3246478052e002cbd87e9a253f9cd04a56aa7d9b @@ -7865,10 +8074,17 @@ __metadata: languageName: node linkType: hard +<<<<<<< HEAD "regenerator-runtime@npm:^0.14.0": version: 0.14.0 resolution: "regenerator-runtime@npm:0.14.0" checksum: 1c977ad82a82a4412e4f639d65d22be376d3ebdd30da2c003eeafdaaacd03fc00c2320f18120007ee700900979284fc78a9f00da7fb593f6e6eeebc673fba9a3 +======= +"regenerator-runtime@npm:^0.14.1": + version: 0.14.1 + resolution: "regenerator-runtime@npm:0.14.1" + checksum: 10c0/1b16eb2c4bceb1665c89de70dcb64126a22bc8eb958feef3cd68fe11ac6d2a4899b5cd1b80b0774c7c03591dc57d16631a7f69d2daa2ec98100e2f29f7ec4cc4 +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) languageName: node linkType: hard @@ -8123,19 +8339,25 @@ resolve@^1.20.0: languageName: node linkType: hard +<<<<<<< HEAD "sass-loader@npm:^13.3.2": version: 13.3.2 resolution: "sass-loader@npm:13.3.2" +======= +"sass-loader@npm:^14.1.1": + version: 14.1.1 + resolution: "sass-loader@npm:14.1.1" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) dependencies: neo-async: ^2.6.2 peerDependencies: - fibers: ">= 3.1.0" + "@rspack/core": 0.x || 1.x node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 sass: ^1.3.0 sass-embedded: "*" webpack: ^5.0.0 peerDependenciesMeta: - fibers: + "@rspack/core": optional: true node-sass: optional: true @@ -8143,6 +8365,7 @@ resolve@^1.20.0: optional: true sass-embedded: optional: true +<<<<<<< HEAD checksum: 7394a8d1b818a289b9caabd979543c907b83e28ae08bc80ccb836e0ccabc4ae574c077ab2fa520ba5fb8abb2ec3e7c9822a1cbd8c58a28ff30018be9d1dc6c27 languageName: node linkType: hard @@ -8150,6 +8373,17 @@ resolve@^1.20.0: "sass@npm:^1.69.5": version: 1.69.5 resolution: "sass@npm:1.69.5" +======= + webpack: + optional: true + checksum: 10c0/303ae65c38019723c1d534d6c70ba051b2744ea52c9e07c1c761303962540e8f3147bd73ff0ce2767c7435bc76f544f5cbc5db03617689f30ec9ffb26494289d + languageName: node + linkType: hard + +"sass@npm:^1.72.0": + version: 1.72.0 + resolution: "sass@npm:1.72.0" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) dependencies: chokidar: ">=3.0.0 <4.0.0" immutable: ^4.0.0 @@ -8819,9 +9053,15 @@ resolve@^1.20.0: languageName: node linkType: hard +<<<<<<< HEAD "style-loader@npm:^3.3.3": version: 3.3.3 resolution: "style-loader@npm:3.3.3" +======= +"style-loader@npm:^3.3.4": + version: 3.3.4 + resolution: "style-loader@npm:3.3.4" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) peerDependencies: webpack: ^5.0.0 checksum: f59c953f56f6a935bd6a1dfa409f1128fed2b66b48ce4a7a75b85862a7156e5e90ab163878962762f528ec4d510903d828da645e143fbffd26f055dc1c094078 @@ -8912,9 +9152,17 @@ resolve@^1.20.0: languageName: node linkType: hard +<<<<<<< HEAD "swc-loader@npm:^0.2.3": version: 0.2.3 resolution: "swc-loader@npm:0.2.3" +======= +"swc-loader@npm:^0.2.6": + version: 0.2.6 + resolution: "swc-loader@npm:0.2.6" + dependencies: + "@swc/counter": "npm:^0.1.3" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) peerDependencies: "@swc/core": ^1.2.147 webpack: ">=2" @@ -8988,9 +9236,15 @@ resolve@^1.20.0: languageName: node linkType: hard +<<<<<<< HEAD "terser@npm:^5.16.8, terser@npm:^5.24.0": version: 5.24.0 resolution: "terser@npm:5.24.0" +======= +"terser@npm:^5.26.0, terser@npm:^5.30.2": + version: 5.30.2 + resolution: "terser@npm:5.30.2" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) dependencies: "@jridgewell/source-map": ^0.3.3 acorn: ^8.8.2 @@ -9038,7 +9292,11 @@ resolve@^1.20.0: version: 0.0.0-use.local resolution: "tgfont@workspace:packages/tgfont" dependencies: +<<<<<<< HEAD fantasticon: ^1.2.2 +======= + fantasticon: "npm:^1.2.3" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) languageName: unknown linkType: soft @@ -9060,11 +9318,19 @@ resolve@^1.20.0: version: 0.0.0-use.local resolution: "tgui-dev-server@workspace:packages/tgui-dev-server" dependencies: +<<<<<<< HEAD axios: ^1.6.2 glob: ^7.2.0 source-map: ^0.7.4 stacktrace-parser: ^0.1.10 ws: ^8.14.2 +======= + axios: "npm:^1.6.8" + glob: "npm:^7.2.3" + source-map: "npm:^0.7.4" + stacktrace-parser: "npm:^0.1.10" + ws: "npm:^8.16.0" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) languageName: unknown linkType: soft @@ -9072,12 +9338,21 @@ resolve@^1.20.0: version: 0.0.0-use.local resolution: "tgui-panel@workspace:packages/tgui-panel" dependencies: +<<<<<<< HEAD "@types/node": ^14.x "@types/react": ^18.2.42 common: "workspace:*" dompurify: ^2.4.4 react: ^18.2.0 react-dom: ^18.2.0 +======= + "@types/node": "npm:^20.12.3" + "@types/react": "npm:^18.2.74" + common: "workspace:*" + dompurify: "npm:^2.4.9" + react: "npm:^18.2.0" + react-dom: "npm:^18.2.0" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) tgui: "workspace:*" tgui-dev-server: "workspace:*" tgui-polyfill: "workspace:*" @@ -9088,10 +9363,17 @@ resolve@^1.20.0: version: 0.0.0-use.local resolution: "tgui-polyfill@workspace:packages/tgui-polyfill" dependencies: +<<<<<<< HEAD core-js: ^3.33.3 regenerator-runtime: ^0.14.0 terser: ^5.24.0 unfetch: ^5.0.0 +======= + core-js: "npm:^3.36.1" + regenerator-runtime: "npm:^0.14.1" + terser: "npm:^5.30.2" + unfetch: "npm:^5.0.0" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) languageName: unknown linkType: soft @@ -9099,7 +9381,11 @@ resolve@^1.20.0: version: 0.0.0-use.local resolution: "tgui-say@workspace:packages/tgui-say" dependencies: +<<<<<<< HEAD "@types/react": ^18.2.39 +======= + "@types/react": "npm:^18.2.74" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) common: "workspace:*" react: ^18.2.0 tgui: "workspace:*" @@ -9111,6 +9397,7 @@ resolve@^1.20.0: version: 0.0.0-use.local resolution: "tgui-workspace@workspace:." dependencies: +<<<<<<< HEAD "@swc/core": ^1.3.100 "@swc/jest": ^0.2.29 "@types/jest": ^29.5.10 @@ -9143,6 +9430,39 @@ resolve@^1.20.0: webpack: ^5.89.0 webpack-bundle-analyzer: ^4.10.1 webpack-cli: ^5.1.4 +======= + "@swc/core": "npm:^1.4.11" + "@swc/jest": "npm:^0.2.36" + "@types/jest": "npm:^29.5.12" + "@types/node": "npm:^20.12.3" + "@types/webpack-env": "npm:^1.18.4" + "@typescript-eslint/parser": "npm:^7.5.0" + "@typescript-eslint/utils": "npm:^7.5.0" + css-loader: "npm:^6.10.0" + esbuild-loader: "npm:^4.1.0" + eslint: "npm:^8.57.0" + eslint-config-prettier: "npm:^9.1.0" + eslint-plugin-react: "npm:^7.34.1" + eslint-plugin-simple-import-sort: "npm:^12.0.0" + eslint-plugin-sonarjs: "npm:^0.25.0" + eslint-plugin-unused-imports: "npm:^3.1.0" + file-loader: "npm:^6.2.0" + jest: "npm:^29.7.0" + jest-circus: "npm:^29.7.0" + jest-environment-jsdom: "npm:^29.7.0" + jsdom: "npm:^22.1.0" + mini-css-extract-plugin: "npm:^2.8.1" + prettier: "npm:^3.2.5" + sass: "npm:^1.72.0" + sass-loader: "npm:^14.1.1" + style-loader: "npm:^3.3.4" + swc-loader: "npm:^0.2.6" + typescript: "npm:^5.4.3" + url-loader: "npm:^4.1.1" + webpack: "npm:^5.91.0" + webpack-bundle-analyzer: "npm:^4.10.1" + webpack-cli: "npm:^5.1.4" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) languageName: unknown linkType: soft @@ -9150,6 +9470,7 @@ resolve@^1.20.0: version: 0.0.0-use.local resolution: "tgui@workspace:packages/tgui" dependencies: +<<<<<<< HEAD "@popperjs/core": ^2.11.8 "@types/marked": ^4.0.8 "@types/react": ^18.2.39 @@ -9163,6 +9484,21 @@ resolve@^1.20.0: react: ^18.2.0 react-dom: ^18.2.0 react-popper: ^2.3.0 +======= + "@popperjs/core": "npm:^2.11.8" + "@types/marked": "npm:4.3.2" + "@types/react": "npm:^18.2.74" + common: "workspace:*" + dateformat: "npm:^4.6.3" + dompurify: "npm:^2.4.9" + highlight.js: "npm:^11.9.0" + jest: "npm:^29.7.0" + js-yaml: "npm:^4.1.0" + marked: "npm:^4.3.0" + react: "npm:^18.2.0" + react-dom: "npm:^18.2.0" + react-popper: "npm:^2.3.0" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) tgui-dev-server: "workspace:*" tgui-polyfill: "workspace:*" languageName: unknown @@ -9445,6 +9781,7 @@ resolve@^1.20.0: languageName: node linkType: hard +<<<<<<< HEAD "typescript@npm:^4.9.4": version: 4.9.4 resolution: "typescript@npm:4.9.4" @@ -9462,6 +9799,25 @@ resolve@^1.20.0: tsc: bin/tsc tsserver: bin/tsserver checksum: 1caaea6cb7f813e64345190fddc4e6c924d0b698ab81189b503763c4a18f7f5501c69362979d36e19c042d89d936443e768a78b0675690b35eb663d19e0eae71 +======= +"typescript@npm:^5.4.3": + version: 5.4.3 + resolution: "typescript@npm:5.4.3" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 10c0/22443a8760c3668e256c0b34b6b45c359ef6cecc10c42558806177a7d500ab1a7d7aac1f976d712e26989ddf6731d2fbdd3212b7c73290a45127c1c43ba2005a + languageName: node + linkType: hard + +"typescript@patch:typescript@npm%3A^5.4.3#optional!builtin": + version: 5.4.3 + resolution: "typescript@patch:typescript@npm%3A5.4.3#optional!builtin::version=5.4.3&hash=5adc0c" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 10c0/6e51f8b7e6ec55b897b9e56b67e864fe8f44e30f4a14357aad5dc0f7432db2f01efc0522df0b6c36d361c51f2dc3dcac5c832efd96a404cfabf884e915d38828 +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) languageName: node linkType: hard @@ -9781,9 +10137,15 @@ resolve@^1.20.0: languageName: node linkType: hard +<<<<<<< HEAD "webpack@npm:^5": version: 5.75.0 resolution: "webpack@npm:5.75.0" +======= +"webpack@npm:^5.91.0": + version: 5.91.0 + resolution: "webpack@npm:5.91.0" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) dependencies: "@types/eslint-scope": ^3.7.3 "@types/estree": ^0.0.51 @@ -10026,9 +10388,15 @@ resolve@^1.20.0: languageName: node linkType: hard +<<<<<<< HEAD "ws@npm:^8.11.0, ws@npm:^8.13.0, ws@npm:^8.14.2": version: 8.14.2 resolution: "ws@npm:8.14.2" +======= +"ws@npm:^8.11.0, ws@npm:^8.13.0, ws@npm:^8.16.0": + version: 8.16.0 + resolution: "ws@npm:8.16.0" +>>>>>>> 78a6f5d39e5 ([MIRROR] TGUI: updated dependencies (#1787)) peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ">=5.0.2"