Merge branch 'master' into vscode-languageclient-4.0.0-166.0.0

pull/275/head
Felix Becker 2018-05-30 15:07:19 -07:00 committed by GitHub
commit 3d5396e0c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 22 deletions

10
composer.lock generated
View File

@ -522,16 +522,16 @@
},
{
"name": "microsoft/tolerant-php-parser",
"version": "v0.0.10",
"version": "v0.0.11",
"source": {
"type": "git",
"url": "https://github.com/Microsoft/tolerant-php-parser.git",
"reference": "694b1538bb73fdcf1b8ea8e20f5acd03aae594e9"
"reference": "7647b60b13afd7e929aeef3de2c35696266c4da5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Microsoft/tolerant-php-parser/zipball/694b1538bb73fdcf1b8ea8e20f5acd03aae594e9",
"reference": "694b1538bb73fdcf1b8ea8e20f5acd03aae594e9",
"url": "https://api.github.com/repos/Microsoft/tolerant-php-parser/zipball/7647b60b13afd7e929aeef3de2c35696266c4da5",
"reference": "7647b60b13afd7e929aeef3de2c35696266c4da5",
"shasum": ""
},
"require": {
@ -559,7 +559,7 @@
}
],
"description": "Tolerant PHP-to-AST parser designed for IDE usage scenarios",
"time": "2018-03-18T03:12:58+00:00"
"time": "2018-05-12T19:12:14+00:00"
},
{
"name": "netresearch/jsonmapper",

View File

@ -19,7 +19,7 @@
"refactor"
],
"categories": [
"Languages"
"Programming Languages"
],
"icon": "images/logo.png",
"galleryBanner": {
@ -44,21 +44,20 @@
"postinstall": "node ./node_modules/vscode/bin/install",
"lint": "tslint -c tslint.json \"src/**/*.ts\"",
"semantic-release": "semantic-release",
"commitmsg": "validate-commit-msg"
"commitmsg": "commitlint -e $GIT_PARAMS"
},
"devDependencies": {
"@semantic-release/git": "^2.0.0",
"@types/mocha": "^2.2.42",
"@commitlint/cli": "^6.2.0",
"@commitlint/config-conventional": "^6.1.3",
"@types/mocha": "5.0.0",
"@types/mz": "^0.0.31",
"@types/node": "^8.0.24",
"@types/semver": "^5.3.34",
"cz-conventional-changelog": "^2.0.0",
"husky": "^0.14.3",
"semantic-release": "^12.4.1",
"semantic-release-vsce": "^2.0.0",
"semantic-release": "^15.5.0",
"semantic-release-vsce": "^2.1.0",
"tslint": "^5.0.0",
"typescript": "^2.1.4",
"validate-commit-msg": "^2.14.0",
"vscode": "^1.0.0"
},
"dependencies": {
@ -66,22 +65,20 @@
"semver": "^5.3.0",
"vscode-languageclient": "4.0.0"
},
"config": {
"commitizen": {
"path": "./node_modules/cz-conventional-changelog"
}
"commitlint": {
"extends": ["@commitlint/config-conventional"]
},
"release": {
"verifyConditions": [
"semantic-release-vsce",
"@semantic-release/github"
],
"getLastRelease": "@semantic-release/git",
"publish": [
{
"prepare": {
"path": "semantic-release-vsce",
"packageVsix": "php-intellisense.vsix"
},
"publish": [
"semantic-release-vsce",
{
"path": "@semantic-release/github",
"assets": "php-intellisense.vsix"