From bcec0d3d5cc6fb14940c4141ffa8bd6617bf8d4e Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Mon, 27 Aug 2018 18:12:34 +0200 Subject: [PATCH] [html] update dependencies --- .../html-language-features/package.json | 4 +- .../server/package.json | 14 ++--- .../server/src/test/formatting.test.ts | 4 +- .../html-language-features/server/yarn.lock | 52 +++++++++++-------- extensions/html-language-features/yarn.lock | 28 +++++----- 5 files changed, 55 insertions(+), 47 deletions(-) diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json index 58228fa32f8..6b3504cdeca 100644 --- a/extensions/html-language-features/package.json +++ b/extensions/html-language-features/package.json @@ -174,8 +174,8 @@ }, "dependencies": { "vscode-extension-telemetry": "0.0.18", - "vscode-languageclient": "^5.1.0-next.4", - "vscode-nls": "^3.2.4" + "vscode-languageclient": "^5.1.0-next.6", + "vscode-nls": "^3.2.5" }, "devDependencies": { "@types/node": "^8.10.25" diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json index f58370909f2..ee5dae3498d 100644 --- a/extensions/html-language-features/server/package.json +++ b/extensions/html-language-features/server/package.json @@ -9,12 +9,12 @@ }, "main": "./out/htmlServerMain", "dependencies": { - "vscode-css-languageservice": "^3.0.9", - "vscode-html-languageservice": "^2.1.3", - "vscode-languageserver": "^5.1.0-next.3", + "vscode-css-languageservice": "^3.0.10", + "vscode-html-languageservice": "^2.1.6", + "vscode-languageserver": "^5.1.0-next.5", "vscode-languageserver-types": "^3.10.0", - "vscode-nls": "^3.2.4", - "vscode-uri": "^1.0.5" + "vscode-nls": "^3.2.5", + "vscode-uri": "^1.0.6" }, "devDependencies": { "@types/mocha": "2.2.33", @@ -25,8 +25,8 @@ "mocha-multi-reporters": "^1.1.7" }, "scripts": { - "compile": "gulp compile-extension:html-language-features-server", - "watch": "gulp watch-extension:html-language-features-server", + "compile": "npx gulp compile-extension:html-language-features-server", + "watch": "npx gulp watch-extension:html-language-features-server", "install-service-next": "yarn add vscode-css-languageservice@next && yarn add vscode-html-languageservice@next", "install-service-local": "npm install ../../../../vscode-css-languageservice -f && npm install ../../../../vscode-html-languageservice -f", "install-server-next": "yarn add vscode-languageserver@next", diff --git a/extensions/html-language-features/server/src/test/formatting.test.ts b/extensions/html-language-features/server/src/test/formatting.test.ts index c270d4bfdaf..d8427eead1f 100644 --- a/extensions/html-language-features/server/src/test/formatting.test.ts +++ b/extensions/html-language-features/server/src/test/formatting.test.ts @@ -59,7 +59,7 @@ suite('HTML Embedded Formatting', () => { }); test('HTML & Scripts', function (): any { - assertFormat('', '\n\n\n \n\n\n'); + assertFormat('', '\n\n\n \n\n\n'); assertFormat('', '\n\n\n \n\n\n'); assertFormat('', '\n\n\n \n\n\n'); assertFormat('\n ', '\n\n\n \n\n\n'); @@ -109,7 +109,7 @@ suite('HTML Embedded Formatting', () => { }); test('bug 36574', function (): any { - assertFormat('', ''); + assertFormat('', ''); }); test('bug 48049', function (): any { diff --git a/extensions/html-language-features/server/yarn.lock b/extensions/html-language-features/server/yarn.lock index 8090a9ec2ce..110cc6cfe02 100644 --- a/extensions/html-language-features/server/yarn.lock +++ b/extensions/html-language-features/server/yarn.lock @@ -194,31 +194,31 @@ supports-color@5.4.0: dependencies: has-flag "^3.0.0" -vscode-css-languageservice@^3.0.9: - version "3.0.9" - resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9.tgz#770471350120c5bcf6918632a125638fc0ece3be" +vscode-css-languageservice@^3.0.10: + version "3.0.10" + resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.10.tgz#71ece7e0d19227e9f21bcd5d5d928f817a7d701e" dependencies: - vscode-languageserver-types "^3.10.0" - vscode-nls "^3.2.4" + vscode-languageserver-types "^3.12.0" + vscode-nls "^3.2.5" -vscode-html-languageservice@^2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-2.1.3.tgz#c999c39e37adc632be8003a5e82075cf75dbb9bc" +vscode-html-languageservice@^2.1.6: + version "2.1.6" + resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-2.1.6.tgz#409351fda166990d20a0bfc53c2873b0d09381cc" dependencies: - vscode-languageserver-types "^3.10.0" - vscode-nls "^3.2.4" - vscode-uri "^1.0.5" + vscode-languageserver-types "^3.12.0" + vscode-nls "^3.2.5" + vscode-uri "^1.0.6" vscode-jsonrpc@^3.6.2: version "3.6.2" resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8" -vscode-languageserver-protocol@^3.12.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.12.0.tgz#5b23501292abad88f0463b01e83ff98e64a37652" +vscode-languageserver-protocol@^3.13.0-next.1: + version "3.13.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0-next.1.tgz#24d15aa5769e4b035f6ce38342685959e1eb454e" dependencies: vscode-jsonrpc "^3.6.2" - vscode-languageserver-types "^3.12.0" + vscode-languageserver-types "^3.13.0-next.1" vscode-languageserver-types@^3.10.0: version "3.10.0" @@ -228,21 +228,29 @@ vscode-languageserver-types@^3.12.0: version "3.12.0" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.12.0.tgz#f96051381b6a050b7175b37d6cb5d2f2eb64b944" -vscode-languageserver@^5.1.0-next.3: - version "5.1.0-next.3" - resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.1.0-next.3.tgz#352ce1f0f8bdfc47c1236277ebe865e25b087ccd" +vscode-languageserver-types@^3.13.0-next.1: + version "3.13.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280" + +vscode-languageserver@^5.1.0-next.5: + version "5.1.0-next.5" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.1.0-next.5.tgz#d343278b4de448a31f9db146b98638898c8d4f55" dependencies: - vscode-languageserver-protocol "^3.12.0" + vscode-languageserver-protocol "^3.13.0-next.1" vscode-uri "^1.0.5" -vscode-nls@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398" +vscode-nls@^3.2.5: + version "3.2.5" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4" vscode-uri@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.5.tgz#3b899a8ef71c37f3054d79bdbdda31c7bf36f20d" +vscode-uri@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.6.tgz#6b8f141b0bbc44ad7b07e94f82f168ac7608ad4d" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" diff --git a/extensions/html-language-features/yarn.lock b/extensions/html-language-features/yarn.lock index 3f7b93cdfbe..1c5c57c5c9a 100644 --- a/extensions/html-language-features/yarn.lock +++ b/extensions/html-language-features/yarn.lock @@ -38,27 +38,27 @@ vscode-jsonrpc@^3.6.2: version "3.6.2" resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8" -vscode-languageclient@^5.1.0-next.4: - version "5.1.0-next.4" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0-next.4.tgz#2f96b4aa198c45f3e897b7f330c597a401ca95f2" +vscode-languageclient@^5.1.0-next.6: + version "5.1.0-next.6" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0-next.6.tgz#b04f49f645a51e864d607e85a43d2b0d2f101d5d" dependencies: semver "^5.5.0" - vscode-languageserver-protocol "^3.12.0" + vscode-languageserver-protocol "^3.13.0-next.1" -vscode-languageserver-protocol@^3.12.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.12.0.tgz#5b23501292abad88f0463b01e83ff98e64a37652" +vscode-languageserver-protocol@^3.13.0-next.1: + version "3.13.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0-next.1.tgz#24d15aa5769e4b035f6ce38342685959e1eb454e" dependencies: vscode-jsonrpc "^3.6.2" - vscode-languageserver-types "^3.12.0" + vscode-languageserver-types "^3.13.0-next.1" -vscode-languageserver-types@^3.12.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.12.0.tgz#f96051381b6a050b7175b37d6cb5d2f2eb64b944" +vscode-languageserver-types@^3.13.0-next.1: + version "3.13.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280" -vscode-nls@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398" +vscode-nls@^3.2.5: + version "3.2.5" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4" zone.js@0.7.6: version "0.7.6"