Update few files after syncing changes:

This commit is contained in:
Mike Grabowski
2019-01-28 15:08:34 +01:00
parent f8c484dfbf
commit 1add9b4f08
2 changed files with 161 additions and 155 deletions
-4
View File
@@ -323,11 +323,7 @@ dependencies {
api 'com.google.code.findbugs:jsr305:3.0.2'
api "com.squareup.okhttp3:okhttp:${OKHTTP_VERSION}"
api "com.squareup.okhttp3:okhttp-urlconnection:${OKHTTP_VERSION}"
<<<<<<< HEAD
api 'com.squareup.okio:okio:1.15.0'
=======
api 'com.squareup.okio:okio:1.14.0'
>>>>>>> parent of b864e7e63e... Revert "Merge branch 'master' into 0.58-stable"
compile 'org.webkit:android-jsc:r174650'
testImplementation "junit:junit:${JUNIT_VERSION}"
+161 -151
View File
@@ -3538,12 +3538,6 @@ jest-docblock@^21.0.0:
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414"
integrity sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==
<<<<<<< HEAD
jest-docblock@^24.0.0-alpha.4:
version "24.0.0-alpha.4"
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.0.0-alpha.4.tgz#883264370210bbd4dfadf9ea0bc5f89baca926c1"
integrity sha512-NQ6DsiCR6OLLZ8XI1X5E0L/WzobR1vBRbPj5GDNIseblMKtCBOsVy9tzvl3+sgLDoQcWB4GctfrBD7UM9/pItg==
=======
jest-docblock@^24.0.0-alpha.6:
version "24.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.0.0-alpha.6.tgz#abb38d04afd624cbfb34e13fa9e0c1053388a333"
@@ -3555,7 +3549,6 @@ jest-each@^23.6.0:
version "23.6.0"
resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.6.0.tgz#ba0c3a82a8054387016139c733a05242d3d71575"
integrity sha512-x7V6M/WGJo6/kLoissORuvLIeAoyo2YqLOoCDkohgJ4XOXSqOtyvr8FbInlAWS77ojBsZrafbozWoKVRdtxFCg==
>>>>>>> parent of b864e7e63e... Revert "Merge branch 'master' into 0.58-stable"
dependencies:
chalk "^2.0.1"
pretty-format "^23.6.0"
@@ -3613,32 +3606,20 @@ jest-get-type@^24.0.0-alpha.6:
resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.0.0-alpha.6.tgz#23cc13e4e04c61f001356529675a6aec5a2ef53d"
integrity sha512-U9hmkEfO5dtccZ96iQgbPARorzyVRYWiRnrm5GO4l5iJOpK86fuUsZLjETu+cOpd72RVh00aEm/tVOhZrLizbA==
<<<<<<< HEAD
jest-haste-map@24.0.0-alpha.6:
version "24.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.0.0-alpha.6.tgz#fb2c785080f391b923db51846b86840d0d773076"
integrity sha512-+NO2HMbjvrG8BC39ieLukdpFrcPhhjCJGhpbHodHNZygH1Tt06WrlNYGpZtWKx/zpf533tCtMQXO/q59JenjNw==
=======
jest-haste-map@24.0.0-alpha.4:
version "24.0.0-alpha.4"
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.0.0-alpha.4.tgz#209c13e79a09b4d380d6c46ab12ecc82f02b84ff"
integrity sha512-I2KD+LkcXjQHrPadfE5jx4AQmnxrpziV9NQIrFbytClRJtBKsloL+DlfPdn2sAIIF7y34irlUSB7aybTgxev7A==
>>>>>>> parent of b864e7e63e... Revert "Merge branch 'master' into 0.58-stable"
dependencies:
fb-watchman "^2.0.0"
graceful-fs "^4.1.11"
invariant "^2.2.4"
<<<<<<< HEAD
jest-serializer "^24.0.0-alpha.6"
jest-worker "^24.0.0-alpha.6"
=======
jest-serializer "^24.0.0-alpha.4"
jest-worker "^24.0.0-alpha.4"
>>>>>>> parent of b864e7e63e... Revert "Merge branch 'master' into 0.58-stable"
micromatch "^2.3.11"
sane "^3.0.0"
jest-haste-map@^24.0.0-alpha.6:
jest-haste-map@24.0.0-alpha.6, jest-haste-map@^24.0.0-alpha.6:
version "24.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.0.0-alpha.6.tgz#fb2c785080f391b923db51846b86840d0d773076"
integrity sha512-+NO2HMbjvrG8BC39ieLukdpFrcPhhjCJGhpbHodHNZygH1Tt06WrlNYGpZtWKx/zpf533tCtMQXO/q59JenjNw==
@@ -3838,21 +3819,12 @@ jest-runtime@^24.0.0-alpha.6:
write-file-atomic "^2.1.0"
yargs "^12.0.2"
<<<<<<< HEAD
jest-serializer@24.0.0-alpha.6, jest-serializer@^24.0.0-alpha.6:
version "24.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.0.0-alpha.6.tgz#27d2fee4b1a85698717a30c3ec2ab80767312597"
integrity sha512-IPA5T6/GhlE6dedSk7Cd7YfuORnYjN0VD5iJVFn1Q81RJjpj++Hen5kJbKcg547vXsQ1TddV15qOA/zeIfOCLw==
jest-serializer@^24.0.0-alpha.4:
=======
jest-serializer@24.0.0-alpha.4:
>>>>>>> parent of b864e7e63e... Revert "Merge branch 'master' into 0.58-stable"
version "24.0.0-alpha.4"
resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.0.0-alpha.4.tgz#939c31155b95bebc1ef6f76ae34dbf2c06046e52"
integrity sha512-g/hO2JM6c96wGzbiQNdbOrLlx8p+cA8W8+EwFkKtUlWcmBCxbsZb8TaIK2FLfvxCTKPwMhBujhw46GM5WppAsQ==
jest-serializer@^24.0.0-alpha.4, jest-serializer@^24.0.0-alpha.6:
jest-serializer@24.0.0-alpha.6, jest-serializer@^24.0.0-alpha.4, jest-serializer@^24.0.0-alpha.6:
version "24.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.0.0-alpha.6.tgz#27d2fee4b1a85698717a30c3ec2ab80767312597"
integrity sha512-IPA5T6/GhlE6dedSk7Cd7YfuORnYjN0VD5iJVFn1Q81RJjpj++Hen5kJbKcg547vXsQ1TddV15qOA/zeIfOCLw==
@@ -3946,25 +3918,14 @@ jest-watcher@^24.0.0-alpha.6:
chalk "^2.0.1"
string-length "^2.0.0"
<<<<<<< HEAD
jest-worker@24.0.0-alpha.6, jest-worker@^24.0.0-alpha.6:
version "24.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.0.0-alpha.6.tgz#463681b92c117c57107135c14b9b9d6cd51d80ce"
integrity sha512-iXtH7MR9bjWlNnlnRBcrBRrb4cSVxML96La5vsnmBvDI+mJnkP5uEt6Fgpo5Y8f3z9y2Rd7wuPnKRxqQsiU/dA==
dependencies:
merge-stream "^1.0.1"
jest-worker@^24.0.0-alpha.4:
=======
jest-worker@24.0.0-alpha.4:
>>>>>>> parent of b864e7e63e... Revert "Merge branch 'master' into 0.58-stable"
version "24.0.0-alpha.4"
resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.0.0-alpha.4.tgz#6766d11b66e7b2d61f79711d159125657084d021"
integrity sha512-kZYIxqwkvaQggTBiOnoGoI7pyHAsCgFg+1C9NCSpkaQOLQ/MpEdY6cTPTbLwWdtzSloWnECAAj8p9es2VLQd/Q==
dependencies:
merge-stream "^1.0.1"
jest-worker@^24.0.0-alpha.4, jest-worker@^24.0.0-alpha.6:
jest-worker@24.0.0-alpha.6, jest-worker@^24.0.0-alpha.4, jest-worker@^24.0.0-alpha.6:
version "24.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.0.0-alpha.6.tgz#463681b92c117c57107135c14b9b9d6cd51d80ce"
integrity sha512-iXtH7MR9bjWlNnlnRBcrBRrb4cSVxML96La5vsnmBvDI+mJnkP5uEt6Fgpo5Y8f3z9y2Rd7wuPnKRxqQsiU/dA==
@@ -4349,15 +4310,9 @@ merge@^1.2.0:
integrity sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=
metro-babel-register@^0.49.1:
<<<<<<< HEAD
version "0.49.2"
resolved "https://registry.yarnpkg.com/metro-babel-register/-/metro-babel-register-0.49.2.tgz#746c73311135bd6c2af4d83c2cc6c5cbcf0e8a65"
integrity sha512-xx+SNwJ3Dl4MmSNn1RpUGc7b5pyTxXdpqpE7Fuk499rZffypVI1uhKOjKt2lwQhlyD03sXuvB/m3RdEg3mivWg==
=======
version "0.49.1"
resolved "https://registry.yarnpkg.com/metro-babel-register/-/metro-babel-register-0.49.1.tgz#b84d81690d41aab83ab288745863e0e21ad761c3"
integrity sha512-hBVAbX5xUPlEy0aKRvGCR4Yn309oGwKl3An6sOLHvtZB4z45eDVbaBSSaMW2q8IGwahdrunYdWtaLVESpBoX6Q==
>>>>>>> parent of b864e7e63e... Revert "Merge branch 'master' into 0.58-stable"
dependencies:
"@babel/core" "^7.0.0"
"@babel/plugin-proposal-class-properties" "^7.0.0"
@@ -4372,62 +4327,6 @@ metro-babel-register@^0.49.1:
core-js "^2.2.2"
escape-string-regexp "^1.0.5"
<<<<<<< HEAD
metro-babel7-plugin-react-transform@0.49.2:
version "0.49.2"
resolved "https://registry.yarnpkg.com/metro-babel7-plugin-react-transform/-/metro-babel7-plugin-react-transform-0.49.2.tgz#d4c43faa6f2b91cc1b244a36a5d708ae8d39dbb2"
integrity sha512-LpJT8UvqF/tvVqEwiLUTMjRPhEGdI8e2dr3424XaRANba3j0nqmrbKdJQsPE8TrcqMWR4RHmfsXk0ti5QrEvJg==
dependencies:
"@babel/helper-module-imports" "^7.0.0"
metro-cache@0.49.2:
version "0.49.2"
resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.49.2.tgz#355dd3dba9fbd805a7ca6f55646216d35ca98225"
integrity sha512-GFeK4bPQn/U9bbRlVPhu2dYMe/b/GsNOFPEResOxr0kQreHV81rs6Jzcr4pU+9HY7vFiEQ1oggnsLUmANuRyPQ==
dependencies:
jest-serializer "24.0.0-alpha.6"
metro-core "0.49.2"
mkdirp "^0.5.1"
rimraf "^2.5.4"
metro-config@0.49.2, metro-config@^0.49.1:
version "0.49.2"
resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.49.2.tgz#d9dd0cc32fdb9731b4685b0019c98874a6e4443b"
integrity sha512-olh50qIMWd+Mj47TQeFnIW9NIquMpfq2g2NT5k+rwI38Xfk+KBnV4BamxtzZuViH7eQI06+Cdyu4NvcZffBXGg==
dependencies:
cosmiconfig "^5.0.5"
metro "0.49.2"
metro-cache "0.49.2"
metro-core "0.49.2"
pretty-format "24.0.0-alpha.6"
metro-core@0.49.2, metro-core@^0.49.1:
version "0.49.2"
resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.49.2.tgz#e3d7f9f02454863fc047bd75c2e37d5544c72d1a"
integrity sha512-kqhvNPOUTUWOqfm4nFF8l0zWMp2BKO1BUx5KY7osFnVTUpDkuq9Iy433FqEFVhA2jUISrmnd0CTIPcDQyFNllQ==
dependencies:
jest-haste-map "24.0.0-alpha.6"
lodash.throttle "^4.1.1"
metro-resolver "0.49.2"
wordwrap "^1.0.0"
metro-memory-fs@^0.49.1:
version "0.49.2"
resolved "https://registry.yarnpkg.com/metro-memory-fs/-/metro-memory-fs-0.49.2.tgz#af3128b8a60d02d4aed427558b42c8d210a5543c"
integrity sha512-bt7ve7iud5gU4Duo9MVMqohJ0nBxILHmQxFhDXOvJnttiDuIfQQUK84pVlo8maNkFbN8uxEJPLBjpD1DC1IOxA==
metro-minify-uglify@0.49.2:
version "0.49.2"
resolved "https://registry.yarnpkg.com/metro-minify-uglify/-/metro-minify-uglify-0.49.2.tgz#f3b8615cb0e9afd714e4952842bcb9f4d71b4822"
integrity sha512-LfnR5N2784pnHe5ShioNkLHyUA1unDU6iLivehX2Waxno1oIP3xKYl/u/VTDET4L8AvLwa5HFACE2hbiWjGQ2Q==
dependencies:
uglify-es "^3.1.9"
metro-react-native-babel-preset@0.49.2:
version "0.49.2"
resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.49.2.tgz#8d53610e044e0c9a53a03d307e1c51f9e8577abc"
integrity sha512-N0+4ramShYCHSAVEPUNWIZuKZskWj8/RDSoinhadHpdpHORMbMxLkexSOVHLluB+XFQ+DENLEx5oVPYwOlENBA==
=======
metro-babel7-plugin-react-transform@0.49.1:
version "0.49.1"
resolved "https://registry.yarnpkg.com/metro-babel7-plugin-react-transform/-/metro-babel7-plugin-react-transform-0.49.1.tgz#eb34c351abe217df942113d95752a0989f4aa38e"
@@ -4435,6 +4334,13 @@ metro-babel7-plugin-react-transform@0.49.1:
dependencies:
"@babel/helper-module-imports" "^7.0.0"
metro-babel7-plugin-react-transform@0.49.2:
version "0.49.2"
resolved "https://registry.yarnpkg.com/metro-babel7-plugin-react-transform/-/metro-babel7-plugin-react-transform-0.49.2.tgz#d4c43faa6f2b91cc1b244a36a5d708ae8d39dbb2"
integrity sha512-LpJT8UvqF/tvVqEwiLUTMjRPhEGdI8e2dr3424XaRANba3j0nqmrbKdJQsPE8TrcqMWR4RHmfsXk0ti5QrEvJg==
dependencies:
"@babel/helper-module-imports" "^7.0.0"
metro-cache@0.49.1:
version "0.49.1"
resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.49.1.tgz#eebbf64d1b7711ca311444727e1e7a0d8cf3ebe3"
@@ -4445,6 +4351,16 @@ metro-cache@0.49.1:
mkdirp "^0.5.1"
rimraf "^2.5.4"
metro-cache@0.49.2:
version "0.49.2"
resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.49.2.tgz#355dd3dba9fbd805a7ca6f55646216d35ca98225"
integrity sha512-GFeK4bPQn/U9bbRlVPhu2dYMe/b/GsNOFPEResOxr0kQreHV81rs6Jzcr4pU+9HY7vFiEQ1oggnsLUmANuRyPQ==
dependencies:
jest-serializer "24.0.0-alpha.6"
metro-core "0.49.2"
mkdirp "^0.5.1"
rimraf "^2.5.4"
metro-config@0.49.1:
version "0.49.1"
resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.49.1.tgz#4db688461bc9a4bdebc884e1e65e9f22c172aadd"
@@ -4456,6 +4372,17 @@ metro-config@0.49.1:
metro-core "0.49.1"
pretty-format "24.0.0-alpha.4"
metro-config@0.49.2, metro-config@^0.49.1:
version "0.49.2"
resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.49.2.tgz#d9dd0cc32fdb9731b4685b0019c98874a6e4443b"
integrity sha512-olh50qIMWd+Mj47TQeFnIW9NIquMpfq2g2NT5k+rwI38Xfk+KBnV4BamxtzZuViH7eQI06+Cdyu4NvcZffBXGg==
dependencies:
cosmiconfig "^5.0.5"
metro "0.49.2"
metro-cache "0.49.2"
metro-core "0.49.2"
pretty-format "24.0.0-alpha.6"
metro-core@0.49.1, metro-core@^0.49.1:
version "0.49.1"
resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.49.1.tgz#552ccbd21273fb4a6ae88b1407a79d84966e47cc"
@@ -4466,6 +4393,16 @@ metro-core@0.49.1, metro-core@^0.49.1:
metro-resolver "0.49.1"
wordwrap "^1.0.0"
metro-core@0.49.2:
version "0.49.2"
resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.49.2.tgz#e3d7f9f02454863fc047bd75c2e37d5544c72d1a"
integrity sha512-kqhvNPOUTUWOqfm4nFF8l0zWMp2BKO1BUx5KY7osFnVTUpDkuq9Iy433FqEFVhA2jUISrmnd0CTIPcDQyFNllQ==
dependencies:
jest-haste-map "24.0.0-alpha.6"
lodash.throttle "^4.1.1"
metro-resolver "0.49.2"
wordwrap "^1.0.0"
metro-memory-fs@^0.49.1:
version "0.49.1"
resolved "https://registry.yarnpkg.com/metro-memory-fs/-/metro-memory-fs-0.49.1.tgz#e1f107c9d6b01492e4bf7d3261e59fa81373dee9"
@@ -4478,11 +4415,17 @@ metro-minify-uglify@0.49.1:
dependencies:
uglify-es "^3.1.9"
metro-minify-uglify@0.49.2:
version "0.49.2"
resolved "https://registry.yarnpkg.com/metro-minify-uglify/-/metro-minify-uglify-0.49.2.tgz#f3b8615cb0e9afd714e4952842bcb9f4d71b4822"
integrity sha512-LfnR5N2784pnHe5ShioNkLHyUA1unDU6iLivehX2Waxno1oIP3xKYl/u/VTDET4L8AvLwa5HFACE2hbiWjGQ2Q==
dependencies:
uglify-es "^3.1.9"
metro-react-native-babel-preset@0.49.1:
version "0.49.1"
resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.49.1.tgz#6df6195599055fe6010b81ad0e5a47c199e6a9c0"
integrity sha512-GYg2Sl7uVoRIvU4d3aN6UB65/aHxEU9GmjzFc7NWMQ1zkMZeRvcJaqZ5ijurNQLgN1TyEsIsKrV+3/KV9Xxnog==
>>>>>>> parent of b864e7e63e... Revert "Merge branch 'master' into 0.58-stable"
dependencies:
"@babel/plugin-proposal-class-properties" "^7.0.0"
"@babel/plugin-proposal-export-default-from" "^7.0.0"
@@ -4517,30 +4460,48 @@ metro-react-native-babel-preset@0.49.1:
"@babel/plugin-transform-typescript" "^7.0.0"
"@babel/plugin-transform-unicode-regex" "^7.0.0"
"@babel/template" "^7.0.0"
<<<<<<< HEAD
metro-babel7-plugin-react-transform "0.49.2"
metro-babel7-plugin-react-transform "0.49.1"
react-transform-hmr "^1.0.4"
metro-resolver@0.49.2:
metro-react-native-babel-preset@0.49.2:
version "0.49.2"
resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.49.2.tgz#b7580d7a24fdf96170a9d4099a66b29a18e6e5f8"
integrity sha512-Si9/A+jNQmVWlLSi6fXSG1tDEanYu99PMz/cAvM+aZy1yX9RyqfJzHzWVdr4lrNh+4DKCgDea94B9BjezqNYyw==
resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.49.2.tgz#8d53610e044e0c9a53a03d307e1c51f9e8577abc"
integrity sha512-N0+4ramShYCHSAVEPUNWIZuKZskWj8/RDSoinhadHpdpHORMbMxLkexSOVHLluB+XFQ+DENLEx5oVPYwOlENBA==
dependencies:
absolute-path "^0.0.0"
metro-source-map@0.49.2:
version "0.49.2"
resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.49.2.tgz#0f9e3d0286fc9549652c99b56b7aa2aec12372e7"
integrity sha512-gUQ9wq8iR05QeMqRbAJ+L961LVfoNKLBXSeEzHxoDNSwZ7jFYLMKn0ofLlfMy0S1javZGisS51l5OScLt83naQ==
dependencies:
source-map "^0.5.6"
metro@0.49.2, metro@^0.49.1:
version "0.49.2"
resolved "https://registry.yarnpkg.com/metro/-/metro-0.49.2.tgz#0fd615d9f451893a0816721b46e94dcf49dda0f6"
integrity sha512-GSNMigeQq+QQ++qwEnWx0hjtYCZIvogn4JuqpKqOyVqNbg+aIheJPvxfDzjF9OXM5WHuNsTfGLW8n5kbUmQJSg==
=======
metro-babel7-plugin-react-transform "0.49.1"
"@babel/plugin-proposal-class-properties" "^7.0.0"
"@babel/plugin-proposal-export-default-from" "^7.0.0"
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0"
"@babel/plugin-proposal-object-rest-spread" "^7.0.0"
"@babel/plugin-proposal-optional-catch-binding" "^7.0.0"
"@babel/plugin-proposal-optional-chaining" "^7.0.0"
"@babel/plugin-syntax-dynamic-import" "^7.0.0"
"@babel/plugin-syntax-export-default-from" "^7.0.0"
"@babel/plugin-transform-arrow-functions" "^7.0.0"
"@babel/plugin-transform-block-scoping" "^7.0.0"
"@babel/plugin-transform-classes" "^7.0.0"
"@babel/plugin-transform-computed-properties" "^7.0.0"
"@babel/plugin-transform-destructuring" "^7.0.0"
"@babel/plugin-transform-exponentiation-operator" "^7.0.0"
"@babel/plugin-transform-flow-strip-types" "^7.0.0"
"@babel/plugin-transform-for-of" "^7.0.0"
"@babel/plugin-transform-function-name" "^7.0.0"
"@babel/plugin-transform-literals" "^7.0.0"
"@babel/plugin-transform-modules-commonjs" "^7.0.0"
"@babel/plugin-transform-object-assign" "^7.0.0"
"@babel/plugin-transform-parameters" "^7.0.0"
"@babel/plugin-transform-react-display-name" "^7.0.0"
"@babel/plugin-transform-react-jsx" "^7.0.0"
"@babel/plugin-transform-react-jsx-source" "^7.0.0"
"@babel/plugin-transform-regenerator" "^7.0.0"
"@babel/plugin-transform-runtime" "^7.0.0"
"@babel/plugin-transform-shorthand-properties" "^7.0.0"
"@babel/plugin-transform-spread" "^7.0.0"
"@babel/plugin-transform-sticky-regex" "^7.0.0"
"@babel/plugin-transform-template-literals" "^7.0.0"
"@babel/plugin-transform-typescript" "^7.0.0"
"@babel/plugin-transform-unicode-regex" "^7.0.0"
"@babel/template" "^7.0.0"
metro-babel7-plugin-react-transform "0.49.2"
react-transform-hmr "^1.0.4"
metro-resolver@0.49.1:
@@ -4550,6 +4511,13 @@ metro-resolver@0.49.1:
dependencies:
absolute-path "^0.0.0"
metro-resolver@0.49.2:
version "0.49.2"
resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.49.2.tgz#b7580d7a24fdf96170a9d4099a66b29a18e6e5f8"
integrity sha512-Si9/A+jNQmVWlLSi6fXSG1tDEanYu99PMz/cAvM+aZy1yX9RyqfJzHzWVdr4lrNh+4DKCgDea94B9BjezqNYyw==
dependencies:
absolute-path "^0.0.0"
metro-source-map@0.49.1:
version "0.49.1"
resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.49.1.tgz#2e216830f103a351d2d72fc48540eb7fcd317423"
@@ -4557,11 +4525,17 @@ metro-source-map@0.49.1:
dependencies:
source-map "^0.5.6"
metro-source-map@0.49.2:
version "0.49.2"
resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.49.2.tgz#0f9e3d0286fc9549652c99b56b7aa2aec12372e7"
integrity sha512-gUQ9wq8iR05QeMqRbAJ+L961LVfoNKLBXSeEzHxoDNSwZ7jFYLMKn0ofLlfMy0S1javZGisS51l5OScLt83naQ==
dependencies:
source-map "^0.5.6"
metro@0.49.1, metro@^0.49.1:
version "0.49.1"
resolved "https://registry.yarnpkg.com/metro/-/metro-0.49.1.tgz#a59e00901640a4c4a856ad6f6129634cdb55e31e"
integrity sha512-TJbeL7lPs7CS4Ja7tLUmYPfTQa0TmtNBgiSTOlV54iD6pPjJrJeJgiJGeDfl8cPXXd6xNfcopX5AGg9nh2eCnw==
>>>>>>> parent of b864e7e63e... Revert "Merge branch 'master' into 0.58-stable"
dependencies:
"@babel/core" "^7.0.0"
"@babel/generator" "^7.0.0"
@@ -4584,20 +4558,6 @@ metro@0.49.1, metro@^0.49.1:
fs-extra "^1.0.0"
graceful-fs "^4.1.3"
image-size "^0.6.0"
<<<<<<< HEAD
jest-haste-map "24.0.0-alpha.6"
jest-worker "24.0.0-alpha.6"
json-stable-stringify "^1.0.1"
lodash.throttle "^4.1.1"
merge-stream "^1.0.1"
metro-cache "0.49.2"
metro-config "0.49.2"
metro-core "0.49.2"
metro-minify-uglify "0.49.2"
metro-react-native-babel-preset "0.49.2"
metro-resolver "0.49.2"
metro-source-map "0.49.2"
=======
jest-haste-map "24.0.0-alpha.4"
jest-worker "24.0.0-alpha.4"
json-stable-stringify "^1.0.1"
@@ -4610,7 +4570,61 @@ metro@0.49.1, metro@^0.49.1:
metro-react-native-babel-preset "0.49.1"
metro-resolver "0.49.1"
metro-source-map "0.49.1"
>>>>>>> parent of b864e7e63e... Revert "Merge branch 'master' into 0.58-stable"
mime-types "2.1.11"
mkdirp "^0.5.1"
node-fetch "^2.2.0"
nullthrows "^1.1.0"
react-transform-hmr "^1.0.4"
resolve "^1.5.0"
rimraf "^2.5.4"
serialize-error "^2.1.0"
source-map "^0.5.6"
temp "0.8.3"
throat "^4.1.0"
wordwrap "^1.0.0"
write-file-atomic "^1.2.0"
ws "^1.1.0"
xpipe "^1.0.5"
yargs "^9.0.0"
metro@0.49.2:
version "0.49.2"
resolved "https://registry.yarnpkg.com/metro/-/metro-0.49.2.tgz#0fd615d9f451893a0816721b46e94dcf49dda0f6"
integrity sha512-GSNMigeQq+QQ++qwEnWx0hjtYCZIvogn4JuqpKqOyVqNbg+aIheJPvxfDzjF9OXM5WHuNsTfGLW8n5kbUmQJSg==
dependencies:
"@babel/core" "^7.0.0"
"@babel/generator" "^7.0.0"
"@babel/parser" "^7.0.0"
"@babel/plugin-external-helpers" "^7.0.0"
"@babel/template" "^7.0.0"
"@babel/traverse" "^7.0.0"
"@babel/types" "^7.0.0"
absolute-path "^0.0.0"
async "^2.4.0"
babel-preset-fbjs "^3.0.1"
buffer-crc32 "^0.2.13"
chalk "^1.1.1"
concat-stream "^1.6.0"
connect "^3.6.5"
debug "^2.2.0"
denodeify "^1.2.1"
eventemitter3 "^3.0.0"
fbjs "^1.0.0"
fs-extra "^1.0.0"
graceful-fs "^4.1.3"
image-size "^0.6.0"
jest-haste-map "24.0.0-alpha.6"
jest-worker "24.0.0-alpha.6"
json-stable-stringify "^1.0.1"
lodash.throttle "^4.1.1"
merge-stream "^1.0.1"
metro-cache "0.49.2"
metro-config "0.49.2"
metro-core "0.49.2"
metro-minify-uglify "0.49.2"
metro-react-native-babel-preset "0.49.2"
metro-resolver "0.49.2"
metro-source-map "0.49.2"
mime-types "2.1.11"
mkdirp "^0.5.1"
node-fetch "^2.2.0"
@@ -5397,11 +5411,7 @@ pretty-format@24.0.0-alpha.4:
ansi-regex "^4.0.0"
ansi-styles "^3.2.0"
<<<<<<< HEAD
pretty-format@24.0.0-alpha.6:
=======
pretty-format@24.0.0-alpha.6, pretty-format@^24.0.0-alpha.6:
>>>>>>> parent of b864e7e63e... Revert "Merge branch 'master' into 0.58-stable"
version "24.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.0.0-alpha.6.tgz#25ad2fa46b342d6278bf241c5d2114d4376fbac1"
integrity sha512-zG2m6YJeuzwBFqb5EIdmwYVf30sap+iMRuYNPytOccEXZMAJbPIFGKVJ/U0WjQegmnQbRo9CI7j6j3HtDaifiA==
@@ -5549,9 +5559,9 @@ react-devtools-core@^3.4.2:
ws "^3.3.1"
react-is@^16.6.3:
version "16.6.3"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.6.3.tgz#d2d7462fcfcbe6ec0da56ad69047e47e56e7eac0"
integrity sha512-u7FDWtthB4rWibG/+mFbVd5FvdI20yde86qKGx4lVUTWmPlSWQ4QxbBIrrs+HnXGbxOUlUzTAP/VDmvCwaP2yA==
version "16.7.0"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.7.0.tgz#c1bd21c64f1f1364c6f70695ec02d69392f41bfa"
integrity sha512-Z0VRQdF4NPDoI0tsXVMLkJLiwEBa+RP66g0xDHxgxysxSoCUccSten4RTF/UFvZF1dZvZ9Zu1sx+MDXwcOR34g==
react-native-dummy@0.1.0:
version "0.1.0"
@@ -5976,9 +5986,9 @@ sax@~1.1.1:
integrity sha1-XWFr6KXmB9VOEUr65Vt+ry/MMkA=
scheduler@^0.11.2:
version "0.11.2"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.11.2.tgz#a8db5399d06eba5abac51b705b7151d2319d33d3"
integrity sha512-+WCP3s3wOaW4S7C1tl3TEXp4l9lJn0ZK8G3W3WKRWmw77Z2cIFUW2MiNTMHn5sCjxN+t7N43HAOOgMjyAg5hlg==
version "0.11.3"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.11.3.tgz#b5769b90cf8b1464f3f3cfcafe8e3cd7555a2d6b"
integrity sha512-i9X9VRRVZDd3xZw10NY5Z2cVMbdYg6gqFecfj79USv1CFN+YrJ3gIPRKf1qlY+Sxly4djoKdfx1T+m9dnRB8kQ==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"