Skip to content

Commit 84c1a41

Browse files
cyrus25cyrus25
authored
Merge pull request GeekyAnts#31 from GeekyAnts/development
Upgraded nb version to 3.3.6
2 parents 6755db3 + 68a51f4 commit 84c1a41

File tree

26 files changed

+810
-820
lines changed

26 files changed

+810
-820
lines changed

‎cra-template-nativebase-typescript/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cra-template-nativebase-typescript",
3-
"version": "1.1.6",
3+
"version": "1.1.7",
44
"keywords": [
55
"react",
66
"create-react-app",

‎cra-template-nativebase-typescript/template.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@
1111
"@types/react-native": "^0.65.5",
1212
"typescript": "^4.1.2",
1313
"web-vitals": "^2.1.1",
14-
"native-base": "3.2.2",
14+
"native-base": "3.3.6",
1515
"react-native-safe-area-context": "^3.2.0",
1616
"react-native-svg": "^12.1.1",
1717
"react-native-web": "^0.17.5"
1818
},
1919
"eslintConfig": {
20-
"extends": ["react-app", "react-app/jest"]
20+
"extends": [
21+
"react-app",
22+
"react-app/jest"
23+
]
2124
}
2225
}
23-
}
26+
}

‎cra-template-nativebase/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cra-template-nativebase",
3-
"version": "1.1.6",
3+
"version": "1.1.7",
44
"keywords": [
55
"react",
66
"create-react-app",

‎cra-template-nativebase/template.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,16 @@
55
"@testing-library/react": "^11.1.0",
66
"@testing-library/user-event": "^12.1.10",
77
"web-vitals": "^1.0.1",
8-
"native-base": "3.2.2",
8+
"native-base": "3.3.6",
99
"react-native-safe-area-context": "^3.2.0",
1010
"react-native-svg": "^12.1.1",
1111
"react-native-web": "^0.16.0"
1212
},
1313
"eslintConfig": {
14-
"extends": ["react-app", "react-app/jest"]
14+
"extends": [
15+
"react-app",
16+
"react-app/jest"
17+
]
1518
}
1619
}
17-
}
20+
}

‎expo-nativebase-typescript/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "expo-template-native-base-typescript",
3-
"version": "1.0.7",
3+
"version": "1.0.8",
44
"main": "node_modules/expo/AppEntry.js",
55
"keywords": [
66
"react",
@@ -26,7 +26,7 @@
2626
"dependencies": {
2727
"expo": "~42.0.0",
2828
"expo-status-bar": "~1.0.4",
29-
"native-base": "3.2.2",
29+
"native-base": "3.3.6",
3030
"react": "16.13.1",
3131
"react-dom": "16.13.1",
3232
"react-native": "https://github.com/expo/react-native/archive/sdk-42.0.0.tar.gz",

‎expo-nativebase-typescript/yarn.lock

+96-46
Original file line numberDiff line numberDiff line change
@@ -1752,14 +1752,14 @@
17521752
"@react-types/listbox" "^3.1.1"
17531753
"@react-types/shared" "^3.4.0"
17541754

1755-
"@react-native-aria/overlays@^0.3.2":
1756-
version "0.3.2"
1757-
resolved "https://registry.yarnpkg.com/@react-native-aria/overlays/-/overlays-0.3.2.tgz#fe3fb983b197738237493c3e5af6b30f6da6be9d"
1758-
integrity sha512-sc2attCn+stKugBF8ZBz+EIdGoEHU/+NbJc5agS6lZWeemXL5LcgomNf6Tn7RUlpLfWOTEGBQOAiOZxjZnIQmQ==
1755+
"@react-native-aria/[email protected].3-rc.0":
1756+
version "0.3.3-rc.0"
1757+
resolved "https://registry.yarnpkg.com/@react-native-aria/overlays/-/overlays-0.3.3-rc.0.tgz#9041ddd6f151e6edb50c971d29920c458aa41459"
1758+
integrity sha512-RgaIYIHMltt0RdMrVwfXLAVxc22TIUY1Yx07HbQRMdt4LcSmU8pyp5CEtJ/MQCXceuqocnXfsUxyHOSnfhmfpA==
17591759
dependencies:
17601760
"@react-aria/interactions" "^3.3.2"
17611761
"@react-aria/overlays" "^3.7.0"
1762-
"@react-native-aria/utils" "^0.2.6"
1762+
"@react-native-aria/utils" "^0.2.8"
17631763
"@react-stately/overlays" "^3.1.1"
17641764
"@react-types/overlays" "^3.4.0"
17651765
dom-helpers "^5.0.0"
@@ -2433,6 +2433,11 @@
24332433
expo-modules-autolinking "^0.0.2"
24342434
invariant "^2.2.4"
24352435

2436+
"@yarnpkg/lockfile@^1.1.0":
2437+
version "1.1.0"
2438+
resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
2439+
integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
2440+
24362441
abort-controller@^3.0.0:
24372442
version "3.0.0"
24382443
resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
@@ -3874,6 +3879,13 @@ find-up@~5.0.0:
38743879
locate-path "^6.0.0"
38753880
path-exists "^4.0.0"
38763881

3882+
find-yarn-workspace-root@^2.0.0:
3883+
version "2.0.0"
3884+
resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd"
3885+
integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==
3886+
dependencies:
3887+
micromatch "^4.0.2"
3888+
38773889
fontfaceobserver@^2.1.0:
38783890
version "2.1.0"
38793891
resolved "https://registry.yarnpkg.com/fontfaceobserver/-/fontfaceobserver-2.1.0.tgz#e2705d293e2c585a6531c2a722905657317a2991"
@@ -3915,6 +3927,15 @@ fs-extra@^1.0.0:
39153927
jsonfile "^2.1.0"
39163928
klaw "^1.0.0"
39173929

3930+
fs-extra@^7.0.1:
3931+
version "7.0.1"
3932+
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
3933+
integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
3934+
dependencies:
3935+
graceful-fs "^4.1.2"
3936+
jsonfile "^4.0.0"
3937+
universalify "^0.1.0"
3938+
39183939
fs-extra@^8.1.0:
39193940
version "8.1.0"
39203941
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -4278,6 +4299,11 @@ is-directory@^0.3.1:
42784299
resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
42794300
integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
42804301

4302+
is-docker@^2.0.0:
4303+
version "2.2.1"
4304+
resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
4305+
integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
4306+
42814307
is-extendable@^0.1.0, is-extendable@^0.1.1:
42824308
version "0.1.1"
42834309
resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -4351,6 +4377,13 @@ is-wsl@^1.1.0:
43514377
resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
43524378
integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
43534379

4380+
is-wsl@^2.1.1:
4381+
version "2.2.0"
4382+
resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
4383+
integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
4384+
dependencies:
4385+
is-docker "^2.0.0"
4386+
43544387
[email protected], isarray@~1.0.0:
43554388
version "1.0.0"
43564389
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -4590,6 +4623,13 @@ kind-of@^6.0.0, kind-of@^6.0.2:
45904623
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
45914624
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
45924625

4626+
klaw-sync@^6.0.0:
4627+
version "6.0.0"
4628+
resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c"
4629+
integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==
4630+
dependencies:
4631+
graceful-fs "^4.1.11"
4632+
45934633
klaw@^1.0.0:
45944634
version "1.3.1"
45954635
resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
@@ -5056,7 +5096,7 @@ micromatch@^3.1.10, micromatch@^3.1.4:
50565096
snapdragon "^0.8.1"
50575097
to-regex "^3.0.2"
50585098

5059-
micromatch@^4.0.4:
5099+
micromatch@^4.0.2, micromatch@^4.0.4:
50605100
version "4.0.4"
50615101
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
50625102
integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
@@ -5172,45 +5212,10 @@ nanomatch@^1.2.9:
51725212
snapdragon "^0.8.1"
51735213
to-regex "^3.0.1"
51745214

5175-
[email protected]:
5176-
version "3.2.2"
5177-
resolved "https://registry.yarnpkg.com/native-base/-/native-base-3.2.2.tgz#a802875ac68884b4dbd2ad29c341f3f64f1fc3c5"
5178-
integrity sha512-QcCjCAHeTXSMlXm9tCc1iYyqPVVvP5hij2VNgFo79GmMjNN6mYHqiiCz0tWKMQM+T4soRXlvrqWWTpo8AlUvQg==
5179-
dependencies:
5180-
"@react-aria/focus" "^3.2.3"
5181-
"@react-aria/utils" "^3.6.0"
5182-
"@react-aria/visually-hidden" "^3.2.1"
5183-
"@react-native-aria/button" "^0.2.4"
5184-
"@react-native-aria/checkbox" "^0.2.2"
5185-
"@react-native-aria/combobox" "^0.2.4-alpha.0"
5186-
"@react-native-aria/focus" "^0.2.4"
5187-
"@react-native-aria/interactions" "^0.2.2"
5188-
"@react-native-aria/listbox" "^0.2.4-alpha.3"
5189-
"@react-native-aria/overlays" "^0.3.2"
5190-
"@react-native-aria/radio" "^0.2.4"
5191-
"@react-native-aria/slider" "^0.2.5-alpha.1"
5192-
"@react-native-aria/tabs" "^0.2.7"
5193-
"@react-native-aria/utils" "^0.2.8"
5194-
"@react-stately/checkbox" "^3.0.1"
5195-
"@react-stately/collections" "^3.3.0"
5196-
"@react-stately/combobox" "^3.0.0-alpha.1"
5197-
"@react-stately/radio" "^3.2.1"
5198-
"@react-stately/slider" "^3.0.1"
5199-
"@react-stately/tabs" "^3.0.0-alpha.1"
5200-
"@react-stately/toggle" "^3.2.1"
5201-
"@types/lodash.has" "^4.5.6"
5202-
lodash.clonedeep "^4.5.0"
5203-
lodash.get "^4.4.2"
5204-
lodash.has "^4.5.2"
5205-
lodash.isempty "^4.4.0"
5206-
lodash.isequal "^4.5.0"
5207-
lodash.isnil "^4.0.0"
5208-
lodash.merge "^4.6.2"
5209-
lodash.mergewith "^4.6.2"
5210-
lodash.omit "^4.5.0"
5211-
lodash.omitby "^4.6.0"
5212-
lodash.pick "^4.4.0"
5213-
tinycolor2 "^1.4.2"
5215+
[email protected]:
5216+
version "3.3.6"
5217+
resolved "https://registry.yarnpkg.com/native-base/-/native-base-3.3.6.tgz#031ab776433b2e8a4fe4f7f525b8319452d4255c"
5218+
integrity sha512-AR2cB8MOvjEx+kn93habOzHu8odsG1FfOreKkcqEy5HUvCyiWLusE36fGThl3tXduzwdOo9hdRb+ZVFav1EraQ==
52145219

52155220
[email protected]:
52165221
version "0.6.2"
@@ -5372,6 +5377,14 @@ open@^6.2.0:
53725377
dependencies:
53735378
is-wsl "^1.1.0"
53745379

5380+
open@^7.4.2:
5381+
version "7.4.2"
5382+
resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
5383+
integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
5384+
dependencies:
5385+
is-docker "^2.0.0"
5386+
is-wsl "^2.1.1"
5387+
53755388
options@>=0.0.5:
53765389
version "0.0.6"
53775390
resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
@@ -5481,6 +5494,25 @@ pascalcase@^0.1.1:
54815494
resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
54825495
integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
54835496

5497+
patch-package@^6.4.7:
5498+
version "6.4.7"
5499+
resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.4.7.tgz#2282d53c397909a0d9ef92dae3fdeb558382b148"
5500+
integrity sha512-S0vh/ZEafZ17hbhgqdnpunKDfzHQibQizx9g8yEf5dcVk3KOflOfdufRXQX8CSEkyOQwuM/bNz1GwKvFj54kaQ==
5501+
dependencies:
5502+
"@yarnpkg/lockfile" "^1.1.0"
5503+
chalk "^2.4.2"
5504+
cross-spawn "^6.0.5"
5505+
find-yarn-workspace-root "^2.0.0"
5506+
fs-extra "^7.0.1"
5507+
is-ci "^2.0.0"
5508+
klaw-sync "^6.0.0"
5509+
minimist "^1.2.0"
5510+
open "^7.4.2"
5511+
rimraf "^2.6.3"
5512+
semver "^5.6.0"
5513+
slash "^2.0.0"
5514+
tmp "^0.0.33"
5515+
54845516
path-browserify@^1.0.0:
54855517
version "1.0.1"
54865518
resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
@@ -5681,6 +5713,19 @@ react-is@^17.0.1:
56815713
resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
56825714
integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
56835715

5716+
react-native-iphone-x-helper@^1.0.3:
5717+
version "1.3.1"
5718+
resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz#20c603e9a0e765fd6f97396638bdeb0e5a60b010"
5719+
integrity sha512-HOf0jzRnq2/aFUcdCJ9w9JGzN3gdEg0zFE4FyYlp4jtidqU03D5X7ZegGKfT1EWteR0gPBGp9ye5T5FvSWi9Yg==
5720+
5721+
react-native-keyboard-aware-scroll-view@^0.9.5:
5722+
version "0.9.5"
5723+
resolved "https://registry.yarnpkg.com/react-native-keyboard-aware-scroll-view/-/react-native-keyboard-aware-scroll-view-0.9.5.tgz#e2e9665d320c188e6b1f22f151b94eb358bf9b71"
5724+
integrity sha512-XwfRn+T/qBH9WjTWIBiJD2hPWg0yJvtaEw6RtPCa5/PYHabzBaWxYBOl0usXN/368BL1XktnZPh8C2lmTpOREA==
5725+
dependencies:
5726+
prop-types "^15.6.2"
5727+
react-native-iphone-x-helper "^1.0.3"
5728+
56845729
[email protected]:
56855730
version "3.2.0"
56865731
resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-3.2.0.tgz#06113c6b208f982d68ab5c3cebd199ca93db6941"
@@ -5910,7 +5955,7 @@ reusify@^1.0.4:
59105955
resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
59115956
integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
59125957

5913-
rimraf@^2.5.4:
5958+
rimraf@^2.5.4, rimraf@^2.6.3:
59145959
version "2.7.1"
59155960
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
59165961
integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -6228,6 +6273,11 @@ sprintf-js@~1.0.2:
62286273
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
62296274
integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
62306275

6276+
stable-hash@^0.0.2:
6277+
version "0.0.2"
6278+
resolved "https://registry.yarnpkg.com/stable-hash/-/stable-hash-0.0.2.tgz#a909deaa5b9d430b100ca0a10132a533f2665e94"
6279+
integrity sha512-tPwQ3c1rLIwbJpq59duoznegEbmgfV630C2n4R4G96LKBFljgK8j+O9AxjqB6cAzu4gE7s4pByrLWtZel8E+Mg==
6280+
62316281
stack-utils@^1.0.1:
62326282
version "1.0.5"
62336283
resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.5.tgz#a19b0b01947e0029c8e451d5d61a498f5bb1471b"

‎expo-nativebase/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "expo-template-native-base",
3-
"version": "1.0.6",
3+
"version": "1.0.7",
44
"main": "node_modules/expo/AppEntry.js",
55
"keywords": [
66
"react",
@@ -25,7 +25,7 @@
2525
"dependencies": {
2626
"expo": "~42.0.0",
2727
"expo-status-bar": "~1.0.4",
28-
"native-base": "3.2.2",
28+
"native-base": "3.3.6",
2929
"react": "16.13.1",
3030
"react-dom": "16.13.1",
3131
"react-native": "https://github.com/expo/react-native/archive/sdk-42.0.0.tar.gz",

0 commit comments

Comments
 (0)