- }
-}
-
-#[component]
-fn Counter(
- id: usize,
- value: ReadSignal,
- set_value: WriteSignal,
-) -> impl IntoView {
- let CounterUpdater { set_counters } = use_context().unwrap();
-
- let input = move |ev| {
- set_value
- .set(event_target_value(&ev).parse::().unwrap_or_default())
- };
-
- // this will run when the scope is disposed, i.e., when this row is deleted
- // because the signal was created in the parent scope, it won't be disposed
- // of until the parent scope is. but we no longer need it, so we'll dispose of
- // it when this row is deleted, instead. if we don't dispose of it here,
- // this memory will "leak," i.e., the signal will continue to exist until the
- // parent component is removed. in the case of this component, where it's the
- // root, that's the lifetime of the program.
- on_cleanup(move || {
- log::debug!("deleted a row");
- value.dispose();
- });
-
- view! {
-
"Errors"
impl IntoView { let params = use_params_map(); let user = create_resource( - move || params().get("id").cloned().unwrap_or_default(), + move || params.get().get("id").cloned().unwrap_or_default(), move |id| async move { if id.is_empty() { Ok(None) diff --git a/examples/hackernews_js_fetch/Cargo.toml b/examples/hackernews_js_fetch/Cargo.toml index 00a934bdf9..6a8decc3df 100644 --- a/examples/hackernews_js_fetch/Cargo.toml +++ b/examples/hackernews_js_fetch/Cargo.toml @@ -14,10 +14,10 @@ lto = true console_log = "1.0.0" console_error_panic_hook = "0.1.7" cfg-if = "1.0.0" -leptos = { version = "0.5", features = ["nightly"] } +leptos = { version = "0.5" } leptos_axum = { version = "0.5", default-features = false, optional = true } -leptos_meta = { version = "0.5", features = ["nightly"] } -leptos_router = { version = "0.5", features = ["nightly"] } +leptos_meta = { version = "0.5" } +leptos_router = { version = "0.5" } log = "0.4.17" simple_logger = "4.0.0" serde = { version = "1.0.148", features = ["derive"] } diff --git a/examples/hackernews_js_fetch/src/error_template.rs b/examples/hackernews_js_fetch/src/error_template.rs index adad9489cf..c9300452fa 100644 --- a/examples/hackernews_js_fetch/src/error_template.rs +++ b/examples/hackernews_js_fetch/src/error_template.rs @@ -1,4 +1,4 @@ -use leptos::{view, Errors, For, IntoView, RwSignal, View}; +use leptos::{view, Errors, For, IntoView, RwSignal, SignalGet, View}; // A basic function to display errors served by the error boundaries. Feel free to do more complicated things // here than just displaying them @@ -11,7 +11,7 @@ pub fn error_template(errors: Option>) -> View {
impl IntoView {
let hide_more_link = move || {
stories.get().unwrap_or(None).unwrap_or_default().len() < 28
- || pending()
+ || pending.get()
};
view! {
diff --git a/examples/hackernews_js_fetch/src/routes/story.rs b/examples/hackernews_js_fetch/src/routes/story.rs
index 00449a03a1..176027e040 100644
--- a/examples/hackernews_js_fetch/src/routes/story.rs
+++ b/examples/hackernews_js_fetch/src/routes/story.rs
@@ -7,7 +7,7 @@ use leptos_router::*;
pub fn Story() -> impl IntoView {
let params = use_params_map();
let story = create_resource(
- move || params().get("id").cloned().unwrap_or_default(),
+ move || params.get().get("id").cloned().unwrap_or_default(),
move |id| async move {
if id.is_empty() {
None
@@ -83,11 +83,11 @@ pub fn Comment(comment: api::Comment) -> impl IntoView {
{(!comment.comments.is_empty()).then(|| {
view! {
-
+
{
let comments_len = comment.comments.len();
- move || if open() {
+ move || if open.get() {
"[-]".into()
} else {
format!("[+] {}{} collapsed", comments_len, pluralize(comments_len))
@@ -95,7 +95,7 @@ pub fn Comment(comment: api::Comment) -> impl IntoView {
}
- {move || open().then({
+ {move || open.get().then({
let comments = comment.comments.clone();
move || view! {
"Errors"
diff --git a/examples/hackernews_js_fetch/src/routes/users.rs b/examples/hackernews_js_fetch/src/routes/users.rs index 74264adf74..79257db16b 100644 --- a/examples/hackernews_js_fetch/src/routes/users.rs +++ b/examples/hackernews_js_fetch/src/routes/users.rs @@ -6,7 +6,7 @@ use leptos_router::*; pub fn User() -> impl IntoView { let params = use_params_map(); let user = create_resource( - move || params().get("id").cloned().unwrap_or_default(), + move || params.get().get("id").cloned().unwrap_or_default(), move |id| async move { if id.is_empty() { None diff --git a/examples/js-framework-benchmark/Cargo.toml b/examples/js-framework-benchmark/Cargo.toml index ba0e2ce058..d64028a6f2 100644 --- a/examples/js-framework-benchmark/Cargo.toml +++ b/examples/js-framework-benchmark/Cargo.toml @@ -8,7 +8,7 @@ codegen-units = 1 lto = true [dependencies] -leptos = { path = "../../leptos", features = ["csr", "nightly", "template_macro"] } +leptos = { path = "../../leptos", features = ["csr","template_macro"] } console_log = "1" log = "0.4" # used in rand, but we need to enable js feature diff --git a/examples/js-framework-benchmark/Makefile.toml b/examples/js-framework-benchmark/Makefile.toml index 44916eed44..6953f1b0bb 100644 --- a/examples/js-framework-benchmark/Makefile.toml +++ b/examples/js-framework-benchmark/Makefile.toml @@ -5,13 +5,13 @@ extend = [ ] [tasks.build] -toolchain = "nightly-2024-01-29" +toolchain = "nightly-2024-03-31" command = "cargo" args = ["build-all-features", "--target", "wasm32-unknown-unknown"] install_crate = "cargo-all-features" [tasks.check] -toolchain = "nightly-2024-01-29" +toolchain = "nightly-2024-03-31" command = "cargo" args = ["check-all-features", "--target", "wasm32-unknown-unknown"] install_crate = "cargo-all-features" diff --git a/examples/js-framework-benchmark/rust-toolchain.toml b/examples/js-framework-benchmark/rust-toolchain.toml index 055e912d2e..99fa95aaaf 100644 --- a/examples/js-framework-benchmark/rust-toolchain.toml +++ b/examples/js-framework-benchmark/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "nightly-2024-01-29" +channel = "nightly-2024-03-31" diff --git a/examples/js-framework-benchmark/src/lib.rs b/examples/js-framework-benchmark/src/lib.rs index cabc062f46..2543820839 100644 --- a/examples/js-framework-benchmark/src/lib.rs +++ b/examples/js-framework-benchmark/src/lib.rs @@ -109,13 +109,13 @@ pub fn App() -> impl IntoView { }; let run = move |_| { - set_data(build_data(1000)); - set_selected(None); + set_data.set(build_data(1000)); + set_selected.set(None); }; let run_lots = move |_| { - set_data(build_data(10000)); - set_selected(None); + set_data.set(build_data(10000)); + set_selected.set(None); }; let add = move |_| { @@ -131,8 +131,8 @@ pub fn App() -> impl IntoView { }; let clear = move |_| { - set_data(Vec::new()); - set_selected(None); + set_data.set(Vec::new()); + set_selected.set(None); }; let swap_rows = move |_| { @@ -143,7 +143,7 @@ pub fn App() -> impl IntoView { }); }; - let is_selected = create_selector(selected); + let is_selected = create_selector(move || selected.get()); view! { @@ -166,7 +166,7 @@ pub fn App() -> impl IntoView {
impl IntoView {
template! {
{row_id.to_string()}
- {move || label.get()}
+ {move || label.get()}
diff --git a/examples/login_with_token_csr_only/Cargo.toml b/examples/login_with_token_csr_only/Cargo.toml
index 88a18d2e00..1a961fbc65 100644
--- a/examples/login_with_token_csr_only/Cargo.toml
+++ b/examples/login_with_token_csr_only/Cargo.toml
@@ -7,6 +7,6 @@ codegen-units = 1
lto = true
[patch.crates-io]
-leptos = { path = "../../leptos", features = ["nightly"] }
-leptos_router = { path = "../../router", features = ["nightly"] }
+leptos = { path = "../../leptos" }
+leptos_router = { path = "../../router" }
api-boundary = { path = "api-boundary" }
diff --git a/examples/login_with_token_csr_only/client/src/components/credentials.rs b/examples/login_with_token_csr_only/client/src/components/credentials.rs
index fcb3a81f7e..c4ffcd8f74 100644
--- a/examples/login_with_token_csr_only/client/src/components/credentials.rs
+++ b/examples/login_with_token_csr_only/client/src/components/credentials.rs
@@ -1,4 +1,4 @@
-use leptos::{ev, *};
+use leptos::*;
#[component]
pub fn CredentialsForm(
diff --git a/examples/login_with_token_csr_only/server/src/application.rs b/examples/login_with_token_csr_only/server/src/application.rs
index a410be951f..722586da21 100644
--- a/examples/login_with_token_csr_only/server/src/application.rs
+++ b/examples/login_with_token_csr_only/server/src/application.rs
@@ -16,7 +16,7 @@ impl AppState {
credentials: Credentials,
) -> Result<(), CreateUserError> {
let Credentials { email, password } = credentials;
- let user_exists = self.users.get(&email).is_some();
+ let user_exists = self.users.contains_key(&email);
if user_exists {
return Err(CreateUserError::UserExists);
}
@@ -124,6 +124,7 @@ impl EmailAddress {
#[derive(Clone)]
pub struct CurrentUser {
pub email: EmailAddress,
+ #[allow(dead_code)] // possibly a lint regression, this is used at line 65
pub token: Uuid,
}
diff --git a/examples/parent_child/Cargo.toml b/examples/parent_child/Cargo.toml
index eee81b8ec1..09caca8c25 100644
--- a/examples/parent_child/Cargo.toml
+++ b/examples/parent_child/Cargo.toml
@@ -8,7 +8,7 @@ codegen-units = 1
lto = true
[dependencies]
-leptos = { path = "../../leptos", features = ["csr", "nightly"] }
+leptos = { path = "../../leptos", features = ["csr"] }
console_log = "1"
log = "0.4"
console_error_panic_hook = "0.1.7"
diff --git a/examples/parent_child/rust-toolchain.toml b/examples/parent_child/rust-toolchain.toml
index 055e912d2e..99fa95aaaf 100644
--- a/examples/parent_child/rust-toolchain.toml
+++ b/examples/parent_child/rust-toolchain.toml
@@ -1,2 +1,2 @@
[toolchain]
-channel = "nightly-2024-01-29"
+channel = "nightly-2024-03-31"
diff --git a/examples/parent_child/src/lib.rs b/examples/parent_child/src/lib.rs
index c67f9add4e..3d3fba0ab6 100644
--- a/examples/parent_child/src/lib.rs
+++ b/examples/parent_child/src/lib.rs
@@ -31,10 +31,10 @@ pub fn App() -> impl IntoView {
-
- {
pub fn RkyvExample() -> impl IntoView {
let input_ref = NodeRef::::new();
let (input, set_input) = create_signal(String::new());
- let rkyv_result = create_resource(input, rkyv_example);
+ let rkyv_result = create_resource(move || input.get(), rkyv_example);
view! {
- {rkyv_result}
+ {move || rkyv_result.get()}
}
}
@@ -507,9 +509,9 @@ pub fn FileUploadWithProgress() -> impl IntoView {
.unchecked_into::();
let filename = file.name();
let size = file.size() as usize;
- set_filename(Some(filename.clone()));
- set_max(Some(size));
- set_current(None::);
+ set_filename.set(Some(filename.clone()));
+ set_max.set(Some(size));
+ set_current.set(None::);
spawn_local(async move {
let mut progress = file_progress(filename)
@@ -532,7 +534,7 @@ pub fn FileUploadWithProgress() -> impl IntoView {
)
.parse::()
.expect("invalid length");
- set_current(Some(len));
+ set_current.set(Some(len));
}
});
spawn_local(async move {
@@ -550,9 +552,9 @@ pub fn FileUploadWithProgress() -> impl IntoView {
- {move || filename().map(|filename| view! { ,
) -> impl IntoView {
move || {
- if cond() {
+ if cond.get() {
(then.children)().into_view()
- } else if let Some(else_if) = else_if.iter().find(|i| (i.cond)()) {
+ } else if let Some(else_if) = else_if.iter().find(|i| i.cond.get()) {
(else_if.children)().into_view()
} else if let Some(fallback) = &fallback {
(fallback.children)().into_view()
@@ -43,13 +43,13 @@ fn SlotIf(
#[component]
pub fn App() -> impl IntoView {
let (count, set_count) = create_signal(0);
- let is_even = MaybeSignal::derive(move || count() % 2 == 0);
- let is_div5 = MaybeSignal::derive(move || count() % 5 == 0);
- let is_div7 = MaybeSignal::derive(move || count() % 7 == 0);
+ let is_even = MaybeSignal::derive(move || count.get() % 2 == 0);
+ let is_div5 = MaybeSignal::derive(move || count.get() % 5 == 0);
+ let is_div7 = MaybeSignal::derive(move || count.get() % 7 == 0);
view! {
- " "{count}" is "
+ " "{move||count.get()}" is "
// The slot name can be emitted if it would match the slot struct name (in snake case).
"even"
diff --git a/examples/sso_auth_axum/src/main.rs b/examples/sso_auth_axum/src/main.rs
index 9a017d44b2..87cdcb9fb3 100644
--- a/examples/sso_auth_axum/src/main.rs
+++ b/examples/sso_auth_axum/src/main.rs
@@ -8,12 +8,12 @@ use axum::{
Router,
};
use axum_session::{Key, SessionConfig, SessionLayer, SessionStore};
-use axum_session_auth::{AuthConfig, AuthSessionLayer, SessionSqlitePool};
+use axum_session_auth::{AuthConfig, AuthSessionLayer};
use leptos::{get_configuration, logging::log, provide_context, view};
use leptos_axum::{
generate_route_list, handle_server_fns_with_context, LeptosRoutes,
};
-use sqlx::{sqlite::SqlitePoolOptions, SqlitePool};
+use sqlx::sqlite::SqlitePoolOptions;
use sso_auth_axum::{
auth::*, fallback::file_and_error_handler, state::AppState,
};
diff --git a/examples/ssr_modes/Cargo.toml b/examples/ssr_modes/Cargo.toml
index da2d7cecf5..8117cd0c30 100644
--- a/examples/ssr_modes/Cargo.toml
+++ b/examples/ssr_modes/Cargo.toml
@@ -12,10 +12,10 @@ actix-web = { version = "4", optional = true, features = ["macros"] }
console_error_panic_hook = "0.1"
console_log = "1"
lazy_static = "1"
-leptos = { path = "../../leptos", features = ["nightly"] }
-leptos_meta = { path = "../../meta", features = ["nightly"] }
+leptos = { path = "../../leptos"}
+leptos_meta = { path = "../../meta" }
leptos_actix = { path = "../../integrations/actix", optional = true }
-leptos_router = { path = "../../router", features = ["nightly"] }
+leptos_router = { path = "../../router" }
log = "0.4"
serde = { version = "1", features = ["derive"] }
thiserror = "1"
diff --git a/examples/ssr_modes/rust-toolchain.toml b/examples/ssr_modes/rust-toolchain.toml
index 055e912d2e..99fa95aaaf 100644
--- a/examples/ssr_modes/rust-toolchain.toml
+++ b/examples/ssr_modes/rust-toolchain.toml
@@ -1,2 +1,2 @@
[toolchain]
-channel = "nightly-2024-01-29"
+channel = "nightly-2024-03-31"
diff --git a/examples/ssr_modes/src/app.rs b/examples/ssr_modes/src/app.rs
index 9da69a2158..e69357a9f7 100644
--- a/examples/ssr_modes/src/app.rs
+++ b/examples/ssr_modes/src/app.rs
@@ -67,7 +67,7 @@ fn HomePage() -> impl IntoView {
#[derive(Params, Copy, Clone, Debug, PartialEq, Eq)]
pub struct PostParams {
- id: usize,
+ id: Option,
}
#[component]
@@ -75,7 +75,9 @@ fn Post() -> impl IntoView {
let query = use_params::();
let id = move || {
query.with(|q| {
- q.as_ref().map(|q| q.id).map_err(|_| PostError::InvalidId)
+ q.as_ref()
+ .map(|q| q.id.unwrap_or_default())
+ .map_err(|_| PostError::InvalidId)
})
};
let post = create_resource(id, |id| async move {
diff --git a/examples/ssr_modes_axum/Cargo.toml b/examples/ssr_modes_axum/Cargo.toml
index e69cc16ead..2751bf30d5 100644
--- a/examples/ssr_modes_axum/Cargo.toml
+++ b/examples/ssr_modes_axum/Cargo.toml
@@ -10,10 +10,10 @@ crate-type = ["cdylib", "rlib"]
console_error_panic_hook = "0.1"
console_log = "1"
lazy_static = "1"
-leptos = { path = "../../leptos", features = ["nightly"] }
-leptos_meta = { path = "../../meta", features = ["nightly"] }
+leptos = { path = "../../leptos"}
+leptos_meta = { path = "../../meta" }
leptos_axum = { path = "../../integrations/axum", optional = true }
-leptos_router = { path = "../../router", features = ["nightly"] }
+leptos_router = { path = "../../router" }
log = "0.4"
serde = { version = "1", features = ["derive"] }
thiserror = "1"
diff --git a/examples/ssr_modes_axum/rust-toolchain.toml b/examples/ssr_modes_axum/rust-toolchain.toml
index 055e912d2e..99fa95aaaf 100644
--- a/examples/ssr_modes_axum/rust-toolchain.toml
+++ b/examples/ssr_modes_axum/rust-toolchain.toml
@@ -1,2 +1,2 @@
[toolchain]
-channel = "nightly-2024-01-29"
+channel = "nightly-2024-03-31"
diff --git a/examples/ssr_modes_axum/src/app.rs b/examples/ssr_modes_axum/src/app.rs
index 6b24570f2b..1b042d64ff 100644
--- a/examples/ssr_modes_axum/src/app.rs
+++ b/examples/ssr_modes_axum/src/app.rs
@@ -67,7 +67,7 @@ fn HomePage() -> impl IntoView {
#[derive(Params, Copy, Clone, Debug, PartialEq, Eq)]
pub struct PostParams {
- id: usize,
+ id: Option,
}
#[component]
@@ -75,7 +75,9 @@ fn Post() -> impl IntoView {
let query = use_params::();
let id = move || {
query.with(|q| {
- q.as_ref().map(|q| q.id).map_err(|_| PostError::InvalidId)
+ q.as_ref()
+ .map(|q| q.id.unwrap_or_default())
+ .map_err(|_| PostError::InvalidId)
})
};
let post = create_resource(id, |id| async move {
diff --git a/examples/tailwind_actix/Cargo.toml b/examples/tailwind_actix/Cargo.toml
index 57cd5d7e87..74839c3301 100644
--- a/examples/tailwind_actix/Cargo.toml
+++ b/examples/tailwind_actix/Cargo.toml
@@ -9,10 +9,10 @@ crate-type = ["cdylib", "rlib"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
-leptos = { path = "../../leptos", features = ["nightly"] }
+leptos = { path = "../../leptos" }
leptos_actix = { path = "../../integrations/actix", optional = true }
-leptos_meta = { path = "../../meta", features = ["nightly"] }
-leptos_router = { path = "../../router", features = ["nightly"] }
+leptos_meta = { path = "../../meta" }
+leptos_router = { path = "../../router" }
gloo-net = { version = "0.2", features = ["http"] }
log = "0.4"
diff --git a/examples/tailwind_actix/rust-toolchain.toml b/examples/tailwind_actix/rust-toolchain.toml
index 055e912d2e..99fa95aaaf 100644
--- a/examples/tailwind_actix/rust-toolchain.toml
+++ b/examples/tailwind_actix/rust-toolchain.toml
@@ -1,2 +1,2 @@
[toolchain]
-channel = "nightly-2024-01-29"
+channel = "nightly-2024-03-31"
diff --git a/examples/tailwind_actix/src/app.rs b/examples/tailwind_actix/src/app.rs
index 7310885be7..8eee7dedf8 100644
--- a/examples/tailwind_actix/src/app.rs
+++ b/examples/tailwind_actix/src/app.rs
@@ -31,10 +31,10 @@ fn Home() -> impl IntoView {
on:click=move |_| set_count.update(|count| *count += 1)
>
"Something's here | "
- {move || if count() == 0 {
+ {move || if count.get() == 0 {
"Click me!".to_string()
} else {
- count().to_string()
+ count.get().to_string()
}}
" | Some more text"
diff --git a/examples/tailwind_axum/Cargo.toml b/examples/tailwind_axum/Cargo.toml
index cae42b0c57..7db56c8cdd 100644
--- a/examples/tailwind_axum/Cargo.toml
+++ b/examples/tailwind_axum/Cargo.toml
@@ -10,10 +10,10 @@ crate-type = ["cdylib", "rlib"]
axum = { version = "0.7", optional = true }
console_error_panic_hook = "0.1"
console_log = "1"
-leptos = { path = "../../leptos", features = ["nightly"] }
-leptos_meta = { path = "../../meta", features = ["nightly"] }
+leptos = { path = "../../leptos" }
+leptos_meta = { path = "../../meta" }
leptos_axum = { path = "../../integrations/axum", optional = true }
-leptos_router = { path = "../../router", features = ["nightly"] }
+leptos_router = { path = "../../router" }
log = "0.4.17"
simple_logger = "4"
tokio = { version = "1", features = ["rt-multi-thread", "macros"], optional = true }
diff --git a/examples/tailwind_axum/rust-toolchain.toml b/examples/tailwind_axum/rust-toolchain.toml
index 055e912d2e..99fa95aaaf 100644
--- a/examples/tailwind_axum/rust-toolchain.toml
+++ b/examples/tailwind_axum/rust-toolchain.toml
@@ -1,2 +1,2 @@
[toolchain]
-channel = "nightly-2024-01-29"
+channel = "nightly-2024-03-31"
diff --git a/examples/tailwind_axum/src/app.rs b/examples/tailwind_axum/src/app.rs
index 932096e007..81a3e1b72d 100644
--- a/examples/tailwind_axum/src/app.rs
+++ b/examples/tailwind_axum/src/app.rs
@@ -31,7 +31,7 @@ fn Home() -> impl IntoView {
"+"
diff --git a/examples/timer/Cargo.toml b/examples/timer/Cargo.toml
index 63686821d6..77033bc265 100644
--- a/examples/timer/Cargo.toml
+++ b/examples/timer/Cargo.toml
@@ -8,7 +8,7 @@ codegen-units = 1
lto = true
[dependencies]
-leptos = { path = "../../leptos", features = ["csr", "nightly"] }
+leptos = { path = "../../leptos", features = ["csr"] }
console_log = "1"
log = "0.4"
console_error_panic_hook = "0.1.7"
diff --git a/examples/timer/rust-toolchain.toml b/examples/timer/rust-toolchain.toml
index 055e912d2e..99fa95aaaf 100644
--- a/examples/timer/rust-toolchain.toml
+++ b/examples/timer/rust-toolchain.toml
@@ -1,2 +1,2 @@
[toolchain]
-channel = "nightly-2024-01-29"
+channel = "nightly-2024-03-31"
diff --git a/examples/timer/src/lib.rs b/examples/timer/src/lib.rs
index 3a2cba9903..b0acfe11f1 100644
--- a/examples/timer/src/lib.rs
+++ b/examples/timer/src/lib.rs
@@ -21,12 +21,12 @@ pub fn TimerDemo() -> impl IntoView {
view! {
"Count A (fixed interval of 1000 ms)"
- {count_a}
- "Count B (dynamic interval, currently " {interval} " ms)"
- {count_b}
+ {move||count_a.get()}
+ "Count B (dynamic interval, currently " {move||interval.get()} " ms)"
+ {move||count_b.get()}
() {
- set_interval(value);
+ set_interval.set(value);
}
}/>
diff --git a/examples/todo_app_sqlite/Cargo.toml b/examples/todo_app_sqlite/Cargo.toml
index 5e0727fb69..df031fd352 100644
--- a/examples/todo_app_sqlite/Cargo.toml
+++ b/examples/todo_app_sqlite/Cargo.toml
@@ -15,10 +15,10 @@ console_log = "1.0.0"
console_error_panic_hook = "0.1.7"
serde = { version = "1.0.152", features = ["derive"] }
futures = "0.3.25"
-leptos = { path = "../../leptos", features = ["nightly"] }
+leptos = { path = "../../leptos"}
leptos_actix = { path = "../../integrations/actix", optional = true }
-leptos_meta = { path = "../../meta", features = ["nightly"] }
-leptos_router = { path = "../../router", features = ["nightly"] }
+leptos_meta = { path = "../../meta" }
+leptos_router = { path = "../../router" }
log = "0.4.17"
simple_logger = "4.0.0"
gloo = { git = "https://github.com/rustwasm/gloo" }
diff --git a/examples/todo_app_sqlite/rust-toolchain.toml b/examples/todo_app_sqlite/rust-toolchain.toml
index 055e912d2e..99fa95aaaf 100644
--- a/examples/todo_app_sqlite/rust-toolchain.toml
+++ b/examples/todo_app_sqlite/rust-toolchain.toml
@@ -1,2 +1,2 @@
[toolchain]
-channel = "nightly-2024-01-29"
+channel = "nightly-2024-03-31"
diff --git a/examples/todo_app_sqlite_axum/Cargo.toml b/examples/todo_app_sqlite_axum/Cargo.toml
index 2e9194a173..a0c4143e62 100644
--- a/examples/todo_app_sqlite_axum/Cargo.toml
+++ b/examples/todo_app_sqlite_axum/Cargo.toml
@@ -11,11 +11,11 @@ console_log = "1.0"
console_error_panic_hook = "0.1"
futures = "0.3"
http = "1.0"
-leptos = { path = "../../leptos", features = ["nightly"] }
+leptos = { path = "../../leptos" }
server_fn = { path = "../../server_fn", features = ["serde-lite"] }
leptos_axum = { path = "../../integrations/axum", optional = true }
-leptos_meta = { path = "../../meta", features = ["nightly"] }
-leptos_router = { path = "../../router", features = ["nightly"] }
+leptos_meta = { path = "../../meta" }
+leptos_router = { path = "../../router" }
log = "0.4"
simple_logger = "4.0"
serde = { version = "1", features = ["derive"] }
diff --git a/examples/todo_app_sqlite_axum/rust-toolchain.toml b/examples/todo_app_sqlite_axum/rust-toolchain.toml
index 055e912d2e..292fe499e3 100644
--- a/examples/todo_app_sqlite_axum/rust-toolchain.toml
+++ b/examples/todo_app_sqlite_axum/rust-toolchain.toml
@@ -1,2 +1,2 @@
[toolchain]
-channel = "nightly-2024-01-29"
+channel = "stable"
diff --git a/examples/todo_app_sqlite_axum/src/error_template.rs b/examples/todo_app_sqlite_axum/src/error_template.rs
index 0a1731abe1..d68b2b58f7 100644
--- a/examples/todo_app_sqlite_axum/src/error_template.rs
+++ b/examples/todo_app_sqlite_axum/src/error_template.rs
@@ -1,5 +1,5 @@
use crate::errors::TodoAppError;
-use leptos::{Errors, *};
+use leptos::*;
#[cfg(feature = "ssr")]
use leptos_axum::ResponseOptions;
diff --git a/examples/todo_app_sqlite_csr/Cargo.toml b/examples/todo_app_sqlite_csr/Cargo.toml
index f8b2dc3fe0..5607229b2d 100644
--- a/examples/todo_app_sqlite_csr/Cargo.toml
+++ b/examples/todo_app_sqlite_csr/Cargo.toml
@@ -10,10 +10,10 @@ crate-type = ["cdylib", "rlib"]
console_log = "1.0"
console_error_panic_hook = "0.1"
futures = "0.3"
-leptos = { path = "../../leptos", features = ["nightly"] }
+leptos = { path = "../../leptos" }
leptos_axum = { path = "../../integrations/axum", optional = true }
-leptos_meta = { path = "../../meta", features = ["nightly"] }
-leptos_router = { path = "../../router", features = ["nightly"] }
+leptos_meta = { path = "../../meta"}
+leptos_router = { path = "../../router" }
leptos_integration_utils = { path = "../../integrations/utils", optional = true }
log = "0.4"
simple_logger = "4.0"
diff --git a/examples/todo_app_sqlite_csr/rust-toolchain.toml b/examples/todo_app_sqlite_csr/rust-toolchain.toml
index 055e912d2e..99fa95aaaf 100644
--- a/examples/todo_app_sqlite_csr/rust-toolchain.toml
+++ b/examples/todo_app_sqlite_csr/rust-toolchain.toml
@@ -1,2 +1,2 @@
[toolchain]
-channel = "nightly-2024-01-29"
+channel = "nightly-2024-03-31"
diff --git a/examples/todo_app_sqlite_csr/src/error_template.rs b/examples/todo_app_sqlite_csr/src/error_template.rs
index d7f6b52619..e4e64a82f6 100644
--- a/examples/todo_app_sqlite_csr/src/error_template.rs
+++ b/examples/todo_app_sqlite_csr/src/error_template.rs
@@ -1,5 +1,5 @@
use crate::errors::TodoAppError;
-use leptos::{Errors, *};
+use leptos::*;
#[cfg(feature = "ssr")]
use leptos_axum::ResponseOptions;
diff --git a/examples/todomvc/Cargo.toml b/examples/todomvc/Cargo.toml
index e5f5915621..8d301f6ae2 100644
--- a/examples/todomvc/Cargo.toml
+++ b/examples/todomvc/Cargo.toml
@@ -8,7 +8,7 @@ codegen-units = 1
lto = true
[dependencies]
-leptos = { path = "../../leptos", features = ["nightly", "serde"] }
+leptos = { path = "../../leptos", features = ["serde"] }
log = "0.4"
console_log = "1"
console_error_panic_hook = "0.1.7"
diff --git a/examples/todomvc/rust-toolchain.toml b/examples/todomvc/rust-toolchain.toml
index 055e912d2e..292fe499e3 100644
--- a/examples/todomvc/rust-toolchain.toml
+++ b/examples/todomvc/rust-toolchain.toml
@@ -1,2 +1,2 @@
[toolchain]
-channel = "nightly-2024-01-29"
+channel = "stable"
diff --git a/examples/todomvc/src/lib.rs b/examples/todomvc/src/lib.rs
index 2c37fad92d..112c4eb1d6 100644
--- a/examples/todomvc/src/lib.rs
+++ b/examples/todomvc/src/lib.rs
@@ -146,7 +146,7 @@ pub fn TodoMVC() -> impl IntoView {
window_event_listener(ev::hashchange, move |_| {
let new_mode =
location_hash().map(|hash| route(&hash)).unwrap_or_default();
- set_mode(new_mode);
+ set_mode.set(new_mode);
});
// Callback to add a todo on pressing the `Enter` key, if the field isn't empty
@@ -256,9 +256,9 @@ pub fn TodoMVC() -> impl IntoView {
" left"
- {move || editing().then(|| view! {
+ {move || editing.get().then(|| view! {
impl IntoView {
if key_code == ENTER_KEY {
save(&event_target_value(&ev));
} else if key_code == ESCAPE_KEY {
- set_editing(false);
+ set_editing.set(false);
}
}}
/>
diff --git a/integrations/utils/src/lib.rs b/integrations/utils/src/lib.rs
index fa9b30abcc..594bee6c85 100644
--- a/integrations/utils/src/lib.rs
+++ b/integrations/utils/src/lib.rs
@@ -59,12 +59,10 @@ pub fn html_parts_separated(
// First check runtime env, then build time, then default:
let pkg_path = match std::env::var("CDN_PKG_PATH").ok().map(Cow::from) {
Some(path) => path,
- None => {
- match option_env!("CDN_PKG_PATH").map(Cow::from) {
- Some(path) => path,
- None => format!("/{}", options.site_pkg_dir).into(),
- }
- }
+ None => match option_env!("CDN_PKG_PATH").map(Cow::from) {
+ Some(path) => path,
+ None => format!("/{}", options.site_pkg_dir).into(),
+ },
};
let output_name = &options.output_name;
let nonce = use_nonce();
diff --git a/leptos/Cargo.toml b/leptos/Cargo.toml
index 918764f1fe..f407058e4a 100644
--- a/leptos/Cargo.toml
+++ b/leptos/Cargo.toml
@@ -16,13 +16,18 @@ leptos_macro = { workspace = true }
leptos_reactive = { workspace = true }
leptos_server = { workspace = true }
leptos_config = { workspace = true }
-leptos-spin-macro = { version="0.1", optional = true}
+leptos-spin-macro = { version = "0.1", optional = true }
tracing = "0.1"
typed-builder = "0.18"
typed-builder-macro = "0.18"
serde = { version = "1", optional = true }
serde_json = { version = "1", optional = true }
-server_fn = { workspace = true, features = ["form-redirects", "browser", "url", "cbor"] }
+server_fn = { workspace = true, features = [
+ "form-redirects",
+ "browser",
+ "url",
+ "cbor",
+] }
web-sys = { version = "0.3.63", features = [
"ShadowRoot",
"ShadowRootInit",
@@ -68,10 +73,7 @@ miniserde = ["leptos_reactive/miniserde"]
rkyv = ["leptos_reactive/rkyv"]
tracing = ["leptos_macro/tracing"]
nonce = ["leptos_dom/nonce"]
-spin = [
- "leptos_reactive/spin",
- "leptos-spin-macro"
-]
+spin = ["leptos_reactive/spin", "leptos-spin-macro"]
experimental-islands = [
"leptos_dom/experimental-islands",
"leptos_macro/experimental-islands",
@@ -81,7 +83,7 @@ experimental-islands = [
]
trace-component-props = [
"leptos_dom/trace-component-props",
- "leptos_macro/trace-component-props"
+ "leptos_macro/trace-component-props",
]
[package.metadata.cargo-all-features]
@@ -92,9 +94,10 @@ denylist = [
"rustls",
"default-tls",
"wasm-bindgen",
+ "rkyv", # was causing clippy issues on nightly
"trace-component-props",
"spin",
- "experimental-islands"
+ "experimental-islands",
]
skip_feature_sets = [
[
diff --git a/leptos/src/error_boundary.rs b/leptos/src/error_boundary.rs
index 29a5fecb36..4c187a7087 100644
--- a/leptos/src/error_boundary.rs
+++ b/leptos/src/error_boundary.rs
@@ -1,10 +1,7 @@
use crate::Children;
use leptos_dom::{Errors, HydrationCtx, IntoView};
use leptos_macro::{component, view};
-use leptos_reactive::{
- create_rw_signal, provide_context, run_as_child, signal_prelude::*,
- RwSignal,
-};
+use leptos_reactive::{provide_context, run_as_child, signal_prelude::*};
/// When you render a `Result<_, _>` in your view, in the `Err` case it will
/// render nothing, and search up through the view tree for an `(T);
+#[cfg(all(target_arch = "wasm32", feature = "web"))]
impl fmt::Debug for HashRun {
#[inline]
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
diff --git a/leptos_dom/src/components/errors.rs b/leptos_dom/src/components/errors.rs
index 56228d47a2..0b0159da01 100644
--- a/leptos_dom/src/components/errors.rs
+++ b/leptos_dom/src/components/errors.rs
@@ -1,6 +1,6 @@
use crate::{HydrationCtx, IntoView};
use cfg_if::cfg_if;
-use leptos_reactive::{signal_prelude::*, use_context, RwSignal};
+use leptos_reactive::{signal_prelude::*, use_context};
use server_fn::error::Error;
use std::{borrow::Cow, collections::HashMap};
diff --git a/leptos_dom/src/helpers.rs b/leptos_dom/src/helpers.rs
index c9f5e4502b..7a6c176c7f 100644
--- a/leptos_dom/src/helpers.rs
+++ b/leptos_dom/src/helpers.rs
@@ -39,10 +39,13 @@ pub fn location_hash() -> Option {
if is_server() {
None
} else {
- location().hash().ok().map(|hash| match hash.chars().next() {
- Some('#') => hash[1..].to_string(),
- _ => hash,
- })
+ location()
+ .hash()
+ .ok()
+ .map(|hash| match hash.chars().next() {
+ Some('#') => hash[1..].to_string(),
+ _ => hash,
+ })
}
}
diff --git a/leptos_dom/src/lib.rs b/leptos_dom/src/lib.rs
index 9c0f005cbb..20dcc3fca7 100644
--- a/leptos_dom/src/lib.rs
+++ b/leptos_dom/src/lib.rs
@@ -774,9 +774,26 @@ impl View {
});
}
Self::CoreComponent(c) => match c {
- CoreComponent::DynChild(_) => {}
- CoreComponent::Each(_) => {}
- _ => {}
+ CoreComponent::DynChild(d) => {
+ if let Some(subview) = *d.child.take() {
+ let subview = subview.on(event, event_handler);
+ d.child.replace(Box::new(Some(subview)));
+ }
+ }
+ CoreComponent::Each(each) => {
+ let event_handler = Rc::new(RefCell::new(event_handler));
+ let new_children = each.children.take().into_iter().map(|item| {
+ if let Some(mut item) = item {
+ let event_handler = Rc::clone(&event_handler);
+ item.child = item.child.on(event.clone(), Box::new(move |e| event_handler.borrow_mut()(e)));
+ Some(item)
+ } else {
+ None
+ }
+ }).collect::>();
+ each.children.replace(new_children);
+ }
+ CoreComponent::Unit(_) => {}
},
_ => {}
}
@@ -1168,6 +1185,17 @@ impl IntoView for Cow<'static, str> {
}
}
+impl IntoView for Rc {
+ #[cfg_attr(
+ any(debug_assertions, feature = "ssr"),
+ instrument(level = "trace", name = "#text", skip_all)
+ )]
+ #[inline(always)]
+ fn into_view(self) -> View {
+ View::Text(Text::new(self.into()))
+ }
+}
+
impl IntoView for Oco<'static, str> {
#[cfg_attr(
any(debug_assertions, feature = "ssr"),
diff --git a/leptos_dom/src/macro_helpers/tracing_property.rs b/leptos_dom/src/macro_helpers/tracing_property.rs
index 365cef56f2..e23f5c4f09 100644
--- a/leptos_dom/src/macro_helpers/tracing_property.rs
+++ b/leptos_dom/src/macro_helpers/tracing_property.rs
@@ -155,9 +155,8 @@ fn match_serialize() {
}
#[test]
+#[allow(clippy::needless_borrow)]
fn match_no_serialize() {
- #![allow(clippy::needless_borrow)]
-
struct CustomStruct {
field: &'static str,
}
diff --git a/leptos_dom/src/node_ref.rs b/leptos_dom/src/node_ref.rs
index 0f71b0b46a..61dbb952bf 100644
--- a/leptos_dom/src/node_ref.rs
+++ b/leptos_dom/src/node_ref.rs
@@ -1,7 +1,5 @@
use crate::{html::ElementDescriptor, HtmlElement};
-use leptos_reactive::{
- create_render_effect, create_rw_signal, signal_prelude::*, RwSignal,
-};
+use leptos_reactive::{create_render_effect, signal_prelude::*};
use std::cell::Cell;
/// Contains a shared reference to a DOM node created while using the `view`
diff --git a/leptos_dom/src/ssr.rs b/leptos_dom/src/ssr.rs
index 2de8067abc..262dac6e40 100644
--- a/leptos_dom/src/ssr.rs
+++ b/leptos_dom/src/ssr.rs
@@ -9,7 +9,7 @@ use crate::{
use cfg_if::cfg_if;
use futures::{stream::FuturesUnordered, Future, Stream, StreamExt};
use itertools::Itertools;
-use leptos_reactive::{Oco, *};
+use leptos_reactive::*;
use std::pin::Pin;
type PinnedFuture = Pin>>;
diff --git a/leptos_hot_reload/src/lib.rs b/leptos_hot_reload/src/lib.rs
index 02f33330ec..388ab0a5e6 100644
--- a/leptos_hot_reload/src/lib.rs
+++ b/leptos_hot_reload/src/lib.rs
@@ -78,12 +78,20 @@ impl ViewMacros {
for view in visitor.views {
let span = view.span();
let id = span_to_stable_id(path, span.start().line);
- let tokens = view.tokens.clone().into_iter();
- // TODO handle class = ...
- let rsx =
- rstml::parse2(tokens.collect::())?;
- let template = LNode::parse_view(rsx)?;
- views.push(MacroInvocation { id, template });
+ if view.tokens.is_empty() {
+ views.push(MacroInvocation {
+ id,
+ template: LNode::Fragment(Vec::new()),
+ });
+ } else {
+ let tokens = view.tokens.clone().into_iter();
+ // TODO handle class = ...
+ let rsx = rstml::parse2(
+ tokens.collect::(),
+ )?;
+ let template = LNode::parse_view(rsx)?;
+ views.push(MacroInvocation { id, template });
+ }
}
Ok(views)
}
diff --git a/leptos_macro/Makefile.toml b/leptos_macro/Makefile.toml
index edc1668737..4a32f30846 100644
--- a/leptos_macro/Makefile.toml
+++ b/leptos_macro/Makefile.toml
@@ -11,13 +11,13 @@ dependencies = [
[tasks.test-leptos_macro-example]
description = "Tests the leptos_macro/example to check if macro handles doc comments correctly"
command = "cargo"
-args = ["+nightly-2024-01-29", "test", "--doc"]
+args = ["+nightly-2024-03-31", "test", "--doc"]
cwd = "example"
install_crate = false
[tasks.doc-leptos_macro-example]
description = "Docs the leptos_macro/example to check if macro handles doc comments correctly"
command = "cargo"
-args = ["+nightly-2024-01-29", "doc"]
+args = ["+nightly-2024-03-31", "doc"]
cwd = "example"
install_crate = false
diff --git a/leptos_macro/src/view/server_template.rs b/leptos_macro/src/view/server_template.rs
index 970ecce5c3..a4e4eb9c0c 100644
--- a/leptos_macro/src/view/server_template.rs
+++ b/leptos_macro/src/view/server_template.rs
@@ -429,6 +429,21 @@ fn attribute_to_tokens_ssr<'a>(
{ _ = #value; }
});
}
+ } else if let Some(directive_name) = name.strip_prefix("use:") {
+ let handler = syn::Ident::new(directive_name, attr.key.span());
+ let value = attr.value();
+ let value = value.map(|value| {
+ quote! {
+ _ = #value;
+ }
+ });
+ exprs_for_compiler.push(quote! {
+ #[allow(unused_braces)]
+ {
+ _ = #handler;
+ #value
+ }
+ });
} else if name == "inner_html" {
return attr.value();
} else {
diff --git a/leptos_macro/tests/ui/component.stderr b/leptos_macro/tests/ui/component.stderr
index 96c4b2e7e8..798b73c582 100644
--- a/leptos_macro/tests/ui/component.stderr
+++ b/leptos_macro/tests/ui/component.stderr
@@ -41,15 +41,19 @@ error: `optional_no_strip` conflicts with mutually exclusive `strip_option`
error: unexpected end of input, expected `=` or `(`
= help: try `#[prop(default = 5 * 10)]`
- --> tests/ui/component.rs:36:40
+ --> tests/ui/component.rs:35:1
|
-36 | fn default_without_value(#[prop(default)] default: bool) -> impl IntoView {
- | ^
+35 | #[component]
+ | ^^^^^^^^^^^^
+ |
+ = note: this error originates in the attribute macro `component` (in Nightly builds, run with -Z macro-backtrace for more info)
error: unexpected end of input, expected one of: identifier, `::`, `<`, `_`, literal, `const`, `ref`, `mut`, `&`, parentheses, square brackets, `..`, `const`
= help: try `#[prop(default = 5 * 10)]`
- --> tests/ui/component.rs:42:22
+ --> tests/ui/component.rs:40:1
+ |
+40 | #[component]
+ | ^^^^^^^^^^^^
|
-42 | #[prop(default= |)] default: bool,
- | ^
+ = note: this error originates in the attribute macro `component` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/leptos_macro/tests/ui/component_absolute.stderr b/leptos_macro/tests/ui/component_absolute.stderr
index 862c28af21..3341b8e873 100644
--- a/leptos_macro/tests/ui/component_absolute.stderr
+++ b/leptos_macro/tests/ui/component_absolute.stderr
@@ -33,15 +33,19 @@ error: `optional_no_strip` conflicts with mutually exclusive `strip_option`
error: unexpected end of input, expected `=` or `(`
= help: try `#[prop(default = 5 * 10)]`
- --> tests/ui/component_absolute.rs:32:19
+ --> tests/ui/component_absolute.rs:30:1
|
-32 | #[prop(default)] default: bool,
- | ^
+30 | #[::leptos::component]
+ | ^^^^^^^^^^^^^^^^^^^^^^
+ |
+ = note: this error originates in the attribute macro `::leptos::component` (in Nightly builds, run with -Z macro-backtrace for more info)
error: unexpected end of input, expected one of: identifier, `::`, `<`, `_`, literal, `const`, `ref`, `mut`, `&`, parentheses, square brackets, `..`, `const`
= help: try `#[prop(default = 5 * 10)]`
- --> tests/ui/component_absolute.rs:39:22
+ --> tests/ui/component_absolute.rs:37:1
+ |
+37 | #[::leptos::component]
+ | ^^^^^^^^^^^^^^^^^^^^^^
|
-39 | #[prop(default= |)] default: bool,
- | ^
+ = note: this error originates in the attribute macro `::leptos::component` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/leptos_reactive/Cargo.toml b/leptos_reactive/Cargo.toml
index 0e8d8ef401..45169e934e 100644
--- a/leptos_reactive/Cargo.toml
+++ b/leptos_reactive/Cargo.toml
@@ -72,7 +72,7 @@ hydrate = [
"dep:web-sys",
]
ssr = ["dep:tokio"]
-nightly = ["rkyv?/copy"]
+nightly = [] #["rkyv?/copy"] # not working on more recent nightlys
serde = []
serde-lite = ["dep:serde-lite"]
miniserde = ["dep:miniserde"]
@@ -81,7 +81,7 @@ experimental-islands = []
spin = ["ssr", "dep:spin-sdk"]
[package.metadata.cargo-all-features]
-denylist = ["nightly"]
+denylist = ["nightly", "rkyv"]
skip_feature_sets = [
[
"csr",
diff --git a/leptos_reactive/tests/untracked.rs b/leptos_reactive/tests/untracked.rs
index 11ccc90ba4..39d02893e4 100644
--- a/leptos_reactive/tests/untracked.rs
+++ b/leptos_reactive/tests/untracked.rs
@@ -1,6 +1,5 @@
use leptos_reactive::{
- create_isomorphic_effect, create_runtime, create_signal, signal_prelude::*,
- SignalGetUntracked, SignalSetUntracked,
+ create_isomorphic_effect, create_runtime, signal_prelude::*,
};
#[test]
diff --git a/leptos_server/src/action.rs b/leptos_server/src/action.rs
index 4f3316d47a..5f91959b12 100644
--- a/leptos_server/src/action.rs
+++ b/leptos_server/src/action.rs
@@ -2,9 +2,8 @@
#[cfg(debug_assertions)]
use leptos_reactive::console_warn;
use leptos_reactive::{
- create_rw_signal, is_suppressing_resource_load, signal_prelude::*,
- spawn_local, store_value, try_batch, use_context, ReadSignal, RwSignal,
- StoredValue,
+ is_suppressing_resource_load, signal_prelude::*, spawn_local, store_value,
+ try_batch, use_context, StoredValue,
};
use server_fn::{error::ServerFnUrlError, ServerFn, ServerFnError};
use std::{cell::Cell, future::Future, pin::Pin, rc::Rc};
diff --git a/leptos_server/src/multi_action.rs b/leptos_server/src/multi_action.rs
index d1deb7e718..b9e45ffe80 100644
--- a/leptos_server/src/multi_action.rs
+++ b/leptos_server/src/multi_action.rs
@@ -1,6 +1,6 @@
use leptos_reactive::{
- create_rw_signal, is_suppressing_resource_load, signal_prelude::*,
- spawn_local, store_value, untrack, ReadSignal, RwSignal, StoredValue,
+ is_suppressing_resource_load, signal_prelude::*, spawn_local, store_value,
+ untrack, StoredValue,
};
use server_fn::{ServerFn, ServerFnError};
use std::{future::Future, pin::Pin, rc::Rc};
diff --git a/meta/Cargo.toml b/meta/Cargo.toml
index 73ca0e39db..d2d266f41a 100644
--- a/meta/Cargo.toml
+++ b/meta/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "leptos_meta"
-version = "0.6.9"
+version = "0.6.10"
edition = "2021"
authors = ["Greg Johnston"]
license = "MIT"
diff --git a/meta/src/title.rs b/meta/src/title.rs
index 3fc2ab6f76..746ecec15d 100644
--- a/meta/src/title.rs
+++ b/meta/src/title.rs
@@ -1,4 +1,4 @@
-use crate::{use_head, TextProp};
+use crate::use_head;
use cfg_if::cfg_if;
use leptos::*;
use std::{cell::RefCell, rc::Rc};
diff --git a/router/Cargo.toml b/router/Cargo.toml
index 3d3c9a5d7f..32cff34d8b 100644
--- a/router/Cargo.toml
+++ b/router/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "leptos_router"
-version = "0.6.9"
+version = "0.6.10"
edition = "2021"
authors = ["Greg Johnston", "Ben Wishovich"]
license = "MIT"
diff --git a/router/src/components/form.rs b/router/src/components/form.rs
index 96f75ba842..f34e629f49 100644
--- a/router/src/components/form.rs
+++ b/router/src/components/form.rs
@@ -470,15 +470,13 @@ where
}
});
}
- let action_url = if let Some(url) = action.url() {
- url
- } else {
+ let action_url = action.url().unwrap_or_else(|| {
debug_warn!(
" {
/// Returns the current route params, parsed into the given type, or an error.
#[track_caller]
-pub fn use_params() -> Memo>
+pub fn use_params() -> Memo>
where
- T: PartialEq,
+ T: Params + PartialEq,
{
let route = use_route();
create_memo(move |_| route.params().with(T::from_map))
@@ -150,9 +149,9 @@ pub fn use_query_map() -> Memo {
/// Returns the current URL search query, parsed into the given type, or an error.
#[track_caller]
-pub fn use_query() -> Memo>
+pub fn use_query() -> Memo>
where
- T: PartialEq,
+ T: Params + PartialEq,
{
let router = use_router();
create_memo(move |_| router.inner.location.query.with(|m| T::from_map(m)))
diff --git a/server_fn/Cargo.toml b/server_fn/Cargo.toml
index 0ac4889bee..ff7130910d 100644
--- a/server_fn/Cargo.toml
+++ b/server_fn/Cargo.toml
@@ -128,6 +128,7 @@ denylist = [
"ciborium",
"hyper",
"inventory",
+ "rkyv",
]
skip_feature_sets = [
[
diff --git a/server_fn_macro/Cargo.toml b/server_fn_macro/Cargo.toml
index b5ae3b825a..6f9071ce30 100644
--- a/server_fn_macro/Cargo.toml
+++ b/server_fn_macro/Cargo.toml
@@ -4,6 +4,7 @@ version = { workspace = true }
edition = "2021"
authors = ["Greg Johnston"]
license = "MIT"
+repository = "https://github.com/leptos-rs/leptos"
description = "RPC for any web framework."
readme = "../README.md"
diff --git a/server_fn_macro/src/lib.rs b/server_fn_macro/src/lib.rs
index c41be02648..b423c63bec 100644
--- a/server_fn_macro/src/lib.rs
+++ b/server_fn_macro/src/lib.rs
@@ -13,7 +13,7 @@ use syn::{
parse::{Parse, ParseStream},
punctuated::Punctuated,
spanned::Spanned,
- Type, *,
+ *,
};
/// The implementation of the `server` macro.
bool, and these signals all implement Fn() - class:red=red - class:right=right - class:italics=italics - class:smallcaps=smallcaps + class:red=move||red.get() + class:right=move||right.get() + class:italics=move||italics.get() + class:smallcaps=move||smallcaps.get() > "Lorem ipsum sit dolor amet."
@@ -82,7 +82,7 @@ pub fn ButtonB( view! { diff --git a/examples/portal/Cargo.toml b/examples/portal/Cargo.toml index 69ae4f9e20..9dfa20ef24 100644 --- a/examples/portal/Cargo.toml +++ b/examples/portal/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -leptos = { path = "../../leptos", features = ["csr", "nightly"] } +leptos = { path = "../../leptos", features = ["csr"] } log = "0.4" console_log = "1" console_error_panic_hook = "0.1.7" diff --git a/examples/portal/rust-toolchain.toml b/examples/portal/rust-toolchain.toml index 055e912d2e..99fa95aaaf 100644 --- a/examples/portal/rust-toolchain.toml +++ b/examples/portal/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "nightly-2024-01-29" +channel = "nightly-2024-03-31" diff --git a/examples/portal/src/lib.rs b/examples/portal/src/lib.rs index 989167ff4e..200a4d2244 100644 --- a/examples/portal/src/lib.rs +++ b/examples/portal/src/lib.rs @@ -7,23 +7,23 @@ pub fn App() -> impl IntoView { view! {Length is {result}
+Length is {move||result.get()}
} } @@ -307,7 +309,7 @@ pub async fn rkyv_example(input: String) -> ResultUsing
@@ -317,14 +319,14 @@ pub fn RkyvExample() -> impl IntoView { -rkyvencoding{input}
+{move||input.get()}
Uploading {filename}
})} - {move || max().map(|max| view! { - + {move || filename.get().map(|filename| view! {Uploading {filename}
})} + {move || max.get().map(|max| view! { + })} } } @@ -665,7 +667,7 @@ pub fn CustomErrorTypes() -> impl IntoView { let value = input_ref.get().unwrap().value(); spawn_local(async move { let data = ascii_uppercase(value).await; - set_result(Some(data)); + set_result.set(Some(data)); }); } > @@ -789,13 +791,13 @@ pub fn CustomEncoding() -> impl IntoView { let value = input_ref.get().unwrap().value(); spawn_local(async move { let new_value = why_not(value, ", but in TOML!!!".to_string()).await.unwrap(); - set_result(new_value.0.modified); + set_result.set(new_value.0.modified); }); } > Submit -{result}
+{move||result.get()}
} } diff --git a/examples/server_fns_axum/src/error_template.rs b/examples/server_fns_axum/src/error_template.rs index 0a1731abe1..d68b2b58f7 100644 --- a/examples/server_fns_axum/src/error_template.rs +++ b/examples/server_fns_axum/src/error_template.rs @@ -1,5 +1,5 @@ use crate::errors::TodoAppError; -use leptos::{Errors, *}; +use leptos::*; #[cfg(feature = "ssr")] use leptos_axum::ResponseOptions; diff --git a/examples/session_auth_axum/Cargo.toml b/examples/session_auth_axum/Cargo.toml index 8e13a0a7a6..b78e2f39e6 100644 --- a/examples/session_auth_axum/Cargo.toml +++ b/examples/session_auth_axum/Cargo.toml @@ -12,10 +12,10 @@ console_log = "1.0" rand = { version = "0.8", features = ["min_const_gen"], optional = true } console_error_panic_hook = "0.1" futures = "0.3" -leptos = { path = "../../leptos", features = ["nightly"] } -leptos_meta = { path = "../../meta", features = ["nightly"] } +leptos = { path = "../../leptos" } +leptos_meta = { path = "../../meta"} leptos_axum = { path = "../../integrations/axum", optional = true } -leptos_router = { path = "../../router", features = ["nightly"] } +leptos_router = { path = "../../router" } log = "0.4" simple_logger = "4.0" serde = { version = "1.0", features = ["derive"] } diff --git a/examples/session_auth_axum/rust-toolchain.toml b/examples/session_auth_axum/rust-toolchain.toml index 055e912d2e..99fa95aaaf 100644 --- a/examples/session_auth_axum/rust-toolchain.toml +++ b/examples/session_auth_axum/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "nightly-2024-01-29" +channel = "nightly-2024-03-31" diff --git a/examples/session_auth_axum/src/error_template.rs b/examples/session_auth_axum/src/error_template.rs index 16e81df545..d1ea5f6d03 100644 --- a/examples/session_auth_axum/src/error_template.rs +++ b/examples/session_auth_axum/src/error_template.rs @@ -1,5 +1,5 @@ use crate::errors::TodoAppError; -use leptos::{Errors, *}; +use leptos::*; #[cfg(feature = "ssr")] use leptos_axum::ResponseOptions; diff --git a/examples/slots/Cargo.toml b/examples/slots/Cargo.toml index 7acc9d0809..70fcf81f72 100644 --- a/examples/slots/Cargo.toml +++ b/examples/slots/Cargo.toml @@ -8,7 +8,7 @@ codegen-units = 1 lto = true [dependencies] -leptos = { path = "../../leptos", features = ["csr", "nightly"] } +leptos = { path = "../../leptos", features = ["csr"] } console_log = "1" log = "0.4" console_error_panic_hook = "0.1.7" diff --git a/examples/slots/rust-toolchain.toml b/examples/slots/rust-toolchain.toml index 055e912d2e..99fa95aaaf 100644 --- a/examples/slots/rust-toolchain.toml +++ b/examples/slots/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "nightly-2024-01-29" +channel = "nightly-2024-03-31" diff --git a/examples/slots/src/lib.rs b/examples/slots/src/lib.rs index 6c3fcb44fb..2577681c81 100644 --- a/examples/slots/src/lib.rs +++ b/examples/slots/src/lib.rs @@ -28,9 +28,9 @@ fn SlotIf( #[prop(optional)] fallback: Option-- "All"
- - "Active"
- - "Completed"
+ - "All"
+ - "Active"
+ - "Completed"