From fa8a9424aa0b1c98e1f241f15b10527a18aaccc1 Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Tue, 17 Jan 2017 21:32:50 +0100 Subject: [PATCH] [css] update dependencies and migrate --- extensions/css/client/src/cssMain.ts | 2 +- extensions/css/npm-shrinkwrap.json | 22 +++++++++--------- extensions/css/package.json | 4 ++-- extensions/css/server/npm-shrinkwrap.json | 26 +++++++++++----------- extensions/css/server/package.json | 4 ++-- extensions/css/server/src/cssServerMain.ts | 2 +- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/extensions/css/client/src/cssMain.ts b/extensions/css/client/src/cssMain.ts index 34a8cdb3a3c..ed327d8f89f 100644 --- a/extensions/css/client/src/cssMain.ts +++ b/extensions/css/client/src/cssMain.ts @@ -14,7 +14,7 @@ import * as nls from 'vscode-nls'; let localize = nls.loadMessageBundle(); namespace ColorSymbolRequest { - export const type: RequestType = { get method() { return 'css/colorSymbols'; }, _: null }; + export const type: RequestType = new RequestType('css/colorSymbols'); } // this method is called when vs code is activated diff --git a/extensions/css/npm-shrinkwrap.json b/extensions/css/npm-shrinkwrap.json index 2861fbb102a..662bf8de479 100644 --- a/extensions/css/npm-shrinkwrap.json +++ b/extensions/css/npm-shrinkwrap.json @@ -3,24 +3,24 @@ "version": "0.1.0", "dependencies": { "vscode-jsonrpc": { - "version": "3.0.1-alpha.2", - "from": "vscode-jsonrpc@>=3.0.1-alpha.2 <4.0.0", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.0.1-alpha.2.tgz" + "version": "3.0.2-beta.5", + "from": "vscode-jsonrpc@>=3.0.2-beta.5 <4.0.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.0.2-beta.5.tgz" }, "vscode-languageclient": { - "version": "3.0.1-alpha.2", + "version": "3.0.2-beta.5", "from": "vscode-languageclient@next", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.0.1-alpha.2.tgz" + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.0.2-beta.5.tgz" }, "vscode-languageserver-types": { - "version": "3.0.1-alpha.2", - "from": "vscode-languageserver-types@>=3.0.1-alpha.2 <4.0.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.0.1-alpha.2.tgz" + "version": "3.0.2-beta.5", + "from": "vscode-languageserver-types@>=3.0.2-beta.5 <4.0.0", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.0.2-beta.5.tgz" }, "vscode-nls": { - "version": "1.0.7", - "from": "vscode-nls@latest", - "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-1.0.7.tgz" + "version": "2.0.1", + "from": "vscode-nls@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.1.tgz" } } } diff --git a/extensions/css/package.json b/extensions/css/package.json index 0eee2d83e43..c0484d49941 100644 --- a/extensions/css/package.json +++ b/extensions/css/package.json @@ -656,8 +656,8 @@ } }, "dependencies": { - "vscode-languageclient": "3.0.1-alpha.2", - "vscode-nls": "^1.0.7" + "vscode-languageclient": "^3.0.2-beta.5", + "vscode-nls": "^2.0.2" }, "devDependencies": { "@types/node": "^6.0.51" diff --git a/extensions/css/server/npm-shrinkwrap.json b/extensions/css/server/npm-shrinkwrap.json index f0b61222687..5eeb155344d 100644 --- a/extensions/css/server/npm-shrinkwrap.json +++ b/extensions/css/server/npm-shrinkwrap.json @@ -3,29 +3,29 @@ "version": "1.0.0", "dependencies": { "vscode-css-languageservice": { - "version": "2.0.0-next.6", + "version": "2.0.0-next.7", "from": "vscode-css-languageservice@next", - "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-2.0.0-next.6.tgz" + "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-2.0.0-next.7.tgz" }, "vscode-jsonrpc": { - "version": "3.0.1-alpha.2", - "from": "vscode-jsonrpc@>=3.0.1-alpha.2 <4.0.0", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.0.1-alpha.2.tgz" + "version": "3.0.2-beta.5", + "from": "vscode-jsonrpc@>=3.0.2-beta.5 <4.0.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.0.2-beta.5.tgz" }, "vscode-languageserver": { - "version": "3.0.1-alpha.2", + "version": "3.0.2-beta.5", "from": "vscode-languageserver@next", - "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.0.1-alpha.2.tgz" + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.0.2-beta.5.tgz" }, "vscode-languageserver-types": { - "version": "3.0.1-alpha.2", - "from": "vscode-languageserver-types@>=3.0.1-alpha.2 <4.0.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.0.1-alpha.2.tgz" + "version": "3.0.2-beta.5", + "from": "vscode-languageserver-types@3.0.2-beta.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.0.2-beta.5.tgz" }, "vscode-nls": { - "version": "1.0.7", - "from": "vscode-nls@>=1.0.4 <2.0.0", - "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-1.0.7.tgz" + "version": "2.0.1", + "from": "vscode-nls@latest", + "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.1.tgz" } } } diff --git a/extensions/css/server/package.json b/extensions/css/server/package.json index db1c1c8baaf..d22b3d88757 100644 --- a/extensions/css/server/package.json +++ b/extensions/css/server/package.json @@ -8,8 +8,8 @@ "node": "*" }, "dependencies": { - "vscode-css-languageservice": "^2.0.0-next.6", - "vscode-languageserver": "3.0.1-alpha.2" + "vscode-css-languageservice": "^2.0.0-next.7", + "vscode-languageserver": "^3.0.2-beta.5" }, "devDependencies": { "@types/node": "^6.0.51" diff --git a/extensions/css/server/src/cssServerMain.ts b/extensions/css/server/src/cssServerMain.ts index 1e47913aa80..408a82c14f5 100644 --- a/extensions/css/server/src/cssServerMain.ts +++ b/extensions/css/server/src/cssServerMain.ts @@ -13,7 +13,7 @@ import { getCSSLanguageService, getSCSSLanguageService, getLESSLanguageService, import { getLanguageModelCache } from './languageModelCache'; namespace ColorSymbolRequest { - export const type: RequestType = { get method() { return 'css/colorSymbols'; }, _: null }; + export const type: RequestType = new RequestType('css/colorSymbols'); } export interface Settings { -- GitLab