Bump minimum version of VS Code to 1.40.0 and Node.js to 12.0.0 (#2104)

microsoft · May 14, 2020 · 8904765 · 8904765
1 parent fb133a9
commit 8904765
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 38 deletions.
diff --git a/.azure-pipelines/common/build.yml b/.azure-pipelines/common/build.yml
@@ -1,8 +1,8 @@
 steps:
 - task: NodeTool@0
-  displayName: 'Use Node 10.x'
+  displayName: 'Use Node 12.x'
   inputs:
-    versionSpec: 10.x
+    versionSpec: 12.x
 
 - task: Npm@1
   displayName: 'npm ci'

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "icon": "resources/azure-functions.png",
     "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
     "engines": {
-        "vscode": "^1.37.0"
+        "vscode": "^1.40.0"
     },
     "repository": {
         "type": "git",
@@ -1011,14 +1011,14 @@
         "@types/gulp": "^4.0.6",
         "@types/gulp-filter": "^3.0.33",
         "@types/mocha": "^7.0.2",
-        "@types/node": "^10.0.0",
+        "@types/node": "^12.0.0",
         "@types/p-retry": "^3.0.1",
         "@types/ps-tree": "^1.1.0",
         "@types/request": "2.0.7",
         "@types/request-promise": "4.1.38",
         "@types/semver": "^5.5.0",
-        "@types/vscode": "1.37.0",
-        "@types/websocket": "^0.0.37",
+        "@types/vscode": "1.40.0",
+        "@types/websocket": "^1.0.0",
         "@types/xml2js": "^0.4.5",
         "@types/xregexp": "^3.0.30",
         "azure-arm-resource": "^3.0.0-preview",
@@ -1038,7 +1038,7 @@
         "vinyl-buffer": "^1.0.1",
         "vinyl-source-stream": "^2.0.0",
         "vsce": "^1.71.0",
-        "vscode-azureextensiondev": "^0.3.3",
+        "vscode-azureextensiondev": "^0.4.0",
         "vscode-test": "^1.3.0",
         "webpack": "^4.41.5",
         "webpack-cli": "^3.3.10"
@@ -1061,8 +1061,8 @@
         "ps-tree": "^1.1.1",
         "request-promise": "^4.2.4",
         "semver": "^5.7.1",
-        "vscode-azureappservice": "^0.59.3",
-        "vscode-azureextensionui": "^0.32.1",
+        "vscode-azureappservice": "^0.60.0",
+        "vscode-azureextensionui": "^0.33.0",
         "vscode-azurekudu": "^0.1.8",
         "vscode-nls": "^4.1.1",
         "websocket": "^1.0.29",

diff --git a/src/commands/remoteDebugJava/DebugProxy.ts b/src/commands/remoteDebugJava/DebugProxy.ts
@@ -65,7 +65,9 @@ export class DebugProxy extends EventEmitter {
                         });
 
                         connection.on('message', (data: websocket.IMessage) => {
-                            socket.write(data.binaryData);
+                            if (data.binaryData) {
+                                socket.write(data.binaryData);
+                            }
                         });
                         socket.resume();
                     });

diff --git a/src/utils/cpUtils.ts b/src/utils/cpUtils.ts
@@ -46,7 +46,7 @@ export namespace cpUtils {
                 outputChannel.appendLog(localize('runningCommand', 'Running command: "{0} {1}"...', command, formattedArgs));
             }
 
-            childProc.stdout.on('data', (data: string | Buffer) => {
+            childProc.stdout?.on('data', (data: string | Buffer) => {
                 data = data.toString();
                 cmdOutput = cmdOutput.concat(data);
                 cmdOutputIncludingStderr = cmdOutputIncludingStderr.concat(data);
@@ -55,7 +55,7 @@ export namespace cpUtils {
                 }
             });
 
-            childProc.stderr.on('data', (data: string | Buffer) => {
+            childProc.stderr?.on('data', (data: string | Buffer) => {
                 data = data.toString();
                 cmdOutputIncludingStderr = cmdOutputIncludingStderr.concat(data);
                 if (outputChannel) {