Merge branch 'andrew_testing' into Fix-updatePassword

andrew-bierman · Aug 24, 2024 · 203c3de · 203c3de
2 parents 4b33791 + 6af4ce4
commit 203c3de
Show file tree

Hide file tree

Showing 32 changed files with 1,056 additions and 549 deletions.
diff --git a/apps/bun-server/package.json b/apps/bun-server/package.json
@@ -7,7 +7,7 @@
     "build": "tsc"
   },
   "devDependencies": {
-    "typescript": "^5.3.3"
+    "typescript": "^5.5.3"
   },
   "dependencies": {
     "@elysiajs/html": "^0.7.3",

diff --git a/apps/expo/app.json b/apps/expo/app.json
@@ -2,7 +2,7 @@
   "expo": {
     "name": "packrat",
     "slug": "packrat",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "orientation": "portrait",
     "icon": "./assets/packrat-app-icon.png",
     "userInterfaceStyle": "automatic",
@@ -46,7 +46,11 @@
             "buildToolsVersion": "34.0.0"
           },
           "ios": {
-            "deploymentTarget": "13.4"
+            "deploymentTarget": "13.4",
+            "buildNumber": "3",
+            "infoPlist": {
+              "ITSAppUsesNonExemptEncryption": false
+            }
           }
         }
       ]

diff --git a/apps/expo/eas.json b/apps/expo/eas.json
@@ -1,6 +1,7 @@
 {
   "cli": {
-    "version": ">= 3.8.1"
+    "version": ">= 3.8.1",
+    "appVersionSource": "remote"
   },
   "build": {
     "development": {
@@ -21,6 +22,7 @@
       }
     },
     "production": {
+      "autoIncrement": true,
       "ios": {
         "resourceClass": "m-medium"
       }

diff --git a/apps/expo/package.json b/apps/expo/package.json
@@ -42,7 +42,7 @@
     "@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-google-signin/google-signin": "^9.0.2",
@@ -54,7 +54,7 @@
     "@reduxjs/toolkit": "^1.9.3",
     "@rneui/base": "^4.0.0-rc.8",
     "@rneui/themed": "^4.0.0-rc.8",
-    "@rnmapbox/maps": "^10.1.21",
+    "@rnmapbox/maps": "^10.1.29",
     "@tamagui/animations-react-native": "1.96.0",
     "@tamagui/babel-plugin": "1.96.0",
     "@tamagui/config": "1.96.0",
@@ -84,17 +84,18 @@
     "env": "^0.0.2",
     "eslint-plugin-react-native": "^4.0.0",
     "expo": "^50.0.14",
-    "expo-application": "~5.8.3",
+    "expo-application": "~5.8.4",
     "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-constants": "~15.4.6",
     "expo-crypto": "~12.8.1",
     "expo-dev-client": "~3.3.11",
-    "expo-document-picker": "~11.10.1",
-    "expo-file-system": "~16.0.8",
+    "expo-device": "~5.9.4",
+    "expo-document-picker": "^12.0.2",
+    "expo-file-system": "~16.0.9",
     "expo-font": "~11.10.3",
     "expo-haptics": "~12.8.1",
     "expo-image-picker": "~14.7.1",
@@ -174,7 +175,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-react": "^7.33.2",
     "prettier": "^3.2.5",
-    "typescript": "^5.3.3"
+    "typescript": "^5.5.3"
   },
   "overrides": {
     "metro": "0.73.7",

diff --git a/apps/tauri/package.json b/apps/tauri/package.json
@@ -50,7 +50,7 @@
     "rollup-plugin-polyfill-node": "^0.13.0",
     "rollup-plugin-typescript2": "^0.36.0",
     "tslib": "^2.6.2",
-    "typescript": "^5.2.2",
+    "typescript": "^5.5.3",
     "vite": "^5.3.1",
     "vite-plugin-node-polyfills": "^0.21.0"
   }

diff --git a/apps/tauri/src/routeTree.gen.ts b/apps/tauri/src/routeTree.gen.ts
@@ -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
     }
@@ -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,
@@ -272,6 +335,102 @@ export const routeTree = rootRoute.addChildren([
   SignInIndexLazyRoute,
   TripsIndexLazyRoute,
   ProfileSettingsIndexLazyRoute,
-])
+})
 
 /* prettier-ignore-end */
+
+/* ROUTE_MANIFEST_START
+{
+  "routes": {
+    "__root__": {
+      "filePath": "__root.tsx",
+      "children": [
+        "/",
+        "/destination/query",
+        "/pack/$id",
+        "/pack/create",
+        "/profile/$id",
+        "/trip/$tripId",
+        "/trip/create",
+        "/about/",
+        "/appearance/",
+        "/dashboard/",
+        "/feed/",
+        "/items/",
+        "/map/",
+        "/maps/",
+        "/packs/",
+        "/password-reset/",
+        "/profile/",
+        "/register/",
+        "/sign-in/",
+        "/trips/",
+        "/profile/settings/"
+      ]
+    },
+    "/": {
+      "filePath": "index.tsx"
+    },
+    "/destination/query": {
+      "filePath": "destination/query.lazy.tsx"
+    },
+    "/pack/$id": {
+      "filePath": "pack/$id.lazy.tsx"
+    },
+    "/pack/create": {
+      "filePath": "pack/create.lazy.tsx"
+    },
+    "/profile/$id": {
+      "filePath": "profile/$id.lazy.tsx"
+    },
+    "/trip/$tripId": {
+      "filePath": "trip/$tripId.lazy.tsx"
+    },
+    "/trip/create": {
+      "filePath": "trip/create.lazy.tsx"
+    },
+    "/about/": {
+      "filePath": "about/index.lazy.tsx"
+    },
+    "/appearance/": {
+      "filePath": "appearance/index.lazy.tsx"
+    },
+    "/dashboard/": {
+      "filePath": "dashboard/index.lazy.tsx"
+    },
+    "/feed/": {
+      "filePath": "feed/index.lazy.tsx"
+    },
+    "/items/": {
+      "filePath": "items/index.lazy.tsx"
+    },
+    "/map/": {
+      "filePath": "map/index.lazy.tsx"
+    },
+    "/maps/": {
+      "filePath": "maps/index.lazy.tsx"
+    },
+    "/packs/": {
+      "filePath": "packs/index.lazy.tsx"
+    },
+    "/password-reset/": {
+      "filePath": "password-reset/index.lazy.tsx"
+    },
+    "/profile/": {
+      "filePath": "profile/index.lazy.tsx"
+    },
+    "/register/": {
+      "filePath": "register/index.lazy.tsx"
+    },
+    "/sign-in/": {
+      "filePath": "sign-in/index.lazy.tsx"
+    },
+    "/trips/": {
+      "filePath": "trips/index.lazy.tsx"
+    },
+    "/profile/settings/": {
+      "filePath": "profile/settings/index.lazy.tsx"
+    }
+  }
+}
+ROUTE_MANIFEST_END */
diff --git a/apps/vite/package.json b/apps/vite/package.json
@@ -41,8 +41,8 @@
     "rollup-plugin-polyfill-node": "^0.13.0",
     "rollup-plugin-typescript2": "^0.36.0",
     "tslib": "^2.6.2",
-    "typescript": "^5.3.3",
-    "vite": "^5.1.0",
+    "typescript": "^5.5.3",
+    "vite": "^5.3.1",
     "vite-plugin-node-polyfills": "^0.21.0"
   }
 }