Initial VS Code 1.19 source merge (#571)

* Initial 1.19 xcopy

* Fix yarn build

* Fix numerous build breaks

* Next batch of build break fixes

* More build break fixes

* Runtime breaks

* Additional post merge fixes

* Fix windows setup file

* Fix test failures.

* Update license header blocks to refer to source eula
This commit is contained in:
Karl Burtram
2018-01-28 23:37:17 -08:00
committed by GitHub
parent 9a1ac20710
commit 251ae01c3e
8009 changed files with 93378 additions and 35634 deletions

View File

@@ -1,7 +1,6 @@
{
"name": "sqlops",
"version": "0.26.0",
"electronVersion": "1.7.9",
"version": "0.26.1",
"distro": "8c3e97e3425cc9814496472ab73e076de2ba99ee",
"author": {
"name": "Microsoft Corporation"
@@ -14,12 +13,12 @@
"postinstall": "node build/npm/postinstall.js",
"compile": "gulp compile --max_old_space_size=4096",
"watch": "gulp watch --max_old_space_size=4096",
"monaco-editor-setup": "node scripts/monaco-editor-setup.js",
"monaco-editor-test": "mocha --only-monaco-editor",
"precommit": "node build/gulpfile.hygiene.js",
"gulp": "gulp --max_old_space_size=4096",
"7z": "7z",
"update-grammars": "node build/npm/update-all-grammars.js"
"update-grammars": "node build/npm/update-all-grammars.js",
"smoketest": "cd test/smoke && mocha"
},
"dependencies": {
"@angular/animations": "~4.1.3",
@@ -48,17 +47,17 @@
"html-query-plan": "git://github.com/anthonydresser/html-query-plan.git#2.3",
"http-proxy-agent": "0.2.7",
"https-proxy-agent": "0.3.6",
"iconv-lite": "0.4.15",
"iconv-lite": "0.4.19",
"jquery": "3.1.0",
"make-error": "^1.1.1",
"jschardet": "^1.5.1",
"jschardet": "1.6.0",
"keytar": "^4.0.5",
"minimist": "1.2.0",
"moment": "^2.15.1",
"native-keymap": "1.2.5",
"native-watchdog": "0.3.0",
"ng2-charts": "^1.6.0",
"node-pty": "0.7.0",
"node-pty": "0.7.4",
"nsfw": "1.0.16",
"pretty-data": "^0.40.0",
"pty.js": "https://github.com/Tyriar/pty.js/tarball/c75c2dcb6dcad83b0cb3ef2ae42d0448fb912642",
@@ -66,16 +65,17 @@
"rxjs": "5.4.0",
"semver": "4.3.6",
"slickgrid": "github:anthonydresser/SlickGrid#2.3.12",
"spdlog": "0.3.7",
"svg.js": "^2.2.5",
"systemjs": "0.19.40",
"underscore": "^1.8.3",
"v8-profiler": "jrieken/v8-profiler#vscode",
"v8-inspect-profiler": "^0.0.7",
"vscode-chokidar": "1.6.2",
"vscode-debugprotocol": "1.24.0",
"vscode-ripgrep": "0.6.0-patch.0.2",
"vscode-debugprotocol": "1.25.0",
"vscode-ripgrep": "^0.6.0-patch.0.5",
"vscode-textmate": "^3.2.0",
"winreg": "1.2.0",
"xterm": "Tyriar/xterm.js#vscode-release/1.18",
"xterm": "Tyriar/xterm.js#vscode-release/1.19",
"yauzl": "2.8.0",
"zone.js": "^0.8.4"
},
@@ -100,7 +100,7 @@
"flatpak-bundler": "^0.1.1",
"glob": "^5.0.13",
"gulp": "^3.8.9",
"gulp-atom-electron": "^1.11.0",
"gulp-atom-electron": "1.15.1",
"gulp-azure-storage": "^0.7.0",
"gulp-bom": "^1.0.0",
"gulp-buffer": "0.0.2",
@@ -117,8 +117,8 @@
"gulp-replace": "^0.5.4",
"gulp-shell": "^0.5.2",
"gulp-sourcemaps": "^1.11.0",
"gulp-tsb": "2.0.4",
"gulp-tslint": "^7.0.1",
"gulp-tsb": "2.0.5",
"gulp-tslint": "^8.1.2",
"gulp-uglify": "^3.0.0",
"gulp-util": "^3.0.6",
"gulp-vinyl-zip": "^1.2.2",
@@ -141,15 +141,16 @@
"rimraf": "^2.2.8",
"sinon": "^1.17.2",
"source-map": "^0.4.4",
"tslint": "^4.3.1",
"tslint": "^5.8.0",
"typemoq": "^0.3.2",
"typescript": "2.5.2",
"typescript": "2.6.1",
"typescript-formatter": "4.0.1",
"uglify-js": "mishoo/UglifyJS2#harmony-v2.8.22",
"uglify-es": "^3.0.18",
"underscore": "^1.8.3",
"vinyl": "^0.4.5",
"vinyl-fs": "^2.4.3",
"vsce": "^1.25.1",
"vsce": "1.33.2",
"vscode-nls-dev": "^2.0.1"
},
"repository": {
@@ -160,9 +161,9 @@
"url": "https://github.com/Microsoft/sqlopsstudio/issues"
},
"optionalDependencies": {
"windows-process-tree": "0.1.6",
"windows-foreground-love": "0.1.0",
"windows-mutex": "^0.2.0",
"windows-process-tree": "0.1.6",
"fsevents": "0.3.8"
}
}
}