fix: microsoft/TypeScript#29112

Author: Marcelo

package.json

@@ -24,11 +24,16 @@
   "devDependencies": {
     "@testing-library/react": "^9.1.3",
     "@types/apollo-upload-client": "^8.1.1",
+    "@types/bcrypt": "^3.0.0",
+    "@types/connect-redis": "^0.0.11",
     "@types/dotenv": "^6.1.0",
     "@types/express": "^4.16.1",
+    "@types/express-session": "^1.15.14",
     "@types/graphql": "^14.0.7",
+    "@types/ioredis": "^4.0.15",
     "@types/jest": "^24.0.11",
     "@types/johnny-five": "^1.3.0",
+    "@types/mosca": "^2.8.1",
     "@types/node": "^12.7.3",
     "@types/pg": "^7.4.13",
     "@types/react": "^16.8.4",
@@ -63,19 +68,14 @@
     "tslint-config-prettier": "^1.18.0",
     "tslint-plugin-prettier": "^2.0.1",
     "tslint-react": "^4.0.0",
-    "typescript": "^3.3.3333",
+    "typescript": "3.5.3",
     "uglifyjs-webpack-plugin": "^2.1.2",
     "wait-on": "^3.2.0",
     "webpack": "^4.29.5",
     "webpack-cli": "^3.2.3",
     "webpack-dev-server": "^3.2.0"
   },
   "dependencies": {
-    "@types/bcrypt": "^3.0.0",
-    "@types/connect-redis": "^0.0.11",
-    "@types/express-session": "^1.15.12",
-    "@types/ioredis": "^4.0.10",
-    "@types/mosca": "^2.8.1",
     "antd": "^3.19.2",
     "antd-mobile": "^2.2.13",
     "apollo-cache-inmemory": "^1.4.3",

src/client/__tests__/react-router.ts

@@ -89,11 +89,10 @@ export default class Auth extends React.Component<Props, State> {
                           password: this.state.password
                         }
                       }).then(() => {
-                        this.state.errorMessage !== null
-                          ? this.setState({
-                              awaiting: false
-                            })
-                          : null;
+                        this.state.errorMessage &&
+                          this.setState({
+                            awaiting: false
+                          });
                       });
                     }}
                   >

src/client/modules/auth/ui/index.tsx

@@ -5,7 +5,9 @@
   .controller {
     display: flex;
     align-content: center;
+    align-items: center;
     justify-content: space-between;
     width: 100%;
+    margin-bottom: 15px;
   }
 }

src/client/modules/controller/ui/main.scss

@@ -50,7 +50,6 @@ export const StatusBar: React.FunctionComponent<Props> = props => {
                       );
                     });
                 })}
-                ;
               </>
             );
           }}

src/client/modules/home/ui/components/StatusBar/index.tsx

@@ -754,15 +754,7 @@
     "@types/node" "*"
     "@types/range-parser" "*"
 
-"@types/express-session@*":
-  version "1.15.12"
-  resolved "https://registry.yarnpkg.com/@types/express-session/-/express-session-1.15.12.tgz#1126704826e80f8381da4fbbb35a199f550d1433"
-  integrity sha512-DHZXzWy6Nu5Ng0syXUiVFRpZ6/1DOXoTCWa6RG3itGrub2ioBYvgtDbkT6VHHNo3iOdHRROyWANsMBJVaflblQ==
-  dependencies:
-    "@types/express" "*"
-    "@types/node" "*"
-
-"@types/express-session@^1.15.12":
+"@types/express-session@*", "@types/express-session@^1.15.14":
   version "1.15.14"
   resolved "https://registry.yarnpkg.com/@types/express-session/-/express-session-1.15.14.tgz#76ae4fd6e2c7c02a241d469ea2426f422c841b3f"
   integrity sha512-7kVzFTT0Jy0zmUYDt9ik76XbcqyS9NalV4gn4eLwhk1nGQn+lS/HjPODhG3Oi/GBR2w1LQHUdkz/5KICYMACiw==
@@ -827,7 +819,7 @@
   resolved "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.5.1.tgz#d775e93630c2469c2f980fc27e3143240335db3b"
   integrity sha512-PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ==
 
-"@types/ioredis@^4.0.10":
+"@types/ioredis@^4.0.15":
   version "4.0.15"
   resolved "https://registry.yarnpkg.com/@types/ioredis/-/ioredis-4.0.15.tgz#e503e0174f161aa1e668a18cdb87423af04435c3"
   integrity sha512-nhexA6bsi2gXtNcpYl0QWyzX7/xjJ2IAoyPKQldig7NsCY5x0qJhiTf8EzgFKTgbptLmsVUyRNyLsAutTaUxMg==
@@ -1012,9 +1004,9 @@
     csstype "^2.2.0"
 
 "@types/redis@*":
-  version "2.8.12"
-  resolved "https://registry.yarnpkg.com/@types/redis/-/redis-2.8.12.tgz#6405d7ece0d6cc037151b7141cef9ad3cd06f3ac"
-  integrity sha512-eT5cGYr08OnF6OlAHdc2hVOBAKBpfQQNQHsWEvUwRPFiXRd+vv+hOHSSIo4xB7M5vZOZdjMT2OUlXYqo3YlIGQ==
+  version "2.8.13"
+  resolved "https://registry.yarnpkg.com/@types/redis/-/redis-2.8.13.tgz#fdd76d9a8b7c36ff24d8506a94ef2a890c87f498"
+  integrity sha512-p86cm5P6DMotUqCS6odQRz0JJwc5QXZw9eyH0ALVIqmq12yqtex5ighWyGFHKxak9vaA/GF/Ilu0KZ0MuXXUbg==
   dependencies:
     "@types/node" "*"
 
@@ -12487,16 +12479,16 @@ typeorm@^0.2.13:
     yargonaut "^1.1.2"
     yargs "^13.2.1"
 
+typescript@3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
+  integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
+
 typescript@^3.2.2:
   version "3.3.3333"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.3333.tgz#171b2c5af66c59e9431199117a3bcadc66fdcfd6"
   integrity sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw==
 
-typescript@^3.3.3333:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.2.tgz#105b0f1934119dde543ac8eb71af3a91009efe54"
-  integrity sha512-lmQ4L+J6mnu3xweP8+rOrUwzmN+MRAj7TgtJtDaXE5PMyX2kCrklhg3rvOsOIfNeAWMQWO2F1GPc1kMD2vLAfw==
-
 typewise-core@^1.2, typewise-core@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/typewise-core/-/typewise-core-1.2.0.tgz#97eb91805c7f55d2f941748fa50d315d991ef195"