Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-28 16:39:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix38623

Browse Source
This commit is contained in:
Till
2017-12-12 20:12:15 +01:00
parent 2c6e593cb7 b1d931fef1
commit c956970a47
9 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/emmet/package.json
+1 -1
View File
@@ -318,7 +318,7 @@
"@emmetio/css-parser": "ramya-rao-a/css-parser#vscode",
"@emmetio/math-expression": "^0.1.1",
"vscode-emmet-helper": "^1.1.19",
"vscode-languageserver-types": "^3.0.3",
"vscode-languageserver-types": "^3.5.0",
"image-size": "^0.5.2",
"vscode-nls": "2.0.2"
}
extensions/emmet/yarn.lock
+4
View File
@@ -2059,6 +2059,10 @@ vscode-languageserver-types@^3.0.3:
version "3.3.0"
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.3.0.tgz#8964dc7c2247536fbefd2d6836bf3febac80dd00"
vscode-languageserver-types@^3.5.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz#e48d79962f0b8e02de955e3f524908e2b19c0374"
vscode-nls@2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da"
extensions/javascript/package.json
+1 -1
View File
@@ -12,7 +12,7 @@
"main": "./out/javascriptMain",
"dependencies": {
"jsonc-parser": "^0.3.1",
"request-light": "^0.2.0",
"request-light": "^0.2.1",
"vscode-nls": "^2.0.2"
},
"scripts": {
extensions/javascript/yarn.lock
+3 -3
View File
@@ -46,9 +46,9 @@ ms@0.7.1:
version "0.7.1"
resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
request-light@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.2.0.tgz#922497791c2e68528124dfb82354cf37e4bb2cfc"
request-light@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.2.1.tgz#986f5a82893e9d1ca6a896ebe6f46c51c6b4557f"
dependencies:
http-proxy-agent "^0.2.6"
https-proxy-agent "^0.3.5"
extensions/markdown/package.json
+2 -2
View File
@@ -311,8 +311,8 @@
"highlight.js": "9.5.0",
"markdown-it": "^8.4.0",
"markdown-it-named-headers": "0.0.4",
"vscode-extension-telemetry": "0.0.8",
"vscode-nls": "2.0.2"
"vscode-extension-telemetry": "^0.0.8",
"vscode-nls": "^2.0.2"
},
"devDependencies": {
"@types/highlight.js": "9.1.10",
extensions/markdown/yarn.lock
+2 -2
View File
@@ -155,14 +155,14 @@ util-deprecate@~1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
vscode-extension-telemetry@0.0.8:
vscode-extension-telemetry@^0.0.8:
version "0.0.8"
resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.8.tgz#2261bff986b6690a6f1f746a45ac5bd1f85d29e0"
dependencies:
applicationinsights "0.18.0"
winreg "1.2.3"
vscode-nls@2.0.2:
vscode-nls@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da"
extensions/typescript/package.json
+2 -2
View File
@@ -13,8 +13,8 @@
},
"dependencies": {
"semver": "4.3.6",
"vscode-extension-telemetry": "0.0.8",
"vscode-nls": "2.0.1"
"vscode-extension-telemetry": "^0.0.8",
"vscode-nls": "^2.0.2"
},
"devDependencies": {
"@types/node": "8.0.33",
extensions/typescript/yarn.lock
+4 -4
View File
@@ -18,16 +18,16 @@ semver@4.3.6:
version "4.3.6"
resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
vscode-extension-telemetry@0.0.8:
vscode-extension-telemetry@^0.0.8:
version "0.0.8"
resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.8.tgz#2261bff986b6690a6f1f746a45ac5bd1f85d29e0"
dependencies:
applicationinsights "0.18.0"
winreg "1.2.3"
vscode-nls@2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.1.tgz#7853866e33f9c50ca415e51b9640d081800e36c6"
vscode-nls@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da"
winreg@1.2.3:
version "1.2.3"
src/vs/code/electron-main/diagnostics.ts
+1 -1
View File
@@ -124,7 +124,7 @@ function formatEnvironment(info: IMainProcessInfo): string {
const output: string[] = [];
output.push(`Version: ${pkg.name} ${pkg.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`);
output.push(`OS Version: ${os.type()} ${os.arch()} ${os.release()})`);
output.push(`OS Version: ${os.type()} ${os.arch()} ${os.release()}`);
const cpus = os.cpus();
if (cpus && cpus.length > 0) {
output.push(`CPUs: ${cpus[0].model} (${cpus.length} x ${cpus[0].speed})`);