Revert "Revert "Merge from vscode ada4bddb8edc69eea6ebaaa0e88c5f903cbd43d8 (#5529)" (#5553)" (#5562)

This reverts commit c9a4f8f664.

package.json

@@ -25,7 +25,8 @@
     "tslint": "node node_modules/tslint/bin/tslint -c tslint-gci.json -p src/tsconfig.json",
     "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"
+    "strict-initialization-watch": "tsc --watch -p src/tsconfig.json --noEmit --strictPropertyInitialization",
+    "web": "node scripts/code-web.js"
   },
   "dependencies": {
     "@angular/animations": "~4.1.3",
@@ -75,7 +76,7 @@
     "vscode-ripgrep": "^1.2.5",
     "vscode-sqlite3": "4.0.7",
     "vscode-textmate": "^4.0.1",
-    "vscode-xterm": "3.13.0-beta3",
+    "vscode-xterm": "3.14.0-beta2",
     "yauzl": "^2.9.1",
     "yazl": "^2.4.3",
     "zone.js": "^0.8.4"
@@ -131,6 +132,7 @@
     "gulp-uglify": "^3.0.0",
     "gulp-untar": "^0.0.7",
     "gulp-vinyl-zip": "^2.1.2",
+    "http-server": "^0.11.1",
     "husky": "^0.13.1",
     "innosetup-compiler": "^5.5.60",
     "is": "^3.1.0",
@@ -143,6 +145,7 @@
     "mkdirp": "^0.5.0",
     "mocha": "^2.2.5",
     "mocha-junit-reporter": "^1.17.0",
+    "opn": "^5.4.0",
     "optimist": "0.3.5",
     "p-all": "^1.0.0",
     "pump": "^1.0.1",
@@ -155,7 +158,7 @@
     "source-map": "^0.4.4",
     "temp-write": "^3.4.0",
     "ts-loader": "^4.4.2",
-    "tslint": "^5.11.0",
+    "tslint": "^5.16.0",
     "tslint-microsoft-contrib": "^6.0.0",
     "typemoq": "^0.3.2",
     "typescript": "3.4.5",