Merge branch 'master' of https://github.com/VOREStation/VOREStation into tgui-update

_build_dependencies.sh

@@ -2,7 +2,7 @@
 # For dreamchecker
 export SPACEMAN_DMM_VERSION=suite-1.7
 # For NanoUI + TGUI
-export NODE_VERSION=12
+export NODE_VERSION=16
 # Byond Major
 export BYOND_MAJOR=514
 # Byond Minor

tgui/.eslintrc.yml

@@ -12,6 +12,7 @@ env:
 plugins:
   - radar
   - react
+  ## - unused-imports
 settings:
   react:
     version: '16.10'
@@ -756,3 +757,6 @@ rules:
   react/jsx-uses-vars: error
   ## Prevent missing parentheses around multilines JSX (fixable)
   react/jsx-wrap-multilines: error
+  ## Prevents the use of unused imports.
+  ## This could be done by enabling no-unused-vars, but we're doing this for now
+  ## unused-imports/no-unused-imports: error

tgui/.yarnrc.yml

@@ -10,8 +10,10 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
 
+pnpEnableEsmLoader: false
+
 preferAggregateCacheInfo: true
 
 preferInteractive: true
 
-yarnPath: .yarn/releases/yarn-2.4.1.cjs
+yarnPath: .yarn/releases/yarn-3.2.1.cjs

tgui/README.md

@@ -37,7 +37,8 @@ to translate concepts between old and new tgui, read this
 
 You will need these programs to start developing in tgui:
 
-- [Node v12.18.3+](https://nodejs.org/en/download/)
+- [Node v16.13+](https://nodejs.org/en/download/)
+  - **LTS** release is recommended instead of latest
 - [Yarn v1.22.4+](https://yarnpkg.com/getting-started/install) (optional)
 - [Git Bash](https://git-scm.com/downloads)
   or [MSys2](https://www.msys2.org/) (optional)

tgui/package.json

@@ -1,44 +1,46 @@
 {
   "private": true,
   "name": "tgui-workspace",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "workspaces": [
     "packages/*"
   ],
   "dependencies": {
-    "@babel/core": "^7.13.15",
-    "@babel/eslint-parser": "^7.13.14",
-    "@babel/plugin-proposal-class-properties": "^7.13.0",
-    "@babel/plugin-transform-jscript": "^7.12.13",
-    "@babel/preset-env": "^7.13.15",
-    "@babel/preset-typescript": "^7.13.0",
-    "@types/jest": "^26.0.22",
-    "@types/jsdom": "^16.2.10",
-    "@types/node": "^14.14.41",
-    "@typescript-eslint/parser": "^4.22.0",
-    "babel-jest": "^26.6.3",
-    "babel-loader": "^8.2.2",
-    "babel-plugin-inferno": "^6.2.0",
+    "@babel/core": "^7.18.0",
+    "@babel/eslint-parser": "^7.17.0",
+    "@babel/plugin-proposal-class-properties": "^7.17.12",
+    "@babel/plugin-transform-jscript": "^7.17.12",
+    "@babel/preset-env": "^7.18.0",
+    "@babel/preset-typescript": "^7.17.12",
+    "@types/jest": "^27.5.1",
+    "@types/jsdom": "^16.2.14",
+    "@types/node": "^17.0.35",
+    "@typescript-eslint/parser": "^5.25.0",
+    "babel-jest": "^28.1.0",
+    "babel-loader": "^8.2.5",
+    "babel-plugin-inferno": "^6.4.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "common": "workspace:*",
-    "css-loader": "^5.2.2",
-    "eslint": "^7.24.0",
+    "css-loader": "^6.7.1",
+    "eslint": "^8.16.0",
     "eslint-plugin-radar": "^0.2.1",
-    "eslint-plugin-react": "^7.23.2",
+    "eslint-plugin-react": "^7.30.0",
+    "eslint-plugin-unused-imports": "^2.0.0",
     "file-loader": "^6.2.0",
-    "inferno": "^7.4.8",
-    "jest": "^26.6.3",
-    "jest-circus": "^26.6.3",
-    "jsdom": "^16.5.3",
-    "mini-css-extract-plugin": "^1.4.1",
-    "sass": "^1.32.8",
-    "sass-loader": "^11.0.1",
-    "style-loader": "^2.0.0",
-    "terser-webpack-plugin": "^5.1.1",
-    "typescript": "^4.2.4",
+    "inferno": "^7.4.11",
+    "jest": "^28.1.0",
+    "jest-circus": "^28.1.0",
+    "jest-environment-jsdom": "^28.1.0",
+    "jsdom": "^19.0.0",
+    "mini-css-extract-plugin": "^2.6.0",
+    "sass": "^1.52.1",
+    "sass-loader": "^13.0.0",
+    "style-loader": "^3.3.1",
+    "terser-webpack-plugin": "^5.3.1",
+    "typescript": "^4.6.4",
     "url-loader": "^4.1.1",
-    "webpack": "^5.33.2",
-    "webpack-bundle-analyzer": "^4.4.1",
-    "webpack-cli": "^4.6.0"
+    "webpack": "^5.72.1",
+    "webpack-bundle-analyzer": "^4.5.0",
+    "webpack-cli": "^4.9.2"
   }
 }

tgui/packages/tgfont/package.json

@@ -3,7 +3,7 @@
   "name": "tgfont",
   "version": "1.0.0",
   "dependencies": {
-    "fantasticon": "^1.1.3"
+    "fantasticon": "^1.2.3"
   },
   "scripts": {
     "build": "node mkdist.cjs && fantasticon --config config.cjs"

tgui/packages/tgui-dev-server/package.json

@@ -3,12 +3,12 @@
   "name": "tgui-dev-server",
   "version": "4.3.0",
   "dependencies": {
-    "axios": "^0.21.2",
+    "axios": "^0.27.2",
     "common": "workspace:*",
     "esm": "^3.2.25",
-    "glob": "^7.1.6",
+    "glob": "^8.0.3",
     "source-map": "^0.7.3",
     "stacktrace-parser": "^0.1.10",
-    "ws": "^7.4.4"
+    "ws": "^8.6.0"
   }
 }

tgui/packages/tgui-panel/package.json

@@ -4,8 +4,8 @@
   "version": "4.3.0",
   "dependencies": {
     "common": "workspace:*",
-    "dompurify": "^2.2.7",
-    "inferno": "^7.4.8",
+    "dompurify": "^2.3.8",
+    "inferno": "^7.4.11",
     "tgui": "workspace:*",
     "tgui-dev-server": "workspace:*",
     "tgui-polyfill": "workspace:*"

tgui/packages/tgui-panel/styles/components/Chat.scss

@@ -4,6 +4,7 @@
  */
 
 @use 'sass:color';
+@use "sass:math";
 @use '~tgui/styles/base.scss';
 @use '~tgui/styles/colors.scss';
 
@@ -62,7 +63,7 @@ $color-bg-section: base.$color-bg-section !default;
     content: '';
     display: block;
     margin-top: -0.75em;
-    border-bottom: (1em / 6) solid colors.$red;
+    border-bottom: (math.div(1em, 6)) solid colors.$red;
   }
 }
 
@@ -82,7 +83,7 @@ $color-bg-section: base.$color-bg-section !default;
 
 .ChatMessage--highlighted {
   position: relative;
-  border-left: (1em / 6) solid rgba(255, 221, 68);
+  border-left: (math.div(1em, 6)) solid rgba(255, 221, 68);
   padding-left: 0.5em;
 
   &:after {

tgui/packages/tgui-panel/styles/components/Ping.scss

@@ -3,12 +3,14 @@
  * SPDX-License-Identifier: MIT
  */
 
+@use "sass:math";
+
 $border-color: rgba(140, 140, 140, 0.5) !default;
 
 .Ping {
   position: relative;
   padding: 0.125em 0.25em;
-  border: (1em / 12) solid $border-color;
+  border: (math.div(1em, 12)) solid $border-color;
   border-radius: 0.25em;
   width: 3.75em;
   text-align: right;

tgui/packages/tgui-panel/styles/main.scss

@@ -4,6 +4,7 @@
  */
 
 @use 'sass:meta';
+@use "sass:math";
 @use 'sass:color';
 
 @use '~tgui/styles/colors.scss';

tgui/packages/tgui-polyfill/package.json

@@ -3,8 +3,8 @@
   "name": "tgui-polyfill",
   "version": "4.3.0",
   "dependencies": {
-    "core-js": "^3.10.1",
-    "regenerator-runtime": "^0.13.8",
+    "core-js": "^3.22.5",
+    "regenerator-runtime": "^0.13.9",
     "unfetch": "^4.2.0"
   }
 }

tgui/packages/tgui/package.json

@@ -3,14 +3,14 @@
   "name": "tgui",
   "version": "4.3.0",
   "dependencies": {
-    "@popperjs/core": "^2.9.1",
+    "@popperjs/core": "^2.11.5",
     "common": "workspace:*",
-    "dateformat": "^4.5.1",
-    "dompurify": "^2.2.7",
-    "inferno": "^7.4.8",
-    "inferno-vnode-flags": "^7.4.8",
+    "dateformat": "^5.0.3",
+    "dompurify": "^2.3.8",
+    "inferno": "^7.4.11",
+    "inferno-vnode-flags": "^7.4.11",
     "js-yaml": "^4.1.0",
-    "marked": "^4.0.10",
+    "marked": "^4.0.16",
     "tgui-dev-server": "workspace:*",
     "tgui-polyfill": "workspace:*"
   }

tgui/packages/tgui/styles/base.scss

@@ -4,6 +4,7 @@
  */
 
 @use 'sass:color';
+@use "sass:math";
 
 $color-fg: #ffffff !default;
 $color-bg: #252525 !default;
@@ -19,9 +20,9 @@ $font-size: 1 * $unit !default;
 $border-radius: 0.16em !default;
 
 @function em($px) {
-  @return 1em * ($px / $unit);
+  @return 1em * math.div($px, $unit);
 }
 
 @function rem($px) {
-  @return 1rem * ($px / $unit);
+  @return 1rem * math.div($px, $unit);
 }

tgui/packages/tgui/styles/components/Tabs.scss

@@ -4,6 +4,7 @@
  */
 
 @use 'sass:color';
+@use "sass:math";
 @use '../base.scss';
 @use '../colors.scss';
 
@@ -102,28 +103,28 @@ $fg-map: colors.$fg-map !default;
 
 .Tabs--horizontal {
   .Tab {
-    border-top: (1em / 6) solid transparent;
-    border-bottom: (1em / 6) solid transparent;
+    border-top: (math.div(1em, 6)) solid transparent;
+    border-bottom: (math.div(1em, 6)) solid transparent;
     border-top-left-radius: 0.25em;
     border-top-right-radius: 0.25em;
   }
 
   .Tab--selected {
-    border-bottom: (1em / 6) solid $color-default;
+    border-bottom: (math.div(1em, 6)) solid $color-default;
   }
 }
 
 .Tabs--vertical {
   .Tab {
     min-height: 2em;
-    border-left: (1em / 6) solid transparent;
-    border-right: (1em / 6) solid transparent;
+    border-left: (math.div(1em, 6)) solid transparent;
+    border-right: (math.div(1em, 6)) solid transparent;
     border-top-left-radius: 0.25em;
     border-bottom-left-radius: 0.25em;
   }
 
   .Tab--selected {
-    border-right: (1em / 6) solid $color-default;
+    border-right: (math.div(1em, 6)) solid $color-default;
   }
 }
 

tgui/packages/tgui/styles/functions.scss

@@ -18,9 +18,9 @@
     @return null;
   }
   @if math.unit($value) == '%' {
-    @return $value / 100%;
+    @return math.div($value, 100%);
   }
-  @return $value / ($value * 0 + 1);
+  @return math.div($value, ($value * 0 + 1));
 }
 
 
@@ -48,12 +48,12 @@
 
   @each $name, $value in $colors {
     $adjusted: 0;
-    $value: $value / 255;
+    $value: math.div($value, 255);
     @if $value < 0.03928 {
-      $value: $value / 12.92;
+      $value: math.div($value, 12.92);
     }
     @else {
-      $value: ($value + .055) / 1.055;
+      $value: math.div(($value + .055), 1.055);
       $value: math.pow($value, 2.4);
     }
     $colors: map.merge($colors, ($name: $value));

vorestation.dme

@@ -4122,7 +4122,6 @@
 #include "maps\expedition_vr\beach\submaps\mountains.dm"
 #include "maps\expedition_vr\beach\submaps\mountains_areas.dm"
 #include "maps\gateway_archive_vr\blackmarketpackers.dm"
-#include "maps\groundbase\groundbase.dm"
 #include "maps\offmap_vr\om_ships\abductor.dm"
 #include "maps\southern_cross\items\clothing\sc_accessory.dm"
 #include "maps\southern_cross\items\clothing\sc_suit.dm"
@@ -4139,5 +4138,6 @@
 #include "maps\submaps\space_submaps\debrisfield\debrisfield.dm"
 #include "maps\submaps\surface_submaps\wilderness\wilderness.dm"
 #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm"
+#include "maps\tether\tether.dm"
 #include "maps\~map_system\maps.dm"
 // END_INCLUDE