Merge from vscode e1d3dd53d17fb1529a002e4d6fb066db0a0bd385 (#6460)

* Merge from vscode e1d3dd53d17fb1529a002e4d6fb066db0a0bd385

* fix servers icon

* fix tests
This commit is contained in:
Anthony Dresser
2019-07-22 18:28:21 -07:00
committed by GitHub
parent f2afacd8b2
commit 15fc7a077a
91 changed files with 2562 additions and 972 deletions

View File

@@ -4,4 +4,7 @@ out/**/*.js.map
src/
test/
tsconfig.json
.gitignore
.gitignore
yarn.lock
extension.webpack.config.js
vscode-json-languageserver-*.tgz

View File

@@ -1,7 +1,7 @@
{
"name": "vscode-json-languageserver",
"description": "JSON language server",
"version": "1.2.0",
"version": "1.2.1",
"author": "Microsoft Corporation",
"license": "MIT",
"engines": {
@@ -24,10 +24,9 @@
"@types/node": "^10.14.8"
},
"scripts": {
"prepublishOnly": "npm run clean && npm run test",
"preversion": "npm test",
"compile": "gulp compile-extension:json-language-features-server",
"watch": "gulp watch-extension:json-language-features-server",
"prepublishOnly": "npm run clean && npm run compile",
"compile": "npx gulp compile-extension:json-language-features-server",
"watch": "npx gulp watch-extension:json-language-features-server",
"clean": "../../../node_modules/.bin/rimraf out",
"install-service-next": "yarn add vscode-json-languageservice@next",
"install-service-local": "yarn link vscode-json-languageservice",