Skip to content

Commit 4b90014

Browse files
authored
Merge pull request #2628 from StoDevX/update-react-navigation-et-r-n-material-bottom-tabs
Update react-navigation et react-navigation-material-bottom-tabs
2 parents 2ccc13f + b075159 commit 4b90014

File tree

2 files changed

+67
-65
lines changed

2 files changed

+67
-65
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@
113113
"react-native-tableview-simple": "0.17.5",
114114
"react-native-typography": "1.3.0",
115115
"react-native-vector-icons": "4.6.0",
116-
"react-navigation": "2.0.0",
117-
"react-navigation-material-bottom-tabs": "0.2.0",
116+
"react-navigation": "2.2.0",
117+
"react-navigation-material-bottom-tabs": "0.3.0",
118118
"react-redux": "5.0.7",
119119
"redux": "3.7.2",
120120
"redux-logger": "3.0.6",

yarn.lock

Lines changed: 65 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -2155,8 +2155,8 @@ deep-is@~0.1.3:
21552155
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
21562156

21572157
deepmerge@^2.1.0:
2158-
version "2.1.0"
2159-
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.1.0.tgz#511a54fff405fc346f0240bb270a3e9533a31102"
2158+
version "2.1.1"
2159+
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.1.1.tgz#e862b4e45ea0555072bf51e7fd0d9845170ae768"
21602160

21612161
default-require-extensions@^1.0.0:
21622162
version "1.0.0"
@@ -3256,11 +3256,7 @@ [email protected]:
32563256
version "4.2.0"
32573257
resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
32583258

3259-
hoist-non-react-statics@^2.2.0:
3260-
version "2.3.1"
3261-
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz#343db84c6018c650778898240135a1420ee22ce0"
3262-
3263-
hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
3259+
hoist-non-react-statics@^2.2.0, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
32643260
version "2.5.0"
32653261
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40"
32663262

@@ -3358,10 +3354,16 @@ [email protected]:
33583354
cheerio "0.20.0"
33593355
color-logger "0.0.3"
33603356

3361-
[email protected], iconv-lite@^0.4.17, iconv-lite@^0.4.8, iconv-lite@~0.4.13:
3357+
[email protected], iconv-lite@^0.4.17, iconv-lite@^0.4.8:
33623358
version "0.4.19"
33633359
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
33643360

3361+
iconv-lite@~0.4.13:
3362+
version "0.4.23"
3363+
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
3364+
dependencies:
3365+
safer-buffer ">= 2.1.2 < 3"
3366+
33653367
ieee754@^1.1.4:
33663368
version "1.1.8"
33673369
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
@@ -5556,15 +5558,15 @@ promise@^7.1.1:
55565558
dependencies:
55575559
asap "~2.0.3"
55585560

5559-
[email protected], prop-types@^15.6.1:
5561+
[email protected], prop-types@^15.5.10, prop-types@^15.6.0, prop-types@^15.6.1:
55605562
version "15.6.1"
55615563
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
55625564
dependencies:
55635565
fbjs "^0.8.16"
55645566
loose-envify "^1.3.1"
55655567
object-assign "^4.1.1"
55665568

5567-
prop-types@^15.5.1, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0:
5569+
prop-types@^15.5.1, prop-types@^15.5.8:
55685570
version "15.6.0"
55695571
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
55705572
dependencies:
@@ -5643,15 +5645,7 @@ react-is@^16.4.0:
56435645
version "16.4.0"
56445646
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.4.0.tgz#cc9fdc855ac34d2e7d9d2eb7059bbc240d35ffcf"
56455647

5646-
react-lifecycles-compat@^1.0.2:
5647-
version "1.1.4"
5648-
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-1.1.4.tgz#fc005c72849b7ed364de20a0f64ff58ebdc2009a"
5649-
5650-
react-lifecycles-compat@^3, react-lifecycles-compat@^3.0.2:
5651-
version "3.0.2"
5652-
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.2.tgz#7279047275bd727a912e25f734c0559527e84eff"
5653-
5654-
react-lifecycles-compat@^3.0.4:
5648+
react-lifecycles-compat@^3, react-lifecycles-compat@^3.0.4:
56555649
version "3.0.4"
56565650
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
56575651

@@ -5719,15 +5713,15 @@ [email protected]:
57195713
version "3.2.2"
57205714
resolved "https://registry.yarnpkg.com/react-native-network-info/-/react-native-network-info-3.2.2.tgz#93625587ab5ae31b7c853f37ec2b75a0af6c936d"
57215715

5722-
5723-
version "2.0.0-alpha.0"
5724-
resolved "https://registry.yarnpkg.com/react-native-paper/-/react-native-paper-2.0.0-alpha.0.tgz#20ddb59926a45333841db7bb35911543b390cd2e"
5716+
5717+
version "2.0.0-alpha.4"
5718+
resolved "https://registry.yarnpkg.com/react-native-paper/-/react-native-paper-2.0.0-alpha.4.tgz#2186fd85e3e5aee368a0861f6a302015e76f24d9"
57255719
dependencies:
57265720
color "^2.0.1"
57275721
create-react-context "^0.2.2"
57285722
deepmerge "^2.1.0"
57295723
hoist-non-react-statics "^2.5.0"
5730-
react-lifecycles-compat "^3.0.2"
5724+
react-lifecycles-compat "^3.0.4"
57315725

57325726
57335727
version "0.0.6"
@@ -5743,6 +5737,12 @@ react-native-safe-area-view@^0.7.0:
57435737
dependencies:
57445738
hoist-non-react-statics "^2.3.1"
57455739

5740+
react-native-safe-area-view@^0.8.0:
5741+
version "0.8.0"
5742+
resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.8.0.tgz#22d78cb8e8658d04a10cd53c1546e0bc86cb7aea"
5743+
dependencies:
5744+
hoist-non-react-statics "^2.3.1"
5745+
57465746
57475747
version "3.4.2"
57485748
resolved "https://registry.yarnpkg.com/react-native-search-bar/-/react-native-search-bar-3.4.2.tgz#8606bb1d6b29a26dd5ee86cfae00f7253181736d"
@@ -5756,23 +5756,17 @@ [email protected]:
57565756
lodash "^4.16.4"
57575757
react-native-vector-icons "^4.4.2"
57585758

5759-
react-native-tab-view@^0.0.74:
5760-
version "0.0.74"
5761-
resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-0.0.74.tgz#62c0c882d9232b461ce181d440d683b4f99d1bd8"
5762-
dependencies:
5763-
prop-types "^15.6.0"
5764-
5765-
react-native-tab-view@~0.0.77:
5759+
react-native-tab-view@^0.0.77:
57665760
version "0.0.77"
57675761
resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-0.0.77.tgz#11ceb8e7c23100d07e628dc151b57797524d00d4"
57685762
dependencies:
57695763
prop-types "^15.6.0"
57705764

5771-
react-native-tab-view@~0.0.78:
5772-
version "0.0.78"
5773-
resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-0.0.78.tgz#9b90730d89cbd34a03f0e0ab10e74ca7af945560"
5765+
react-native-tab-view@^1.0.0:
5766+
version "1.0.2"
5767+
resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-1.0.2.tgz#66e0bc6d38a227ed2b212e3a256b7902f6ce02ed"
57745768
dependencies:
5775-
prop-types "^15.6.0"
5769+
prop-types "^15.6.1"
57765770

57775771
57785772
version "0.17.5"
@@ -5856,44 +5850,44 @@ [email protected]:
58565850
xmldoc "^0.4.0"
58575851
yargs "^9.0.0"
58585852

5859-
react-navigation-deprecated-tab-navigator@1.2.0:
5860-
version "1.2.0"
5861-
resolved "https://registry.yarnpkg.com/react-navigation-deprecated-tab-navigator/-/react-navigation-deprecated-tab-navigator-1.2.0.tgz#e0d969c196dcd3a4a440770a7bd97fa058eb4aaf"
5853+
react-navigation-deprecated-tab-navigator@1.3.0:
5854+
version "1.3.0"
5855+
resolved "https://registry.yarnpkg.com/react-navigation-deprecated-tab-navigator/-/react-navigation-deprecated-tab-navigator-1.3.0.tgz#015dcae1e977b984ca7e99245261c15439026bb7"
58625856
dependencies:
5863-
react-native-tab-view "^0.0.74"
5857+
react-native-tab-view "^0.0.77"
58645858

5865-
react-navigation-material-bottom-tabs@0.2.0:
5866-
version "0.2.0"
5867-
resolved "https://registry.yarnpkg.com/react-navigation-material-bottom-tabs/-/react-navigation-material-bottom-tabs-0.2.0.tgz#0e6783a713483f6c6df16e7aa891a00ff283e657"
5859+
react-navigation-material-bottom-tabs@0.3.0:
5860+
version "0.3.0"
5861+
resolved "https://registry.yarnpkg.com/react-navigation-material-bottom-tabs/-/react-navigation-material-bottom-tabs-0.3.0.tgz#7fae682a41c1c290f2584fe50879e36b41da5394"
58685862
dependencies:
58695863
hoist-non-react-statics "^2.5.0"
58705864
prop-types "^15.6.0"
5871-
react-native-paper "2.0.0-alpha.0"
5872-
react-navigation-tabs "^0.3.0"
5865+
react-native-paper "2.0.0-alpha.4"
5866+
react-navigation-tabs "^0.4.0"
58735867

5874-
react-navigation-tabs@0.2.0:
5875-
version "0.2.0"
5876-
resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-0.2.0.tgz#d25be64e01a728c893a93cfeee6b176ab74d67de"
5868+
react-navigation-tabs@0.5.0:
5869+
version "0.5.0"
5870+
resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-0.5.0.tgz#74d5511270742a0b67c46fe65a1b19e553763819"
58775871
dependencies:
58785872
hoist-non-react-statics "^2.5.0"
5879-
prop-types "^15.6.0"
5880-
react-lifecycles-compat "^1.0.2"
5873+
prop-types "^15.6.1"
5874+
react-lifecycles-compat "^3.0.4"
58815875
react-native-safe-area-view "^0.7.0"
5882-
react-native-tab-view "~0.0.77"
5876+
react-native-tab-view "^1.0.0"
58835877

5884-
react-navigation-tabs@^0.3.0:
5885-
version "0.3.0"
5886-
resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-0.3.0.tgz#b1fe7ef1c665dd8928fafcc8622616e220ae5efa"
5878+
react-navigation-tabs@^0.4.0:
5879+
version "0.4.1"
5880+
resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-0.4.1.tgz#b367535c1b00fc2046341ae93cb8d3e8e0b96a11"
58875881
dependencies:
58885882
hoist-non-react-statics "^2.5.0"
5889-
prop-types "^15.6.0"
5883+
prop-types "^15.6.1"
58905884
react-lifecycles-compat "^3.0.4"
58915885
react-native-safe-area-view "^0.7.0"
5892-
react-native-tab-view "~0.0.78"
5886+
react-native-tab-view "^1.0.0"
58935887

5894-
react-navigation@2.0.0:
5895-
version "2.0.0"
5896-
resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-2.0.0.tgz#f3e7ed29dd8366fd3542b6009a4f6ce4ffa37932"
5888+
react-navigation@2.2.0:
5889+
version "2.2.0"
5890+
resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-2.2.0.tgz#d220ba1d1168252809c72d6d849ef4ac901773a3"
58975891
dependencies:
58985892
clamp "^1.0.1"
58995893
create-react-context "^0.2.1"
@@ -5902,9 +5896,9 @@ [email protected]:
59025896
prop-types "^15.5.10"
59035897
react-lifecycles-compat "^3"
59045898
react-native-drawer-layout-polyfill "^1.3.2"
5905-
react-native-safe-area-view "^0.7.0"
5906-
react-navigation-deprecated-tab-navigator "1.2.0"
5907-
react-navigation-tabs "0.2.0"
5899+
react-native-safe-area-view "^0.8.0"
5900+
react-navigation-deprecated-tab-navigator "1.3.0"
5901+
react-navigation-tabs "0.5.0"
59085902

59095903
react-proxy@^1.1.7:
59105904
version "1.1.8"
@@ -6317,6 +6311,10 @@ safe-regex@^1.1.0:
63176311
dependencies:
63186312
ret "~0.1.10"
63196313

6314+
"safer-buffer@>= 2.1.2 < 3":
6315+
version "2.1.2"
6316+
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
6317+
63206318
sane@^2.0.0:
63216319
version "2.2.0"
63226320
resolved "https://registry.yarnpkg.com/sane/-/sane-2.2.0.tgz#d6d2e2fcab00e3d283c93b912b7c3a20846f1d56"
@@ -6946,8 +6944,8 @@ typedarray@^0.0.6:
69466944
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
69476945

69486946
ua-parser-js@^0.7.9:
6949-
version "0.7.17"
6950-
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
6947+
version "0.7.18"
6948+
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed"
69516949

69526950
uglify-es@^3.1.9:
69536951
version "3.3.8"
@@ -7124,7 +7122,11 @@ whatwg-encoding@^1.0.1:
71247122
dependencies:
71257123
iconv-lite "0.4.19"
71267124

7127-
whatwg-fetch@>=0.10.0, whatwg-fetch@^1.0.0:
7125+
whatwg-fetch@>=0.10.0:
7126+
version "2.0.4"
7127+
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
7128+
7129+
whatwg-fetch@^1.0.0:
71287130
version "1.1.1"
71297131
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-1.1.1.tgz#ac3c9d39f320c6dce5339969d054ef43dd333319"
71307132

0 commit comments

Comments
 (0)