From e4ac54d1deb7dbd7873215d98a99f91ac647a7e8 Mon Sep 17 00:00:00 2001 From: Aleksander <170264518+t-aleksander@users.noreply.github.com> Date: Thu, 15 Oct 2026 11:28:08 +0200 Subject: [PATCH 1/2] fix dependencies --- Cargo.lock | 4 ++-- web/package.json | 2 +- web/pnpm-lock.yaml | 46 ++++++++++++++++++++--------------------- web/pnpm-workspace.yaml | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b32dd022..7e76bb13 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3968,9 +3968,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.43" +version = "0.23.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0283386ce02abc0151e1761d08802dfe86c173b0b494af5cbc086574e453da06" +checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf" dependencies = [ "aws-lc-rs", "log", diff --git a/web/package.json b/web/package.json index 45d18b90..242b926e 100644 --- a/web/package.json +++ b/web/package.json @@ -24,7 +24,7 @@ "@tanstack/react-router": "^1.170.16", "@tanstack/react-router-devtools": "^1.167.0", "@uidotdev/usehooks": "^2.4.1", - "axios": "^1.18.0", + "axios": "^1.20.0", "change-case": "^5.4.4", "clsx": "^2.1.1", "dayjs": "^1.11.21", diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index 757f42b1..642f2e7c 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -5,7 +5,7 @@ settings: excludeLinksFromLockfile: false overrides: - seroval: 1.5.4 + seroval: ^1.6.3 importers: @@ -42,8 +42,8 @@ importers: specifier: ^2.4.1 version: 2.4.1(react-dom@19.2.7(react@19.2.7))(react@19.2.7) axios: - specifier: ^1.18.0 - version: 1.18.0(supports-color@10.2.2) + specifier: ^1.20.0 + version: 1.20.0 change-case: specifier: ^5.4.4 version: 5.4.4 @@ -1493,8 +1493,8 @@ packages: asynckit@0.4.0: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} - axios@1.18.0: - resolution: {integrity: sha512-E32NzpYKp++W7XRe52rHiXV2ehxmh3wbdgO7MHeFM+vqxLBYHzt0ElkiImtOBxtOmyp0yoC8C6uESVV84Y2/hw==} + axios@1.20.0: + resolution: {integrity: sha512-r8aOh8j9cGKpgQAqpzrUHnSIc6a59Y3Xf/cv8sy1DrHCkZHzQGEuoq1tARk6qSyDdtQGSDgpb9kFlruzPvrgwg==} babel-dead-code-elimination@1.0.12: resolution: {integrity: sha512-GERT7L2TiYcYDtYk1IpD+ASAYXjKbLTDPhBtYj7X1NuRMDTMtAx9kyBenub1Ev41lo91OHCKdmP+egTDmfQ7Ig==} @@ -2518,16 +2518,16 @@ packages: resolution: {integrity: sha512-16OL3NnUBw8JG1jBLUoZJsLnQq0n5Ua6aHalhJK4fMQkz1lqR7Osz1sA30trBtd9VUDc2NgkuRCn8+/pBwqZ+w==} engines: {node: '>=10'} peerDependencies: - seroval: 1.5.4 + seroval: ^1.6.3 seroval-plugins@1.5.4: resolution: {integrity: sha512-S0xQPhUTefAhNvNWFg0c1J8qJArHt5KdtJ/cFAofo06KD1MVSeFWyl4iiu+ApDIuw0WhjpOfCdgConOfAnLgkw==} engines: {node: '>=10'} peerDependencies: - seroval: 1.5.4 + seroval: ^1.6.3 - seroval@1.5.4: - resolution: {integrity: sha512-46uFvgrXTVxZcUorgSSRZ4y+ieqLLQRMlG4bnCZKW3qI6BZm7Rg4ntMW4p1mILEEBZWrFlcpp0AyIIlM6jD9iw==} + seroval@1.6.9: + resolution: {integrity: sha512-UeEzHwAK+yl0YLbsvROV1t5yMYEwZZ0CfKYxDvUgS2fO9Vxdf8djqVIB+OuVpuawRNPqw68LE1Du/GMsW2ZPqA==} engines: {node: '>=10'} sharp@0.35.3: @@ -3832,8 +3832,8 @@ snapshots: dependencies: '@tanstack/history': 1.162.0 cookie-es: 3.1.1 - seroval: 1.5.4 - seroval-plugins: 1.5.4(seroval@1.5.4) + seroval: 1.6.9 + seroval-plugins: 1.5.4(seroval@1.6.9) '@tanstack/router-devtools-core@1.168.0(@tanstack/router-core@1.171.13)(csstype@3.2.3)': dependencies: @@ -4050,7 +4050,7 @@ snapshots: acorn@8.17.0: {} - agent-base@6.0.2(supports-color@10.2.2): + agent-base@6.0.2: dependencies: debug: 4.4.3(supports-color@10.2.2) transitivePeerDependencies: @@ -4090,11 +4090,11 @@ snapshots: asynckit@0.4.0: {} - axios@1.18.0(supports-color@10.2.2): + axios@1.20.0: dependencies: follow-redirects: 1.16.0 form-data: 4.0.6 - https-proxy-agent: 5.0.1(supports-color@10.2.2) + https-proxy-agent: 5.0.1 proxy-from-env: 2.1.0 transitivePeerDependencies: - debug @@ -4604,9 +4604,9 @@ snapshots: html-url-attributes@3.0.1: {} - https-proxy-agent@5.0.1(supports-color@10.2.2): + https-proxy-agent@5.0.1: dependencies: - agent-base: 6.0.2(supports-color@10.2.2) + agent-base: 6.0.2 debug: 4.4.3(supports-color@10.2.2) transitivePeerDependencies: - supports-color @@ -5221,15 +5221,15 @@ snapshots: semver@7.8.5: {} - seroval-plugins@1.3.3(seroval@1.5.4): + seroval-plugins@1.3.3(seroval@1.6.9): dependencies: - seroval: 1.5.4 + seroval: 1.6.9 - seroval-plugins@1.5.4(seroval@1.5.4): + seroval-plugins@1.5.4(seroval@1.6.9): dependencies: - seroval: 1.5.4 + seroval: 1.6.9 - seroval@1.5.4: {} + seroval@1.6.9: {} sharp@0.35.3(@types/node@25.9.4): dependencies: @@ -5313,8 +5313,8 @@ snapshots: solid-js@1.9.10: dependencies: csstype: 3.2.3 - seroval: 1.5.4 - seroval-plugins: 1.3.3(seroval@1.5.4) + seroval: 1.6.9 + seroval-plugins: 1.3.3(seroval@1.6.9) source-map-js@1.2.1: {} diff --git a/web/pnpm-workspace.yaml b/web/pnpm-workspace.yaml index bea4c0c9..7d35a259 100644 --- a/web/pnpm-workspace.yaml +++ b/web/pnpm-workspace.yaml @@ -9,4 +9,4 @@ onlyBuiltDependencies: - esbuild - sharp overrides: - seroval: 1.5.4 + seroval: ^1.6.3 From eb66daf8a2eb4ca197295f5ba1a6f9e5bc84bc27 Mon Sep 17 00:00:00 2001 From: Aleksander <170264518+t-aleksander@users.noreply.github.com> Date: Thu, 15 Oct 2026 11:38:03 +0200 Subject: [PATCH 2/2] bump git vergen --- Cargo.lock | 133 ++++------------------------------------------------- Cargo.toml | 2 +- build.rs | 4 +- 3 files changed, 11 insertions(+), 128 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7e76bb13..cac4754b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -60,9 +60,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "ammonia" -version = "4.1.4" +version = "4.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6d763210e2eb7670d1a5183a08bebefa3f97db2a738a684f2ce00bd49f681d" +checksum = "36322ccf536de7b7afd259098615203e4cc5caca1b78482b58334a720c66e40a" dependencies = [ "cssparser", "html5ever", @@ -891,16 +891,6 @@ dependencies = [ "syn 2.0.119", ] -[[package]] -name = "darling" -version = "0.20.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" -dependencies = [ - "darling_core 0.20.11", - "darling_macro 0.20.11", -] - [[package]] name = "darling" version = "0.23.0" @@ -921,20 +911,6 @@ dependencies = [ "darling_macro 0.24.1", ] -[[package]] -name = "darling_core" -version = "0.20.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.119", -] - [[package]] name = "darling_core" version = "0.23.0" @@ -961,17 +937,6 @@ dependencies = [ "syn 3.0.4", ] -[[package]] -name = "darling_macro" -version = "0.20.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" -dependencies = [ - "darling_core 0.20.11", - "quote", - "syn 2.0.119", -] - [[package]] name = "darling_macro" version = "0.23.0" @@ -1058,7 +1023,7 @@ dependencies = [ "tracing", "tracing-subscriber", "url", - "vergen-git2 9.1.0", + "vergen-git2", ] [[package]] @@ -1112,7 +1077,7 @@ dependencies = [ "url", "utoipa", "uuid", - "vergen-git2 10.0.3", + "vergen-git2", "webauthn-rs", "x25519-dalek", ] @@ -1230,37 +1195,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "derive_builder" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" -dependencies = [ - "darling 0.20.11", - "proc-macro2", - "quote", - "syn 2.0.119", -] - -[[package]] -name = "derive_builder_macro" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" -dependencies = [ - "derive_builder_core", - "syn 2.0.119", -] - [[package]] name = "digest" version = "0.10.7" @@ -1728,19 +1662,6 @@ dependencies = [ "polyval", ] -[[package]] -name = "git2" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b88256088d75a56f8ecfa070513a775dd9107f6530ef14919dac831af9cfe2b" -dependencies = [ - "bitflags 2.13.1", - "libc", - "libgit2-sys", - "log", - "url", -] - [[package]] name = "git2" version = "0.21.0" @@ -5431,19 +5352,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vergen" -version = "9.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b849a1f6d8639e8de261e81ee0fc881e3e3620db1af9f2e0da015d4382ceaf75" -dependencies = [ - "anyhow", - "derive_builder", - "rustversion", - "time", - "vergen-lib 9.1.0", -] - [[package]] name = "vergen" version = "10.0.3" @@ -5453,22 +5361,8 @@ dependencies = [ "anyhow", "bon", "rustversion", - "vergen-lib 10.0.3", -] - -[[package]] -name = "vergen-git2" -version = "9.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51ab55ddf1188c8d679f349775362b0fa9e90bd7a4ac69838b2a087623f0d57" -dependencies = [ - "anyhow", - "derive_builder", - "git2 0.20.4", - "rustversion", "time", - "vergen 9.1.0", - "vergen-lib 9.1.0", + "vergen-lib", ] [[package]] @@ -5479,22 +5373,11 @@ checksum = "04218f71b80f5ae2665411a97dab37d3e756a06354aa826e098e049d4540769f" dependencies = [ "anyhow", "bon", - "git2 0.21.0", + "git2", "rustversion", "time", - "vergen 10.0.3", - "vergen-lib 10.0.3", -] - -[[package]] -name = "vergen-lib" -version = "9.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b34a29ba7e9c59e62f229ae1932fb1b8fb8a6fdcc99215a641913f5f5a59a569" -dependencies = [ - "anyhow", - "derive_builder", - "rustversion", + "vergen", + "vergen-lib", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index e6be87a4..86a7c991 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,7 +70,7 @@ tokio = { version = "1", features = ["net"] } [build-dependencies] tonic-prost-build = "0.14" -vergen-git2 = { version = "9.1", features = ["build"] } +vergen-git2 = { version = "10.0", features = ["build"] } [lints.clippy] uninlined_format_args = "deny" diff --git a/build.rs b/build.rs index 057ea8f7..32739bc6 100644 --- a/build.rs +++ b/build.rs @@ -1,8 +1,8 @@ -use vergen_git2::{Emitter, Git2Builder}; +use vergen_git2::{Emitter, Git2}; fn main() -> Result<(), Box> { // set VERGEN_GIT_SHA env variable based on git commit hash - let git2 = Git2Builder::default().branch(true).sha(true).build()?; + let git2 = Git2::builder().branch(true).sha(true).build(); Emitter::default().add_instructions(&git2)?.emit()?; tonic_prost_build::configure()