diff --git a/Cargo.lock b/Cargo.lock index 228129dd6..09cc0b958 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -635,9 +635,9 @@ dependencies = [ [[package]] name = "askama_escape" -version = "0.10.3" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" +checksum = "3df27b8d5ddb458c5fb1bbc1ce172d4a38c614a97d550b0ac89003897fb01de4" [[package]] name = "asn1-rs" diff --git a/Cargo.toml b/Cargo.toml index e021a14dd..9908f7d7b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -202,7 +202,7 @@ warnings = { version = "0.2.1" } prettier-please = { version = "0.3.0", features = ["verbatim"] } anyhow = "1.0.97" clap = { version = "4.5.31" } -askama_escape = "0.10.3" +askama_escape = "0.13.0" tracing = "0.1.41" tracing-futures = "0.2.5" tracing-subscriber = { version = "0.3.19", default-features = false } diff --git a/packages/ssr/src/renderer.rs b/packages/ssr/src/renderer.rs index d7e871df7..0165ac11f 100644 --- a/packages/ssr/src/renderer.rs +++ b/packages/ssr/src/renderer.rs @@ -335,13 +335,13 @@ fn to_string_works() { PreRendered("\"".to_string()), PreRendered(">".to_string()), InnerHtmlMarker, - PreRendered("Hello world 1 -->".to_string()), + PreRendered("Hello world 1 -->".to_string()), Node { index: 0, escape_text: EscapeText::Escape }, PreRendered( - "<-- Hello world 2
nest 1
nest 2
" + "<-- Hello world 2
nest 1
nest 2
" .to_string() ), Node { @@ -360,7 +360,7 @@ fn to_string_works() { use Segment::*; - assert_eq!(out, "
Hello world 1 -->123<-- Hello world 2
nest 1
nest 2
</diiiiiiiiv>
finalize 0
finalize 1
finalize 2
finalize 3
finalize 4
"); + assert_eq!(out, "
Hello world 1 -->123<-- Hello world 2
nest 1
nest 2
</diiiiiiiiv>
finalize 0
finalize 1
finalize 2
finalize 3
finalize 4
"); } #[test] diff --git a/packages/ssr/tests/escape.rs b/packages/ssr/tests/escape.rs index 310a7a907..6f5be33dd 100644 --- a/packages/ssr/tests/escape.rs +++ b/packages/ssr/tests/escape.rs @@ -11,7 +11,7 @@ fn escape_static_values() { assert_eq!( dioxus_ssr::pre_render(&dom), - "" + "" ); } @@ -27,7 +27,7 @@ fn escape_dynamic_values() { assert_eq!( dioxus_ssr::pre_render(&dom), - "" + "" ); } @@ -42,7 +42,7 @@ fn escape_static_style() { assert_eq!( dioxus_ssr::pre_render(&dom), - "
" + "
" ); } @@ -58,7 +58,7 @@ fn escape_dynamic_style() { assert_eq!( dioxus_ssr::pre_render(&dom), - "
" + "
" ); } @@ -77,7 +77,7 @@ fn escape_static_text() { assert_eq!( dioxus_ssr::pre_render(&dom), - "
"><div>
" + "
"><div>
" ); } @@ -97,7 +97,7 @@ fn escape_dynamic_text() { assert_eq!( dioxus_ssr::pre_render(&dom), - "
"><div>
" + "
"><div>
" ); } @@ -219,7 +219,7 @@ fn escape_static_component_fragment_div() { assert_eq!( dioxus_ssr::pre_render(&dom), - "
body { font-family: "sans-serif"; }
" + "
body { font-family: "sans-serif"; }
" ); } @@ -244,6 +244,6 @@ fn escape_dynamic_component_fragment_div() { assert_eq!( dioxus_ssr::pre_render(&dom), - "
body { font-family: "sans-serif"; }
" + "
body { font-family: "sans-serif"; }
" ); } diff --git a/packages/ssr/tests/simple.rs b/packages/ssr/tests/simple.rs index be06e519a..875c46a83 100644 --- a/packages/ssr/tests/simple.rs +++ b/packages/ssr/tests/simple.rs @@ -42,7 +42,7 @@ fn dynamic() { dioxus_ssr::render_element(rsx! { div { "Hello world 1 -->" "{dynamic}" "<-- Hello world 2" } }), - "
Hello world 1 -->123<-- Hello world 2
" + "
Hello world 1 -->123<-- Hello world 2
" ); }