Merge branch 'update-vulnerable-deps'

3 files changed, 92 insertions, 75 deletions

diff --git a/gui/package-lock.json b/gui/package-lock.json
index 48f2773e3b..12219e168f 100644
--- a/gui/package-lock.json
+++ b/gui/package-lock.json
@@ -441,40 +441,40 @@
       }
     },
     "app-builder-bin": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.6.4.tgz",
-      "integrity": "sha512-wC9HYqiC1XqpunT/9y2VuF90KbarnIHL90Tv8BD3TITTgbVIdRTXAsvWvmaR/ImvAX0+l5Z3jZtXjdJ7Pw3bLQ==",
+      "version": "2.6.6",
+      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.6.6.tgz",
+      "integrity": "sha512-G0Ee6xkbxV+fvM/7xXWIgSDjWAD4E/d/aNbxerq/TVsCyBIau/0VPmrEqBMyZv0NbTwLDW5aF/yHG+0ZEY77kA==",
       "dev": true
     },
     "app-builder-lib": {
-      "version": "20.39.0",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.39.0.tgz",
-      "integrity": "sha512-lkxGyBrQwueYb3ViqHt5WjyzVVBQqXMXc7TF+JqkuuUWp5DF7SXAYZYd+rsR3gmCbdNxw4SPIEmWmm+I9LK2gw==",
+      "version": "20.40.2",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.40.2.tgz",
+      "integrity": "sha512-SAbfua8+L3pFbQp3QFpKV0PzHJPJqepROeX/FPrfdL02zxlw+BVOe6KfC3+UV6XUombWvVPG+SwG956vfIx/Cw==",
       "dev": true,
       "requires": {
         "7zip-bin": "~4.1.0",
-        "app-builder-bin": "2.6.4",
+        "app-builder-bin": "2.6.6",
         "async-exit-hook": "^2.0.1",
         "bluebird-lst": "^1.0.7",
-        "builder-util": "9.7.0",
-        "builder-util-runtime": "8.2.0",
+        "builder-util": "9.7.1",
+        "builder-util-runtime": "8.2.1",
         "chromium-pickle-js": "^0.2.0",
         "debug": "^4.1.1",
         "ejs": "^2.6.1",
         "electron-osx-sign": "0.4.11",
-        "electron-publish": "20.39.0",
+        "electron-publish": "20.40.0",
         "fs-extra-p": "^7.0.1",
         "hosted-git-info": "^2.7.1",
         "is-ci": "^2.0.0",
         "isbinaryfile": "^4.0.0",
-        "js-yaml": "^3.12.1",
+        "js-yaml": "^3.13.0",
         "lazy-val": "^1.0.4",
         "minimatch": "^3.0.4",
         "normalize-package-data": "^2.5.0",
         "plist": "^3.0.1",
         "read-config-file": "3.2.2",
         "sanitize-filename": "^1.6.1",
-        "semver": "^5.6.0",
+        "semver": "^6.0.0",
         "temp-file": "^3.3.2"
       },
       "dependencies": {
@@ -492,6 +492,12 @@
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
           "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
           "dev": true
+        },
+        "semver": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz",
+          "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==",
+          "dev": true
         }
       }
     },
@@ -836,9 +842,9 @@
       "dev": true
     },
     "bluebird": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
-      "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==",
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
+      "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==",
       "dev": true
     },
     "bluebird-lst": {
@@ -1082,22 +1088,22 @@
       "dev": true
     },
     "builder-util": {
-      "version": "9.7.0",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-9.7.0.tgz",
-      "integrity": "sha512-QA2RxbaSKvaFVNGcYsjmlkTn03tcdPxgIxHCOgw38G7NK91QWc76RBY9+T1sU8BLVEZJ4qNRWx+pd5rG9tTi+Q==",
+      "version": "9.7.1",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-9.7.1.tgz",
+      "integrity": "sha512-txpzYIeuHFjrOQWPTJDvhJYisIVGJdSG9ppccE+y7agT0YNhBlVHGnd8+HgFTajYE34xzB5zf1/zxiiDqSKSpA==",
       "dev": true,
       "requires": {
         "7zip-bin": "~4.1.0",
-        "app-builder-bin": "2.6.4",
+        "app-builder-bin": "2.6.6",
         "bluebird-lst": "^1.0.7",
-        "builder-util-runtime": "^8.2.0",
+        "builder-util-runtime": "^8.2.1",
         "chalk": "^2.4.2",
         "debug": "^4.1.1",
         "fs-extra-p": "^7.0.1",
         "is-ci": "^2.0.0",
-        "js-yaml": "^3.12.1",
-        "source-map-support": "^0.5.10",
-        "stat-mode": "^0.2.2",
+        "js-yaml": "^3.13.0",
+        "source-map-support": "^0.5.11",
+        "stat-mode": "^0.3.0",
         "temp-file": "^3.3.2"
       },
       "dependencies": {
@@ -1148,9 +1154,9 @@
       }
     },
     "builder-util-runtime": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.0.tgz",
-      "integrity": "sha512-2Q3YrxANTrDs2NjSG5mbNGLPuUhPnSNYF9w5i4jWfHcNfQ3TgRrGXq4UfnkCiZVX8Axp4eAOSscaLLScKp/XLg==",
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.1.tgz",
+      "integrity": "sha512-2TkeTcI9bDlK5azRZSJJNxhAgW1DK+JY3jHK0UWPxgJcan4GZSVDNNO3sXntNxrp+JAdPHMF14rzNd/G53lvqw==",
       "dev": true,
       "requires": {
         "bluebird-lst": "^1.0.7",
@@ -1798,17 +1804,17 @@
       "dev": true
     },
     "dmg-builder": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.6.0.tgz",
-      "integrity": "sha512-voodd3qdpdRiaciFZTfrFq/e82UPmUqSJq6R3Wc2Ql6XqXYLQcKo1h9rSZiivwls8PqE4Mk1IHTIOwmvJaq+MA==",
+      "version": "6.6.1",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.6.1.tgz",
+      "integrity": "sha512-aIbpQG3es+gHTFtsBQE4fmSYVM60yewxJZsN6FhkAmAmNaoO45bEQNJZsRX0YE49+imiSC92mJmFAEP6iKE0Tg==",
       "dev": true,
       "requires": {
-        "app-builder-lib": "~20.39.0",
+        "app-builder-lib": "~20.40.0",
         "bluebird-lst": "^1.0.7",
-        "builder-util": "~9.7.0",
+        "builder-util": "~9.7.1",
         "fs-extra-p": "^7.0.1",
         "iconv-lite": "^0.4.24",
-        "js-yaml": "^3.12.1",
+        "js-yaml": "^3.13.0",
         "parse-color": "^1.0.0",
         "sanitize-filename": "^1.6.1"
       }
@@ -1941,24 +1947,24 @@
       }
     },
     "electron-builder": {
-      "version": "20.39.0",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.39.0.tgz",
-      "integrity": "sha512-50SNZ/G+iE9MpTwxzeHt1Cqg8jZKeFLuJ9wubR4e/8VIzAe0ERUmwAQw+77UrlwXZD/PKKoYblc0Sr08Vm4exg==",
+      "version": "20.40.2",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.40.2.tgz",
+      "integrity": "sha512-hnnBzyLXna+WpmT4MIoWVdRli43q09yqKOgzPJj0KrOoJZ7TIoY1aYSPvSg8VL5rSuTgdAWGL4rYd9zcq3YXMQ==",
       "dev": true,
       "requires": {
-        "app-builder-lib": "20.39.0",
+        "app-builder-lib": "20.40.2",
         "bluebird-lst": "^1.0.7",
-        "builder-util": "9.7.0",
-        "builder-util-runtime": "8.2.0",
+        "builder-util": "9.7.1",
+        "builder-util-runtime": "8.2.1",
         "chalk": "^2.4.2",
-        "dmg-builder": "6.6.0",
+        "dmg-builder": "6.6.1",
         "fs-extra-p": "^7.0.1",
         "is-ci": "^2.0.0",
         "lazy-val": "^1.0.4",
         "read-config-file": "3.2.2",
         "sanitize-filename": "^1.6.1",
         "update-notifier": "^2.5.0",
-        "yargs": "^13.2.1"
+        "yargs": "^13.2.2"
       },
       "dependencies": {
         "ansi-regex": {
@@ -1977,9 +1983,9 @@
           }
         },
         "camelcase": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.0.tgz",
-          "integrity": "sha512-Y05ICatFYPAfykDIB7VdwSJ0LUl1yq/BwO2OpyGGLjiRe1fgzTwVypPiWnzkGFOVFHXrCXUNBl86bpjBhZWSJg==",
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
           "dev": true
         },
         "chalk": {
@@ -2314,18 +2320,18 @@
       }
     },
     "electron-publish": {
-      "version": "20.39.0",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.39.0.tgz",
-      "integrity": "sha512-PWrGUru994CSmtsA56GnjyLB3EnIS3zyEmrW0hDXtwuctZLGMnrxjK/7WEORYkgTQ/GufD5b/8T05Q2Kr42nqQ==",
+      "version": "20.40.0",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.40.0.tgz",
+      "integrity": "sha512-mkjtsIgftRszuT/8do8TszmddokDnu254OyTeL8nE780o/A8t68oXHZzvlTJ4AQ8uBOYrA87JDO/BFCWjnVArA==",
       "dev": true,
       "requires": {
         "bluebird-lst": "^1.0.7",
-        "builder-util": "~9.7.0",
-        "builder-util-runtime": "^8.2.0",
+        "builder-util": "~9.7.1",
+        "builder-util-runtime": "^8.2.1",
         "chalk": "^2.4.2",
         "fs-extra-p": "^7.0.1",
         "lazy-val": "^1.0.4",
-        "mime": "^2.4.0"
+        "mime": "^2.4.1"
       },
       "dependencies": {
         "ansi-styles": {
@@ -2349,9 +2355,9 @@
           }
         },
         "mime": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-          "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.2.tgz",
+          "integrity": "sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==",
           "dev": true
         },
         "supports-color": {
@@ -4580,9 +4586,9 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "js-yaml": {
-      "version": "3.13.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
-      "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",
@@ -5808,9 +5814,9 @@
       "dev": true
     },
     "p-is-promise": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz",
-      "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
       "dev": true
     },
     "p-limit": {
@@ -7386,9 +7392,9 @@
       }
     },
     "stat-mode": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
-      "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.3.0.tgz",
+      "integrity": "sha512-QjMLR0A3WwFY2aZdV0okfFEJB5TRjkggXZjxP3A1RsWsNHNu3YPv8btmtc6iCFZ0Rul3FE93OYogvhOUClU+ng==",
       "dev": true
     },
     "static-extend": {
@@ -7816,9 +7822,9 @@
       "dev": true
     },
     "tslint": {
-      "version": "5.13.1",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.13.1.tgz",
-      "integrity": "sha512-fplQqb2miLbcPhyHoMV4FU9PtNRbgmm/zI5d3SZwwmJQM6V0eodju+hplpyfhLWpmwrDNfNYU57uYRb8s0zZoQ==",
+      "version": "5.15.0",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.15.0.tgz",
+      "integrity": "sha512-6bIEujKR21/3nyeoX2uBnE8s+tMXCQXhqMmaIPJpHmXJoBJPTLcI7/VHRtUwMhnLVdwLqqY3zmd8Dxqa5CVdJA==",
       "dev": true,
       "requires": {
         "babel-code-frame": "^6.22.0",
@@ -7827,13 +7833,13 @@
         "commander": "^2.12.1",
         "diff": "^3.2.0",
         "glob": "^7.1.1",
-        "js-yaml": "^3.7.0",
+        "js-yaml": "^3.13.0",
         "minimatch": "^3.0.4",
         "mkdirp": "^0.5.1",
         "resolve": "^1.3.2",
         "semver": "^5.3.0",
         "tslib": "^1.8.0",
-        "tsutils": "^2.27.2"
+        "tsutils": "^2.29.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -7874,12 +7880,23 @@
       "dev": true
     },
     "tslint-react": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/tslint-react/-/tslint-react-3.6.0.tgz",
-      "integrity": "sha512-AIv1QcsSnj7e9pFir6cJ6vIncTqxfqeFF3Lzh8SuuBljueYzEAtByuB6zMaD27BL0xhMEqsZ9s5eHuCONydjBw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tslint-react/-/tslint-react-4.0.0.tgz",
+      "integrity": "sha512-9fNE0fm9zNDx1+b6hgy8rgDN2WsQLRiIrn3+fbqm0tazBVF6jiaCFAITxmU+WSFWYE03Xhp1joCircXOe1WVAQ==",
       "dev": true,
       "requires": {
-        "tsutils": "^2.13.1"
+        "tsutils": "^3.9.1"
+      },
+      "dependencies": {
+        "tsutils": {
+          "version": "3.10.0",
+          "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.10.0.tgz",
+          "integrity": "sha512-q20XSMq7jutbGB8luhKKsQldRKWvyBO2BGqni3p4yq8Ys9bEP/xQw3KepKmMRt9gJ4lvQSScrihJrcKdKoSU7Q==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.8.1"
+          }
+        }
       }
     },
     "tsutils": {
diff --git a/gui/package.json b/gui/package.json
index d10736dc48..3407cf2c73 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -65,7 +65,7 @@
     "chai-spies": "^1.0.0",
     "cross-env": "^5.1.3",
     "electron": "^4.1.4",
-    "electron-builder": "^20.39.0",
+    "electron-builder": "^20.40.2",
     "electron-devtools-installer": "^2.2.1",
     "electron-mocha": "^6.0.4",
     "enzyme": "^3.7.0",
@@ -77,9 +77,9 @@
     "sinon": "^7.1.1",
     "ts-node": "^8.0.3",
     "tsc-watch": "^2.1.1",
-    "tslint": "^5.12.1",
+    "tslint": "^5.15.0",
     "tslint-config-prettier": "^1.18.0",
-    "tslint-react": "^3.6.0",
+    "tslint-react": "^4.0.0",
     "typescript": "^3.3.3"
   },
   "scripts": {
diff --git a/gui/src/renderer/components/Cell.tsx b/gui/src/renderer/components/Cell.tsx
index 2ba4051172..c2f5e633bf 100644
--- a/gui/src/renderer/components/Cell.tsx
+++ b/gui/src/renderer/components/Cell.tsx
@@ -245,12 +245,12 @@ export const Switch = function CellSwitch(props: SwitchControl['props']) {
   );
 };
 
-interface InputFrameProps {
+interface IInputFrameProps {
   children?: React.ReactNode;
   style?: Types.StyleRuleSetRecursive<Types.ViewStyleRuleSet>;
 }
 
-export const InputFrame = function CellInputFrame(props: InputFrameProps) {
+export const InputFrame = function CellInputFrame(props: IInputFrameProps) {
   const { style, children } = props;
 
   return <View style={[styles.input.frame, style]}>{children}</View>;