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 prettier-1.6.0-50.0.0

This commit is contained in:
Ika 2017-08-29 07:41:40 +08:00 committed by GitHub
commit a75fcc4bda
2 changed files with 16 additions and 10 deletions

View File

@ -26,8 +26,8 @@
"prettier-config-ikatyang": "1.1.1",
"ts-jest": "20.0.10",
"ts-node": "3.3.0",
"tslint": "5.6.0",
"tslint-config-ikatyang": "2.2.0",
"tslint": "5.7.0",
"tslint-config-ikatyang": "2.3.0",
"tslint-config-prettier-ext": "1.5.0",
"tslint-plugin-prettier": "1.1.0",
"typescript": "2.4.2"

View File

@ -2384,9 +2384,9 @@ tslib@^1.0.0, tslib@^1.7.1:
version "1.7.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec"
tslint-config-ikatyang@2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/tslint-config-ikatyang/-/tslint-config-ikatyang-2.2.0.tgz#10de198873836a0a521fc1071ad8ec9fbca5d727"
tslint-config-ikatyang@2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/tslint-config-ikatyang/-/tslint-config-ikatyang-2.3.0.tgz#6f8e1bb6e75c5ec0666d31ebddd9e81059376c45"
dependencies:
tslint-consistent-codestyle "~1.6.0"
tslint-eslint-rules "~4.1.0"
@ -2429,9 +2429,9 @@ tslint-plugin-prettier@1.1.0:
eslint-plugin-prettier "^2.2.0"
tslib "^1.7.1"
tslint@5.6.0:
version "5.6.0"
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.6.0.tgz#088aa6c6026623338650b2900828ab3edf59f6cf"
tslint@5.7.0:
version "5.7.0"
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.7.0.tgz#c25e0d0c92fa1201c2bc30e844e08e682b4f3552"
dependencies:
babel-code-frame "^6.22.0"
colors "^1.1.2"
@ -2442,18 +2442,24 @@ tslint@5.6.0:
resolve "^1.3.2"
semver "^5.3.0"
tslib "^1.7.1"
tsutils "^2.7.1"
tsutils "^2.8.1"
tsutils@^1.4.0:
version "1.9.1"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.9.1.tgz#b9f9ab44e55af9681831d5f28d0aeeaf5c750cb0"
tsutils@^2.6.1, tsutils@^2.7.1, tsutils@^2.8.0:
tsutils@^2.6.1, tsutils@^2.8.0:
version "2.8.0"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.8.0.tgz#0160173729b3bf138628dd14a1537e00851d814a"
dependencies:
tslib "^1.7.1"
tsutils@^2.8.1:
version "2.8.1"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.8.1.tgz#3771404e7ca9f0bedf5d919a47a4b1890a68efff"
dependencies:
tslib "^1.7.1"
tunnel-agent@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"