Merge upgrade/backlog branch

package.json

@@ -5,7 +5,7 @@
     "publisher": "Kelvin",
     "version": "1.16.3",
     "engines": {
-        "vscode": "^1.33.0"
+        "vscode": "^1.40.0"
     },
     "categories": [
         "Other"
@@ -177,7 +177,7 @@
         }
     },
     "scripts": {
-        "vscode:prepublish": "npm run build && cd webview && npm run build",
+        "vscode:prepublish": "yarn run build && cd webview && yarn run build",
         "build": "webpack --mode production",
         "compile": "webpack --mode none --info-verbosity verbose --display-modules",
         "profile": "webpack --mode production --profile --json > stats.json",
@@ -186,21 +186,21 @@
     "devDependencies": {
         "@types/node": "^8.10.43",
         "@types/request": "^2.48.1",
-        "@types/ssh2": "^0.5.35",
+        "@types/ssh2": "^0.5.41",
+        "@types/vscode": "1.40.0",
         "@types/webpack": "^4.4.25",
         "@types/winreg": "^1.2.30",
         "clean-webpack-plugin": "^2.0.0",
-        "ts-loader": "^5.3.3",
+        "ts-loader": "^6.2.1",
         "typescript": "^3.4.3",
-        "vscode": "^1.1.33",
         "webpack": "^4.29.6",
         "webpack-cli": "^3.2.3"
     },
     "dependencies": {
-        "event-stream": "^3.3.4",
+        "event-stream": "^4.0.1",
         "jsonc-parser": "^2.0.0",
         "socks": "^2.2.0",
-        "ssh2": "^0.8.2",
+        "ssh2": "^0.8.9",
         "winreg": "^1.2.4"
     }
 }

src/connect.ts

@@ -147,6 +147,10 @@ export async function createSocket(config: FileSystemConfig): Promise<NodeJS.Rea
           Logging.debug(`\tError connecting to hop ${config.hop} for ${config.name}: ${err}`);
           err.message = `Couldn't connect through the hop:\n${err.message}`;
           return reject(err);
+        } else if (!channel) {
+          err = new Error('Did not receive a channel');
+          Logging.debug(`\tGot no channel when connecting to hop ${config.hop} for ${config.name}`);
+          return reject(err);
         }
         channel.once('close', () => ssh.destroy());
         resolve(channel);

src/sshFileSystem.ts

@@ -26,7 +26,7 @@ export class SSHFileSystem implements vscode.FileSystemProvider {
     if (relPath.startsWith('/')) relPath = relPath.substr(1);
     return path.posix.resolve(this.root, relPath);
   }
-  public continuePromise<T>(func: (cb: (err: Error | null, res?: T) => void) => boolean): Promise<T> {
+  public continuePromise<T>(func: (cb: (err: Error | null | undefined, res?: T) => void) => boolean): Promise<T> {
     return new Promise<T>((resolve, reject) => {
       const exec = () => {
         this.waitForContinue = false;

src/toPromise.ts

@@ -1,5 +1,5 @@
 
-export type toPromiseCallback<T> = (err: Error | null, res?: T) => void;
+export type toPromiseCallback<T> = (err: Error | null | undefined, res?: T) => void;
 export async function toPromise<T>(func: (cb: toPromiseCallback<T>) => void): Promise<T> {
   return new Promise<T>((resolve, reject) => {
     try {

webview/package.json

@@ -3,12 +3,10 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "react": "^16.8.3",
-    "react-dev-utils": "./react-dev-utils",
-    "react-dom": "^16.8.3",
-    "react-redux": "^6.0.1",
-    "react-scripts-ts": "3.1.0",
-    "redux": "^4.0.1"
+    "react": "^16.13.0",
+    "react-dom": "^16.13.0",
+    "react-redux": "^7.2.0",
+    "redux": "^4.0.5"
   },
   "scripts": {
     "start": "react-scripts-ts start",
@@ -17,12 +15,14 @@
     "eject": "react-scripts-ts eject"
   },
   "devDependencies": {
-    "@types/jest": "^24.0.6",
-    "@types/node": "^11.9.5",
-    "@types/react": "^16.8.4",
-    "@types/react-dom": "^16.8.2",
-    "@types/react-redux": "^7.0.1",
-    "typescript": "^3.3.3333"
+    "react-dev-utils": "file:./react-dev-utils",
+    "react-scripts-ts": "^3.1.0",
+    "@types/jest": "^25.1.4",
+    "@types/node": "^13.9.2",
+    "@types/react": "^16.9.23",
+    "@types/react-dom": "^16.9.5",
+    "@types/react-redux": "^7.1.7",
+    "typescript": "^3.8.3"
   },
   "resolutions": {
     "react-dev-utils": "file:./react-dev-utils"

webview/src/FieldTypes/base.tsx

@@ -50,7 +50,7 @@ export abstract class FieldBase<T, P = {}, S = {}> extends React.Component<Props
         }
         return validator ? validator(newValue!) : null;
     }
-    public getValue(): T {
+    public getValue(): T | undefined {
         const { newValue, oldValue } = this.state;
         if (newValue === undefined) {
             return this.props.optional ? newValue : oldValue;

webview/src/FieldTypes/dropdown.tsx

@@ -23,7 +23,7 @@ export class FieldDropdown<T> extends FieldBase<T, Props<T>, State<T>> {
     public renderInput() {
         const { newValue, open } = this.state;
         const { displayName } = this.props;
-        const display = newValue ? (displayName ? displayName(newValue) : newValue.toString()) : '';
+        const display = newValue ? (displayName ? displayName(newValue) : `${newValue}`) : '';
         return <div className="FieldDropdown" ref={this.mainDivRef}>
             <p style={{ float: 'right', margin: 5 }}>▼</p>
             <div className="current" onClick={this.toggle}>{display}</div>
@@ -35,7 +35,7 @@ export class FieldDropdown<T> extends FieldBase<T, Props<T>, State<T>> {
         const generateItem = (item: T, index: number) => {
             const style = displayStyle && displayStyle(item);
             return <li key={index} style={style} onClick={this.select.bind(this, item)}>
-                {displayName ? displayName(item) : item.toString()}
+                {displayName ? displayName(item) : `${item}`}
             </li>
         };
         return <ul className="list">