1
0
mirror of https://github.com/ikatyang/emoji-cheat-sheet.git synced 2025-04-10 17:23:41 +02:00

Merge branch 'master' into ts-jest-20.0.10-30.0.0

This commit is contained in:
Ika 2017-08-09 10:09:18 +08:00 committed by GitHub
commit b1c68d2bf2
2 changed files with 6 additions and 12 deletions

View File

@ -25,7 +25,7 @@
"prettier": "1.5.3",
"prettier-config-ikatyang": "1.1.1",
"ts-jest": "20.0.10",
"tslint": "5.5.0",
"tslint": "5.6.0",
"tslint-config-ikatyang": "2.1.0",
"tslint-config-prettier-ext": "1.4.0",
"tslint-plugin-prettier": "1.0.0",

View File

@ -2368,9 +2368,9 @@ tslint-plugin-prettier@1.0.0:
fast-diff "^1.1.1"
tslib "^1.7.1"
tslint@5.5.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.5.0.tgz#10e8dab3e3061fa61e9442e8cee3982acf20a6aa"
tslint@5.6.0:
version "5.6.0"
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.6.0.tgz#088aa6c6026623338650b2900828ab3edf59f6cf"
dependencies:
babel-code-frame "^6.22.0"
colors "^1.1.2"
@ -2381,19 +2381,13 @@ tslint@5.5.0:
resolve "^1.3.2"
semver "^5.3.0"
tslib "^1.7.1"
tsutils "^2.5.1"
tsutils "^2.7.1"
tsutils@^1.4.0:
version "1.9.1"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.9.1.tgz#b9f9ab44e55af9681831d5f28d0aeeaf5c750cb0"
tsutils@^2.5.1:
version "2.7.1"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.7.1.tgz#411a0e9466525a2b2869260a55620d7292155e24"
dependencies:
tslib "^1.7.1"
tsutils@^2.6.1, tsutils@^2.8.0:
tsutils@^2.6.1, tsutils@^2.7.1, tsutils@^2.8.0:
version "2.8.0"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.8.0.tgz#0160173729b3bf138628dd14a1537e00851d814a"
dependencies: