diff --git a/extensions/html/npm-shrinkwrap.json b/extensions/html/npm-shrinkwrap.json
index 8c759738735..0288034b88f 100644
--- a/extensions/html/npm-shrinkwrap.json
+++ b/extensions/html/npm-shrinkwrap.json
@@ -8,14 +8,14 @@
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-2.4.0.tgz"
},
"vscode-languageclient": {
- "version": "2.6.0-next.1",
- "from": "vscode-languageclient@>=2.6.0-next.1 <3.0.0",
- "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-2.6.0-next.1.tgz"
+ "version": "2.6.4-next.1",
+ "from": "vscode-languageclient@next",
+ "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-2.6.4-next.1.tgz"
},
"vscode-languageserver-types": {
- "version": "1.0.4-next.2",
- "from": "vscode-languageserver-types@>=1.0.4-next.2 <2.0.0",
- "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-1.0.4-next.2.tgz"
+ "version": "1.0.5-next.1",
+ "from": "vscode-languageserver-types@next",
+ "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-1.0.5-next.1.tgz"
},
"vscode-nls": {
"version": "1.0.7",
diff --git a/extensions/html/package.json b/extensions/html/package.json
index 10065b96869..d2463f92da6 100644
--- a/extensions/html/package.json
+++ b/extensions/html/package.json
@@ -15,8 +15,8 @@
"compile": "gulp compile-extension:html-client && gulp compile-extension:html-server",
"postinstall": "cd server && npm install",
"update-grammar": "node ../../build/npm/update-grammar.js textmate/html.tmbundle Syntaxes/HTML.plist ./syntaxes/html.json",
- "install-client-next": "npm install vscode-languageclient@next -f -S",
- "install-client-local": "npm install ../../../vscode-languageserver-node/client -f -S"
+ "install-client-next": "npm install vscode-languageserver-types@next -f -S && npm install vscode-languageclient@next -f -S",
+ "install-client-local": "npm install ../../../vscode-languageserver-node/types -f -S && npm install ../../../vscode-languageserver-node/client -f -S"
},
"contributes": {
"languages": [
@@ -143,8 +143,8 @@
}
},
"dependencies": {
- "vscode-languageclient": "^2.6.2",
- "vscode-languageserver-types": "^1.0.4",
+ "vscode-languageclient": "^2.6.4-next.1",
+ "vscode-languageserver-types": "^1.0.5-next.1",
"vscode-nls": "^1.0.7"
}
-}
\ No newline at end of file
+}
diff --git a/extensions/html/server/npm-shrinkwrap.json b/extensions/html/server/npm-shrinkwrap.json
index 4a1ad2a623d..811b781c29d 100644
--- a/extensions/html/server/npm-shrinkwrap.json
+++ b/extensions/html/server/npm-shrinkwrap.json
@@ -2,10 +2,15 @@
"name": "vscode-html-languageserver",
"version": "1.0.0",
"dependencies": {
+ "vscode-css-languageservice": {
+ "version": "2.0.0-next.3",
+ "from": "vscode-css-languageservice@next",
+ "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-2.0.0-next.3.tgz"
+ },
"vscode-html-languageservice": {
- "version": "1.0.0-next.9",
+ "version": "1.0.1-next.2",
"from": "vscode-html-languageservice@next",
- "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-1.0.0-next.9.tgz"
+ "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-1.0.1-next.2.tgz"
},
"vscode-jsonrpc": {
"version": "2.4.0",
@@ -13,12 +18,14 @@
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-2.4.0.tgz"
},
"vscode-languageserver": {
- "version": "2.6.0-next.3",
- "from": "vscode-languageserver@>=2.6.0-next.3 <3.0.0"
+ "version": "2.6.2-next.1",
+ "from": "vscode-languageserver@next",
+ "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-2.6.2-next.1.tgz"
},
"vscode-languageserver-types": {
- "version": "1.0.4-next.2",
- "from": "vscode-languageserver-types@>=1.0.4-next.1 <2.0.0"
+ "version": "1.0.5-next.1",
+ "from": "vscode-languageserver-types@>=1.0.5-next.1 <2.0.0",
+ "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-1.0.5-next.1.tgz"
},
"vscode-nls": {
"version": "1.0.7",
diff --git a/extensions/html/server/package.json b/extensions/html/server/package.json
index 7761a81fbd9..ccda47decda 100644
--- a/extensions/html/server/package.json
+++ b/extensions/html/server/package.json
@@ -8,17 +8,17 @@
"node": "*"
},
"dependencies": {
- "vscode-html-languageservice": "^1.0.0",
- "vscode-languageserver": "^2.6.1",
- "vscode-css-languageservice": "^1.1.0",
+ "vscode-css-languageservice": "^2.0.0-next.3",
+ "vscode-html-languageservice": "^1.0.1-next.2",
+ "vscode-languageserver": "^2.6.2-next.1",
"vscode-nls": "^1.0.4",
"vscode-uri": "^1.0.0"
},
"scripts": {
"compile": "gulp compile-extension:json-server",
"watch": "gulp watch-extension:json-server",
- "install-service-next": "npm install vscode-html-languageservice@next -f -S",
- "install-service-local": "npm install ../../../../vscode-html-languageservice -f -S",
+ "install-service-next": "npm install vscode-css-languageservice@next -f -S && npm install vscode-html-languageservice@next -f -S",
+ "install-service-local": "npm install ../../../../vscode-css-languageservice -f -S && npm install ../../../../vscode-html-languageservice -f -S",
"install-server-next": "npm install vscode-languageserver@next -f -S",
"install-server-local": "npm install ../../../../vscode-languageserver-node/server -f -S",
"test": "mocha"