Merge from master

package.json

@@ -24,7 +24,9 @@
     "monaco-compile-check": "tsc -p src/tsconfig.monaco.json --noEmit",
     "download-builtin-extensions": "node build/lib/builtInExtensions.js",
     "check-monaco-editor-compilation": "tsc -p src/tsconfig.monaco.json --noEmit",
-    "tslint": "node node_modules/tslint/bin/tslint -c tslint-gci.json -p src/tsconfig.json"
+    "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"
   },
   "dependencies": {
     "@angular/animations": "~4.1.3",
@@ -42,7 +44,7 @@
     "angular2-grid": "2.0.6",
     "angular2-slickgrid": "github:Microsoft/angular2-slickgrid#1.4.6",
     "ansi_up": "^3.0.0",
-    "applicationinsights": "0.18.0",
+    "applicationinsights": "1.0.6",
     "chart.js": "^2.6.0",
     "fast-plist": "0.1.2",
     "find-remove": "1.2.1",
@@ -60,9 +62,9 @@
     "minimist": "1.2.0",
     "native-is-elevated": "^0.2.1",
     "native-keymap": "1.2.5",
-    "native-watchdog": "0.3.0",
+    "native-watchdog": "1.0.0",
     "ng2-charts": "^1.6.0",
-    "node-pty": "0.7.6",
+    "node-pty": "0.7.8",
     "nsfw": "1.0.16",
     "pretty-data": "^0.40.0",
     "reflect-metadata": "^0.1.8",
@@ -70,39 +72,45 @@
     "sanitize-html": "^1.19.1",
     "semver": "^5.5.0",
     "slickgrid": "github:anthonydresser/SlickGrid#2.3.29",
-    "spdlog": "0.7.1",
+    "spdlog": "0.7.2",
     "sudo-prompt": "8.2.0",
     "svg.js": "^2.2.5",
-    "v8-inspect-profiler": "^0.0.8",
-    "vscode-chokidar": "1.6.2",
-    "vscode-debugprotocol": "1.31.0",
-    "vscode-nsfw": "1.0.17",
-    "vscode-ripgrep": "^1.0.1",
+    "v8-inspect-profiler": "^0.0.13",
+    "vscode-chokidar": "1.6.5",
+    "vscode-debugprotocol": "1.33.0",
+    "vscode-nsfw": "1.1.1",
+    "vscode-proxy-agent": "0.1.1",
+    "vscode-ripgrep": "^1.2.5",
+    "vscode-sqlite3": "4.0.5",
     "vscode-textmate": "^4.0.1",
-    "vscode-xterm": "3.6.0-beta13",
+    "vscode-xterm": "3.9.0-beta13",
     "winreg": "^1.2.4",
     "yauzl": "^2.9.1",
+    "yazl": "^2.4.3",
     "zone.js": "^0.8.4"
   },
   "devDependencies": {
     "7zip": "0.0.6",
-    "@types/keytar": "4.0.1",
-    "@types/minimist": "1.2.0",
+    "@types/keytar": "^4.0.1",
+    "@types/minimist": "^1.2.0",
     "@types/mocha": "2.2.39",
+    "@types/node": "^8.9.1",
     "@types/sanitize-html": "^1.18.2",
-    "@types/semver": "5.3.30",
+    "@types/semver": "^5.5.0",
     "@types/should": "^13.0.0",
-    "@types/sinon": "1.16.34",
+    "@types/sinon": "^1.16.36",
+    "@types/webpack": "^4.4.10",
     "@types/winreg": "^1.2.30",
     "asar": "^0.14.0",
     "azure-storage": "^0.3.1",
     "chromium-pickle-js": "^0.2.0",
     "clean-css": "3.4.6",
+    "copy-webpack-plugin": "^4.5.2",
     "coveralls": "^2.11.11",
     "cson-parser": "^1.3.3",
     "debounce": "^1.0.0",
     "documentdb": "^1.5.1",
-    "electron-mksnapshot": "~1.7.0",
+    "electron-mksnapshot": "~2.0.0",
     "eslint": "^3.4.0",
     "event-stream": "3.3.4",
     "express": "^4.13.1",
@@ -118,7 +126,6 @@
     "gulp-eslint": "^3.0.1",
     "gulp-filter": "^3.0.0",
     "gulp-flatmap": "^1.0.0",
-    "gulp-image-resize": "^0.10.0",
     "gulp-json-editor": "^2.2.1",
     "gulp-mocha": "^2.1.3",
     "gulp-plumber": "^1.2.0",
@@ -126,7 +133,6 @@
     "gulp-rename": "^1.2.0",
     "gulp-replace": "^0.5.4",
     "gulp-shell": "^0.5.2",
-    "gulp-sourcemaps": "^1.11.0",
     "gulp-tsb": "2.0.5",
     "gulp-tslint": "^8.1.2",
     "gulp-uglify": "^3.0.0",
@@ -138,33 +144,39 @@
     "istanbul": "^0.3.17",
     "jsdom-no-contextify": "^3.1.0",
     "lazy.js": "^0.4.2",
+    "merge-options": "^1.0.1",
     "mime": "^1.4.1",
     "minimatch": "^3.0.4",
     "mkdirp": "^0.5.0",
     "mocha": "^2.2.5",
     "mocha-junit-reporter": "^1.17.0",
-    "object-assign": "^4.0.1",
     "optimist": "0.3.5",
     "p-all": "^1.0.0",
     "pump": "^1.0.1",
     "queue": "3.0.6",
+    "rcedit": "^1.1.0",
     "remap-istanbul": "^0.6.4",
     "rimraf": "^2.2.8",
     "should": "^13.2.3",
     "sinon": "^1.17.2",
     "source-map": "^0.4.4",
     "temp-write": "^3.4.0",
-    "tslint": "^5.9.1",
+    "ts-loader": "^4.4.2",
+    "tslint": "^5.11.0",
     "tslint-microsoft-contrib": "^6.0.0",
     "typemoq": "^0.3.2",
-    "typescript": "2.9.2",
+    "typescript": "3.1.4",
     "typescript-formatter": "7.1.0",
+    "typescript-tslint-plugin": "^0.0.7",
     "uglify-es": "^3.0.18",
     "underscore": "^1.8.3",
     "vinyl": "^0.4.5",
     "vinyl-fs": "^2.4.3",
-    "vsce": "1.46.0",
-    "vscode-nls-dev": "3.0.7"
+    "vsce": "1.48.0",
+    "vscode-nls-dev": "3.2.2",
+    "webpack": "^4.16.5",
+    "webpack-cli": "^3.1.0",
+    "webpack-stream": "^5.1.1"
   },
   "repository": {
     "type": "git",
@@ -175,11 +187,12 @@
   },
   "optionalDependencies": {
     "windows-foreground-love": "0.1.0",
-    "windows-mutex": "^0.2.0",
-    "windows-process-tree": "0.2.2"
+    "windows-mutex": "0.2.1",
+    "windows-process-tree": "0.2.3"
   },
   "resolutions": {
     "rc": "1.2.8",
-    "event-stream": "3.3.4"
+    "event-stream": "3.3.4",
+    "@types/node": "8.10.34"
   }
 }