gitorious/emoji-cheat-sheet
1
0
Fork 0
mirror of https://github.com/ikatyang/emoji-cheat-sheet.git synced 2025-04-10 17:23:41 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into @types/node-8.0.22-38.0.0

Browse Source
This commit is contained in:
Ika 2017-08-17 12:07:05 +08:00 committed by GitHub
commit 479b14437b
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@ -17,9 +17,9 @@
},
"devDependencies": {
"@types/cheerio": "0.22.2",
"@types/jest": "20.0.6",
"@types/jest": "20.0.7",
"@types/node": "8.0.22",
"@types/request": "2.0.0",
"@types/request": "2.0.1",
"jest": "20.0.4",
"jest-playback": "1.0.0",
"prettier": "1.5.3",
@ -29,7 +29,7 @@
"tslint": "5.6.0",
"tslint-config-ikatyang": "2.2.0",
"tslint-config-prettier-ext": "1.5.0",
"tslint-plugin-prettier": "1.0.0",
"tslint-plugin-prettier": "1.1.0",
"typescript": "2.4.2"
}
}

29
yarn.lock
View File

@ -12,9 +12,9 @@
dependencies:
"@types/node" "*"
"@types/jest@20.0.6":
version "20.0.6"
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-20.0.6.tgz#7e0ba76ddfacb42ee9bb0d8833e5208cf0680431"
"@types/jest@20.0.7":
version "20.0.7"
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-20.0.7.tgz#39cd215db8bda03928dceb933a1e63eb2cbd210e"
"@types/node@*":
version "8.0.15"
@ -24,9 +24,9 @@
version "8.0.22"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.22.tgz#9c6bfee1f45f5e9952ff6b487e657ecca48c7777"
"@types/request@2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@types/request/-/request-2.0.0.tgz#7d6fd2a1ef48ad07d0e3333471b8267156d707a4"
"@types/request@2.0.1":
version "2.0.1"
resolved "https://registry.yarnpkg.com/@types/request/-/request-2.0.1.tgz#5fb3b273a19a67a698abfd38ece5cd8ef946bc6d"
dependencies:
"@types/form-data" "*"
"@types/node" "*"
@ -688,6 +688,13 @@ escodegen@^1.6.1:
optionalDependencies:
source-map "~0.2.0"
eslint-plugin-prettier@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.2.0.tgz#f2837ad063903d73c621e7188fb3d41486434088"
dependencies:
fast-diff "^1.1.1"
jest-docblock "^20.0.1"
esprima@^2.7.1:
version "2.7.3"
resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
@ -1242,7 +1249,7 @@ jest-diff@^20.0.3:
jest-matcher-utils "^20.0.3"
pretty-format "^20.0.3"
jest-docblock@^20.0.3:
jest-docblock@^20.0.1, jest-docblock@^20.0.3:
version "20.0.3"
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.0.3.tgz#17bea984342cc33d83c50fbe1545ea0efaa44712"
@ -2415,11 +2422,11 @@ tslint-plugin-ikatyang@~1.0.0:
tslib "^1.7.1"
tsutils "^2.8.0"
tslint-plugin-prettier@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/tslint-plugin-prettier/-/tslint-plugin-prettier-1.0.0.tgz#2138ec2a65de883d19b95247430771cdfcbff8de"
tslint-plugin-prettier@1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/tslint-plugin-prettier/-/tslint-plugin-prettier-1.1.0.tgz#05e84d2b6716d6d9ae62017533b612f9ed7a1085"
dependencies:
fast-diff "^1.1.1"
eslint-plugin-prettier "^2.2.0"
tslib "^1.7.1"
tslint@5.6.0: