Skip to content

Commit

Permalink
Merge branch 'master' into jest-23.0.0-236.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
matteofigus authored May 25, 2018
2 parents 469cdf9 + 0b8de22 commit 88bad74
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"codecov": "3.0.2",
"husky": "0.14.3",
"jest": "23.0.0",
"jest-environment-jsdom": "22.4.3",
"jest-environment-jsdom": "23.0.0",
"lerna": "2.11.0",
"lint-staged": "7.1.2",
"node-dir": "0.1.17",
Expand Down
30 changes: 15 additions & 15 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4224,12 +4224,12 @@ jest-docblock@^22.4.0:
dependencies:
detect-newline "^2.1.0"

jest-environment-jsdom@22.4.3:
version "22.4.3"
resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.4.3.tgz#d67daa4155e33516aecdd35afd82d4abf0fa8a1e"
jest-environment-jsdom@23.0.0:
version "23.0.0"
resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.0.0.tgz#57b0f0dd263359a86d7952a4b712b3fabca1a625"
dependencies:
jest-mock "^22.4.3"
jest-util "^22.4.3"
jest-mock "^23.0.0"
jest-util "^23.0.0"
jsdom "^11.5.1"

jest-environment-jsdom@^22.4.1:
Expand Down Expand Up @@ -4341,9 +4341,9 @@ jest-message-util@^22.4.0:
slash "^1.0.0"
stack-utils "^1.0.1"

jest-message-util@^22.4.3:
version "22.4.3"
resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-22.4.3.tgz#cf3d38aafe4befddbfc455e57d65d5239e399eb7"
jest-message-util@^23.0.0:
version "23.0.0"
resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.0.0.tgz#073f3d76c701f7c718a4b9af1eb7f138792c4796"
dependencies:
"@babel/code-frame" "^7.0.0-beta.35"
chalk "^2.0.1"
Expand All @@ -4365,9 +4365,9 @@ jest-mock@^22.2.0:
version "22.2.0"
resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-22.2.0.tgz#444b3f9488a7473adae09bc8a77294afded397a7"

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

jest-mock@^23.0.0:
version "23.0.0"
Expand Down Expand Up @@ -4485,15 +4485,15 @@ jest-util@^22.4.1:
mkdirp "^0.5.1"
source-map "^0.6.0"

jest-util@^22.4.3:
version "22.4.3"
resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-22.4.3.tgz#c70fec8eec487c37b10b0809dc064a7ecf6aafac"
jest-util@^23.0.0:
version "23.0.0"
resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.0.0.tgz#86386800ffbe3fe17a06320e0cf9ca9b7868263b"
dependencies:
callsites "^2.0.0"
chalk "^2.0.1"
graceful-fs "^4.1.11"
is-ci "^1.0.10"
jest-message-util "^22.4.3"
jest-message-util "^23.0.0"
mkdirp "^0.5.1"
source-map "^0.6.0"

Expand Down

0 comments on commit 88bad74

Please sign in to comment.