[MIRROR] TGUI: updated dependencies (#1787)

* TGUI: updated dependencies * Fixing conflicts, lock file --------- Co-authored-by: Jeremiah <[email protected]> Co-authored-by: Mal <[email protected]>
Fluffy-Frontier · Apr 3, 2024 · b34aee5 · b34aee5
1 parent bcce212
commit b34aee5
Show file tree

Hide file tree

Showing 17 changed files with 501 additions and 91 deletions.
diff --git a/tgui/.yarn/sdks/eslint/lib/unsupported-api.js 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
@@ -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
@@ -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
@@ -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
@@ -1,8 +1,13 @@
 {
   "private": true,
   "name": "tgui-workspace",
+<<<<<<< HEAD
   "version": "5.0.0",
   "packageManager": "[email protected]",
+=======
+  "version": "5.0.1",
+  "packageManager": "[email protected]",
+>>>>>>> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 (
     <Window width={350} height={350}>
       <Window.Content>
@@ -44,9 +45,10 @@ export const SmokeMachine = (props) => {
             <Button
               icon={active ? 'power-off' : 'times'}
               selected={active}
-              content={active ? 'On' : 'Off'}
               onClick={() => act('power')}
-            />
+            >
+              {active ? 'On' : 'Off'}
+            </Button>
           }
         >
           <ProgressBar
@@ -63,13 +65,14 @@ export const SmokeMachine = (props) => {
               <LabeledList.Item label="Range">
                 {[1, 2, 3, 4, 5].map((amount) => (
                   <Button
-                    key={amount}
-                    selected={setting === amount}
-                    icon="plus"
-                    content={amount * 3}
                     disabled={maxSetting < amount}
+                    icon="plus"
+                    key={amount}
                     onClick={() => act('setting', { amount })}
-                  />
+                    selected={setting === amount}
+                  >
+                    {amount * 3}
+                  </Button>
                 ))}
               </LabeledList.Item>
             </LabeledList>
@@ -78,7 +81,9 @@ export const SmokeMachine = (props) => {
         <Section
           title="Contents"
           buttons={
-            <Button icon="trash" content="Purge" onClick={() => act('purge')} />
+            <Button icon="trash" onClick={() => act('purge')}>
+              Purge
+            </Button>
           }
         >
           {tankContents.map((chemical) => (

diff --git 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
@@ -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
@@ -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"
+  ]
 }