Skip to content

Commit 605f60a

Browse files
author
Weffe
committed
Merge branch 'master' into dev
2 parents 3ab89a1 + e9c5f4a commit 605f60a

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@
3838
"axios": "^0.18.0"
3939
},
4040
"devDependencies": {
41-
"@types/jest": "^24.0.9",
41+
"@types/jest": "^24.0.11",
4242
"axios": "^0.18.0",
4343
"axios-mock-adapter": "^1.16.0",
4444
"docsify-cli": "^4.3.0",
4545
"jest": "^24.1.0",
4646
"npm-run-all": "^4.1.5",
4747
"rimraf": "^2.6.3",
48-
"standard-version": "^5.0.1",
49-
"ts-jest": "^24.0.0",
48+
"standard-version": "^5.0.2",
49+
"ts-jest": "^24.0.2",
5050
"typescript": "^3.3.3333"
5151
},
5252
"dependencies": {

yarn.lock

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@
136136
resolved "https://registry.yarnpkg.com/@types/jest-diff/-/jest-diff-20.0.1.tgz#35cc15b9c4f30a18ef21852e255fdb02f6d59b89"
137137
integrity sha512-yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA==
138138

139-
"@types/jest@^24.0.9":
140-
version "24.0.9"
141-
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.9.tgz#74ce9cf337f25e189aa18f76ab3d65e8669b55f2"
142-
integrity sha512-k3OOeevcBYLR5pdsOv5g3OP94h3mrJmLPHFEPWgbbVy2tGv0TZ/TlygiC848ogXhK8NL0I5up7YYtwpCp8xCJA==
139+
"@types/jest@^24.0.11":
140+
version "24.0.11"
141+
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.11.tgz#1f099bea332c228ea6505a88159bfa86a5858340"
142+
integrity sha512-2kLuPC5FDnWIDvaJBzsGTBQaBbnDweznicvK7UGYzlIJP4RJR2a4A/ByLUXEyEgag6jz8eHdlWExGDtH3EYUXQ==
143143
dependencies:
144144
"@types/jest-diff" "*"
145145

@@ -1329,12 +1329,12 @@ dot-prop@^4.1.0:
13291329
dependencies:
13301330
is-obj "^1.0.0"
13311331

1332-
dotgitignore@^1.0.3:
1333-
version "1.0.3"
1334-
resolved "https://registry.yarnpkg.com/dotgitignore/-/dotgitignore-1.0.3.tgz#a442cbde7dc20dff51cdb849e4c5a64568c07923"
1335-
integrity sha512-eu5XjSstm0WXQsARgo6kPjkINYZlOUW+z/KtAAIBjHa5mUpMPrxJytbPIndWz6GubBuuuH5ljtVcXKnVnH5q8w==
1332+
dotgitignore@^2.1.0:
1333+
version "2.1.0"
1334+
resolved "https://registry.yarnpkg.com/dotgitignore/-/dotgitignore-2.1.0.tgz#a4b15a4e4ef3cf383598aaf1dfa4a04bcc089b7b"
1335+
integrity sha512-sCm11ak2oY6DglEPpCB8TixLjWAxd3kJTs6UIcSasNYxXdFPV+YKlye92c8H4kKFqV5qYMIh7d+cYecEg0dIkA==
13361336
dependencies:
1337-
find-up "^2.1.0"
1337+
find-up "^3.0.0"
13381338
minimatch "^3.0.4"
13391339

13401340
duplexer3@^0.1.4:
@@ -1674,7 +1674,7 @@ find-up@^1.0.0:
16741674
path-exists "^2.0.0"
16751675
pinkie-promise "^2.0.0"
16761676

1677-
find-up@^2.0.0, find-up@^2.1.0:
1677+
find-up@^2.0.0:
16781678
version "2.1.0"
16791679
resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
16801680
integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
@@ -4653,17 +4653,17 @@ stack-utils@^1.0.1:
46534653
resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
46544654
integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==
46554655

4656-
standard-version@^5.0.1:
4657-
version "5.0.1"
4658-
resolved "https://registry.yarnpkg.com/standard-version/-/standard-version-5.0.1.tgz#b2b2e858379c75b7da25fbc1cdafe8b6f36810d3"
4659-
integrity sha512-nlab5/C0P1Zd5k/2Zer/Y8xDnyf9kHES8Hy82aO8owJG9TJb3KbdNNOBNAgfa/ZsiDlJE9WQTGm1yN2VM1qxTg==
4656+
standard-version@^5.0.2:
4657+
version "5.0.2"
4658+
resolved "https://registry.yarnpkg.com/standard-version/-/standard-version-5.0.2.tgz#39fc8ce9a2850cc70868a39f9a4c9661a4439beb"
4659+
integrity sha512-vvdWZySinwWU9UZhtgYUGGTkYzqrwYMw3c7CFJ17E7vMbAEqVSui/bm+ZcSukAAU2WmphPTWIKFmn8ni+lk4NA==
46604660
dependencies:
46614661
chalk "^2.4.1"
46624662
conventional-changelog "^3.0.6"
46634663
conventional-recommended-bump "^4.0.4"
46644664
detect-indent "^5.0.0"
46654665
detect-newline "^2.1.0"
4666-
dotgitignore "^1.0.3"
4666+
dotgitignore "^2.1.0"
46674667
figures "^2.0.0"
46684668
fs-access "^1.0.0"
46694669
git-semver-tags "^2.0.2"
@@ -4977,10 +4977,10 @@ trim-right@^1.0.1:
49774977
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
49784978
integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
49794979

4980-
ts-jest@^24.0.0:
4981-
version "24.0.0"
4982-
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.0.0.tgz#3f26bf2ec1fa584863a5a9c29bd8717d549efbf6"
4983-
integrity sha512-o8BO3TkMREpAATaFTrXkovMsCpBl2z4NDBoLJuWZcJJj1ijI49UnvDMfVpj+iogn/Jl8Pbhuei5nc/Ti+frEHw==
4980+
ts-jest@^24.0.2:
4981+
version "24.0.2"
4982+
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.0.2.tgz#8dde6cece97c31c03e80e474c749753ffd27194d"
4983+
integrity sha512-h6ZCZiA1EQgjczxq+uGLXQlNgeg02WWJBbeT8j6nyIBRQdglqbvzDoHahTEIiS6Eor6x8mK6PfZ7brQ9Q6tzHw==
49844984
dependencies:
49854985
bs-logger "0.x"
49864986
buffer-from "1.x"

0 commit comments

Comments
 (0)