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 tslint-config-prettier-ext-1.5.0-31.0.0

This commit is contained in:
Ika 2017-08-10 11:24:14 +08:00 committed by GitHub
commit 6d2ec09fbb
2 changed files with 8 additions and 8 deletions

View File

@ -18,7 +18,7 @@
"devDependencies": {
"@types/cheerio": "0.22.2",
"@types/jest": "20.0.6",
"@types/node": "8.0.19",
"@types/node": "8.0.20",
"@types/request": "2.0.0",
"jest": "20.0.4",
"jest-playback": "1.0.0",
@ -26,7 +26,7 @@
"prettier-config-ikatyang": "1.1.1",
"ts-jest": "20.0.10",
"tslint": "5.6.0",
"tslint-config-ikatyang": "2.1.0",
"tslint-config-ikatyang": "2.2.0",
"tslint-config-prettier-ext": "1.5.0",
"tslint-plugin-prettier": "1.0.0",
"typescript": "2.4.2"

View File

@ -20,9 +20,9 @@
version "8.0.15"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.15.tgz#8f23f8a4642ced357704d048010876fc0c7f179a"
"@types/node@8.0.19":
version "8.0.19"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.19.tgz#e46e2b0243de7d03f15b26b45c59ebb84f657a4e"
"@types/node@8.0.20":
version "8.0.20"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.20.tgz#65c7375255c24b184c215a5d0b63247c32f01c91"
"@types/request@2.0.0":
version "2.0.0"
@ -2323,9 +2323,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.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/tslint-config-ikatyang/-/tslint-config-ikatyang-2.1.0.tgz#8b3b8f615004bc2f6cd4d7cca151c2ad04570e69"
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"
dependencies:
tslint-consistent-codestyle "~1.6.0"
tslint-eslint-rules "~4.1.0"