From 5a4a3771da84b8cfcecebea86119e28afc5701dd Mon Sep 17 00:00:00 2001 From: Aleksej Komarov Date: Sat, 29 Feb 2020 09:20:38 +0200 Subject: [PATCH] tgui: Update dependencies (#49496) * Update tgui dependencies * Handle the missing stack trace in case of IE8 * Remove the now useless pow polyfill for sass * Inferno fixed some interesting bug --- tgui/packages/tgui-dev-server/link/server.js | 9 +- tgui/packages/tgui/interfaces/Bepis.js | 4 +- tgui/packages/tgui/interfaces/Canvas.js | 2 +- .../tgui/interfaces/GravityGenerator.js | 2 +- tgui/packages/tgui/interfaces/HypnoChair.js | 2 +- tgui/packages/tgui/interfaces/LanguageMenu.js | 2 +- tgui/packages/tgui/interfaces/Launchpad.js | 2 +- tgui/packages/tgui/interfaces/MiningVendor.js | 8 +- tgui/packages/tgui/interfaces/NaniteRemote.js | 10 +- .../tgui/interfaces/NtosAiRestorer.js | 2 +- tgui/packages/tgui/interfaces/NtosCard.js | 2 - .../tgui/interfaces/NtosConfiguration.js | 2 +- .../tgui/interfaces/NtosCrewManifest.js | 2 +- .../tgui/interfaces/OperatingComputer.js | 2 +- tgui/packages/tgui/interfaces/Roulette.js | 8 +- .../packages/tgui/interfaces/TransferValve.js | 6 +- tgui/packages/tgui/interfaces/Vending.js | 8 +- tgui/packages/tgui/public/tgui.bundle.js | 4 +- tgui/packages/tgui/styles/functions.scss | 35 +- tgui/packages/tgui/webpack.config.js | 16 +- tgui/yarn.lock | 2174 ++++++++--------- 21 files changed, 1114 insertions(+), 1188 deletions(-) diff --git a/tgui/packages/tgui-dev-server/link/server.js b/tgui/packages/tgui-dev-server/link/server.js index 4d0e22d3413..652d403973f 100644 --- a/tgui/packages/tgui-dev-server/link/server.js +++ b/tgui/packages/tgui-dev-server/link/server.js @@ -29,10 +29,13 @@ export const broadcastMessage = (link, msg) => { } }; -const deserializeObject = obj => { - return JSON.parse(obj, (key, value) => { +const deserializeObject = str => { + return JSON.parse(str, (key, value) => { if (typeof value === 'object' && value !== null) { if (value.__error__) { + if (!value.stack) { + return value.string; + } return retrace(value.stack); } if (value.__number__) { @@ -102,7 +105,7 @@ const setupHttpLink = () => { body += chunk.toString(); }); req.on('end', () => { - const msg = JSON.parse(body); + const msg = deserializeObject(body); handleLinkMessage(msg); res.end(); }); diff --git a/tgui/packages/tgui/interfaces/Bepis.js b/tgui/packages/tgui/interfaces/Bepis.js index bc47d59ca77..71ba5c8cb64 100644 --- a/tgui/packages/tgui/interfaces/Bepis.js +++ b/tgui/packages/tgui/interfaces/Bepis.js @@ -87,10 +87,10 @@ export const Bepis = props => {
- Average technology cost: {data.mean_value} + Average technology cost: {data.mean_value} - Current chance of Success: Est. {data.success_estimate}% + Current chance of Success: Est. {data.success_estimate}% {data.error_name && ( diff --git a/tgui/packages/tgui/interfaces/Canvas.js b/tgui/packages/tgui/interfaces/Canvas.js index b30639697c2..9571d94e225 100644 --- a/tgui/packages/tgui/interfaces/Canvas.js +++ b/tgui/packages/tgui/interfaces/Canvas.js @@ -73,7 +73,7 @@ class PaintCanvas extends Component { height={y_size || 300} {...rest} onClick={e => this.clickwrapper(e)}> - Canvas failed to render. + Canvas failed to render. ); } diff --git a/tgui/packages/tgui/interfaces/GravityGenerator.js b/tgui/packages/tgui/interfaces/GravityGenerator.js index 9fbf263a381..080ac327e19 100644 --- a/tgui/packages/tgui/interfaces/GravityGenerator.js +++ b/tgui/packages/tgui/interfaces/GravityGenerator.js @@ -55,7 +55,7 @@ export const GravityGenerator = props => { )} {charging_state === 2 && ( - Discharging + Discharging )} diff --git a/tgui/packages/tgui/interfaces/HypnoChair.js b/tgui/packages/tgui/interfaces/HypnoChair.js index 00ef2e819dc..6348ca272e0 100644 --- a/tgui/packages/tgui/interfaces/HypnoChair.js +++ b/tgui/packages/tgui/interfaces/HypnoChair.js @@ -12,7 +12,7 @@ export const HypnoChair = props => { The Enhanced Interrogation Chamber is designed to induce a deep-rooted trance trigger into the subject. Once the procedure is complete, by using the implanted trigger phrase, the authorities are able to - ensure immediate and complete obedience and truthfulness. + ensure immediate and complete obedience and truthfulness.
{ )}> {language.desc} {' '} - Key: ,{language.key} + Key: ,{language.key} {' '} {!!language.shadow && '(gained from mob)'} {' '} diff --git a/tgui/packages/tgui/interfaces/Launchpad.js b/tgui/packages/tgui/interfaces/Launchpad.js index e96ab310f85..781f6b3dd2f 100644 --- a/tgui/packages/tgui/interfaces/Launchpad.js +++ b/tgui/packages/tgui/interfaces/Launchpad.js @@ -154,7 +154,7 @@ export const LaunchpadControl = props => { inline bold mr={1}> - Y: + Y: {
{data.user && ( - Welcome, {data.user.name || "Unknown"}, + Welcome, {data.user.name || "Unknown"}, {' '} {data.user.job || "Unemployed"}!
- Your balance is {data.user.points} mining points. + Your balance is {data.user.points} mining points.
) || ( - No registered ID card!
- Please contact your local HoP! + No registered ID card!
+ Please contact your local HoP!
)}
diff --git a/tgui/packages/tgui/interfaces/NaniteRemote.js b/tgui/packages/tgui/interfaces/NaniteRemote.js index ebe1a635858..9abc4c2dbd4 100644 --- a/tgui/packages/tgui/interfaces/NaniteRemote.js +++ b/tgui/packages/tgui/interfaces/NaniteRemote.js @@ -109,16 +109,16 @@ export const NaniteRemote = props => { - Name + Name - Mode + Mode - Code + Code - Relay + Relay {saved_settings.map(setting => ( @@ -156,7 +156,7 @@ export const NaniteRemote = props => {
) : ( - No settings currently saved + No settings currently saved )}
diff --git a/tgui/packages/tgui/interfaces/NtosAiRestorer.js b/tgui/packages/tgui/interfaces/NtosAiRestorer.js index ee68bbd5c41..a50bd41034b 100644 --- a/tgui/packages/tgui/interfaces/NtosAiRestorer.js +++ b/tgui/packages/tgui/interfaces/NtosAiRestorer.js @@ -61,7 +61,7 @@ export const NtosAiRestorer = props => { fontSize="20px" color="good" mt={1}> - RECONSTRUCTION IN PROGRESS + RECONSTRUCTION IN PROGRESS )}