Skip to content

Commit

Permalink
Merge pull request #64 from GeekyAnts/fix/solito-navigation
Browse files Browse the repository at this point in the history 
fix: solito navigation
  • Loading branch information
@ankit-tailor
ankit-tailor authored Aug 31, 2022
2 parents 80731d6 + 06d485d commit 8531305
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 106 deletions.
4 changes: 1 addition & 3 deletions solito-universal-app-template-nativebase-typescript/apps/expo/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,10 @@
},
"devDependencies": {
"@babel/core": "^7.12.9",
"@react-navigation/native": "*",
"@react-navigation/native-stack": "*",
"@types/react": "~17.0.21",
"@types/react-native": "~0.64.12",
"metro-minify-esbuild": "^0.1.0",
"react-native-screens": "*",
"react-native-screens": "~3.10.1",
"typescript": "~4.3.5"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion solito-universal-app-template-nativebase-typescript/packages/app/features/home/screen.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function HomeScreen() {
<Image
rounded="full"
source={{
uri: 'https://pbs.twimg.com/profile_images/1534837615848849413/6uNTjzMu_400x400.jpg',
uri: 'https://pbs.twimg.com/profile_images/1550379416995643392/KeFMAS7m_400x400.png',
}}
alt="NextJS Logo"
resizeMode="contain"
Expand Down
57 changes: 8 additions & 49 deletions solito-universal-app-template-nativebase-typescript/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2222,35 +2222,11 @@
query-string "^7.0.0"
react-is "^16.13.0"

"@react-navigation/core@^6.2.2":
version "6.2.2"
resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-6.2.2.tgz#29ca539e22581616aad82b7451d47c5efe936f31"
integrity sha512-gEJ1gRqt1EIqRrnJIpSQ0wWJRue9maAQNKYrlQ0a/LSKErF3g6w+sD2wW4Bbb1yj88pGhKeuI4wdB9MVK766Pg==
dependencies:
"@react-navigation/routers" "^6.1.1"
escape-string-regexp "^4.0.0"
nanoid "^3.1.23"
query-string "^7.0.0"
react-is "^16.13.0"

"@react-navigation/elements@^1.3.1":
version "1.3.1"
resolved "https://registry.yarnpkg.com/@react-navigation/elements/-/elements-1.3.1.tgz#aacb08fe0ca4db50f0ed16b72906869ce770edf4"
integrity sha512-jIDRJaG8YPIinl4hZXJu/W3TnhDe8hLYmGSEdL1mxZ1aoNMiApCBYkgTy11oq0EfK/koZd3DPSkJNbzBAQmPJw==

"@react-navigation/elements@^1.3.4":
version "1.3.4"
resolved "https://registry.yarnpkg.com/@react-navigation/elements/-/elements-1.3.4.tgz#abb48136508c1e60862dc14a101ce02ff685a337"
integrity sha512-O0jICpjn3jskVo4yiWzZozmj7DZy1ZBbn3O7dbenuUjZSj/cscjwaapmZZFGcI/IMmjmx8UTKsybhCFEIbGf3g==

"@react-navigation/native-stack@*":
version "6.7.0"
resolved "https://registry.yarnpkg.com/@react-navigation/native-stack/-/native-stack-6.7.0.tgz#57e6390e3e4e46b3a7f580810c3d384b4676b7e5"
integrity sha512-03CuSwbBvP9+iXgjrTRRw+aog+KZXbhPzqCWVExzIWNOzf5/PJEcdtlm9KDrx2aHHDtDA6LRLKQA4UIlJOmNzA==
dependencies:
"@react-navigation/elements" "^1.3.4"
warn-once "^0.1.0"

"@react-navigation/native-stack@^6.5.0":
version "6.5.0"
resolved "https://registry.yarnpkg.com/@react-navigation/native-stack/-/native-stack-6.5.0.tgz#332ac7c736e2c2a2d961b324085957c3db79e1d2"
Expand All @@ -2259,16 +2235,6 @@
"@react-navigation/elements" "^1.3.1"
warn-once "^0.1.0"

"@react-navigation/native@*":
version "6.0.11"
resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-6.0.11.tgz#d221a5f6a5222187a09fc968d07d67d83ce70708"
integrity sha512-z0YTB7Czdb9SNjxfzcFNB3Vym0qmUcxpiYGOOXX8PH0s+xlIs/w+2RVp6YAvAC48A30o7MMCYqy5OeR6lrtWHg==
dependencies:
"@react-navigation/core" "^6.2.2"
escape-string-regexp "^4.0.0"
fast-deep-equal "^3.1.3"
nanoid "^3.1.23"

"@react-navigation/native@^6.0.8":
version "6.0.8"
resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-6.0.8.tgz#66f48ad2b3fb1acd08c8d935d9f342a3d77ee6cd"
Expand All @@ -2286,13 +2252,6 @@
dependencies:
nanoid "^3.1.23"

"@react-navigation/routers@^6.1.1":
version "6.1.1"
resolved "https://registry.yarnpkg.com/@react-navigation/routers/-/routers-6.1.1.tgz#902ec3fedcf540af36cd9f013779c5134af58e73"
integrity sha512-mWWj2yh4na/OBaE7bWrft4kdAtxnG8MlV6ph3Bi6tHqgcnxENX+dnQY6y0qg/6E7cmMlaJg5nAC5y4Enr5ir8A==
dependencies:
nanoid "^3.1.23"

"@react-stately/checkbox@^3.0.1", "@react-stately/checkbox@^3.0.6":
version "3.0.6"
resolved "https://registry.yarnpkg.com/@react-stately/checkbox/-/checkbox-3.0.6.tgz#6c3e125902f4478f6b8abf3e78a088804c66ae28"
Expand Down Expand Up @@ -9297,14 +9256,6 @@ [email protected]:
resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-3.3.2.tgz#9549a2ce580f2374edb05e49d661258d1b8bcaed"
integrity sha512-yOwiiPJ1rk+/nfK13eafbpW6sKW0jOnsRem2C1LPJjM3tfTof6hlvV5eWHATye3XOpu2cJ7N+HdkUvUDGwFD2Q==

react-native-screens@*:
version "3.15.0"
resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.15.0.tgz#78e42c8df72851b1ff235ddf5434b961ae123ca5"
integrity sha512-ezC5TibsUYyqPuuHpZoM3iEl6bRzCVBMJeGaFkn7xznuOt1VwkZVub0BvafIEYR/+AQC/RjxzMSQPs1qal0+wA==
dependencies:
react-freeze "^1.0.0"
warn-once "^0.1.0"

react-native-screens@^3.4.0:
version "3.13.1"
resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.13.1.tgz#b3b1c5788dca25a71668909f66d87fb35c5c5241"
Expand All @@ -9313,6 +9264,14 @@ react-native-screens@^3.4.0:
react-freeze "^1.0.0"
warn-once "^0.1.0"

react-native-screens@~3.10.1:
version "3.10.2"
resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.10.2.tgz#cbf505d61c09e29ad5b335309951a3bd81f0df19"
integrity sha512-bMKSpwMeqAoXBqTJiDEG1ogM1cMk66sEmpp/4dGqdX59v+OwMqPeTuBk37qaSuS7gPOFFKsNW2X3ymGvBT4iEw==
dependencies:
react-freeze "^1.0.0"
warn-once "^0.1.0"

react-native-svg@^12.3.0:
version "12.3.0"
resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-12.3.0.tgz#40f657c5d1ee366df23f3ec8dae76fd276b86248"
Expand Down
4 changes: 1 addition & 3 deletions solito-universal-app-template-nativebase/apps/expo/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"dependencies": {
"@react-navigation/native": "*",
"@react-navigation/native-stack": "*",
"app": "*",
"expo": "^44.0.0",
"expo-splash-screen": "~0.14.1",
Expand All @@ -12,7 +10,7 @@
"react-native-gesture-handler": "~2.1.0",
"react-native-reanimated": "~2.3.1",
"react-native-safe-area-context": "3.3.2",
"react-native-screens": "*",
"react-native-screens": "~3.10.1",
"react-native-svg": "^12.4.0",
"react-native-web": "0.17.1"
},
Expand Down
2 changes: 1 addition & 1 deletion solito-universal-app-template-nativebase/packages/app/features/home/home.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function HomeScreen() {
<Image
rounded="full"
source={{
uri: 'https://pbs.twimg.com/profile_images/1534837615848849413/6uNTjzMu_400x400.jpg',
uri: 'https://pbs.twimg.com/profile_images/1550379416995643392/KeFMAS7m_400x400.png',
}}
alt="NextJS Logo"
resizeMode="contain"
Expand Down
57 changes: 8 additions & 49 deletions solito-universal-app-template-nativebase/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2222,35 +2222,11 @@
query-string "^7.0.0"
react-is "^16.13.0"

"@react-navigation/core@^6.2.2":
version "6.2.2"
resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-6.2.2.tgz#29ca539e22581616aad82b7451d47c5efe936f31"
integrity sha512-gEJ1gRqt1EIqRrnJIpSQ0wWJRue9maAQNKYrlQ0a/LSKErF3g6w+sD2wW4Bbb1yj88pGhKeuI4wdB9MVK766Pg==
dependencies:
"@react-navigation/routers" "^6.1.1"
escape-string-regexp "^4.0.0"
nanoid "^3.1.23"
query-string "^7.0.0"
react-is "^16.13.0"

"@react-navigation/elements@^1.3.1":
version "1.3.1"
resolved "https://registry.yarnpkg.com/@react-navigation/elements/-/elements-1.3.1.tgz#aacb08fe0ca4db50f0ed16b72906869ce770edf4"
integrity sha512-jIDRJaG8YPIinl4hZXJu/W3TnhDe8hLYmGSEdL1mxZ1aoNMiApCBYkgTy11oq0EfK/koZd3DPSkJNbzBAQmPJw==

"@react-navigation/elements@^1.3.4":
version "1.3.4"
resolved "https://registry.yarnpkg.com/@react-navigation/elements/-/elements-1.3.4.tgz#abb48136508c1e60862dc14a101ce02ff685a337"
integrity sha512-O0jICpjn3jskVo4yiWzZozmj7DZy1ZBbn3O7dbenuUjZSj/cscjwaapmZZFGcI/IMmjmx8UTKsybhCFEIbGf3g==

"@react-navigation/native-stack@*":
version "6.7.0"
resolved "https://registry.yarnpkg.com/@react-navigation/native-stack/-/native-stack-6.7.0.tgz#57e6390e3e4e46b3a7f580810c3d384b4676b7e5"
integrity sha512-03CuSwbBvP9+iXgjrTRRw+aog+KZXbhPzqCWVExzIWNOzf5/PJEcdtlm9KDrx2aHHDtDA6LRLKQA4UIlJOmNzA==
dependencies:
"@react-navigation/elements" "^1.3.4"
warn-once "^0.1.0"

"@react-navigation/native-stack@^6.5.0":
version "6.5.0"
resolved "https://registry.yarnpkg.com/@react-navigation/native-stack/-/native-stack-6.5.0.tgz#332ac7c736e2c2a2d961b324085957c3db79e1d2"
Expand All @@ -2259,16 +2235,6 @@
"@react-navigation/elements" "^1.3.1"
warn-once "^0.1.0"

"@react-navigation/native@*":
version "6.0.11"
resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-6.0.11.tgz#d221a5f6a5222187a09fc968d07d67d83ce70708"
integrity sha512-z0YTB7Czdb9SNjxfzcFNB3Vym0qmUcxpiYGOOXX8PH0s+xlIs/w+2RVp6YAvAC48A30o7MMCYqy5OeR6lrtWHg==
dependencies:
"@react-navigation/core" "^6.2.2"
escape-string-regexp "^4.0.0"
fast-deep-equal "^3.1.3"
nanoid "^3.1.23"

"@react-navigation/native@^6.0.8":
version "6.0.8"
resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-6.0.8.tgz#66f48ad2b3fb1acd08c8d935d9f342a3d77ee6cd"
Expand All @@ -2286,13 +2252,6 @@
dependencies:
nanoid "^3.1.23"

"@react-navigation/routers@^6.1.1":
version "6.1.1"
resolved "https://registry.yarnpkg.com/@react-navigation/routers/-/routers-6.1.1.tgz#902ec3fedcf540af36cd9f013779c5134af58e73"
integrity sha512-mWWj2yh4na/OBaE7bWrft4kdAtxnG8MlV6ph3Bi6tHqgcnxENX+dnQY6y0qg/6E7cmMlaJg5nAC5y4Enr5ir8A==
dependencies:
nanoid "^3.1.23"

"@react-stately/checkbox@^3.0.1", "@react-stately/checkbox@^3.0.6":
version "3.0.6"
resolved "https://registry.yarnpkg.com/@react-stately/checkbox/-/checkbox-3.0.6.tgz#6c3e125902f4478f6b8abf3e78a088804c66ae28"
Expand Down Expand Up @@ -9297,14 +9256,6 @@ [email protected]:
resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-3.3.2.tgz#9549a2ce580f2374edb05e49d661258d1b8bcaed"
integrity sha512-yOwiiPJ1rk+/nfK13eafbpW6sKW0jOnsRem2C1LPJjM3tfTof6hlvV5eWHATye3XOpu2cJ7N+HdkUvUDGwFD2Q==

react-native-screens@*:
version "3.15.0"
resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.15.0.tgz#78e42c8df72851b1ff235ddf5434b961ae123ca5"
integrity sha512-ezC5TibsUYyqPuuHpZoM3iEl6bRzCVBMJeGaFkn7xznuOt1VwkZVub0BvafIEYR/+AQC/RjxzMSQPs1qal0+wA==
dependencies:
react-freeze "^1.0.0"
warn-once "^0.1.0"

react-native-screens@^3.4.0:
version "3.13.1"
resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.13.1.tgz#b3b1c5788dca25a71668909f66d87fb35c5c5241"
Expand All @@ -9313,6 +9264,14 @@ react-native-screens@^3.4.0:
react-freeze "^1.0.0"
warn-once "^0.1.0"

react-native-screens@~3.10.1:
version "3.10.2"
resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.10.2.tgz#cbf505d61c09e29ad5b335309951a3bd81f0df19"
integrity sha512-bMKSpwMeqAoXBqTJiDEG1ogM1cMk66sEmpp/4dGqdX59v+OwMqPeTuBk37qaSuS7gPOFFKsNW2X3ymGvBT4iEw==
dependencies:
react-freeze "^1.0.0"
warn-once "^0.1.0"

react-native-svg@^12.3.0:
version "12.3.0"
resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-12.3.0.tgz#40f657c5d1ee366df23f3ec8dae76fd276b86248"
Expand Down

0 comments on commit 8531305

Please sign in to comment.