Skip to content

Commit

Permalink
chore: upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
IgnisDa committed Feb 18, 2025
1 parent 1dfe686 commit 242689c
Show file tree
Hide file tree
Showing 11 changed files with 642 additions and 657 deletions.
291 changes: 130 additions & 161 deletions Cargo.lock

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,27 +51,27 @@ anyhow = "=1.0.95"
apalis = { version = "=0.6.4", features = ["catch-panic", "limit", "retry"] }
apalis-cron = "=0.6.4"
argon2 = "=0.6.0-pre.1"
async-graphql = { version = "=7.0.14", features = [
async-graphql = { version = "=7.0.15", features = [
"chrono",
"decimal",
"log",
"tracing",
"uuid",
] }
async-graphql-axum = "=7.0.14"
async-graphql-axum = "=7.0.15"
async-trait = "=0.1.86"
aws-sdk-s3 = { version = "=1.72.0", features = ["behavior-version-latest"] }
aws-sdk-s3 = { version = "=1.76.0", features = ["behavior-version-latest"] }
axum = { version = "=0.8.1", features = ["macros", "multipart"] }
boilermates = "=0.3.0"
bon = "=3.3.2"
chrono = "=0.4.39"
chrono-tz = "=0.10.1"
compile-time = "=0.2.0"
const-str = "=0.6.1"
const-str = "=0.6.2"
convert_case = "=0.7.1"
csv = "=1.3.1"
data-encoding = "=2.7.0"
derive_more = { version = "=1.0.0", features = [
data-encoding = "=2.8.0"
derive_more = { version = "=2.0.1", features = [
"add",
"add_assign",
"sum",
Expand All @@ -95,16 +95,16 @@ indexmap = "=2.7.1"
indoc = "=2.0.5"
isolang = { version = "=2.4.0", features = ["list_languages"] }
itertools = "=0.14.0"
jsonwebtoken = { version = "=9.3.0", default-features = false }
jsonwebtoken = { version = "=9.3.1", default-features = false }
logs-wheel = "=0.3.1"
markdown = "=1.0.0-alpha.21"
markdown = "=1.0.0-alpha.22"
mime_guess = "=2.0.5"
nanoid = "=0.4.0"
nest_struct = "=0.5.2"
nest_struct = "=0.5.3"
openidconnect = "=3.5.0"
paginate = "=1.1.11"
radarr-api-rs = "=3.0.1"
rand = "=0.9.0-beta.0"
rand = "=0.9.0"
regex = "=1.11.1"
rust_decimal = "=1.36.0"
rust_decimal_macros = "=1.36.0"
Expand All @@ -125,7 +125,7 @@ schematic = { version = "=0.17.11", features = [
"yaml",
], default-features = false }
scraper = "=0.22.0"
sea-orm = { version = "=1.1.4", features = [
sea-orm = { version = "=1.1.5", features = [
"debug-print",
"postgres-array",
"macros",
Expand All @@ -136,15 +136,15 @@ sea-orm = { version = "=1.1.4", features = [
"with-rust_decimal",
"with-uuid",
], default-features = false }
sea-orm-migration = "=1.1.4"
sea-query = "=0.32.1"
sea-orm-migration = "=1.1.5"
sea-query = "=0.32.2"
serde = { version = "=1.0.217", features = ["derive"] }
serde_json = "=1.0.138"
serde_with = { version = "=3.12.0", features = ["chrono_0_4"] }
serde-xml-rs = "=0.6.0"
slug = "=0.1.6"
sonarr-api-rs = "=3.0.0"
sqlx = { version = "=0.8.2", default-features = false, features = ["postgres"] }
sqlx = { version = "=0.8.3", default-features = false, features = ["postgres"] }
strum = { version = "=0.26.3", features = ["derive"] }
struson = { version = "=0.6.0", features = ["serde"] }
reqwest = { version = "=0.12.12", features = ["json", "stream"] }
Expand All @@ -155,7 +155,7 @@ tower-http = { version = "=0.6.2", features = ["catch-panic", "cors", "trace"] }
tracing = { version = "=0.1.41", features = ["attributes"] }
tracing-subscriber = "=0.3.19"
unkey = "=0.5.0"
uuid = { version = "=1.12.1", features = ["v4"], default-features = false }
uuid = { version = "=1.13.2", features = ["v4"], default-features = false }

[profile.release]
lto = true
32 changes: 16 additions & 16 deletions apps/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
"@conform-to/react": "1.2.2",
"@conform-to/zod": "1.2.2",
"@formkit/auto-animate": "0.8.2",
"@hello-pangea/dnd": "17.0.0",
"@hello-pangea/dnd": "18.0.1",
"@lukemorales/query-key-factory": "1.3.4",
"@mantine/carousel": "7.16.3",
"@mantine/charts": "7.16.3",
"@mantine/code-highlight": "7.16.3",
"@mantine/core": "7.16.3",
"@mantine/dates": "7.16.3",
"@mantine/form": "7.16.3",
"@mantine/hooks": "7.16.3",
"@mantine/modals": "7.16.3",
"@mantine/notifications": "7.16.3",
"@mantine/carousel": "7.17.0",
"@mantine/charts": "7.17.0",
"@mantine/code-highlight": "7.17.0",
"@mantine/core": "7.17.0",
"@mantine/dates": "7.17.0",
"@mantine/form": "7.17.0",
"@mantine/hooks": "7.17.0",
"@mantine/modals": "7.17.0",
"@mantine/notifications": "7.17.0",
"@mjackson/file-storage": "0.6.1",
"@mjackson/form-data-parser": "0.7.0",
"@react-router/fs-routes": "7.1.5",
Expand All @@ -32,8 +32,8 @@
"@ryot/graphql": "workspace:*",
"@ryot/ts-utils": "workspace:*",
"@tabler/icons-react": "3.17.0",
"@tanstack/react-query": "5.66.0",
"@tanstack/react-query-devtools": "5.66.0",
"@tanstack/react-query": "5.66.5",
"@tanstack/react-query-devtools": "5.66.5",
"clsx": "2.1.1",
"cookie": "1.0.2",
"crypto-js": "4.2.0",
Expand All @@ -48,11 +48,11 @@
"humanize-duration-ts": "2.1.1",
"immer": "10.1.1",
"isbot": "5.1.22",
"jotai": "2.11.3",
"jotai": "2.12.1",
"js-cookie": "3.0.5",
"jwt-decode": "4.0.0",
"mantine-datatable": "7.15.1",
"nanoid": "5.0.9",
"nanoid": "5.1.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router": "7.1.5",
Expand All @@ -66,7 +66,7 @@
"ufo": "1.5.4",
"usehooks-ts": "3.1.1",
"uuid": "11.0.5",
"zod": "3.24.1"
"zod": "3.24.2"
},
"devDependencies": {
"@bitprojects/umami-logger-typescript": "1.0.10",
Expand All @@ -79,7 +79,7 @@
"@types/react": "18.3.18",
"@types/react-dom": "18.3.5",
"@types/uuid": "10.0.0",
"postcss": "8.5.1",
"postcss": "8.5.2",
"postcss-preset-mantine": "1.17.0",
"postcss-simple-vars": "7.0.1",
"react-router-devtools": "1.1.4",
Expand Down
12 changes: 6 additions & 6 deletions apps/website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@radix-ui/react-label": "2.1.2",
"@radix-ui/react-slot": "1.1.2",
"@radix-ui/react-tooltip": "1.1.8",
"@react-email/components": "0.0.32",
"@react-email/components": "0.0.33",
"@react-router/fs-routes": "7.1.5",
"@react-router/node": "7.1.5",
"@react-router/serve": "7.1.5",
Expand All @@ -25,12 +25,12 @@
"@ryot/transactional": "workspace:*",
"@ryot/ts-utils": "workspace:*",
"@tabler/icons-react": "3.17.0",
"@tailwindcss/vite": "4.0.5",
"@tailwindcss/vite": "4.0.6",
"@unkey/api": "0.33.1",
"class-variance-authority": "0.7.1",
"clsx": "2.1.1",
"dayjs": "1.11.13",
"drizzle-orm": "0.39.2",
"drizzle-orm": "0.39.3",
"embla-carousel-autoplay": "8.5.2",
"embla-carousel-react": "8.5.2",
"graphql": "16.10.0",
Expand All @@ -40,7 +40,7 @@
"isbot": "5.1.22",
"lodash": "4.17.21",
"lucide-react": "0.475.0",
"nanoid": "5.0.9",
"nanoid": "5.1.0",
"next-themes": "0.4.4",
"nodemailer": "6.10.0",
"openid-client": "5.7.1",
Expand All @@ -56,7 +56,7 @@
"tiny-invariant": "1.3.3",
"ts-pattern": "5.6.2",
"ufo": "1.5.4",
"zod": "3.24.1"
"zod": "3.24.2"
},
"devDependencies": {
"@react-router/dev": "7.1.5",
Expand All @@ -67,7 +67,7 @@
"@types/react-dom": "18.3.5",
"autoprefixer": "10.4.20",
"drizzle-kit": "0.30.4",
"tailwindcss": "4.0.5",
"tailwindcss": "4.0.6",
"typescript": "5.7.3",
"vite": "6.1.0",
"vite-tsconfig-paths": "5.1.4"
Expand Down
13 changes: 12 additions & 1 deletion crates/models/common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use enum_meta::{meta, Meta};
use enum_models::{EntityLot, MediaLot, MediaSource};
use rust_decimal::Decimal;
use schematic::{ConfigEnum, Schematic};
use sea_orm::{prelude::DateTimeUtc, FromJsonQueryResult};
use sea_orm::{prelude::DateTimeUtc, sea_query::PgDateTruncUnit, FromJsonQueryResult};
use serde::{Deserialize, Serialize};
use serde_with::skip_serializing_none;
use strum::{Display, EnumIter};
Expand Down Expand Up @@ -253,6 +253,17 @@ pub enum DailyUserActivitiesResponseGroupedBy {
AllTime,
}

impl From<DailyUserActivitiesResponseGroupedBy> for PgDateTruncUnit {
fn from(group: DailyUserActivitiesResponseGroupedBy) -> Self {
match group {
DailyUserActivitiesResponseGroupedBy::Day => PgDateTruncUnit::Day,
DailyUserActivitiesResponseGroupedBy::Year => PgDateTruncUnit::Year,
DailyUserActivitiesResponseGroupedBy::Month => PgDateTruncUnit::Month,
DailyUserActivitiesResponseGroupedBy::AllTime => unreachable!(),
}
}
}

#[skip_serializing_none]
#[derive(Debug, Hash, Default, Serialize, Deserialize, InputObject, Clone, PartialEq, Eq)]
pub struct UserAnalyticsInput {
Expand Down
2 changes: 1 addition & 1 deletion crates/models/fitness/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::collections::HashMap;

use async_graphql::{Enum, InputObject, SimpleObject};
use common_models::{SearchInput, StoredUrl};
use derive_more::{Add, AddAssign, Sum};
use derive_more::with_trait::{Add, AddAssign, Sum};
use educe::Educe;
use enum_models::{
ExerciseEquipment, ExerciseForce, ExerciseLevel, ExerciseLot, ExerciseMechanic, ExerciseMuscle,
Expand Down
30 changes: 11 additions & 19 deletions crates/services/statistics/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::{cmp::Reverse, fmt::Write, sync::Arc};
use std::{cmp::Reverse, sync::Arc};

use async_graphql::Result;
use common_models::{
Expand All @@ -17,9 +17,9 @@ use hashbag::HashBag;
use itertools::Itertools;
use sea_orm::{
prelude::{Date, Expr},
sea_query::{Alias, Func, NullOrdering},
ColumnTrait, DerivePartialModel, EntityTrait, FromQueryResult, Iden, Order, QueryFilter,
QueryOrder, QuerySelect, QueryTrait,
sea_query::{Alias, Func, NullOrdering, PgFunc},
ColumnTrait, DerivePartialModel, EntityTrait, FromQueryResult, Order, QueryFilter, QueryOrder,
QuerySelect, QueryTrait,
};
use supporting_service::SupportingService;

Expand Down Expand Up @@ -78,13 +78,6 @@ impl StatisticsService {
user_id: &String,
input: UserAnalyticsInput,
) -> Result<DailyUserActivitiesResponse> {
// TODO: https://github.com/SeaQL/sea-query/pull/825 when merged
struct DateTrunc;
impl Iden for DateTrunc {
fn unquoted(&self, s: &mut dyn Write) {
write!(s, "DATE_TRUNC").unwrap();
}
}
let precondition = DailyUserActivity::find()
.filter(daily_user_activity::Column::UserId.eq(user_id))
.apply_if(input.date_range.end_date, |query, v| {
Expand Down Expand Up @@ -129,14 +122,13 @@ impl StatisticsService {
Expr::expr(Func::cast_as(
match grouped_by {
DailyUserActivitiesResponseGroupedBy::AllTime => default_date,
_ => Expr::expr(
Func::cust(DateTrunc)
.arg(Expr::val(grouped_by.to_string()))
.arg(Func::coalesce([
Expr::col(daily_user_activity::Column::Date).into(),
Func::cast_as(default_date, date_type.clone()).into(),
])),
),
_ => Expr::expr(PgFunc::date_trunc(
grouped_by.into(),
Func::coalesce([
Expr::col(daily_user_activity::Column::Date).into(),
Func::cast_as(default_date, date_type.clone()).into(),
]),
)),
},
date_type,
)),
Expand Down
2 changes: 1 addition & 1 deletion libs/generated/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"graphql": "16.10.0"
},
"devDependencies": {
"@graphql-codegen/cli": "5.0.4",
"@graphql-codegen/cli": "5.0.5",
"@graphql-codegen/client-preset": "4.6.2"
}
}
4 changes: 2 additions & 2 deletions libs/transactional/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"name": "@ryot/transactional",
"private": true,
"dependencies": {
"@react-email/components": "0.0.32",
"@react-email/components": "0.0.33",
"@ryot/ts-utils": "workspace:*",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-email": "3.0.6"
"react-email": "3.0.7"
},
"devDependencies": {
"@types/react": "18.3.18",
Expand Down
2 changes: 1 addition & 1 deletion libs/ts-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"react-router": "7.1.5",
"tailwind-merge": "3.0.1",
"tiny-invariant": "1.3.3",
"zod": "3.24.1"
"zod": "3.24.2"
},
"devDependencies": {
"@types/lodash": "4.17.15"
Expand Down
Loading

0 comments on commit 242689c

Please sign in to comment.