Skip to content

Commit 25b8083

Browse files
JClackettJClackett
committed
Merge branch 'main' into develop
# Conflicts: # apps/app/package.json # apps/web/package.json # pnpm-lock.yaml
2 parents 2628ba7 + f9651de commit 25b8083

40 files changed

Lines changed: 4949 additions & 4604 deletions

‎apps/app/app.config.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { ConfigContext, ExpoConfig } from "expo/config"
22

3-
const VERSION = "1.1.2"
4-
const BUILD = 35
3+
const VERSION = "1.5.0"
4+
const BUILD = 36
55

66
const IS_DEV = process.env.APP_VARIANT === "development"
77

‎apps/app/babel.config.js‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
module.exports = function (api) {
1+
module.exports = (api) => {
22
api.cache(true)
33
return {
4-
presets: [["module:metro-react-native-babel-preset", { useTransformReactJSXExperimental: true }], "babel-preset-expo"],
5-
plugins: [
6-
["@babel/plugin-transform-react-jsx", { runtime: "automatic" }],
7-
"nativewind/babel",
8-
"react-native-reanimated/plugin",
9-
],
4+
presets: ["nativewind/babel", ["babel-preset-expo", { jsxImportSource: "nativewind" }]],
5+
plugins: ["react-native-reanimated/plugin"],
106
}
117
}

‎apps/app/eas.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
2+
"cli": {
3+
"appVersionSource": "local"
4+
},
25
"build": {
36
"development": {
47
"ios": { "simulator": true },

‎apps/app/metro.config.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Learn more: https://docs.expo.dev/guides/monorepos/
22
const { getSentryExpoConfig } = require("@sentry/react-native/metro")
3-
4-
const path = require("path")
3+
const { withNativeWind } = require("nativewind/metro")
4+
const path = require("node:path")
55

66
const projectRoot = __dirname
77
const workspaceRoot = path.resolve(projectRoot, "../..")
@@ -19,4 +19,4 @@ config.resolver.nodeModulesPaths = [path.resolve(projectRoot, "node_modules"), p
1919
// 3. Force Metro to resolve (sub)dependencies only from the `nodeModulesPaths`
2020
config.resolver.disableHierarchicalLookup = true
2121

22-
module.exports = config
22+
module.exports = withNativeWind(config, { input: "./src/global.css" })

‎apps/app/nativewind-env.d.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/// <reference types="nativewind/types" />
2+
3+
// NOTE: This file should not be edited and should be committed with your source code. It is generated by NativeWind.

‎apps/app/package.json‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -18,67 +18,67 @@
1818
"@element/shared": "workspace:*",
1919
"@element/tailwind-config": "workspace:*",
2020
"@expo-google-fonts/poppins": "0.2.3",
21-
"@expo/react-native-action-sheet": "4.1.0",
22-
"@react-native-async-storage/async-storage": "1.21.0",
23-
"@react-native-community/datetimepicker": "8.0.0",
21+
"@expo/react-native-action-sheet": "4.0.1",
22+
"@react-native-async-storage/async-storage": "1.23.1",
23+
"@react-native-community/datetimepicker": "8.2.0",
2424
"@react-native-menu/menu": "^1.0.3",
25-
"@react-native-picker/picker": "2.6.1",
26-
"@sentry/react-native": "5.20.0",
25+
"@react-native-picker/picker": "2.9.0",
26+
"@sentry/react-native": "6.3.0",
2727
"@tanstack/react-query": "4.36.1",
2828
"@trpc/client": "10.45.2",
2929
"@trpc/react-query": "10.45.2",
3030
"class-variance-authority": "0.7.0",
31-
"dayjs": "1.11.13",
32-
"expo": "50.0.21",
33-
"expo-application": "~5.8.4",
34-
"expo-blur": "~12.9.2",
35-
"expo-build-properties": "~0.11.1",
36-
"expo-constants": "~15.4.6",
37-
"expo-dev-client": "~3.3.11",
38-
"expo-device": "~5.9.4",
39-
"expo-font": "~11.10.3",
40-
"expo-haptics": "~12.8.1",
41-
"expo-image": "~1.10.6",
42-
"expo-image-picker": "~14.7.1",
43-
"expo-linking": "~6.2.2",
44-
"expo-notifications": "~0.27.7",
45-
"expo-router": "3.4.10",
46-
"expo-splash-screen": "~0.26.5",
47-
"expo-status-bar": "~1.11.1",
48-
"expo-system-ui": "2.9.4",
49-
"expo-updates": "~0.24.12",
50-
"lucide-react-native": "0.303.0",
51-
"match-sorter": "6.3.4",
52-
"nativewind": "2.0.11",
31+
"dayjs": "1.11.11",
32+
"expo": "52.0.31",
33+
"expo-application": "~6.0.2",
34+
"expo-blur": "~14.0.3",
35+
"expo-build-properties": "~0.13.2",
36+
"expo-constants": "~17.0.5",
37+
"expo-dev-client": "~5.0.11",
38+
"expo-device": "~7.0.2",
39+
"expo-font": "~13.0.3",
40+
"expo-haptics": "~14.0.1",
41+
"expo-image": "~2.0.4",
42+
"expo-image-picker": "~16.0.5",
43+
"expo-linking": "~7.0.5",
44+
"expo-notifications": "~0.29.13",
45+
"expo-router": "4.0.17",
46+
"expo-splash-screen": "~0.29.21",
47+
"expo-status-bar": "~2.0.1",
48+
"expo-system-ui": "4.0.8",
49+
"expo-updates": "~0.26.17",
50+
"lucide-react-native": "0.475.0",
51+
"match-sorter": "8.0.0",
52+
"nativewind": "4.1.23",
5353
"polished": "4.3.1",
54-
"posthog-react-native": "^2.10.1",
55-
"react": "18.2.0",
56-
"react-dom": "18.2.0",
57-
"react-native": "0.73.6",
58-
"react-native-avoid-softinput": "^4.0.2",
59-
"react-native-gesture-handler": "2.14.1",
60-
"react-native-ios-context-menu": "^2.5.1",
61-
"react-native-ios-utilities": "^4.4.5",
62-
"react-native-modal-datetime-picker": "17.1.0",
54+
"posthog-react-native": "3.9.0",
55+
"react": "18.3.1",
56+
"react-dom": "18.3.1",
57+
"react-native": "0.76.7",
58+
"react-native-avoid-softinput": "7.0.0",
59+
"react-native-gesture-handler": "2.20.2",
60+
"react-native-ios-context-menu": "3.1.0",
61+
"react-native-ios-utilities": "5.1.1",
62+
"react-native-modal-datetime-picker": "18.0.0",
6363
"react-native-progress": "5.0.1",
64-
"react-native-reanimated": "3.6.3",
65-
"react-native-safe-area-context": "4.8.2",
66-
"react-native-screens": "~3.29.0",
67-
"react-native-svg": "14.1.0",
64+
"react-native-reanimated": "3.16.7",
65+
"react-native-safe-area-context": "4.12.0",
66+
"react-native-screens": "~4.4.0",
67+
"react-native-svg": "15.8.0",
6868
"react-native-toast-message": "2.2.1",
6969
"reanimated-color-picker": "2.4.2",
7070
"superjson": "1.13.3",
7171
"uuid": "3.4.0",
72-
"zeego": "^1.10.0",
73-
"zustand": "4.5.5"
72+
"zeego": "2.0.4",
73+
"zustand": "4.5.2"
7474
},
7575
"devDependencies": {
76-
"@babel/core": "7.25.2",
77-
"@babel/preset-env": "7.25.4",
78-
"@babel/runtime": "7.25.6",
76+
"@babel/core": "7.26.8",
77+
"@babel/preset-env": "7.24.5",
78+
"@babel/runtime": "7.24.5",
7979
"@element/tailwind-config": "*",
80-
"@expo/config-plugins": "7.8.4",
81-
"@types/react": "18.3.10",
80+
"@expo/config-plugins": "9.0.15",
81+
"@types/react": "18.3.18",
8282
"@types/uuid": "3.4.13",
8383
"metro-react-native-babel-preset": "^0.77.0",
8484
"postcss": "8.4.47",

‎apps/app/src/app/(auth)/login.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export default function Login() {
4343
contentContainerStyle={{ paddingBottom: 400 }}
4444
showsHorizontalScrollIndicator={false}
4545
>
46-
<View className="space-y-1">
46+
<View className="gap-1">
4747
<View>
4848
<FormInput
4949
autoCapitalize="none"
@@ -80,7 +80,7 @@ export default function Login() {
8080
<Text className="opacity-60">or</Text>
8181
<View className="ml-3 h-px flex-1 bg-gray-100 dark:bg-gray-600" />
8282
</View>
83-
<View className="space-y-2">
83+
<View className="gap-2">
8484
<Link href="/register" asChild replace>
8585
<Button variant="outline">Register</Button>
8686
</Link>

‎apps/app/src/app/(auth)/register.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default function Register() {
4545
contentContainerStyle={{ paddingBottom: 400 }}
4646
showsHorizontalScrollIndicator={false}
4747
>
48-
<View className="space-y-1">
48+
<View className="gap-1">
4949
<View>
5050
<FormInput
5151
autoCapitalize="none"
@@ -98,7 +98,7 @@ export default function Register() {
9898
<Text className="opacity-60">or</Text>
9999
<View className="ml-3 h-px flex-1 bg-gray-100 dark:bg-gray-600" />
100100
</View>
101-
<View className="space-y-2">
101+
<View className="gap-2">
102102
<Link href="/login" asChild replace>
103103
<Button variant="outline">Login</Button>
104104
</Link>

‎apps/app/src/app/(home)/(timeline)/[id]/delete.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default function DeleteTask() {
3030
return (
3131
<ModalView title="Delete task">
3232
<ScrollView
33-
className="flex-1 space-y-2"
33+
className="flex-1 gap-2"
3434
showsVerticalScrollIndicator={false}
3535
keyboardShouldPersistTaps="handled"
3636
keyboardDismissMode="interactive"

‎apps/app/src/app/(home)/(timeline)/backlog.tsx‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1+
import { formatDuration, safeReadableColor } from "@element/shared"
2+
import colors from "@element/tailwind-config/src/colors"
13
import { useActionSheet } from "@expo/react-native-action-sheet"
24
import dayjs from "dayjs"
35
import * as Haptics from "expo-haptics"
46
import { useFocusEffect, useRouter } from "expo-router"
57
import { Circle } from "lucide-react-native"
68
import { ActivityIndicator, RefreshControl, ScrollView, TouchableOpacity, View, useColorScheme } from "react-native"
7-
8-
import { formatDuration, safeReadableColor } from "@element/shared"
9-
import colors from "@element/tailwind-config/src/colors"
10-
119
import { ModalView } from "~/components/ModalView"
1210
import { Text } from "~/components/Text"
1311
import { useTimelineDays } from "~/lib/hooks/useTimeline"
@@ -97,21 +95,18 @@ function TaskItem({ task }: { task: RouterOutputs["task"]["backlog"][number] })
9795

9896
const isDark = useColorScheme() === "dark"
9997
return (
100-
<View className="rounded border border-gray-100 bg-white dark:border-gray-600 dark:bg-black">
101-
<View className="flex flex-1 flex-row space-x-2 p-3">
98+
<View className="rounded-xs border border-gray-100 bg-white dark:border-gray-600 dark:bg-black ">
99+
<View className="flex flex-1 flex-row p-3">
102100
<TouchableOpacity
103101
onLongPress={handleOpenMenu}
104102
onPress={() => router.navigate({ pathname: "/[id]", params: { id: task.id } })}
105103
className="flex-1 flex-row justify-between"
106104
>
107-
<Text
108-
className="text-md flex flex-1 pt-0.5"
109-
style={{ textDecorationLine: task.isComplete ? "line-through" : undefined }}
110-
>
105+
<Text className="text-sm pt-0.5" style={{ textDecorationLine: task.isComplete ? "line-through" : undefined }}>
111106
{task.name}
112107
</Text>
113108
{!task.isComplete && (
114-
<View className="flex flex-shrink-0 flex-row items-center space-x-2">
109+
<View className="flex flex-shrink-0 flex-row items-center gap-2">
115110
{task.startTime ? <Text className="text-xs">{task.startTime}</Text> : null}
116111
{task.durationHours || task.durationMinutes ? (
117112
<Text className="text-xs">{formatDuration(task.durationHours, task.durationMinutes)}</Text>

0 commit comments

Comments
 (0)