Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

* Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973

* disable strict null check

package.json

@@ -5,6 +5,7 @@
   "author": {
     "name": "Microsoft Corporation"
   },
+  "license": "MIT",
   "main": "./out/main",
   "private": true,
   "scripts": {
@@ -16,7 +17,7 @@
     "watch-client": "gulp watch-client --max_old_space_size=4095",
     "monaco-editor-test": "mocha --only-monaco-editor",
     "precommit": "node build/gulpfile.hygiene.js",
-    "gulp": "gulp --max_old_space_size=4095",
+    "gulp": "gulp --max_old_space_size=8192",
     "7z": "7z",
     "update-grammars": "node build/npm/update-all-grammars.js",
     "update-localization-extension": "node build/npm/update-localization-extension.js",
@@ -26,7 +27,7 @@
     "strict-null-check": "tsc -p src/tsconfig.strictNullChecks.json",
     "strict-null-check-watch": "tsc -p src/tsconfig.strictNullChecks.json --watch",
     "strict-initialization-watch": "tsc --watch -p src/tsconfig.json --noEmit --strictPropertyInitialization",
-    "web": "node scripts/code-web.js"
+    "update-distro": "node build/npm/update-distro.js"
   },
   "dependencies": {
     "@angular/animations": "~4.1.3",
@@ -45,40 +46,40 @@
     "ansi_up": "^3.0.0",
     "applicationinsights": "1.0.8",
     "chart.js": "^2.6.0",
-    "gc-signals": "^0.0.2",
-    "getmac": "1.4.1",
     "graceful-fs": "4.1.11",
     "html-query-plan": "git://github.com/anthonydresser/html-query-plan.git#2.6",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^2.2.1",
-    "iconv-lite": "0.4.23",
+    "iconv-lite": "0.5.0",
     "jquery": "3.4.0",
     "jschardet": "1.6.0",
-    "keytar": "4.2.1",
+    "keytar": "^4.11.0",
     "minimist": "1.2.0",
     "native-is-elevated": "^0.2.1",
-    "native-keymap": "1.2.5",
+    "native-keymap": "2.0.0",
     "native-watchdog": "1.0.0",
     "ng2-charts": "^1.6.0",
-    "node-pty": "0.9.0-beta9",
+    "node-pty": "0.9.0-beta19",
+    "nsfw": "1.2.5",
+    "onigasm-umd": "^2.2.2",
     "plotly.js-dist": "^1.48.3",
     "reflect-metadata": "^0.1.8",
     "rxjs": "5.4.0",
     "sanitize-html": "^1.19.1",
     "semver": "^5.5.0",
     "slickgrid": "github:anthonydresser/SlickGrid#2.3.29",
-    "spdlog": "0.8.1",
-    "sudo-prompt": "8.2.0",
+    "spdlog": "^0.9.0",
+    "sudo-prompt": "9.0.0",
     "v8-inspect-profiler": "^0.0.20",
-    "vscode-chokidar": "1.6.5",
-    "vscode-debugprotocol": "1.34.0",
-    "vscode-nsfw": "1.1.1",
+    "vscode-chokidar": "2.1.7",
     "vscode-proxy-agent": "0.4.0",
-    "vscode-ripgrep": "^1.2.5",
-    "vscode-sqlite3": "4.0.7",
-    "vscode-textmate": "^4.0.1",
-    "vscode-xterm": "3.14.0-beta3",
-    "yauzl": "^2.9.1",
+    "vscode-ripgrep": "^1.3.1",
+    "vscode-sqlite3": "4.0.8",
+    "vscode-textmate": "^4.2.2",
+    "xterm": "3.15.0-beta71",
+    "xterm-addon-search": "0.2.0-beta2",
+    "xterm-addon-web-links": "0.1.0-beta10",
+    "yauzl": "^2.9.2",
     "yazl": "^2.4.3",
     "zone.js": "^0.8.4"
   },
@@ -86,7 +87,7 @@
     "7zip": "0.0.6",
     "@types/chart.js": "^2.7.31",
     "@types/htmlparser2": "^3.7.31",
-    "@types/keytar": "^4.0.1",
+    "@types/keytar": "^4.4.0",
     "@types/minimist": "^1.2.0",
     "@types/mocha": "2.2.39",
     "@types/node": "^10.12.12",
@@ -105,7 +106,7 @@
     "debounce": "^1.0.0",
     "documentdb": "^1.5.1",
     "electron-mksnapshot": "~2.0.0",
-    "eslint": ">=4.18.2",
+    "eslint": "^4.18.2",
     "event-stream": "3.3.4",
     "express": "^4.13.1",
     "fancy-log": "^1.3.3",
@@ -134,7 +135,7 @@
     "gulp-vinyl-zip": "^2.1.2",
     "http-server": "^0.11.1",
     "husky": "^0.13.1",
-    "innosetup-compiler": "^5.5.60",
+    "innosetup": "5.6.1",
     "is": "^3.1.0",
     "istanbul": "^0.3.17",
     "jsdom-no-contextify": "^3.1.0",
@@ -161,14 +162,15 @@
     "tslint": "^5.16.0",
     "tslint-microsoft-contrib": "^6.0.0",
     "typemoq": "^0.3.2",
-    "typescript": "3.4.5",
+    "typescript": "3.5.2",
     "typescript-formatter": "7.1.0",
     "uglify-es": "^3.0.18",
     "underscore": "^1.8.2",
     "vinyl": "^2.0.0",
     "vinyl-fs": "^3.0.0",
     "vsce": "1.48.0",
-    "vscode-nls-dev": "3.2.5",
+    "vscode-debugprotocol": "1.35.0",
+    "vscode-nls-dev": "^3.3.1",
     "webpack": "^4.16.5",
     "webpack-cli": "^3.1.0",
     "webpack-stream": "^5.1.1"
@@ -185,12 +187,6 @@
     "vscode-windows-registry": "1.0.1",
     "windows-foreground-love": "0.1.0",
     "windows-mutex": "0.2.1",
-    "windows-process-tree": "0.2.3"
-  },
-  "resolutions": {
-    "rc": "1.2.8",
-    "event-stream": "3.3.4",
-    "natives": "1.1.6",
-    "@types/node": "10.12.12"
+    "windows-process-tree": "0.2.4"
   }
-}
+}