From e0563bd63717d662556cc3d152c5ee799bf16cc0 Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Thu, 23 Mar 2023 13:15:47 -0500 Subject: [PATCH 1/4] allow paths in format expressions --- packages/rsx/src/ifmt.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/rsx/src/ifmt.rs b/packages/rsx/src/ifmt.rs index c7a3c2e26..8146cea42 100644 --- a/packages/rsx/src/ifmt.rs +++ b/packages/rsx/src/ifmt.rs @@ -59,6 +59,11 @@ impl FromStr for IfmtInput { let mut current_captured = String::new(); while let Some(c) = chars.next() { if c == ':' { + // two :s in a row is a path, not a format arg + if chars.next_if(|c| *c == ':').is_some() { + current_captured.push_str("::"); + continue; + } let mut current_format_args = String::new(); for c in chars.by_ref() { if c == '}' { From d658f501415aefb9061a95aab653b24e9a603e86 Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Fri, 24 Mar 2023 09:34:40 -0700 Subject: [PATCH 2/4] publish autofmt --- packages/autofmt/Cargo.toml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/autofmt/Cargo.toml b/packages/autofmt/Cargo.toml index e409cfb2f..ccb6fed24 100644 --- a/packages/autofmt/Cargo.toml +++ b/packages/autofmt/Cargo.toml @@ -2,7 +2,13 @@ name = "dioxus-autofmt" version = "0.3.0" edition = "2021" - +authors = ["Jonathan Kelley"] +description = "Autofomatter for Dioxus RSX" +license = "MIT/Apache-2.0" +repository = "https://github.com/DioxusLabs/dioxus/" +homepage = "https://dioxuslabs.com" +documentation = "https://dioxuslabs.com" +keywords = ["dom", "ui", "gui", "react"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] @@ -11,7 +17,7 @@ proc-macro2 = { version = "1.0.6", features = ["span-locations"] } quote = "1.0" syn = { version = "1.0.11", features = ["full", "extra-traits"] } serde = { version = "1.0.136", features = ["derive"] } -prettyplease = { git = "https://github.com/DioxusLabs/prettyplease-macro-fmt.git", features = [ +prettyplease = { package = "prettier-please", version = "0.1.16", features = [ "verbatim", ] } From b06228be7047b02b39562f9b96a1ce08cb8a60b3 Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Fri, 24 Mar 2023 09:39:52 -0700 Subject: [PATCH 3/4] publish rosetta --- packages/rsx-rosetta/Cargo.toml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/rsx-rosetta/Cargo.toml b/packages/rsx-rosetta/Cargo.toml index a0a9763e1..d160d2bf9 100644 --- a/packages/rsx-rosetta/Cargo.toml +++ b/packages/rsx-rosetta/Cargo.toml @@ -1,12 +1,19 @@ [package] name = "rsx-rosetta" -version = "0.0.0" -edition = "2018" +version = "0.3.0" +edition = "2021" +authors = ["Jonathan Kelley"] +description = "Autofomatter for Dioxus RSX" +license = "MIT/Apache-2.0" +repository = "https://github.com/DioxusLabs/dioxus/" +homepage = "https://dioxuslabs.com" +documentation = "https://dioxuslabs.com" +keywords = ["dom", "ui", "gui", "react"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -dioxus-autofmt = { path = "../autofmt" } +dioxus-autofmt = { path = "../autofmt", version = "0.3.0" } dioxus-rsx = { path = "../rsx" , version = "^0.0.3" } html_parser = "0.6.3" proc-macro2 = "1.0.49" From ec8b77ab3200fef11df718956ec21e81c7c187e4 Mon Sep 17 00:00:00 2001 From: Arniu Tseng Date: Sat, 25 Mar 2023 18:20:01 +0800 Subject: [PATCH 4/4] Remove unused simple-logger --- packages/router/Cargo.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/router/Cargo.toml b/packages/router/Cargo.toml index d14d9ae19..e1f442ab4 100644 --- a/packages/router/Cargo.toml +++ b/packages/router/Cargo.toml @@ -36,7 +36,6 @@ thiserror = "1.0.30" futures-util = "0.3.21" serde = { version = "1", optional = true } serde_urlencoded = { version = "0.7.1", optional = true } -simple_logger = "4.0.0" [features] default = ["query"] @@ -46,7 +45,6 @@ wasm_test = [] [dev-dependencies] console_error_panic_hook = "0.1.7" -log = "0.4.14" wasm-logger = "0.2.0" wasm-bindgen-test = "0.3" gloo-utils = "0.1.2"