Merge branch 'master' into microsoft/tolerant-php-parser-v0.0.11-#235.1.0

pull/310/head
Felix Becker 2018-05-30 14:41:32 -07:00 committed by GitHub
commit 046add26fd
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

@ -804,16 +804,16 @@
}, },
{ {
"name": "sabre/event", "name": "sabre/event",
"version": "5.0.2", "version": "5.0.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sabre-io/event.git", "url": "https://github.com/sabre-io/event.git",
"reference": "3cb619803d5e3e38ed7c309250da5589676aedc8" "reference": "f5cf802d240df1257866d8813282b98aee3bc548"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sabre-io/event/zipball/3cb619803d5e3e38ed7c309250da5589676aedc8", "url": "https://api.github.com/repos/sabre-io/event/zipball/f5cf802d240df1257866d8813282b98aee3bc548",
"reference": "3cb619803d5e3e38ed7c309250da5589676aedc8", "reference": "f5cf802d240df1257866d8813282b98aee3bc548",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -860,7 +860,7 @@
"reactor", "reactor",
"signal" "signal"
], ],
"time": "2017-06-10T09:11:18+00:00" "time": "2018-03-05T13:55:47+00:00"
}, },
{ {
"name": "sabre/uri", "name": "sabre/uri",

View File

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