diff --git a/extensions/html/client/src/htmlMain.ts b/extensions/html/client/src/htmlMain.ts index d095d8248c2..d924a16ea2a 100644 --- a/extensions/html/client/src/htmlMain.ts +++ b/extensions/html/client/src/htmlMain.ts @@ -16,7 +16,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'); } interface IPackageInfo { diff --git a/extensions/html/npm-shrinkwrap.json b/extensions/html/npm-shrinkwrap.json index 2cdc5c2063b..2b35d5b2b8d 100644 --- a/extensions/html/npm-shrinkwrap.json +++ b/extensions/html/npm-shrinkwrap.json @@ -13,24 +13,24 @@ "resolved": "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.5.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-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", + "version": "3.0.2-beta.5", "from": "vscode-languageserver-types@next", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.0.1-alpha.2.tgz" + "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.7 <2.0.0", - "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" }, "winreg": { "version": "0.0.13", diff --git a/extensions/html/package.json b/extensions/html/package.json index db0bb0c3a0c..75e03cdbda9 100644 --- a/extensions/html/package.json +++ b/extensions/html/package.json @@ -137,8 +137,18 @@ "html.format.wrapAttributes": { "type": "string", "default": "auto", - "enum": [ "auto", "force", "force-align", "force-expand-multiline" ], - "enumDescriptions": ["%html.format.wrapAttributes.auto%", "%html.format.wrapAttributes.force%", "%html.format.wrapAttributes.forcealign%", "%html.format.wrapAttributes.forcemultiline%"], + "enum": [ + "auto", + "force", + "force-align", + "force-expand-multiline" + ], + "enumDescriptions": [ + "%html.format.wrapAttributes.auto%", + "%html.format.wrapAttributes.force%", + "%html.format.wrapAttributes.forcealign%", + "%html.format.wrapAttributes.forcemultiline%" + ], "description": "%html.format.wrapAttributes.desc%" }, "html.suggest.angular1": { @@ -181,9 +191,9 @@ }, "dependencies": { "vscode-extension-telemetry": "0.0.5", - "vscode-languageclient": "3.0.1-alpha.2", - "vscode-languageserver-types": "3.0.1-alpha.2", - "vscode-nls": "^1.0.7" + "vscode-languageclient": "^3.0.2-beta.5", + "vscode-languageserver-types": "^3.0.2-beta.5", + "vscode-nls": "^2.0.1" }, "devDependencies": { "@types/node": "^6.0.51",