Skip to content

Commit b2fd61f

Browse files
JClackettJClackett
committed
Merge branch 'develop' of github.com:NoQuarterTeam/element into develop
# Conflicts: # apps/app/package.json # apps/web/package.json # pnpm-lock.yaml
2 parents 25b8083 + 21e2e2e commit b2fd61f

11 files changed

Lines changed: 4527 additions & 4209 deletions

File tree

‎apps/app/package.json‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,35 @@
2121
"@expo/react-native-action-sheet": "4.0.1",
2222
"@react-native-async-storage/async-storage": "1.23.1",
2323
"@react-native-community/datetimepicker": "8.2.0",
24-
"@react-native-menu/menu": "^1.0.3",
24+
"@react-native-menu/menu": "1.0.3",
2525
"@react-native-picker/picker": "2.9.0",
2626
"@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",
30-
"class-variance-authority": "0.7.0",
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",
30+
"class-variance-authority": "0.7.1",
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",
5353
"polished": "4.3.1",
5454
"posthog-react-native": "3.9.0",
5555
"react": "18.3.1",
@@ -69,21 +69,21 @@
6969
"reanimated-color-picker": "2.4.2",
7070
"superjson": "1.13.3",
7171
"uuid": "3.4.0",
72-
"zeego": "2.0.4",
73-
"zustand": "4.5.2"
72+
"zeego": "1.10.0",
73+
"zustand": "4.5.6"
7474
},
7575
"devDependencies": {
76-
"@babel/core": "7.26.8",
77-
"@babel/preset-env": "7.24.5",
78-
"@babel/runtime": "7.24.5",
76+
"@babel/core": "7.26.7",
77+
"@babel/preset-env": "7.26.7",
78+
"@babel/runtime": "7.26.7",
7979
"@element/tailwind-config": "*",
80-
"@expo/config-plugins": "9.0.15",
80+
"@expo/config-plugins": "7.8.4",
8181
"@types/react": "18.3.18",
8282
"@types/uuid": "3.4.13",
83-
"metro-react-native-babel-preset": "^0.77.0",
84-
"postcss": "8.4.47",
83+
"metro-react-native-babel-preset": "0.77.0",
84+
"postcss": "8.5.1",
8585
"tailwindcss": "3.3.2",
86-
"typescript": "5.6.2"
86+
"typescript": "5.7.3"
8787
},
8888
"private": true
8989
}

‎apps/web/package.json‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -22,74 +22,74 @@
2222
"@element/shared": "workspace:*",
2323
"@fontsource/poppins": "^5.0.8",
2424
"@hello-pangea/dnd": "16.6.0",
25-
"@radix-ui/react-alert-dialog": "1.1.1",
26-
"@radix-ui/react-avatar": "1.1.0",
27-
"@radix-ui/react-checkbox": "1.1.1",
28-
"@radix-ui/react-dropdown-menu": "2.1.1",
29-
"@radix-ui/react-hover-card": "1.1.1",
30-
"@radix-ui/react-popover": "1.1.1",
31-
"@radix-ui/react-switch": "1.1.0",
32-
"@radix-ui/react-toast": "1.2.1",
33-
"@radix-ui/react-tooltip": "1.1.2",
34-
"@remix-run/css-bundle": "2.12.1",
35-
"@remix-run/node": "2.12.1",
36-
"@remix-run/react": "2.12.1",
37-
"@remix-run/serve": "2.12.1",
25+
"@radix-ui/react-alert-dialog": "1.1.6",
26+
"@radix-ui/react-avatar": "1.1.3",
27+
"@radix-ui/react-checkbox": "1.1.4",
28+
"@radix-ui/react-dropdown-menu": "2.1.6",
29+
"@radix-ui/react-hover-card": "1.1.6",
30+
"@radix-ui/react-popover": "1.1.6",
31+
"@radix-ui/react-switch": "1.1.3",
32+
"@radix-ui/react-toast": "1.2.6",
33+
"@radix-ui/react-tooltip": "1.1.8",
34+
"@remix-run/css-bundle": "2.15.3",
35+
"@remix-run/node": "2.15.3",
36+
"@remix-run/react": "2.15.3",
37+
"@remix-run/serve": "2.15.3",
3838
"@tailwindcss/container-queries": "^0.1.1",
3939
"@tanstack/react-query": "4.36.1",
4040
"@tanstack/react-table": "^8.11.6",
4141
"@trpc/server": "10.45.2",
42-
"axios": "1.7.7",
43-
"class-variance-authority": "0.7.0",
44-
"cookie": "0.7.0",
42+
"axios": "1.7.9",
43+
"class-variance-authority": "0.7.1",
44+
"cookie": "0.7.2",
4545
"currency.js": "2.0.4",
4646
"dayjs": "1.11.13",
4747
"deep-equal": "2.2.3",
48-
"dotenv": "16.4.5",
48+
"dotenv": "16.4.7",
4949
"expo-server-sdk": "^3.7.0",
5050
"isbot": "3.8.0",
51-
"jose": "5.9.3",
51+
"jose": "5.9.6",
5252
"js-confetti": "0.12.0",
5353
"js-cookie": "3.0.5",
5454
"jsonwebtoken": "9.0.2",
5555
"limax": "4.1.0",
56-
"lucide-react": "0.446.0",
56+
"lucide-react": "0.474.0",
5757
"match-sorter": "6.3.4",
5858
"polished": "4.3.1",
5959
"posthog-js": "^1.100.0",
6060
"pretty-cache-header": "1.0.0",
61-
"query-string": "9.1.0",
61+
"query-string": "9.1.1",
6262
"react": "18.3.1",
6363
"react-colorful": "5.6.1",
6464
"react-dom": "18.3.1",
65-
"react-dropzone": "14.2.3",
66-
"react-intersection-observer": "9.13.1",
67-
"react-select": "5.8.1",
68-
"recharts": "2.12.7",
65+
"react-dropzone": "14.3.5",
66+
"react-intersection-observer": "9.15.1",
67+
"react-select": "5.10.0",
68+
"recharts": "2.15.1",
6969
"remix-utils": "7.7.0",
7070
"sharp": "0.32.6",
71-
"sonner": "1.5.0",
71+
"sonner": "1.7.4",
7272
"tailwind-scrollbar-hide": "^1.1.7",
7373
"tailwindcss-radix": "3.0.5",
74-
"zod": "3.23.8",
75-
"zustand": "4.5.5"
74+
"zod": "3.24.1",
75+
"zustand": "4.5.6"
7676
},
7777
"devDependencies": {
7878
"@element/tailwind-config": "workspace:*",
79-
"@remix-run/dev": "2.12.1",
80-
"@tailwindcss/forms": "0.5.9",
79+
"@remix-run/dev": "2.15.3",
80+
"@tailwindcss/forms": "0.5.10",
8181
"@types/cookie": "0.6.0",
8282
"@types/deep-equal": "1.0.4",
8383
"@types/js-cookie": "3.0.6",
84-
"@types/jsonwebtoken": "9.0.7",
84+
"@types/jsonwebtoken": "9.0.8",
8585
"@types/react": "18.3.18",
86-
"@types/react-dom": "18.3.0",
86+
"@types/react-dom": "18.3.5",
8787
"cssnano": "6.1.2",
88-
"dotenv-cli": "7.4.2",
89-
"postcss": "8.4.47",
90-
"remix-flat-routes": "0.6.5",
88+
"dotenv-cli": "7.4.4",
89+
"postcss": "8.5.1",
90+
"remix-flat-routes": "0.8.4",
9191
"tailwindcss": "3.3.2",
92-
"typescript": "5.6.2"
92+
"typescript": "5.7.3"
9393
},
9494
"sideEffects": false
9595
}

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"turbo": "1.13.4"
66
},
77
"devDependencies": {
8-
"@biomejs/biome": "1.9.2",
9-
"typescript": "5.6.2"
8+
"@biomejs/biome": "1.9.4",
9+
"typescript": "5.7.3"
1010
},
1111
"scripts": {
1212
"build": "turbo run build",

‎packages/api/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"dayjs": "1.11.13",
2020
"jsonwebtoken": "9.0.2",
2121
"superjson": "1.13.3",
22-
"zod": "3.23.8"
22+
"zod": "3.24.1"
2323
},
2424
"devDependencies": {
25-
"@types/jsonwebtoken": "9.0.7",
25+
"@types/jsonwebtoken": "9.0.8",
2626
"@types/node": "^18.15.3"
2727
}
2828
}

‎packages/database/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
"sideEffects": false,
77
"dependencies": {
88
"@element/server-env": "workspace:*",
9-
"@neondatabase/serverless": "^0.9.0",
9+
"@neondatabase/serverless": "^0.10.0",
1010
"@planetscale/database": "^1.13.0",
1111
"@prisma/adapter-neon": "^5.12.1",
12-
"@prisma/adapter-planetscale": "5.20.0",
13-
"@prisma/client": "5.20.0",
14-
"prisma": "5.20.0",
12+
"@prisma/adapter-planetscale": "5.22.0",
13+
"@prisma/client": "5.22.0",
14+
"prisma": "5.22.0",
1515
"ws": "^8.16.0"
1616
},
1717
"devDependencies": {

‎packages/emails/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
},
1717
"devDependencies": {
1818
"tailwindcss": "3.3.2",
19-
"typescript": "5.6.2"
19+
"typescript": "5.7.3"
2020
}
2121
}

‎packages/server/env/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
"with-env": "dotenv -e ../../../.env --"
1111
},
1212
"dependencies": {
13-
"zod": "3.23.8"
13+
"zod": "3.24.1"
1414
},
1515
"devDependencies": {
16-
"@types/node": "18.19.54",
17-
"dotenv-cli": "7.4.2",
18-
"typescript": "5.6.2"
16+
"@types/node": "18.19.75",
17+
"dotenv-cli": "7.4.4",
18+
"typescript": "5.7.3"
1919
}
2020
}

‎packages/server/schemas/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
"dependencies": {
1111
"@element/database": "workspace:*",
1212
"@element/shared": "workspace:*",
13-
"zod": "3.23.8",
13+
"zod": "3.24.1",
1414
"zodix": "0.4.4"
1515
},
1616
"devDependencies": {
1717
"@element/tailwind-config": "workspace:*",
18-
"@types/node": "18.19.54",
19-
"typescript": "5.6.2"
18+
"@types/node": "18.19.75",
19+
"typescript": "5.7.3"
2020
}
2121
}

‎packages/server/services/package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,31 @@
99
"typecheck": "tsc --noEmit"
1010
},
1111
"dependencies": {
12-
"@aws-sdk/client-s3": "3.658.1",
13-
"@aws-sdk/lib-storage": "3.658.1",
14-
"@aws-sdk/s3-request-presigner": "3.658.1",
12+
"@aws-sdk/client-s3": "3.743.0",
13+
"@aws-sdk/lib-storage": "3.743.0",
14+
"@aws-sdk/s3-request-presigner": "3.743.0",
1515
"@element/database": "workspace:*",
1616
"@element/emails": "workspace:*",
1717
"@element/server-env": "workspace:*",
1818
"@element/shared": "workspace:*",
19-
"@slack/web-api": "7.5.0",
19+
"@slack/web-api": "7.8.0",
2020
"@upstash/qstash": "^2.3.0",
2121
"bcryptjs": "2.4.3",
2222
"blurhash": "2.0.5",
2323
"dayjs": "1.11.13",
2424
"jsonwebtoken": "9.0.2",
2525
"loops": "^0.4.0",
26-
"nodemailer": "6.9.15",
26+
"nodemailer": "6.10.0",
2727
"resend": "3.5.0",
2828
"sharp": "0.32.6",
2929
"stripe": "15.12.0",
30-
"zod": "3.23.8"
30+
"zod": "3.24.1"
3131
},
3232
"devDependencies": {
3333
"@types/bcryptjs": "2.4.6",
34-
"@types/jsonwebtoken": "9.0.7",
35-
"@types/node": "18.19.54",
36-
"@types/nodemailer": "6.4.16",
37-
"typescript": "5.6.2"
34+
"@types/jsonwebtoken": "9.0.8",
35+
"@types/node": "18.19.75",
36+
"@types/nodemailer": "6.4.17",
37+
"typescript": "5.7.3"
3838
}
3939
}

‎packages/shared/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"peerDependencies": {
1515
"polished": "4.3.1",
16-
"tailwind-merge": "2.5.2"
16+
"tailwind-merge": "2.6.0"
1717
},
1818
"devDependencies": {
1919
"@types/node": "^18.15.3"

0 commit comments

Comments
 (0)