diff --git a/.github/update.log b/.github/update.log index 6a5e0f01f9..6f02abf158 100644 --- a/.github/update.log +++ b/.github/update.log @@ -1155,3 +1155,4 @@ Update On Wed Oct 15 20:47:46 CEST 2025 Update On Thu Oct 16 20:51:10 CEST 2025 Update On Fri Oct 17 20:36:54 CEST 2025 Update On Sat Oct 18 20:36:36 CEST 2025 +Update On Sun Oct 19 20:38:20 CEST 2025 diff --git a/clash-nyanpasu/backend/Cargo.lock b/clash-nyanpasu/backend/Cargo.lock index 98c66e6ea2..655e9bc5a5 100644 --- a/clash-nyanpasu/backend/Cargo.lock +++ b/clash-nyanpasu/backend/Cargo.lock @@ -365,7 +365,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -531,7 +531,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -566,7 +566,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -615,7 +615,7 @@ checksum = "99e1aca718ea7b89985790c94aad72d77533063fe00bc497bb79a7c2dae6a661" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -765,9 +765,9 @@ dependencies = [ [[package]] name = "backon" -version = "1.5.2" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592277618714fbcecda9a02ba7a8781f319d26532a88553bbacc77ba5d2b3a8d" +checksum = "cffb0e931875b666fc4fcb20fee52e9bbd1ef836fd9e9e04ec21555f9f85f7ef" dependencies = [ "fastrand", "gloo-timers", @@ -860,7 +860,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.106", + "syn 2.0.107", "which 4.4.2", ] @@ -971,7 +971,7 @@ dependencies = [ "boa_interner", "boa_macros", "boa_string", - "indexmap 2.11.4", + "indexmap 2.12.0", "num-bigint", "rustc-hash 2.1.1", ] @@ -997,7 +997,7 @@ dependencies = [ "fast-float2", "hashbrown 0.15.5", "icu_normalizer 1.5.0", - "indexmap 2.11.4", + "indexmap 2.12.0", "intrusive-collections", "itertools 0.13.0", "num-bigint", @@ -1043,7 +1043,7 @@ dependencies = [ "boa_gc", "boa_macros", "hashbrown 0.15.5", - "indexmap 2.11.4", + "indexmap 2.12.0", "once_cell", "phf 0.11.3", "rustc-hash 2.1.1", @@ -1058,7 +1058,7 @@ checksum = "9fd3f870829131332587f607a7ff909f1af5fc523fd1b192db55fbbdf52e8d3c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", "synstructure", ] @@ -1196,7 +1196,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -1488,7 +1488,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -1542,7 +1542,7 @@ dependencies = [ "hex", "humansize", "image", - "indexmap 2.11.4", + "indexmap 2.12.0", "itertools 0.14.0", "log", "md-5", @@ -1722,7 +1722,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d" dependencies = [ "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -2003,7 +2003,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -2013,7 +2013,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" dependencies = [ "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -2054,7 +2054,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -2065,7 +2065,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -2156,7 +2156,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -2177,7 +2177,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -2187,7 +2187,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -2200,7 +2200,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -2355,7 +2355,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -2387,7 +2387,7 @@ checksum = "788160fb30de9cdd857af31c6a2675904b16ece8fc2737b2c7127ba368c9d0f4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -2685,7 +2685,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -2706,7 +2706,7 @@ checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -2777,7 +2777,7 @@ checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -2898,7 +2898,7 @@ checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -3055,7 +3055,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -3205,7 +3205,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -3511,7 +3511,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -3773,7 +3773,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -3788,7 +3788,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.11.4", + "indexmap 2.12.0", "slab", "tokio", "tokio-util", @@ -4302,7 +4302,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -4404,7 +4404,7 @@ dependencies = [ "proc-macro2", "quote", "sha2 0.10.9", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -4421,7 +4421,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.9", - "syn 2.0.106", + "syn 2.0.107", "url", ] @@ -4438,12 +4438,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.11.4" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" +checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" dependencies = [ "equivalent", - "hashbrown 0.15.5", + "hashbrown 0.16.0", "serde", "serde_core", ] @@ -4516,7 +4516,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -4829,7 +4829,7 @@ checksum = "02cb977175687f33fa4afa0c95c112b987ea1443e5a51c8f8ff27dc618270cc2" dependencies = [ "cssparser", "html5ever", - "indexmap 2.11.4", + "indexmap 2.12.0", "selectors", ] @@ -5119,7 +5119,7 @@ checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -5356,7 +5356,7 @@ dependencies = [ "half", "hashbrown 0.16.0", "hexf-parse", - "indexmap 2.11.4", + "indexmap 2.12.0", "libm", "log", "num-traits", @@ -5629,7 +5629,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -5691,7 +5691,7 @@ dependencies = [ "proc-macro-crate 3.3.0", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -5738,7 +5738,7 @@ dependencies = [ "http-body-util", "hyper", "hyper-util", - "indexmap 2.11.4", + "indexmap 2.12.0", "interprocess", "nyanpasu-utils", "pin-project-lite", @@ -5760,7 +5760,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -6416,7 +6416,7 @@ checksum = "05bbaa5b6b98826bb62b164406f703bee72c5287af9986f9c863fa8ea992b476" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -6458,7 +6458,7 @@ dependencies = [ "phf 0.13.1", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -6718,7 +6718,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -6738,7 +6738,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset 0.4.2", - "indexmap 2.11.4", + "indexmap 2.12.0", ] [[package]] @@ -6866,7 +6866,7 @@ dependencies = [ "phf_shared 0.11.3", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", "unicase", ] @@ -6880,7 +6880,7 @@ dependencies = [ "phf_shared 0.13.1", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -6943,7 +6943,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -6982,7 +6982,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af6b589e163c5a788fab00ce0c0366f6efbb9959c2f9874b224936af7fce7e1" dependencies = [ "base64 0.22.1", - "indexmap 2.11.4", + "indexmap 2.12.0", "quick-xml 0.38.3", "serde", "time", @@ -7121,7 +7121,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -7207,7 +7207,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b" dependencies = [ "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -7605,7 +7605,7 @@ checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -7814,7 +7814,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -8022,7 +8022,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -8166,7 +8166,7 @@ checksum = "d6185cf75117e20e62b1ff867b9518577271e58abe0037c40bb4794969355ab0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -8177,7 +8177,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -8186,7 +8186,7 @@ version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ - "indexmap 2.11.4", + "indexmap 2.12.0", "itoa", "memchr", "ryu", @@ -8212,7 +8212,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -8255,7 +8255,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.11.4", + "indexmap 2.12.0", "schemars 0.9.0", "schemars 1.0.4", "serde", @@ -8274,7 +8274,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -8283,7 +8283,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.11.4", + "indexmap 2.12.0", "itoa", "ryu", "serde", @@ -8295,7 +8295,7 @@ name = "serde_yaml_ng" version = "0.10.0" source = "git+https://github.com/libnyanpasu/serde-yaml-ng.git?branch=feat/specta#3078760ab9e9a3a9e18ebb4c5d3e577eb74c4a5c" dependencies = [ - "indexmap 2.11.4", + "indexmap 2.12.0", "itoa", "ryu", "serde", @@ -8322,7 +8322,7 @@ checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -8694,7 +8694,7 @@ version = "2.0.0-rc.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab7f01e9310a820edd31c80fde3cae445295adde21a3f9416517d7d65015b971" dependencies = [ - "indexmap 2.11.4", + "indexmap 2.12.0", "paste", "serde", "serde_json", @@ -8714,7 +8714,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -8838,7 +8838,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -8881,9 +8881,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.106" +version = "2.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" +checksum = "2a26dbd934e5451d21ef060c018dae56fc073894c5a7896f882928a76e6d081b" dependencies = [ "proc-macro2", "quote", @@ -8907,7 +8907,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -9029,7 +9029,7 @@ checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -9149,7 +9149,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.9", - "syn 2.0.106", + "syn 2.0.107", "tauri-utils", "thiserror 2.0.17", "time", @@ -9167,7 +9167,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", "tauri-codegen", "tauri-utils", ] @@ -9473,7 +9473,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -9642,7 +9642,7 @@ checksum = "451b374529930d7601b1eef8d32bc79ae870b6079b069401709c2a8bf9e75f36" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -9688,7 +9688,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -9699,7 +9699,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -9856,7 +9856,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -9916,7 +9916,7 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8" dependencies = [ - "indexmap 2.11.4", + "indexmap 2.12.0", "serde", "serde_spanned 1.0.0", "toml_datetime 0.7.0", @@ -9949,7 +9949,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.11.4", + "indexmap 2.12.0", "toml_datetime 0.6.11", "winnow 0.5.40", ] @@ -9960,7 +9960,7 @@ version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.11.4", + "indexmap 2.12.0", "toml_datetime 0.6.11", "winnow 0.5.40", ] @@ -9971,7 +9971,7 @@ version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.11.4", + "indexmap 2.12.0", "serde", "serde_spanned 0.6.9", "toml_datetime 0.6.11", @@ -10079,7 +10079,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -10171,7 +10171,7 @@ version = "0.2.5" source = "git+https://github.com/Frando/tracing-test.git?rev=e81ec65#e81ec655a5ec5c4351104628b1b1ba694f80a1dc" dependencies = [ "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -10677,7 +10677,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", "wasm-bindgen-shared", ] @@ -10712,7 +10712,7 @@ checksum = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -10994,7 +10994,7 @@ checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -11057,7 +11057,7 @@ dependencies = [ "cfg_aliases", "document-features", "hashbrown 0.16.0", - "indexmap 2.11.4", + "indexmap 2.12.0", "log", "naga", "once_cell", @@ -11411,7 +11411,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -11422,7 +11422,7 @@ checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -11433,7 +11433,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -11444,7 +11444,7 @@ checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -12226,7 +12226,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", "synstructure", ] @@ -12238,7 +12238,7 @@ checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", "synstructure", ] @@ -12294,7 +12294,7 @@ checksum = "dc6821851fa840b708b4cbbaf6241868cabc85a2dc22f426361b0292bfc0b836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", "zbus-lockstep", "zbus_xml", "zvariant", @@ -12309,7 +12309,7 @@ dependencies = [ "proc-macro-crate 3.3.0", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", "zbus_names", "zvariant", "zvariant_utils", @@ -12357,7 +12357,7 @@ checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -12377,7 +12377,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", "synstructure", ] @@ -12398,7 +12398,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -12442,7 +12442,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -12453,7 +12453,7 @@ checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", ] [[package]] @@ -12471,7 +12471,7 @@ dependencies = [ "flate2", "getrandom 0.3.3", "hmac", - "indexmap 2.11.4", + "indexmap 2.12.0", "lzma-rs", "memchr", "pbkdf2", @@ -12491,7 +12491,7 @@ checksum = "caa8cd6af31c3b31c6631b8f483848b91589021b28fffe50adada48d4f4d2ed1" dependencies = [ "arbitrary", "crc32fast", - "indexmap 2.11.4", + "indexmap 2.12.0", "memchr", ] @@ -12598,7 +12598,7 @@ dependencies = [ "proc-macro-crate 3.3.0", "proc-macro2", "quote", - "syn 2.0.106", + "syn 2.0.107", "zvariant_utils", ] @@ -12611,6 +12611,6 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.106", + "syn 2.0.107", "winnow 0.7.13", ] diff --git a/clash-nyanpasu/frontend/interface/package.json b/clash-nyanpasu/frontend/interface/package.json index 66e319979c..79f96867f7 100644 --- a/clash-nyanpasu/frontend/interface/package.json +++ b/clash-nyanpasu/frontend/interface/package.json @@ -22,6 +22,6 @@ }, "devDependencies": { "@types/lodash-es": "4.17.12", - "@types/react": "19.1.14" + "@types/react": "19.2.2" } } diff --git a/clash-nyanpasu/frontend/nyanpasu/package.json b/clash-nyanpasu/frontend/nyanpasu/package.json index 95ff8d0529..7148a4fd3b 100644 --- a/clash-nyanpasu/frontend/nyanpasu/package.json +++ b/clash-nyanpasu/frontend/nyanpasu/package.json @@ -70,8 +70,8 @@ "@tauri-apps/plugin-process": "2.3.0", "@tauri-apps/plugin-shell": "2.3.1", "@tauri-apps/plugin-updater": "2.9.0", - "@types/react": "19.1.14", - "@types/react-dom": "19.1.9", + "@types/react": "19.2.2", + "@types/react-dom": "19.2.2", "@types/validator": "13.15.3", "@vitejs/plugin-legacy": "7.2.1", "@vitejs/plugin-react": "5.0.4", diff --git a/clash-nyanpasu/frontend/ui/package.json b/clash-nyanpasu/frontend/ui/package.json index 1ae48eef64..11d0b2325d 100644 --- a/clash-nyanpasu/frontend/ui/package.json +++ b/clash-nyanpasu/frontend/ui/package.json @@ -19,7 +19,7 @@ "@radix-ui/react-scroll-area": "1.2.10", "@tauri-apps/api": "2.8.0", "@types/d3": "7.4.3", - "@types/react": "19.1.14", + "@types/react": "19.2.2", "@vitejs/plugin-react": "5.0.4", "ahooks": "3.9.5", "d3": "7.9.0", diff --git a/clash-nyanpasu/manifest/version.json b/clash-nyanpasu/manifest/version.json index 64b77ce699..019cb39a72 100644 --- a/clash-nyanpasu/manifest/version.json +++ b/clash-nyanpasu/manifest/version.json @@ -2,7 +2,7 @@ "manifest_version": 1, "latest": { "mihomo": "v1.19.15", - "mihomo_alpha": "alpha-c5fe367", + "mihomo_alpha": "alpha-5bc0ac7", "clash_rs": "v0.9.1", "clash_premium": "2023-09-05-gdcc8d87", "clash_rs_alpha": "0.9.1-alpha+sha.00bf55b" @@ -69,5 +69,5 @@ "linux-armv7hf": "clash-armv7-unknown-linux-gnueabihf" } }, - "updated_at": "2025-10-14T22:20:59.604Z" + "updated_at": "2025-10-18T22:20:48.820Z" } diff --git a/clash-nyanpasu/package.json b/clash-nyanpasu/package.json index 9de5c898db..26d9e03774 100644 --- a/clash-nyanpasu/package.json +++ b/clash-nyanpasu/package.json @@ -66,7 +66,7 @@ "@tauri-apps/cli": "2.8.4", "@types/fs-extra": "11.0.4", "@types/lodash-es": "4.17.12", - "@types/node": "24.5.2", + "@types/node": "24.8.1", "@typescript-eslint/eslint-plugin": "8.46.1", "@typescript-eslint/parser": "8.46.1", "autoprefixer": "10.4.21", @@ -107,7 +107,7 @@ "stylelint-scss": "6.12.1", "tailwindcss": "4.1.14", "tsx": "4.20.6", - "typescript": "5.9.2", + "typescript": "5.9.3", "typescript-eslint": "8.46.1" }, "packageManager": "pnpm@10.18.3", diff --git a/clash-nyanpasu/pnpm-lock.yaml b/clash-nyanpasu/pnpm-lock.yaml index ba60ed9788..23e3ce4b06 100644 --- a/clash-nyanpasu/pnpm-lock.yaml +++ b/clash-nyanpasu/pnpm-lock.yaml @@ -24,7 +24,7 @@ importers: devDependencies: '@commitlint/cli': specifier: 19.8.1 - version: 19.8.1(@types/node@24.5.2)(typescript@5.9.2) + version: 19.8.1(@types/node@24.8.1)(typescript@5.9.3) '@commitlint/config-conventional': specifier: 19.8.1 version: 19.8.1 @@ -47,14 +47,14 @@ importers: specifier: 4.17.12 version: 4.17.12 '@types/node': - specifier: 24.5.2 - version: 24.5.2 + specifier: 24.8.1 + version: 24.8.1 '@typescript-eslint/eslint-plugin': specifier: 8.46.1 - version: 8.46.1(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2) + version: 8.46.1(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3) '@typescript-eslint/parser': specifier: 8.46.1 - version: 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2) + version: 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3) autoprefixer: specifier: 10.4.21 version: 10.4.21(postcss@8.5.6) @@ -75,16 +75,16 @@ importers: version: 10.1.8(eslint@9.38.0(jiti@2.6.0)) eslint-import-resolver-alias: specifier: 1.1.2 - version: 1.1.2(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint@9.38.0(jiti@2.6.0))) + version: 1.1.2(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint@9.38.0(jiti@2.6.0))) eslint-plugin-html: specifier: 8.1.3 version: 8.1.3 eslint-plugin-import: specifier: 2.32.0 - version: 2.32.0(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint@9.38.0(jiti@2.6.0)) + version: 2.32.0(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint@9.38.0(jiti@2.6.0)) eslint-plugin-n: specifier: 17.23.1 - version: 17.23.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2) + version: 17.23.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3) eslint-plugin-prettier: specifier: 5.5.4 version: 5.5.4(eslint-config-prettier@10.1.8(eslint@9.38.0(jiti@2.6.0)))(eslint@9.38.0(jiti@2.6.0))(prettier@3.6.2) @@ -105,13 +105,13 @@ importers: version: 16.4.0 knip: specifier: 5.66.0 - version: 5.66.0(@types/node@24.5.2)(typescript@5.9.2) + version: 5.66.0(@types/node@24.8.1)(typescript@5.9.3) lint-staged: specifier: 16.2.4 version: 16.2.4 neostandard: specifier: 0.12.2 - version: 0.12.2(@typescript-eslint/utils@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint@9.38.0(jiti@2.6.0)))(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2) + version: 0.12.2(@typescript-eslint/utils@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint@9.38.0(jiti@2.6.0)))(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3) npm-run-all2: specifier: 8.0.4 version: 8.0.4 @@ -144,25 +144,25 @@ importers: version: 6.1.5(bufferutil@4.0.8)(utf-8-validate@5.0.10) stylelint: specifier: 16.25.0 - version: 16.25.0(typescript@5.9.2) + version: 16.25.0(typescript@5.9.3) stylelint-config-html: specifier: 1.1.0 - version: 1.1.0(postcss-html@1.8.0)(stylelint@16.25.0(typescript@5.9.2)) + version: 1.1.0(postcss-html@1.8.0)(stylelint@16.25.0(typescript@5.9.3)) stylelint-config-recess-order: specifier: 7.4.0 - version: 7.4.0(stylelint-order@7.0.0(stylelint@16.25.0(typescript@5.9.2)))(stylelint@16.25.0(typescript@5.9.2)) + version: 7.4.0(stylelint-order@7.0.0(stylelint@16.25.0(typescript@5.9.3)))(stylelint@16.25.0(typescript@5.9.3)) stylelint-config-standard: specifier: 39.0.1 - version: 39.0.1(stylelint@16.25.0(typescript@5.9.2)) + version: 39.0.1(stylelint@16.25.0(typescript@5.9.3)) stylelint-declaration-block-no-ignored-properties: specifier: 2.8.0 - version: 2.8.0(stylelint@16.25.0(typescript@5.9.2)) + version: 2.8.0(stylelint@16.25.0(typescript@5.9.3)) stylelint-order: specifier: 7.0.0 - version: 7.0.0(stylelint@16.25.0(typescript@5.9.2)) + version: 7.0.0(stylelint@16.25.0(typescript@5.9.3)) stylelint-scss: specifier: 6.12.1 - version: 6.12.1(stylelint@16.25.0(typescript@5.9.2)) + version: 6.12.1(stylelint@16.25.0(typescript@5.9.3)) tailwindcss: specifier: 4.1.14 version: 4.1.14 @@ -170,11 +170,11 @@ importers: specifier: 4.20.6 version: 4.20.6 typescript: - specifier: 5.9.2 - version: 5.9.2 + specifier: 5.9.3 + version: 5.9.3 typescript-eslint: specifier: 8.46.1 - version: 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2) + version: 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3) frontend/interface: dependencies: @@ -207,8 +207,8 @@ importers: specifier: 4.17.12 version: 4.17.12 '@types/react': - specifier: 19.1.14 - version: 19.1.14 + specifier: 19.2.2 + version: 19.2.2 frontend/nyanpasu: dependencies: @@ -223,7 +223,7 @@ importers: version: 3.2.2(react@19.2.0) '@emotion/styled': specifier: 11.14.1 - version: 11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0) + version: 11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0) '@juggle/resize-observer': specifier: 3.4.0 version: 3.4.0 @@ -232,16 +232,16 @@ importers: version: 0.3.0 '@mui/icons-material': specifier: 7.3.4 - version: 7.3.4(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@types/react@19.1.14)(react@19.2.0) + version: 7.3.4(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@types/react@19.2.2)(react@19.2.0) '@mui/lab': specifier: 7.0.0-beta.17 - version: 7.0.0-beta.17(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + version: 7.0.0-beta.17(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) '@mui/material': specifier: 7.3.4 - version: 7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + version: 7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) '@mui/x-date-pickers': specifier: 8.14.1 - version: 8.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@mui/system@7.3.3(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(dayjs@1.11.18)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + version: 8.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@mui/system@7.3.3(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(dayjs@1.11.18)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) '@nyanpasu/interface': specifier: workspace:^ version: link:../interface @@ -280,22 +280,22 @@ importers: version: 12.23.24(@emotion/is-prop-valid@1.3.0)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) i18next: specifier: 25.6.0 - version: 25.6.0(typescript@5.9.2) + version: 25.6.0(typescript@5.9.3) jotai: specifier: 2.15.0 - version: 2.15.0(@babel/core@7.28.4)(@babel/template@7.27.2)(@types/react@19.1.14)(react@19.2.0) + version: 2.15.0(@babel/core@7.28.4)(@babel/template@7.27.2)(@types/react@19.2.2)(react@19.2.0) json-schema: specifier: 0.4.0 version: 0.4.0 material-react-table: specifier: npm:@greenhat616/material-react-table@4.0.0 - version: '@greenhat616/material-react-table@4.0.0(cf0080e1f91ffd25b6969a93f2859f47)' + version: '@greenhat616/material-react-table@4.0.0(ef41ff754ab870a3b756da6accdf34b6)' monaco-editor: specifier: 0.54.0 version: 0.54.0 mui-color-input: specifier: 7.0.0 - version: 7.0.0(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + version: 7.0.0(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) react: specifier: 19.2.0 version: 19.2.0 @@ -310,13 +310,13 @@ importers: version: 1.6.5(react-dom@19.2.0(react@19.2.0))(react@19.2.0) react-hook-form-mui: specifier: 8.0.0 - version: 8.0.0(37a6e4033f81f625d38c79bfcc2a64c4) + version: 8.0.0(2c4354c4d268b0fbad08332eb9ef8bc3) react-i18next: specifier: 15.7.4 - version: 15.7.4(i18next@25.6.0(typescript@5.9.2))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.2) + version: 15.7.4(i18next@25.6.0(typescript@5.9.3))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3) react-markdown: specifier: 10.1.0 - version: 10.1.0(@types/react@19.1.14)(react@19.2.0) + version: 10.1.0(@types/react@19.2.2)(react@19.2.0) react-split-grid: specifier: 1.0.4 version: 1.0.4(react@19.2.0) @@ -344,7 +344,7 @@ importers: version: 11.13.5 '@emotion/react': specifier: 11.14.0 - version: 11.14.0(@types/react@19.1.14)(react@19.2.0) + version: 11.14.0(@types/react@19.2.2)(react@19.2.0) '@iconify/json': specifier: 2.2.397 version: 2.2.397 @@ -359,10 +359,10 @@ importers: version: 1.133.13(react-dom@19.2.0(react@19.2.0))(react@19.2.0) '@tanstack/react-router-devtools': specifier: 1.133.13 - version: 1.133.13(@tanstack/react-router@1.133.13(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@tanstack/router-core@1.133.13)(@types/node@24.5.2)(csstype@3.1.3)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(sass-embedded@1.93.2)(sass@1.93.2)(solid-js@1.9.5)(stylus@0.62.0)(terser@5.36.0)(tiny-invariant@1.3.3)(tsx@4.20.6)(yaml@2.8.1) + version: 1.133.13(@tanstack/react-router@1.133.13(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@tanstack/router-core@1.133.13)(@types/node@24.8.1)(csstype@3.1.3)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(sass-embedded@1.93.2)(sass@1.93.2)(solid-js@1.9.5)(stylus@0.62.0)(terser@5.36.0)(tiny-invariant@1.3.3)(tsx@4.20.6)(yaml@2.8.1) '@tanstack/router-plugin': specifier: 1.133.13 - version: 1.133.13(@tanstack/react-router@1.133.13(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 1.133.13(@tanstack/react-router@1.133.13(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) '@tauri-apps/plugin-clipboard-manager': specifier: 2.3.0 version: 2.3.0 @@ -388,23 +388,23 @@ importers: specifier: 2.9.0 version: 2.9.0 '@types/react': - specifier: 19.1.14 - version: 19.1.14 + specifier: 19.2.2 + version: 19.2.2 '@types/react-dom': - specifier: 19.1.9 - version: 19.1.9(@types/react@19.1.14) + specifier: 19.2.2 + version: 19.2.2(@types/react@19.2.2) '@types/validator': specifier: 13.15.3 version: 13.15.3 '@vitejs/plugin-legacy': specifier: 7.2.1 - version: 7.2.1(terser@5.36.0)(vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 7.2.1(terser@5.36.0)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) '@vitejs/plugin-react': specifier: 5.0.4 - version: 5.0.4(vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 5.0.4(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) '@vitejs/plugin-react-swc': specifier: 4.1.0 - version: 4.1.0(vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 4.1.0(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) change-case: specifier: 5.4.4 version: 5.4.4 @@ -437,25 +437,25 @@ importers: version: 20.2.0 unplugin-icons: specifier: 22.4.2 - version: 22.4.2(@svgr/core@8.1.0(typescript@5.9.2)) + version: 22.4.2(@svgr/core@8.1.0(typescript@5.9.3)) validator: specifier: 13.15.15 version: 13.15.15 vite: specifier: 7.1.10 - version: 7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + version: 7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) vite-plugin-html: specifier: 3.2.2 - version: 3.2.2(vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 3.2.2(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) vite-plugin-sass-dts: specifier: 1.3.34 - version: 1.3.34(postcss@8.5.6)(prettier@3.6.2)(sass-embedded@1.93.2)(vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 1.3.34(postcss@8.5.6)(prettier@3.6.2)(sass-embedded@1.93.2)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) vite-plugin-svgr: specifier: 4.5.0 - version: 4.5.0(rollup@4.46.2)(typescript@5.9.2)(vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 4.5.0(rollup@4.46.2)(typescript@5.9.3)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) vite-tsconfig-paths: specifier: 5.1.4 - version: 5.1.4(typescript@5.9.2)(vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 5.1.4(typescript@5.9.3)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) zod: specifier: 4.1.12 version: 4.1.12 @@ -467,19 +467,19 @@ importers: version: 0.3.0 '@mui/icons-material': specifier: 7.3.4 - version: 7.3.4(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@types/react@19.1.14)(react@19.2.0) + version: 7.3.4(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@types/react@19.2.2)(react@19.2.0) '@mui/lab': specifier: 7.0.0-beta.17 - version: 7.0.0-beta.17(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + version: 7.0.0-beta.17(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) '@mui/material': specifier: 7.3.4 - version: 7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + version: 7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) '@radix-ui/react-portal': specifier: 1.1.9 - version: 1.1.9(@types/react-dom@19.1.9(@types/react@19.1.14))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + version: 1.1.9(@types/react-dom@19.2.2(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) '@radix-ui/react-scroll-area': specifier: 1.2.10 - version: 1.2.10(@types/react-dom@19.1.9(@types/react@19.1.14))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + version: 1.2.10(@types/react-dom@19.2.2(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) '@tauri-apps/api': specifier: 2.8.0 version: 2.8.0 @@ -487,11 +487,11 @@ importers: specifier: 7.4.3 version: 7.4.3 '@types/react': - specifier: 19.1.14 - version: 19.1.14 + specifier: 19.2.2 + version: 19.2.2 '@vitejs/plugin-react': specifier: 5.0.4 - version: 5.0.4(vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 5.0.4(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) ahooks: specifier: 3.9.5 version: 3.9.5(react-dom@19.2.0(react@19.2.0))(react@19.2.0) @@ -512,7 +512,7 @@ importers: version: 6.0.0(react@19.2.0) react-i18next: specifier: 15.7.4 - version: 15.7.4(i18next@25.6.0(typescript@5.9.2))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.2) + version: 15.7.4(i18next@25.6.0(typescript@5.9.3))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3) react-use: specifier: 17.6.0 version: 17.6.0(react-dom@19.2.0(react@19.2.0))(react@19.2.0) @@ -521,14 +521,14 @@ importers: version: 4.1.14 vite: specifier: 7.1.10 - version: 7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + version: 7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) vite-tsconfig-paths: specifier: 5.1.4 - version: 5.1.4(typescript@5.9.2)(vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 5.1.4(typescript@5.9.3)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) devDependencies: '@emotion/react': specifier: 11.14.0 - version: 11.14.0(@types/react@19.1.14)(react@19.2.0) + version: 11.14.0(@types/react@19.2.2)(react@19.2.0) '@types/d3-interpolate-path': specifier: 2.0.3 version: 2.0.3 @@ -546,10 +546,10 @@ importers: version: 3.3.1 typescript-plugin-css-modules: specifier: 5.2.0 - version: 5.2.0(typescript@5.9.2) + version: 5.2.0(typescript@5.9.3) vite-plugin-dts: specifier: 4.5.4 - version: 4.5.4(@types/node@24.5.2)(rollup@4.46.2)(typescript@5.9.2)(vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 4.5.4(@types/node@24.8.1)(rollup@4.46.2)(typescript@5.9.3)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) scripts: dependencies: @@ -3507,8 +3507,8 @@ packages: '@types/node@16.18.108': resolution: {integrity: sha512-fj42LD82fSv6yN9C6Q4dzS+hujHj+pTv0IpRR3kI20fnYeS0ytBpjFO9OjmDowSPPt4lNKN46JLaKbCyP+BW2A==} - '@types/node@24.5.2': - resolution: {integrity: sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ==} + '@types/node@24.8.1': + resolution: {integrity: sha512-alv65KGRadQVfVcG69MuB4IzdYVpRwMG/mq8KWOaoOdyY617P5ivaDiMCGOFDWD2sAn5Q0mR3mRtUOgm99hL9Q==} '@types/parse-json@4.0.2': resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==} @@ -3522,18 +3522,18 @@ packages: '@types/prop-types@15.7.15': resolution: {integrity: sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==} - '@types/react-dom@19.1.9': - resolution: {integrity: sha512-qXRuZaOsAdXKFyOhRBg6Lqqc0yay13vN7KrIg4L7N4aaHN68ma9OK3NE1BoDFgFOTfM7zg+3/8+2n8rLUH3OKQ==} + '@types/react-dom@19.2.2': + resolution: {integrity: sha512-9KQPoO6mZCi7jcIStSnlOWn2nEF3mNmyr3rIAsGnAbQKYbRLyqmeSc39EVgtxXVia+LMT8j3knZLAZAh+xLmrw==} peerDependencies: - '@types/react': ^19.0.0 + '@types/react': ^19.2.0 '@types/react-transition-group@4.4.12': resolution: {integrity: sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==} peerDependencies: '@types/react': '*' - '@types/react@19.1.14': - resolution: {integrity: sha512-ukd93VGzaNPMAUPy0gRDSC57UuQbnH9Kussp7HBjM06YFi9uZTFhOvMSO2OKqXm1rSgzOE+pVx1k1PYHGwlc8Q==} + '@types/react@19.2.2': + resolution: {integrity: sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA==} '@types/responselike@1.0.3': resolution: {integrity: sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==} @@ -8235,8 +8235,8 @@ packages: engines: {node: '>=14.17'} hasBin: true - typescript@5.9.2: - resolution: {integrity: sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==} + typescript@5.9.3: + resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==} engines: {node: '>=14.17'} hasBin: true @@ -8253,8 +8253,8 @@ packages: resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==} engines: {node: '>= 0.4'} - undici-types@7.12.0: - resolution: {integrity: sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==} + undici-types@7.14.0: + resolution: {integrity: sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==} undici@5.29.0: resolution: {integrity: sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==} @@ -9812,11 +9812,11 @@ snapshots: '@bufbuild/protobuf@2.5.2': {} - '@commitlint/cli@19.8.1(@types/node@24.5.2)(typescript@5.9.2)': + '@commitlint/cli@19.8.1(@types/node@24.8.1)(typescript@5.9.3)': dependencies: '@commitlint/format': 19.8.1 '@commitlint/lint': 19.8.1 - '@commitlint/load': 19.8.1(@types/node@24.5.2)(typescript@5.9.2) + '@commitlint/load': 19.8.1(@types/node@24.8.1)(typescript@5.9.3) '@commitlint/read': 19.8.1 '@commitlint/types': 19.8.1 tinyexec: 1.0.1 @@ -9863,15 +9863,15 @@ snapshots: '@commitlint/rules': 19.8.1 '@commitlint/types': 19.8.1 - '@commitlint/load@19.8.1(@types/node@24.5.2)(typescript@5.9.2)': + '@commitlint/load@19.8.1(@types/node@24.8.1)(typescript@5.9.3)': dependencies: '@commitlint/config-validator': 19.8.1 '@commitlint/execute-rule': 19.8.1 '@commitlint/resolve-extends': 19.8.1 '@commitlint/types': 19.8.1 chalk: 5.4.1 - cosmiconfig: 9.0.0(typescript@5.9.2) - cosmiconfig-typescript-loader: 6.1.0(@types/node@24.5.2)(cosmiconfig@9.0.0(typescript@5.9.2))(typescript@5.9.2) + cosmiconfig: 9.0.0(typescript@5.9.3) + cosmiconfig-typescript-loader: 6.1.0(@types/node@24.8.1)(cosmiconfig@9.0.0(typescript@5.9.3))(typescript@5.9.3) lodash.isplainobject: 4.0.6 lodash.merge: 4.6.2 lodash.uniq: 4.5.0 @@ -10048,7 +10048,7 @@ snapshots: '@emotion/memoize@0.9.0': {} - '@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0)': + '@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0)': dependencies: '@babel/runtime': 7.26.0 '@emotion/babel-plugin': 11.13.5 @@ -10060,7 +10060,7 @@ snapshots: hoist-non-react-statics: 3.3.2 react: 19.2.0 optionalDependencies: - '@types/react': 19.1.14 + '@types/react': 19.2.2 transitivePeerDependencies: - supports-color @@ -10074,18 +10074,18 @@ snapshots: '@emotion/sheet@1.4.0': {} - '@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0)': + '@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0)': dependencies: '@babel/runtime': 7.27.6 '@emotion/babel-plugin': 11.13.5 '@emotion/is-prop-valid': 1.3.0 - '@emotion/react': 11.14.0(@types/react@19.1.14)(react@19.2.0) + '@emotion/react': 11.14.0(@types/react@19.2.2)(react@19.2.0) '@emotion/serialize': 1.3.3 '@emotion/use-insertion-effect-with-fallbacks': 1.2.0(react@19.2.0) '@emotion/utils': 1.4.2 react: 19.2.0 optionalDependencies: - '@types/react': 19.1.14 + '@types/react': 19.2.2 transitivePeerDependencies: - supports-color @@ -10235,13 +10235,13 @@ snapshots: '@fastify/busboy@2.1.1': {} - '@greenhat616/material-react-table@4.0.0(cf0080e1f91ffd25b6969a93f2859f47)': + '@greenhat616/material-react-table@4.0.0(ef41ff754ab870a3b756da6accdf34b6)': dependencies: - '@emotion/react': 11.14.0(@types/react@19.1.14)(react@19.2.0) - '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0) - '@mui/icons-material': 7.3.4(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@types/react@19.1.14)(react@19.2.0) - '@mui/material': 7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@mui/x-date-pickers': 8.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@mui/system@7.3.3(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(dayjs@1.11.18)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + '@emotion/react': 11.14.0(@types/react@19.2.2)(react@19.2.0) + '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0) + '@mui/icons-material': 7.3.4(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@types/react@19.2.2)(react@19.2.0) + '@mui/material': 7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + '@mui/x-date-pickers': 8.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@mui/system@7.3.3(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(dayjs@1.11.18)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) '@tanstack/match-sorter-utils': 8.19.4 '@tanstack/react-table': 8.21.3(react-dom@19.2.0(react@19.2.0))(react@19.2.0) '@tanstack/react-virtual': 3.13.9(react-dom@19.2.0(react@19.2.0))(react@19.2.0) @@ -10335,23 +10335,23 @@ snapshots: '@material/material-color-utilities@0.3.0': {} - '@microsoft/api-extractor-model@7.30.3(@types/node@24.5.2)': + '@microsoft/api-extractor-model@7.30.3(@types/node@24.8.1)': dependencies: '@microsoft/tsdoc': 0.15.1 '@microsoft/tsdoc-config': 0.17.1 - '@rushstack/node-core-library': 5.11.0(@types/node@24.5.2) + '@rushstack/node-core-library': 5.11.0(@types/node@24.8.1) transitivePeerDependencies: - '@types/node' - '@microsoft/api-extractor@7.51.0(@types/node@24.5.2)': + '@microsoft/api-extractor@7.51.0(@types/node@24.8.1)': dependencies: - '@microsoft/api-extractor-model': 7.30.3(@types/node@24.5.2) + '@microsoft/api-extractor-model': 7.30.3(@types/node@24.8.1) '@microsoft/tsdoc': 0.15.1 '@microsoft/tsdoc-config': 0.17.1 - '@rushstack/node-core-library': 5.11.0(@types/node@24.5.2) + '@rushstack/node-core-library': 5.11.0(@types/node@24.8.1) '@rushstack/rig-package': 0.5.3 - '@rushstack/terminal': 0.15.0(@types/node@24.5.2) - '@rushstack/ts-command-line': 4.23.5(@types/node@24.5.2) + '@rushstack/terminal': 0.15.0(@types/node@24.8.1) + '@rushstack/ts-command-line': 4.23.5(@types/node@24.8.1) lodash: 4.17.21 minimatch: 3.0.8 resolve: 1.22.8 @@ -10383,39 +10383,39 @@ snapshots: '@mui/core-downloads-tracker@7.3.4': {} - '@mui/icons-material@7.3.4(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@types/react@19.1.14)(react@19.2.0)': + '@mui/icons-material@7.3.4(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@types/react@19.2.2)(react@19.2.0)': dependencies: '@babel/runtime': 7.28.4 - '@mui/material': 7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + '@mui/material': 7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) react: 19.2.0 optionalDependencies: - '@types/react': 19.1.14 + '@types/react': 19.2.2 - '@mui/lab@7.0.0-beta.17(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@mui/lab@7.0.0-beta.17(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': dependencies: '@babel/runtime': 7.28.3 - '@mui/material': 7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@mui/system': 7.3.2(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0) - '@mui/types': 7.4.6(@types/react@19.1.14) - '@mui/utils': 7.3.2(@types/react@19.1.14)(react@19.2.0) + '@mui/material': 7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + '@mui/system': 7.3.2(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0) + '@mui/types': 7.4.6(@types/react@19.2.2) + '@mui/utils': 7.3.2(@types/react@19.2.2)(react@19.2.0) clsx: 2.1.1 prop-types: 15.8.1 react: 19.2.0 react-dom: 19.2.0(react@19.2.0) optionalDependencies: - '@emotion/react': 11.14.0(@types/react@19.1.14)(react@19.2.0) - '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0) - '@types/react': 19.1.14 + '@emotion/react': 11.14.0(@types/react@19.2.2)(react@19.2.0) + '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0) + '@types/react': 19.2.2 - '@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': dependencies: '@babel/runtime': 7.28.4 '@mui/core-downloads-tracker': 7.3.4 - '@mui/system': 7.3.3(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0) - '@mui/types': 7.4.7(@types/react@19.1.14) - '@mui/utils': 7.3.3(@types/react@19.1.14)(react@19.2.0) + '@mui/system': 7.3.3(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0) + '@mui/types': 7.4.7(@types/react@19.2.2) + '@mui/utils': 7.3.3(@types/react@19.2.2)(react@19.2.0) '@popperjs/core': 2.11.8 - '@types/react-transition-group': 4.4.12(@types/react@19.1.14) + '@types/react-transition-group': 4.4.12(@types/react@19.2.2) clsx: 2.1.1 csstype: 3.1.3 prop-types: 15.8.1 @@ -10424,29 +10424,29 @@ snapshots: react-is: 19.1.1 react-transition-group: 4.4.5(react-dom@19.2.0(react@19.2.0))(react@19.2.0) optionalDependencies: - '@emotion/react': 11.14.0(@types/react@19.1.14)(react@19.2.0) - '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0) - '@types/react': 19.1.14 + '@emotion/react': 11.14.0(@types/react@19.2.2)(react@19.2.0) + '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0) + '@types/react': 19.2.2 - '@mui/private-theming@7.3.2(@types/react@19.1.14)(react@19.2.0)': + '@mui/private-theming@7.3.2(@types/react@19.2.2)(react@19.2.0)': dependencies: '@babel/runtime': 7.28.4 - '@mui/utils': 7.3.3(@types/react@19.1.14)(react@19.2.0) + '@mui/utils': 7.3.3(@types/react@19.2.2)(react@19.2.0) prop-types: 15.8.1 react: 19.2.0 optionalDependencies: - '@types/react': 19.1.14 + '@types/react': 19.2.2 - '@mui/private-theming@7.3.3(@types/react@19.1.14)(react@19.2.0)': + '@mui/private-theming@7.3.3(@types/react@19.2.2)(react@19.2.0)': dependencies: '@babel/runtime': 7.28.4 - '@mui/utils': 7.3.3(@types/react@19.1.14)(react@19.2.0) + '@mui/utils': 7.3.3(@types/react@19.2.2)(react@19.2.0) prop-types: 15.8.1 react: 19.2.0 optionalDependencies: - '@types/react': 19.1.14 + '@types/react': 19.2.2 - '@mui/styled-engine@7.3.2(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(react@19.2.0)': + '@mui/styled-engine@7.3.2(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(react@19.2.0)': dependencies: '@babel/runtime': 7.28.4 '@emotion/cache': 11.14.0 @@ -10456,10 +10456,10 @@ snapshots: prop-types: 15.8.1 react: 19.2.0 optionalDependencies: - '@emotion/react': 11.14.0(@types/react@19.1.14)(react@19.2.0) - '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0) + '@emotion/react': 11.14.0(@types/react@19.2.2)(react@19.2.0) + '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0) - '@mui/styled-engine@7.3.3(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(react@19.2.0)': + '@mui/styled-engine@7.3.3(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(react@19.2.0)': dependencies: '@babel/runtime': 7.28.4 '@emotion/cache': 11.14.0 @@ -10469,101 +10469,101 @@ snapshots: prop-types: 15.8.1 react: 19.2.0 optionalDependencies: - '@emotion/react': 11.14.0(@types/react@19.1.14)(react@19.2.0) - '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0) + '@emotion/react': 11.14.0(@types/react@19.2.2)(react@19.2.0) + '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0) - '@mui/system@7.3.2(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0)': + '@mui/system@7.3.2(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0)': dependencies: '@babel/runtime': 7.28.4 - '@mui/private-theming': 7.3.2(@types/react@19.1.14)(react@19.2.0) - '@mui/styled-engine': 7.3.2(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(react@19.2.0) - '@mui/types': 7.4.6(@types/react@19.1.14) - '@mui/utils': 7.3.3(@types/react@19.1.14)(react@19.2.0) + '@mui/private-theming': 7.3.2(@types/react@19.2.2)(react@19.2.0) + '@mui/styled-engine': 7.3.2(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(react@19.2.0) + '@mui/types': 7.4.6(@types/react@19.2.2) + '@mui/utils': 7.3.3(@types/react@19.2.2)(react@19.2.0) clsx: 2.1.1 csstype: 3.1.3 prop-types: 15.8.1 react: 19.2.0 optionalDependencies: - '@emotion/react': 11.14.0(@types/react@19.1.14)(react@19.2.0) - '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0) - '@types/react': 19.1.14 + '@emotion/react': 11.14.0(@types/react@19.2.2)(react@19.2.0) + '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0) + '@types/react': 19.2.2 - '@mui/system@7.3.3(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0)': + '@mui/system@7.3.3(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0)': dependencies: '@babel/runtime': 7.28.4 - '@mui/private-theming': 7.3.3(@types/react@19.1.14)(react@19.2.0) - '@mui/styled-engine': 7.3.3(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(react@19.2.0) - '@mui/types': 7.4.7(@types/react@19.1.14) - '@mui/utils': 7.3.3(@types/react@19.1.14)(react@19.2.0) + '@mui/private-theming': 7.3.3(@types/react@19.2.2)(react@19.2.0) + '@mui/styled-engine': 7.3.3(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(react@19.2.0) + '@mui/types': 7.4.7(@types/react@19.2.2) + '@mui/utils': 7.3.3(@types/react@19.2.2)(react@19.2.0) clsx: 2.1.1 csstype: 3.1.3 prop-types: 15.8.1 react: 19.2.0 optionalDependencies: - '@emotion/react': 11.14.0(@types/react@19.1.14)(react@19.2.0) - '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0) - '@types/react': 19.1.14 + '@emotion/react': 11.14.0(@types/react@19.2.2)(react@19.2.0) + '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0) + '@types/react': 19.2.2 - '@mui/types@7.4.6(@types/react@19.1.14)': + '@mui/types@7.4.6(@types/react@19.2.2)': dependencies: '@babel/runtime': 7.28.4 optionalDependencies: - '@types/react': 19.1.14 + '@types/react': 19.2.2 - '@mui/types@7.4.7(@types/react@19.1.14)': + '@mui/types@7.4.7(@types/react@19.2.2)': dependencies: '@babel/runtime': 7.28.4 optionalDependencies: - '@types/react': 19.1.14 + '@types/react': 19.2.2 - '@mui/utils@7.3.2(@types/react@19.1.14)(react@19.2.0)': + '@mui/utils@7.3.2(@types/react@19.2.2)(react@19.2.0)': dependencies: '@babel/runtime': 7.28.4 - '@mui/types': 7.4.6(@types/react@19.1.14) + '@mui/types': 7.4.6(@types/react@19.2.2) '@types/prop-types': 15.7.15 clsx: 2.1.1 prop-types: 15.8.1 react: 19.2.0 react-is: 19.1.1 optionalDependencies: - '@types/react': 19.1.14 + '@types/react': 19.2.2 - '@mui/utils@7.3.3(@types/react@19.1.14)(react@19.2.0)': + '@mui/utils@7.3.3(@types/react@19.2.2)(react@19.2.0)': dependencies: '@babel/runtime': 7.28.4 - '@mui/types': 7.4.7(@types/react@19.1.14) + '@mui/types': 7.4.7(@types/react@19.2.2) '@types/prop-types': 15.7.15 clsx: 2.1.1 prop-types: 15.8.1 react: 19.2.0 react-is: 19.1.1 optionalDependencies: - '@types/react': 19.1.14 + '@types/react': 19.2.2 - '@mui/x-date-pickers@8.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@mui/system@7.3.3(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(dayjs@1.11.18)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@mui/x-date-pickers@8.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@mui/system@7.3.3(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(dayjs@1.11.18)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': dependencies: '@babel/runtime': 7.28.4 - '@mui/material': 7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@mui/system': 7.3.3(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0) - '@mui/utils': 7.3.3(@types/react@19.1.14)(react@19.2.0) - '@mui/x-internals': 8.14.0(@types/react@19.1.14)(react@19.2.0) - '@types/react-transition-group': 4.4.12(@types/react@19.1.14) + '@mui/material': 7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + '@mui/system': 7.3.3(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0) + '@mui/utils': 7.3.3(@types/react@19.2.2)(react@19.2.0) + '@mui/x-internals': 8.14.0(@types/react@19.2.2)(react@19.2.0) + '@types/react-transition-group': 4.4.12(@types/react@19.2.2) clsx: 2.1.1 prop-types: 15.8.1 react: 19.2.0 react-dom: 19.2.0(react@19.2.0) react-transition-group: 4.4.5(react-dom@19.2.0(react@19.2.0))(react@19.2.0) optionalDependencies: - '@emotion/react': 11.14.0(@types/react@19.1.14)(react@19.2.0) - '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0) + '@emotion/react': 11.14.0(@types/react@19.2.2)(react@19.2.0) + '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0) dayjs: 1.11.18 transitivePeerDependencies: - '@types/react' - '@mui/x-internals@8.14.0(@types/react@19.1.14)(react@19.2.0)': + '@mui/x-internals@8.14.0(@types/react@19.2.2)(react@19.2.0)': dependencies: '@babel/runtime': 7.28.4 - '@mui/utils': 7.3.3(@types/react@19.1.14)(react@19.2.0) + '@mui/utils': 7.3.3(@types/react@19.2.2)(react@19.2.0) react: 19.2.0 reselect: 5.1.1 use-sync-external-store: 1.6.0(react@19.2.0) @@ -10986,88 +10986,88 @@ snapshots: '@radix-ui/primitive@1.1.3': {} - '@radix-ui/react-compose-refs@1.1.2(@types/react@19.1.14)(react@19.2.0)': + '@radix-ui/react-compose-refs@1.1.2(@types/react@19.2.2)(react@19.2.0)': dependencies: react: 19.2.0 optionalDependencies: - '@types/react': 19.1.14 + '@types/react': 19.2.2 - '@radix-ui/react-context@1.1.2(@types/react@19.1.14)(react@19.2.0)': + '@radix-ui/react-context@1.1.2(@types/react@19.2.2)(react@19.2.0)': dependencies: react: 19.2.0 optionalDependencies: - '@types/react': 19.1.14 + '@types/react': 19.2.2 - '@radix-ui/react-direction@1.1.1(@types/react@19.1.14)(react@19.2.0)': + '@radix-ui/react-direction@1.1.1(@types/react@19.2.2)(react@19.2.0)': dependencies: react: 19.2.0 optionalDependencies: - '@types/react': 19.1.14 + '@types/react': 19.2.2 - '@radix-ui/react-portal@1.1.9(@types/react-dom@19.1.9(@types/react@19.1.14))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-portal@1.1.9(@types/react-dom@19.2.2(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': dependencies: - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.1.9(@types/react@19.1.14))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.1.14)(react@19.2.0) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.2(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.2)(react@19.2.0) react: 19.2.0 react-dom: 19.2.0(react@19.2.0) optionalDependencies: - '@types/react': 19.1.14 - '@types/react-dom': 19.1.9(@types/react@19.1.14) + '@types/react': 19.2.2 + '@types/react-dom': 19.2.2(@types/react@19.2.2) - '@radix-ui/react-presence@1.1.5(@types/react-dom@19.1.9(@types/react@19.1.14))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-presence@1.1.5(@types/react-dom@19.2.2(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': dependencies: - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.1.14)(react@19.2.0) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.1.14)(react@19.2.0) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.2)(react@19.2.0) + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.2)(react@19.2.0) react: 19.2.0 react-dom: 19.2.0(react@19.2.0) optionalDependencies: - '@types/react': 19.1.14 - '@types/react-dom': 19.1.9(@types/react@19.1.14) + '@types/react': 19.2.2 + '@types/react-dom': 19.2.2(@types/react@19.2.2) - '@radix-ui/react-primitive@2.1.3(@types/react-dom@19.1.9(@types/react@19.1.14))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-primitive@2.1.3(@types/react-dom@19.2.2(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': dependencies: - '@radix-ui/react-slot': 1.2.3(@types/react@19.1.14)(react@19.2.0) + '@radix-ui/react-slot': 1.2.3(@types/react@19.2.2)(react@19.2.0) react: 19.2.0 react-dom: 19.2.0(react@19.2.0) optionalDependencies: - '@types/react': 19.1.14 - '@types/react-dom': 19.1.9(@types/react@19.1.14) + '@types/react': 19.2.2 + '@types/react-dom': 19.2.2(@types/react@19.2.2) - '@radix-ui/react-scroll-area@1.2.10(@types/react-dom@19.1.9(@types/react@19.1.14))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': + '@radix-ui/react-scroll-area@1.2.10(@types/react-dom@19.2.2(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)': dependencies: '@radix-ui/number': 1.1.1 '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.1.14)(react@19.2.0) - '@radix-ui/react-context': 1.1.2(@types/react@19.1.14)(react@19.2.0) - '@radix-ui/react-direction': 1.1.1(@types/react@19.1.14)(react@19.2.0) - '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.1.9(@types/react@19.1.14))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.1.9(@types/react@19.1.14))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.1.14)(react@19.2.0) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.1.14)(react@19.2.0) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.2)(react@19.2.0) + '@radix-ui/react-context': 1.1.2(@types/react@19.2.2)(react@19.2.0) + '@radix-ui/react-direction': 1.1.1(@types/react@19.2.2)(react@19.2.0) + '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.2(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.2(@types/react@19.2.2))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.2)(react@19.2.0) + '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.2)(react@19.2.0) react: 19.2.0 react-dom: 19.2.0(react@19.2.0) optionalDependencies: - '@types/react': 19.1.14 - '@types/react-dom': 19.1.9(@types/react@19.1.14) + '@types/react': 19.2.2 + '@types/react-dom': 19.2.2(@types/react@19.2.2) - '@radix-ui/react-slot@1.2.3(@types/react@19.1.14)(react@19.2.0)': + '@radix-ui/react-slot@1.2.3(@types/react@19.2.2)(react@19.2.0)': dependencies: - '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.1.14)(react@19.2.0) + '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.2)(react@19.2.0) react: 19.2.0 optionalDependencies: - '@types/react': 19.1.14 + '@types/react': 19.2.2 - '@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.1.14)(react@19.2.0)': + '@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.2.2)(react@19.2.0)': dependencies: react: 19.2.0 optionalDependencies: - '@types/react': 19.1.14 + '@types/react': 19.2.2 - '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.1.14)(react@19.2.0)': + '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.2.2)(react@19.2.0)': dependencies: react: 19.2.0 optionalDependencies: - '@types/react': 19.1.14 + '@types/react': 19.2.2 '@rolldown/pluginutils@1.0.0-beta.35': {} @@ -11156,7 +11156,7 @@ snapshots: '@rtsao/scc@1.1.0': {} - '@rushstack/node-core-library@5.11.0(@types/node@24.5.2)': + '@rushstack/node-core-library@5.11.0(@types/node@24.8.1)': dependencies: ajv: 8.13.0 ajv-draft-04: 1.0.0(ajv@8.13.0) @@ -11167,23 +11167,23 @@ snapshots: resolve: 1.22.8 semver: 7.5.4 optionalDependencies: - '@types/node': 24.5.2 + '@types/node': 24.8.1 '@rushstack/rig-package@0.5.3': dependencies: resolve: 1.22.8 strip-json-comments: 3.1.1 - '@rushstack/terminal@0.15.0(@types/node@24.5.2)': + '@rushstack/terminal@0.15.0(@types/node@24.8.1)': dependencies: - '@rushstack/node-core-library': 5.11.0(@types/node@24.5.2) + '@rushstack/node-core-library': 5.11.0(@types/node@24.8.1) supports-color: 8.1.1 optionalDependencies: - '@types/node': 24.5.2 + '@types/node': 24.8.1 - '@rushstack/ts-command-line@4.23.5(@types/node@24.5.2)': + '@rushstack/ts-command-line@4.23.5(@types/node@24.8.1)': dependencies: - '@rushstack/terminal': 0.15.0(@types/node@24.5.2) + '@rushstack/terminal': 0.15.0(@types/node@24.8.1) '@types/argparse': 1.0.38 argparse: 1.0.10 string-argv: 0.3.2 @@ -11227,9 +11227,9 @@ snapshots: '@sindresorhus/is@4.6.0': {} - '@stylistic/eslint-plugin@2.11.0(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2)': + '@stylistic/eslint-plugin@2.11.0(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3)': dependencies: - '@typescript-eslint/utils': 8.44.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2) + '@typescript-eslint/utils': 8.44.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3) eslint: 9.38.0(jiti@2.6.0) eslint-visitor-keys: 4.2.1 espree: 10.4.0 @@ -11283,12 +11283,12 @@ snapshots: '@svgr/babel-plugin-transform-react-native-svg': 8.1.0(@babel/core@7.28.4) '@svgr/babel-plugin-transform-svg-component': 8.0.0(@babel/core@7.28.4) - '@svgr/core@8.1.0(typescript@5.9.2)': + '@svgr/core@8.1.0(typescript@5.9.3)': dependencies: '@babel/core': 7.28.4 '@svgr/babel-preset': 8.1.0(@babel/core@7.28.4) camelcase: 6.3.0 - cosmiconfig: 8.3.6(typescript@5.9.2) + cosmiconfig: 8.3.6(typescript@5.9.3) snake-case: 3.0.4 transitivePeerDependencies: - supports-color @@ -11299,11 +11299,11 @@ snapshots: '@babel/types': 7.28.4 entities: 4.5.0 - '@svgr/plugin-jsx@8.1.0(@svgr/core@8.1.0(typescript@5.9.2))': + '@svgr/plugin-jsx@8.1.0(@svgr/core@8.1.0(typescript@5.9.3))': dependencies: '@babel/core': 7.28.4 '@svgr/babel-preset': 8.1.0(@babel/core@7.28.4) - '@svgr/core': 8.1.0(typescript@5.9.2) + '@svgr/core': 8.1.0(typescript@5.9.3) '@svgr/hast-util-to-babel-ast': 8.0.0 svg-parser: 2.0.4 transitivePeerDependencies: @@ -11450,13 +11450,13 @@ snapshots: '@tanstack/query-core': 5.90.5 react: 19.2.0 - '@tanstack/react-router-devtools@1.133.13(@tanstack/react-router@1.133.13(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@tanstack/router-core@1.133.13)(@types/node@24.5.2)(csstype@3.1.3)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(sass-embedded@1.93.2)(sass@1.93.2)(solid-js@1.9.5)(stylus@0.62.0)(terser@5.36.0)(tiny-invariant@1.3.3)(tsx@4.20.6)(yaml@2.8.1)': + '@tanstack/react-router-devtools@1.133.13(@tanstack/react-router@1.133.13(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@tanstack/router-core@1.133.13)(@types/node@24.8.1)(csstype@3.1.3)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(sass-embedded@1.93.2)(sass@1.93.2)(solid-js@1.9.5)(stylus@0.62.0)(terser@5.36.0)(tiny-invariant@1.3.3)(tsx@4.20.6)(yaml@2.8.1)': dependencies: '@tanstack/react-router': 1.133.13(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@tanstack/router-devtools-core': 1.133.13(@tanstack/router-core@1.133.13)(@types/node@24.5.2)(csstype@3.1.3)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(solid-js@1.9.5)(stylus@0.62.0)(terser@5.36.0)(tiny-invariant@1.3.3)(tsx@4.20.6)(yaml@2.8.1) + '@tanstack/router-devtools-core': 1.133.13(@tanstack/router-core@1.133.13)(@types/node@24.8.1)(csstype@3.1.3)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(solid-js@1.9.5)(stylus@0.62.0)(terser@5.36.0)(tiny-invariant@1.3.3)(tsx@4.20.6)(yaml@2.8.1) react: 19.2.0 react-dom: 19.2.0(react@19.2.0) - vite: 7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) transitivePeerDependencies: - '@tanstack/router-core' - '@types/node' @@ -11514,14 +11514,14 @@ snapshots: tiny-invariant: 1.3.3 tiny-warning: 1.0.3 - '@tanstack/router-devtools-core@1.133.13(@tanstack/router-core@1.133.13)(@types/node@24.5.2)(csstype@3.1.3)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(solid-js@1.9.5)(stylus@0.62.0)(terser@5.36.0)(tiny-invariant@1.3.3)(tsx@4.20.6)(yaml@2.8.1)': + '@tanstack/router-devtools-core@1.133.13(@tanstack/router-core@1.133.13)(@types/node@24.8.1)(csstype@3.1.3)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(solid-js@1.9.5)(stylus@0.62.0)(terser@5.36.0)(tiny-invariant@1.3.3)(tsx@4.20.6)(yaml@2.8.1)': dependencies: '@tanstack/router-core': 1.133.13 clsx: 2.1.1 goober: 2.1.16(csstype@3.1.3) solid-js: 1.9.5 tiny-invariant: 1.3.3 - vite: 7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) optionalDependencies: csstype: 3.1.3 transitivePeerDependencies: @@ -11550,7 +11550,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@tanstack/router-plugin@1.133.13(@tanstack/react-router@1.133.13(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1))': + '@tanstack/router-plugin@1.133.13(@tanstack/react-router@1.133.13(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1))': dependencies: '@babel/core': 7.28.4 '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.28.4) @@ -11568,7 +11568,7 @@ snapshots: zod: 3.25.76 optionalDependencies: '@tanstack/react-router': 1.133.13(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - vite: 7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) transitivePeerDependencies: - supports-color @@ -11710,7 +11710,7 @@ snapshots: '@types/adm-zip@0.5.7': dependencies: - '@types/node': 24.5.2 + '@types/node': 24.8.1 '@types/argparse@1.0.38': {} @@ -11741,12 +11741,12 @@ snapshots: dependencies: '@types/http-cache-semantics': 4.0.4 '@types/keyv': 3.1.4 - '@types/node': 24.5.2 + '@types/node': 24.8.1 '@types/responselike': 1.0.3 '@types/conventional-commits-parser@5.0.0': dependencies: - '@types/node': 24.5.2 + '@types/node': 24.8.1 '@types/d3-array@3.2.1': {} @@ -11882,7 +11882,7 @@ snapshots: '@types/fs-extra@11.0.4': dependencies: '@types/jsonfile': 6.1.4 - '@types/node': 24.5.2 + '@types/node': 24.8.1 '@types/geojson@7946.0.14': {} @@ -11902,11 +11902,11 @@ snapshots: '@types/jsonfile@6.1.4': dependencies: - '@types/node': 24.5.2 + '@types/node': 24.8.1 '@types/keyv@3.1.4': dependencies: - '@types/node': 24.5.2 + '@types/node': 24.8.1 '@types/lodash-es@4.17.12': dependencies: @@ -11922,9 +11922,9 @@ snapshots: '@types/node@16.18.108': {} - '@types/node@24.5.2': + '@types/node@24.8.1': dependencies: - undici-types: 7.12.0 + undici-types: 7.14.0 '@types/parse-json@4.0.2': {} @@ -11938,21 +11938,21 @@ snapshots: '@types/prop-types@15.7.15': {} - '@types/react-dom@19.1.9(@types/react@19.1.14)': + '@types/react-dom@19.2.2(@types/react@19.2.2)': dependencies: - '@types/react': 19.1.14 + '@types/react': 19.2.2 - '@types/react-transition-group@4.4.12(@types/react@19.1.14)': + '@types/react-transition-group@4.4.12(@types/react@19.2.2)': dependencies: - '@types/react': 19.1.14 + '@types/react': 19.2.2 - '@types/react@19.1.14': + '@types/react@19.2.2': dependencies: csstype: 3.1.3 '@types/responselike@1.0.3': dependencies: - '@types/node': 24.5.2 + '@types/node': 24.8.1 '@types/semver@7.7.1': {} @@ -11970,53 +11970,53 @@ snapshots: '@types/yauzl@2.10.3': dependencies: - '@types/node': 24.5.2 + '@types/node': 24.8.1 optional: true - '@typescript-eslint/eslint-plugin@8.46.1(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2)': + '@typescript-eslint/eslint-plugin@8.46.1(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3)': dependencies: '@eslint-community/regexpp': 4.12.1 - '@typescript-eslint/parser': 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2) + '@typescript-eslint/parser': 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3) '@typescript-eslint/scope-manager': 8.46.1 - '@typescript-eslint/type-utils': 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2) - '@typescript-eslint/utils': 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2) + '@typescript-eslint/type-utils': 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3) + '@typescript-eslint/utils': 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3) '@typescript-eslint/visitor-keys': 8.46.1 eslint: 9.38.0(jiti@2.6.0) graphemer: 1.4.0 ignore: 7.0.5 natural-compare: 1.4.0 - ts-api-utils: 2.1.0(typescript@5.9.2) - typescript: 5.9.2 + ts-api-utils: 2.1.0(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2)': + '@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3)': dependencies: '@typescript-eslint/scope-manager': 8.46.1 '@typescript-eslint/types': 8.46.1 - '@typescript-eslint/typescript-estree': 8.46.1(typescript@5.9.2) + '@typescript-eslint/typescript-estree': 8.46.1(typescript@5.9.3) '@typescript-eslint/visitor-keys': 8.46.1 debug: 4.4.3 eslint: 9.38.0(jiti@2.6.0) - typescript: 5.9.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/project-service@8.44.1(typescript@5.9.2)': + '@typescript-eslint/project-service@8.44.1(typescript@5.9.3)': dependencies: - '@typescript-eslint/tsconfig-utils': 8.46.0(typescript@5.9.2) + '@typescript-eslint/tsconfig-utils': 8.46.0(typescript@5.9.3) '@typescript-eslint/types': 8.46.0 debug: 4.4.3 - typescript: 5.9.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/project-service@8.46.1(typescript@5.9.2)': + '@typescript-eslint/project-service@8.46.1(typescript@5.9.3)': dependencies: - '@typescript-eslint/tsconfig-utils': 8.46.1(typescript@5.9.2) + '@typescript-eslint/tsconfig-utils': 8.46.1(typescript@5.9.3) '@typescript-eslint/types': 8.46.1 debug: 4.4.3 - typescript: 5.9.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -12030,27 +12030,27 @@ snapshots: '@typescript-eslint/types': 8.46.1 '@typescript-eslint/visitor-keys': 8.46.1 - '@typescript-eslint/tsconfig-utils@8.44.1(typescript@5.9.2)': + '@typescript-eslint/tsconfig-utils@8.44.1(typescript@5.9.3)': dependencies: - typescript: 5.9.2 + typescript: 5.9.3 - '@typescript-eslint/tsconfig-utils@8.46.0(typescript@5.9.2)': + '@typescript-eslint/tsconfig-utils@8.46.0(typescript@5.9.3)': dependencies: - typescript: 5.9.2 + typescript: 5.9.3 - '@typescript-eslint/tsconfig-utils@8.46.1(typescript@5.9.2)': + '@typescript-eslint/tsconfig-utils@8.46.1(typescript@5.9.3)': dependencies: - typescript: 5.9.2 + typescript: 5.9.3 - '@typescript-eslint/type-utils@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2)': + '@typescript-eslint/type-utils@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3)': dependencies: '@typescript-eslint/types': 8.46.1 - '@typescript-eslint/typescript-estree': 8.46.1(typescript@5.9.2) - '@typescript-eslint/utils': 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2) + '@typescript-eslint/typescript-estree': 8.46.1(typescript@5.9.3) + '@typescript-eslint/utils': 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3) debug: 4.4.3 eslint: 9.38.0(jiti@2.6.0) - ts-api-utils: 2.1.0(typescript@5.9.2) - typescript: 5.9.2 + ts-api-utils: 2.1.0(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -12062,10 +12062,10 @@ snapshots: '@typescript-eslint/types@8.46.1': {} - '@typescript-eslint/typescript-estree@8.44.1(typescript@5.9.2)': + '@typescript-eslint/typescript-estree@8.44.1(typescript@5.9.3)': dependencies: - '@typescript-eslint/project-service': 8.44.1(typescript@5.9.2) - '@typescript-eslint/tsconfig-utils': 8.44.1(typescript@5.9.2) + '@typescript-eslint/project-service': 8.44.1(typescript@5.9.3) + '@typescript-eslint/tsconfig-utils': 8.44.1(typescript@5.9.3) '@typescript-eslint/types': 8.44.1 '@typescript-eslint/visitor-keys': 8.44.1 debug: 4.4.3 @@ -12073,15 +12073,15 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.7.3 - ts-api-utils: 2.1.0(typescript@5.9.2) - typescript: 5.9.2 + ts-api-utils: 2.1.0(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@8.46.1(typescript@5.9.2)': + '@typescript-eslint/typescript-estree@8.46.1(typescript@5.9.3)': dependencies: - '@typescript-eslint/project-service': 8.46.1(typescript@5.9.2) - '@typescript-eslint/tsconfig-utils': 8.46.1(typescript@5.9.2) + '@typescript-eslint/project-service': 8.46.1(typescript@5.9.3) + '@typescript-eslint/tsconfig-utils': 8.46.1(typescript@5.9.3) '@typescript-eslint/types': 8.46.1 '@typescript-eslint/visitor-keys': 8.46.1 debug: 4.4.3 @@ -12089,30 +12089,30 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.7.3 - ts-api-utils: 2.1.0(typescript@5.9.2) - typescript: 5.9.2 + ts-api-utils: 2.1.0(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.44.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2)': + '@typescript-eslint/utils@8.44.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3)': dependencies: '@eslint-community/eslint-utils': 4.8.0(eslint@9.38.0(jiti@2.6.0)) '@typescript-eslint/scope-manager': 8.44.1 '@typescript-eslint/types': 8.44.1 - '@typescript-eslint/typescript-estree': 8.44.1(typescript@5.9.2) + '@typescript-eslint/typescript-estree': 8.44.1(typescript@5.9.3) eslint: 9.38.0(jiti@2.6.0) - typescript: 5.9.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2)': + '@typescript-eslint/utils@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3)': dependencies: '@eslint-community/eslint-utils': 4.8.0(eslint@9.38.0(jiti@2.6.0)) '@typescript-eslint/scope-manager': 8.46.1 '@typescript-eslint/types': 8.46.1 - '@typescript-eslint/typescript-estree': 8.46.1(typescript@5.9.2) + '@typescript-eslint/typescript-estree': 8.46.1(typescript@5.9.3) eslint: 9.38.0(jiti@2.6.0) - typescript: 5.9.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -12187,7 +12187,7 @@ snapshots: '@unrs/resolver-binding-win32-x64-msvc@1.10.1': optional: true - '@vitejs/plugin-legacy@7.2.1(terser@5.36.0)(vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1))': + '@vitejs/plugin-legacy@7.2.1(terser@5.36.0)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1))': dependencies: '@babel/core': 7.28.0 '@babel/plugin-transform-dynamic-import': 7.27.1(@babel/core@7.28.0) @@ -12202,19 +12202,19 @@ snapshots: regenerator-runtime: 0.14.1 systemjs: 6.15.1 terser: 5.36.0 - vite: 7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) transitivePeerDependencies: - supports-color - '@vitejs/plugin-react-swc@4.1.0(vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1))': + '@vitejs/plugin-react-swc@4.1.0(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1))': dependencies: '@rolldown/pluginutils': 1.0.0-beta.35 '@swc/core': 1.13.5 - vite: 7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) transitivePeerDependencies: - '@swc/helpers' - '@vitejs/plugin-react@5.0.4(vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1))': + '@vitejs/plugin-react@5.0.4(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1))': dependencies: '@babel/core': 7.28.4 '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.28.4) @@ -12222,7 +12222,7 @@ snapshots: '@rolldown/pluginutils': 1.0.0-beta.38 '@types/babel__core': 7.20.5 react-refresh: 0.17.0 - vite: 7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) transitivePeerDependencies: - supports-color @@ -12256,7 +12256,7 @@ snapshots: de-indent: 1.0.2 he: 1.2.0 - '@vue/language-core@2.2.0(typescript@5.9.2)': + '@vue/language-core@2.2.0(typescript@5.9.3)': dependencies: '@volar/language-core': 2.4.11 '@vue/compiler-dom': 3.5.13 @@ -12267,7 +12267,7 @@ snapshots: muggle-string: 0.4.1 path-browserify: 1.0.1 optionalDependencies: - typescript: 5.9.2 + typescript: 5.9.3 '@vue/shared@3.5.13': {} @@ -12899,12 +12899,12 @@ snapshots: core-js@3.46.0: {} - cosmiconfig-typescript-loader@6.1.0(@types/node@24.5.2)(cosmiconfig@9.0.0(typescript@5.9.2))(typescript@5.9.2): + cosmiconfig-typescript-loader@6.1.0(@types/node@24.8.1)(cosmiconfig@9.0.0(typescript@5.9.3))(typescript@5.9.3): dependencies: - '@types/node': 24.5.2 - cosmiconfig: 9.0.0(typescript@5.9.2) + '@types/node': 24.8.1 + cosmiconfig: 9.0.0(typescript@5.9.3) jiti: 2.6.0 - typescript: 5.9.2 + typescript: 5.9.3 cosmiconfig@7.1.0: dependencies: @@ -12914,23 +12914,23 @@ snapshots: path-type: 4.0.0 yaml: 1.10.2 - cosmiconfig@8.3.6(typescript@5.9.2): + cosmiconfig@8.3.6(typescript@5.9.3): dependencies: import-fresh: 3.3.0 js-yaml: 4.1.0 parse-json: 5.2.0 path-type: 4.0.0 optionalDependencies: - typescript: 5.9.2 + typescript: 5.9.3 - cosmiconfig@9.0.0(typescript@5.9.2): + cosmiconfig@9.0.0(typescript@5.9.3): dependencies: env-paths: 2.2.1 import-fresh: 3.3.0 js-yaml: 4.1.0 parse-json: 5.2.0 optionalDependencies: - typescript: 5.9.2 + typescript: 5.9.3 country-code-emoji@2.3.0: {} @@ -13705,9 +13705,9 @@ snapshots: optionalDependencies: unrs-resolver: 1.10.1 - eslint-import-resolver-alias@1.1.2(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint@9.38.0(jiti@2.6.0))): + eslint-import-resolver-alias@1.1.2(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint@9.38.0(jiti@2.6.0))): dependencies: - eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint@9.38.0(jiti@2.6.0)) + eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint@9.38.0(jiti@2.6.0)) eslint-import-resolver-node@0.3.9: dependencies: @@ -13717,7 +13717,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-import-resolver-typescript@3.10.1(eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint-import-resolver-node@0.3.9)(eslint@9.38.0(jiti@2.6.0)))(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint@9.38.0(jiti@2.6.0)))(eslint@9.38.0(jiti@2.6.0)): + eslint-import-resolver-typescript@3.10.1(eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.38.0(jiti@2.6.0)))(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint@9.38.0(jiti@2.6.0)))(eslint@9.38.0(jiti@2.6.0)): dependencies: '@nolyfill/is-core-module': 1.0.39 debug: 4.4.3 @@ -13728,16 +13728,16 @@ snapshots: tinyglobby: 0.2.14 unrs-resolver: 1.10.1 optionalDependencies: - eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint@9.38.0(jiti@2.6.0)) - eslint-plugin-import-x: 4.16.1(@typescript-eslint/utils@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint-import-resolver-node@0.3.9)(eslint@9.38.0(jiti@2.6.0)) + eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint@9.38.0(jiti@2.6.0)) + eslint-plugin-import-x: 4.16.1(@typescript-eslint/utils@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.38.0(jiti@2.6.0)) transitivePeerDependencies: - supports-color - eslint-module-utils@2.12.1(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint-import-resolver-node@0.3.9)(eslint@9.38.0(jiti@2.6.0)): + eslint-module-utils@2.12.1(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.38.0(jiti@2.6.0)): dependencies: debug: 3.2.7 optionalDependencies: - '@typescript-eslint/parser': 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2) + '@typescript-eslint/parser': 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3) eslint: 9.38.0(jiti@2.6.0) eslint-import-resolver-node: 0.3.9 transitivePeerDependencies: @@ -13754,7 +13754,7 @@ snapshots: dependencies: htmlparser2: 10.0.0 - eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint-import-resolver-node@0.3.9)(eslint@9.38.0(jiti@2.6.0)): + eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.38.0(jiti@2.6.0)): dependencies: '@typescript-eslint/types': 8.41.0 comment-parser: 1.4.1 @@ -13767,12 +13767,12 @@ snapshots: stable-hash-x: 0.2.0 unrs-resolver: 1.10.1 optionalDependencies: - '@typescript-eslint/utils': 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2) + '@typescript-eslint/utils': 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3) eslint-import-resolver-node: 0.3.9 transitivePeerDependencies: - supports-color - eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint@9.38.0(jiti@2.6.0)): + eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint@9.38.0(jiti@2.6.0)): dependencies: '@rtsao/scc': 1.1.0 array-includes: 3.1.9 @@ -13783,7 +13783,7 @@ snapshots: doctrine: 2.1.0 eslint: 9.38.0(jiti@2.6.0) eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint-import-resolver-node@0.3.9)(eslint@9.38.0(jiti@2.6.0)) + eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.38.0(jiti@2.6.0)) hasown: 2.0.2 is-core-module: 2.16.1 is-glob: 4.0.3 @@ -13795,13 +13795,13 @@ snapshots: string.prototype.trimend: 1.0.9 tsconfig-paths: 3.15.0 optionalDependencies: - '@typescript-eslint/parser': 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2) + '@typescript-eslint/parser': 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3) transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack - supports-color - eslint-plugin-n@17.23.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2): + eslint-plugin-n@17.23.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3): dependencies: '@eslint-community/eslint-utils': 4.8.0(eslint@9.38.0(jiti@2.6.0)) enhanced-resolve: 5.18.3 @@ -13812,7 +13812,7 @@ snapshots: globrex: 0.1.2 ignore: 5.3.2 semver: 7.7.2 - ts-declaration-location: 1.0.7(typescript@5.9.2) + ts-declaration-location: 1.0.7(typescript@5.9.3) transitivePeerDependencies: - typescript @@ -14506,11 +14506,11 @@ snapshots: hyphenate-style-name@1.1.0: {} - i18next@25.6.0(typescript@5.9.2): + i18next@25.6.0(typescript@5.9.3): dependencies: '@babel/runtime': 7.28.4 optionalDependencies: - typescript: 5.9.2 + typescript: 5.9.3 iconv-lite@0.6.3: dependencies: @@ -14872,11 +14872,11 @@ snapshots: jju@1.4.0: {} - jotai@2.15.0(@babel/core@7.28.4)(@babel/template@7.27.2)(@types/react@19.1.14)(react@19.2.0): + jotai@2.15.0(@babel/core@7.28.4)(@babel/template@7.27.2)(@types/react@19.2.2)(react@19.2.0): optionalDependencies: '@babel/core': 7.28.4 '@babel/template': 7.27.2 - '@types/react': 19.1.14 + '@types/react': 19.2.2 react: 19.2.0 js-cookie@2.2.1: {} @@ -14954,10 +14954,10 @@ snapshots: kind-of@6.0.3: {} - knip@5.66.0(@types/node@24.5.2)(typescript@5.9.2): + knip@5.66.0(@types/node@24.8.1)(typescript@5.9.3): dependencies: '@nodelib/fs.walk': 1.2.8 - '@types/node': 24.5.2 + '@types/node': 24.8.1 fast-glob: 3.3.3 formatly: 0.3.0 jiti: 2.6.0 @@ -14968,7 +14968,7 @@ snapshots: picomatch: 4.0.3 smol-toml: 1.4.2 strip-json-comments: 5.0.2 - typescript: 5.9.2 + typescript: 5.9.3 zod: 4.1.12 known-css-properties@0.36.0: {} @@ -15526,16 +15526,16 @@ snapshots: muggle-string@0.4.1: {} - mui-color-input@7.0.0(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0): + mui-color-input@7.0.0(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0): dependencies: '@ctrl/tinycolor': 4.1.0 - '@emotion/react': 11.14.0(@types/react@19.1.14)(react@19.2.0) - '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0) - '@mui/material': 7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + '@emotion/react': 11.14.0(@types/react@19.2.2)(react@19.2.0) + '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0) + '@mui/material': 7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) react: 19.2.0 react-dom: 19.2.0(react@19.2.0) optionalDependencies: - '@types/react': 19.1.14 + '@types/react': 19.2.2 nano-css@5.6.2(react-dom@19.2.0(react@19.2.0))(react@19.2.0): dependencies: @@ -15566,20 +15566,20 @@ snapshots: sax: 1.3.0 optional: true - neostandard@0.12.2(@typescript-eslint/utils@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint@9.38.0(jiti@2.6.0)))(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2): + neostandard@0.12.2(@typescript-eslint/utils@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint@9.38.0(jiti@2.6.0)))(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3): dependencies: '@humanwhocodes/gitignore-to-minimatch': 1.0.2 - '@stylistic/eslint-plugin': 2.11.0(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2) + '@stylistic/eslint-plugin': 2.11.0(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3) eslint: 9.38.0(jiti@2.6.0) - eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint-import-resolver-node@0.3.9)(eslint@9.38.0(jiti@2.6.0)))(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint@9.38.0(jiti@2.6.0)))(eslint@9.38.0(jiti@2.6.0)) - eslint-plugin-import-x: 4.16.1(@typescript-eslint/utils@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint-import-resolver-node@0.3.9)(eslint@9.38.0(jiti@2.6.0)) - eslint-plugin-n: 17.23.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2) + eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.38.0(jiti@2.6.0)))(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint@9.38.0(jiti@2.6.0)))(eslint@9.38.0(jiti@2.6.0)) + eslint-plugin-import-x: 4.16.1(@typescript-eslint/utils@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.38.0(jiti@2.6.0)) + eslint-plugin-n: 17.23.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3) eslint-plugin-promise: 7.2.1(eslint@9.38.0(jiti@2.6.0)) eslint-plugin-react: 7.37.5(eslint@9.38.0(jiti@2.6.0)) find-up: 5.0.0 globals: 15.15.0 peowly: 1.3.2 - typescript-eslint: 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2) + typescript-eslint: 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3) transitivePeerDependencies: - '@typescript-eslint/utils' - eslint-import-resolver-node @@ -16126,38 +16126,38 @@ snapshots: react: 19.2.0 react-dom: 19.2.0(react@19.2.0) - react-hook-form-mui@8.0.0(37a6e4033f81f625d38c79bfcc2a64c4): + react-hook-form-mui@8.0.0(2c4354c4d268b0fbad08332eb9ef8bc3): dependencies: - '@mui/material': 7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + '@mui/material': 7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) react: 19.2.0 react-hook-form: 7.52.1(react@19.2.0) optionalDependencies: - '@mui/icons-material': 7.3.4(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@types/react@19.1.14)(react@19.2.0) - '@mui/x-date-pickers': 8.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@mui/system@7.3.3(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(react@19.2.0))(@types/react@19.1.14)(dayjs@1.11.18)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + '@mui/icons-material': 7.3.4(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@types/react@19.2.2)(react@19.2.0) + '@mui/x-date-pickers': 8.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@mui/system@7.3.3(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(react@19.2.0))(@types/react@19.2.2)(dayjs@1.11.18)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) react-hook-form@7.52.1(react@19.2.0): dependencies: react: 19.2.0 - react-i18next@15.7.4(i18next@25.6.0(typescript@5.9.2))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.2): + react-i18next@15.7.4(i18next@25.6.0(typescript@5.9.3))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.9.3): dependencies: '@babel/runtime': 7.28.3 html-parse-stringify: 3.0.1 - i18next: 25.6.0(typescript@5.9.2) + i18next: 25.6.0(typescript@5.9.3) react: 19.2.0 optionalDependencies: react-dom: 19.2.0(react@19.2.0) - typescript: 5.9.2 + typescript: 5.9.3 react-is@16.13.1: {} react-is@19.1.1: {} - react-markdown@10.1.0(@types/react@19.1.14)(react@19.2.0): + react-markdown@10.1.0(@types/react@19.2.2)(react@19.2.0): dependencies: '@types/hast': 3.0.4 '@types/mdast': 4.0.3 - '@types/react': 19.1.14 + '@types/react': 19.2.2 devlop: 1.1.0 hast-util-to-jsx-runtime: 2.3.0 html-url-attributes: 3.0.0 @@ -16909,36 +16909,36 @@ snapshots: dependencies: inline-style-parser: 0.2.3 - stylelint-config-html@1.1.0(postcss-html@1.8.0)(stylelint@16.25.0(typescript@5.9.2)): + stylelint-config-html@1.1.0(postcss-html@1.8.0)(stylelint@16.25.0(typescript@5.9.3)): dependencies: postcss-html: 1.8.0 - stylelint: 16.25.0(typescript@5.9.2) + stylelint: 16.25.0(typescript@5.9.3) - stylelint-config-recess-order@7.4.0(stylelint-order@7.0.0(stylelint@16.25.0(typescript@5.9.2)))(stylelint@16.25.0(typescript@5.9.2)): + stylelint-config-recess-order@7.4.0(stylelint-order@7.0.0(stylelint@16.25.0(typescript@5.9.3)))(stylelint@16.25.0(typescript@5.9.3)): dependencies: - stylelint: 16.25.0(typescript@5.9.2) - stylelint-order: 7.0.0(stylelint@16.25.0(typescript@5.9.2)) + stylelint: 16.25.0(typescript@5.9.3) + stylelint-order: 7.0.0(stylelint@16.25.0(typescript@5.9.3)) - stylelint-config-recommended@17.0.0(stylelint@16.25.0(typescript@5.9.2)): + stylelint-config-recommended@17.0.0(stylelint@16.25.0(typescript@5.9.3)): dependencies: - stylelint: 16.25.0(typescript@5.9.2) + stylelint: 16.25.0(typescript@5.9.3) - stylelint-config-standard@39.0.1(stylelint@16.25.0(typescript@5.9.2)): + stylelint-config-standard@39.0.1(stylelint@16.25.0(typescript@5.9.3)): dependencies: - stylelint: 16.25.0(typescript@5.9.2) - stylelint-config-recommended: 17.0.0(stylelint@16.25.0(typescript@5.9.2)) + stylelint: 16.25.0(typescript@5.9.3) + stylelint-config-recommended: 17.0.0(stylelint@16.25.0(typescript@5.9.3)) - stylelint-declaration-block-no-ignored-properties@2.8.0(stylelint@16.25.0(typescript@5.9.2)): + stylelint-declaration-block-no-ignored-properties@2.8.0(stylelint@16.25.0(typescript@5.9.3)): dependencies: - stylelint: 16.25.0(typescript@5.9.2) + stylelint: 16.25.0(typescript@5.9.3) - stylelint-order@7.0.0(stylelint@16.25.0(typescript@5.9.2)): + stylelint-order@7.0.0(stylelint@16.25.0(typescript@5.9.3)): dependencies: postcss: 8.5.6 postcss-sorting: 9.1.0(postcss@8.5.6) - stylelint: 16.25.0(typescript@5.9.2) + stylelint: 16.25.0(typescript@5.9.3) - stylelint-scss@6.12.1(stylelint@16.25.0(typescript@5.9.2)): + stylelint-scss@6.12.1(stylelint@16.25.0(typescript@5.9.3)): dependencies: css-tree: 3.1.0 is-plain-object: 5.0.0 @@ -16948,9 +16948,9 @@ snapshots: postcss-resolve-nested-selector: 0.1.6 postcss-selector-parser: 7.1.0 postcss-value-parser: 4.2.0 - stylelint: 16.25.0(typescript@5.9.2) + stylelint: 16.25.0(typescript@5.9.3) - stylelint@16.25.0(typescript@5.9.2): + stylelint@16.25.0(typescript@5.9.3): dependencies: '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4) '@csstools/css-tokenizer': 3.0.4 @@ -16959,7 +16959,7 @@ snapshots: '@dual-bundle/import-meta-resolve': 4.2.1 balanced-match: 2.0.0 colord: 2.9.3 - cosmiconfig: 9.0.0(typescript@5.9.2) + cosmiconfig: 9.0.0(typescript@5.9.3) css-functions-list: 3.2.3 css-tree: 3.1.0 debug: 4.4.3 @@ -17152,22 +17152,22 @@ snapshots: trough@2.2.0: {} - ts-api-utils@2.1.0(typescript@5.9.2): + ts-api-utils@2.1.0(typescript@5.9.3): dependencies: - typescript: 5.9.2 + typescript: 5.9.3 ts-custom-error@3.3.1: {} - ts-declaration-location@1.0.7(typescript@5.9.2): + ts-declaration-location@1.0.7(typescript@5.9.3): dependencies: picomatch: 4.0.3 - typescript: 5.9.2 + typescript: 5.9.3 ts-easing@0.2.0: {} - tsconfck@3.0.3(typescript@5.9.2): + tsconfck@3.0.3(typescript@5.9.3): optionalDependencies: - typescript: 5.9.2 + typescript: 5.9.3 tsconfig-paths@3.15.0: dependencies: @@ -17273,18 +17273,18 @@ snapshots: dependencies: is-typedarray: 1.0.0 - typescript-eslint@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2): + typescript-eslint@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3): dependencies: - '@typescript-eslint/eslint-plugin': 8.46.1(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2))(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2) - '@typescript-eslint/parser': 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2) - '@typescript-eslint/typescript-estree': 8.46.1(typescript@5.9.2) - '@typescript-eslint/utils': 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.2) + '@typescript-eslint/eslint-plugin': 8.46.1(@typescript-eslint/parser@8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3))(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3) + '@typescript-eslint/parser': 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3) + '@typescript-eslint/typescript-estree': 8.46.1(typescript@5.9.3) + '@typescript-eslint/utils': 8.46.1(eslint@9.38.0(jiti@2.6.0))(typescript@5.9.3) eslint: 9.38.0(jiti@2.6.0) - typescript: 5.9.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color - typescript-plugin-css-modules@5.2.0(typescript@5.9.2): + typescript-plugin-css-modules@5.2.0(typescript@5.9.3): dependencies: '@types/postcss-modules-local-by-default': 4.0.2 '@types/postcss-modules-scope': 3.0.4 @@ -17301,7 +17301,7 @@ snapshots: sass: 1.83.0 source-map-js: 1.2.1 tsconfig-paths: 4.2.0 - typescript: 5.9.2 + typescript: 5.9.3 optionalDependencies: stylus: 0.62.0 transitivePeerDependencies: @@ -17310,7 +17310,7 @@ snapshots: typescript@5.7.3: {} - typescript@5.9.2: {} + typescript@5.9.3: {} ufo@1.5.4: {} @@ -17330,7 +17330,7 @@ snapshots: has-symbols: 1.1.0 which-boxed-primitive: 1.1.1 - undici-types@7.12.0: {} + undici-types@7.14.0: {} undici@5.29.0: dependencies: @@ -17429,7 +17429,7 @@ snapshots: unplugin: 2.3.10 unplugin-utils: 0.3.0 - unplugin-icons@22.4.2(@svgr/core@8.1.0(typescript@5.9.2)): + unplugin-icons@22.4.2(@svgr/core@8.1.0(typescript@5.9.3)): dependencies: '@antfu/install-pkg': 1.1.0 '@iconify/utils': 3.0.2 @@ -17437,7 +17437,7 @@ snapshots: local-pkg: 1.1.2 unplugin: 2.3.10 optionalDependencies: - '@svgr/core': 8.1.0(typescript@5.9.2) + '@svgr/core': 8.1.0(typescript@5.9.3) transitivePeerDependencies: - supports-color @@ -17563,26 +17563,26 @@ snapshots: - rollup - supports-color - vite-plugin-dts@4.5.4(@types/node@24.5.2)(rollup@4.46.2)(typescript@5.9.2)(vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)): + vite-plugin-dts@4.5.4(@types/node@24.8.1)(rollup@4.46.2)(typescript@5.9.3)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)): dependencies: - '@microsoft/api-extractor': 7.51.0(@types/node@24.5.2) + '@microsoft/api-extractor': 7.51.0(@types/node@24.8.1) '@rollup/pluginutils': 5.1.4(rollup@4.46.2) '@volar/typescript': 2.4.11 - '@vue/language-core': 2.2.0(typescript@5.9.2) + '@vue/language-core': 2.2.0(typescript@5.9.3) compare-versions: 6.1.1 debug: 4.4.0 kolorist: 1.8.0 local-pkg: 1.1.1 magic-string: 0.30.17 - typescript: 5.9.2 + typescript: 5.9.3 optionalDependencies: - vite: 7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) transitivePeerDependencies: - '@types/node' - rollup - supports-color - vite-plugin-html@3.2.2(vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)): + vite-plugin-html@3.2.2(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)): dependencies: '@rollup/pluginutils': 4.2.1 colorette: 2.0.20 @@ -17596,39 +17596,39 @@ snapshots: html-minifier-terser: 6.1.0 node-html-parser: 5.4.2 pathe: 0.2.0 - vite: 7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) - vite-plugin-sass-dts@1.3.34(postcss@8.5.6)(prettier@3.6.2)(sass-embedded@1.93.2)(vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)): + vite-plugin-sass-dts@1.3.34(postcss@8.5.6)(prettier@3.6.2)(sass-embedded@1.93.2)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)): dependencies: postcss: 8.5.6 postcss-js: 4.0.1(postcss@8.5.6) prettier: 3.6.2 sass-embedded: 1.93.2 - vite: 7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) - vite-plugin-svgr@4.5.0(rollup@4.46.2)(typescript@5.9.2)(vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)): + vite-plugin-svgr@4.5.0(rollup@4.46.2)(typescript@5.9.3)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)): dependencies: '@rollup/pluginutils': 5.2.0(rollup@4.46.2) - '@svgr/core': 8.1.0(typescript@5.9.2) - '@svgr/plugin-jsx': 8.1.0(@svgr/core@8.1.0(typescript@5.9.2)) - vite: 7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + '@svgr/core': 8.1.0(typescript@5.9.3) + '@svgr/plugin-jsx': 8.1.0(@svgr/core@8.1.0(typescript@5.9.3)) + vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) transitivePeerDependencies: - rollup - supports-color - typescript - vite-tsconfig-paths@5.1.4(typescript@5.9.2)(vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)): + vite-tsconfig-paths@5.1.4(typescript@5.9.3)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)): dependencies: debug: 4.3.7 globrex: 0.1.2 - tsconfck: 3.0.3(typescript@5.9.2) + tsconfck: 3.0.3(typescript@5.9.3) optionalDependencies: - vite: 7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) transitivePeerDependencies: - supports-color - typescript - vite@7.1.10(@types/node@24.5.2)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1): + vite@7.1.10(@types/node@24.8.1)(jiti@2.6.0)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1): dependencies: esbuild: 0.25.0 fdir: 6.5.0(picomatch@4.0.3) @@ -17637,7 +17637,7 @@ snapshots: rollup: 4.46.2 tinyglobby: 0.2.15 optionalDependencies: - '@types/node': 24.5.2 + '@types/node': 24.8.1 fsevents: 2.3.3 jiti: 2.6.0 less: 4.2.0 diff --git a/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts b/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts index fad6a3fe86..ff93acacda 100644 --- a/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts +++ b/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts @@ -25,8 +25,8 @@ led-boot = &red_led; led-failsafe = &red_led; - led-running = &red_led; - led-upgrade = &red_led; + led-running = &green_led; + led-upgrade = &green_led; }; chosen { @@ -45,6 +45,7 @@ red_led: red-led { label = "red:status"; gpios = <&gpio4 RK_PB1 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "default-on"; }; }; @@ -109,6 +110,8 @@ vcc_3v3_pcie: regulator-vcc-3v3-pcie { compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&pcie_pwr_en>; regulator-name = "vcc_3v3_pcie"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; @@ -158,6 +161,30 @@ vin-supply = <&vcc_12v0_dcin>; }; + vcc_5v0_typec0: regulator-vcc-5v0-typec0 { + compatible = "regulator-fixed"; + enable-active-high; + gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&usb_otg0_pwren>; + regulator-name = "vcc_5v0_typec0"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vcc_5v0_device>; + }; + + vcc_5v0_usbhost: regulator-vcc-5v0-usbhost { + compatible = "regulator-fixed"; + enable-active-high; + gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&usb_host_pwren>; + regulator-name = "vcc_5v0_usbhost"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vcc_5v0_device>; + }; + vcc_3v3_ufs_s0: regulator-vcc-ufs-s0 { compatible = "regulator-fixed"; regulator-name = "vcc_3v3_ufs_s0"; @@ -167,49 +194,80 @@ regulator-max-microvolt = <3300000>; vin-supply = <&vcc_5v0_sys>; }; + + sdio_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; + clocks = <&hym8563>; + clock-names = "ext_clock"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_reg_on>; + reset-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>; + }; +}; + +&combphy0_ps { + status = "okay"; +}; + +&combphy1_psu { + status = "okay"; +}; + +&cpu_b0 { + cpu-supply = <&vdd_cpu_big_s0>; +}; + +&cpu_b1 { + cpu-supply = <&vdd_cpu_big_s0>; +}; + +&cpu_b2 { + cpu-supply = <&vdd_cpu_big_s0>; +}; + +&cpu_b3 { + cpu-supply = <&vdd_cpu_big_s0>; }; &cpu_l0 { cpu-supply = <&vdd_cpu_lit_s0>; }; +&cpu_l1 { + cpu-supply = <&vdd_cpu_lit_s0>; +}; + +&cpu_l2 { + cpu-supply = <&vdd_cpu_lit_s0>; +}; + +&cpu_l3 { + cpu-supply = <&vdd_cpu_lit_s0>; +}; + &gmac0 { phy-mode = "rgmii-id"; clock_in_out = "output"; - - snps,reset-gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - snps,reset-delays-us = <0 20000 100000>; - + phy-handle = <&rgmii_phy0>; pinctrl-names = "default"; pinctrl-0 = <ð0m0_miim ð0m0_tx_bus2 ð0m0_rx_bus2 ð0m0_rgmii_clk - ð0m0_rgmii_bus - ðm0_clk0_25m_out>; - - phy-handle = <&rgmii_phy0>; + ð0m0_rgmii_bus>; status = "okay"; }; &gmac1 { phy-mode = "rgmii-id"; clock_in_out = "output"; - - snps,reset-gpio = <&gpio3 RK_PA3 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - snps,reset-delays-us = <0 20000 100000>; - + phy-handle = <&rgmii_phy1>; pinctrl-names = "default"; pinctrl-0 = <ð1m0_miim ð1m0_tx_bus2 ð1m0_rx_bus2 ð1m0_rgmii_clk - ð1m0_rgmii_bus - ðm0_clk1_25m_out>; - - phy-handle = <&rgmii_phy1>; + ð1m0_rgmii_bus>; status = "okay"; }; @@ -578,12 +636,22 @@ &i2c2 { status = "okay"; + usbc0: typec-portc@22 { + compatible = "fcs,fusb302"; + reg = <0x22>; + interrupt-parent = <&gpio0>; + interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <&usbc0_interrupt>; + vbus-supply = <&vcc_5v0_typec0>; + }; + hym8563: rtc@51 { compatible = "haoyu,hym8563"; reg = <0x51>; clock-output-names = "hym8563"; interrupt-parent = <&gpio0>; - interrupts = ; + interrupts = ; pinctrl-names = "default"; pinctrl-0 = <&hym8563_int>; wakeup-source; @@ -591,12 +659,19 @@ }; }; +&i2c3 { + status = "okay"; +}; + &mdio0 { rgmii_phy0: phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <0x1>; - clocks = <&cru REFCLKO25M_GMAC0_OUT>; - realtek,led-data = <0x6d60>; + pinctrl-names = "default"; + pinctrl-0 = <&gmac0_rst>; + reset-assert-us = <20000>; + reset-deassert-us = <100000>; + reset-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; }; }; @@ -604,12 +679,32 @@ rgmii_phy1: phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <0x1>; - clocks = <&cru REFCLKO25M_GMAC1_OUT>; - realtek,led-data = <0x6d60>; + pinctrl-names = "default"; + pinctrl-0 = <&gmac1_rst>; + reset-assert-us = <20000>; + reset-deassert-us = <100000>; + reset-gpios = <&gpio3 RK_PA3 GPIO_ACTIVE_LOW>; }; }; +&pcie0 { + pinctrl-names = "default"; + pinctrl-0 = <&pcie_reset>; + reset-gpios = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; + vpcie3v3-supply = <&vcc_3v3_pcie>; + status = "okay"; +}; + &pinctrl { + gmac { + gmac0_rst: gmac0-rst { + rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; + }; + gmac1_rst: gmac1-rst { + rockchip,pins = <3 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + headphone { hp_det: hp-det { rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>; @@ -630,6 +725,57 @@ rockchip,pins = <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; }; }; + + pcie { + pcie_pwr_en: pcie-pwr-en { + rockchip,pins = <3 RK_PD6 RK_FUNC_GPIO &pcfg_pull_down>; + }; + pcie_reset: pcie-reset { + rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + usb { + usb_host_pwren: usb-host-pwren { + rockchip,pins = <4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + usb_otg0_pwren: usb-otg0-pwren { + rockchip,pins = <4 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + usbc0_interrupt: usbc0-interrupt { + rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>; + }; + usbc0_sbu1: usbc0-sbu1 { + rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_down>; + }; + usbc0_sbu2: usbc0-sbu2 { + rockchip,pins = <2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_down>; + }; + }; + + wireless-bluetooth { + bt_reg_on: bt-reg-on { + rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + host_wake_bt: host-wake-bt { + rockchip,pins = <1 RK_PD4 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + bt_wake_host: bt-wake-host { + rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_down>; + }; + }; + + wireless-wlan { + wifi_wake_host: wifi-wake-host { + rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_down>; + }; + + wifi_reg_on: wifi-reg-on { + rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; }; &sdhci { @@ -644,6 +790,21 @@ status = "okay"; }; +&sdio { + bus-width = <4>; + cap-sdio-irq; + keep-power-in-suspend; + mmc-pwrseq = <&sdio_pwrseq>; + no-sd; + no-mmc; + non-removable; + sd-uhs-sdr104; + vmmc-supply = <&vcc_3v3_s3>; + vqmmc-supply = <&vcc_1v8_s3>; + wakeup-source; + status = "okay"; +}; + &sdmmc { bus-width = <4>; cap-mmc-highspeed; @@ -652,13 +813,58 @@ max-frequency = <200000000>; no-sdio; no-mmc; - sd-uhs-sdr50; + sd-uhs-sdr104; vmmc-supply = <&vcc_3v3_s3>; vqmmc-supply = <&vccio_sd_s0>; status = "okay"; }; +&u2phy0 { + status = "okay"; +}; + +&u2phy0_otg { + status = "okay"; +}; + +&u2phy1 { + status = "okay"; +}; + +&u2phy1_otg { + phy-supply = <&vcc_5v0_usbhost>; + status = "okay"; +}; + &uart0 { pinctrl-0 = <&uart0m0_xfer>; status = "okay"; }; + +&uart4 { + pinctrl-0 = <&uart4m1_xfer &uart4m1_ctsn &uart4m1_rtsn>; + pinctrl-names = "default"; + uart-has-rtscts; + status = "okay"; +}; + +&usb_drd0_dwc3 { + usb-role-switch; + dr_mode = "otg"; + status = "okay"; +}; + +&usb_drd1_dwc3 { + dr_mode = "host"; + status = "okay"; +}; + +&usbdp_phy { + mode-switch; + orientation-switch; + pinctrl-names = "default"; + pinctrl-0 = <&usbc0_sbu1 &usbc0_sbu2>; + sbu1-dc-gpios = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>; + sbu2-dc-gpios = <&gpio2 RK_PA7 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; diff --git a/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts b/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts index 515bdc5647..0b98f9e874 100644 --- a/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts +++ b/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts @@ -23,11 +23,11 @@ ethernet0 = &gmac0; ethernet1 = &gmac1; mmc0 = &sdmmc; - - led-boot = &sys_led; - led-failsafe = &sys_led; - led-running = &sys_led; - led-upgrade = &sys_led; + + led-boot = &power_led; + led-failsafe = &power_led; + led-running = &power_led; + led-upgrade = &power_led; }; chosen { @@ -46,10 +46,10 @@ }; }; - gpio_keys: gpio-keys { + keys { compatible = "gpio-keys"; - button@1 { + key-1 { debounce-interval = <50>; gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_LOW>; label = "reset"; @@ -63,7 +63,7 @@ leds { compatible = "gpio-leds"; - sys_led: led-sys { + power_led: led-0 { color = ; function = LED_FUNCTION_HEARTBEAT; gpios = <&gpio2 RK_PB3 GPIO_ACTIVE_HIGH>; @@ -73,7 +73,7 @@ pinctrl-0 = <&led_sys_h>; }; - wan_led: led-wan { + led1: led-1 { color = ; function = LED_FUNCTION_LAN; gpios = <&gpio4 RK_PC5 GPIO_ACTIVE_HIGH>; @@ -83,7 +83,7 @@ pinctrl-0 = <&led1_h>; }; - lan_led: led-lan { + led2: led-2 { color = ; function = LED_FUNCTION_LAN; gpios = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>; diff --git a/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts b/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts index 9a50b6f096..b21651773f 100644 --- a/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts +++ b/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts @@ -1,12 +1,18 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/* + * Copyright (c) 2025 FriendlyElec Computer Tech. Co., Ltd. + * (http://www.friendlyelec.com) + * + * Copyright (c) 2025 Tianling Shen + */ /dts-v1/; - #include #include #include #include #include + #include "rk3576.dtsi" / { @@ -16,34 +22,60 @@ aliases { mmc0 = &sdhci; mmc1 = &sdmmc; + mmc2 = &sdio; - led-boot = &sys_led; - led-failsafe = &sys_led; - led-running = &sys_led; - led-upgrade = &sys_led; + led-boot = &power_led; + led-failsafe = &power_led; + led-running = &power_led; + led-upgrade = &power_led; }; - chosen: chosen { + chosen { stdout-path = "serial0:1500000n8"; }; - gpio_keys: gpio-keys { + gpio-keys { compatible = "gpio-keys"; pinctrl-names = "default"; - pinctrl-0 = <&reset_button_pin>; + pinctrl-0 = <&user_but_pin>; - button@1 { - debounce-interval = <50>; - gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_LOW>; + button-reset { label = "reset"; + gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_LOW>; + debounce-interval = <50>; linux,code = ; wakeup-source; }; }; + gpio-leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&led1_h>, <&led_sys_h>, <&led2_h>; + + led-0 { + color = ; + function = LED_FUNCTION_LAN; + gpios = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>; + }; + + power_led: led-1 { + color = ; + function = LED_FUNCTION_POWER; + gpios = <&gpio2 RK_PB3 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + }; + + led-2 { + color = ; + function = LED_FUNCTION_WAN; + gpios = <&gpio4 RK_PC5 GPIO_ACTIVE_HIGH>; + }; + }; + hdmi-con { compatible = "hdmi-connector"; - hdmi-pwr-supply = <&vcc_5v0_hdmi>; + hdmi-pwr-supply = <&vcc5v_hdmi_tx>; type = "a"; port { @@ -53,226 +85,126 @@ }; }; - gpio-leds { - compatible = "gpio-leds"; - - sys_led: led-sys { - gpios = <&gpio2 RK_PB3 GPIO_ACTIVE_HIGH>; - label = "red:power"; - linux,default-trigger = "heartbeat"; - pinctrl-names = "default"; - pinctrl-0 = <&sys_led_pin>; - }; - - wan_led: led-wan { - gpios = <&gpio4 RK_PC5 GPIO_ACTIVE_HIGH>; - label = "green:wan"; - pinctrl-names = "default"; - pinctrl-0 = <&wan_led_pin>; - }; - - lan_led: led-lan { - gpios = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>; - label = "green:lan"; - pinctrl-names = "default"; - pinctrl-0 = <&lan_led_pin>; - }; - }; - - usbc_vin0 { - compatible = "iio-hwmon"; - io-channels = <&saradc 2>; - }; - - vcc5v0_usb_otg0: regulator-vcc5v0-usb-otg0 { - compatible = "regulator-fixed"; - regulator-name = "vcc5v0_usb_otg0"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - gpio = <&gpio0 RK_PD1 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&usb_otg0_pwren_h>; - vin-supply = <&vcc5v0_device>; - }; - - vcc12v_dcin: regulator-vcc12v-dcin { - compatible = "regulator-fixed"; - regulator-name = "vcc12v_dcin"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <12000000>; - regulator-max-microvolt = <12000000>; - }; - - vcc1v2_ufs_vccq_s0: regulator-vcc1v2-ufs-vccq-s0 { - compatible = "regulator-fixed"; - regulator-name = "vcc1v2_ufs_vccq_s0"; - regulator-boot-on; - regulator-always-on; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - vin-supply = <&vcc_sys>; - }; - - vcc1v8_ufs_vccq2_s0: regulator-vcc1v8-ufs-vccq2-s0 { - compatible = "regulator-fixed"; - regulator-name = "vcc1v8_ufs_vccq2_s0"; - regulator-boot-on; - regulator-always-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - vin-supply = <&vcc_1v8_s3>; - }; - - vcc3v3_pcie20: vcc3v3-pcie20 { - compatible = "regulator-fixed"; - regulator-name = "vcc3v3_pcie20"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - vin-supply = <&vcc_3v3_s3>; - }; - sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&hym8563>; clock-names = "ext_clock"; pinctrl-names = "default"; - pinctrl-0 = <&wifi_reg_on>; + pinctrl-0 = <&wifi_reg_on_h>; post-power-on-delay-ms = <200>; reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; }; vcc3v3_rtc_s5: regulator-vcc3v3-rtc-s5 { compatible = "regulator-fixed"; - regulator-name = "vcc3v3_rtc_s5"; - regulator-boot-on; regulator-always-on; + regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - vin-supply = <&vcc_sys>; + regulator-name = "vcc3v3_rtc_s5"; + vin-supply = <&vcc5v0_sys_s5>; }; - vcc_3v3_sd_s0: regulator-vcc-3v3-sd-s0 { + vcc5v_dcin: regulator-vcc5v-dcin { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-name = "vcc5v_dcin"; + }; + + vcc5v_hdmi_tx: regulator-vcc5v-hdmi-tx { compatible = "regulator-fixed"; enable-active-high; - gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>; + gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; - pinctrl-0 = <&sd_s0_pwren>; - regulator-boot-on; - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; - regulator-name = "vcc_3v3_sd_s0"; - vin-supply = <&vcc_3v3_s3>; - - regulator-state-mem { - regulator-on-in-suspend; - }; + pinctrl-0 = <&hdmi_tx_on_h>; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-name = "vcc5v_hdmi_tx"; + vin-supply = <&vcc5v0_sys_s5>; }; - vcc5v0_device: regulator-vcc5v0-device { + vcc5v0_device_s0: regulator-vcc5v0-device-s0 { compatible = "regulator-fixed"; - regulator-name = "vcc5v0_device"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - vin-supply = <&vcc12v_dcin>; + regulator-name = "vcc5v0_device_s0"; + vin-supply = <&vcc5v_dcin>; }; - vcc_sys: regulator-vcc5v0-sys { + vcc5v0_sys_s5: regulator-vcc5v0-sys-s5 { compatible = "regulator-fixed"; - regulator-name = "vcc_sys"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - vin-supply = <&vcc12v_dcin>; + regulator-name = "vcc5v0_sys_s5"; + vin-supply = <&vcc5v_dcin>; + }; + + vcc5v0_usb_otg0: regulator-vcc5v0-usb-otg0 { + compatible = "regulator-fixed"; + enable-active-high; + gpios = <&gpio0 RK_PD1 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&usb_otg0_pwren_h>; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-name = "vcc5v0_usb_otg0"; + vin-supply = <&vcc5v0_sys_s5>; }; vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 { compatible = "regulator-fixed"; - regulator-name = "vcc_1v1_nldo_s3"; - regulator-boot-on; regulator-always-on; + regulator-boot-on; regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; - vin-supply = <&vcc_sys>; + regulator-name = "vcc_1v1_nldo_s3"; + vin-supply = <&vcc5v0_sys_s5>; }; vcc_1v8_s0: regulator-vcc-1v8-s0 { compatible = "regulator-fixed"; - regulator-name = "vcc_1v8_s0"; - regulator-boot-on; regulator-always-on; + regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; + regulator-name = "vcc_1v8_s0"; vin-supply = <&vcc_1v8_s3>; }; vcc_2v0_pldo_s3: regulator-vcc-2v0-pldo-s3 { compatible = "regulator-fixed"; - regulator-name = "vcc_2v0_pldo_s3"; - regulator-boot-on; regulator-always-on; + regulator-boot-on; regulator-min-microvolt = <2000000>; regulator-max-microvolt = <2000000>; - vin-supply = <&vcc_sys>; + regulator-name = "vcc_2v0_pldo_s3"; + vin-supply = <&vcc5v0_sys_s5>; }; vcc_3v3_s0: regulator-vcc-3v3-s0 { compatible = "regulator-fixed"; - regulator-name = "vcc_3v3_s0"; - regulator-boot-on; regulator-always-on; + regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + regulator-name = "vcc_3v3_s0"; vin-supply = <&vcc_3v3_s3>; }; - - vcc_5v0_hdmi: regulator-vcc-5v0-hdmi { - compatible = "regulator-fixed"; - enable-active-high; - gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&hdmi_con_en>; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-name = "vcc_5v0_hdmi"; - vin-supply = <&vcc_sys>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vcc_ufs_s0: regulator-vcc-ufs-s0 { - compatible = "regulator-fixed"; - regulator-name = "vcc_ufs_s0"; - regulator-boot-on; - regulator-always-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - vin-supply = <&vcc_sys>; - }; }; -&cpu_l0 { - cpu-supply = <&vdd_cpu_lit_s0>; +&combphy0_ps { + status = "okay"; }; -&cpu_l1 { - cpu-supply = <&vdd_cpu_lit_s0>; -}; - -&cpu_l2 { - cpu-supply = <&vdd_cpu_lit_s0>; -}; - -&cpu_l3 { - cpu-supply = <&vdd_cpu_lit_s0>; +&combphy1_psu { + status = "okay"; }; &cpu_b0 { @@ -291,11 +223,24 @@ cpu-supply = <&vdd_cpu_big_s0>; }; -&combphy0_ps { - status = "okay"; +&cpu_l0 { + cpu-supply = <&vdd_cpu_lit_s0>; }; -&combphy1_psu { +&cpu_l1 { + cpu-supply = <&vdd_cpu_lit_s0>; +}; + +&cpu_l2 { + cpu-supply = <&vdd_cpu_lit_s0>; +}; + +&cpu_l3 { + cpu-supply = <&vdd_cpu_lit_s0>; +}; + +&gpu { + mali-supply = <&vdd_gpu_s0>; status = "okay"; }; @@ -323,66 +268,42 @@ status = "okay"; }; -&sai6 { - status = "okay"; -}; - -&gpu { - mali-supply = <&vdd_gpu_s0>; - status = "okay"; -}; - &i2c1 { status = "okay"; - rk806: pmic@23 { + pmic@23 { compatible = "rockchip,rk806"; reg = <0x23>; + #gpio-cells = <2>; + gpio-controller; interrupt-parent = <&gpio0>; interrupts = <6 IRQ_TYPE_LEVEL_LOW>; - gpio-controller; - #gpio-cells = <2>; pinctrl-names = "default"; pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>, <&rk806_dvs2_null>, <&rk806_dvs3_null>; system-power-controller; - vcc1-supply = <&vcc_sys>; - vcc2-supply = <&vcc_sys>; - vcc3-supply = <&vcc_sys>; - vcc4-supply = <&vcc_sys>; - vcc5-supply = <&vcc_sys>; - vcc6-supply = <&vcc_sys>; - vcc7-supply = <&vcc_sys>; - vcc8-supply = <&vcc_sys>; - vcc9-supply = <&vcc_sys>; - vcc10-supply = <&vcc_sys>; + vcc1-supply = <&vcc5v0_sys_s5>; + vcc2-supply = <&vcc5v0_sys_s5>; + vcc3-supply = <&vcc5v0_sys_s5>; + vcc4-supply = <&vcc5v0_sys_s5>; + vcc5-supply = <&vcc5v0_sys_s5>; + vcc6-supply = <&vcc5v0_sys_s5>; + vcc7-supply = <&vcc5v0_sys_s5>; + vcc8-supply = <&vcc5v0_sys_s5>; + vcc9-supply = <&vcc5v0_sys_s5>; + vcc10-supply = <&vcc5v0_sys_s5>; vcc11-supply = <&vcc_2v0_pldo_s3>; - vcc12-supply = <&vcc_sys>; + vcc12-supply = <&vcc5v0_sys_s5>; vcc13-supply = <&vcc_1v1_nldo_s3>; vcc14-supply = <&vcc_1v1_nldo_s3>; - vcca-supply = <&vcc_sys>; + vcca-supply = <&vcc5v0_sys_s5>; rk806_dvs1_null: dvs1-null-pins { pins = "gpio_pwrctrl1"; function = "pin_fun0"; }; - rk806_dvs2_null: dvs2-null-pins { - pins = "gpio_pwrctrl2"; - function = "pin_fun0"; - }; - - rk806_dvs3_null: dvs3-null-pins { - pins = "gpio_pwrctrl3"; - function = "pin_fun0"; - }; - - rk806_dvs1_slp: dvs1-slp-pins { - pins = "gpio_pwrctrl1"; - function = "pin_fun1"; - }; - rk806_dvs1_pwrdn: dvs1-pwrdn-pins { pins = "gpio_pwrctrl1"; function = "pin_fun2"; @@ -393,21 +314,11 @@ function = "pin_fun3"; }; - rk806_dvs2_slp: dvs2-slp-pins { - pins = "gpio_pwrctrl2"; + rk806_dvs1_slp: dvs1-slp-pins { + pins = "gpio_pwrctrl1"; function = "pin_fun1"; }; - rk806_dvs2_pwrdn: dvs2-pwrdn-pins { - pins = "gpio_pwrctrl2"; - function = "pin_fun2"; - }; - - rk806_dvs2_rst: dvs2-rst-pins { - pins = "gpio_pwrctrl2"; - function = "pin_fun3"; - }; - rk806_dvs2_dvs: dvs2-dvs-pins { pins = "gpio_pwrctrl2"; function = "pin_fun4"; @@ -418,21 +329,26 @@ function = "pin_fun5"; }; - rk806_dvs3_slp: dvs3-slp-pins { - pins = "gpio_pwrctrl3"; - function = "pin_fun1"; + rk806_dvs2_null: dvs2-null-pins { + pins = "gpio_pwrctrl2"; + function = "pin_fun0"; }; - rk806_dvs3_pwrdn: dvs3-pwrdn-pins { - pins = "gpio_pwrctrl3"; + rk806_dvs2_pwrdn: dvs2-pwrdn-pins { + pins = "gpio_pwrctrl2"; function = "pin_fun2"; }; - rk806_dvs3_rst: dvs3-rst-pins { - pins = "gpio_pwrctrl3"; + rk806_dvs2_rst: dvs2-rst-pins { + pins = "gpio_pwrctrl2"; function = "pin_fun3"; }; + rk806_dvs2_slp: dvs2-slp-pins { + pins = "gpio_pwrctrl2"; + function = "pin_fun1"; + }; + rk806_dvs3_dvs: dvs3-dvs-pins { pins = "gpio_pwrctrl3"; function = "pin_fun4"; @@ -443,15 +359,35 @@ function = "pin_fun5"; }; + rk806_dvs3_null: dvs3-null-pins { + pins = "gpio_pwrctrl3"; + function = "pin_fun0"; + }; + + rk806_dvs3_pwrdn: dvs3-pwrdn-pins { + pins = "gpio_pwrctrl3"; + function = "pin_fun2"; + }; + + rk806_dvs3_rst: dvs3-rst-pins { + pins = "gpio_pwrctrl3"; + function = "pin_fun3"; + }; + + rk806_dvs3_slp: dvs3-slp-pins { + pins = "gpio_pwrctrl3"; + function = "pin_fun1"; + }; + regulators { vdd_cpu_big_s0: dcdc-reg1 { regulator-always-on; regulator-boot-on; + regulator-enable-ramp-delay = <400>; regulator-min-microvolt = <550000>; regulator-max-microvolt = <950000>; - regulator-ramp-delay = <12500>; regulator-name = "vdd_cpu_big_s0"; - regulator-enable-ramp-delay = <400>; + regulator-ramp-delay = <12500>; regulator-state-mem { regulator-off-in-suspend; @@ -460,11 +396,11 @@ vdd_npu_s0: dcdc-reg2 { regulator-boot-on; + regulator-enable-ramp-delay = <400>; regulator-min-microvolt = <550000>; regulator-max-microvolt = <950000>; - regulator-ramp-delay = <12500>; regulator-name = "vdd_npu_s0"; - regulator-enable-ramp-delay = <400>; + regulator-ramp-delay = <12500>; regulator-state-mem { regulator-off-in-suspend; @@ -476,8 +412,8 @@ regulator-boot-on; regulator-min-microvolt = <550000>; regulator-max-microvolt = <950000>; - regulator-ramp-delay = <12500>; regulator-name = "vdd_cpu_lit_s0"; + regulator-ramp-delay = <12500>; regulator-state-mem { regulator-off-in-suspend; @@ -500,11 +436,11 @@ vdd_gpu_s0: dcdc-reg5 { regulator-boot-on; + regulator-enable-ramp-delay = <400>; regulator-min-microvolt = <550000>; regulator-max-microvolt = <900000>; - regulator-ramp-delay = <12500>; regulator-name = "vdd_gpu_s0"; - regulator-enable-ramp-delay = <400>; + regulator-ramp-delay = <12500>; regulator-state-mem { regulator-off-in-suspend; @@ -645,7 +581,7 @@ vdd_0v75_s3: nldo-reg1 { regulator-always-on; regulator-boot-on; - regulator-min-microvolt = <550000>; + regulator-min-microvolt = <750000>; regulator-max-microvolt = <750000>; regulator-name = "vdd_0v75_s3"; @@ -668,6 +604,7 @@ }; vdda0v75_hdmi_s0: nldo-reg3 { + regulator-always-on; regulator-boot-on; regulator-min-microvolt = <837500>; regulator-max-microvolt = <837500>; @@ -713,96 +650,68 @@ reg = <0x51>; #clock-cells = <0>; clock-output-names = "hym8563"; - pinctrl-names = "default"; - pinctrl-0 = <&rtc_int_l>; interrupt-parent = <&gpio0>; interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <&rtc_int_l>; wakeup-source; }; }; &pcie0 { pinctrl-names = "default"; - pinctrl-0 = <&pcie0_reset>; + pinctrl-0 = <&pcie0_perstn>; reset-gpios = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc3v3_pcie20>; + vpcie3v3-supply = <&vcc_3v3_s3>; status = "okay"; - - pcie@0,0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - - rtl8125_1: pcie@1,0 { - compatible = "pci10ec,8125"; - reg = <0x000000 0 0 0 0>; - - realtek,led-data = <0x0 0x0 0x2b 0x200>; - label = "eth0"; - }; - }; }; &pcie1 { pinctrl-names = "default"; - pinctrl-0 = <&pcie1_reset>; + pinctrl-0 = <&pcie1_perstn>; reset-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc3v3_pcie20>; + vpcie3v3-supply = <&vcc_3v3_s3>; status = "okay"; - - pcie@0,0 { - reg = <0x00100000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - - rtl8125_2: pcie@10,0 { - compatible = "pci10ec,8125"; - reg = <0x000000 0 0 0 0>; - - realtek,led-data = <0x0 0x0 0x2b 0x200>; - label = "eth1"; - }; - }; }; &pinctrl { - gpio-key { - reset_button_pin: reset-button-pin { + bt { + bt_reg_on_h: bt-reg-on-h { + rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + bt_wake_host_h: bt-wake-host-h { + rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_down>; + }; + + host_wake_bt_h: host-wake-bt-h { + rockchip,pins = <3 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + gpio-keys { + user_but_pin: user-but-pin { rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>; }; }; gpio-leds { - sys_led_pin: sys-led-pin { + led_sys_h: led-sys-h { rockchip,pins = <2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>; }; - wan_led_pin: wan-led-pin { - rockchip,pins = <4 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - lan_led_pin: lan-led-pin { + led1_h: led1-h { rockchip,pins = <2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; - }; - usb { - usb3_host_pwren_h: usb3-host-pwren-h { - rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - usb_otg0_pwren_h: usb-otg0-pwren-h { - rockchip,pins = <0 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>; + led2_h: led2-h { + rockchip,pins = <4 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; }; }; - pcie { - pcie0_reset: pcie0-reset { - rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>; - }; - - pcie1_reset: pcie1-reset { - rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>; + hdmi { + hdmi_tx_on_h: hdmi-tx-on-h { + rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; }; }; @@ -812,86 +721,80 @@ }; }; - sdmmc { - sd_s0_pwren: sd-s0-pwren { - rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up>; + pcie { + pcie0_perstn: pcie0-perstn { + rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + pcie1_perstn: pcie1-perstn { + rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>; }; }; - hdmi { - hdmi_con_en: hdmi-con-en { - rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; + usb { + usb_otg0_pwren_h: usb-otg0-pwren-h { + rockchip,pins = <0 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>; }; }; - wireless-wlan { - wifi_wake_host: wifi-wake-host { + wifi { + wifi_wake_host_h: wifi-wake-host-h { rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_down>; }; - wifi_reg_on: wifi-reg-on { + wifi_reg_on_h: wifi-reg-on-h { rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; }; }; - - wireless-bluetooth { - bt_reg_on: bt-reg-on { - rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>; - }; - - host_wake_bt: host-wake-bt { - rockchip,pins = <3 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>; - }; - - bt_wake_host: bt-wake-host { - rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_down>; - }; - }; +}; + +&sai6 { + status = "okay"; }; &sdmmc { - max-frequency = <200000000>; - no-sdio; - no-mmc; bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; disable-wp; sd-uhs-sdr104; - vmmc-supply = <&vcc_3v3_sd_s0>; + vmmc-supply = <&vcc_3v3_s3>; vqmmc-supply = <&vccio_sd_s0>; - pinctrl-names = "default"; - pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_det &sdmmc0_bus4>; status = "okay"; }; &sdio { - max-frequency = <200000000>; - no-sd; - no-mmc; + #address-cells = <1>; + #size-cells = <0>; bus-width = <4>; - disable-wp; cap-sd-highspeed; cap-sdio-irq; keep-power-in-suspend; mmc-pwrseq = <&sdio_pwrseq>; non-removable; - pinctrl-names = "default"; - pinctrl-0 = <&sdmmc1m0_bus4 &sdmmc1m0_clk &sdmmc1m0_cmd>; sd-uhs-sdr104; + vmmc-supply = <&vcc_3v3_s3>; + vqmmc-supply = <&vcc_1v8_s3>; wakeup-source; status = "okay"; + + wifi@1 { + reg = <1>; + interrupt-parent = <&gpio0>; + interrupts = ; + interrupt-names = "host-wake"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_wake_host_h>; + }; }; &sdhci { bus-width = <8>; - no-sdio; - no-sd; - non-removable; - max-frequency = <200000000>; + cap-mmc-highspeed; + full-pwr-cycle-in-suspend; mmc-hs400-1_8v; mmc-hs400-enhanced-strobe; - full-pwr-cycle-in-suspend; + non-removable; status = "okay"; }; @@ -916,23 +819,26 @@ &uart5 { pinctrl-names = "default"; pinctrl-0 = <&uart5m0_xfer &uart5m0_ctsn &uart5m0_rtsn>; + uart-has-rtscts; status = "okay"; bluetooth { compatible = "realtek,rtl8822cs-bt"; enable-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_HIGH>; - host-wake-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; device-wake-gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>; + host-wake-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&bt_wake_host_h &host_wake_bt_h &bt_reg_on_h>; }; }; &usbdp_phy { - rockchip,dp-lane-mux = <2 3>; status = "okay"; }; &usb_drd0_dwc3 { dr_mode = "host"; + extcon = <&u2phy0>; status = "okay"; }; @@ -950,7 +856,3 @@ remote-endpoint = <&hdmi_in_vp0>; }; }; - -&wdt { - status= "okay"; -}; diff --git a/lede/target/linux/rockchip/image/armv8.mk b/lede/target/linux/rockchip/image/armv8.mk index cfd1f064b0..b8a9d543d4 100644 --- a/lede/target/linux/rockchip/image/armv8.mk +++ b/lede/target/linux/rockchip/image/armv8.mk @@ -27,7 +27,7 @@ define Device/ariaboard_photonicat2 DEVICE_MODEL := Photonicat 2 SOC := rk3576 DEVICE_DTS := rockchip/rk3576-photonicat2 - UBOOT_DEVICE_NAME := evb-rk3576 + UBOOT_DEVICE_NAME := generic-rk3576 IMAGE/sysupgrade.img.gz := boot-common | boot-script rk3576 | pine64-img | gzip | append-metadata DEVICE_PACKAGES := kmod-aic8800u wpad-openssl endef @@ -59,7 +59,7 @@ define Device/armsom_sige5 DEVICE_MODEL := Sige5 SOC := rk3576 DEVICE_DTS := rockchip/rk3576-armsom-sige5 - UBOOT_DEVICE_NAME := evb-rk3576 + UBOOT_DEVICE_NAME := sige5-rk3576 IMAGE/sysupgrade.img.gz := boot-common | boot-script rk3576 | pine64-img | gzip | append-metadata endef TARGET_DEVICES += armsom_sige5 @@ -161,7 +161,7 @@ define Device/friendlyarm_nanopi-m5 DEVICE_MODEL := NanoPi M5 SOC := rk3576 DEVICE_DTS := rockchip/rk3576-nanopi-m5 - UBOOT_DEVICE_NAME := evb-rk3576 + UBOOT_DEVICE_NAME := generic-rk3576 DEVICE_PACKAGES := kmod-gpio-button-hotplug IMAGE/sysupgrade.img.gz := boot-common | boot-script rk3576 | pine64-img | gzip | append-metadata endef @@ -291,7 +291,7 @@ define Device/friendlyarm_nanopi-r76s DEVICE_MODEL := NanoPi R76S SOC := rk3576 DEVICE_DTS := rockchip/rk3576-nanopi-r76s - UBOOT_DEVICE_NAME := evb-rk3576 + UBOOT_DEVICE_NAME := generic-rk3576 DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-r8125 IMAGE/sysupgrade.img.gz := boot-common | boot-script rk3576 | pine64-img | gzip | append-metadata endef diff --git a/openwrt-packages/luci-theme-kucat/Makefile b/openwrt-packages/luci-theme-kucat/Makefile index ae57c7e632..04ce3aa049 100644 --- a/openwrt-packages/luci-theme-kucat/Makefile +++ b/openwrt-packages/luci-theme-kucat/Makefile @@ -10,8 +10,8 @@ THEME_TITLE:=Kucat Theme PKG_NAME:=luci-theme-$(THEME_NAME) LUCI_TITLE:=Kucat Theme by sirpdboy LUCI_DEPENDS:= -PKG_VERSION:=2.6.16 -PKG_RELEASE:=20250915 +PKG_VERSION:=2.6.18 +PKG_RELEASE:=20251018 define Package/luci-theme-$(THEME_NAME)/conffiles /www/luci-static/resources/background/ diff --git a/openwrt-packages/luci-theme-kucat/htdocs/luci-static/kucat/css/style.css b/openwrt-packages/luci-theme-kucat/htdocs/luci-static/kucat/css/style.css index e6148bab43..bf97257a59 100644 --- a/openwrt-packages/luci-theme-kucat/htdocs/luci-static/kucat/css/style.css +++ b/openwrt-packages/luci-theme-kucat/htdocs/luci-static/kucat/css/style.css @@ -705,7 +705,7 @@ footer>a { small { font-size: 90%; line-height: 1.42857143; - white-space: nowrap + white-space: normal; } .main { @@ -1621,7 +1621,6 @@ table>tbody>tr:first-child>td,table>tfoot>tr:first-child>td,table>thead>tr:first border: 1px solid var(--inputborder-color)!important; transition: box-shadow .25s ease; border-radius: var(--radius2); - cursor: pointer; box-shadow: 0 0.3rem 0.8rem var(--input-boxcolor) } @@ -2269,7 +2268,7 @@ button:hover,.btn:hover,.cbi-button:hover { .cbi-dropdown>ul { display: flex; - overflow-x: hidden; + overflow-x: auto; overflow-y: auto; width: 100%; list-style: none; @@ -2393,11 +2392,10 @@ button:hover,.btn:hover,.cbi-button:hover { color: var(--inputtext-color); margin-left: 0 !important; margin-top: 0.25rem; - left: 0; + left: 0 !important; cursor: pointer; } - .cbi-dropdown>ul>li[display],.cbi-dropdown[open]>ul.preview,.cbi-dropdown[open]>ul.dropdown>li,.cbi-dropdown[multiple]>ul>li>label,.cbi-dropdown[multiple][open]>ul.dropdown>li,.cbi-dropdown[multiple][more]>.more,.cbi-dropdown[multiple][empty]>.more { display: flex; align-items: center; @@ -4326,7 +4324,7 @@ select,input,.cbi-dropdown,.btn,button,.cbi-button,.item::after { #cbi-appfilter>div>div { overflow: auto; - background-color: rgba(var(--primary-rgbbody),1) !important + /* background-color: rgba(var(--primary-rgbbody),1) !important */ } #cbi-appfilter>div>div>button { @@ -4360,12 +4358,16 @@ select,input,.cbi-dropdown,.btn,button,.cbi-button,.item::after { } #cbi-appfilter>div>div span { - color: var(--body-color) !important + /* color: var(--body-color) !important*/ } #cbi-appfilter>div>div input { - background-color: rgba(248,248,248,0.2) !important; - color: var(--body-color) !important + /* background-color: rgba(248,248,248,0.2) !important; + color: var(--body-color) !important*/ +} + +#cbi-appfilter #user_status_table th.th:nth-child(1) { + width: 150px !important; } .CodeMirror.cm-s-dracula.CodeMirror-wrap { @@ -4555,6 +4557,7 @@ div#file-manager-container #status-bar #status-info { width: 30rem; } .cbi-dropdown[open]>ul.dropdown { + overflow: auto; max-width: 100%; width: 30rem; } @@ -4912,9 +4915,10 @@ div#file-manager-container #status-bar #status-info { } .cbi-dropdown[open]>ul.dropdown { + overflow: auto; max-width: 100%; margin: auto; - max-height: 8rem !important; + /*max-height: 8rem !important;*/ padding: 0 !important; } table>tbody>tr>td, table>tfoot>tr>td, table>thead>tr>td { diff --git a/openwrt-packages/luci-theme-material3/htdocs/luci-static/material3/cascade.css b/openwrt-packages/luci-theme-material3/htdocs/luci-static/material3/cascade.css index 0b594a07cb..4ac1f25863 100644 --- a/openwrt-packages/luci-theme-material3/htdocs/luci-static/material3/cascade.css +++ b/openwrt-packages/luci-theme-material3/htdocs/luci-static/material3/cascade.css @@ -2676,6 +2676,16 @@ div.cbi-value var.cbi-tooltip-container { mask: url("icons/docker.svg") center/contain no-repeat } +.nav>li[data-path="admin/modem"]>a::before { + -webkit-mask: url("icons/modem.svg") center/contain no-repeat; + mask: url("icons/modem.svg") center/contain no-repeat +} + +.nav>li[data-path="admin/vpn"]>a::before { + -webkit-mask: url("icons/vpn.svg") center/contain no-repeat; + mask: url("icons/vpn.svg") center/contain no-repeat +} + .nav>li[data-path="admin/logout"]>a::before { -webkit-mask: url("icons/logout.svg") center/contain no-repeat; mask: url("icons/logout.svg") center/contain no-repeat diff --git a/openwrt-packages/luci-theme-material3/htdocs/luci-static/material3/icons/modem.svg b/openwrt-packages/luci-theme-material3/htdocs/luci-static/material3/icons/modem.svg new file mode 100644 index 0000000000..ffc216c38a --- /dev/null +++ b/openwrt-packages/luci-theme-material3/htdocs/luci-static/material3/icons/modem.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/openwrt-packages/luci-theme-material3/htdocs/luci-static/material3/icons/vpn.svg b/openwrt-packages/luci-theme-material3/htdocs/luci-static/material3/icons/vpn.svg new file mode 100644 index 0000000000..b020c36d35 --- /dev/null +++ b/openwrt-packages/luci-theme-material3/htdocs/luci-static/material3/icons/vpn.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/openwrt-packages/openlist2/Makefile b/openwrt-packages/openlist2/Makefile index bf5bd4bbed..dc47afea99 100644 --- a/openwrt-packages/openlist2/Makefile +++ b/openwrt-packages/openlist2/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openlist2 -PKG_VERSION:=4.1.4 -PKG_WEB_VERSION:=4.1.4 +PKG_VERSION:=4.1.5 +PKG_WEB_VERSION:=4.1.5 PKG_RELEASE:=1 PKG_SOURCE:=openlist-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/OpenListTeam/OpenList/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=63726bbedc1ad8995cfad0ae7451cb503a504a3af3579710c4430c12286e01c3 +PKG_HASH:=5ddf3f0b7616248862a8b908cffad9437d19053092bc45e8299ad7c95a3626d2 PKG_BUILD_DIR:=$(BUILD_DIR)/OpenList-$(PKG_VERSION) @@ -24,7 +24,7 @@ PKG_MAINTAINER:=sbwml define Download/openlist-frontend FILE:=openlist-frontend-dist-lite-v$(PKG_WEB_VERSION).tar.gz URL:=https://github.com/OpenListTeam/OpenList-Frontend/releases/download/v$(PKG_WEB_VERSION)/ - HASH:=7020d27ea0d95c806ef6e9541b72da53458d77209ce3f2f27ded8a0c35a5d757 + HASH:=19a079a30fb6658a9122ecce4285abad6c276a9a41b79688b48a601d5fd18896 endef PKG_BUILD_DEPENDS:=golang/host diff --git a/small/v2ray-geodata/Makefile b/small/v2ray-geodata/Makefile index c6de07d820..767d5f11a1 100644 --- a/small/v2ray-geodata/Makefile +++ b/small/v2ray-geodata/Makefile @@ -21,13 +21,13 @@ define Download/geoip HASH:=c23ac8343e9796f8cc8b670c3aeb6df6d03d4e8914437a409961477f6b226098 endef -GEOSITE_VER:=20251018085207 +GEOSITE_VER:=20251019045243 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=c43dd5592ee78ff9bb843b75710f00ba059e84d56e1e9caace30015b8b5c9c1d + HASH:=b912b7aeb0519d0e54d4e8462e498f784d1eec27785e076b8345cc0bc078dac0 endef GEOSITE_IRAN_VER:=202510130040 diff --git a/v2rayn/v2rayN/ServiceLib/Base/MyReactiveObject.cs b/v2rayn/v2rayN/ServiceLib/Base/MyReactiveObject.cs index 0172faadc1..505631512e 100644 --- a/v2rayn/v2rayN/ServiceLib/Base/MyReactiveObject.cs +++ b/v2rayn/v2rayN/ServiceLib/Base/MyReactiveObject.cs @@ -1,5 +1,3 @@ -using ReactiveUI; - namespace ServiceLib.Base; public class MyReactiveObject : ReactiveObject diff --git a/v2rayn/v2rayN/ServiceLib/Common/EmbedUtils.cs b/v2rayn/v2rayN/ServiceLib/Common/EmbedUtils.cs index b647d154ab..d3b323f7c5 100644 --- a/v2rayn/v2rayN/ServiceLib/Common/EmbedUtils.cs +++ b/v2rayn/v2rayN/ServiceLib/Common/EmbedUtils.cs @@ -1,6 +1,3 @@ -using System.Collections.Concurrent; -using System.Reflection; - namespace ServiceLib.Common; public static class EmbedUtils diff --git a/v2rayn/v2rayN/ServiceLib/Common/FileManager.cs b/v2rayn/v2rayN/ServiceLib/Common/FileManager.cs index 6d4d28ca3a..44a9fe82ee 100644 --- a/v2rayn/v2rayN/ServiceLib/Common/FileManager.cs +++ b/v2rayn/v2rayN/ServiceLib/Common/FileManager.cs @@ -1,6 +1,5 @@ using System.Formats.Tar; using System.IO.Compression; -using System.Text; namespace ServiceLib.Common; diff --git a/v2rayn/v2rayN/ServiceLib/Common/JsonUtils.cs b/v2rayn/v2rayN/ServiceLib/Common/JsonUtils.cs index 4fbaa0e18d..b5bcc7fedb 100644 --- a/v2rayn/v2rayN/ServiceLib/Common/JsonUtils.cs +++ b/v2rayn/v2rayN/ServiceLib/Common/JsonUtils.cs @@ -1,8 +1,3 @@ -using System.Text.Encodings.Web; -using System.Text.Json; -using System.Text.Json.Nodes; -using System.Text.Json.Serialization; - namespace ServiceLib.Common; public class JsonUtils diff --git a/v2rayn/v2rayN/ServiceLib/Common/ProcUtils.cs b/v2rayn/v2rayN/ServiceLib/Common/ProcUtils.cs index 2819f2fb51..ce487c7a0d 100644 --- a/v2rayn/v2rayN/ServiceLib/Common/ProcUtils.cs +++ b/v2rayn/v2rayN/ServiceLib/Common/ProcUtils.cs @@ -1,5 +1,3 @@ -using System.Diagnostics; - namespace ServiceLib.Common; public static class ProcUtils diff --git a/v2rayn/v2rayN/ServiceLib/Common/Utils.cs b/v2rayn/v2rayN/ServiceLib/Common/Utils.cs index 85182a607c..8adf9d834a 100644 --- a/v2rayn/v2rayN/ServiceLib/Common/Utils.cs +++ b/v2rayn/v2rayN/ServiceLib/Common/Utils.cs @@ -1,13 +1,5 @@ using System.Collections.Specialized; -using System.Diagnostics; -using System.Net; -using System.Net.NetworkInformation; -using System.Net.Sockets; -using System.Reflection; -using System.Runtime.InteropServices; -using System.Security.Cryptography; using System.Security.Principal; -using System.Text; using CliWrap; using CliWrap.Buffered; diff --git a/v2rayn/v2rayN/ServiceLib/Common/WindowsUtils.cs b/v2rayn/v2rayN/ServiceLib/Common/WindowsUtils.cs index 6c6f7be1e6..2215a3e3f3 100644 --- a/v2rayn/v2rayN/ServiceLib/Common/WindowsUtils.cs +++ b/v2rayn/v2rayN/ServiceLib/Common/WindowsUtils.cs @@ -1,5 +1,3 @@ -using System.Security.Cryptography; -using System.Text; using Microsoft.Win32; namespace ServiceLib.Common; diff --git a/v2rayn/v2rayN/ServiceLib/Events/AppEvents.cs b/v2rayn/v2rayN/ServiceLib/Events/AppEvents.cs index 45de4de1e8..5824bfc009 100644 --- a/v2rayn/v2rayN/ServiceLib/Events/AppEvents.cs +++ b/v2rayn/v2rayN/ServiceLib/Events/AppEvents.cs @@ -1,5 +1,3 @@ -using System.Reactive; - namespace ServiceLib.Events; public static class AppEvents diff --git a/v2rayn/v2rayN/ServiceLib/Events/EventChannel.cs b/v2rayn/v2rayN/ServiceLib/Events/EventChannel.cs index c3c58f3eac..4ca040c65a 100644 --- a/v2rayn/v2rayN/ServiceLib/Events/EventChannel.cs +++ b/v2rayn/v2rayN/ServiceLib/Events/EventChannel.cs @@ -1,5 +1,3 @@ -using System.Reactive; -using System.Reactive.Linq; using System.Reactive.Subjects; namespace ServiceLib.Events; diff --git a/v2rayn/v2rayN/ServiceLib/Global.cs b/v2rayn/v2rayN/ServiceLib/Global.cs index 6e3c541cec..2327de4801 100644 --- a/v2rayn/v2rayN/ServiceLib/Global.cs +++ b/v2rayn/v2rayN/ServiceLib/Global.cs @@ -316,7 +316,7 @@ public class Global ]; public static readonly HashSet SingboxOnlyConfigType = SingboxSupportConfigType.Except(XraySupportConfigType).ToHashSet(); - + public static readonly List DomainStrategies = [ AsIs, diff --git a/v2rayn/v2rayN/ServiceLib/GlobalUsings.cs b/v2rayn/v2rayN/ServiceLib/GlobalUsings.cs index a952f4a8a8..d38ccc06c1 100644 --- a/v2rayn/v2rayN/ServiceLib/GlobalUsings.cs +++ b/v2rayn/v2rayN/ServiceLib/GlobalUsings.cs @@ -1,14 +1,36 @@ +global using System.Collections.Concurrent; +global using System.Diagnostics; +global using System.Net; +global using System.Net.NetworkInformation; +global using System.Net.Sockets; +global using System.Reactive; +global using System.Reactive.Disposables; +global using System.Reactive.Linq; +global using System.Reflection; +global using System.Runtime.InteropServices; +global using System.Security.Cryptography; +global using System.Text; +global using System.Text.Encodings.Web; +global using System.Text.Json; +global using System.Text.Json.Nodes; +global using System.Text.Json.Serialization; +global using System.Text.RegularExpressions; +global using DynamicData; +global using DynamicData.Binding; +global using ReactiveUI; +global using ReactiveUI.Fody.Helpers; global using ServiceLib.Base; global using ServiceLib.Common; global using ServiceLib.Enums; global using ServiceLib.Events; global using ServiceLib.Handler; +global using ServiceLib.Handler.Fmt; +global using ServiceLib.Handler.SysProxy; global using ServiceLib.Helper; global using ServiceLib.Manager; -global using ServiceLib.Handler.Fmt; -global using ServiceLib.Services; -global using ServiceLib.Services.Statistics; -global using ServiceLib.Services.CoreConfig; global using ServiceLib.Models; global using ServiceLib.Resx; -global using ServiceLib.Handler.SysProxy; +global using ServiceLib.Services; +global using ServiceLib.Services.CoreConfig; +global using ServiceLib.Services.Statistics; +global using SQLite; diff --git a/v2rayn/v2rayN/ServiceLib/Handler/AutoStartupHandler.cs b/v2rayn/v2rayN/ServiceLib/Handler/AutoStartupHandler.cs index 015271d9c7..82e945171b 100644 --- a/v2rayn/v2rayN/ServiceLib/Handler/AutoStartupHandler.cs +++ b/v2rayn/v2rayN/ServiceLib/Handler/AutoStartupHandler.cs @@ -1,5 +1,4 @@ using System.Security.Principal; -using System.Text.RegularExpressions; namespace ServiceLib.Handler; diff --git a/v2rayn/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayn/v2rayN/ServiceLib/Handler/ConfigHandler.cs index c3dc716bfe..fd93d8bebe 100644 --- a/v2rayn/v2rayN/ServiceLib/Handler/ConfigHandler.cs +++ b/v2rayn/v2rayN/ServiceLib/Handler/ConfigHandler.cs @@ -1,5 +1,4 @@ using System.Data; -using System.Text.RegularExpressions; namespace ServiceLib.Handler; @@ -1484,7 +1483,7 @@ public static class ConfigHandler if (profileItem is null) { profileItem = Hysteria2Fmt.ResolveFull2(strData, subRemarks); - } + } if (profileItem is null || profileItem.Address.IsNullOrEmpty()) { return -1; diff --git a/v2rayn/v2rayN/ServiceLib/Handler/ConnectionHandler.cs b/v2rayn/v2rayN/ServiceLib/Handler/ConnectionHandler.cs index 38f3ae516c..ae3268ea96 100644 --- a/v2rayn/v2rayN/ServiceLib/Handler/ConnectionHandler.cs +++ b/v2rayn/v2rayN/ServiceLib/Handler/ConnectionHandler.cs @@ -1,5 +1,3 @@ -using System.Net; - namespace ServiceLib.Handler; public static class ConnectionHandler diff --git a/v2rayn/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs b/v2rayn/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs index 2ec9769fb1..adaeb95468 100644 --- a/v2rayn/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs +++ b/v2rayn/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs @@ -1,5 +1,3 @@ -using System.Text.RegularExpressions; - namespace ServiceLib.Handler.Fmt; public class ShadowsocksFmt : BaseFmt diff --git a/v2rayn/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingWindows.cs b/v2rayn/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingWindows.cs index 44b7e04695..8dc2f335ad 100644 --- a/v2rayn/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingWindows.cs +++ b/v2rayn/v2rayN/ServiceLib/Handler/SysProxy/ProxySettingWindows.cs @@ -1,4 +1,3 @@ -using System.Runtime.InteropServices; using static ServiceLib.Handler.SysProxy.ProxySettingWindows.InternetConnectionOption; namespace ServiceLib.Handler.SysProxy; diff --git a/v2rayn/v2rayN/ServiceLib/Helper/DownloaderHelper.cs b/v2rayn/v2rayN/ServiceLib/Helper/DownloaderHelper.cs index 3764499c39..000685a0d8 100644 --- a/v2rayn/v2rayN/ServiceLib/Helper/DownloaderHelper.cs +++ b/v2rayn/v2rayN/ServiceLib/Helper/DownloaderHelper.cs @@ -1,4 +1,3 @@ -using System.Net; using Downloader; namespace ServiceLib.Helper; diff --git a/v2rayn/v2rayN/ServiceLib/Helper/HttpClientHelper.cs b/v2rayn/v2rayN/ServiceLib/Helper/HttpClientHelper.cs index a559800fbb..cd971a898a 100644 --- a/v2rayn/v2rayN/ServiceLib/Helper/HttpClientHelper.cs +++ b/v2rayn/v2rayN/ServiceLib/Helper/HttpClientHelper.cs @@ -1,8 +1,5 @@ -using System.Diagnostics; -using System.Net; using System.Net.Http.Headers; using System.Net.Mime; -using System.Text; namespace ServiceLib.Helper; diff --git a/v2rayn/v2rayN/ServiceLib/Helper/SqliteHelper.cs b/v2rayn/v2rayN/ServiceLib/Helper/SqliteHelper.cs index 959d5ff6ab..83c9bf9087 100644 --- a/v2rayn/v2rayN/ServiceLib/Helper/SqliteHelper.cs +++ b/v2rayn/v2rayN/ServiceLib/Helper/SqliteHelper.cs @@ -1,5 +1,4 @@ using System.Collections; -using SQLite; namespace ServiceLib.Helper; diff --git a/v2rayn/v2rayN/ServiceLib/Manager/CoreAdminManager.cs b/v2rayn/v2rayN/ServiceLib/Manager/CoreAdminManager.cs index 4143e78abe..0d52f1c73e 100644 --- a/v2rayn/v2rayN/ServiceLib/Manager/CoreAdminManager.cs +++ b/v2rayn/v2rayN/ServiceLib/Manager/CoreAdminManager.cs @@ -1,4 +1,3 @@ -using System.Text; using CliWrap; using CliWrap.Buffered; diff --git a/v2rayn/v2rayN/ServiceLib/Manager/PacManager.cs b/v2rayn/v2rayN/ServiceLib/Manager/PacManager.cs index 10bedc2942..cba89830f6 100644 --- a/v2rayn/v2rayN/ServiceLib/Manager/PacManager.cs +++ b/v2rayn/v2rayN/ServiceLib/Manager/PacManager.cs @@ -1,6 +1,3 @@ -using System.Net.Sockets; -using System.Text; - namespace ServiceLib.Manager; public class PacManager diff --git a/v2rayn/v2rayN/ServiceLib/Manager/ProfileExManager.cs b/v2rayn/v2rayN/ServiceLib/Manager/ProfileExManager.cs index 0a3b7399ea..739bd550a7 100644 --- a/v2rayn/v2rayN/ServiceLib/Manager/ProfileExManager.cs +++ b/v2rayn/v2rayN/ServiceLib/Manager/ProfileExManager.cs @@ -1,5 +1,3 @@ -using System.Collections.Concurrent; - //using System.Reactive.Linq; namespace ServiceLib.Manager; diff --git a/v2rayn/v2rayN/ServiceLib/Manager/ProfileGroupItemManager.cs b/v2rayn/v2rayN/ServiceLib/Manager/ProfileGroupItemManager.cs index 72c55870cb..bf52dcb2ae 100644 --- a/v2rayn/v2rayN/ServiceLib/Manager/ProfileGroupItemManager.cs +++ b/v2rayn/v2rayN/ServiceLib/Manager/ProfileGroupItemManager.cs @@ -1,5 +1,3 @@ -using System.Collections.Concurrent; - namespace ServiceLib.Manager; public class ProfileGroupItemManager diff --git a/v2rayn/v2rayN/ServiceLib/Manager/TaskManager.cs b/v2rayn/v2rayN/ServiceLib/Manager/TaskManager.cs index dfbd242d51..40da7ac7f7 100644 --- a/v2rayn/v2rayN/ServiceLib/Manager/TaskManager.cs +++ b/v2rayn/v2rayN/ServiceLib/Manager/TaskManager.cs @@ -26,15 +26,29 @@ public class TaskManager await Task.Delay(1000 * 60); //Execute once 1 minute - await UpdateTaskRunSubscription(); + try + { + await UpdateTaskRunSubscription(); + } + catch (Exception ex) + { + Logging.SaveLog("ScheduledTasks - UpdateTaskRunSubscription", ex); + } //Execute once 20 minute if (numOfExecuted % 20 == 0) { //Logging.SaveLog("Execute save config"); - await ConfigHandler.SaveConfig(_config); - await ProfileExManager.Instance.SaveTo(); + try + { + await ConfigHandler.SaveConfig(_config); + await ProfileExManager.Instance.SaveTo(); + } + catch (Exception ex) + { + Logging.SaveLog("ScheduledTasks - SaveConfig", ex); + } } //Execute once 1 hour @@ -46,8 +60,14 @@ public class TaskManager FileManager.DeleteExpiredFiles(Utils.GetLogPath(), DateTime.Now.AddMonths(-1)); FileManager.DeleteExpiredFiles(Utils.GetTempPath(), DateTime.Now.AddMonths(-1)); - //Check once 1 hour - await UpdateTaskRunGeo(numOfExecuted / 60); + try + { + await UpdateTaskRunGeo(numOfExecuted / 60); + } + catch (Exception ex) + { + Logging.SaveLog("ScheduledTasks - UpdateTaskRunGeo", ex); + } } numOfExecuted++; diff --git a/v2rayn/v2rayN/ServiceLib/Manager/WebDavManager.cs b/v2rayn/v2rayN/ServiceLib/Manager/WebDavManager.cs index 3f5c9ea3c0..83ae24ce9b 100644 --- a/v2rayn/v2rayN/ServiceLib/Manager/WebDavManager.cs +++ b/v2rayn/v2rayN/ServiceLib/Manager/WebDavManager.cs @@ -1,4 +1,3 @@ -using System.Net; using WebDav; namespace ServiceLib.Manager; diff --git a/v2rayn/v2rayN/ServiceLib/Models/CheckUpdateModel.cs b/v2rayn/v2rayN/ServiceLib/Models/CheckUpdateModel.cs index f06eedc936..2707cc6e4c 100644 --- a/v2rayn/v2rayN/ServiceLib/Models/CheckUpdateModel.cs +++ b/v2rayn/v2rayN/ServiceLib/Models/CheckUpdateModel.cs @@ -1,6 +1,3 @@ -using ReactiveUI; -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.Models; public class CheckUpdateModel : ReactiveObject diff --git a/v2rayn/v2rayN/ServiceLib/Models/ClashProxyModel.cs b/v2rayn/v2rayN/ServiceLib/Models/ClashProxyModel.cs index 014b0f12c0..10d68e14b9 100644 --- a/v2rayn/v2rayN/ServiceLib/Models/ClashProxyModel.cs +++ b/v2rayn/v2rayN/ServiceLib/Models/ClashProxyModel.cs @@ -1,6 +1,3 @@ -using ReactiveUI; -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.Models; [Serializable] diff --git a/v2rayn/v2rayN/ServiceLib/Models/DNSItem.cs b/v2rayn/v2rayN/ServiceLib/Models/DNSItem.cs index 9474d906b2..2dea42d0c3 100644 --- a/v2rayn/v2rayN/ServiceLib/Models/DNSItem.cs +++ b/v2rayn/v2rayN/ServiceLib/Models/DNSItem.cs @@ -1,5 +1,3 @@ -using SQLite; - namespace ServiceLib.Models; [Serializable] diff --git a/v2rayn/v2rayN/ServiceLib/Models/FullConfigTemplateItem.cs b/v2rayn/v2rayN/ServiceLib/Models/FullConfigTemplateItem.cs index f388132581..b3e3b14e57 100644 --- a/v2rayn/v2rayN/ServiceLib/Models/FullConfigTemplateItem.cs +++ b/v2rayn/v2rayN/ServiceLib/Models/FullConfigTemplateItem.cs @@ -1,5 +1,3 @@ -using SQLite; - namespace ServiceLib.Models; [Serializable] diff --git a/v2rayn/v2rayN/ServiceLib/Models/GitHubRelease.cs b/v2rayn/v2rayN/ServiceLib/Models/GitHubRelease.cs index 9875c0a050..f654946738 100644 --- a/v2rayn/v2rayN/ServiceLib/Models/GitHubRelease.cs +++ b/v2rayn/v2rayN/ServiceLib/Models/GitHubRelease.cs @@ -1,5 +1,3 @@ -using System.Text.Json.Serialization; - namespace ServiceLib.Models; public class GitHubReleaseAsset diff --git a/v2rayn/v2rayN/ServiceLib/Models/ProfileExItem.cs b/v2rayn/v2rayN/ServiceLib/Models/ProfileExItem.cs index 49a8574921..33b20c57c6 100644 --- a/v2rayn/v2rayN/ServiceLib/Models/ProfileExItem.cs +++ b/v2rayn/v2rayN/ServiceLib/Models/ProfileExItem.cs @@ -1,5 +1,3 @@ -using SQLite; - namespace ServiceLib.Models; [Serializable] diff --git a/v2rayn/v2rayN/ServiceLib/Models/ProfileGroupItem.cs b/v2rayn/v2rayN/ServiceLib/Models/ProfileGroupItem.cs index 1030d6de8c..c6131275c1 100644 --- a/v2rayn/v2rayN/ServiceLib/Models/ProfileGroupItem.cs +++ b/v2rayn/v2rayN/ServiceLib/Models/ProfileGroupItem.cs @@ -1,5 +1,3 @@ -using SQLite; - namespace ServiceLib.Models; [Serializable] diff --git a/v2rayn/v2rayN/ServiceLib/Models/ProfileItem.cs b/v2rayn/v2rayN/ServiceLib/Models/ProfileItem.cs index 55f658e9b2..729fa7b257 100644 --- a/v2rayn/v2rayN/ServiceLib/Models/ProfileItem.cs +++ b/v2rayn/v2rayN/ServiceLib/Models/ProfileItem.cs @@ -1,6 +1,3 @@ -using ReactiveUI; -using SQLite; - namespace ServiceLib.Models; [Serializable] diff --git a/v2rayn/v2rayN/ServiceLib/Models/ProfileItemModel.cs b/v2rayn/v2rayN/ServiceLib/Models/ProfileItemModel.cs index 40ba3f1d98..b4d7211921 100644 --- a/v2rayn/v2rayN/ServiceLib/Models/ProfileItemModel.cs +++ b/v2rayn/v2rayN/ServiceLib/Models/ProfileItemModel.cs @@ -1,5 +1,3 @@ -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.Models; [Serializable] diff --git a/v2rayn/v2rayN/ServiceLib/Models/RoutingItem.cs b/v2rayn/v2rayN/ServiceLib/Models/RoutingItem.cs index 78d934458d..ddd27a9b18 100644 --- a/v2rayn/v2rayN/ServiceLib/Models/RoutingItem.cs +++ b/v2rayn/v2rayN/ServiceLib/Models/RoutingItem.cs @@ -1,5 +1,3 @@ -using SQLite; - namespace ServiceLib.Models; [Serializable] diff --git a/v2rayn/v2rayN/ServiceLib/Models/ServerStatItem.cs b/v2rayn/v2rayN/ServiceLib/Models/ServerStatItem.cs index b500846571..05cd1ee60f 100644 --- a/v2rayn/v2rayN/ServiceLib/Models/ServerStatItem.cs +++ b/v2rayn/v2rayN/ServiceLib/Models/ServerStatItem.cs @@ -1,5 +1,3 @@ -using SQLite; - namespace ServiceLib.Models; [Serializable] diff --git a/v2rayn/v2rayN/ServiceLib/Models/SingboxConfig.cs b/v2rayn/v2rayN/ServiceLib/Models/SingboxConfig.cs index 8263924a31..9474631ba8 100644 --- a/v2rayn/v2rayN/ServiceLib/Models/SingboxConfig.cs +++ b/v2rayn/v2rayN/ServiceLib/Models/SingboxConfig.cs @@ -1,5 +1,3 @@ -using System.Text.Json.Serialization; - namespace ServiceLib.Models; public class SingboxConfig diff --git a/v2rayn/v2rayN/ServiceLib/Models/SubItem.cs b/v2rayn/v2rayN/ServiceLib/Models/SubItem.cs index cc1fb518c0..612ec15b63 100644 --- a/v2rayn/v2rayN/ServiceLib/Models/SubItem.cs +++ b/v2rayn/v2rayN/ServiceLib/Models/SubItem.cs @@ -1,5 +1,3 @@ -using SQLite; - namespace ServiceLib.Models; [Serializable] diff --git a/v2rayn/v2rayN/ServiceLib/Models/V2rayConfig.cs b/v2rayn/v2rayN/ServiceLib/Models/V2rayConfig.cs index cff3cf8bc2..0f4fd348c3 100644 --- a/v2rayn/v2rayN/ServiceLib/Models/V2rayConfig.cs +++ b/v2rayn/v2rayN/ServiceLib/Models/V2rayConfig.cs @@ -1,5 +1,3 @@ -using System.Text.Json.Serialization; - namespace ServiceLib.Models; public class V2rayConfig diff --git a/v2rayn/v2rayN/ServiceLib/Models/VmessQRCode.cs b/v2rayn/v2rayN/ServiceLib/Models/VmessQRCode.cs index c51d9986fc..a555aae095 100644 --- a/v2rayn/v2rayN/ServiceLib/Models/VmessQRCode.cs +++ b/v2rayn/v2rayN/ServiceLib/Models/VmessQRCode.cs @@ -1,5 +1,3 @@ -using System.Text.Json.Serialization; - namespace ServiceLib.Models; /// diff --git a/v2rayn/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayn/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx index f1f49548a7..5666a55aca 100644 --- a/v2rayn/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx +++ b/v2rayn/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx @@ -121,7 +121,7 @@ 导出分享链接至剪贴板成功 - 请先检查配置文件设置 + 请先检查设置 配置格式不正确 @@ -133,7 +133,7 @@ 下载开始... - 转换配置文件失败 + 转换配置失败 生成默认配置文件失败 @@ -142,10 +142,10 @@ 获取默认配置失败 - 导入自定义配置文件失败 + 导入自定义配置失败 - 读取配置文件失败 + 读取配置失败 请填写正确格式的端口 @@ -265,13 +265,13 @@ 请选择协议 - 请先选择配置文件 + 请先选择配置 - 配置文件去重完成。原数量: {0},现数量: {1}。 + 配置去重完成。原数量: {0},现数量: {1}。 - 是否确定移除配置文件? + 是否确定移除? 客户端配置文件保存在:{0} @@ -283,10 +283,10 @@ 配置成功。 {0} - 成功导入自定义配置文件 + 成功导入自定义配置 - 成功从剪贴板导入 {0} 个配置文件 + 成功从剪贴板导入 {0} 个配置 扫描导入分享链接成功 @@ -385,7 +385,7 @@ 所有 - 请浏览导入配置文件配置 + 请浏览导入配置 测试中... @@ -397,7 +397,7 @@ 本地 - 配置文件过滤器,按回车执行 + 过滤器,按回车执行 检查更新 @@ -478,55 +478,55 @@ 扫描屏幕上的二维码 (Ctrl+S) - 克隆所选配置文件 + 克隆所选 - 移除重复的配置文件 + 移除重复 - 移除所选配置文件 (多选) (Delete) + 移除所选 (多选) (Delete) - 设为活动配置文件 (Enter) + 设为活动 (Enter) 清除所有服务统计数据 - 测试配置文件真连接延迟 (多选) (Ctrl+R) + 测试真连接延迟 (多选) (Ctrl+R) 按测试结果排序 - 测试配置文件速度 (多选) (Ctrl+T) + 测试速度 (多选) (Ctrl+T) - 测试配置文件延迟 Tcping (多选) (Ctrl+O) + 测试延迟 Tcping (多选) (Ctrl+O) - 导出所选配置文件完整配置 + 导出所选完整配置 导出分享链接至剪贴板 (多选) (Ctrl+C) - 添加自定义配置文件 + 添加自定义配置 - 添加 [Shadowsocks] 配置文件 + 添加 [Shadowsocks] - 添加 [SOCKS] 配置文件 + 添加 [SOCKS] - 添加 [Trojan] 配置文件 + 添加 [Trojan] - 添加 [VLESS] 配置文件 + 添加 [VLESS] - 添加 [VMess] 配置文件 + 添加 [VMess] 全选 (Ctrl+A) @@ -691,7 +691,7 @@ Outbound Freedom domainStrategy - 自动调整配置文件列宽在更新订阅后 + 自动调整配置列宽在更新订阅后 检查 Pre-Release 更新 (请谨慎启用) @@ -700,7 +700,7 @@ 例外 - 例外:对于下列字符开头的地址,不使用代理配置文件。使用分号 (;) 分隔。 + 例外:对于下列字符开头的地址,不使用代理配置。使用分号 (;) 分隔。 显示实时速度 (需重启) @@ -751,7 +751,7 @@ 启用安全协议 TLS v1.3 (订阅/检查更新) - 托盘右键菜单配置文件展示数量限制 + 托盘右键菜单配置展示数量限制 开启 UDP @@ -784,7 +784,7 @@ Pac 模式 - 分享配置文件 (Ctrl+F) + 分享 (Ctrl+F) 路由 @@ -916,7 +916,7 @@ 移至订阅分组 - 启用配置文件拖放排序 (需重启) + 启用配置拖放排序 (需重启) 自动刷新 @@ -925,10 +925,10 @@ 跳过测试 - 编辑配置文件 (Ctrl+D) + 编辑 (Ctrl+D) - 主界面双击设为活动配置文件 + 主界面双击设为活动 测试完成 @@ -1033,7 +1033,7 @@ Domain - 添加 [Hysteria2] 配置文件 + 添加 [Hysteria2] Hysteria 最大带宽 (Up/Dw) @@ -1042,19 +1042,19 @@ 使用系统 hosts - 添加 [TUIC] 配置文件 + 添加 [TUIC] 拥塞控制算法 - 前置代理配置文件别名 + 前置代理配置别名 - 落地代理配置文件別名 + 落地代理配置別名 - 请确保配置文件别名存在并唯一 + 请确保配置别名存在并唯一 自动路由 @@ -1075,7 +1075,7 @@ 启用 IPv6 - 添加 [WireGuard] 配置文件 + 添加 [WireGuard] PrivateKey @@ -1108,7 +1108,7 @@ *grpc Authority - 添加 [HTTP] 配置文件 + 添加 [HTTP] 和分组前置代理冲突 @@ -1198,13 +1198,13 @@ 延迟测试 - 当前部分节点延迟测试 + 当前部分延迟测试 刷新 - 设为活动节点 (Enter) + 设为活动 (Enter) Outbound 默认解析策略 @@ -1222,7 +1222,7 @@ 导出分享链接至剪贴板 (多选) Base64 编码 - 导出所选配置文件完整配置至剪贴板 + 导出所选完整配置至剪贴板 显示或隐藏主界面 @@ -1339,7 +1339,7 @@ 多线程测试时的并发数量 - 例外:对于下列地址不使用代理配置文件。使用逗号 (,) 分隔。 + 例外:对于下列地址不使用代理配置。使用逗号 (,) 分隔。 流量探测类型 @@ -1375,31 +1375,31 @@ 会覆盖端口,多组时用逗号 (,) 隔开 - 多配置文件生成策略组 + 多选生成策略组 - 多配置文件随机 Xray + 多选随机 Xray - 多配置文件负载均衡 Xray + 多选负载均衡 Xray - 多配置文件最低延迟 Xray + 多选最低延迟 Xray - 多配置文件最稳定 Xray + 多选最稳定 Xray - 多配置文件最低延迟 sing-box + 多选最低延迟 sing-box - 导出配置文件 + 导出 当前连接信息测试地址 - 可以填写配置文件别名,请确保存在并唯一 + 可以填写配置别名,请确保存在并唯一 密码错误,请重试。 @@ -1408,7 +1408,7 @@ Mldsa65Verify - 添加 [Anytls] 配置文件 + 添加 [Anytls] 远程 DNS @@ -1495,13 +1495,13 @@ 开始解析和处理订阅内容 - 选择配置文件 + 选择配置 默认全局生效,内置 FakeIP 过滤,仅在 sing-box 中生效 - 请至少添加一个配置文件 + 请至少添加一个配置 策略组 @@ -1525,28 +1525,28 @@ 策略组类型 - 添加策略组配置文件 + 添加策略组 - 添加链式代理配置文件 + 添加链式代理 - 添加子配置文件 + 添加子项 - 删除子配置文件 + 删除子项 - 服务器列表 + 子项列表 故障转移 - 多配置文件故障转移 sing-box + 多选故障转移 sing-box - 多配置文件故障转移 Xray + 多选故障转移 Xray 核心 '{0}' 不支持网络类型 '{1}'。 @@ -1567,10 +1567,10 @@ 策略组: - 节点别名 '{0}' 不存在。 + 别名 '{0}' 不存在。 - 组“{0}”为空。请至少添加一个节点。 + 组“{0}”为空。请至少添加一个配置。 {0}属性无效,请检查 @@ -1590,4 +1590,4 @@ 可对 Routing 和 DNS 单独设定规则,ALL 则都生效 - \ No newline at end of file + diff --git a/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs b/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs index 191c7efafb..71f25acd36 100644 --- a/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs +++ b/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs @@ -1,7 +1,3 @@ -using System.Net; -using System.Net.NetworkInformation; -using ServiceLib.Common; - namespace ServiceLib.Services.CoreConfig; public partial class CoreConfigSingboxService(Config config) diff --git a/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxConfigTemplateService.cs b/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxConfigTemplateService.cs index c6bec22b1b..6fe9b35a0f 100644 --- a/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxConfigTemplateService.cs +++ b/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxConfigTemplateService.cs @@ -1,5 +1,3 @@ -using System.Text.Json.Nodes; - namespace ServiceLib.Services.CoreConfig; public partial class CoreConfigSingboxService diff --git a/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs b/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs index 8c31ddae30..f7fb384adf 100644 --- a/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs +++ b/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs @@ -1,6 +1,3 @@ -using System.Net; -using System.Net.NetworkInformation; - namespace ServiceLib.Services.CoreConfig; public partial class CoreConfigV2rayService(Config config) diff --git a/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayConfigTemplateService.cs b/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayConfigTemplateService.cs index 459e77de4c..f53308d131 100644 --- a/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayConfigTemplateService.cs +++ b/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayConfigTemplateService.cs @@ -1,5 +1,3 @@ -using System.Text.Json.Nodes; - namespace ServiceLib.Services.CoreConfig; public partial class CoreConfigV2rayService diff --git a/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs b/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs index 99cda5b7f2..cb731612c7 100644 --- a/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs +++ b/v2rayn/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs @@ -1,7 +1,3 @@ -using System.Text.Json; -using System.Text.Json.Nodes; -using System.Text.Json.Serialization; - namespace ServiceLib.Services.CoreConfig; public partial class CoreConfigV2rayService diff --git a/v2rayn/v2rayN/ServiceLib/Services/DownloadService.cs b/v2rayn/v2rayN/ServiceLib/Services/DownloadService.cs index 9917064695..4b2a7881e3 100644 --- a/v2rayn/v2rayN/ServiceLib/Services/DownloadService.cs +++ b/v2rayn/v2rayN/ServiceLib/Services/DownloadService.cs @@ -1,6 +1,4 @@ -using System.Net; using System.Net.Http.Headers; -using System.Net.Sockets; namespace ServiceLib.Services; diff --git a/v2rayn/v2rayN/ServiceLib/Services/ProcessService.cs b/v2rayn/v2rayN/ServiceLib/Services/ProcessService.cs index 06e27d5236..0f7161e3f9 100644 --- a/v2rayn/v2rayN/ServiceLib/Services/ProcessService.cs +++ b/v2rayn/v2rayN/ServiceLib/Services/ProcessService.cs @@ -1,6 +1,3 @@ -using System.Diagnostics; -using System.Text; - namespace ServiceLib.Services; public class ProcessService : IDisposable diff --git a/v2rayn/v2rayN/ServiceLib/Services/SpeedtestService.cs b/v2rayn/v2rayN/ServiceLib/Services/SpeedtestService.cs index b2cd6a2b58..bb4e9386d4 100644 --- a/v2rayn/v2rayN/ServiceLib/Services/SpeedtestService.cs +++ b/v2rayn/v2rayN/ServiceLib/Services/SpeedtestService.cs @@ -1,8 +1,3 @@ -using System.Collections.Concurrent; -using System.Diagnostics; -using System.Net; -using System.Net.Sockets; - namespace ServiceLib.Services; public class SpeedtestService(Config config, Func updateFunc) diff --git a/v2rayn/v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs b/v2rayn/v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs index d3de6a18c0..2b0f53f190 100644 --- a/v2rayn/v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs +++ b/v2rayn/v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs @@ -1,5 +1,4 @@ using System.Net.WebSockets; -using System.Text; namespace ServiceLib.Services.Statistics; diff --git a/v2rayn/v2rayN/ServiceLib/Services/UpdateService.cs b/v2rayn/v2rayN/ServiceLib/Services/UpdateService.cs index 429c0a62a7..16a6946465 100644 --- a/v2rayn/v2rayN/ServiceLib/Services/UpdateService.cs +++ b/v2rayn/v2rayN/ServiceLib/Services/UpdateService.cs @@ -1,6 +1,3 @@ -using System.Runtime.InteropServices; -using System.Text.RegularExpressions; - namespace ServiceLib.Services; public class UpdateService diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/AddGroupServerViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/AddGroupServerViewModel.cs index 130f447d24..b5bfe80dcc 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/AddGroupServerViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/AddGroupServerViewModel.cs @@ -1,8 +1,3 @@ -using System.Reactive; -using DynamicData.Binding; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.ViewModels; public class AddGroupServerViewModel : MyReactiveObject diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/AddServer2ViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/AddServer2ViewModel.cs index a94ecf74e2..cbc97642cb 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/AddServer2ViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/AddServer2ViewModel.cs @@ -1,7 +1,3 @@ -using System.Reactive; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.ViewModels; public class AddServer2ViewModel : MyReactiveObject diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs index cd2399bce5..addd5bccc0 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs @@ -1,7 +1,3 @@ -using System.Reactive; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.ViewModels; public class AddServerViewModel : MyReactiveObject diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs index 5a96a04d8c..c0eae75f0d 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs @@ -1,7 +1,3 @@ -using System.Reactive; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.ViewModels; public class BackupAndRestoreViewModel : MyReactiveObject diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs index 4c07271243..5267979b43 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs @@ -1,11 +1,3 @@ -using System.Reactive; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Runtime.InteropServices; -using DynamicData.Binding; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.ViewModels; public class CheckUpdateViewModel : MyReactiveObject diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs index d45b8e7d21..dbcc9a79dd 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs @@ -1,11 +1,3 @@ -using System.Reactive; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData; -using DynamicData.Binding; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.ViewModels; public class ClashConnectionsViewModel : MyReactiveObject diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs index bf999d12df..eb67a9d475 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs @@ -1,11 +1,4 @@ -using System.Reactive; using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using DynamicData; -using DynamicData.Binding; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; using static ServiceLib.Models.ClashProviders; using static ServiceLib.Models.ClashProxies; diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs index da21ab35bf..9c559a231e 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs @@ -1,8 +1,3 @@ -using System.Reactive; -using System.Reactive.Linq; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.ViewModels; public class DNSSettingViewModel : MyReactiveObject diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/FullConfigTemplateViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/FullConfigTemplateViewModel.cs index 3619ddef2f..a3907fc5a2 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/FullConfigTemplateViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/FullConfigTemplateViewModel.cs @@ -1,7 +1,3 @@ -using System.Reactive; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.ViewModels; public class FullConfigTemplateViewModel : MyReactiveObject diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/GlobalHotkeySettingViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/GlobalHotkeySettingViewModel.cs index 0acb8726c4..581007f16d 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/GlobalHotkeySettingViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/GlobalHotkeySettingViewModel.cs @@ -1,6 +1,3 @@ -using System.Reactive; -using ReactiveUI; - namespace ServiceLib.ViewModels; public class GlobalHotkeySettingViewModel : MyReactiveObject diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs index 2ad35e32d5..0b72118476 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs @@ -1,8 +1,4 @@ -using System.Reactive; using System.Reactive.Concurrency; -using System.Reactive.Linq; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; namespace ServiceLib.ViewModels; diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs index e9d89b94a1..08a77d3325 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs @@ -1,10 +1,3 @@ -using System.Collections.Concurrent; -using System.Reactive.Linq; -using System.Text; -using System.Text.RegularExpressions; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.ViewModels; public class MsgViewModel : MyReactiveObject diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs index 7f446cf237..d2f334afc3 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs @@ -1,7 +1,3 @@ -using System.Reactive; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.ViewModels; public class OptionSettingViewModel : MyReactiveObject diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs index 8742755e99..7301882cac 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs @@ -1,9 +1,3 @@ -using System.Reactive.Linq; -using DynamicData; -using DynamicData.Binding; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.ViewModels; public class ProfilesSelectViewModel : MyReactiveObject diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs index bf9c4dbf71..1b7b82c7aa 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs @@ -1,12 +1,3 @@ -using System.Reactive; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Text; -using DynamicData; -using DynamicData.Binding; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.ViewModels; public class ProfilesViewModel : MyReactiveObject diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/RoutingRuleDetailsViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/RoutingRuleDetailsViewModel.cs index 36b1babf1a..e984ab6434 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/RoutingRuleDetailsViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/RoutingRuleDetailsViewModel.cs @@ -1,7 +1,3 @@ -using System.Reactive; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.ViewModels; public class RoutingRuleDetailsViewModel : MyReactiveObject diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs index 979d3dc495..445e61bc2f 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs @@ -1,10 +1,3 @@ -using System.Reactive; -using System.Text.Json; -using System.Text.Json.Serialization; -using DynamicData.Binding; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.ViewModels; public class RoutingRuleSettingViewModel : MyReactiveObject diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs index 5237a8d276..8f62f2d028 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs @@ -1,8 +1,3 @@ -using System.Reactive; -using DynamicData.Binding; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.ViewModels; public class RoutingSettingViewModel : MyReactiveObject diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs index 9742cfe6c7..707722adfc 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs @@ -1,11 +1,3 @@ -using System.Reactive; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Text; -using DynamicData.Binding; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.ViewModels; public class StatusBarViewModel : MyReactiveObject diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/SubEditViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/SubEditViewModel.cs index bfbfbbe7f4..344f4ac861 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/SubEditViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/SubEditViewModel.cs @@ -1,7 +1,3 @@ -using System.Reactive; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.ViewModels; public class SubEditViewModel : MyReactiveObject diff --git a/v2rayn/v2rayN/ServiceLib/ViewModels/SubSettingViewModel.cs b/v2rayn/v2rayN/ServiceLib/ViewModels/SubSettingViewModel.cs index 88f33619c1..ce0f6fa728 100644 --- a/v2rayn/v2rayN/ServiceLib/ViewModels/SubSettingViewModel.cs +++ b/v2rayn/v2rayN/ServiceLib/ViewModels/SubSettingViewModel.cs @@ -1,9 +1,3 @@ -using System.Reactive; -using DynamicData; -using DynamicData.Binding; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; - namespace ServiceLib.ViewModels; public class SubSettingViewModel : MyReactiveObject diff --git a/v2rayn/v2rayN/v2rayN.Desktop/App.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/App.axaml.cs index 9f4d605ff4..5da86c6ebd 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/App.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/App.axaml.cs @@ -1,6 +1,3 @@ -using Avalonia; -using Avalonia.Controls.ApplicationLifetimes; -using Avalonia.Markup.Xaml; using v2rayN.Desktop.Views; namespace v2rayN.Desktop; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Base/WindowBase.cs b/v2rayn/v2rayN/v2rayN.Desktop/Base/WindowBase.cs index 10105d2ee4..63b00036c9 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Base/WindowBase.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Base/WindowBase.cs @@ -1,7 +1,3 @@ -using Avalonia; -using Avalonia.Interactivity; -using Avalonia.ReactiveUI; - namespace v2rayN.Desktop.Base; public class WindowBase : ReactiveWindow where TViewModel : class diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs b/v2rayn/v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs index 3c5169cc12..c07029387c 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs @@ -1,6 +1,3 @@ -using Avalonia; -using Avalonia.Media; - namespace v2rayN.Desktop.Common; public static class AppBuilderExtension diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Common/AvaUtils.cs b/v2rayn/v2rayN/v2rayN.Desktop/Common/AvaUtils.cs index f7f03ab3e2..1ef294f62f 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Common/AvaUtils.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Common/AvaUtils.cs @@ -1,9 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Input; using Avalonia.Input.Platform; -using Avalonia.Media.Imaging; -using Avalonia.Platform; namespace v2rayN.Desktop.Common; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Common/TextEditorKeywordHighlighter.cs b/v2rayn/v2rayN/v2rayN.Desktop/Common/TextEditorKeywordHighlighter.cs index af1de3d063..f5e4dc6a2a 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Common/TextEditorKeywordHighlighter.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Common/TextEditorKeywordHighlighter.cs @@ -1,4 +1,3 @@ -using Avalonia.Media; using AvaloniaEdit; using AvaloniaEdit.Document; using AvaloniaEdit.Rendering; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Common/UI.cs b/v2rayn/v2rayN/v2rayN.Desktop/Common/UI.cs index e9ddc36f0b..c17d8947c0 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Common/UI.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Common/UI.cs @@ -1,7 +1,5 @@ -using Avalonia.Controls; using Avalonia.Platform.Storage; using MsBox.Avalonia; -using MsBox.Avalonia.Enums; namespace v2rayN.Desktop.Common; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Converters/DelayColorConverter.cs b/v2rayn/v2rayN/v2rayN.Desktop/Converters/DelayColorConverter.cs index 053645783e..82cd0cf146 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Converters/DelayColorConverter.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Converters/DelayColorConverter.cs @@ -1,6 +1,4 @@ -using System.Globalization; using Avalonia.Data.Converters; -using Avalonia.Media; namespace v2rayN.Desktop.Converters; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/GlobalUsings.cs b/v2rayn/v2rayN/v2rayN.Desktop/GlobalUsings.cs index aede90ccbd..c9a2bc45dd 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/GlobalUsings.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/GlobalUsings.cs @@ -1,3 +1,29 @@ +global using System; +global using System.Collections.Generic; +global using System.Globalization; +global using System.IO; +global using System.Linq; +global using System.Reactive.Disposables; +global using System.Reactive.Linq; +global using System.Text; +global using System.Threading; +global using System.Threading.Tasks; +global using Avalonia; +global using Avalonia.Controls; +global using Avalonia.Controls.ApplicationLifetimes; +global using Avalonia.Input; +global using Avalonia.Interactivity; +global using Avalonia.Markup.Xaml; +global using Avalonia.Media; +global using Avalonia.Media.Imaging; +global using Avalonia.Platform; +global using Avalonia.ReactiveUI; +global using Avalonia.Styling; +global using Avalonia.Threading; +global using ReactiveUI; +global using ReactiveUI.Fody.Helpers; +global using DynamicData; +global using MsBox.Avalonia.Enums; global using ServiceLib; global using ServiceLib.Base; global using ServiceLib.Common; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Manager/HotkeyManager.cs b/v2rayn/v2rayN/v2rayN.Desktop/Manager/HotkeyManager.cs index 5ce6ff6076..f803c538de 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Manager/HotkeyManager.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Manager/HotkeyManager.cs @@ -1,6 +1,3 @@ -using System.Reactive.Linq; -using Avalonia.Input; -using Avalonia.ReactiveUI; using Avalonia.Win32.Input; using GlobalHotKeys; @@ -11,7 +8,7 @@ public sealed class HotkeyManager private static readonly Lazy _instance = new(() => new()); public static HotkeyManager Instance = _instance.Value; private readonly Dictionary _hotkeyTriggerDic = new(); - private HotKeyManager? _hotKeyManager; + private GlobalHotKeys.HotKeyManager? _hotKeyManager; private Config? _config; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Program.cs b/v2rayn/v2rayN/v2rayN.Desktop/Program.cs index 4b53432455..1a0ce38e48 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Program.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Program.cs @@ -1,5 +1,3 @@ -using Avalonia; -using Avalonia.ReactiveUI; using v2rayN.Desktop.Common; namespace v2rayN.Desktop; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs b/v2rayn/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs index ae12fa07f6..2bfa5eaf0a 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs @@ -1,13 +1,6 @@ -using System.Reactive.Linq; -using Avalonia; -using Avalonia.Controls; using Avalonia.Controls.Notifications; using Avalonia.Controls.Primitives; -using Avalonia.Media; -using Avalonia.Styling; using AvaloniaEdit; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; using Semi.Avalonia; namespace v2rayN.Desktop.ViewModels; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml.cs index 2acaee559f..0430a57ce1 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml.cs @@ -1,9 +1,3 @@ -using System.Reactive.Disposables; -using Avalonia.Controls; -using Avalonia.Input; -using Avalonia.Interactivity; -using DynamicData; -using ReactiveUI; using v2rayN.Desktop.Base; namespace v2rayN.Desktop.Views; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml.cs index 4d378bf9f5..2e6731b779 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml.cs @@ -1,6 +1,3 @@ -using System.Reactive.Disposables; -using Avalonia.Interactivity; -using ReactiveUI; using v2rayN.Desktop.Base; using v2rayN.Desktop.Common; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs index a42ab3875a..255ace7511 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs @@ -1,7 +1,3 @@ -using System.Reactive.Disposables; -using Avalonia.Controls; -using Avalonia.Interactivity; -using ReactiveUI; using v2rayN.Desktop.Base; namespace v2rayN.Desktop.Views; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml.cs index 60a777ad72..391f2892a9 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml.cs @@ -1,8 +1,3 @@ -using System.Reactive.Disposables; -using Avalonia.Controls; -using Avalonia.Interactivity; -using Avalonia.ReactiveUI; -using ReactiveUI; using v2rayN.Desktop.Common; namespace v2rayN.Desktop.Views; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs index 9567c1fdb3..a994235cd2 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs @@ -1,7 +1,3 @@ -using System.Reactive.Disposables; -using Avalonia.ReactiveUI; -using ReactiveUI; - namespace v2rayN.Desktop.Views; public partial class CheckUpdateView : ReactiveUserControl diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml.cs index 76a0fd1d75..1c39df7226 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml.cs @@ -1,9 +1,3 @@ -using System.Reactive.Disposables; -using Avalonia.Controls; -using Avalonia.Interactivity; -using Avalonia.ReactiveUI; -using ReactiveUI; - namespace v2rayN.Desktop.Views; public partial class ClashConnectionsView : ReactiveUserControl diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml.cs index c8e7aeba65..9a86846bfb 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml.cs @@ -1,9 +1,3 @@ -using System.Reactive.Disposables; -using Avalonia.Input; -using Avalonia.ReactiveUI; -using DynamicData; -using ReactiveUI; - namespace v2rayN.Desktop.Views; public partial class ClashProxiesView : ReactiveUserControl diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs index 2a472e3035..71c3999c91 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs @@ -1,8 +1,3 @@ -using System.Reactive.Disposables; -using System.Reactive.Linq; -using Avalonia.Controls; -using Avalonia.Interactivity; -using ReactiveUI; using v2rayN.Desktop.Base; namespace v2rayN.Desktop.Views; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs index 97bc4afbfa..1a8d5061a7 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs @@ -1,6 +1,3 @@ -using System.Reactive.Disposables; -using Avalonia.Interactivity; -using ReactiveUI; using v2rayN.Desktop.Base; namespace v2rayN.Desktop.Views; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs index 18ee0f1b64..9b332695ed 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs @@ -1,9 +1,3 @@ -using System.Reactive.Disposables; -using System.Text; -using Avalonia.Controls; -using Avalonia.Input; -using Avalonia.Interactivity; -using ReactiveUI; using v2rayN.Desktop.Base; using v2rayN.Desktop.Manager; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml b/v2rayn/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml index b66a98a483..e02d0ba532 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml @@ -25,7 +25,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -90,39 +90,15 @@ - - - - - - - + - - - - - - - + - - - - - - - + - - - - - - - + diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs index 0fa30a521f..c3bba36388 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs @@ -1,15 +1,5 @@ -using System.Reactive.Disposables; -using System.Reactive.Linq; -using Avalonia; -using Avalonia.Controls; -using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Controls.Notifications; -using Avalonia.Input; -using Avalonia.Interactivity; -using Avalonia.Threading; using DialogHostAvalonia; -using MsBox.Avalonia.Enums; -using ReactiveUI; using v2rayN.Desktop.Base; using v2rayN.Desktop.Common; using v2rayN.Desktop.Manager; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/MsgView.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/MsgView.axaml.cs index 1f7665ca65..cc9bf46495 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/MsgView.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/MsgView.axaml.cs @@ -1,9 +1,3 @@ -using System.Reactive.Disposables; -using Avalonia.Interactivity; -using Avalonia.Media; -using Avalonia.ReactiveUI; -using Avalonia.Threading; -using ReactiveUI; using v2rayN.Desktop.Common; namespace v2rayN.Desktop.Views; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs index edcbef0b9f..3913b54c49 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs @@ -1,7 +1,3 @@ -using System.Reactive.Disposables; -using Avalonia.Controls; -using Avalonia.Interactivity; -using ReactiveUI; using v2rayN.Desktop.Base; namespace v2rayN.Desktop.Views; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs index ac562758c0..b71b61b0a7 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs @@ -1,10 +1,4 @@ -using System.Reactive.Disposables; -using Avalonia; -using Avalonia.Controls; -using Avalonia.Input; -using Avalonia.Interactivity; using Avalonia.VisualTree; -using ReactiveUI; using v2rayN.Desktop.Base; namespace v2rayN.Desktop.Views; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml b/v2rayn/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml index 89bcbb280d..a0f5af1b39 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml @@ -92,22 +92,11 @@ - + + - - - - - - - - - - - - @@ -140,12 +129,22 @@ + + + + + + + + + + diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs index c6c16c86d3..09d0952c21 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs @@ -1,13 +1,4 @@ -using System.Reactive.Disposables; -using System.Reactive.Linq; -using Avalonia.Controls; -using Avalonia.Input; -using Avalonia.Interactivity; -using Avalonia.ReactiveUI; -using Avalonia.Threading; using DialogHostAvalonia; -using MsBox.Avalonia.Enums; -using ReactiveUI; using v2rayN.Desktop.Common; namespace v2rayN.Desktop.Views; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs index 05d2dd8396..3f1e714947 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs @@ -1,7 +1,3 @@ -using Avalonia.Controls; -using Avalonia.Media.Imaging; -using Avalonia.Threading; - namespace v2rayN.Desktop.Views; public partial class QrcodeView : UserControl diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs index eb947b114a..6c3f663d51 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs @@ -1,7 +1,3 @@ -using System.Reactive.Disposables; -using Avalonia.Controls; -using Avalonia.Interactivity; -using ReactiveUI; using v2rayN.Desktop.Base; namespace v2rayN.Desktop.Views; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml.cs index 78ec883364..80a13d5a12 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml.cs @@ -1,9 +1,3 @@ -using System.Reactive.Disposables; -using Avalonia.Controls; -using Avalonia.Input; -using Avalonia.Interactivity; -using MsBox.Avalonia.Enums; -using ReactiveUI; using v2rayN.Desktop.Base; using v2rayN.Desktop.Common; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs index 50a79d180b..582bdeeef5 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs @@ -1,9 +1,3 @@ -using System.Reactive.Disposables; -using Avalonia.Controls; -using Avalonia.Input; -using Avalonia.Interactivity; -using MsBox.Avalonia.Enums; -using ReactiveUI; using v2rayN.Desktop.Base; using v2rayN.Desktop.Common; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs index f59eccb16c..e5ab59c9a1 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs @@ -1,11 +1,4 @@ -using System.Reactive.Disposables; -using Avalonia; -using Avalonia.Controls; -using Avalonia.Controls.ApplicationLifetimes; -using Avalonia.ReactiveUI; -using Avalonia.Threading; using DialogHostAvalonia; -using ReactiveUI; using v2rayN.Desktop.Common; namespace v2rayN.Desktop.Views; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs index e07540b211..a25dcd287c 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs @@ -1,7 +1,3 @@ -using System.Reactive.Disposables; -using Avalonia; -using Avalonia.Interactivity; -using ReactiveUI; using v2rayN.Desktop.Base; namespace v2rayN.Desktop.Views; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs index d563aeb16c..cf0f5d75dd 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs @@ -1,11 +1,4 @@ -using System.Reactive.Disposables; -using Avalonia.Controls; -using Avalonia.Input; -using Avalonia.Interactivity; using DialogHostAvalonia; -using DynamicData; -using MsBox.Avalonia.Enums; -using ReactiveUI; using v2rayN.Desktop.Base; using v2rayN.Desktop.Common; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs index a87d0debea..cb5182eb12 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs @@ -1,5 +1,3 @@ -using Avalonia.Controls; -using Avalonia.Threading; using CliWrap.Buffered; using DialogHostAvalonia; diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs index b1f16b7e5e..68bde40963 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs @@ -1,7 +1,3 @@ -using System.Reactive.Disposables; -using Avalonia; -using Avalonia.ReactiveUI; -using ReactiveUI; using v2rayN.Desktop.ViewModels; namespace v2rayN.Desktop.Views; diff --git a/v2rayn/v2rayN/v2rayN/App.xaml.cs b/v2rayn/v2rayN/v2rayN/App.xaml.cs index b37b69861e..de9a5370c4 100644 --- a/v2rayn/v2rayN/v2rayN/App.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/App.xaml.cs @@ -1,7 +1,3 @@ -using System.Diagnostics; -using System.Windows; -using System.Windows.Threading; - namespace v2rayN; /// diff --git a/v2rayn/v2rayN/v2rayN/AssemblyInfo.cs b/v2rayn/v2rayN/v2rayN/AssemblyInfo.cs index 4f943deb82..cb66e3c103 100644 --- a/v2rayn/v2rayN/v2rayN/AssemblyInfo.cs +++ b/v2rayn/v2rayN/v2rayN/AssemblyInfo.cs @@ -1,5 +1,3 @@ -using System.Windows; - [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located //(used if a resource is not found in the page, @@ -7,4 +5,4 @@ using System.Windows; ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located //(used if a resource is not found in the page, // app, or any theme specific resource dictionaries) -)] \ No newline at end of file +)] diff --git a/v2rayn/v2rayN/v2rayN/Base/WindowBase.cs b/v2rayn/v2rayN/v2rayN/Base/WindowBase.cs index 1c5b8cdaa9..aa6401e527 100644 --- a/v2rayn/v2rayN/v2rayN/Base/WindowBase.cs +++ b/v2rayn/v2rayN/v2rayN/Base/WindowBase.cs @@ -1,6 +1,3 @@ -using System.Windows; -using ReactiveUI; - namespace v2rayN.Base; public class WindowBase : ReactiveWindow where TViewModel : class diff --git a/v2rayn/v2rayN/v2rayN/Common/QRCodeUtils.cs b/v2rayn/v2rayN/v2rayN/Common/QRCodeUtils.cs index ce8eec5e30..6b0bc38d95 100644 --- a/v2rayn/v2rayN/v2rayN/Common/QRCodeUtils.cs +++ b/v2rayn/v2rayN/v2rayN/Common/QRCodeUtils.cs @@ -1,7 +1,4 @@ -using System.Collections; using System.Drawing; -using System.Windows; -using System.Windows.Interop; using System.Windows.Media; using System.Windows.Media.Imaging; diff --git a/v2rayn/v2rayN/v2rayN/Common/UI.cs b/v2rayn/v2rayN/v2rayN/Common/UI.cs index 60d81a4d22..1d5e860c53 100644 --- a/v2rayn/v2rayN/v2rayN/Common/UI.cs +++ b/v2rayn/v2rayN/v2rayN/Common/UI.cs @@ -1,4 +1,3 @@ -using System.Windows; using Microsoft.Win32; namespace v2rayN; diff --git a/v2rayn/v2rayN/v2rayN/Common/WindowsUtils.cs b/v2rayn/v2rayN/v2rayN/Common/WindowsUtils.cs index 346c77637c..807782689f 100644 --- a/v2rayn/v2rayN/v2rayN/Common/WindowsUtils.cs +++ b/v2rayn/v2rayN/v2rayN/Common/WindowsUtils.cs @@ -1,7 +1,4 @@ using System.Drawing; -using System.Runtime.InteropServices; -using System.Windows; -using System.Windows.Interop; using System.Windows.Media; using System.Windows.Media.Imaging; using Microsoft.Win32; diff --git a/v2rayn/v2rayN/v2rayN/Converters/DelayColorConverter.cs b/v2rayn/v2rayN/v2rayN/Converters/DelayColorConverter.cs index cab9828ee7..8fb8e23984 100644 --- a/v2rayn/v2rayN/v2rayN/Converters/DelayColorConverter.cs +++ b/v2rayn/v2rayN/v2rayN/Converters/DelayColorConverter.cs @@ -1,4 +1,3 @@ -using System.Windows.Data; using System.Windows.Media; namespace v2rayN.Converters; diff --git a/v2rayn/v2rayN/v2rayN/Converters/InverseBooleanConverter.cs b/v2rayn/v2rayN/v2rayN/Converters/InverseBooleanConverter.cs index 29b212d7d0..a83b4ebc47 100644 --- a/v2rayn/v2rayN/v2rayN/Converters/InverseBooleanConverter.cs +++ b/v2rayn/v2rayN/v2rayN/Converters/InverseBooleanConverter.cs @@ -1,6 +1,3 @@ -using System.Globalization; -using System.Windows.Data; - namespace v2rayN.Converters; [ValueConversion(typeof(bool), typeof(bool))] diff --git a/v2rayn/v2rayN/v2rayN/GlobalUsings.cs b/v2rayn/v2rayN/v2rayN/GlobalUsings.cs index aede90ccbd..21d8dbab3e 100644 --- a/v2rayn/v2rayN/v2rayN/GlobalUsings.cs +++ b/v2rayn/v2rayN/v2rayN/GlobalUsings.cs @@ -1,3 +1,26 @@ +global using System; +global using System.Collections; +global using System.Collections.Generic; +global using System.ComponentModel; +global using System.Diagnostics; +global using System.Globalization; +global using System.IO; +global using System.Linq; +global using System.Reactive.Disposables; +global using System.Reactive.Linq; +global using System.Runtime.InteropServices; +global using System.Text; +global using System.Threading; +global using System.Threading.Tasks; +global using System.Windows; +global using System.Windows.Data; +global using System.Windows.Input; +global using System.Windows.Interop; +global using System.Windows.Threading; +global using DynamicData; +global using DynamicData.Binding; +global using ReactiveUI; +global using ReactiveUI.Fody.Helpers; global using ServiceLib; global using ServiceLib.Base; global using ServiceLib.Common; diff --git a/v2rayn/v2rayN/v2rayN/Manager/HotkeyManager.cs b/v2rayn/v2rayN/v2rayN/Manager/HotkeyManager.cs index 538ce60556..dc9eec8e35 100644 --- a/v2rayn/v2rayN/v2rayN/Manager/HotkeyManager.cs +++ b/v2rayn/v2rayN/v2rayN/Manager/HotkeyManager.cs @@ -1,10 +1,3 @@ -using System.ComponentModel; -using System.Runtime.InteropServices; -using System.Text; -using System.Windows; -using System.Windows.Input; -using System.Windows.Interop; - namespace v2rayN.Manager; public sealed class HotkeyManager diff --git a/v2rayn/v2rayN/v2rayN/Manager/WindowsManager.cs b/v2rayn/v2rayN/v2rayN/Manager/WindowsManager.cs index db5818f9a9..c3bb98d731 100644 --- a/v2rayn/v2rayN/v2rayN/Manager/WindowsManager.cs +++ b/v2rayn/v2rayN/v2rayN/Manager/WindowsManager.cs @@ -1,5 +1,4 @@ using System.Drawing; -using System.IO; using System.Windows.Media.Imaging; namespace v2rayN.Manager; diff --git a/v2rayn/v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs b/v2rayn/v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs index 382047787f..b92f2ff253 100644 --- a/v2rayn/v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs +++ b/v2rayn/v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs @@ -1,14 +1,6 @@ -using System.Reactive.Linq; -using System.Runtime.InteropServices; -using System.Windows; -using System.Windows.Interop; -using DynamicData; -using DynamicData.Binding; using MaterialDesignColors; using MaterialDesignColors.ColorManipulation; using MaterialDesignThemes.Wpf; -using ReactiveUI; -using ReactiveUI.Fody.Helpers; namespace v2rayN.ViewModels; diff --git a/v2rayn/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml.cs index 84cdec4249..a08d796249 100644 --- a/v2rayn/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml.cs @@ -1,9 +1,3 @@ -using System.Reactive.Disposables; -using System.Windows; -using System.Windows.Input; -using DynamicData; -using ReactiveUI; - namespace v2rayN.Views; public partial class AddGroupServerWindow diff --git a/v2rayn/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs index b9c62dcdd7..0f429a49fb 100644 --- a/v2rayn/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs @@ -1,7 +1,3 @@ -using System.Reactive.Disposables; -using System.Windows; -using ReactiveUI; - namespace v2rayN.Views; public partial class AddServer2Window diff --git a/v2rayn/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs index 2c0406d547..65383c32e9 100644 --- a/v2rayn/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs @@ -1,7 +1,4 @@ -using System.Reactive.Disposables; -using System.Windows; using System.Windows.Controls; -using ReactiveUI; namespace v2rayN.Views; diff --git a/v2rayn/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs index c69fbe14f3..cc5a3610ba 100644 --- a/v2rayn/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs @@ -1,7 +1,3 @@ -using System.Reactive.Disposables; -using System.Windows; -using ReactiveUI; - namespace v2rayN.Views; public partial class BackupAndRestoreView diff --git a/v2rayn/v2rayN/v2rayN/Views/CheckUpdateView.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/CheckUpdateView.xaml.cs index cf53fc1a31..b6adb2f5d9 100644 --- a/v2rayn/v2rayN/v2rayN/Views/CheckUpdateView.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/CheckUpdateView.xaml.cs @@ -1,6 +1,3 @@ -using System.Reactive.Disposables; -using ReactiveUI; - namespace v2rayN.Views; public partial class CheckUpdateView diff --git a/v2rayn/v2rayN/v2rayN/Views/ClashConnectionsView.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/ClashConnectionsView.xaml.cs index da1795bd95..0a6245a985 100644 --- a/v2rayn/v2rayN/v2rayN/Views/ClashConnectionsView.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/ClashConnectionsView.xaml.cs @@ -1,7 +1,4 @@ -using System.Reactive.Disposables; -using System.Windows; using System.Windows.Controls; -using ReactiveUI; namespace v2rayN.Views; diff --git a/v2rayn/v2rayN/v2rayN/Views/ClashProxiesView.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/ClashProxiesView.xaml.cs index 23943da190..f475c84acc 100644 --- a/v2rayn/v2rayN/v2rayN/Views/ClashProxiesView.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/ClashProxiesView.xaml.cs @@ -1,7 +1,3 @@ -using System.Reactive.Disposables; -using System.Windows.Input; -using ReactiveUI; - namespace v2rayN.Views; /// diff --git a/v2rayn/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs index 00c7d0fbe6..ad99b3571e 100644 --- a/v2rayn/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs @@ -1,8 +1,3 @@ -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Windows; -using ReactiveUI; - namespace v2rayN.Views; public partial class DNSSettingWindow diff --git a/v2rayn/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs index 7f3c3341a4..e0cd8b145b 100644 --- a/v2rayn/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs @@ -1,7 +1,3 @@ -using System.Reactive.Disposables; -using System.Windows; -using ReactiveUI; - namespace v2rayN.Views; public partial class FullConfigTemplateWindow diff --git a/v2rayn/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs index b23b28608d..f71fe7cc48 100644 --- a/v2rayn/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs @@ -1,9 +1,4 @@ -using System.Reactive.Disposables; -using System.Text; -using System.Windows; using System.Windows.Controls; -using System.Windows.Input; -using ReactiveUI; using v2rayN.Manager; namespace v2rayN.Views; diff --git a/v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml index 83d267e78c..908eb710b3 100644 --- a/v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml +++ b/v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml @@ -45,7 +45,7 @@ KeyboardNavigation.TabNavigation="Continue" Style="{StaticResource MaterialDesignToolBar}"> - + - + - + @@ -249,7 +249,7 @@ @@ -266,7 +266,7 @@ @@ -283,7 +283,7 @@ @@ -300,7 +300,7 @@ diff --git a/v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml.cs index 3fccddf075..9dc818eecc 100644 --- a/v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml.cs @@ -1,13 +1,6 @@ -using System.ComponentModel; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Windows; using System.Windows.Controls; -using System.Windows.Input; -using System.Windows.Interop; using System.Windows.Media; using MaterialDesignThemes.Wpf; -using ReactiveUI; using v2rayN.Manager; namespace v2rayN.Views; diff --git a/v2rayn/v2rayN/v2rayN/Views/MsgView.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/MsgView.xaml.cs index 449597cc77..61fbe46957 100644 --- a/v2rayn/v2rayN/v2rayN/Views/MsgView.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/MsgView.xaml.cs @@ -1,8 +1,3 @@ -using System.Reactive.Disposables; -using System.Windows; -using System.Windows.Threading; -using ReactiveUI; - namespace v2rayN.Views; public partial class MsgView diff --git a/v2rayn/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs index 31b43d9a54..1824e2a51c 100644 --- a/v2rayn/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs @@ -1,9 +1,4 @@ -using System.Globalization; -using System.IO; -using System.Reactive.Disposables; -using System.Windows; using System.Windows.Media; -using ReactiveUI; namespace v2rayN.Views; diff --git a/v2rayn/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs index 6e3369df05..1b8419a04d 100644 --- a/v2rayn/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs @@ -1,9 +1,5 @@ -using System.Reactive.Disposables; -using System.Windows; using System.Windows.Controls; using System.Windows.Controls.Primitives; -using System.Windows.Input; -using ReactiveUI; using v2rayN.Base; namespace v2rayN.Views; diff --git a/v2rayn/v2rayN/v2rayN/Views/ProfilesView.xaml b/v2rayn/v2rayN/v2rayN/Views/ProfilesView.xaml index e81ee0684e..495dfb1b45 100644 --- a/v2rayn/v2rayN/v2rayN/Views/ProfilesView.xaml +++ b/v2rayn/v2rayN/v2rayN/Views/ProfilesView.xaml @@ -100,14 +100,18 @@ + + Header="{x:Static resx:ResUI.menuCopyServer}" /> - - - - - - - - - - - - + + + + + + + + + + + diff --git a/v2rayn/v2rayN/v2rayN/Views/ProfilesView.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/ProfilesView.xaml.cs index fc8d027f0a..76d73a2662 100644 --- a/v2rayn/v2rayN/v2rayN/Views/ProfilesView.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/ProfilesView.xaml.cs @@ -1,13 +1,7 @@ -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Windows; using System.Windows.Controls; using System.Windows.Controls.Primitives; -using System.Windows.Input; using System.Windows.Media; -using System.Windows.Threading; using MaterialDesignThemes.Wpf; -using ReactiveUI; using v2rayN.Base; using Point = System.Windows.Point; diff --git a/v2rayn/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs index 220f58b203..0586067af3 100644 --- a/v2rayn/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs @@ -1,7 +1,3 @@ -using System.Reactive.Disposables; -using System.Windows; -using ReactiveUI; - namespace v2rayN.Views; public partial class RoutingRuleDetailsWindow diff --git a/v2rayn/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs index d69146d938..153aaedcbb 100644 --- a/v2rayn/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs @@ -1,8 +1,3 @@ -using System.Reactive.Disposables; -using System.Windows; -using System.Windows.Input; -using ReactiveUI; - namespace v2rayN.Views; public partial class RoutingRuleSettingWindow diff --git a/v2rayn/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs index e597715b88..565897b0d7 100644 --- a/v2rayn/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs @@ -1,8 +1,3 @@ -using System.Reactive.Disposables; -using System.Windows; -using System.Windows.Input; -using ReactiveUI; - namespace v2rayN.Views; public partial class RoutingSettingWindow diff --git a/v2rayn/v2rayN/v2rayN/Views/StatusBarView.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/StatusBarView.xaml.cs index 1d80a694c9..906308ab80 100644 --- a/v2rayn/v2rayN/v2rayN/Views/StatusBarView.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/StatusBarView.xaml.cs @@ -1,8 +1,3 @@ -using System.Reactive.Disposables; -using System.Windows; -using System.Windows.Input; -using System.Windows.Threading; -using ReactiveUI; using v2rayN.Manager; namespace v2rayN.Views; diff --git a/v2rayn/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs index 8bd7d6c528..488420faab 100644 --- a/v2rayn/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs @@ -1,7 +1,3 @@ -using System.Reactive.Disposables; -using System.Windows; -using ReactiveUI; - namespace v2rayN.Views; public partial class SubEditWindow diff --git a/v2rayn/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs index 9e8d0c7604..f44739d3ae 100644 --- a/v2rayn/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs @@ -1,9 +1,4 @@ -using System.ComponentModel; -using System.Reactive.Disposables; -using System.Windows; -using System.Windows.Input; using MaterialDesignThemes.Wpf; -using ReactiveUI; namespace v2rayN.Views; diff --git a/v2rayn/v2rayN/v2rayN/Views/ThemeSettingView.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/ThemeSettingView.xaml.cs index 93d634de1f..0aacbdbba1 100644 --- a/v2rayn/v2rayN/v2rayN/Views/ThemeSettingView.xaml.cs +++ b/v2rayn/v2rayN/v2rayN/Views/ThemeSettingView.xaml.cs @@ -1,5 +1,3 @@ -using System.Reactive.Disposables; -using ReactiveUI; using v2rayN.ViewModels; namespace v2rayN.Views; diff --git a/yt-dlp/.github/FUNDING.yml b/yt-dlp/.github/FUNDING.yml index 04de087085..ee89f27d43 100644 --- a/yt-dlp/.github/FUNDING.yml +++ b/yt-dlp/.github/FUNDING.yml @@ -10,4 +10,4 @@ liberapay: # Replace with a single Liberapay username issuehunt: # Replace with a single IssueHunt username otechie: # Replace with a single Otechie username -custom: ['https://github.com/yt-dlp/yt-dlp/blob/master/Collaborators.md#collaborators'] +custom: ['https://github.com/yt-dlp/yt-dlp/blob/master/Maintainers.md#maintainers'] diff --git a/yt-dlp/.github/workflows/release.yml b/yt-dlp/.github/workflows/release.yml index 6bb429f269..ee93d499ac 100644 --- a/yt-dlp/.github/workflows/release.yml +++ b/yt-dlp/.github/workflows/release.yml @@ -259,7 +259,7 @@ jobs: "[![Discord](https://img.shields.io/discord/807245652072857610?color=blue&labelColor=555555&label=&logo=discord&style=for-the-badge)]" \ "(https://discord.gg/H5MNcFW63r \"Discord\") " \ "[![Donate](https://img.shields.io/badge/_-Donate-red.svg?logo=githubsponsors&labelColor=555555&style=for-the-badge)]" \ - "(https://github.com/${BASE_REPO}/blob/master/Collaborators.md#collaborators \"Donate\") " \ + "(https://github.com/${BASE_REPO}/blob/master/Maintainers.md#maintainers \"Donate\") " \ "[![Documentation](https://img.shields.io/badge/-Docs-brightgreen.svg?style=for-the-badge&logo=GitBook&labelColor=555555)]" \ "(https://github.com/${REPOSITORY}${DOCS_PATH}#readme \"Documentation\") " > ./RELEASE_NOTES if [[ "${TARGET_REPO}" == "${BASE_REPO}" ]]; then diff --git a/yt-dlp/CONTRIBUTORS b/yt-dlp/CONTRIBUTORS index 482c4103f3..888d48d561 100644 --- a/yt-dlp/CONTRIBUTORS +++ b/yt-dlp/CONTRIBUTORS @@ -1,10 +1,10 @@ pukkandan (owner) -shirt-dev (collaborator) -coletdjnz/colethedj (collaborator) -Ashish0804 (collaborator) -bashonly (collaborator) -Grub4K (collaborator) -seproDev (collaborator) +shirt-dev (maintainer) +coletdjnz (maintainer) +Ashish0804 (maintainer) +bashonly (maintainer) +Grub4K (maintainer) +seproDev (maintainer) h-h-h-h pauldubois98 nixxo diff --git a/yt-dlp/Collaborators.md b/yt-dlp/Maintainers.md similarity index 54% rename from yt-dlp/Collaborators.md rename to yt-dlp/Maintainers.md index ee748eb7fd..8b52daf5fa 100644 --- a/yt-dlp/Collaborators.md +++ b/yt-dlp/Maintainers.md @@ -1,59 +1,34 @@ -# Collaborators +# Maintainers -This is a list of the collaborators of the project and their major contributions. See the [Changelog](Changelog.md) for more details. +This file lists the maintainers of yt-dlp and their major contributions. See the [Changelog](Changelog.md) for more details. You can also find lists of all [contributors of yt-dlp](CONTRIBUTORS) and [authors of youtube-dl](https://github.com/ytdl-org/youtube-dl/blob/master/AUTHORS) +## Core Maintainers -## [pukkandan](https://github.com/pukkandan) +Core Maintainers are responsible for reviewing and merging contributions, publishing releases, and steering the overall direction of the project. -[![ko-fi](https://img.shields.io/badge/_-Ko--fi-red.svg?logo=kofi&labelColor=555555&style=for-the-badge)](https://ko-fi.com/pukkandan) -[![gh-sponsor](https://img.shields.io/badge/_-Github-white.svg?logo=github&labelColor=555555&style=for-the-badge)](https://github.com/sponsors/pukkandan) +**You can contact the core maintainers via `maintainers@yt-dlp.org`.** -* Owner of the fork - - - -## [shirt](https://github.com/shirt-dev) - -[![ko-fi](https://img.shields.io/badge/_-Ko--fi-red.svg?logo=kofi&labelColor=555555&style=for-the-badge)](https://ko-fi.com/shirt) - -* Multithreading (`-N`) and aria2c support for fragment downloads -* Support for media initialization and discontinuity in HLS -* The self-updater (`-U`) - - - -## [coletdjnz](https://github.com/coletdjnz) +### [coletdjnz](https://github.com/coletdjnz) [![gh-sponsor](https://img.shields.io/badge/_-Github-white.svg?logo=github&labelColor=555555&style=for-the-badge)](https://github.com/sponsors/coletdjnz) -* Improved plugin architecture -* Rewrote the networking infrastructure, implemented support for `requests` -* YouTube improvements including: age-gate bypass, private playlists, multiple-clients (to avoid throttling) and a lot of under-the-hood improvements -* Added support for new websites YoutubeWebArchive, MainStreaming, PRX, nzherald, Mediaklikk, StarTV etc -* Improved/fixed support for Patreon, panopto, gfycat, itv, pbs, SouthParkDE etc +* Overhauled the networking stack and implemented support for `requests` and `curl_cffi` (`--impersonate`) HTTP clients +* Reworked the plugin architecture to support installing plugins across all yt-dlp distributions (exe, pip, etc.) +* Maintains support for YouTube +* Added and fixed support for various other sites + +### [bashonly](https://github.com/bashonly) + +* Rewrote and maintains the build/release workflows and the self-updater: executables, automated/nightly/master releases, `--update-to` +* Overhauled external downloader cookie handling +* Added `--cookies-from-browser` support for Firefox containers +* Overhauled and maintains support for sites like Youtube, Vimeo, Twitter, TikTok, etc +* Added support for sites like Dacast, Kick, Loom, SproutVideo, Triller, Weverse, etc - -## [Ashish0804](https://github.com/Ashish0804) [Inactive] - -[![ko-fi](https://img.shields.io/badge/_-Ko--fi-red.svg?logo=kofi&labelColor=555555&style=for-the-badge)](https://ko-fi.com/ashish0804) - -* Added support for new websites BiliIntl, DiscoveryPlusIndia, OlympicsReplay, PlanetMarathi, ShemarooMe, Utreon, Zee5 etc -* Added playlist/series downloads for Hotstar, ParamountPlus, Rumble, SonyLIV, Trovo, TubiTv, Voot etc -* Improved/fixed support for HiDive, HotStar, Hungama, LBRY, LinkedInLearning, Mxplayer, SonyLiv, TV2, Vimeo, VLive etc - - -## [bashonly](https://github.com/bashonly) - -* `--update-to`, self-updater rewrite, automated/nightly/master releases -* `--cookies-from-browser` support for Firefox containers, external downloader cookie handling overhaul -* Added support for new websites like Dacast, Kick, NBCStations, Triller, VideoKen, Weverse, WrestleUniverse etc -* Improved/fixed support for Anvato, Brightcove, Reddit, SlidesLive, TikTok, Twitter, Vimeo etc - - -## [Grub4K](https://github.com/Grub4K) +### [Grub4K](https://github.com/Grub4K) [![gh-sponsor](https://img.shields.io/badge/_-Github-white.svg?logo=github&labelColor=555555&style=for-the-badge)](https://github.com/sponsors/Grub4K) [![ko-fi](https://img.shields.io/badge/_-Ko--fi-red.svg?logo=kofi&labelColor=555555&style=for-the-badge)](https://ko-fi.com/Grub4K) @@ -63,8 +38,48 @@ You can also find lists of all [contributors of yt-dlp](CONTRIBUTORS) and [autho * Improved/fixed/added Bundestag, crunchyroll, pr0gramm, Twitter, WrestleUniverse etc -## [sepro](https://github.com/seproDev) +### [sepro](https://github.com/seproDev) * UX improvements: Warn when ffmpeg is missing, warn when double-clicking exe * Code cleanup: Remove dead extractors, mark extractors as broken, enable/apply ruff rules * Improved/fixed/added ArdMediathek, DRTV, Floatplane, MagentaMusik, Naver, Nebula, OnDemandKorea, Vbox7 etc + + +## Inactive Core Maintainers + +### [pukkandan](https://github.com/pukkandan) + +[![ko-fi](https://img.shields.io/badge/_-Ko--fi-red.svg?logo=kofi&labelColor=555555&style=for-the-badge)](https://ko-fi.com/pukkandan) +[![gh-sponsor](https://img.shields.io/badge/_-Github-white.svg?logo=github&labelColor=555555&style=for-the-badge)](https://github.com/sponsors/pukkandan) + +* Founder of the fork +* Lead Maintainer from 2021-2024 + + +### [shirt](https://github.com/shirt-dev) + +[![ko-fi](https://img.shields.io/badge/_-Ko--fi-red.svg?logo=kofi&labelColor=555555&style=for-the-badge)](https://ko-fi.com/shirt) + +* Multithreading (`-N`) and aria2c support for fragment downloads +* Support for media initialization and discontinuity in HLS +* The self-updater (`-U`) + + +### [Ashish0804](https://github.com/Ashish0804) + +[![ko-fi](https://img.shields.io/badge/_-Ko--fi-red.svg?logo=kofi&labelColor=555555&style=for-the-badge)](https://ko-fi.com/ashish0804) + +* Added support for new websites BiliIntl, DiscoveryPlusIndia, OlympicsReplay, PlanetMarathi, ShemarooMe, Utreon, Zee5 etc +* Added playlist/series downloads for Hotstar, ParamountPlus, Rumble, SonyLIV, Trovo, TubiTv, Voot etc +* Improved/fixed support for HiDive, HotStar, Hungama, LBRY, LinkedInLearning, Mxplayer, SonyLiv, TV2, Vimeo, VLive etc + +## Triage Maintainers + +Triage Maintainers are frequent contributors who can manage issues and pull requests. + +- [gamer191](https://github.com/gamer191) +- [garret1317](https://github.com/garret1317) +- [pzhlkj6612](https://github.com/pzhlkj6612) +- [DTrombett](https://github.com/dtrombett) +- [doe1080](https://github.com/doe1080) +- [grqz](https://github.com/grqz) diff --git a/yt-dlp/Makefile b/yt-dlp/Makefile index 404250c815..290955d209 100644 --- a/yt-dlp/Makefile +++ b/yt-dlp/Makefile @@ -157,7 +157,7 @@ yt-dlp.tar.gz: all --exclude '.git' \ -- \ README.md supportedsites.md Changelog.md LICENSE \ - CONTRIBUTING.md Collaborators.md CONTRIBUTORS AUTHORS \ + CONTRIBUTING.md Maintainers.md CONTRIBUTORS AUTHORS \ Makefile yt-dlp.1 README.txt completions .gitignore \ yt-dlp yt_dlp pyproject.toml devscripts test diff --git a/yt-dlp/README.md b/yt-dlp/README.md index 6ee8d641ee..214e801463 100644 --- a/yt-dlp/README.md +++ b/yt-dlp/README.md @@ -5,7 +5,7 @@ [![Release version](https://img.shields.io/github/v/release/yt-dlp/yt-dlp?color=brightgreen&label=Download&style=for-the-badge)](#installation "Installation") [![PyPI](https://img.shields.io/badge/-PyPI-blue.svg?logo=pypi&labelColor=555555&style=for-the-badge)](https://pypi.org/project/yt-dlp "PyPI") -[![Donate](https://img.shields.io/badge/_-Donate-red.svg?logo=githubsponsors&labelColor=555555&style=for-the-badge)](Collaborators.md#collaborators "Donate") +[![Donate](https://img.shields.io/badge/_-Donate-red.svg?logo=githubsponsors&labelColor=555555&style=for-the-badge)](Maintainers.md#maintainers "Donate") [![Discord](https://img.shields.io/discord/807245652072857610?color=blue&labelColor=555555&label=&logo=discord&style=for-the-badge)](https://discord.gg/H5MNcFW63r "Discord") [![Supported Sites](https://img.shields.io/badge/-Supported_Sites-brightgreen.svg?style=for-the-badge)](supportedsites.md "Supported Sites") [![License: Unlicense](https://img.shields.io/badge/-Unlicense-blue.svg?style=for-the-badge)](LICENSE "License") diff --git a/yt-dlp/pyproject.toml b/yt-dlp/pyproject.toml index 0dabe2ea14..1d6e573791 100644 --- a/yt-dlp/pyproject.toml +++ b/yt-dlp/pyproject.toml @@ -4,8 +4,11 @@ build-backend = "hatchling.build" [project] name = "yt-dlp" -maintainers = [ +authors = [ {name = "pukkandan", email = "pukkandan.ytdlp@gmail.com"}, +] +maintainers = [ + {email = "maintainers@yt-dlp.org"}, {name = "Grub4K", email = "contact@grub4k.xyz"}, {name = "bashonly", email = "bashonly@protonmail.com"}, {name = "coletdjnz", email = "coletdjnz@protonmail.com"}, @@ -89,7 +92,7 @@ pyinstaller = [ Documentation = "https://github.com/yt-dlp/yt-dlp#readme" Repository = "https://github.com/yt-dlp/yt-dlp" Tracker = "https://github.com/yt-dlp/yt-dlp/issues" -Funding = "https://github.com/yt-dlp/yt-dlp/blob/master/Collaborators.md#collaborators" +Funding = "https://github.com/yt-dlp/yt-dlp/blob/master/Maintainers.md#maintainers" [project.scripts] yt-dlp = "yt_dlp:main"