Merge from vscode 2e5312cd61ff99c570299ecc122c52584265eda2

This commit is contained in:
ADS Merger
2020-04-23 02:50:35 +00:00
committed by Anthony Dresser
parent 3603f55d97
commit 7f1d8fc32f
659 changed files with 22709 additions and 12497 deletions

View File

@@ -15,6 +15,9 @@
"postinstall": "node build/npm/postinstall.js",
"compile": "gulp compile --max_old_space_size=4095",
"watch": "gulp watch --max_old_space_size=4095",
"watchd": "deemon yarn watch",
"kill-watchd": "deemon --kill yarn watch",
"restart-watchd": "deemon --restart yarn watch",
"watch-client": "gulp watch-client --max_old_space_size=4095",
"mocha": "mocha test/unit/node/all.js --delay",
"precommit": "node build/gulpfile.hygiene.js",
@@ -56,19 +59,19 @@
"iconv-lite": "0.5.0",
"jquery": "3.4.0",
"jschardet": "2.1.1",
"keytar": "github:rmacfarlane/node-keytar#334424bd26414923782f144110f4beda19168d24",
"keytar": "^5.5.0",
"minimist": "^1.2.5",
"native-is-elevated": "0.4.1",
"native-keymap": "2.1.1",
"native-watchdog": "1.3.0",
"ng2-charts": "^1.6.0",
"node-pty": "0.10.0-beta7",
"node-pty": "0.10.0-beta8",
"onigasm-umd": "2.2.5",
"plotly.js-dist-min": "^1.53.0",
"reflect-metadata": "^0.1.8",
"rxjs": "5.4.0",
"sanitize-html": "^1.19.1",
"semver-umd": "^5.5.5",
"semver-umd": "^5.5.6",
"slickgrid": "github:anthonydresser/SlickGrid#2.3.33",
"spdlog": "^0.11.1",
"sudo-prompt": "9.1.1",
@@ -76,13 +79,13 @@
"vscode-nsfw": "1.2.8",
"vscode-proxy-agent": "^0.5.2",
"vscode-ripgrep": "^1.5.8",
"vscode-sqlite3": "4.0.9",
"vscode-sqlite3": "4.0.10",
"vscode-textmate": "4.4.0",
"xterm": "4.5.0-beta.4",
"xterm-addon-search": "0.5.0",
"xterm-addon-unicode11": "0.1.1",
"xterm-addon-web-links": "0.2.1",
"xterm-addon-webgl": "0.5.0",
"xterm": "4.6.0-beta.15",
"xterm-addon-search": "0.6.0",
"xterm-addon-unicode11": "0.2.0-beta.2",
"xterm-addon-web-links": "0.3.0",
"xterm-addon-webgl": "0.7.0-beta.6",
"yauzl": "^2.9.2",
"yazl": "^2.4.3",
"zone.js": "^0.8.4"
@@ -122,7 +125,8 @@
"cson-parser": "^1.3.3",
"css-loader": "^3.2.0",
"debounce": "^1.0.0",
"electron": "7.1.11",
"deemon": "^1.4.0",
"electron": "7.2.2",
"eslint": "6.8.0",
"eslint-plugin-jsdoc": "^19.1.0",
"event-stream": "3.3.4",
@@ -179,7 +183,7 @@
"temp-write": "^3.4.0",
"ts-loader": "^4.4.2",
"typemoq": "^0.3.2",
"typescript": "^3.9.0-dev.20200327",
"typescript": "^3.9.0-dev.20200420",
"typescript-formatter": "7.1.0",
"underscore": "^1.8.2",
"vinyl": "^2.0.0",