Skip to content

Commit 88bad74

Browse files
authored
Merge branch 'master' into jest-23.0.0-236.0.0
2 parents 469cdf9 + 0b8de22 commit 88bad74

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"codecov": "3.0.2",
55
"husky": "0.14.3",
66
"jest": "23.0.0",
7-
"jest-environment-jsdom": "22.4.3",
7+
"jest-environment-jsdom": "23.0.0",
88
"lerna": "2.11.0",
99
"lint-staged": "7.1.2",
1010
"node-dir": "0.1.17",

yarn.lock

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4224,12 +4224,12 @@ jest-docblock@^22.4.0:
42244224
dependencies:
42254225
detect-newline "^2.1.0"
42264226

4227-
jest-environment-jsdom@22.4.3:
4228-
version "22.4.3"
4229-
resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.4.3.tgz#d67daa4155e33516aecdd35afd82d4abf0fa8a1e"
4227+
jest-environment-jsdom@23.0.0:
4228+
version "23.0.0"
4229+
resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.0.0.tgz#57b0f0dd263359a86d7952a4b712b3fabca1a625"
42304230
dependencies:
4231-
jest-mock "^22.4.3"
4232-
jest-util "^22.4.3"
4231+
jest-mock "^23.0.0"
4232+
jest-util "^23.0.0"
42334233
jsdom "^11.5.1"
42344234

42354235
jest-environment-jsdom@^22.4.1:
@@ -4341,9 +4341,9 @@ jest-message-util@^22.4.0:
43414341
slash "^1.0.0"
43424342
stack-utils "^1.0.1"
43434343

4344-
jest-message-util@^22.4.3:
4345-
version "22.4.3"
4346-
resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-22.4.3.tgz#cf3d38aafe4befddbfc455e57d65d5239e399eb7"
4344+
jest-message-util@^23.0.0:
4345+
version "23.0.0"
4346+
resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.0.0.tgz#073f3d76c701f7c718a4b9af1eb7f138792c4796"
43474347
dependencies:
43484348
"@babel/code-frame" "^7.0.0-beta.35"
43494349
chalk "^2.0.1"
@@ -4365,9 +4365,9 @@ jest-mock@^22.2.0:
43654365
version "22.2.0"
43664366
resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-22.2.0.tgz#444b3f9488a7473adae09bc8a77294afded397a7"
43674367

4368-
jest-mock@^22.4.3:
4369-
version "22.4.3"
4370-
resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-22.4.3.tgz#f63ba2f07a1511772cdc7979733397df770aabc7"
4368+
jest-mock@^23.0.0:
4369+
version "23.0.0"
4370+
resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.0.0.tgz#d9d897a1b74dc05c66a737213931496215897dd8"
43714371

43724372
jest-mock@^23.0.0:
43734373
version "23.0.0"
@@ -4485,15 +4485,15 @@ jest-util@^22.4.1:
44854485
mkdirp "^0.5.1"
44864486
source-map "^0.6.0"
44874487

4488-
jest-util@^22.4.3:
4489-
version "22.4.3"
4490-
resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-22.4.3.tgz#c70fec8eec487c37b10b0809dc064a7ecf6aafac"
4488+
jest-util@^23.0.0:
4489+
version "23.0.0"
4490+
resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.0.0.tgz#86386800ffbe3fe17a06320e0cf9ca9b7868263b"
44914491
dependencies:
44924492
callsites "^2.0.0"
44934493
chalk "^2.0.1"
44944494
graceful-fs "^4.1.11"
44954495
is-ci "^1.0.10"
4496-
jest-message-util "^22.4.3"
4496+
jest-message-util "^23.0.0"
44974497
mkdirp "^0.5.1"
44984498
source-map "^0.6.0"
44994499

0 commit comments

Comments
 (0)