Skip to content

Commit 974812d

Browse files
authored
Merge pull request #272 from opencomponents/jest-22.4.2-155.0.0
Update jest in / from 22.2.1 to 22.4.2
2 parents b01c11e + 363252d commit 974812d

File tree

2 files changed

+70
-148
lines changed

2 files changed

+70
-148
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"devDependencies": {
44
"codecov": "3.0.0",
55
"husky": "0.14.3",
6-
"jest": "^22.1.4",
6+
"jest": "^22.4.2",
77
"jest-environment-jsdom": "^22.1.4",
88
"lerna": "^2.4.0",
99
"lint-staged": "7.0.0",

yarn.lock

Lines changed: 69 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -542,12 +542,12 @@ babel-helpers@^6.24.1:
542542
babel-runtime "^6.22.0"
543543
babel-template "^6.24.1"
544544

545-
babel-jest@^22.2.0:
546-
version "22.2.0"
547-
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-22.2.0.tgz#2d04087f5d149585e14f641d529551963fc9b4f8"
545+
babel-jest@^22.4.1:
546+
version "22.4.1"
547+
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-22.4.1.tgz#ff53ebca45957347f27ff4666a31499fbb4c4ddd"
548548
dependencies:
549549
babel-plugin-istanbul "^4.1.5"
550-
babel-preset-jest "^22.2.0"
550+
babel-preset-jest "^22.4.1"
551551

552552
babel-loader@^7.1.2:
553553
version "7.1.2"
@@ -585,9 +585,9 @@ babel-plugin-istanbul@^4.1.5:
585585
istanbul-lib-instrument "^1.7.5"
586586
test-exclude "^4.1.1"
587587

588-
babel-plugin-jest-hoist@^22.2.0:
589-
version "22.2.0"
590-
resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.2.0.tgz#bd34f39d652406669713b8c89e23ef25c890b993"
588+
babel-plugin-jest-hoist@^22.4.1:
589+
version "22.4.1"
590+
resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.1.tgz#d712fe5da8b6965f3191dacddbefdbdf4fb66d63"
591591

592592
babel-plugin-minify-builtins@^0.3.0:
593593
version "0.3.0"
@@ -957,11 +957,11 @@ babel-preset-env@^1.6.0, babel-preset-env@^1.6.1:
957957
invariant "^2.2.2"
958958
semver "^5.3.0"
959959

960-
babel-preset-jest@^22.2.0:
961-
version "22.2.0"
962-
resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-22.2.0.tgz#f77b43f06ef4d8547214b2e206cc76a25c3ba0e2"
960+
babel-preset-jest@^22.4.1:
961+
version "22.4.1"
962+
resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-22.4.1.tgz#efa2e5f5334242a9457a068452d7d09735db172a"
963963
dependencies:
964-
babel-plugin-jest-hoist "^22.2.0"
964+
babel-plugin-jest-hoist "^22.4.1"
965965
babel-plugin-syntax-object-rest-spread "^6.13.0"
966966

967967
babel-preset-minify@^0.3.0:
@@ -2673,17 +2673,6 @@ expand-range@^1.8.1:
26732673
dependencies:
26742674
fill-range "^2.1.0"
26752675

2676-
expect@^22.2.0:
2677-
version "22.2.0"
2678-
resolved "https://registry.yarnpkg.com/expect/-/expect-22.2.0.tgz#dddcaab2e22ccc9f51e7c1732e0aa723f2f1f2b8"
2679-
dependencies:
2680-
ansi-styles "^3.2.0"
2681-
jest-diff "^22.1.0"
2682-
jest-get-type "^22.1.0"
2683-
jest-matcher-utils "^22.2.0"
2684-
jest-message-util "^22.2.0"
2685-
jest-regex-util "^22.1.0"
2686-
26872676
expect@^22.4.0:
26882677
version "22.4.0"
26892678
resolved "https://registry.yarnpkg.com/expect/-/expect-22.4.0.tgz#371edf1ae15b83b5bf5ec34b42f1584660a36c16"
@@ -3924,9 +3913,9 @@ jest-changed-files@^22.2.0:
39243913
dependencies:
39253914
throat "^4.0.0"
39263915

3927-
jest-cli@^22.2.1:
3928-
version "22.2.1"
3929-
resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-22.2.1.tgz#f1df6675cd719e0773be77d6314c5f4b1d8af47f"
3916+
jest-cli@^22.4.2:
3917+
version "22.4.2"
3918+
resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-22.4.2.tgz#e6546dc651e13d164481aa3e76e53ac4f4edab06"
39303919
dependencies:
39313920
ansi-escapes "^3.0.0"
39323921
chalk "^2.0.1"
@@ -3940,18 +3929,19 @@ jest-cli@^22.2.1:
39403929
istanbul-lib-instrument "^1.8.0"
39413930
istanbul-lib-source-maps "^1.2.1"
39423931
jest-changed-files "^22.2.0"
3943-
jest-config "^22.2.1"
3944-
jest-environment-jsdom "^22.2.0"
3932+
jest-config "^22.4.2"
3933+
jest-environment-jsdom "^22.4.1"
39453934
jest-get-type "^22.1.0"
3946-
jest-haste-map "^22.2.0"
3947-
jest-message-util "^22.2.0"
3935+
jest-haste-map "^22.4.2"
3936+
jest-message-util "^22.4.0"
39483937
jest-regex-util "^22.1.0"
39493938
jest-resolve-dependencies "^22.1.0"
3950-
jest-runner "^22.2.1"
3951-
jest-runtime "^22.2.1"
3952-
jest-snapshot "^22.2.0"
3953-
jest-util "^22.2.0"
3954-
jest-worker "^22.2.0"
3939+
jest-runner "^22.4.2"
3940+
jest-runtime "^22.4.2"
3941+
jest-snapshot "^22.4.0"
3942+
jest-util "^22.4.1"
3943+
jest-validate "^22.4.2"
3944+
jest-worker "^22.2.2"
39553945
micromatch "^2.3.11"
39563946
node-notifier "^5.2.1"
39573947
realpath-native "^1.0.0"
@@ -3962,22 +3952,6 @@ jest-cli@^22.2.1:
39623952
which "^1.2.12"
39633953
yargs "^10.0.3"
39643954

3965-
jest-config@^22.2.1:
3966-
version "22.2.1"
3967-
resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-22.2.1.tgz#8617e99cff0544f0a5f254a5dde37f43b5383934"
3968-
dependencies:
3969-
chalk "^2.0.1"
3970-
glob "^7.1.1"
3971-
jest-environment-jsdom "^22.2.0"
3972-
jest-environment-node "^22.2.0"
3973-
jest-get-type "^22.1.0"
3974-
jest-jasmine2 "^22.2.1"
3975-
jest-regex-util "^22.1.0"
3976-
jest-resolve "^22.2.0"
3977-
jest-util "^22.2.0"
3978-
jest-validate "^22.2.0"
3979-
pretty-format "^22.1.0"
3980-
39813955
jest-config@^22.4.2:
39823956
version "22.4.2"
39833957
resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-22.4.2.tgz#580ba5819bf81a5e48f4fd470e8b81834f45c855"
@@ -3994,15 +3968,6 @@ jest-config@^22.4.2:
39943968
jest-validate "^22.4.2"
39953969
pretty-format "^22.4.0"
39963970

3997-
jest-diff@^22.1.0:
3998-
version "22.1.0"
3999-
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-22.1.0.tgz#0fad9d96c87b453896bf939df3dc8aac6919ac38"
4000-
dependencies:
4001-
chalk "^2.0.1"
4002-
diff "^3.2.0"
4003-
jest-get-type "^22.1.0"
4004-
pretty-format "^22.1.0"
4005-
40063971
jest-diff@^22.4.0:
40073972
version "22.4.0"
40083973
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-22.4.0.tgz#384c2b78519ca44ca126382df53f134289232525"
@@ -4012,13 +3977,13 @@ jest-diff@^22.4.0:
40123977
jest-get-type "^22.1.0"
40133978
pretty-format "^22.4.0"
40143979

4015-
jest-docblock@^22.2.0:
4016-
version "22.2.0"
4017-
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.2.0.tgz#4d054eac354751e94a43a0ea2e2fe5c04cc61bbb"
3980+
jest-docblock@^22.4.0:
3981+
version "22.4.0"
3982+
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.4.0.tgz#dbf1877e2550070cfc4d9b07a55775a0483159b8"
40183983
dependencies:
40193984
detect-newline "^2.1.0"
40203985

4021-
jest-environment-jsdom@^22.1.4, jest-environment-jsdom@^22.2.0:
3986+
jest-environment-jsdom@^22.1.4:
40223987
version "22.2.0"
40233988
resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.2.0.tgz#e9537400cbdef2d1e61d7196f8afa40e826fe9d8"
40243989
dependencies:
@@ -4034,13 +3999,6 @@ jest-environment-jsdom@^22.4.1:
40343999
jest-util "^22.4.1"
40354000
jsdom "^11.5.1"
40364001

4037-
jest-environment-node@^22.2.0:
4038-
version "22.2.0"
4039-
resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-22.2.0.tgz#ba7d0183fac076d34867367a4ac53ced69e3d3a9"
4040-
dependencies:
4041-
jest-mock "^22.2.0"
4042-
jest-util "^22.2.0"
4043-
40444002
jest-environment-node@^22.4.1:
40454003
version "22.4.1"
40464004
resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-22.4.1.tgz#418850eb654596b8d6e36c2021cbedbc23df8e16"
@@ -4052,33 +4010,18 @@ jest-get-type@^22.1.0:
40524010
version "22.1.0"
40534011
resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.1.0.tgz#4e90af298ed6181edc85d2da500dbd2753e0d5a9"
40544012

4055-
jest-haste-map@^22.2.0:
4056-
version "22.2.0"
4057-
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-22.2.0.tgz#c9f508b8f63322490339ba02343dd688474d9ad5"
4013+
jest-haste-map@^22.4.2:
4014+
version "22.4.2"
4015+
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-22.4.2.tgz#a90178e66146d4378bb076345a949071f3b015b4"
40584016
dependencies:
40594017
fb-watchman "^2.0.0"
40604018
graceful-fs "^4.1.11"
4061-
jest-docblock "^22.2.0"
4062-
jest-worker "^22.2.0"
4019+
jest-docblock "^22.4.0"
4020+
jest-serializer "^22.4.0"
4021+
jest-worker "^22.2.2"
40634022
micromatch "^2.3.11"
40644023
sane "^2.0.0"
40654024

4066-
jest-jasmine2@^22.2.1:
4067-
version "22.2.1"
4068-
resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-22.2.1.tgz#58d115f3f4a0a186b5e90c5db8ac68aecfc41051"
4069-
dependencies:
4070-
callsites "^2.0.0"
4071-
chalk "^2.0.1"
4072-
co "^4.6.0"
4073-
expect "^22.2.0"
4074-
graceful-fs "^4.1.11"
4075-
is-generator-fn "^1.0.0"
4076-
jest-diff "^22.1.0"
4077-
jest-matcher-utils "^22.2.0"
4078-
jest-message-util "^22.2.0"
4079-
jest-snapshot "^22.2.0"
4080-
source-map-support "^0.5.0"
4081-
40824025
jest-jasmine2@^22.4.2:
40834026
version "22.4.2"
40844027
resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-22.4.2.tgz#dfd3d259579ed6f52510d8f1ab692808f0d40691"
@@ -4095,19 +4038,11 @@ jest-jasmine2@^22.4.2:
40954038
jest-util "^22.4.1"
40964039
source-map-support "^0.5.0"
40974040

4098-
jest-leak-detector@^22.1.0:
4099-
version "22.1.0"
4100-
resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-22.1.0.tgz#08376644cee07103da069baac19adb0299b772c2"
4101-
dependencies:
4102-
pretty-format "^22.1.0"
4103-
4104-
jest-matcher-utils@^22.2.0:
4105-
version "22.2.0"
4106-
resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-22.2.0.tgz#5390f823c18c748543d463825aa8e4df0db253ca"
4041+
jest-leak-detector@^22.4.0:
4042+
version "22.4.0"
4043+
resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-22.4.0.tgz#64da77f05b001c96d2062226e079f89989c4aa2f"
41074044
dependencies:
4108-
chalk "^2.0.1"
4109-
jest-get-type "^22.1.0"
4110-
pretty-format "^22.1.0"
4045+
pretty-format "^22.4.0"
41114046

41124047
jest-matcher-utils@^22.4.0:
41134048
version "22.4.0"
@@ -4151,52 +4086,46 @@ jest-resolve-dependencies@^22.1.0:
41514086
dependencies:
41524087
jest-regex-util "^22.1.0"
41534088

4154-
jest-resolve@^22.2.0:
4155-
version "22.2.0"
4156-
resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-22.2.0.tgz#25aa8b887b31ab8c79763503e209d7c136f74ab1"
4157-
dependencies:
4158-
browser-resolve "^1.11.2"
4159-
chalk "^2.0.1"
4160-
41614089
jest-resolve@^22.4.2:
41624090
version "22.4.2"
41634091
resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-22.4.2.tgz#25d88aa4147462c9c1c6a1ba16250d3794c24d00"
41644092
dependencies:
41654093
browser-resolve "^1.11.2"
41664094
chalk "^2.0.1"
41674095

4168-
jest-runner@^22.2.1:
4169-
version "22.2.1"
4170-
resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-22.2.1.tgz#539b2b7eb0ceb34e63a1ca78a1eda46ace70b940"
4096+
jest-runner@^22.4.2:
4097+
version "22.4.2"
4098+
resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-22.4.2.tgz#19390ea9d99f768973e16f95a1efa351c0017e87"
41714099
dependencies:
41724100
exit "^0.1.2"
4173-
jest-config "^22.2.1"
4174-
jest-docblock "^22.2.0"
4175-
jest-haste-map "^22.2.0"
4176-
jest-jasmine2 "^22.2.1"
4177-
jest-leak-detector "^22.1.0"
4178-
jest-message-util "^22.2.0"
4179-
jest-runtime "^22.2.1"
4180-
jest-util "^22.2.0"
4181-
jest-worker "^22.2.0"
4101+
jest-config "^22.4.2"
4102+
jest-docblock "^22.4.0"
4103+
jest-haste-map "^22.4.2"
4104+
jest-jasmine2 "^22.4.2"
4105+
jest-leak-detector "^22.4.0"
4106+
jest-message-util "^22.4.0"
4107+
jest-runtime "^22.4.2"
4108+
jest-util "^22.4.1"
4109+
jest-worker "^22.2.2"
41824110
throat "^4.0.0"
41834111

4184-
jest-runtime@^22.2.1:
4185-
version "22.2.1"
4186-
resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-22.2.1.tgz#c5b0173a7f5274b28da30019cf7bb7b8cda68040"
4112+
jest-runtime@^22.4.2:
4113+
version "22.4.2"
4114+
resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-22.4.2.tgz#0de0444f65ce15ee4f2e0055133fc7c17b9168f3"
41874115
dependencies:
41884116
babel-core "^6.0.0"
4189-
babel-jest "^22.2.0"
4117+
babel-jest "^22.4.1"
41904118
babel-plugin-istanbul "^4.1.5"
41914119
chalk "^2.0.1"
41924120
convert-source-map "^1.4.0"
41934121
exit "^0.1.2"
41944122
graceful-fs "^4.1.11"
4195-
jest-config "^22.2.1"
4196-
jest-haste-map "^22.2.0"
4123+
jest-config "^22.4.2"
4124+
jest-haste-map "^22.4.2"
41974125
jest-regex-util "^22.1.0"
4198-
jest-resolve "^22.2.0"
4199-
jest-util "^22.2.0"
4126+
jest-resolve "^22.4.2"
4127+
jest-util "^22.4.1"
4128+
jest-validate "^22.4.2"
42004129
json-stable-stringify "^1.0.1"
42014130
micromatch "^2.3.11"
42024131
realpath-native "^1.0.0"
@@ -4205,16 +4134,9 @@ jest-runtime@^22.2.1:
42054134
write-file-atomic "^2.1.0"
42064135
yargs "^10.0.3"
42074136

4208-
jest-snapshot@^22.2.0:
4209-
version "22.2.0"
4210-
resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-22.2.0.tgz#0c0ba152d296ef70fa198cc84977a2cc269ee4cf"
4211-
dependencies:
4212-
chalk "^2.0.1"
4213-
jest-diff "^22.1.0"
4214-
jest-matcher-utils "^22.2.0"
4215-
mkdirp "^0.5.1"
4216-
natural-compare "^1.4.0"
4217-
pretty-format "^22.1.0"
4137+
jest-serializer@^22.4.0:
4138+
version "22.4.0"
4139+
resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-22.4.0.tgz#b5d145b98c4b0d2c20ab686609adbb81fe23b566"
42184140

42194141
jest-snapshot@^22.4.0:
42204142
version "22.4.0"
@@ -4270,18 +4192,18 @@ jest-validate@^22.4.0, jest-validate@^22.4.2:
42704192
leven "^2.1.0"
42714193
pretty-format "^22.4.0"
42724194

4273-
jest-worker@^22.2.0:
4274-
version "22.2.0"
4275-
resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-22.2.0.tgz#d88d6ee176d6409f206cbbf7b485250793264262"
4195+
jest-worker@^22.2.2:
4196+
version "22.2.2"
4197+
resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-22.2.2.tgz#c1f5dc39976884b81f68ec50cb8532b2cbab3390"
42764198
dependencies:
42774199
merge-stream "^1.0.1"
42784200

4279-
jest@^22.1.4:
4280-
version "22.2.1"
4281-
resolved "https://registry.yarnpkg.com/jest/-/jest-22.2.1.tgz#fb6524d35bd02968afe3b17f330d6f7207846147"
4201+
jest@^22.4.2:
4202+
version "22.4.2"
4203+
resolved "https://registry.yarnpkg.com/jest/-/jest-22.4.2.tgz#34012834a49bf1bdd3bc783850ab44e4499afc20"
42824204
dependencies:
42834205
import-local "^1.0.0"
4284-
jest-cli "^22.2.1"
4206+
jest-cli "^22.4.2"
42854207

42864208
42874209
version "0.15.0"

0 commit comments

Comments
 (0)