Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/expo 51 upgrade #933

Open
wants to merge 2 commits into
base: andrew_testing
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
mongodb-data
*.env
.env.local
.env.production
.env.old
node_modules
# yarn.lock
# dist
Expand Down
4 changes: 3 additions & 1 deletion apps/expo/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@
"deploymentTarget": "13.4"
}
}
]
],
"expo-font",
"expo-secure-store"
],
"extra": {
"eas": {
Expand Down
72 changes: 36 additions & 36 deletions apps/expo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@
"dependencies": {
"@babel/runtime": "^7.21.0",
"@expo/match-media": "^0.4.0",
"@expo/metro-runtime": "~3.1.3",
"@expo/metro-runtime": "~3.2.1",
"@expo/vector-icons": "^14.0.0",
"@expo/webpack-config": "^19.0.0",
"@fortawesome/fontawesome-svg-core": "^6.3.0",
"@fortawesome/free-solid-svg-icons": "^6.3.0",
"@fortawesome/react-fontawesome": "^0.2.0",
"@hookform/resolvers": "^3.3.4",
"@react-native-async-storage/async-storage": "1.21.0",
"@react-native-async-storage/async-storage": "1.23.1",
"@react-native-community/geolocation": "^3.0.6",
"@react-native-community/netinfo": "11.1.0",
"@react-native-community/netinfo": "11.3.1",
"@react-native-google-signin/google-signin": "^9.0.2",
"@react-native-menu/menu": "^0.9.1",
"@react-navigation/bottom-tabs": "^6.5.11",
Expand Down Expand Up @@ -83,32 +83,32 @@
"dotenv": "^16.0.3",
"env": "^0.0.2",
"eslint-plugin-react-native": "^4.0.0",
"expo": "^50.0.14",
"expo-application": "~5.8.3",
"expo-auth-session": "~5.4.0",
"expo-blur": "~12.9.2",
"expo-build-properties": "~0.11.1",
"expo-checkbox": "~2.7.0",
"expo-clipboard": "~5.0.1",
"expo-constants": "~15.4.5",
"expo-crypto": "~12.8.1",
"expo-dev-client": "~3.3.11",
"expo-document-picker": "~11.10.1",
"expo-file-system": "~16.0.8",
"expo-font": "~11.10.3",
"expo-haptics": "~12.8.1",
"expo-image-picker": "^14.7.1",
"expo-linear-gradient": "~12.7.2",
"expo-linking": "~6.2.2",
"expo-location": "~16.5.5",
"expo-random": "~13.6.0",
"expo-router": "~3.4.10",
"expo-secure-store": "~12.8.1",
"expo-splash-screen": "~0.26.4",
"expo": "^51.0.5",
"expo-application": "~5.9.1",
"expo-auth-session": "~5.5.2",
"expo-blur": "~13.0.2",
"expo-build-properties": "~0.12.1",
"expo-checkbox": "~3.0.0",
"expo-clipboard": "~6.0.3",
"expo-constants": "~16.0.1",
"expo-crypto": "~13.0.2",
"expo-dev-client": "~4.0.13",
"expo-document-picker": "~12.0.1",
"expo-file-system": "~17.0.1",
"expo-font": "~12.0.5",
"expo-haptics": "~13.0.1",
"expo-image-picker": "~15.0.4",
"expo-linear-gradient": "~13.0.2",
"expo-linking": "~6.3.1",
"expo-location": "~17.0.1",
"expo-random": "~14.0.1",
"expo-router": "~3.5.12",
"expo-secure-store": "~13.0.1",
"expo-splash-screen": "~0.27.4",
"expo-standard-web-crypto": "^1.7.0",
"expo-status-bar": "~1.11.1",
"expo-system-ui": "~2.9.3",
"expo-web-browser": "~12.8.2",
"expo-status-bar": "~1.12.1",
"expo-system-ui": "~3.0.4",
"expo-web-browser": "~13.0.3",
"file-saver": "^2.0.5",
"firebase": "^9.19.1",
"fuse.js": "^6.6.2",
Expand All @@ -120,26 +120,26 @@
"react": "18.2.0",
"react-dom": "18.2.0",
"react-hook-form": "^7.50.1",
"react-native": "0.73.6",
"react-native": "0.74.1",
"react-native-dotenv": "^3.4.8",
"react-native-elements": "^3.4.3",
"react-native-flash-message": "^0.4.2",
"react-native-gesture-handler": "~2.14.0",
"react-native-gesture-handler": "~2.16.1",
"react-native-google-places-autocomplete": "^2.5.1",
"react-native-ios-context-menu": "^2.4.1",
"react-native-ios-utilities": "^4.3.0",
"react-native-paper": "^5.10.6",
"react-native-paper-dates": "^0.18.12",
"react-native-reanimated": "~3.6.2",
"react-native-safe-area-context": "4.8.2",
"react-native-screens": "~3.29.0",
"react-native-reanimated": "~3.10.1",
"react-native-safe-area-context": "4.10.1",
"react-native-screens": "3.31.1",
"react-native-select-dropdown": "^3.3.4",
"react-native-svg": "14.1.0",
"react-native-svg": "15.2.0",
"react-native-table-component": "https://github.com/slice312/react-native-table-component.git",
"react-native-url-polyfill": "^2.0.0",
"react-native-vector-icons": "^10.0.3",
"react-native-web": "^0.19.10",
"react-native-webview": "13.6.4",
"react-native-webview": "13.8.6",
"react-redux": "^9.0.4",
"react-responsive": "^9.0.2",
"redux-persist": "^6.0.0",
Expand All @@ -164,7 +164,7 @@
"@types/react-test-renderer": "^18.0.0",
"@types/server": "^1.0.5",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"babel-preset-expo": "^10.0.1",
"babel-preset-expo": "~11.0.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.0.0",
"eslint-config-standard-with-typescript": "^38.0.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@tamagui/next-plugin": "1.96.0",
"@tamagui/next-theme": "1.96.0",
"app": "*",
"babel-preset-expo": "^10.0.1",
"babel-preset-expo": "~11.0.0",
"babel-preset-react-native": "^4.0.1",
"metro-react-native-babel-preset": "^0.77.0",
"metro-react-native-babel-transformer": "^0.77.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/tauri/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"esbuild-plugin-flow": "^0.3.2",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native": "0.73.6",
"react-native": "0.74.1",
"react-native-web": "^0.19.10"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion apps/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"esbuild-plugin-flow": "^0.3.2",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native": "0.73.6",
"react-native": "0.74.1",
"react-native-web": "^0.19.10"
},
"devDependencies": {
Expand Down
67 changes: 65 additions & 2 deletions apps/vite/src/routeTree.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,86 +162,149 @@ const ProfileSettingsIndexLazyRoute = ProfileSettingsIndexLazyImport.update({
declare module '@tanstack/react-router' {
interface FileRoutesByPath {
'/': {
id: '/'
path: '/'
fullPath: '/'
preLoaderRoute: typeof IndexImport
parentRoute: typeof rootRoute
}
'/destination/query': {
id: '/destination/query'
path: '/destination/query'
fullPath: '/destination/query'
preLoaderRoute: typeof DestinationQueryLazyImport
parentRoute: typeof rootRoute
}
'/pack/$id': {
id: '/pack/$id'
path: '/pack/$id'
fullPath: '/pack/$id'
preLoaderRoute: typeof PackIdLazyImport
parentRoute: typeof rootRoute
}
'/pack/create': {
id: '/pack/create'
path: '/pack/create'
fullPath: '/pack/create'
preLoaderRoute: typeof PackCreateLazyImport
parentRoute: typeof rootRoute
}
'/profile/$id': {
id: '/profile/$id'
path: '/profile/$id'
fullPath: '/profile/$id'
preLoaderRoute: typeof ProfileIdLazyImport
parentRoute: typeof rootRoute
}
'/trip/$tripId': {
id: '/trip/$tripId'
path: '/trip/$tripId'
fullPath: '/trip/$tripId'
preLoaderRoute: typeof TripTripIdLazyImport
parentRoute: typeof rootRoute
}
'/trip/create': {
id: '/trip/create'
path: '/trip/create'
fullPath: '/trip/create'
preLoaderRoute: typeof TripCreateLazyImport
parentRoute: typeof rootRoute
}
'/about/': {
id: '/about/'
path: '/about/'
fullPath: '/about/'
preLoaderRoute: typeof AboutIndexLazyImport
parentRoute: typeof rootRoute
}
'/appearance/': {
id: '/appearance/'
path: '/appearance/'
fullPath: '/appearance/'
preLoaderRoute: typeof AppearanceIndexLazyImport
parentRoute: typeof rootRoute
}
'/dashboard/': {
id: '/dashboard/'
path: '/dashboard/'
fullPath: '/dashboard/'
preLoaderRoute: typeof DashboardIndexLazyImport
parentRoute: typeof rootRoute
}
'/feed/': {
id: '/feed/'
path: '/feed/'
fullPath: '/feed/'
preLoaderRoute: typeof FeedIndexLazyImport
parentRoute: typeof rootRoute
}
'/items/': {
id: '/items/'
path: '/items/'
fullPath: '/items/'
preLoaderRoute: typeof ItemsIndexLazyImport
parentRoute: typeof rootRoute
}
'/map/': {
id: '/map/'
path: '/map/'
fullPath: '/map/'
preLoaderRoute: typeof MapIndexLazyImport
parentRoute: typeof rootRoute
}
'/maps/': {
id: '/maps/'
path: '/maps/'
fullPath: '/maps/'
preLoaderRoute: typeof MapsIndexLazyImport
parentRoute: typeof rootRoute
}
'/packs/': {
id: '/packs/'
path: '/packs/'
fullPath: '/packs/'
preLoaderRoute: typeof PacksIndexLazyImport
parentRoute: typeof rootRoute
}
'/password-reset/': {
id: '/password-reset/'
path: '/password-reset/'
fullPath: '/password-reset/'
preLoaderRoute: typeof PasswordResetIndexLazyImport
parentRoute: typeof rootRoute
}
'/profile/': {
id: '/profile/'
path: '/profile/'
fullPath: '/profile/'
preLoaderRoute: typeof ProfileIndexLazyImport
parentRoute: typeof rootRoute
}
'/register/': {
id: '/register/'
path: '/register/'
fullPath: '/register/'
preLoaderRoute: typeof RegisterIndexLazyImport
parentRoute: typeof rootRoute
}
'/sign-in/': {
id: '/sign-in/'
path: '/sign-in/'
fullPath: '/sign-in/'
preLoaderRoute: typeof SignInIndexLazyImport
parentRoute: typeof rootRoute
}
'/trips/': {
id: '/trips/'
path: '/trips/'
fullPath: '/trips/'
preLoaderRoute: typeof TripsIndexLazyImport
parentRoute: typeof rootRoute
}
'/profile/settings/': {
id: '/profile/settings/'
path: '/profile/settings/'
fullPath: '/profile/settings/'
preLoaderRoute: typeof ProfileSettingsIndexLazyImport
parentRoute: typeof rootRoute
}
Expand All @@ -250,7 +313,7 @@ declare module '@tanstack/react-router' {

// Create and export the route tree

export const routeTree = rootRoute.addChildren([
export const routeTree = rootRoute.addChildren({
IndexRoute,
DestinationQueryLazyRoute,
PackIdLazyRoute,
Expand All @@ -272,6 +335,6 @@ export const routeTree = rootRoute.addChildren([
SignInIndexLazyRoute,
TripsIndexLazyRoute,
ProfileSettingsIndexLazyRoute,
])
})

/* prettier-ignore-end */
2 changes: 1 addition & 1 deletion packages/app/context/FontLoader.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useEffect } from 'react';
import { useFonts } from 'expo-font';
// import { SplashScreen } from 'expo-router';
import { APP } from '@env';
import { APP } from '@packrat/config';

// Expo vector icons
import {
Expand Down
Loading
Loading