diff --git a/.github/update.log b/.github/update.log index 93d358828f..e70f97c296 100644 --- a/.github/update.log +++ b/.github/update.log @@ -727,3 +727,4 @@ Update On Sun Aug 4 20:30:12 CEST 2024 Update On Mon Aug 5 20:34:45 CEST 2024 Update On Tue Aug 6 20:32:42 CEST 2024 Update On Wed Aug 7 20:33:57 CEST 2024 +Update On Thu Aug 8 20:35:50 CEST 2024 diff --git a/clash-meta/component/power/event_windows.go b/clash-meta/component/power/event_windows.go index 1265569522..a9489df417 100644 --- a/clash-meta/component/power/event_windows.go +++ b/clash-meta/component/power/event_windows.go @@ -55,6 +55,11 @@ func NewEventListener(cb func(Type)) (func(), error) { } handle := uintptr(0) + // DWORD PowerRegisterSuspendResumeNotification( + // [in] DWORD Flags, + // [in] HANDLE Recipient, + // [out] PHPOWERNOTIFY RegistrationHandle + //); _, _, err := powerRegisterSuspendResumeNotification.Call( _DEVICE_NOTIFY_CALLBACK, uintptr(unsafe.Pointer(¶ms)), @@ -65,8 +70,11 @@ func NewEventListener(cb func(Type)) (func(), error) { } return func() { + // DWORD PowerUnregisterSuspendResumeNotification( + // [in, out] HPOWERNOTIFY RegistrationHandle + //); _, _, _ = powerUnregisterSuspendResumeNotification.Call( - uintptr(unsafe.Pointer(&handle)), + handle, ) runtime.KeepAlive(params) runtime.KeepAlive(handle) diff --git a/clash-meta/go.mod b/clash-meta/go.mod index ca4c4bece4..90c252798b 100644 --- a/clash-meta/go.mod +++ b/clash-meta/go.mod @@ -7,7 +7,7 @@ require ( github.com/bahlo/generic-list-go v0.2.0 github.com/cilium/ebpf v0.12.3 github.com/coreos/go-iptables v0.7.0 - github.com/dlclark/regexp2 v1.11.2 + github.com/dlclark/regexp2 v1.11.4 github.com/go-chi/chi/v5 v5.1.0 github.com/go-chi/cors v1.2.1 github.com/go-chi/render v1.0.3 @@ -20,7 +20,7 @@ require ( github.com/mdlayher/netlink v1.7.2 github.com/metacubex/chacha v0.1.0 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 - github.com/metacubex/quic-go v0.45.1-0.20240803003931-60a15f6efd94 + github.com/metacubex/quic-go v0.46.1-0.20240807232329-1c6cb2d67f58 github.com/metacubex/randv2 v0.2.0 github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 github.com/metacubex/sing-shadowsocks v0.2.8 @@ -50,11 +50,11 @@ require ( gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7 go.uber.org/automaxprocs v1.5.3 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba - golang.org/x/crypto v0.25.0 + golang.org/x/crypto v0.26.0 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 - golang.org/x/net v0.27.0 - golang.org/x/sync v0.7.0 - golang.org/x/sys v0.22.0 + golang.org/x/net v0.28.0 + golang.org/x/sync v0.8.0 + golang.org/x/sys v0.23.0 google.golang.org/protobuf v1.34.2 gopkg.in/yaml.v3 v3.0.1 lukechampine.com/blake3 v1.3.0 @@ -108,7 +108,7 @@ require ( gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect go.uber.org/mock v0.4.0 // indirect golang.org/x/mod v0.19.0 // indirect - golang.org/x/text v0.16.0 // indirect + golang.org/x/text v0.17.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.23.0 // indirect ) diff --git a/clash-meta/go.sum b/clash-meta/go.sum index aef02f4bab..d5b5705371 100644 --- a/clash-meta/go.sum +++ b/clash-meta/go.sum @@ -26,8 +26,8 @@ github.com/coreos/go-iptables v0.7.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFE github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dlclark/regexp2 v1.11.2 h1:/u628IuisSTwri5/UKloiIsH8+qF2Pu7xEQX+yIKg68= -github.com/dlclark/regexp2 v1.11.2/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= +github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo= +github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 h1:/5RkVc9Rc81XmMyVqawCiDyrBHZbLAZgTTCqou4mwj8= github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9/go.mod h1:hkIFzoiIPZYxdFOOLyDho59b7SrDfo+w3h+yWdlg45I= github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 h1:8j2RH289RJplhA6WfdaPqzg1MjH2K8wX5e0uhAxrw2g= @@ -103,8 +103,8 @@ github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvO github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88= github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec h1:HxreOiFTUrJXJautEo8rnE1uKTVGY8wtZepY1Tii/Nc= github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec/go.mod h1:8BVmQ+3cxjqzWElafm24rb2Ae4jRI6vAXNXWqWjfrXw= -github.com/metacubex/quic-go v0.45.1-0.20240803003931-60a15f6efd94 h1:wlhwgxRzPLH8Ce0VME35iD2sr7jY2gFrL299/T4C2Sg= -github.com/metacubex/quic-go v0.45.1-0.20240803003931-60a15f6efd94/go.mod h1:Yza2H7Ax1rxWPUcJx0vW+oAt9EsPuSiyQFhFabUPzwU= +github.com/metacubex/quic-go v0.46.1-0.20240807232329-1c6cb2d67f58 h1:T6OxROLZBr9SOQxN5TzUslv81hEREy/dEgaUKVjaG7U= +github.com/metacubex/quic-go v0.46.1-0.20240807232329-1c6cb2d67f58/go.mod h1:Yza2H7Ax1rxWPUcJx0vW+oAt9EsPuSiyQFhFabUPzwU= github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiLs= github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY= github.com/metacubex/sing v0.0.0-20240724044459-6f3cf5896297 h1:YG/JkwGPbca5rUtEMHIu8ZuqzR7BSVm1iqY8hNoMeMA= @@ -226,8 +226,8 @@ go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBs go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= -golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= +golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= @@ -236,11 +236,11 @@ golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -257,12 +257,12 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= +golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= diff --git a/clash-nyanpasu/.eslintrc.cjs b/clash-nyanpasu/.eslintrc.cjs index ccbfd73cd9..c17de7b28f 100644 --- a/clash-nyanpasu/.eslintrc.cjs +++ b/clash-nyanpasu/.eslintrc.cjs @@ -24,6 +24,7 @@ module.exports = { "react-compiler/react-compiler": "error", "react-hooks/rules-of-hooks": "error", "react-hooks/exhaustive-deps": "warn", + "react/no-children-prop": "off", }, settings: { react: { diff --git a/clash-nyanpasu/backend/Cargo.lock b/clash-nyanpasu/backend/Cargo.lock index 3117f09fce..c30bcdc388 100644 --- a/clash-nyanpasu/backend/Cargo.lock +++ b/clash-nyanpasu/backend/Cargo.lock @@ -3946,7 +3946,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -5017,9 +5017,9 @@ checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" [[package]] name = "oxc_allocator" -version = "0.23.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0222635617c93d6b8cf04931d33f865af48f092219bd3a5748a0a10aadba3357" +checksum = "bf56669b84958d483bbd296b3b2e4fc0d4c4a9c0953dc8ba5834a56d756907c9" dependencies = [ "allocator-api2", "bumpalo", @@ -5027,9 +5027,9 @@ dependencies = [ [[package]] name = "oxc_ast" -version = "0.23.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda87402f7d35680d090063de0b5b092eda60ea2d70aa6d5fae74bc5537e4f22" +checksum = "24e81e91ab3bd480b34cf435d4fbbb9278a08ef76a9f99cdf1ce8c4df68333f8" dependencies = [ "bitflags 2.6.0", "num-bigint", @@ -5041,9 +5041,9 @@ dependencies = [ [[package]] name = "oxc_ast_macros" -version = "0.23.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e864ddc3bc3bcc12b2de8c9b9c1c51dfa1a6dd9a6f35d22e91f58753d42ae342" +checksum = "ca3d3f75136e7c263112bbe781c442cf573e29e00ea8cde3f7b25917e9bf4dff" dependencies = [ "proc-macro2", "quote", @@ -5052,9 +5052,9 @@ dependencies = [ [[package]] name = "oxc_diagnostics" -version = "0.23.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad620eda707d87b229a596b87dc00f6fdde4a63717402be391ffba78265f6490" +checksum = "bdb43e4ecfef9c27d7a2899b4fcea86f0c6376c2c0f7de678b929740b3a035c0" dependencies = [ "miette", "owo-colors", @@ -5064,15 +5064,15 @@ dependencies = [ [[package]] name = "oxc_index" -version = "0.23.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db5ab95d149e6e24790ee9a37dfb4b9926ce3585e4c7da3ad8be0182081b9d30" +checksum = "529ae8c89ff70c29dabc30dd352892dc99cef4b5c38b4789c30d08f7b6d8f240" [[package]] name = "oxc_parser" -version = "0.23.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af6dc7cfa5fc66fb142a594c5f3f2de4d4abb3a219ecd81e0a1a0f9c10d2d90" +checksum = "93c01f9cad727fd01459f3936cd81792962345e26ebc5fcfbbe307f98be8004c" dependencies = [ "assert-unchecked", "bitflags 2.6.0", @@ -5090,24 +5090,27 @@ dependencies = [ [[package]] name = "oxc_span" -version = "0.23.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11728a24c5e0219c0f93b633e8cf472f4963635911de6bece7ec663c762099f" +checksum = "c9fead43f4a8429e9cded8996f23360ea72f8fe0f5a7399108ac7f70491e0647" dependencies = [ "compact_str", "miette", "oxc_allocator", + "oxc_ast_macros", ] [[package]] name = "oxc_syntax" -version = "0.23.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0524ebb94bb558a6d20b2f00b80967162ed0221137c6e6758232145798f9836c" +checksum = "1c2a454a9cdad75b7aa3284f36c96313f3567833776f56255a585dbe744165f1" dependencies = [ "bitflags 2.6.0", "dashmap 6.0.1", "nonmax", + "oxc_allocator", + "oxc_ast_macros", "oxc_index", "oxc_span", "phf 0.11.2", @@ -6395,9 +6398,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150" dependencies = [ "serde_derive", ] @@ -6414,9 +6417,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1" dependencies = [ "proc-macro2", "quote", diff --git a/clash-nyanpasu/backend/tauri/Cargo.toml b/clash-nyanpasu/backend/tauri/Cargo.toml index 41f519b2c1..c591fe5a4e 100644 --- a/clash-nyanpasu/backend/tauri/Cargo.toml +++ b/clash-nyanpasu/backend/tauri/Cargo.toml @@ -122,11 +122,11 @@ os_pipe = "1.2.0" whoami = "1.5.1" atomic_enum = "0.3.0" boa_engine.workspace = true -oxc_parser = "0.23" -oxc_allocator = "0.23" -oxc_span = "0.23" -oxc_ast = "0.23" -oxc_syntax = "0.23" +oxc_parser = "0.24" +oxc_allocator = "0.24" +oxc_span = "0.24" +oxc_ast = "0.24" +oxc_syntax = "0.24" mlua = { version = "0.9", features = [ "lua54", "async", diff --git a/clash-nyanpasu/frontend/interface/ipc/useNyanpasu.ts b/clash-nyanpasu/frontend/interface/ipc/useNyanpasu.ts index 531ce393ee..af1d4d29dd 100644 --- a/clash-nyanpasu/frontend/interface/ipc/useNyanpasu.ts +++ b/clash-nyanpasu/frontend/interface/ipc/useNyanpasu.ts @@ -14,6 +14,7 @@ export const useNyanpasu = (options?: { onSuccess?: (data?: VergeConfig) => void; onUpdate?: (data?: VergeConfig) => void; onError?: (error: any) => void; + onLatestCoreError?: (error: any) => void; }) => { const { getConfigs, setConfigs, deleteConnections } = useClash(); @@ -56,6 +57,9 @@ export const useNyanpasu = (options?: { const getLatestCore = useSWR("getLatestCore", fetchLatestCore, { revalidateOnMount: false, + revalidateOnFocus: false, + refreshInterval: 0, + onError: options?.onLatestCoreError, }); const updateCore = async (core: Required["clash_core"]) => { diff --git a/clash-nyanpasu/frontend/nyanpasu/package.json b/clash-nyanpasu/frontend/nyanpasu/package.json index d2268a3c74..32d91303f4 100644 --- a/clash-nyanpasu/frontend/nyanpasu/package.json +++ b/clash-nyanpasu/frontend/nyanpasu/package.json @@ -29,7 +29,7 @@ "dayjs": "1.11.12", "framer-motion": "12.0.0-alpha.0", "i18next": "23.12.2", - "jotai": "2.9.1", + "jotai": "2.9.2", "material-react-table": "2.13.1", "monaco-editor": "0.50.0", "mui-color-input": "3.0.0", @@ -38,7 +38,7 @@ "react-error-boundary": "4.0.13", "react-fast-marquee": "1.6.5", "react-hook-form-mui": "7.0.1", - "react-i18next": "15.0.0", + "react-i18next": "15.0.1", "react-markdown": "9.0.1", "react-router-dom": "6.26.0", "react-split-grid": "1.0.4", @@ -48,7 +48,7 @@ "devDependencies": { "@emotion/babel-plugin": "11.12.0", "@emotion/react": "11.13.0", - "@iconify/json": "2.2.234", + "@iconify/json": "2.2.235", "@types/react": "18.3.3", "@types/react-dom": "18.3.0", "@vitejs/plugin-react": "4.3.1", @@ -59,10 +59,10 @@ "tailwindcss-textshadow": "2.1.3", "unplugin-auto-import": "0.18.2", "unplugin-icons": "0.19.2", - "vite": "5.3.5", + "vite": "5.4.0", "vite-plugin-monaco-editor": "1.1.3", "vite-plugin-sass-dts": "1.3.25", "vite-plugin-svgr": "4.2.0", - "vite-tsconfig-paths": "4.3.2" + "vite-tsconfig-paths": "5.0.0" } } diff --git a/clash-nyanpasu/frontend/nyanpasu/src/components/logs/log-item.tsx b/clash-nyanpasu/frontend/nyanpasu/src/components/logs/log-item.tsx index 97a99c2b98..702809986d 100644 --- a/clash-nyanpasu/frontend/nyanpasu/src/components/logs/log-item.tsx +++ b/clash-nyanpasu/frontend/nyanpasu/src/components/logs/log-item.tsx @@ -22,7 +22,7 @@ export const LogItem = ({ value }: { value: LogMessage }) => { }, [value.payload]); return ( -
+
{value.time} diff --git a/clash-nyanpasu/frontend/nyanpasu/src/components/logs/log-list.tsx b/clash-nyanpasu/frontend/nyanpasu/src/components/logs/log-list.tsx index 064f859018..b7190207b3 100644 --- a/clash-nyanpasu/frontend/nyanpasu/src/components/logs/log-list.tsx +++ b/clash-nyanpasu/frontend/nyanpasu/src/components/logs/log-list.tsx @@ -1,36 +1,53 @@ import { useDebounceEffect } from "ahooks"; -import { useRef } from "react"; -import { VList, VListHandle } from "virtua"; +import { RefObject, useRef } from "react"; +import { Virtualizer, VListHandle } from "virtua"; import { LogMessage } from "@nyanpasu/interface"; import LogItem from "./log-item"; -export const LogList = ({ data }: { data: LogMessage[] }) => { - const vListRef = useRef(null); +export interface LogListProps { + data: LogMessage[]; + scrollRef: RefObject; +} + +export const LogList = ({ data, scrollRef }: LogListProps) => { + const virtualizerRef = useRef(null); const shouldStickToBottom = useRef(true); + const isFristScroll = useRef(true); + useDebounceEffect( () => { - if (shouldStickToBottom.current) { - vListRef.current?.scrollToIndex(data.length - 1, { + if (shouldStickToBottom) { + virtualizerRef.current?.scrollToIndex(data.length - 1, { align: "end", - smooth: true, + smooth: !isFristScroll.current, }); + + isFristScroll.current = false; } }, [data], { wait: 100 }, ); + const handleRangeChange = (_start: number, end: number) => { + if (end + 1 === data.length) { + shouldStickToBottom.current = true; + } else { + shouldStickToBottom.current = false; + } + }; + return ( - {data.map((item, index) => { return ; })} - + ); }; diff --git a/clash-nyanpasu/frontend/nyanpasu/src/components/logs/log-page.tsx b/clash-nyanpasu/frontend/nyanpasu/src/components/logs/log-page.tsx new file mode 100644 index 0000000000..168045b301 --- /dev/null +++ b/clash-nyanpasu/frontend/nyanpasu/src/components/logs/log-page.tsx @@ -0,0 +1,23 @@ +import { useAtomValue } from "jotai"; +import ContentDisplay from "../base/content-display"; +import ClearLogButton from "./clear-log-button"; +import { LogList } from "./log-list"; +import { atomLogList } from "./modules/store"; + +export const LogPage = () => { + const logList = useAtomValue(atomLogList); + + return ( + <> + {logList?.data.length ? ( + + ) : ( + + )} + + + + ); +}; + +export default LogPage; diff --git a/clash-nyanpasu/frontend/nyanpasu/src/components/logs/modules/store.ts b/clash-nyanpasu/frontend/nyanpasu/src/components/logs/modules/store.ts new file mode 100644 index 0000000000..cc07f787ac --- /dev/null +++ b/clash-nyanpasu/frontend/nyanpasu/src/components/logs/modules/store.ts @@ -0,0 +1,4 @@ +import { atom } from "jotai"; +import { LogListProps } from "../log-list"; + +export const atomLogList = atom(); diff --git a/clash-nyanpasu/frontend/nyanpasu/src/components/proxies/group-list.tsx b/clash-nyanpasu/frontend/nyanpasu/src/components/proxies/group-list.tsx index 0e274d5871..dd69dfc307 100644 --- a/clash-nyanpasu/frontend/nyanpasu/src/components/proxies/group-list.tsx +++ b/clash-nyanpasu/frontend/nyanpasu/src/components/proxies/group-list.tsx @@ -11,6 +11,7 @@ import { ListItemText, } from "@mui/material"; import { getServerPort, useClashCore } from "@nyanpasu/interface"; +import LazyImage from "@nyanpasu/ui/materialYou/components/lazyImage"; const IconRender = memo(function IconRender({ icon }: { icon: string }) { const { @@ -32,7 +33,11 @@ const IconRender = memo(function IconRender({ icon }: { icon: string }) { } return ( - + ); }); diff --git a/clash-nyanpasu/frontend/nyanpasu/src/components/rules/modules/store.ts b/clash-nyanpasu/frontend/nyanpasu/src/components/rules/modules/store.ts new file mode 100644 index 0000000000..a736e8e20e --- /dev/null +++ b/clash-nyanpasu/frontend/nyanpasu/src/components/rules/modules/store.ts @@ -0,0 +1,8 @@ +import { atom } from "jotai"; +import { RefObject } from "react"; +import { Clash } from "@nyanpasu/interface"; + +export const atomRulePage = atom<{ + data?: Clash.Rule[]; + scrollRef?: RefObject; +}>(); diff --git a/clash-nyanpasu/frontend/nyanpasu/src/components/rules/rule-item.tsx b/clash-nyanpasu/frontend/nyanpasu/src/components/rules/rule-item.tsx index ee7a4be764..cb3391e0b2 100644 --- a/clash-nyanpasu/frontend/nyanpasu/src/components/rules/rule-item.tsx +++ b/clash-nyanpasu/frontend/nyanpasu/src/components/rules/rule-item.tsx @@ -37,7 +37,7 @@ const RuleItem = ({ index, value }: Props) => { }; return ( -
+
{index + 1}
diff --git a/clash-nyanpasu/frontend/nyanpasu/src/components/rules/rule-page.tsx b/clash-nyanpasu/frontend/nyanpasu/src/components/rules/rule-page.tsx new file mode 100644 index 0000000000..8403fbe964 --- /dev/null +++ b/clash-nyanpasu/frontend/nyanpasu/src/components/rules/rule-page.tsx @@ -0,0 +1,21 @@ +import { useAtomValue } from "jotai"; +import { Virtualizer } from "virtua"; +import ContentDisplay from "../base/content-display"; +import { atomRulePage } from "./modules/store"; +import RuleItem from "./rule-item"; + +export const RulePage = () => { + const rule = useAtomValue(atomRulePage); + + return rule?.data?.length ? ( + + {rule.data.map((item, index) => { + return ; + })} + + ) : ( + + ); +}; + +export default RulePage; diff --git a/clash-nyanpasu/frontend/nyanpasu/src/components/setting/setting-clash-core.tsx b/clash-nyanpasu/frontend/nyanpasu/src/components/setting/setting-clash-core.tsx index e2fbe3bced..268fb62a83 100644 --- a/clash-nyanpasu/frontend/nyanpasu/src/components/setting/setting-clash-core.tsx +++ b/clash-nyanpasu/frontend/nyanpasu/src/components/setting/setting-clash-core.tsx @@ -2,6 +2,7 @@ import { useLockFn, useReactive } from "ahooks"; import { motion } from "framer-motion"; import { useMemo, useState } from "react"; import { useTranslation } from "react-i18next"; +import { formatError } from "@/utils"; import { message } from "@/utils/notification"; import LoadingButton from "@mui/lab/LoadingButton"; import { Box, List, ListItem } from "@mui/material"; @@ -32,7 +33,14 @@ export const SettingClashCore = () => { restartSidecar, getLatestCore, updateCore, - } = useNyanpasu(); + } = useNyanpasu({ + onLatestCoreError: (error) => { + message(`Fetch latest core failed: ${formatError(error)}`, { + type: "error", + title: t("Error"), + }); + }, + }); const { getVersion, deleteConnections } = useClash(); @@ -145,7 +153,7 @@ export const SettingClashCore = () => { }; }); }, [getClashCore.data, getLatestCore.data]); - console.log(nyanpasuConfig?.clash_core); + return ( { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +}; + +export default SettingPage; diff --git a/clash-nyanpasu/frontend/nyanpasu/src/pages/dashboard.tsx b/clash-nyanpasu/frontend/nyanpasu/src/pages/dashboard.tsx index 9a04717182..933e6497b7 100644 --- a/clash-nyanpasu/frontend/nyanpasu/src/pages/dashboard.tsx +++ b/clash-nyanpasu/frontend/nyanpasu/src/pages/dashboard.tsx @@ -11,7 +11,7 @@ export const Dashboard = () => { return ( - + diff --git a/clash-nyanpasu/frontend/nyanpasu/src/pages/logs.tsx b/clash-nyanpasu/frontend/nyanpasu/src/pages/logs.tsx index ce3a0ea699..02cb913dc5 100644 --- a/clash-nyanpasu/frontend/nyanpasu/src/pages/logs.tsx +++ b/clash-nyanpasu/frontend/nyanpasu/src/pages/logs.tsx @@ -1,14 +1,12 @@ -import { useAtomValue } from "jotai"; -import { useEffect, useState } from "react"; +import { useDebounceEffect } from "ahooks"; +import { useAtomValue, useSetAtom } from "jotai"; +import { RefObject, useRef, useState } from "react"; import { useTranslation } from "react-i18next"; -import { BaseEmpty } from "@/components/base"; -import ClearLogButton from "@/components/logs/clear-log-button"; import { LogFilter } from "@/components/logs/log-filter"; import { LogLevel } from "@/components/logs/log-level"; -import { LogList } from "@/components/logs/log-list"; import LogToggle from "@/components/logs/log-toggle"; +import { atomLogList } from "@/components/logs/modules/store"; import { atomLogData } from "@/store"; -import { LogMessage } from "@nyanpasu/interface"; import { BasePage } from "@nyanpasu/ui"; export default function LogPage() { @@ -20,25 +18,30 @@ export default function LogPage() { const [filterText, setFilterText] = useState(""); - const [filterLogs, setFilterLogs] = useState([]); + const setLogList = useSetAtom(atomLogList); - useEffect(() => { - setFilterLogs( - logData.filter((data) => { - return ( - data.payload.includes(filterText) && - (logState === "all" ? true : data.type.includes(logState)) - ); - }), - ); - }, [logData, logState, filterText]); + const viewportRef = useRef(null); + + useDebounceEffect( + () => { + setLogList({ + data: logData.filter((data) => { + return ( + data.payload.includes(filterText) && + (logState === "all" ? true : data.type.includes(logState)) + ); + }), + scrollRef: viewportRef as RefObject, + }); + }, + [logData, logState, filterText], + { wait: 150 }, + ); return ( @@ -51,14 +54,8 @@ export default function LogPage() { />
} - > - {filterLogs.length ? ( - - ) : ( - - )} - - - + viewportRef={viewportRef} + children={() => import("@/components/logs/log-page")} + /> ); } diff --git a/clash-nyanpasu/frontend/nyanpasu/src/pages/rules.tsx b/clash-nyanpasu/frontend/nyanpasu/src/pages/rules.tsx index d4dcc65c33..b37ac995e6 100644 --- a/clash-nyanpasu/frontend/nyanpasu/src/pages/rules.tsx +++ b/clash-nyanpasu/frontend/nyanpasu/src/pages/rules.tsx @@ -1,8 +1,8 @@ -import { useMemo, useState } from "react"; +import { useDebounceEffect } from "ahooks"; +import { useSetAtom } from "jotai"; +import { RefObject, useRef, useState } from "react"; import { useTranslation } from "react-i18next"; -import { VList } from "virtua"; -import { BaseEmpty } from "@/components/base"; -import RuleItem from "@/components/rules/rule-item"; +import { atomRulePage } from "@/components/rules/modules/store"; import { alpha, FilledInputProps, TextField, useTheme } from "@mui/material"; import { useClashCore } from "@nyanpasu/interface"; import { BasePage } from "@nyanpasu/ui"; @@ -16,11 +16,22 @@ export default function RulesPage() { const [filterText, setFilterText] = useState(""); - const rules = useMemo(() => { - return getRules.data?.rules.filter((each) => - each.payload.includes(filterText), - ); - }, [getRules.data, filterText]); + const setRule = useSetAtom(atomRulePage); + + const viewportRef = useRef(null); + + useDebounceEffect( + () => { + setRule({ + data: getRules.data?.rules.filter((each) => + each.payload.includes(filterText), + ), + scrollRef: viewportRef as RefObject, + }); + }, + [getRules.data, viewportRef.current, filterText], + { wait: 150 }, + ); const inputProps: Partial = { sx: { @@ -37,8 +48,6 @@ export default function RulesPage() { } - > - - {rules ? ( - rules.map((item, index) => { - return ; - }) - ) : ( - - )} - - + viewportRef={viewportRef} + children={() => import("@/components/rules/rule-page")} + /> ); } diff --git a/clash-nyanpasu/frontend/nyanpasu/src/pages/settings.tsx b/clash-nyanpasu/frontend/nyanpasu/src/pages/settings.tsx index c57d82fa97..08969870c1 100644 --- a/clash-nyanpasu/frontend/nyanpasu/src/pages/settings.tsx +++ b/clash-nyanpasu/frontend/nyanpasu/src/pages/settings.tsx @@ -1,35 +1,16 @@ import MdiTrayFull from "~icons/mdi/tray-full"; import { useLockFn } from "ahooks"; -import { motion } from "framer-motion"; -import React, { lazy, Suspense } from "react"; +import React from "react"; import { useTranslation } from "react-i18next"; import HotkeyDialog from "@/components/setting/modules/hotkey-dialog"; import TrayIconDialog from "@/components/setting/modules/tray-icon-dialog"; import { formatEnvInfos } from "@/utils"; import { Feedback, GitHub, Keyboard } from "@mui/icons-material"; -import Masonry from "@mui/lab/Masonry"; import { IconButton } from "@mui/material"; import { collect_envs } from "@nyanpasu/interface"; import { BasePage } from "@nyanpasu/ui"; import { open } from "@tauri-apps/api/shell"; -const asyncComponents = [ - () => import("@/components/setting/setting-system-proxy"), - () => import("@/components/setting/setting-nyanpasu-ui"), - () => import("@/components/setting/setting-clash-base"), - () => import("@/components/setting/setting-clash-port"), - () => import("@/components/setting/setting-clash-external"), - () => import("@/components/setting/setting-clash-web"), - () => import("@/components/setting/setting-clash-field"), - () => import("@/components/setting/setting-clash-core"), - () => import("@/components/setting/setting-system-behavior"), - () => import("@/components/setting/setting-system-service"), - () => import("@/components/setting/setting-nyanpasu-tasks"), - () => import("@/components/setting/setting-nyanpasu-misc"), - () => import("@/components/setting/setting-nyanpasu-path"), - () => import("@/components/setting/setting-nyanpasu-version"), -]; - const GithubIcon = () => { const toGithubRepo = useLockFn(() => { return open("https://github.com/LibNyanpasu/clash-nyanpasu"); @@ -86,7 +67,11 @@ const TrayIconButton = () => { return ( <> setOpen(false)} /> - setOpen(true)}> + setOpen(true)} + > @@ -107,36 +92,7 @@ export default function SettingPage() {
} - > - - {asyncComponents.map((item, index) => { - const AsyncComponent = lazy(item); - - return ( - - - - - - ); - })} - - + children={() => import("@/components/setting/setting-page")} + /> ); } diff --git a/clash-nyanpasu/frontend/ui/materialYou/components/asyncComponent/index.tsx b/clash-nyanpasu/frontend/ui/materialYou/components/asyncComponent/index.tsx new file mode 100644 index 0000000000..b151bb068a --- /dev/null +++ b/clash-nyanpasu/frontend/ui/materialYou/components/asyncComponent/index.tsx @@ -0,0 +1,38 @@ +import { motion } from "framer-motion"; +import { ComponentType, lazy, Suspense, useState } from "react"; +import { cn } from "@/utils"; +import LinearProgress from "@mui/material/LinearProgress"; + +export interface AsyncComponentProps { + component: () => Promise<{ default: ComponentType }>; +} + +export const AsyncComponent = ({ component }: AsyncComponentProps) => { + const [isLoaded, setIsLoaded] = useState(false); + + const Component = lazy(() => + component().then(async (module) => { + setIsLoaded(true); + return module; + }), + ); + + return ( + + +
+ } + > + + + + + ); +}; diff --git a/clash-nyanpasu/frontend/ui/materialYou/components/basePage/index.tsx b/clash-nyanpasu/frontend/ui/materialYou/components/basePage/index.tsx index f74df033be..7feb2f412c 100644 --- a/clash-nyanpasu/frontend/ui/materialYou/components/basePage/index.tsx +++ b/clash-nyanpasu/frontend/ui/materialYou/components/basePage/index.tsx @@ -1,44 +1,78 @@ -import { CSSProperties, FC, ReactNode, useEffect, useRef } from "react"; +import { CSSProperties, FC, ReactNode, Ref } from "react"; import { BaseErrorBoundary } from "./baseErrorBoundary"; import Header from "./header"; import "./style.scss"; +import { cn } from "@/utils"; +import * as ScrollArea from "@radix-ui/react-scroll-area"; +import { AsyncComponent, AsyncComponentProps } from "../asyncComponent"; -interface Props { +interface BasePageProps { title?: ReactNode; header?: ReactNode; contentStyle?: CSSProperties; sectionStyle?: CSSProperties; full?: boolean; - children?: ReactNode; + viewportRef?: Ref; + children?: ReactNode | AsyncComponentProps["component"]; } -export const BasePage: FC = ({ +export const BasePage: FC = ({ title, header, contentStyle, sectionStyle, full, + viewportRef, children, }) => { - const sectionStyleRef = useRef(sectionStyle); - const contentStyleRef = useRef(contentStyle); + const isAsyncComponent = typeof children === "function"; - useEffect(() => { - sectionStyleRef.current = sectionStyle; - contentStyleRef.current = contentStyle; - }, [sectionStyle, contentStyle]); + const Children = () => { + return isAsyncComponent ? ( + + ) : ( + children + ); + }; return (
-
-
-
{children}
-
-
+ + div]:!block", + full ?? "p-6", + )} + ref={viewportRef} + style={sectionStyle} + > + + + + + + + + {/* + + */} + +
); }; + +export const ScrollAreaViewport = ScrollArea.Viewport; diff --git a/clash-nyanpasu/frontend/ui/materialYou/components/basePage/style.scss b/clash-nyanpasu/frontend/ui/materialYou/components/basePage/style.scss index b05bc5c94d..7fdac987ac 100644 --- a/clash-nyanpasu/frontend/ui/materialYou/components/basePage/style.scss +++ b/clash-nyanpasu/frontend/ui/materialYou/components/basePage/style.scss @@ -16,33 +16,10 @@ } .MDYBasePage-container { - position: relative; - box-sizing: border-box; - flex: 1 1 100%; - width: 100%; - height: 100%; - overflow: auto; background-color: var(--background-color); - border-radius: calc(var(--border-radius) * 2); - scrollbar-gutter: stable; - .MDYBasePage-content { - > section { - padding: 28px; - margin: 0 auto; - } - } - - &.no-padding { - scrollbar-gutter: unset; - - .MDYBasePage-content { - overflow: visible; - - > section { - padding: 0; - } - } + .ScrollArea-Thumb { + background-color: var(--scroller-color); } } } diff --git a/clash-nyanpasu/frontend/ui/materialYou/components/index.ts b/clash-nyanpasu/frontend/ui/materialYou/components/index.ts index 0b91983490..6bfc9e2651 100644 --- a/clash-nyanpasu/frontend/ui/materialYou/components/index.ts +++ b/clash-nyanpasu/frontend/ui/materialYou/components/index.ts @@ -1,9 +1,11 @@ -export * from "./basePage"; +export * from "./asyncComponent"; export * from "./baseCard"; -export * from "./item"; -export * from "./expand"; export * from "./baseDialog"; -export * from "./loadingSwitch"; +export * from "./basePage"; +export * from "./expand"; export * from "./expandMore"; -export * from "./sidePage"; export * from "./floatingButton"; +export * from "./item"; +export * from "./lazyImage"; +export * from "./loadingSwitch"; +export * from "./sidePage"; diff --git a/clash-nyanpasu/frontend/ui/materialYou/components/lazyImage/index.tsx b/clash-nyanpasu/frontend/ui/materialYou/components/lazyImage/index.tsx new file mode 100644 index 0000000000..631aa3fe24 --- /dev/null +++ b/clash-nyanpasu/frontend/ui/materialYou/components/lazyImage/index.tsx @@ -0,0 +1,35 @@ +import { useEffect, useRef, useState } from "react"; +import { cn } from "@/utils"; + +export interface LazyImageProps + extends React.ImgHTMLAttributes { + loadingClassName?: string; +} +export default function LazyImage(props: LazyImageProps) { + const [loading, setLoading] = useState(true); + const imgRef = useRef(null); + useEffect(() => { + if (imgRef.current) { + imgRef.current.onload = () => setLoading(false); + } + }, [props.src]); + + return ( + <> +
+ + + ); +} diff --git a/clash-nyanpasu/frontend/ui/package.json b/clash-nyanpasu/frontend/ui/package.json index 593d34856b..bb4d547098 100644 --- a/clash-nyanpasu/frontend/ui/package.json +++ b/clash-nyanpasu/frontend/ui/package.json @@ -9,6 +9,7 @@ "@mui/lab": "5.0.0-alpha.173", "@mui/material": "5.16.6", "@radix-ui/react-portal": "1.1.1", + "@radix-ui/react-scroll-area": "1.1.0", "@tauri-apps/api": "1.6.0", "@types/d3": "7.4.3", "@types/react": "18.3.3", @@ -17,7 +18,7 @@ "framer-motion": "12.0.0-alpha.0", "react": "18.3.1", "react-error-boundary": "4.0.13", - "react-i18next": "15.0.0" + "react-i18next": "15.0.1" }, "devDependencies": { "@types/d3-interpolate-path": "2.0.3", diff --git a/clash-nyanpasu/package.json b/clash-nyanpasu/package.json index 4ba2628616..acba520e30 100644 --- a/clash-nyanpasu/package.json +++ b/clash-nyanpasu/package.json @@ -51,7 +51,7 @@ "lodash-es": "4.17.21" }, "devDependencies": { - "@commitlint/cli": "19.3.0", + "@commitlint/cli": "19.4.0", "@commitlint/config-conventional": "19.2.2", "@ianvs/prettier-plugin-sort-imports": "4.3.1", "@tauri-apps/cli": "1.6.0", @@ -76,7 +76,7 @@ "eslint-plugin-react": "7.35.0", "eslint-plugin-react-compiler": "0.0.0-experimental-9ed098e-20240725", "eslint-plugin-react-hooks": "4.6.2", - "knip": "5.27.1", + "knip": "5.27.2", "lint-staged": "15.2.8", "npm-run-all2": "6.2.2", "postcss": "8.4.41", @@ -94,7 +94,7 @@ "stylelint-declaration-block-no-ignored-properties": "2.8.0", "stylelint-order": "6.0.4", "stylelint-scss": "6.5.0", - "tailwindcss": "3.4.7", + "tailwindcss": "3.4.8", "tsx": "4.16.5", "typescript": "5.5.4" }, diff --git a/clash-nyanpasu/pnpm-lock.yaml b/clash-nyanpasu/pnpm-lock.yaml index bbe4811823..9dc6a5020a 100644 --- a/clash-nyanpasu/pnpm-lock.yaml +++ b/clash-nyanpasu/pnpm-lock.yaml @@ -23,8 +23,8 @@ importers: version: 4.17.21 devDependencies: '@commitlint/cli': - specifier: 19.3.0 - version: 19.3.0(@types/node@20.14.14)(typescript@5.5.4) + specifier: 19.4.0 + version: 19.4.0(@types/node@20.14.14)(typescript@5.5.4) '@commitlint/config-conventional': specifier: 19.2.2 version: 19.2.2 @@ -98,8 +98,8 @@ importers: specifier: 4.6.2 version: 4.6.2(eslint@8.57.0) knip: - specifier: 5.27.1 - version: 5.27.1(@types/node@20.14.14)(typescript@5.5.4) + specifier: 5.27.2 + version: 5.27.2(@types/node@20.14.14)(typescript@5.5.4) lint-staged: specifier: 15.2.8 version: 15.2.8 @@ -152,8 +152,8 @@ importers: specifier: 6.5.0 version: 6.5.0(stylelint@16.8.1(typescript@5.5.4)) tailwindcss: - specifier: 3.4.7 - version: 3.4.7 + specifier: 3.4.8 + version: 3.4.8 tsx: specifier: 4.16.5 version: 4.16.5 @@ -168,16 +168,16 @@ importers: version: 1.6.0 ahooks: specifier: 3.8.0 - version: 3.8.0(react@19.0.0-rc-df783f9ea1-20240708) + version: 3.8.0(react@19.0.0-rc-e948a5ac-20240807) ofetch: specifier: 1.3.4 version: 1.3.4 react: specifier: npm:react@rc - version: 19.0.0-rc-df783f9ea1-20240708 + version: 19.0.0-rc-e948a5ac-20240807 swr: specifier: 2.2.5 - version: 2.2.5(react@19.0.0-rc-df783f9ea1-20240708) + version: 2.2.5(react@19.0.0-rc-e948a5ac-20240807) devDependencies: '@types/react': specifier: npm:types-react@rc @@ -187,19 +187,19 @@ importers: dependencies: '@dnd-kit/core': specifier: 6.1.0 - version: 6.1.0(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708) + version: 6.1.0(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807) '@dnd-kit/sortable': specifier: 8.0.0 - version: 8.0.0(@dnd-kit/core@6.1.0(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708) + version: 8.0.0(@dnd-kit/core@6.1.0(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807) '@dnd-kit/utilities': specifier: 3.2.2 - version: 3.2.2(react@19.0.0-rc-df783f9ea1-20240708) + version: 3.2.2(react@19.0.0-rc-e948a5ac-20240807) '@emotion/styled': specifier: 11.13.0 - version: 11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + version: 11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) '@generouted/react-router': specifier: 1.19.6 - version: 1.19.6(react-router-dom@6.26.0(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(vite@5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)) + version: 1.19.6(react-router-dom@6.26.0(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(vite@5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)) '@juggle/resize-observer': specifier: 3.4.0 version: 3.4.0 @@ -208,13 +208,13 @@ importers: version: 0.3.0 '@mui/icons-material': specifier: 5.16.6 - version: 5.16.6(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + version: 5.16.6(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) '@mui/lab': specifier: 5.0.0-alpha.173 - version: 5.0.0-alpha.173(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + version: 5.0.0-alpha.173(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) '@mui/material': specifier: 5.16.6 - version: 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + version: 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) '@nyanpasu/interface': specifier: workspace:^ version: link:../interface @@ -226,10 +226,10 @@ importers: version: 1.6.0 ahooks: specifier: 3.8.0 - version: 3.8.0(react@19.0.0-rc-df783f9ea1-20240708) + version: 3.8.0(react@19.0.0-rc-e948a5ac-20240807) allotment: specifier: 1.20.2 - version: 1.20.2(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708) + version: 1.20.2(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807) axios: specifier: 1.7.3 version: 1.7.3 @@ -241,65 +241,65 @@ importers: version: 1.11.12 framer-motion: specifier: 12.0.0-alpha.0 - version: 12.0.0-alpha.0(@emotion/is-prop-valid@1.3.0)(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708) + version: 12.0.0-alpha.0(@emotion/is-prop-valid@1.3.0)(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807) i18next: specifier: 23.12.2 version: 23.12.2 jotai: - specifier: 2.9.1 - version: 2.9.1(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + specifier: 2.9.2 + version: 2.9.2(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) material-react-table: specifier: 2.13.1 - version: 2.13.1(v6klvv7qq3oqdau37hnr43dlum) + version: 2.13.1(tm7kuompb3st4orj6tmr52l63e) monaco-editor: specifier: 0.50.0 version: 0.50.0 mui-color-input: specifier: 3.0.0 - version: 3.0.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + version: 3.0.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) react: specifier: npm:react@rc - version: 19.0.0-rc-df783f9ea1-20240708 + version: 19.0.0-rc-e948a5ac-20240807 react-dom: specifier: npm:react-dom@rc - version: 19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708) + version: 19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807) react-error-boundary: specifier: 4.0.13 - version: 4.0.13(react@19.0.0-rc-df783f9ea1-20240708) + version: 4.0.13(react@19.0.0-rc-e948a5ac-20240807) react-fast-marquee: specifier: 1.6.5 - version: 1.6.5(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708) + version: 1.6.5(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807) react-hook-form-mui: specifier: 7.0.1 - version: 7.0.1(4s5fqkimzxhijq4pilwibt7tdm) + version: 7.0.1(7xgojhwrwkzcetsx7pzz5bdopa) react-i18next: - specifier: 15.0.0 - version: 15.0.0(i18next@23.12.2)(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708) + specifier: 15.0.1 + version: 15.0.1(i18next@23.12.2)(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807) react-markdown: specifier: 9.0.1 - version: 9.0.1(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + version: 9.0.1(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) react-router-dom: specifier: 6.26.0 - version: 6.26.0(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708) + version: 6.26.0(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807) react-split-grid: specifier: 1.0.4 - version: 1.0.4(react@19.0.0-rc-df783f9ea1-20240708) + version: 1.0.4(react@19.0.0-rc-e948a5ac-20240807) swr: specifier: 2.2.5 - version: 2.2.5(react@19.0.0-rc-df783f9ea1-20240708) + version: 2.2.5(react@19.0.0-rc-e948a5ac-20240807) virtua: specifier: 0.33.4 - version: 0.33.4(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708) + version: 0.33.4(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807) devDependencies: '@emotion/babel-plugin': specifier: 11.12.0 version: 11.12.0 '@emotion/react': specifier: 11.13.0 - version: 11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + version: 11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) '@iconify/json': - specifier: 2.2.234 - version: 2.2.234 + specifier: 2.2.235 + version: 2.2.235 '@types/react': specifier: npm:types-react@rc version: types-react@19.0.0-rc.1 @@ -308,10 +308,10 @@ importers: version: types-react-dom@19.0.0-rc.1 '@vitejs/plugin-react': specifier: 4.3.1 - version: 4.3.1(vite@5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)) + version: 4.3.1(vite@5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)) '@vitejs/plugin-react-swc': specifier: 3.7.0 - version: 3.7.0(vite@5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)) + version: 3.7.0(vite@5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)) clsx: specifier: 2.1.1 version: 2.1.1 @@ -331,20 +331,20 @@ importers: specifier: 0.19.2 version: 0.19.2(@svgr/core@8.1.0(typescript@5.5.4)) vite: - specifier: 5.3.5 - version: 5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0) + specifier: 5.4.0 + version: 5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0) vite-plugin-monaco-editor: specifier: npm:vite-plugin-monaco-editor-new@1.1.3 version: vite-plugin-monaco-editor-new@1.1.3(monaco-editor@0.50.0) vite-plugin-sass-dts: specifier: 1.3.25 - version: 1.3.25(postcss@8.4.41)(prettier@3.3.3)(sass@1.77.8)(vite@5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)) + version: 1.3.25(postcss@8.4.41)(prettier@3.3.3)(sass@1.77.8)(vite@5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)) vite-plugin-svgr: specifier: 4.2.0 - version: 4.2.0(rollup@4.17.2)(typescript@5.5.4)(vite@5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)) + version: 4.2.0(rollup@4.17.2)(typescript@5.5.4)(vite@5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)) vite-tsconfig-paths: - specifier: 4.3.2 - version: 4.3.2(typescript@5.5.4)(vite@5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)) + specifier: 5.0.0 + version: 5.0.0(typescript@5.5.4)(vite@5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)) frontend/ui: dependencies: @@ -353,16 +353,19 @@ importers: version: 0.3.0 '@mui/icons-material': specifier: 5.16.6 - version: 5.16.6(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + version: 5.16.6(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) '@mui/lab': specifier: 5.0.0-alpha.173 - version: 5.0.0-alpha.173(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + version: 5.0.0-alpha.173(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) '@mui/material': specifier: 5.16.6 - version: 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + version: 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) '@radix-ui/react-portal': specifier: 1.1.1 - version: 1.1.1(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + version: 1.1.1(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@radix-ui/react-scroll-area': + specifier: 1.1.0 + version: 1.1.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) '@tauri-apps/api': specifier: 1.6.0 version: 1.6.0 @@ -374,22 +377,22 @@ importers: version: types-react@19.0.0-rc.1 ahooks: specifier: 3.8.0 - version: 3.8.0(react@19.0.0-rc-df783f9ea1-20240708) + version: 3.8.0(react@19.0.0-rc-e948a5ac-20240807) d3: specifier: 7.9.0 version: 7.9.0 framer-motion: specifier: 12.0.0-alpha.0 - version: 12.0.0-alpha.0(@emotion/is-prop-valid@1.3.0)(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708) + version: 12.0.0-alpha.0(@emotion/is-prop-valid@1.3.0)(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807) react: specifier: npm:react@rc - version: 19.0.0-rc-df783f9ea1-20240708 + version: 19.0.0-rc-e948a5ac-20240807 react-error-boundary: specifier: 4.0.13 - version: 4.0.13(react@19.0.0-rc-df783f9ea1-20240708) + version: 4.0.13(react@19.0.0-rc-e948a5ac-20240807) react-i18next: - specifier: 15.0.0 - version: 15.0.0(i18next@23.12.2)(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708) + specifier: 15.0.1 + version: 15.0.1(i18next@23.12.2)(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807) devDependencies: '@types/d3-interpolate-path': specifier: 2.0.3 @@ -689,8 +692,8 @@ packages: resolution: {integrity: sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==} engines: {node: '>=6.9.0'} - '@commitlint/cli@19.3.0': - resolution: {integrity: sha512-LgYWOwuDR7BSTQ9OLZ12m7F/qhNY+NpAyPBgo4YNMkACE7lGuUnuQq1yi9hz1KA4+3VqpOYl8H1rY/LYK43v7g==} + '@commitlint/cli@19.4.0': + resolution: {integrity: sha512-sJX4J9UioVwZHq7JWM9tjT5bgWYaIN3rC4FP7YwfEwBYiIO+wMyRttRvQLNkow0vCdM0D67r9NEWU0Ui03I4Eg==} engines: {node: '>=v18'} hasBin: true @@ -722,8 +725,8 @@ packages: resolution: {integrity: sha512-xrzMmz4JqwGyKQKTpFzlN0dx0TAiT7Ran1fqEBgEmEj+PU98crOFtysJgY+QdeSagx6EDRigQIXJVnfrI0ratA==} engines: {node: '>=v18'} - '@commitlint/load@19.2.0': - resolution: {integrity: sha512-XvxxLJTKqZojCxaBQ7u92qQLFMMZc4+p9qrIq/9kJDy8DOrEa7P1yx7Tjdc2u2JxIalqT4KOGraVgCE7eCYJyQ==} + '@commitlint/load@19.4.0': + resolution: {integrity: sha512-I4lCWaEZYQJ1y+Y+gdvbGAx9pYPavqZAZ3/7/8BpWh+QjscAn8AjsUpLV2PycBsEx7gupq5gM4BViV9xwTIJuw==} engines: {node: '>=v18'} '@commitlint/message@19.0.0': @@ -734,8 +737,8 @@ packages: resolution: {integrity: sha512-Il+tNyOb8VDxN3P6XoBBwWJtKKGzHlitEuXA5BP6ir/3loWlsSqDr5aecl6hZcC/spjq4pHqNh0qPlfeWu38QA==} engines: {node: '>=v18'} - '@commitlint/read@19.2.1': - resolution: {integrity: sha512-qETc4+PL0EUv7Q36lJbPG+NJiBOGg7SSC7B5BsPWOmei+Dyif80ErfWQ0qXoW9oCh7GTpTNRoaVhiI8RbhuaNw==} + '@commitlint/read@19.4.0': + resolution: {integrity: sha512-r95jLOEZzKDakXtnQub+zR3xjdnrl2XzerPwm7ch1/cc5JGq04tyaNpa6ty0CRCWdVrk4CZHhqHozb8yZwy2+g==} engines: {node: '>=v18'} '@commitlint/resolve-extends@19.1.0': @@ -1216,8 +1219,8 @@ packages: '@vue/compiler-sfc': optional: true - '@iconify/json@2.2.234': - resolution: {integrity: sha512-2z0+I0YhHelZ+MPX7wHsSGKv81PicsnVlRfCYNmhZ0s1tyPo7Kkvt8QWjytPZV6f/ypb111I5jpTFB+W7bcAgQ==} + '@iconify/json@2.2.235': + resolution: {integrity: sha512-8a5r/uIZY3DvJPCkRCMly0BgmsxItMTR6RjGnifQ0kGrLSE7TpdYIfQya9Ckd2qfWjD20WZmWblpFm1FcF6ybQ==} '@iconify/types@2.0.0': resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==} @@ -1635,6 +1638,12 @@ packages: '@popperjs/core@2.11.8': resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} + '@radix-ui/number@1.1.0': + resolution: {integrity: sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ==} + + '@radix-ui/primitive@1.1.0': + resolution: {integrity: sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==} + '@radix-ui/react-compose-refs@1.1.0': resolution: {integrity: sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==} peerDependencies: @@ -1644,6 +1653,24 @@ packages: '@types/react': optional: true + '@radix-ui/react-context@1.1.0': + resolution: {integrity: sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==} + peerDependencies: + '@types/react': npm:types-react@rc + react: npm:react@rc + peerDependenciesMeta: + '@types/react': + optional: true + + '@radix-ui/react-direction@1.1.0': + resolution: {integrity: sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==} + peerDependencies: + '@types/react': npm:types-react@rc + react: npm:react@rc + peerDependenciesMeta: + '@types/react': + optional: true + '@radix-ui/react-portal@1.1.1': resolution: {integrity: sha512-A3UtLk85UtqhzFqtoC8Q0KvR2GbXF3mtPgACSazajqq6A41mEQgo53iPzY4i6BwDxlIFqWIhiQ2G729n+2aw/g==} peerDependencies: @@ -1657,6 +1684,19 @@ packages: '@types/react-dom': optional: true + '@radix-ui/react-presence@1.1.0': + resolution: {integrity: sha512-Gq6wuRN/asf9H/E/VzdKoUtT8GC9PQc9z40/vEr0VCJ4u5XvvhWIrSsCB6vD2/cH7ugTdSfYq9fLJCcM00acrQ==} + peerDependencies: + '@types/react': npm:types-react@rc + '@types/react-dom': npm:types-react-dom@rc + react: npm:react@rc + react-dom: npm:react-dom@rc + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + '@radix-ui/react-primitive@2.0.0': resolution: {integrity: sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==} peerDependencies: @@ -1670,6 +1710,19 @@ packages: '@types/react-dom': optional: true + '@radix-ui/react-scroll-area@1.1.0': + resolution: {integrity: sha512-9ArIZ9HWhsrfqS765h+GZuLoxaRHD/j0ZWOWilsCvYTpYJp8XwCqNG7Dt9Nu/TItKOdgLGkOPCodQvDc+UMwYg==} + peerDependencies: + '@types/react': npm:types-react@rc + '@types/react-dom': npm:types-react-dom@rc + react: npm:react@rc + react-dom: npm:react-dom@rc + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + '@radix-ui/react-slot@1.1.0': resolution: {integrity: sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==} peerDependencies: @@ -1679,6 +1732,15 @@ packages: '@types/react': optional: true + '@radix-ui/react-use-callback-ref@1.1.0': + resolution: {integrity: sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==} + peerDependencies: + '@types/react': npm:types-react@rc + react: npm:react@rc + peerDependenciesMeta: + '@types/react': + optional: true + '@radix-ui/react-use-layout-effect@1.1.0': resolution: {integrity: sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==} peerDependencies: @@ -4182,16 +4244,12 @@ packages: javascript-natural-sort@0.7.1: resolution: {integrity: sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==} - jiti@1.21.0: - resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==} - hasBin: true - jiti@1.21.6: resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==} hasBin: true - jotai@2.9.1: - resolution: {integrity: sha512-t4Q7FIqQB3N/1art4OcqdlEtPmQ2h4DNIzTFhvt06WE0kCpQ1QoG+1A1IGTaQBi2KdDRsnywj+ojmHHKgw6PDA==} + jotai@2.9.2: + resolution: {integrity: sha512-jIBXEadOHCziOuMY6HAy2KQcHipGhnsbF+twqh8Lcmcz/Yei0gdBtW5mOYdKmbQxGqkvfvXM3w/oHtJ2WNGSFg==} engines: {node: '>=12.20.0'} peerDependencies: '@types/react': npm:types-react@rc @@ -4275,8 +4333,8 @@ packages: resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==} engines: {node: '>=0.10.0'} - knip@5.27.1: - resolution: {integrity: sha512-Cz1Mebby5oJNd11bEErhbu3Vnw678nrxTtwJEJjNFJ5f4OuCXGS1Uwc3Ml8B0Uh9JcolT4+5KPlw+sOsB/NBAg==} + knip@5.27.2: + resolution: {integrity: sha512-Mya1XEDq1oygibQf0uocQd02Fil8RtvNVhcFAcxypjcc6zakT7wsJtS0xvuwEitilfI0tiFC9PghmJQ3DMKuTg==} engines: {node: '>=18.6.0'} hasBin: true peerDependencies: @@ -4306,10 +4364,6 @@ packages: resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==} engines: {node: '>=10'} - lilconfig@3.1.1: - resolution: {integrity: sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==} - engines: {node: '>=14'} - lilconfig@3.1.2: resolution: {integrity: sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==} engines: {node: '>=14'} @@ -5098,10 +5152,6 @@ packages: resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==} engines: {node: ^10 || ^12 || >=14} - postcss@8.4.40: - resolution: {integrity: sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==} - engines: {node: ^10 || ^12 || >=14} - postcss@8.4.41: resolution: {integrity: sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==} engines: {node: ^10 || ^12 || >=14} @@ -5237,8 +5287,8 @@ packages: resolution: {integrity: sha512-RcSV/u+lPChcTB+A4fij0xkE204yzKdAsGUFy6+DrfUzWSawB+cu0n3WLmJcJXQ/VnmjSUlIrqmVLicRhT/gLA==} hasBin: true - react-dom@19.0.0-rc-df783f9ea1-20240708: - resolution: {integrity: sha512-Pr6WPfwXZOlO3mmG4cqH/fMoMAcUKXzVT/KJHZEEx8iQTtn0dBzwOV7exJV21qQqtLVLOfup4fBCH1aVlkdhig==} + react-dom@19.0.0-rc-e948a5ac-20240807: + resolution: {integrity: sha512-FVjbcTEsbHn00XuWb1Q0zeTHk27M5kAGw7k8Y1U/M748dIqJOoL64C5n9+YBq7XbGrk10c3wKLYB0DJ8LkBRzw==} peerDependencies: react: npm:react@rc @@ -5277,8 +5327,8 @@ packages: peerDependencies: react: npm:react@rc - react-i18next@15.0.0: - resolution: {integrity: sha512-2O3IgF4zivg57Q6p6i+ChDgJ371IDcEWbuWC6gvoh5NbkDMs0Q+O7RPr4v61+Se32E0V+LmtwePAeqWZW0bi6g==} + react-i18next@15.0.1: + resolution: {integrity: sha512-NwxLqNM6CLbeGA9xPsjits0EnXdKgCRSS6cgkgOdNcPXqL+1fYNl8fBg1wmnnHvFy812Bt4IWTPE9zjoPmFj3w==} peerDependencies: i18next: '>= 23.2.3' react: npm:react@rc @@ -5330,8 +5380,8 @@ packages: react: npm:react@rc react-dom: npm:react-dom@rc - react@19.0.0-rc-df783f9ea1-20240708: - resolution: {integrity: sha512-sEKaKkgwW0cbYIYhUJoTGNHlcXeJDATtiwwm13RoZgzCIRYkE38nOL1RGnY5xUqalXQS1jEObSJCQSeLLi5sEg==} + react@19.0.0-rc-e948a5ac-20240807: + resolution: {integrity: sha512-HQz6Ien3YXDqFFsZcoEagiXk43VOtyvEQAk2ZR/+99dnhRxlFT7e2n0g6qgeD2B/S7UZimiYS+HQS410xhvMxg==} engines: {node: '>=0.10.0'} read-cache@1.0.0: @@ -5478,8 +5528,8 @@ packages: sax@1.3.0: resolution: {integrity: sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==} - scheduler@0.25.0-rc-df783f9ea1-20240708: - resolution: {integrity: sha512-9Bge9CdWSZuKyIUuNRgX1NHgTV04WrqEonVbLSBv/DlWJvJjDQO8y/kPehrOP4db730Csn4/5DMFXmbTS5MBkA==} + scheduler@0.25.0-rc-e948a5ac-20240807: + resolution: {integrity: sha512-LH8rwsrnIYe1YTz0odUZWq5+rCZZqcw69DTx0eSnD1xx3q1AM60gEYrpis6Uf3p5bMU2wFxjtlubx/Pw+kvfCA==} screenfull@5.2.0: resolution: {integrity: sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==} @@ -5824,8 +5874,8 @@ packages: engines: {node: '>=8.9.0'} hasBin: true - tailwindcss@3.4.7: - resolution: {integrity: sha512-rxWZbe87YJb4OcSopb7up2Ba4U82BoiSGUdoDr3Ydrg9ckxFS/YWsvhN323GMcddgU65QRy7JndC7ahhInhvlQ==} + tailwindcss@3.4.8: + resolution: {integrity: sha512-GkP17r9GQkxgZ9FKHJQEnjJuKBcbFhMFzKu5slmN6NjlCuFnYJMQ8N4AZ6VrUyiRXlDtPKHkesuQ/MS913Nvdg==} engines: {node: '>=14.0.0'} hasBin: true @@ -6167,16 +6217,16 @@ packages: peerDependencies: vite: ^2.6.0 || 3 || 4 || 5 - vite-tsconfig-paths@4.3.2: - resolution: {integrity: sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==} + vite-tsconfig-paths@5.0.0: + resolution: {integrity: sha512-sCdKc6uC7ir102lW8deBiMnS0NGEs0100OJX8WZQmf3Uf7tJ/T3uQnzznq/tZWph7tkG+44JYOsKE7YTZjDn+Q==} peerDependencies: vite: '*' peerDependenciesMeta: vite: optional: true - vite@5.3.5: - resolution: {integrity: sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA==} + vite@5.4.0: + resolution: {integrity: sha512-5xokfMX0PIiwCMCMb9ZJcMyh5wbBun0zUzKib+L65vAZ8GY9ePZMXxFrHbr/Kyll2+LSCY7xtERPpxkBDKngwg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -6184,6 +6234,7 @@ packages: less: '*' lightningcss: ^1.21.0 sass: '*' + sass-embedded: '*' stylus: '*' sugarss: '*' terser: ^5.4.0 @@ -6196,6 +6247,8 @@ packages: optional: true sass: optional: true + sass-embedded: + optional: true stylus: optional: true sugarss: @@ -6324,11 +6377,6 @@ packages: resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} engines: {node: '>= 6'} - yaml@2.4.2: - resolution: {integrity: sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA==} - engines: {node: '>= 14'} - hasBin: true - yaml@2.5.0: resolution: {integrity: sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==} engines: {node: '>= 14'} @@ -6497,7 +6545,7 @@ snapshots: '@babel/helper-module-imports@7.24.3': dependencies: - '@babel/types': 7.24.5 + '@babel/types': 7.25.2 '@babel/helper-module-transforms@7.24.5(@babel/core@7.24.5)': dependencies: @@ -6681,12 +6729,12 @@ snapshots: '@babel/helper-validator-identifier': 7.24.7 to-fast-properties: 2.0.0 - '@commitlint/cli@19.3.0(@types/node@20.14.14)(typescript@5.5.4)': + '@commitlint/cli@19.4.0(@types/node@20.14.14)(typescript@5.5.4)': dependencies: '@commitlint/format': 19.3.0 '@commitlint/lint': 19.2.2 - '@commitlint/load': 19.2.0(@types/node@20.14.14)(typescript@5.5.4) - '@commitlint/read': 19.2.1 + '@commitlint/load': 19.4.0(@types/node@20.14.14)(typescript@5.5.4) + '@commitlint/read': 19.4.0 '@commitlint/types': 19.0.3 execa: 8.0.1 yargs: 17.7.2 @@ -6732,7 +6780,7 @@ snapshots: '@commitlint/rules': 19.0.3 '@commitlint/types': 19.0.3 - '@commitlint/load@19.2.0(@types/node@20.14.14)(typescript@5.5.4)': + '@commitlint/load@19.4.0(@types/node@20.14.14)(typescript@5.5.4)': dependencies: '@commitlint/config-validator': 19.0.3 '@commitlint/execute-rule': 19.0.0 @@ -6756,7 +6804,7 @@ snapshots: conventional-changelog-angular: 7.0.0 conventional-commits-parser: 5.0.0 - '@commitlint/read@19.2.1': + '@commitlint/read@19.4.0': dependencies: '@commitlint/top-level': 19.0.0 '@commitlint/types': 19.0.3 @@ -6811,29 +6859,29 @@ snapshots: '@ctrl/tinycolor@4.1.0': {} - '@dnd-kit/accessibility@3.1.0(react@19.0.0-rc-df783f9ea1-20240708)': + '@dnd-kit/accessibility@3.1.0(react@19.0.0-rc-e948a5ac-20240807)': dependencies: - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 tslib: 2.6.2 - '@dnd-kit/core@6.1.0(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)': + '@dnd-kit/core@6.1.0(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)': dependencies: - '@dnd-kit/accessibility': 3.1.0(react@19.0.0-rc-df783f9ea1-20240708) - '@dnd-kit/utilities': 3.2.2(react@19.0.0-rc-df783f9ea1-20240708) - react: 19.0.0-rc-df783f9ea1-20240708 - react-dom: 19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708) + '@dnd-kit/accessibility': 3.1.0(react@19.0.0-rc-e948a5ac-20240807) + '@dnd-kit/utilities': 3.2.2(react@19.0.0-rc-e948a5ac-20240807) + react: 19.0.0-rc-e948a5ac-20240807 + react-dom: 19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807) tslib: 2.6.2 - '@dnd-kit/sortable@8.0.0(@dnd-kit/core@6.1.0(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)': + '@dnd-kit/sortable@8.0.0(@dnd-kit/core@6.1.0(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)': dependencies: - '@dnd-kit/core': 6.1.0(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708) - '@dnd-kit/utilities': 3.2.2(react@19.0.0-rc-df783f9ea1-20240708) - react: 19.0.0-rc-df783f9ea1-20240708 + '@dnd-kit/core': 6.1.0(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807) + '@dnd-kit/utilities': 3.2.2(react@19.0.0-rc-e948a5ac-20240807) + react: 19.0.0-rc-e948a5ac-20240807 tslib: 2.6.2 - '@dnd-kit/utilities@3.2.2(react@19.0.0-rc-df783f9ea1-20240708)': + '@dnd-kit/utilities@3.2.2(react@19.0.0-rc-e948a5ac-20240807)': dependencies: - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 tslib: 2.6.2 '@dual-bundle/import-meta-resolve@4.1.0': {} @@ -6882,17 +6930,17 @@ snapshots: '@emotion/memoize@0.9.0': {} - '@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1)': + '@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': dependencies: '@babel/runtime': 7.24.8 '@emotion/babel-plugin': 11.12.0 '@emotion/cache': 11.13.0 '@emotion/serialize': 1.3.0 - '@emotion/use-insertion-effect-with-fallbacks': 1.1.0(react@19.0.0-rc-df783f9ea1-20240708) + '@emotion/use-insertion-effect-with-fallbacks': 1.1.0(react@19.0.0-rc-e948a5ac-20240807) '@emotion/utils': 1.4.0 '@emotion/weak-memoize': 0.4.0 hoist-non-react-statics: 3.3.2 - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 optionalDependencies: '@types/react': types-react@19.0.0-rc.1 @@ -6906,24 +6954,24 @@ snapshots: '@emotion/sheet@1.4.0': {} - '@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1)': + '@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': dependencies: '@babel/runtime': 7.24.8 '@emotion/babel-plugin': 11.12.0 '@emotion/is-prop-valid': 1.3.0 - '@emotion/react': 11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + '@emotion/react': 11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) '@emotion/serialize': 1.3.0 - '@emotion/use-insertion-effect-with-fallbacks': 1.1.0(react@19.0.0-rc-df783f9ea1-20240708) + '@emotion/use-insertion-effect-with-fallbacks': 1.1.0(react@19.0.0-rc-e948a5ac-20240807) '@emotion/utils': 1.4.0 - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 optionalDependencies: '@types/react': types-react@19.0.0-rc.1 '@emotion/unitless@0.9.0': {} - '@emotion/use-insertion-effect-with-fallbacks@1.1.0(react@19.0.0-rc-df783f9ea1-20240708)': + '@emotion/use-insertion-effect-with-fallbacks@1.1.0(react@19.0.0-rc-e948a5ac-20240807)': dependencies: - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 '@emotion/utils@1.4.0': {} @@ -7101,11 +7149,11 @@ snapshots: '@floating-ui/core': 1.6.1 '@floating-ui/utils': 0.2.2 - '@floating-ui/react-dom@2.0.9(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)': + '@floating-ui/react-dom@2.0.9(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)': dependencies: '@floating-ui/dom': 1.6.5 - react: 19.0.0-rc-df783f9ea1-20240708 - react-dom: 19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708) + react: 19.0.0-rc-e948a5ac-20240807 + react-dom: 19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807) '@floating-ui/utils@0.2.2': {} @@ -7114,13 +7162,13 @@ snapshots: postcss: 7.0.32 purgecss: 2.3.0 - '@generouted/react-router@1.19.6(react-router-dom@6.26.0(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(vite@5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0))': + '@generouted/react-router@1.19.6(react-router-dom@6.26.0(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(vite@5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0))': dependencies: fast-glob: 3.3.2 - generouted: 1.19.6(vite@5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)) - react: 19.0.0-rc-df783f9ea1-20240708 - react-router-dom: 6.26.0(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708) - vite: 5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0) + generouted: 1.19.6(vite@5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)) + react: 19.0.0-rc-e948a5ac-20240807 + react-router-dom: 6.26.0(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807) + vite: 5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0) '@humanwhocodes/config-array@0.11.14': dependencies: @@ -7146,7 +7194,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@iconify/json@2.2.234': + '@iconify/json@2.2.235': dependencies: '@iconify/types': 2.0.0 pathe: 1.1.2 @@ -7206,184 +7254,184 @@ snapshots: '@material/material-color-utilities@0.3.0': {} - '@mui/base@5.0.0-beta.40(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1)': + '@mui/base@5.0.0-beta.40(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': dependencies: '@babel/runtime': 7.24.8 - '@floating-ui/react-dom': 2.0.9(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708) + '@floating-ui/react-dom': 2.0.9(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807) '@mui/types': 7.2.15(types-react@19.0.0-rc.1) - '@mui/utils': 5.16.5(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + '@mui/utils': 5.16.5(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) '@popperjs/core': 2.11.8 clsx: 2.1.1 prop-types: 15.8.1 - react: 19.0.0-rc-df783f9ea1-20240708 - react-dom: 19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708) + react: 19.0.0-rc-e948a5ac-20240807 + react-dom: 19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807) optionalDependencies: '@types/react': types-react@19.0.0-rc.1 '@mui/core-downloads-tracker@5.16.6': {} - '@mui/icons-material@5.16.6(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1)': + '@mui/icons-material@5.16.6(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': dependencies: '@babel/runtime': 7.24.8 - '@mui/material': 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - react: 19.0.0-rc-df783f9ea1-20240708 + '@mui/material': 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + react: 19.0.0-rc-e948a5ac-20240807 optionalDependencies: '@types/react': types-react@19.0.0-rc.1 - '@mui/lab@5.0.0-alpha.173(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1)': + '@mui/lab@5.0.0-alpha.173(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': dependencies: '@babel/runtime': 7.24.8 - '@mui/base': 5.0.0-beta.40(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@mui/material': 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@mui/system': 5.16.5(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + '@mui/base': 5.0.0-beta.40(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@mui/material': 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@mui/system': 5.16.5(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) '@mui/types': 7.2.15(types-react@19.0.0-rc.1) - '@mui/utils': 5.16.5(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + '@mui/utils': 5.16.5(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) clsx: 2.1.1 prop-types: 15.8.1 - react: 19.0.0-rc-df783f9ea1-20240708 - react-dom: 19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708) + react: 19.0.0-rc-e948a5ac-20240807 + react-dom: 19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807) optionalDependencies: - '@emotion/react': 11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@emotion/styled': 11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + '@emotion/react': 11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@emotion/styled': 11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) '@types/react': types-react@19.0.0-rc.1 - '@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1)': + '@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': dependencies: '@babel/runtime': 7.24.8 '@mui/core-downloads-tracker': 5.16.6 - '@mui/system': 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + '@mui/system': 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) '@mui/types': 7.2.15(types-react@19.0.0-rc.1) - '@mui/utils': 5.16.6(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + '@mui/utils': 5.16.6(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) '@popperjs/core': 2.11.8 '@types/react-transition-group': 4.4.10 clsx: 2.1.1 csstype: 3.1.3 prop-types: 15.8.1 - react: 19.0.0-rc-df783f9ea1-20240708 - react-dom: 19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708) + react: 19.0.0-rc-e948a5ac-20240807 + react-dom: 19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807) react-is: 18.3.1 - react-transition-group: 4.4.5(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708) + react-transition-group: 4.4.5(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807) optionalDependencies: - '@emotion/react': 11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@emotion/styled': 11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + '@emotion/react': 11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@emotion/styled': 11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) '@types/react': types-react@19.0.0-rc.1 - '@mui/private-theming@5.16.5(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1)': + '@mui/private-theming@5.16.5(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': dependencies: '@babel/runtime': 7.24.8 - '@mui/utils': 5.16.5(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + '@mui/utils': 5.16.5(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) prop-types: 15.8.1 - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 optionalDependencies: '@types/react': types-react@19.0.0-rc.1 - '@mui/private-theming@5.16.6(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1)': + '@mui/private-theming@5.16.6(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': dependencies: '@babel/runtime': 7.24.8 - '@mui/utils': 5.16.6(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + '@mui/utils': 5.16.6(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) prop-types: 15.8.1 - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 optionalDependencies: '@types/react': types-react@19.0.0-rc.1 - '@mui/styled-engine@5.16.4(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)': + '@mui/styled-engine@5.16.4(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)': dependencies: '@babel/runtime': 7.24.8 '@emotion/cache': 11.13.0 csstype: 3.1.3 prop-types: 15.8.1 - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 optionalDependencies: - '@emotion/react': 11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@emotion/styled': 11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + '@emotion/react': 11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@emotion/styled': 11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) - '@mui/styled-engine@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)': + '@mui/styled-engine@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)': dependencies: '@babel/runtime': 7.24.8 '@emotion/cache': 11.13.0 csstype: 3.1.3 prop-types: 15.8.1 - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 optionalDependencies: - '@emotion/react': 11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@emotion/styled': 11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + '@emotion/react': 11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@emotion/styled': 11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) - '@mui/system@5.16.5(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1)': + '@mui/system@5.16.5(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': dependencies: '@babel/runtime': 7.24.8 - '@mui/private-theming': 5.16.5(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@mui/styled-engine': 5.16.4(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708) + '@mui/private-theming': 5.16.5(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@mui/styled-engine': 5.16.4(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807) '@mui/types': 7.2.15(types-react@19.0.0-rc.1) - '@mui/utils': 5.16.5(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + '@mui/utils': 5.16.5(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) clsx: 2.1.1 csstype: 3.1.3 prop-types: 15.8.1 - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 optionalDependencies: - '@emotion/react': 11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@emotion/styled': 11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + '@emotion/react': 11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@emotion/styled': 11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) '@types/react': types-react@19.0.0-rc.1 - '@mui/system@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1)': + '@mui/system@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': dependencies: '@babel/runtime': 7.24.8 - '@mui/private-theming': 5.16.6(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@mui/styled-engine': 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708) + '@mui/private-theming': 5.16.6(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@mui/styled-engine': 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807) '@mui/types': 7.2.15(types-react@19.0.0-rc.1) - '@mui/utils': 5.16.6(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + '@mui/utils': 5.16.6(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) clsx: 2.1.1 csstype: 3.1.3 prop-types: 15.8.1 - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 optionalDependencies: - '@emotion/react': 11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@emotion/styled': 11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + '@emotion/react': 11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@emotion/styled': 11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) '@types/react': types-react@19.0.0-rc.1 '@mui/types@7.2.15(types-react@19.0.0-rc.1)': optionalDependencies: '@types/react': types-react@19.0.0-rc.1 - '@mui/utils@5.16.5(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1)': + '@mui/utils@5.16.5(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': dependencies: '@babel/runtime': 7.24.8 '@mui/types': 7.2.15(types-react@19.0.0-rc.1) '@types/prop-types': 15.7.12 clsx: 2.1.1 prop-types: 15.8.1 - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 react-is: 18.3.1 optionalDependencies: '@types/react': types-react@19.0.0-rc.1 - '@mui/utils@5.16.6(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1)': + '@mui/utils@5.16.6(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': dependencies: '@babel/runtime': 7.24.8 '@mui/types': 7.2.15(types-react@19.0.0-rc.1) '@types/prop-types': 15.7.12 clsx: 2.1.1 prop-types: 15.8.1 - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 react-is: 18.3.1 optionalDependencies: '@types/react': types-react@19.0.0-rc.1 - '@mui/x-date-pickers@7.9.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(dayjs@1.11.12)(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1)': + '@mui/x-date-pickers@7.9.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(dayjs@1.11.12)(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': dependencies: '@babel/runtime': 7.24.8 - '@mui/base': 5.0.0-beta.40(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@mui/material': 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@mui/system': 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@mui/utils': 5.16.6(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + '@mui/base': 5.0.0-beta.40(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@mui/material': 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@mui/system': 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@mui/utils': 5.16.6(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) '@types/react-transition-group': 4.4.10 clsx: 2.1.1 prop-types: 15.8.1 - react: 19.0.0-rc-df783f9ea1-20240708 - react-dom: 19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708) - react-transition-group: 4.4.5(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708) + react: 19.0.0-rc-e948a5ac-20240807 + react-dom: 19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807) + react-transition-group: 4.4.5(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807) optionalDependencies: - '@emotion/react': 11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@emotion/styled': 11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + '@emotion/react': 11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@emotion/styled': 11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) dayjs: 1.11.12 transitivePeerDependencies: - '@types/react' @@ -7606,37 +7654,82 @@ snapshots: '@popperjs/core@2.11.8': {} - '@radix-ui/react-compose-refs@1.1.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1)': + '@radix-ui/number@1.1.0': {} + + '@radix-ui/primitive@1.1.0': {} + + '@radix-ui/react-compose-refs@1.1.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': dependencies: - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 optionalDependencies: '@types/react': types-react@19.0.0-rc.1 - '@radix-ui/react-portal@1.1.1(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1)': + '@radix-ui/react-context@1.1.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': dependencies: - '@radix-ui/react-primitive': 2.0.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@radix-ui/react-use-layout-effect': 1.1.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 optionalDependencies: '@types/react': types-react@19.0.0-rc.1 - '@radix-ui/react-primitive@2.0.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1)': + '@radix-ui/react-direction@1.1.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': dependencies: - '@radix-ui/react-slot': 1.1.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 optionalDependencies: '@types/react': types-react@19.0.0-rc.1 - '@radix-ui/react-slot@1.1.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1)': + '@radix-ui/react-portal@1.1.1(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': dependencies: - '@radix-ui/react-compose-refs': 1.1.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - react: 19.0.0-rc-df783f9ea1-20240708 + '@radix-ui/react-primitive': 2.0.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@radix-ui/react-use-layout-effect': 1.1.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + react: 19.0.0-rc-e948a5ac-20240807 optionalDependencies: '@types/react': types-react@19.0.0-rc.1 - '@radix-ui/react-use-layout-effect@1.1.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1)': + '@radix-ui/react-presence@1.1.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': dependencies: - react: 19.0.0-rc-df783f9ea1-20240708 + '@radix-ui/react-compose-refs': 1.1.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@radix-ui/react-use-layout-effect': 1.1.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + react: 19.0.0-rc-e948a5ac-20240807 + optionalDependencies: + '@types/react': types-react@19.0.0-rc.1 + + '@radix-ui/react-primitive@2.0.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': + dependencies: + '@radix-ui/react-slot': 1.1.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + react: 19.0.0-rc-e948a5ac-20240807 + optionalDependencies: + '@types/react': types-react@19.0.0-rc.1 + + '@radix-ui/react-scroll-area@1.1.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': + dependencies: + '@radix-ui/number': 1.1.0 + '@radix-ui/primitive': 1.1.0 + '@radix-ui/react-compose-refs': 1.1.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@radix-ui/react-context': 1.1.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@radix-ui/react-direction': 1.1.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@radix-ui/react-presence': 1.1.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@radix-ui/react-primitive': 2.0.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@radix-ui/react-use-callback-ref': 1.1.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@radix-ui/react-use-layout-effect': 1.1.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + react: 19.0.0-rc-e948a5ac-20240807 + optionalDependencies: + '@types/react': types-react@19.0.0-rc.1 + + '@radix-ui/react-slot@1.1.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': + dependencies: + '@radix-ui/react-compose-refs': 1.1.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + react: 19.0.0-rc-e948a5ac-20240807 + optionalDependencies: + '@types/react': types-react@19.0.0-rc.1 + + '@radix-ui/react-use-callback-ref@1.1.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': + dependencies: + react: 19.0.0-rc-e948a5ac-20240807 + optionalDependencies: + '@types/react': types-react@19.0.0-rc.1 + + '@radix-ui/react-use-layout-effect@1.1.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1)': + dependencies: + react: 19.0.0-rc-e948a5ac-20240807 optionalDependencies: '@types/react': types-react@19.0.0-rc.1 @@ -7840,17 +7933,17 @@ snapshots: dependencies: remove-accents: 0.5.0 - '@tanstack/react-table@8.19.3(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)': + '@tanstack/react-table@8.19.3(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)': dependencies: '@tanstack/table-core': 8.19.3 - react: 19.0.0-rc-df783f9ea1-20240708 - react-dom: 19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708) + react: 19.0.0-rc-e948a5ac-20240807 + react-dom: 19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807) - '@tanstack/react-virtual@3.8.3(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)': + '@tanstack/react-virtual@3.8.3(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)': dependencies: '@tanstack/virtual-core': 3.8.3 - react: 19.0.0-rc-df783f9ea1-20240708 - react-dom: 19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708) + react: 19.0.0-rc-e948a5ac-20240807 + react-dom: 19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807) '@tanstack/table-core@8.19.3': {} @@ -8246,21 +8339,21 @@ snapshots: '@ungap/structured-clone@1.2.0': {} - '@vitejs/plugin-react-swc@3.7.0(vite@5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0))': + '@vitejs/plugin-react-swc@3.7.0(vite@5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0))': dependencies: '@swc/core': 1.6.1 - vite: 5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0) + vite: 5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0) transitivePeerDependencies: - '@swc/helpers' - '@vitejs/plugin-react@4.3.1(vite@5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0))': + '@vitejs/plugin-react@4.3.1(vite@5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0))': dependencies: '@babel/core': 7.24.5 '@babel/plugin-transform-react-jsx-self': 7.24.5(@babel/core@7.24.5) '@babel/plugin-transform-react-jsx-source': 7.24.1(@babel/core@7.24.5) '@types/babel__core': 7.20.5 react-refresh: 0.14.2 - vite: 5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0) + vite: 5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0) transitivePeerDependencies: - supports-color @@ -8305,14 +8398,14 @@ snapshots: clean-stack: 5.2.0 indent-string: 5.0.0 - ahooks@3.8.0(react@19.0.0-rc-df783f9ea1-20240708): + ahooks@3.8.0(react@19.0.0-rc-e948a5ac-20240807): dependencies: '@babel/runtime': 7.24.6 dayjs: 1.11.11 intersection-observer: 0.12.2 js-cookie: 2.2.1 lodash: 4.17.21 - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 react-fast-compare: 3.2.2 resize-observer-polyfill: 1.5.1 screenfull: 5.2.0 @@ -8332,16 +8425,16 @@ snapshots: require-from-string: 2.0.2 uri-js: 4.4.1 - allotment@1.20.2(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708): + allotment@1.20.2(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807): dependencies: classnames: 2.5.1 eventemitter3: 5.0.1 lodash.clamp: 4.0.3 lodash.debounce: 4.0.8 lodash.isequal: 4.5.0 - react: 19.0.0-rc-df783f9ea1-20240708 - react-dom: 19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708) - use-resize-observer: 9.1.0(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708) + react: 19.0.0-rc-e948a5ac-20240807 + react-dom: 19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807) + use-resize-observer: 9.1.0(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807) ansi-align@2.0.0: dependencies: @@ -9780,13 +9873,13 @@ snapshots: fraction.js@4.3.7: {} - framer-motion@12.0.0-alpha.0(@emotion/is-prop-valid@1.3.0)(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708): + framer-motion@12.0.0-alpha.0(@emotion/is-prop-valid@1.3.0)(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807): dependencies: tslib: 2.6.2 optionalDependencies: '@emotion/is-prop-valid': 1.3.0 - react: 19.0.0-rc-df783f9ea1-20240708 - react-dom: 19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708) + react: 19.0.0-rc-e948a5ac-20240807 + react-dom: 19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807) fs-extra@11.2.0: dependencies: @@ -9816,9 +9909,9 @@ snapshots: functions-have-names@1.2.3: {} - generouted@1.19.6(vite@5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)): + generouted@1.19.6(vite@5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)): dependencies: - vite: 5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0) + vite: 5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0) gensync@1.0.0-beta.2: {} @@ -10352,14 +10445,12 @@ snapshots: javascript-natural-sort@0.7.1: optional: true - jiti@1.21.0: {} - jiti@1.21.6: {} - jotai@2.9.1(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1): + jotai@2.9.2(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1): optionalDependencies: '@types/react': types-react@19.0.0-rc.1 - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 js-cookie@2.2.1: {} @@ -10421,7 +10512,7 @@ snapshots: kind-of@6.0.3: {} - knip@5.27.1(@types/node@20.14.14)(typescript@5.5.4): + knip@5.27.2(@types/node@20.14.14)(typescript@5.5.4): dependencies: '@nodelib/fs.walk': 1.2.8 '@snyk/github-codeowners': 1.1.0 @@ -10471,8 +10562,6 @@ snapshots: lilconfig@2.1.0: {} - lilconfig@3.1.1: {} - lilconfig@3.1.2: {} lines-and-columns@1.2.4: {} @@ -10596,19 +10685,19 @@ snapshots: escape-string-regexp: 4.0.0 optional: true - material-react-table@2.13.1(v6klvv7qq3oqdau37hnr43dlum): + material-react-table@2.13.1(tm7kuompb3st4orj6tmr52l63e): dependencies: - '@emotion/react': 11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@emotion/styled': 11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@mui/icons-material': 5.16.6(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@mui/material': 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@mui/x-date-pickers': 7.9.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(dayjs@1.11.12)(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + '@emotion/react': 11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@emotion/styled': 11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@mui/icons-material': 5.16.6(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@mui/material': 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@mui/x-date-pickers': 7.9.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(dayjs@1.11.12)(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) '@tanstack/match-sorter-utils': 8.15.1 - '@tanstack/react-table': 8.19.3(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708) - '@tanstack/react-virtual': 3.8.3(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708) + '@tanstack/react-table': 8.19.3(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807) + '@tanstack/react-virtual': 3.8.3(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807) highlight-words: 1.2.2 - react: 19.0.0-rc-df783f9ea1-20240708 - react-dom: 19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708) + react: 19.0.0-rc-e948a5ac-20240807 + react-dom: 19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807) mathml-tag-names@2.1.3: {} @@ -10910,14 +10999,14 @@ snapshots: ms@2.1.3: {} - mui-color-input@3.0.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1): + mui-color-input@3.0.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1): dependencies: '@ctrl/tinycolor': 4.1.0 - '@emotion/react': 11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@emotion/styled': 11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@mui/material': 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - react: 19.0.0-rc-df783f9ea1-20240708 - react-dom: 19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708) + '@emotion/react': 11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@emotion/styled': 11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@mui/material': 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + react: 19.0.0-rc-e948a5ac-20240807 + react-dom: 19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807) optionalDependencies: '@types/react': types-react@19.0.0-rc.1 @@ -11146,7 +11235,7 @@ snapshots: parse-json@5.2.0: dependencies: - '@babel/code-frame': 7.24.2 + '@babel/code-frame': 7.24.7 error-ex: 1.3.2 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 @@ -11258,8 +11347,8 @@ snapshots: postcss-load-config@4.0.2(postcss@8.4.41): dependencies: - lilconfig: 3.1.1 - yaml: 2.4.2 + lilconfig: 3.1.2 + yaml: 2.5.0 optionalDependencies: postcss: 8.4.41 @@ -11351,12 +11440,6 @@ snapshots: picocolors: 1.0.1 source-map-js: 1.2.0 - postcss@8.4.40: - dependencies: - nanoid: 3.3.7 - picocolors: 1.0.1 - source-map-js: 1.2.0 - postcss@8.4.41: dependencies: nanoid: 3.3.7 @@ -11454,50 +11537,50 @@ snapshots: - supports-color - utf-8-validate - react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708): + react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807): dependencies: - react: 19.0.0-rc-df783f9ea1-20240708 - scheduler: 0.25.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 + scheduler: 0.25.0-rc-e948a5ac-20240807 - react-error-boundary@4.0.13(react@19.0.0-rc-df783f9ea1-20240708): + react-error-boundary@4.0.13(react@19.0.0-rc-e948a5ac-20240807): dependencies: '@babel/runtime': 7.24.5 - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 react-fast-compare@3.2.2: {} - react-fast-marquee@1.6.5(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708): + react-fast-marquee@1.6.5(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807): dependencies: - react: 19.0.0-rc-df783f9ea1-20240708 - react-dom: 19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708) + react: 19.0.0-rc-e948a5ac-20240807 + react-dom: 19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807) - react-hook-form-mui@7.0.1(4s5fqkimzxhijq4pilwibt7tdm): + react-hook-form-mui@7.0.1(7xgojhwrwkzcetsx7pzz5bdopa): dependencies: - '@mui/material': 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - react: 19.0.0-rc-df783f9ea1-20240708 - react-hook-form: 7.52.1(react@19.0.0-rc-df783f9ea1-20240708) + '@mui/material': 5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + react: 19.0.0-rc-e948a5ac-20240807 + react-hook-form: 7.52.1(react@19.0.0-rc-e948a5ac-20240807) optionalDependencies: - '@mui/icons-material': 5.16.6(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) - '@mui/x-date-pickers': 7.9.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1))(dayjs@1.11.12)(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1) + '@mui/icons-material': 5.16.6(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) + '@mui/x-date-pickers': 7.9.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@mui/material@5.16.6(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1))(dayjs@1.11.12)(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1) - react-hook-form@7.52.1(react@19.0.0-rc-df783f9ea1-20240708): + react-hook-form@7.52.1(react@19.0.0-rc-e948a5ac-20240807): dependencies: - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 - react-i18next@15.0.0(i18next@23.12.2)(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708): + react-i18next@15.0.1(i18next@23.12.2)(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807): dependencies: '@babel/runtime': 7.24.8 html-parse-stringify: 3.0.1 i18next: 23.12.2 - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 optionalDependencies: - react-dom: 19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708) + react-dom: 19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807) react-is@16.13.1: {} react-is@18.3.1: {} - react-markdown@9.0.1(react@19.0.0-rc-df783f9ea1-20240708)(types-react@19.0.0-rc.1): + react-markdown@9.0.1(react@19.0.0-rc-e948a5ac-20240807)(types-react@19.0.0-rc.1): dependencies: '@types/hast': 3.0.4 '@types/react': types-react@19.0.0-rc.1 @@ -11505,7 +11588,7 @@ snapshots: hast-util-to-jsx-runtime: 2.3.0 html-url-attributes: 3.0.0 mdast-util-to-hast: 13.1.0 - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 remark-parse: 11.0.0 remark-rehype: 11.1.0 unified: 11.0.4 @@ -11516,34 +11599,34 @@ snapshots: react-refresh@0.14.2: {} - react-router-dom@6.26.0(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708): + react-router-dom@6.26.0(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807): dependencies: '@remix-run/router': 1.19.0 - react: 19.0.0-rc-df783f9ea1-20240708 - react-dom: 19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708) - react-router: 6.26.0(react@19.0.0-rc-df783f9ea1-20240708) + react: 19.0.0-rc-e948a5ac-20240807 + react-dom: 19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807) + react-router: 6.26.0(react@19.0.0-rc-e948a5ac-20240807) - react-router@6.26.0(react@19.0.0-rc-df783f9ea1-20240708): + react-router@6.26.0(react@19.0.0-rc-e948a5ac-20240807): dependencies: '@remix-run/router': 1.19.0 - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 - react-split-grid@1.0.4(react@19.0.0-rc-df783f9ea1-20240708): + react-split-grid@1.0.4(react@19.0.0-rc-e948a5ac-20240807): dependencies: prop-types: 15.8.1 - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 split-grid: 1.0.11 - react-transition-group@4.4.5(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708): + react-transition-group@4.4.5(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807): dependencies: '@babel/runtime': 7.24.8 dom-helpers: 5.2.1 loose-envify: 1.4.0 prop-types: 15.8.1 - react: 19.0.0-rc-df783f9ea1-20240708 - react-dom: 19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708) + react: 19.0.0-rc-e948a5ac-20240807 + react-dom: 19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807) - react@19.0.0-rc-df783f9ea1-20240708: {} + react@19.0.0-rc-e948a5ac-20240807: {} read-cache@1.0.0: dependencies: @@ -11726,7 +11809,7 @@ snapshots: sax@1.3.0: {} - scheduler@0.25.0-rc-df783f9ea1-20240708: {} + scheduler@0.25.0-rc-e948a5ac-20240807: {} screenfull@5.2.0: {} @@ -12093,11 +12176,11 @@ snapshots: svg-tags@1.0.0: {} - swr@2.2.5(react@19.0.0-rc-df783f9ea1-20240708): + swr@2.2.5(react@19.0.0-rc-e948a5ac-20240807): dependencies: client-only: 0.0.1 - react: 19.0.0-rc-df783f9ea1-20240708 - use-sync-external-store: 1.2.2(react@19.0.0-rc-df783f9ea1-20240708) + react: 19.0.0-rc-e948a5ac-20240807 + use-sync-external-store: 1.2.2(react@19.0.0-rc-e948a5ac-20240807) synckit@0.9.1: dependencies: @@ -12143,7 +12226,7 @@ snapshots: reduce-css-calc: 2.1.8 resolve: 1.22.8 - tailwindcss@3.4.7: + tailwindcss@3.4.8: dependencies: '@alloc/quick-lru': 5.2.0 arg: 5.0.2 @@ -12153,7 +12236,7 @@ snapshots: fast-glob: 3.3.2 glob-parent: 6.0.2 is-glob: 4.0.3 - jiti: 1.21.0 + jiti: 1.21.6 lilconfig: 2.1.0 micromatch: 4.0.7 normalize-path: 3.0.0 @@ -12164,7 +12247,7 @@ snapshots: postcss-js: 4.0.1(postcss@8.4.41) postcss-load-config: 4.0.2(postcss@8.4.41) postcss-nested: 6.0.1(postcss@8.4.41) - postcss-selector-parser: 6.1.0 + postcss-selector-parser: 6.1.1 resolve: 1.22.8 sucrase: 3.35.0 transitivePeerDependencies: @@ -12509,15 +12592,15 @@ snapshots: dependencies: prepend-http: 1.0.4 - use-resize-observer@9.1.0(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708): + use-resize-observer@9.1.0(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807): dependencies: '@juggle/resize-observer': 3.4.0 - react: 19.0.0-rc-df783f9ea1-20240708 - react-dom: 19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708) + react: 19.0.0-rc-e948a5ac-20240807 + react-dom: 19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807) - use-sync-external-store@1.2.2(react@19.0.0-rc-df783f9ea1-20240708): + use-sync-external-store@1.2.2(react@19.0.0-rc-e948a5ac-20240807): dependencies: - react: 19.0.0-rc-df783f9ea1-20240708 + react: 19.0.0-rc-e948a5ac-20240807 utf-8-validate@5.0.10: dependencies: @@ -12536,50 +12619,50 @@ snapshots: unist-util-stringify-position: 4.0.0 vfile-message: 4.0.2 - virtua@0.33.4(react-dom@19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708))(react@19.0.0-rc-df783f9ea1-20240708): + virtua@0.33.4(react-dom@19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807))(react@19.0.0-rc-e948a5ac-20240807): optionalDependencies: - react: 19.0.0-rc-df783f9ea1-20240708 - react-dom: 19.0.0-rc-df783f9ea1-20240708(react@19.0.0-rc-df783f9ea1-20240708) + react: 19.0.0-rc-e948a5ac-20240807 + react-dom: 19.0.0-rc-e948a5ac-20240807(react@19.0.0-rc-e948a5ac-20240807) vite-plugin-monaco-editor-new@1.1.3(monaco-editor@0.50.0): dependencies: esbuild: 0.19.12 monaco-editor: 0.50.0 - vite-plugin-sass-dts@1.3.25(postcss@8.4.41)(prettier@3.3.3)(sass@1.77.8)(vite@5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)): + vite-plugin-sass-dts@1.3.25(postcss@8.4.41)(prettier@3.3.3)(sass@1.77.8)(vite@5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)): dependencies: postcss: 8.4.41 postcss-js: 4.0.1(postcss@8.4.41) prettier: 3.3.3 sass: 1.77.8 - vite: 5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0) + vite: 5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0) - vite-plugin-svgr@4.2.0(rollup@4.17.2)(typescript@5.5.4)(vite@5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)): + vite-plugin-svgr@4.2.0(rollup@4.17.2)(typescript@5.5.4)(vite@5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)): dependencies: '@rollup/pluginutils': 5.1.0(rollup@4.17.2) '@svgr/core': 8.1.0(typescript@5.5.4) '@svgr/plugin-jsx': 8.1.0(@svgr/core@8.1.0(typescript@5.5.4)) - vite: 5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0) + vite: 5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0) transitivePeerDependencies: - rollup - supports-color - typescript - vite-tsconfig-paths@4.3.2(typescript@5.5.4)(vite@5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)): + vite-tsconfig-paths@5.0.0(typescript@5.5.4)(vite@5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0)): dependencies: - debug: 4.3.4 + debug: 4.3.6 globrex: 0.1.2 tsconfck: 3.0.3(typescript@5.5.4) optionalDependencies: - vite: 5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0) + vite: 5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0) transitivePeerDependencies: - supports-color - typescript - vite@5.3.5(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0): + vite@5.4.0(@types/node@20.14.14)(less@4.2.0)(sass@1.77.8)(stylus@0.62.0): dependencies: esbuild: 0.21.5 - postcss: 8.4.40 + postcss: 8.4.41 rollup: 4.17.2 optionalDependencies: '@types/node': 20.14.14 @@ -12722,8 +12805,6 @@ snapshots: yaml@1.10.2: {} - yaml@2.4.2: {} - yaml@2.5.0: {} yargs-parser@21.1.1: {} diff --git a/lede/target/linux/mediatek/image/filogic.mk b/lede/target/linux/mediatek/image/filogic.mk index f824d65273..51a4437477 100644 --- a/lede/target/linux/mediatek/image/filogic.mk +++ b/lede/target/linux/mediatek/image/filogic.mk @@ -241,8 +241,7 @@ define Device/cmcc_rax3000m-emmc DEVICE_MODEL := RAX3000M (eMMC version) DEVICE_DTS := mt7981b-cmcc-rax3000m-emmc DEVICE_DTS_DIR := ../dts - DEVICE_PACKAGES := kmod-mt7981-firmware mt7981-wo-firmware kmod-usb3 \ - automount f2fsck mkf2fs + DEVICE_PACKAGES := kmod-mt7981-firmware mt7981-wo-firmware kmod-usb3 f2fsck mkf2fs KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb KERNEL_INITRAMFS := kernel-bin | lzma | \ fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k @@ -255,7 +254,7 @@ define Device/cmcc_rax3000m-nand DEVICE_MODEL := RAX3000M (NAND version) DEVICE_DTS := mt7981b-cmcc-rax3000m-nand DEVICE_DTS_DIR := ../dts - DEVICE_PACKAGES := kmod-mt7981-firmware mt7981-wo-firmware kmod-usb3 automount + DEVICE_PACKAGES := kmod-mt7981-firmware mt7981-wo-firmware kmod-usb3 UBINIZE_OPTS := -E 5 BLOCKSIZE := 128k PAGESIZE := 2048 diff --git a/lede/target/linux/qualcommax/Makefile b/lede/target/linux/qualcommax/Makefile index e35f55a46e..feafd5a950 100644 --- a/lede/target/linux/qualcommax/Makefile +++ b/lede/target/linux/qualcommax/Makefile @@ -18,6 +18,6 @@ DEFAULT_PACKAGES += \ kmod-qca-nss-ecm kmod-qca-nss-drv-bridge-mgr \ kmod-qca-nss-drv-vlan kmod-qca-nss-drv-pppoe \ kmod-ath11k-ahb wpad-openssl uboot-envtools \ - e2fsprogs kmod-fs-ext4 losetup autocore-arm + e2fsprogs f2fsck mkf2fs losetup automount $(eval $(call BuildTarget)) diff --git a/lede/target/linux/x86/Makefile b/lede/target/linux/x86/Makefile index e3f18e4f08..ea417b9161 100644 --- a/lede/target/linux/x86/Makefile +++ b/lede/target/linux/x86/Makefile @@ -8,7 +8,7 @@ ARCH:=i386 BOARD:=x86 BOARDNAME:=x86 FEATURES:=squashfs vdi vmdk vhdx pcmcia fpu boot-part rootfs-part -SUBTARGETS:=64 generic legacy geode +SUBTARGETS:=64 generic geode legacy KERNEL_PATCHVER:=6.6 KERNEL_TESTING_PATCHVER:=6.1 @@ -17,8 +17,8 @@ KERNELNAME:=bzImage include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs kmod-button-hotplug kmod-usb-hid kmod-mmc kmod-sdhci kmod-fs-f2fs amd64-microcode intel-microcode cfdisk usbutils pciutils \ -kmod-alx kmod-e1000e kmod-igb kmod-igc kmod-igbvf kmod-iavf kmod-bnx2x kmod-pcnet32 kmod-tulip kmod-via-velocity kmod-vmxnet3 kmod-i40e kmod-i40evf \ +DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs kmod-button-hotplug kmod-fs-f2fs kmod-mmc kmod-sdhci kmod-usb-hid amd64-microcode intel-microcode cfdisk \ +kmod-alx kmod-bnx2x kmod-i40e kmod-i40evf kmod-iavf kmod-igb kmod-igbvf kmod-igc kmod-e1000e kmod-pcnet32 kmod-tulip kmod-via-velocity kmod-vmxnet3 \ kmod-sound-hda-core kmod-sound-hda-codec-realtek kmod-sound-hda-codec-via kmod-sound-via82xx kmod-sound-hda-intel kmod-sound-hda-codec-hdmi kmod-sound-i8x0 \ kmod-usb-net kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8150 kmod-usb-net-aqc111 kmod-mlx4-core kmod-mlx5-core kmod-drm-i915 kmod-drm-amdgpu kmod-usb-audio \ kmod-usb-net-rtl8152-vendor kmod-r8125 kmod-r8126 kmod-r8168 kmod-8139cp kmod-8139too kmod-tg3 htop lm-sensors autocore-x86 automount autosamba ca-bundle diff --git a/mihomo/component/power/event_windows.go b/mihomo/component/power/event_windows.go index 1265569522..a9489df417 100644 --- a/mihomo/component/power/event_windows.go +++ b/mihomo/component/power/event_windows.go @@ -55,6 +55,11 @@ func NewEventListener(cb func(Type)) (func(), error) { } handle := uintptr(0) + // DWORD PowerRegisterSuspendResumeNotification( + // [in] DWORD Flags, + // [in] HANDLE Recipient, + // [out] PHPOWERNOTIFY RegistrationHandle + //); _, _, err := powerRegisterSuspendResumeNotification.Call( _DEVICE_NOTIFY_CALLBACK, uintptr(unsafe.Pointer(¶ms)), @@ -65,8 +70,11 @@ func NewEventListener(cb func(Type)) (func(), error) { } return func() { + // DWORD PowerUnregisterSuspendResumeNotification( + // [in, out] HPOWERNOTIFY RegistrationHandle + //); _, _, _ = powerUnregisterSuspendResumeNotification.Call( - uintptr(unsafe.Pointer(&handle)), + handle, ) runtime.KeepAlive(params) runtime.KeepAlive(handle) diff --git a/mihomo/go.mod b/mihomo/go.mod index ca4c4bece4..90c252798b 100644 --- a/mihomo/go.mod +++ b/mihomo/go.mod @@ -7,7 +7,7 @@ require ( github.com/bahlo/generic-list-go v0.2.0 github.com/cilium/ebpf v0.12.3 github.com/coreos/go-iptables v0.7.0 - github.com/dlclark/regexp2 v1.11.2 + github.com/dlclark/regexp2 v1.11.4 github.com/go-chi/chi/v5 v5.1.0 github.com/go-chi/cors v1.2.1 github.com/go-chi/render v1.0.3 @@ -20,7 +20,7 @@ require ( github.com/mdlayher/netlink v1.7.2 github.com/metacubex/chacha v0.1.0 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 - github.com/metacubex/quic-go v0.45.1-0.20240803003931-60a15f6efd94 + github.com/metacubex/quic-go v0.46.1-0.20240807232329-1c6cb2d67f58 github.com/metacubex/randv2 v0.2.0 github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 github.com/metacubex/sing-shadowsocks v0.2.8 @@ -50,11 +50,11 @@ require ( gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7 go.uber.org/automaxprocs v1.5.3 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba - golang.org/x/crypto v0.25.0 + golang.org/x/crypto v0.26.0 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 - golang.org/x/net v0.27.0 - golang.org/x/sync v0.7.0 - golang.org/x/sys v0.22.0 + golang.org/x/net v0.28.0 + golang.org/x/sync v0.8.0 + golang.org/x/sys v0.23.0 google.golang.org/protobuf v1.34.2 gopkg.in/yaml.v3 v3.0.1 lukechampine.com/blake3 v1.3.0 @@ -108,7 +108,7 @@ require ( gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect go.uber.org/mock v0.4.0 // indirect golang.org/x/mod v0.19.0 // indirect - golang.org/x/text v0.16.0 // indirect + golang.org/x/text v0.17.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.23.0 // indirect ) diff --git a/mihomo/go.sum b/mihomo/go.sum index aef02f4bab..d5b5705371 100644 --- a/mihomo/go.sum +++ b/mihomo/go.sum @@ -26,8 +26,8 @@ github.com/coreos/go-iptables v0.7.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFE github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dlclark/regexp2 v1.11.2 h1:/u628IuisSTwri5/UKloiIsH8+qF2Pu7xEQX+yIKg68= -github.com/dlclark/regexp2 v1.11.2/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= +github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo= +github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 h1:/5RkVc9Rc81XmMyVqawCiDyrBHZbLAZgTTCqou4mwj8= github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9/go.mod h1:hkIFzoiIPZYxdFOOLyDho59b7SrDfo+w3h+yWdlg45I= github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 h1:8j2RH289RJplhA6WfdaPqzg1MjH2K8wX5e0uhAxrw2g= @@ -103,8 +103,8 @@ github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvO github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88= github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec h1:HxreOiFTUrJXJautEo8rnE1uKTVGY8wtZepY1Tii/Nc= github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec/go.mod h1:8BVmQ+3cxjqzWElafm24rb2Ae4jRI6vAXNXWqWjfrXw= -github.com/metacubex/quic-go v0.45.1-0.20240803003931-60a15f6efd94 h1:wlhwgxRzPLH8Ce0VME35iD2sr7jY2gFrL299/T4C2Sg= -github.com/metacubex/quic-go v0.45.1-0.20240803003931-60a15f6efd94/go.mod h1:Yza2H7Ax1rxWPUcJx0vW+oAt9EsPuSiyQFhFabUPzwU= +github.com/metacubex/quic-go v0.46.1-0.20240807232329-1c6cb2d67f58 h1:T6OxROLZBr9SOQxN5TzUslv81hEREy/dEgaUKVjaG7U= +github.com/metacubex/quic-go v0.46.1-0.20240807232329-1c6cb2d67f58/go.mod h1:Yza2H7Ax1rxWPUcJx0vW+oAt9EsPuSiyQFhFabUPzwU= github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiLs= github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY= github.com/metacubex/sing v0.0.0-20240724044459-6f3cf5896297 h1:YG/JkwGPbca5rUtEMHIu8ZuqzR7BSVm1iqY8hNoMeMA= @@ -226,8 +226,8 @@ go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBs go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= -golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= +golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= @@ -236,11 +236,11 @@ golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -257,12 +257,12 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= +golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= diff --git a/openwrt-passwall/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua b/openwrt-passwall/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua index bfe0822504..b3cc60ddde 100644 --- a/openwrt-passwall/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua +++ b/openwrt-passwall/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua @@ -201,26 +201,28 @@ if not fs.access(CACHE_DNS_PATH) then end end + local fwd_dns + local ipset_flag + local no_ipv6 + --始终用国内DNS解析节点域名 if true then + fwd_dns = LOCAL_DNS if USE_DEFAULT_DNS == "chinadns_ng" and CHINADNS_DNS ~= "0" then + fwd_dns = nil else uci:foreach(appname, "nodes", function(t) local address = t.address if address == "engage.cloudflareclient.com" then return end if datatypes.hostname(address) then - set_domain_dns(address, LOCAL_DNS) + set_domain_dns(address, fwd_dns) set_domain_ipset(address, setflag_4 .. "passwall_vpslist," .. setflag_6 .. "passwall_vpslist6") end end) end - log(string.format(" - 节点列表中的域名(vpslist)：%s", LOCAL_DNS or "默认")) + log(string.format(" - 节点列表中的域名(vpslist)：%s", fwd_dns or "默认")) end - local fwd_dns - local ipset_flag - local no_ipv6 - --直连（白名单）列表 if USE_DIRECT_LIST == "1" then if fs.access("/usr/share/passwall/rules/direct_host") then diff --git a/sing-box/debug_go119.go b/sing-box/debug.go similarity index 97% rename from sing-box/debug_go119.go rename to sing-box/debug.go index cf522afb72..2fa962d642 100644 --- a/sing-box/debug_go119.go +++ b/sing-box/debug.go @@ -1,5 +1,3 @@ -//go:build go1.19 - package box import ( diff --git a/sing-box/debug_go118.go b/sing-box/debug_go118.go deleted file mode 100644 index bb132efb98..0000000000 --- a/sing-box/debug_go118.go +++ /dev/null @@ -1,36 +0,0 @@ -//go:build !go1.19 - -package box - -import ( - "runtime/debug" - - "github.com/sagernet/sing-box/common/conntrack" - "github.com/sagernet/sing-box/option" -) - -func applyDebugOptions(options option.DebugOptions) { - applyDebugListenOption(options) - if options.GCPercent != nil { - debug.SetGCPercent(*options.GCPercent) - } - if options.MaxStack != nil { - debug.SetMaxStack(*options.MaxStack) - } - if options.MaxThreads != nil { - debug.SetMaxThreads(*options.MaxThreads) - } - if options.PanicOnFault != nil { - debug.SetPanicOnFault(*options.PanicOnFault) - } - if options.TraceBack != "" { - debug.SetTraceback(options.TraceBack) - } - if options.MemoryLimit != 0 { - // debug.SetMemoryLimit(int64(options.MemoryLimit)) - conntrack.MemoryLimit = uint64(options.MemoryLimit) - } - if options.OOMKiller != nil { - conntrack.KillerEnabled = *options.OOMKiller - } -} diff --git a/sing-box/docs/changelog.md b/sing-box/docs/changelog.md index c73553d5c1..39940253f3 100644 --- a/sing-box/docs/changelog.md +++ b/sing-box/docs/changelog.md @@ -2,8 +2,9 @@ icon: material/alert-decagram --- -#### 1.10.0-alpha.28 +#### 1.10.0-alpha.29 +* Update quic-go to v0.46.0 * Fixes and improvements #### 1.10.0-alpha.25 diff --git a/sing-box/go.mod b/sing-box/go.mod index 3c18419265..57234f9b0a 100644 --- a/sing-box/go.mod +++ b/sing-box/go.mod @@ -24,9 +24,9 @@ require ( github.com/sagernet/fswatch v0.1.1 github.com/sagernet/gomobile v0.1.3 github.com/sagernet/gvisor v0.0.0-20240428053021-e691de28565f - github.com/sagernet/quic-go v0.45.2-beta.1 + github.com/sagernet/quic-go v0.46.0-beta.2 github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691 - github.com/sagernet/sing v0.5.0-alpha.14.0.20240806051909-7beca62e4f0d + github.com/sagernet/sing v0.5.0-alpha.15 github.com/sagernet/sing-dns v0.3.0-beta.14 github.com/sagernet/sing-mux v0.2.0 github.com/sagernet/sing-quic v0.2.0-beta.12 diff --git a/sing-box/go.sum b/sing-box/go.sum index 275e91e421..fce7696380 100644 --- a/sing-box/go.sum +++ b/sing-box/go.sum @@ -110,13 +110,13 @@ github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZN github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM= github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I= github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8= -github.com/sagernet/quic-go v0.45.2-beta.1 h1:Gu/vYzKZI7EZItGSkCnatod8c32Nq1hzM5jqCYuc3aY= -github.com/sagernet/quic-go v0.45.2-beta.1/go.mod h1:+N3FqM9DAzOWfe64uxXuBejVJwX7DeW7BslzLO6N/xI= +github.com/sagernet/quic-go v0.46.0-beta.2 h1:D/k9P3btgg0CvtUFVlQsUyN9GkLj0fMG59FOlEz1In8= +github.com/sagernet/quic-go v0.46.0-beta.2/go.mod h1:Zt3LVudHvhFRa7uO7hjtLAYJ9wFzYv4F17+LedJSw44= github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691 h1:5Th31OC6yj8byLGkEnIYp6grlXfo1QYUfiYFGjewIdc= github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691/go.mod h1:B8lp4WkQ1PwNnrVMM6KyuFR20pU8jYBD+A4EhJovEXU= github.com/sagernet/sing v0.2.18/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo= -github.com/sagernet/sing v0.5.0-alpha.14.0.20240806051909-7beca62e4f0d h1:OvHB9r8Ao1UBMO9vdmmfnxSdi92Y/wRmSg7CVGMP/M4= -github.com/sagernet/sing v0.5.0-alpha.14.0.20240806051909-7beca62e4f0d/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak= +github.com/sagernet/sing v0.5.0-alpha.15 h1:Jqc+8MukOIdwyzAK48bK0uHmYUnfMdfGcXTxrB7OTVE= +github.com/sagernet/sing v0.5.0-alpha.15/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak= github.com/sagernet/sing-dns v0.3.0-beta.14 h1:/s+fJzYKsvLaNDt/2rjpsrDcN8wmCO2JbX6OFrl8Nww= github.com/sagernet/sing-dns v0.3.0-beta.14/go.mod h1:rscgSr5ixOPk8XM9ZMLuMXCyldEQ1nLvdl0nfv+lp00= github.com/sagernet/sing-mux v0.2.0 h1:4C+vd8HztJCWNYfufvgL49xaOoOHXty2+EAjnzN3IYo= diff --git a/small/luci-app-passwall/root/usr/share/passwall/app.sh b/small/luci-app-passwall/root/usr/share/passwall/app.sh index 08ea6e3b25..0188e32a15 100755 --- a/small/luci-app-passwall/root/usr/share/passwall/app.sh +++ b/small/luci-app-passwall/root/usr/share/passwall/app.sh @@ -24,7 +24,7 @@ DNS_PORT=15353 TUN_DNS="127.0.0.1#${DNS_PORT}" LOCAL_DNS=119.29.29.29,223.5.5.5 DEFAULT_DNS= -FW_APPEND_DNS= +IPT_APPEND_DNS= ENABLED_DEFAULT_ACL=0 PROXY_IPV6=0 PROXY_IPV6_UDP=0 @@ -1357,7 +1357,7 @@ stop_crontab() { start_dns() { echolog "DNS域名解析：" - local china_ng_local_dns=${LOCAL_DNS} + local china_ng_local_dns=$(IFS=','; set -- $LOCAL_DNS; [ "${1%%[#:]*}" = "127.0.0.1" ] && echo "$1" || ([ -n "$2" ] && echo "$1,$2" || echo "$1")) local sing_box_local_dns= local direct_dns_mode=$(config_t_get global direct_dns_mode "auto") case "$direct_dns_mode" in @@ -1365,7 +1365,7 @@ start_dns() { LOCAL_DNS=$(config_t_get global direct_dns_udp 223.5.5.5 | sed 's/:/#/g') china_ng_local_dns=${LOCAL_DNS} sing_box_local_dns="direct_dns_udp_server=${LOCAL_DNS}" - FW_APPEND_DNS=${LOCAL_DNS} + IPT_APPEND_DNS=${LOCAL_DNS} ;; tcp) LOCAL_DNS="127.0.0.1#${dns_listen_port}" @@ -1373,7 +1373,7 @@ start_dns() { local DIRECT_DNS=$(config_t_get global direct_dns_tcp 223.5.5.5 | sed 's/:/#/g') china_ng_local_dns="tcp://${DIRECT_DNS}" sing_box_local_dns="direct_dns_tcp_server=${DIRECT_DNS}" - FW_APPEND_DNS="${LOCAL_DNS},${DIRECT_DNS}" + IPT_APPEND_DNS="${LOCAL_DNS},${DIRECT_DNS}" ln_run "$(first_type dns2tcp)" dns2tcp "/dev/null" -L "${LOCAL_DNS}" -R "$(get_first_dns DIRECT_DNS 53)" -v echolog " - dns2tcp(${LOCAL_DNS}) -> tcp://$(get_first_dns DIRECT_DNS 53 | sed 's/#/:/g')" echolog " * 请确保上游直连 DNS 支持 TCP 查询。" @@ -1392,7 +1392,7 @@ start_dns() { local tmp_dot_ip=$(echo "$DIRECT_DNS" | sed -n 's/.*:\/\/\([^@#]*@\)*\([^@#]*\).*/\2/p') local tmp_dot_port=$(echo "$DIRECT_DNS" | sed -n 's/.*#\([0-9]\+\).*/\1/p') sing_box_local_dns="direct_dns_dot_server=$tmp_dot_ip#${tmp_dot_port:-853}" - FW_APPEND_DNS="${LOCAL_DNS},$tmp_dot_ip#${tmp_dot_port:-853}" + IPT_APPEND_DNS="${LOCAL_DNS},$tmp_dot_ip#${tmp_dot_port:-853}" else echolog " - 你的ChinaDNS-NG版本不支持DoT，直连DNS将使用默认地址。" fi @@ -1692,7 +1692,7 @@ acl_app() { chinadns_port=$(expr $chinadns_port + 1) _china_ng_listen="127.0.0.1#${chinadns_port}" - _chinadns_local_dns=${LOCAL_DNS} + _chinadns_local_dns=$(IFS=','; set -- $LOCAL_DNS; [ "${1%%[#:]*}" = "127.0.0.1" ] && echo "$1" || ([ -n "$2" ] && echo "$1,$2" || echo "$1")) _direct_dns_mode=$(config_t_get global direct_dns_mode "auto") case "${_direct_dns_mode}" in udp) @@ -1999,7 +1999,7 @@ DEFAULT_DNSMASQ_CFGID=$(uci show dhcp.@dnsmasq[0] | awk -F '.' '{print $2}' | a DEFAULT_DNS=$(uci show dhcp.@dnsmasq[0] | grep "\.server=" | awk -F '=' '{print $2}' | sed "s/'//g" | tr ' ' '\n' | grep -v "\/" | head -2 | sed ':label;N;s/\n/,/;b label') [ -z "${DEFAULT_DNS}" ] && [ "$(echo $ISP_DNS | tr ' ' '\n' | wc -l)" -le 2 ] && DEFAULT_DNS=$(echo -n $ISP_DNS | tr ' ' '\n' | head -2 | tr '\n' ',') LOCAL_DNS="${DEFAULT_DNS:-119.29.29.29,223.5.5.5}" -FW_APPEND_DNS=${LOCAL_DNS} +IPT_APPEND_DNS=${LOCAL_DNS} DNS_QUERY_STRATEGY="UseIP" [ "$FILTER_PROXY_IPV6" = "1" ] && DNS_QUERY_STRATEGY="UseIPv4" diff --git a/small/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua b/small/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua index bfe0822504..b3cc60ddde 100644 --- a/small/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua +++ b/small/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua @@ -201,26 +201,28 @@ if not fs.access(CACHE_DNS_PATH) then end end + local fwd_dns + local ipset_flag + local no_ipv6 + --始终用国内DNS解析节点域名 if true then + fwd_dns = LOCAL_DNS if USE_DEFAULT_DNS == "chinadns_ng" and CHINADNS_DNS ~= "0" then + fwd_dns = nil else uci:foreach(appname, "nodes", function(t) local address = t.address if address == "engage.cloudflareclient.com" then return end if datatypes.hostname(address) then - set_domain_dns(address, LOCAL_DNS) + set_domain_dns(address, fwd_dns) set_domain_ipset(address, setflag_4 .. "passwall_vpslist," .. setflag_6 .. "passwall_vpslist6") end end) end - log(string.format(" - 节点列表中的域名(vpslist)：%s", LOCAL_DNS or "默认")) + log(string.format(" - 节点列表中的域名(vpslist)：%s", fwd_dns or "默认")) end - local fwd_dns - local ipset_flag - local no_ipv6 - --直连（白名单）列表 if USE_DIRECT_LIST == "1" then if fs.access("/usr/share/passwall/rules/direct_host") then diff --git a/small/luci-app-passwall/root/usr/share/passwall/iptables.sh b/small/luci-app-passwall/root/usr/share/passwall/iptables.sh index 1b69f2122e..3cb7bbfb21 100755 --- a/small/luci-app-passwall/root/usr/share/passwall/iptables.sh +++ b/small/luci-app-passwall/root/usr/share/passwall/iptables.sh @@ -841,21 +841,24 @@ add_firewall_rule() { $ipt_m -N PSW_OUTPUT $ipt_m -A PSW_OUTPUT $(dst $IPSET_LANLIST) -j RETURN $ipt_m -A PSW_OUTPUT $(dst $IPSET_VPSLIST) -j RETURN - [ -n "$FW_APPEND_DNS" ] && { - for local_dns in $(echo $FW_APPEND_DNS | tr ',' ' '); do - local dns_address=$(echo "$local_dns" | sed -E 's/(@|\[)?([0-9a-fA-F:.]+)(@|#|$).*/\2/') - local dns_port=$(echo "$local_dns" | sed -nE 's/.*#([0-9]+)$/\1/p') - if echo "$dns_address" | grep -q ':'; then - $ip6t_m -A PSW_OUTPUT -p udp -d ${dns_address} --dport ${dns_port:-53} -j RETURN - $ip6t_m -A PSW_OUTPUT -p tcp -d ${dns_address} --dport ${dns_port:-53} -j RETURN - echolog " - [$?]追加直连DNS到iptables：[${dns_address}]:${dns_port:-53}" - else + + [ -n "$IPT_APPEND_DNS" ] && { + local local_dns dns_address dns_port + for local_dns in $(echo $IPT_APPEND_DNS | tr ',' ' '); do + dns_address=$(echo "$local_dns" | sed -E 's/(@|\[)?([0-9a-fA-F:.]+)(@|#|$).*/\2/') + dns_port=$(echo "$local_dns" | sed -nE 's/.*#([0-9]+)$/\1/p') + if echo "$dns_address" | grep -q -v ':'; then $ipt_m -A PSW_OUTPUT -p udp -d ${dns_address} --dport ${dns_port:-53} -j RETURN $ipt_m -A PSW_OUTPUT -p tcp -d ${dns_address} --dport ${dns_port:-53} -j RETURN echolog " - [$?]追加直连DNS到iptables：${dns_address}:${dns_port:-53}" + else + $ip6t_m -A PSW_OUTPUT -p udp -d ${dns_address} --dport ${dns_port:-53} -j RETURN + $ip6t_m -A PSW_OUTPUT -p tcp -d ${dns_address} --dport ${dns_port:-53} -j RETURN + echolog " - [$?]追加直连DNS到iptables：[${dns_address}]:${dns_port:-53}" fi done } + [ "${USE_DIRECT_LIST}" = "1" ] && $ipt_m -A PSW_OUTPUT $(dst $IPSET_WHITELIST) -j RETURN $ipt_m -A PSW_OUTPUT -m mark --mark 0xff -j RETURN [ "${USE_BLOCK_LIST}" = "1" ] && $ipt_m -A PSW_OUTPUT $(dst $IPSET_BLOCKLIST) -j DROP diff --git a/small/luci-app-passwall/root/usr/share/passwall/nftables.sh b/small/luci-app-passwall/root/usr/share/passwall/nftables.sh index 0a7135adb5..84b60880ad 100755 --- a/small/luci-app-passwall/root/usr/share/passwall/nftables.sh +++ b/small/luci-app-passwall/root/usr/share/passwall/nftables.sh @@ -865,21 +865,7 @@ add_firewall_rule() { nft "flush chain inet fw4 PSW_OUTPUT_MANGLE" nft "add rule inet fw4 PSW_OUTPUT_MANGLE ip daddr @$NFTSET_LANLIST counter return" nft "add rule inet fw4 PSW_OUTPUT_MANGLE ip daddr @$NFTSET_VPSLIST counter return" - [ -n "$FW_APPEND_DNS" ] && { - for local_dns in $(echo $FW_APPEND_DNS | tr ',' ' '); do - local dns_address=$(echo "$local_dns" | sed -E 's/(@|\[)?([0-9a-fA-F:.]+)(@|#|$).*/\2/') - local dns_port=$(echo "$local_dns" | sed -nE 's/.*#([0-9]+)$/\1/p') - if echo "$dns_address" | grep -q ':'; then - nft "add rule inet fw4 PSW_OUTPUT_MANGLE_V6 meta l4proto udp ip6 daddr ${dns_address} $(factor ${dns_port:-53} "udp dport") counter return" - nft "add rule inet fw4 PSW_OUTPUT_MANGLE_V6 meta l4proto tcp ip6 daddr ${dns_address} $(factor ${dns_port:-53} "tcp dport") counter return" - echolog " - [$?]追加直连DNS到nftables：[${dns_address}]:${dns_port:-53}" - else - nft "add rule inet fw4 PSW_OUTPUT_MANGLE ip protocol udp ip daddr ${dns_address} $(factor ${dns_port:-53} "udp dport") counter return" - nft "add rule inet fw4 PSW_OUTPUT_MANGLE ip protocol tcp ip daddr ${dns_address} $(factor ${dns_port:-53} "tcp dport") counter return" - echolog " - [$?]追加直连DNS到nftables：${dns_address}:${dns_port:-53}" - fi - done - } + [ "${USE_DIRECT_LIST}" = "1" ] && nft "add rule inet fw4 PSW_OUTPUT_MANGLE ip daddr @$NFTSET_WHITELIST counter return" nft "add rule inet fw4 PSW_OUTPUT_MANGLE meta mark 0xff counter return" [ "${USE_BLOCK_LIST}" = "1" ] && nft "add rule inet fw4 PSW_OUTPUT_MANGLE ip daddr @$NFTSET_BLOCKLIST counter drop" @@ -946,6 +932,23 @@ add_firewall_rule() { nft "add rule inet fw4 PSW_OUTPUT_MANGLE_V6 meta mark 0xff counter return" [ "${USE_BLOCK_LIST}" = "1" ] && nft "add rule inet fw4 PSW_OUTPUT_MANGLE_V6 ip6 daddr @$NFTSET_BLOCKLIST6 counter drop" + [ -n "$IPT_APPEND_DNS" ] && { + local local_dns dns_address dns_port + for local_dns in $(echo $IPT_APPEND_DNS | tr ',' ' '); do + dns_address=$(echo "$local_dns" | sed -E 's/(@|\[)?([0-9a-fA-F:.]+)(@|#|$).*/\2/') + dns_port=$(echo "$local_dns" | sed -nE 's/.*#([0-9]+)$/\1/p') + if echo "$dns_address" | grep -q -v ':'; then + nft "add rule inet fw4 PSW_OUTPUT_MANGLE ip protocol udp ip daddr ${dns_address} $(factor ${dns_port:-53} "udp dport") counter return" + nft "add rule inet fw4 PSW_OUTPUT_MANGLE ip protocol tcp ip daddr ${dns_address} $(factor ${dns_port:-53} "tcp dport") counter return" + echolog " - [$?]追加直连DNS到nftables：${dns_address}:${dns_port:-53}" + else + nft "add rule inet fw4 PSW_OUTPUT_MANGLE_V6 meta l4proto udp ip6 daddr ${dns_address} $(factor ${dns_port:-53} "udp dport") counter return" + nft "add rule inet fw4 PSW_OUTPUT_MANGLE_V6 meta l4proto tcp ip6 daddr ${dns_address} $(factor ${dns_port:-53} "tcp dport") counter return" + echolog " - [$?]追加直连DNS到nftables：[${dns_address}]:${dns_port:-53}" + fi + done + } + # jump chains [ "$PROXY_IPV6" == "1" ] && { nft "add rule inet fw4 mangle_prerouting meta nfproto {ipv6} counter jump PSW_MANGLE_V6" diff --git a/small/v2ray-geodata/Makefile b/small/v2ray-geodata/Makefile index 28fbe75c28..0db4d10dac 100644 --- a/small/v2ray-geodata/Makefile +++ b/small/v2ray-geodata/Makefile @@ -12,13 +12,13 @@ PKG_MAINTAINER:=Tianling Shen include $(INCLUDE_DIR)/package.mk -GEOIP_VER:=202408032148 +GEOIP_VER:=202408080046 GEOIP_FILE:=geoip.dat.$(GEOIP_VER) define Download/geoip URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/ URL_FILE:=geoip.dat FILE:=$(GEOIP_FILE) - HASH:=b55e5bd8aca7797e4d19872842759e4754e9ca1294a4d8731843ff791e1ef928 + HASH:=4438f89e13c984986d66177ab933da76f1c0ac71334f5fd606f1f9d88f1f0a9a endef GEOSITE_VER:=20240807074444 diff --git a/xray-core/common/reflect/marshal.go b/xray-core/common/reflect/marshal.go index 736afc0167..dce34168a0 100644 --- a/xray-core/common/reflect/marshal.go +++ b/xray-core/common/reflect/marshal.go @@ -2,13 +2,17 @@ package reflect import ( "encoding/json" + "fmt" "reflect" + "strings" + cnet "github.com/xtls/xray-core/common/net" cserial "github.com/xtls/xray-core/common/serial" + "github.com/xtls/xray-core/infra/conf" ) -func MarshalToJson(v interface{}) (string, bool) { - if itf := marshalInterface(v, true); itf != nil { +func MarshalToJson(v interface{}, insertTypeInfo bool) (string, bool) { + if itf := marshalInterface(v, true, insertTypeInfo); itf != nil { if b, err := json.MarshalIndent(itf, "", " "); err == nil { return string(b[:]), true } @@ -16,7 +20,7 @@ func MarshalToJson(v interface{}) (string, bool) { return "", false } -func marshalTypedMessage(v *cserial.TypedMessage, ignoreNullValue bool) interface{} { +func marshalTypedMessage(v *cserial.TypedMessage, ignoreNullValue bool, insertTypeInfo bool) interface{} { if v == nil { return nil } @@ -24,36 +28,67 @@ func marshalTypedMessage(v *cserial.TypedMessage, ignoreNullValue bool) interfac if err != nil { return nil } - r := marshalInterface(tmsg, ignoreNullValue) - if msg, ok := r.(map[string]interface{}); ok { + r := marshalInterface(tmsg, ignoreNullValue, insertTypeInfo) + if msg, ok := r.(map[string]interface{}); ok && insertTypeInfo { msg["_TypedMessage_"] = v.Type } return r } -func marshalSlice(v reflect.Value, ignoreNullValue bool) interface{} { +func marshalSlice(v reflect.Value, ignoreNullValue bool, insertTypeInfo bool) interface{} { r := make([]interface{}, 0) for i := 0; i < v.Len(); i++ { rv := v.Index(i) if rv.CanInterface() { value := rv.Interface() - r = append(r, marshalInterface(value, ignoreNullValue)) + r = append(r, marshalInterface(value, ignoreNullValue, insertTypeInfo)) } } return r } -func marshalStruct(v reflect.Value, ignoreNullValue bool) interface{} { +func isNullValue(f reflect.StructField, rv reflect.Value) bool { + if rv.Kind() == reflect.String && rv.Len() == 0 { + return true + } else if !isValueKind(rv.Kind()) && rv.IsNil() { + return true + } else if tag := f.Tag.Get("json"); strings.Contains(tag, "omitempty") { + if !rv.IsValid() || rv.IsZero() { + return true + } + } + return false +} + +func toJsonName(f reflect.StructField) string { + if tags := f.Tag.Get("protobuf"); len(tags) > 0 { + for _, tag := range strings.Split(tags, ",") { + if before, after, ok := strings.Cut(tag, "="); ok && before == "json" { + return after + } + } + } + if tag := f.Tag.Get("json"); len(tag) > 0 { + if before, _, ok := strings.Cut(tag, ","); ok { + return before + } else { + return tag + } + } + return f.Name +} + +func marshalStruct(v reflect.Value, ignoreNullValue bool, insertTypeInfo bool) interface{} { r := make(map[string]interface{}) t := v.Type() for i := 0; i < v.NumField(); i++ { rv := v.Field(i) if rv.CanInterface() { ft := t.Field(i) - name := ft.Name - value := rv.Interface() - tv := marshalInterface(value, ignoreNullValue) - if tv != nil || !ignoreNullValue { + if !ignoreNullValue || !isNullValue(ft, rv) { + name := toJsonName(ft) + value := rv.Interface() + tv := marshalInterface(value, ignoreNullValue, insertTypeInfo) r[name] = tv } } @@ -61,7 +96,7 @@ func marshalStruct(v reflect.Value, ignoreNullValue bool) interface{} { return r } -func marshalMap(v reflect.Value, ignoreNullValue bool) interface{} { +func marshalMap(v reflect.Value, ignoreNullValue bool, insertTypeInfo bool) interface{} { // policy.level is map[uint32] *struct kt := v.Type().Key() vt := reflect.TypeOf((*interface{})(nil)) @@ -71,7 +106,7 @@ func marshalMap(v reflect.Value, ignoreNullValue bool) interface{} { rv := v.MapIndex(key) if rv.CanInterface() { iv := rv.Interface() - tv := marshalInterface(iv, ignoreNullValue) + tv := marshalInterface(iv, ignoreNullValue, insertTypeInfo) if tv != nil || !ignoreNullValue { r.SetMapIndex(key, reflect.ValueOf(&tv)) } @@ -87,27 +122,63 @@ func marshalIString(v interface{}) (r string, ok bool) { ok = false } }() - if iStringFn, ok := v.(interface{ String() string }); ok { return iStringFn.String(), true } return "", false } -func marshalKnownType(v interface{}, ignoreNullValue bool) (interface{}, bool) { +func serializePortList(portList *cnet.PortList) (interface{}, bool) { + if portList == nil { + return nil, false + } + + n := len(portList.Range) + if n == 1 { + if first := portList.Range[0]; first.From == first.To { + return first.From, true + } + } + + r := make([]string, 0, n) + for _, pr := range portList.Range { + if pr.From == pr.To { + r = append(r, pr.FromPort().String()) + } else { + r = append(r, fmt.Sprintf("%d-%d", pr.From, pr.To)) + } + } + return strings.Join(r, ","), true +} + +func marshalKnownType(v interface{}, ignoreNullValue bool, insertTypeInfo bool) (interface{}, bool) { switch ty := v.(type) { case cserial.TypedMessage: - return marshalTypedMessage(&ty, ignoreNullValue), true + return marshalTypedMessage(&ty, ignoreNullValue, insertTypeInfo), true case *cserial.TypedMessage: - return marshalTypedMessage(ty, ignoreNullValue), true + return marshalTypedMessage(ty, ignoreNullValue, insertTypeInfo), true case map[string]json.RawMessage: return ty, true case []json.RawMessage: return ty, true - case *json.RawMessage: - return ty, true - case json.RawMessage: + case *json.RawMessage, json.RawMessage: return ty, true + case *cnet.IPOrDomain: + if domain := v.(*cnet.IPOrDomain); domain != nil { + return domain.AsAddress().String(), true + } + return nil, false + case *cnet.PortList: + npl := v.(*cnet.PortList) + return serializePortList(npl) + case *conf.PortList: + cpl := v.(*conf.PortList) + return serializePortList(cpl.Build()) + case cnet.Address: + if addr := v.(cnet.Address); addr != nil { + return addr.String(), true + } + return nil, false default: return nil, false } @@ -138,9 +209,9 @@ func isValueKind(kind reflect.Kind) bool { } } -func marshalInterface(v interface{}, ignoreNullValue bool) interface{} { +func marshalInterface(v interface{}, ignoreNullValue bool, insertTypeInfo bool) interface{} { - if r, ok := marshalKnownType(v, ignoreNullValue); ok { + if r, ok := marshalKnownType(v, ignoreNullValue, insertTypeInfo); ok { return r } @@ -152,19 +223,27 @@ func marshalInterface(v interface{}, ignoreNullValue bool) interface{} { if k == reflect.Invalid { return nil } - if isValueKind(k) { + + if ty := rv.Type().Name(); isValueKind(k) { + if k.String() != ty { + if s, ok := marshalIString(v); ok { + return s + } + } return v } + // fmt.Println("kind:", k, "type:", rv.Type().Name()) + switch k { case reflect.Struct: - return marshalStruct(rv, ignoreNullValue) + return marshalStruct(rv, ignoreNullValue, insertTypeInfo) case reflect.Slice: - return marshalSlice(rv, ignoreNullValue) + return marshalSlice(rv, ignoreNullValue, insertTypeInfo) case reflect.Array: - return marshalSlice(rv, ignoreNullValue) + return marshalSlice(rv, ignoreNullValue, insertTypeInfo) case reflect.Map: - return marshalMap(rv, ignoreNullValue) + return marshalMap(rv, ignoreNullValue, insertTypeInfo) default: break } diff --git a/xray-core/common/reflect/marshal_test.go b/xray-core/common/reflect/marshal_test.go index 377ad4e914..359abae0b8 100644 --- a/xray-core/common/reflect/marshal_test.go +++ b/xray-core/common/reflect/marshal_test.go @@ -6,11 +6,40 @@ import ( "strings" "testing" + "github.com/xtls/xray-core/common/protocol" . "github.com/xtls/xray-core/common/reflect" cserial "github.com/xtls/xray-core/common/serial" iserial "github.com/xtls/xray-core/infra/conf/serial" + "github.com/xtls/xray-core/proxy/shadowsocks" ) +func TestMashalAccount(t *testing.T) { + account := &shadowsocks.Account{ + Password: "shadowsocks-password", + CipherType: shadowsocks.CipherType_CHACHA20_POLY1305, + } + + user := &protocol.User{ + Level: 0, + Email: "love@v2ray.com", + Account: cserial.ToTypedMessage(account), + } + + j, ok := MarshalToJson(user, false) + if !ok || strings.Contains(j, "_TypedMessage_") { + + t.Error("marshal account failed") + } + + kws := []string{"CHACHA20_POLY1305", "cipherType", "shadowsocks-password"} + for _, kw := range kws { + if !strings.Contains(j, kw) { + t.Error("marshal account failed") + } + } + // t.Log(j) +} + func TestMashalStruct(t *testing.T) { type Foo = struct { N int `json:"n"` @@ -36,8 +65,8 @@ func TestMashalStruct(t *testing.T) { Arr: &arr, } - s, ok1 := MarshalToJson(f1) - sp, ok2 := MarshalToJson(&f1) + s, ok1 := MarshalToJson(f1, true) + sp, ok2 := MarshalToJson(&f1, true) if !ok1 || !ok2 || s != sp { t.Error("marshal failed") @@ -69,7 +98,7 @@ func TestMarshalConfigJson(t *testing.T) { } tmsg := cserial.ToTypedMessage(bc) - tc, ok := MarshalToJson(tmsg) + tc, ok := MarshalToJson(tmsg, true) if !ok { t.Error("marshal config failed") } @@ -79,15 +108,14 @@ func TestMarshalConfigJson(t *testing.T) { keywords := []string{ "4784f9b8-a879-4fec-9718-ebddefa47750", "bing.com", - "DomainStrategy", - "InboundTag", - "Level", - "Stats", - "UserDownlink", - "UserUplink", - "System", - "InboundDownlink", - "OutboundUplink", + "inboundTag", + "level", + "stats", + "userDownlink", + "userUplink", + "system", + "inboundDownlink", + "outboundUplink", } for _, kw := range keywords { if !strings.Contains(tc, kw) { diff --git a/xray-core/go.mod b/xray-core/go.mod index ff42f9171e..d484016798 100644 --- a/xray-core/go.mod +++ b/xray-core/go.mod @@ -12,7 +12,7 @@ require ( github.com/miekg/dns v1.1.61 github.com/pelletier/go-toml v1.9.5 github.com/pires/go-proxyproto v0.7.0 - github.com/quic-go/quic-go v0.45.2 + github.com/quic-go/quic-go v0.46.0 github.com/refraction-networking/utls v1.6.7 github.com/sagernet/sing v0.4.1 github.com/sagernet/sing-shadowsocks v0.2.7 diff --git a/xray-core/go.sum b/xray-core/go.sum index 8b16d691f8..59e6a9dc19 100644 --- a/xray-core/go.sum +++ b/xray-core/go.sum @@ -112,8 +112,8 @@ github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7q github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= -github.com/quic-go/quic-go v0.45.2 h1:DfqBmqjb4ExSdxRIb/+qXhPC+7k6+DUNZha4oeiC9fY= -github.com/quic-go/quic-go v0.45.2/go.mod h1:1dLehS7TIR64+vxGR70GDcatWTOtMX2PUtnKsjbTurI= +github.com/quic-go/quic-go v0.46.0 h1:uuwLClEEyk1DNvchH8uCByQVjo3yKL9opKulExNDs7Y= +github.com/quic-go/quic-go v0.46.0/go.mod h1:1dLehS7TIR64+vxGR70GDcatWTOtMX2PUtnKsjbTurI= github.com/refraction-networking/utls v1.6.7 h1:zVJ7sP1dJx/WtVuITug3qYUq034cDq9B2MR1K67ULZM= github.com/refraction-networking/utls v1.6.7/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0= github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg= diff --git a/xray-core/infra/conf/serial/builder.go b/xray-core/infra/conf/serial/builder.go index 1ff4ed8a9f..a51648a86d 100644 --- a/xray-core/infra/conf/serial/builder.go +++ b/xray-core/infra/conf/serial/builder.go @@ -17,7 +17,7 @@ func MergeConfigFromFiles(files []string, formats []string) (string, error) { return "", err } - if j, ok := creflect.MarshalToJson(c); ok { + if j, ok := creflect.MarshalToJson(c, true); ok { return j, nil } return "", errors.New("marshal to json failed.").AtError() diff --git a/yass/.github/workflows/releases-flatpak.yml b/yass/.github/workflows/releases-flatpak.yml index b34f7a7526..dd3f76f7ed 100644 --- a/yass/.github/workflows/releases-flatpak.yml +++ b/yass/.github/workflows/releases-flatpak.yml @@ -40,6 +40,8 @@ jobs: flatpak-release: strategy: fail-fast: false + matrix: + arch: [x86_64] runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 @@ -60,10 +62,10 @@ jobs: run: | flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo cd flatpak - flatpak-builder --force-clean --user --install-deps-from=flathub --ccache --mirror-screenshots-url=https://dl.flathub.org/media/ --repo=repo builddir io.github.chilledheart.yass.yml - flatpak build-bundle repo yass.flatpak io.github.chilledheart.yass --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo + flatpak-builder --force-clean --user --arch ${{ matrix.arch }} --install-deps-from=flathub --ccache --mirror-screenshots-url=https://dl.flathub.org/media/ --repo=repo builddir io.github.chilledheart.yass.yml + flatpak build-bundle repo yass-${{ matrix.arch }}.flatpak io.github.chilledheart.yass --arch ${{ matrix.arch }} --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo cd .. - mv -fv flatpak/yass.flatpak yass-${{ github.event.release.tag_name }}.flatpak + mv -fv flatpak/yass-${{ matrix.arch }}.flatpak yass-${{ matrix.arch }}-${{ github.event.release.tag_name }}.flatpak - name: Upload dist tarball (including debuginfo) if: ${{ github.event_name == 'release' }} env: diff --git a/yass/CMakeLists.txt b/yass/CMakeLists.txt index d6f44c5d3f..dd4fc42dbe 100644 --- a/yass/CMakeLists.txt +++ b/yass/CMakeLists.txt @@ -529,6 +529,10 @@ cmake_dependent_option(USE_GTK3_APP_INDICATOR "Build with libappindicator3 (gtk3 only)" ON "GUI AND NOT USE_QT6 AND NOT USE_QT5 AND NOT USE_GTK4 AND NOT WIN32 AND NOT APPLE AND NOT OHOS AND NOT ANDROID" OFF) +cmake_dependent_option( + INSTALL_FLATHUB_APPDATA "Build with flathub appdata" OFF + "GUI AND LINUX" OFF) + # Dynamic users are supported from version 235 # see https://0pointer.net/blog/dynamic-users-with-systemd.html if (USE_OLD_SYSTEMD_SERVICE) @@ -1833,6 +1837,11 @@ if (FREEBSD AND OS_X86) add_compile_options(-msse2) endif() +# make boringssl capable on aarch64 +if (LINUX AND OS_AARCH64) + add_compile_options($<$:-march=armv8-a+crypto>) +endif() + # ***************************************************************************************** # Libc++ Library # ***************************************************************************************** @@ -4992,6 +5001,17 @@ if(NOT CMAKE_SKIP_INSTALL_RULES) install(FILES "${LICENSE_FILE}" DESTINATION ${CMAKE_INSTALL_DOCDIR}) endif() +# ***************************************************************************************** +# Source code: Flathub appdata part +# ***************************************************************************************** + +if (INSTALL_FLATHUB_APPDATA) + set(APPDATA_FILE "${CMAKE_CURRENT_BINARY_DIR}/io.github.chilledheart.yass.appdata.xml") + string(TIMESTAMP YASS_APP_TODAY "%Y-%m-%d") + configure_file("flatpak/io.github.chilledheart.yass.appdata.xml.cmake.in" "${APPDATA_FILE}" @ONLY) + install(FILES "${APPDATA_FILE}" DESTINATION share/appdata) +endif() + # ***************************************************************************************** # Source code: Unit Tests part # ***************************************************************************************** diff --git a/yass/README.md b/yass/README.md index 493335a9ad..68bd685170 100644 --- a/yass/README.md +++ b/yass/README.md @@ -47,7 +47,7 @@ See [Status of Package Store](https://github.com/Chilledheart/yass/wiki/Status-o [![aur yass-proxy-cli](https://img.shields.io/aur/version/yass-proxy-cli)](https://aur.archlinux.org/packages/yass-proxy-cli) ### Prebuilt binaries (Other platforms) -- Flatpak (Qt5) [download flatpak][qt5_flatpak_url] (PS: _Flathub_ is incoming) +- Flatpak (Qt5) [download x86_64 flatpak][qt5_flatpak_url] (PS: _Flathub_ is incoming) - Android [download 64-bit apk][android_64_apk_url] or [download 32-bit apk][android_32_apk_url] (require _Android 7.0_ or above) - iOS [Continue to accept TestFlight invitation][ios_testflight_invitation] (require [TestFlight][ios_testflight_appstore_url] from _AppStore_, and _iOS 13.0_ or above) - Windows [download 64-bit installer][windows_64_installer_url] (require [KB2999226] on _windows 7/8/8.1_) or [download 32-bit installer][windows_32_installer_url] (require [vc 2010 runtime][vs2010_x86] on _windows xp sp3_) or [download arm64 installer][windows_arm64_installer_url] (require _windows 10/11_) @@ -73,8 +73,10 @@ Cipher http2 and https are NaïveProxy-compatible. See [NaïveProxy](https://github.com/klzgrad/naiveproxy)'s project homepage for support. -### Android/iOS/macOS (M1/M2/M3 only) comes with VPN Service support -Mobile users including macOS (M1/M2/M3) machines can use yass as VPN Service more than just Global Proxy. +### Android/iOS/macOS (M1/M2/M3/M4 only) comes with VPN Service support +Mobile users including macOS (M1/M2/M3/M4) machines can use yass as VPN Service more than pure Global Proxy Client. + +TBD: Spliting Tunnel Support (#954) ### More Usages Visit wiki's [Usages](https://github.com/Chilledheart/yass/wiki/Usage). @@ -145,7 +147,7 @@ Please visit [the pages site](https://letshack.info). [qt6_rpm_url]: https://github.com/Chilledheart/yass/releases/download/1.12.3/yass-qt6.lp155.x86_64.1.12.3.rpm [qt6_deb_url]: https://github.com/Chilledheart/yass/releases/download/1.12.3/yass-qt6-ubuntu-22.04-jammy_amd64.1.12.3.deb -[qt5_flatpak_url]: https://github.com/Chilledheart/yass/releases/download/1.12.3/yass-1.12.3.flatpak +[qt5_flatpak_url]: https://github.com/Chilledheart/yass/releases/download/1.12.3/yass-x86_64-1.12.3.flatpak [gtk4_arch_url]: https://repo.archlinuxcn.org/x86_64/yass-proxy-1.12.3-1-x86_64.pkg.tar.zst [cli_tgz_amd64_url]: https://github.com/Chilledheart/yass/releases/download/1.12.3/yass_cli-linux-release-amd64-1.12.3.tgz diff --git a/yass/flatpak/io.github.chilledheart.yass.appdata.xml.cmake.in b/yass/flatpak/io.github.chilledheart.yass.appdata.xml.cmake.in new file mode 100644 index 0000000000..96a62adde4 --- /dev/null +++ b/yass/flatpak/io.github.chilledheart.yass.appdata.xml.cmake.in @@ -0,0 +1,31 @@ + + + io.github.chilledheart.yass + YASS + + Chilledheart + + Chilledheart + Lightweight and efficient, socks/http forward proxy + +

YASS is initiated as C++ rewrite of the outdated shadowsocks-libev package and provide the similar functionalities. + During the recent development, it also supports naiveproxy protocol which is more efficient protocol. + Compared with shadowsocks-libev, it not only contains the client cli command and server cli command, + but also it contains a qt5 graphical interface which is more friendly to the new users.

+ + CC0-1.0 + GPL-2.0 + https://github.com/Chilledheart/yass + io.github.chilledheart.yass.desktop + + + https://github.com/Chilledheart/yass/assets/54673341/4e2a2e47-43fb-402f-90c7-d2e033cc6a1d + Main window + + + + + + + keeyou-cn_at_outlook.com + diff --git a/yass/flatpak/io.github.chilledheart.yass.yml b/yass/flatpak/io.github.chilledheart.yass.yml index 1d82084374..d57fb6635d 100644 --- a/yass/flatpak/io.github.chilledheart.yass.yml +++ b/yass/flatpak/io.github.chilledheart.yass.yml @@ -19,6 +19,7 @@ modules: builddir: true config-opts: - -DCMAKE_BUILD_TYPE=RelWithDebInfo + - -DINSTALL_FLATHUB_APPDATA=on - -DUSE_QT5=on - -DGUI=on - -DCLI=off diff --git a/yass/third_party/zlib/crc32_simd.c b/yass/third_party/zlib/crc32_simd.c index cbe9739578..1c60ae9bd3 100644 --- a/yass/third_party/zlib/crc32_simd.c +++ b/yass/third_party/zlib/crc32_simd.c @@ -398,7 +398,7 @@ uint32_t ZLIB_INTERNAL crc32_sse42_simd_( /* SSE4.2+PCLMUL */ */ #include #include -#define TARGET_ARMV8_WITH_CRC __attribute__((target("arch=armv8-a+crc"))) +#define TARGET_ARMV8_WITH_CRC __attribute__((target("arch=armv8-a+crc+crypto"))) #else // !defined(__GNUC__) && !defined(_aarch64__) #error ARM CRC32 SIMD extensions only supported for Clang and GCC #endif