Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ben/associations

Browse Source
This commit is contained in:
Benjamin Pasero
2016-03-04 17:40:04 +01:00
parent 4d9afc6624 7c803f78da
commit 0c463fcbce
12 changed files with 72 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/json/package.json
View File

@@ -10,7 +10,8 @@
],
"main": "./client/out/jsonMain",
"scripts": {
"compile": "gulp compile-extension:json-client && gulp compile-extension:json-server"
"compile": "gulp compile-extension:json-client && gulp compile-extension:json-server",
"postinstall": "npm --prefix server install server"
},
"contributes": {
"languages": [

4
extensions/json/server/package.json
View File

@@ -13,10 +13,6 @@
"vscode-languageserver": "^1.3.0",
"vscode-nls": "^1.0.4"
},
"devDependencies": {
"mocha": "^2.2.5",
"typescript": "^1.6.2"
},
"scripts": {
"compile": "gulp compile-extension:json-server",
"watch": "gulp watch-extension:json-server"