From 0e3c5120da96ee7995ad2bc7cd5574a83cec2791 Mon Sep 17 00:00:00 2001 From: Valentin Tolmer Date: Tue, 9 Aug 2022 10:07:56 +0200 Subject: [PATCH] app: Switch yew_form dependency back to main repo --- Cargo.lock | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- Cargo.toml | 9 --------- app/Cargo.toml | 15 +++++++++++++-- 3 files changed, 59 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 09d225b..3baaa16 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -598,6 +598,12 @@ version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" +[[package]] +name = "bytemuck" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5377c8865e74a160d21f29c2d40669f53286db6eab59b88540cbb12ffc8b835" + [[package]] name = "byteorder" version = "1.4.3" @@ -695,6 +701,12 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + [[package]] name = "combine" version = "3.8.1" @@ -1784,6 +1796,20 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" +[[package]] +name = "image" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e30ca2ecf7666107ff827a8e481de6a132a9b687ed3bb20bb1c144a36c00964" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "jpeg-decoder", + "num-rational", + "num-traits", +] + [[package]] name = "indexmap" version = "1.6.2" @@ -1846,6 +1872,12 @@ dependencies = [ "libc", ] +[[package]] +name = "jpeg-decoder" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b" + [[package]] name = "js-sys" version = "0.3.58" @@ -2128,6 +2160,7 @@ dependencies = [ "chrono", "graphql_client 0.10.0", "http", + "image", "indexmap", "jwt", "lldap_auth", @@ -2448,6 +2481,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg 1.1.0", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.15" @@ -4559,7 +4603,7 @@ dependencies = [ [[package]] name = "yew_form" version = "0.1.8" -source = "git+https://github.com/sassman/yew_form/?rev=67050812695b7a8a90b81b0637e347fc6629daed#67050812695b7a8a90b81b0637e347fc6629daed" +source = "git+https://github.com/jfbilodeau/yew_form?rev=67050812695b7a8a90b81b0637e347fc6629daed#67050812695b7a8a90b81b0637e347fc6629daed" dependencies = [ "validator", "validator_derive", @@ -4569,7 +4613,7 @@ dependencies = [ [[package]] name = "yew_form_derive" version = "0.1.8" -source = "git+https://github.com/sassman/yew_form/?rev=67050812695b7a8a90b81b0637e347fc6629daed#67050812695b7a8a90b81b0637e347fc6629daed" +source = "git+https://github.com/jfbilodeau/yew_form?rev=67050812695b7a8a90b81b0637e347fc6629daed#67050812695b7a8a90b81b0637e347fc6629daed" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index ed466dc..92e3454 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,12 +7,3 @@ members = [ ] default-members = ["server"] - -# TODO: remove when there's a new release. -[patch.crates-io.yew_form] -git = 'https://github.com/sassman/yew_form/' -rev = '67050812695b7a8a90b81b0637e347fc6629daed' - -[patch.crates-io.yew_form_derive] -git = 'https://github.com/sassman/yew_form/' -rev = '67050812695b7a8a90b81b0637e347fc6629daed' diff --git a/app/Cargo.toml b/app/Cargo.toml index cf56600..f02401f 100644 --- a/app/Cargo.toml +++ b/app/Cargo.toml @@ -18,8 +18,6 @@ wasm-bindgen = "0.2" yew = "0.18" yewtil = "*" yew-router = "0.15" -yew_form = "0.1.8" -yew_form_derive = "*" # Needed because of https://github.com/tkaitchuck/aHash/issues/95 indexmap = "=1.6.2" @@ -47,5 +45,18 @@ features = [ path = "../auth" features = [ "opaque_client" ] +[dependencies.image] +features = ["jpeg"] +default-features = false +version = "0.24" + +[dependencies.yew_form] +git = "https://github.com/jfbilodeau/yew_form" +rev = "67050812695b7a8a90b81b0637e347fc6629daed" + +[dependencies.yew_form_derive] +git = "https://github.com/jfbilodeau/yew_form" +rev = "67050812695b7a8a90b81b0637e347fc6629daed" + [lib] crate-type = ["cdylib"]