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 @types/jest-20.0.6-27.0.0

This commit is contained in:
Ika 2017-08-06 14:16:41 +08:00 committed by GitHub
commit c783b99f55
2 changed files with 12 additions and 12 deletions

View File

@ -24,10 +24,10 @@
"jest-playback": "1.0.0",
"prettier": "1.5.3",
"prettier-config-ikatyang": "1.1.1",
"ts-jest": "20.0.7",
"ts-jest": "20.0.9",
"tslint": "5.5.0",
"tslint-config-ikatyang": "2.1.0",
"tslint-config-prettier-ext": "1.3.0",
"tslint-config-prettier-ext": "1.4.0",
"tslint-plugin-prettier": "1.0.0",
"typescript": "2.4.2"
}

View File

@ -845,9 +845,9 @@ form-data@~2.1.1:
combined-stream "^1.0.5"
mime-types "^2.1.12"
fs-extra@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
fs-extra@^4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.1.tgz#7fc0c6c8957f983f57f306a24e5b9ddd8d0dd880"
dependencies:
graceful-fs "^4.1.2"
jsonfile "^3.0.0"
@ -2335,16 +2335,16 @@ trim-right@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
ts-jest@20.0.7:
version "20.0.7"
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-20.0.7.tgz#82c99b9163f8c0a864a2b221238202fa1e623c26"
ts-jest@20.0.9:
version "20.0.9"
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-20.0.9.tgz#b09a3060f18bc9206e0c5ebc7b0af6dc010e2dc4"
dependencies:
"@types/babel-core" "^6.7.14"
babel-core "^6.24.1"
babel-plugin-istanbul "^4.1.4"
babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
babel-preset-jest "^20.0.3"
fs-extra "^3.0.0"
fs-extra "^4.0.0"
jest-config "^20.0.0"
jest-util "^20.0.0"
pkg-dir "^2.0.0"
@ -2363,9 +2363,9 @@ tslint-config-ikatyang@2.1.0:
tslint-eslint-rules "~4.1.0"
tslint-plugin-ikatyang "~1.0.0"
tslint-config-prettier-ext@1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/tslint-config-prettier-ext/-/tslint-config-prettier-ext-1.3.0.tgz#501437366b90be5a05478123ac78965e5a38287a"
tslint-config-prettier-ext@1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/tslint-config-prettier-ext/-/tslint-config-prettier-ext-1.4.0.tgz#b83d96cb856e385032f083b5fdb7ceb873d4922e"
tslint-consistent-codestyle@~1.6.0:
version "1.6.0"