feat!: rename frender-csr to frender-csr-core

EqualMa · EqualMa · commit 383ad3a13332 · 2025-02-17T20:34:06.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/frender-csr-core/Cargo.toml b/packages/frender-csr-core/Cargo.toml
@@ -1,11 +1,10 @@
 [package]
-name = "frender-csr"
+name = "frender-csr-core"
 version = "0.1.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 frender-common = { version = "0.1.0", path = "../frender-common" }
-either = { version = "1.9.0", default-features = false, optional = true }
 pin-project-lite = "0.2.13"
diff --git a/packages/frender-csr-core/src/event_listener.rs b/packages/frender-csr-core/src/event_listener.rs
diff --git a/packages/frender-csr-core/src/lib.rs b/packages/frender-csr-core/src/lib.rs
diff --git a/packages/frender-csr-core/src/render.rs b/packages/frender-csr-core/src/render.rs
diff --git a/packages/frender-dom/Cargo.toml b/packages/frender-dom/Cargo.toml
@@ -15,7 +15,7 @@ frender-ssr = { version = "0.1.0", path = "../frender-ssr" }
 wasm-bindgen = { version = "0.2.83", optional = true }
 async-str-iter = { version = "0.1.0", path = "../async-str-iter" }
 either = { version = "1.9.0", default-features = false, optional = true }
-frender-csr = { version = "0.1.0", path = "../frender-csr" }
+frender-csr-core = { version = "0.1.0", path = "../frender-csr-core" }
 frender-style = { version = "0.1.0", path = "../frender-style" }
 frender-dom-tokens = { version = "0.1.0", path = "../frender-dom-tokens" }
 frender-attr-value = { version = "0.1.0", path = "../frender-attr-value" }
@@ -51,7 +51,6 @@ web = [
 either = [
     "dep:either",
     "frender-ssr/either",
-    "frender-csr/either",
     "frender-attr-value/either",
     "frender-dom-tokens/either",
     "frender-style/either",
diff --git a/packages/frender-dom/src/csr/web/event_listener.rs b/packages/frender-dom/src/csr/web/event_listener.rs
@@ -3,7 +3,7 @@ use frender_events::web::JsCastEventType;
 
 use std::marker::{PhantomData, PhantomPinned};
 
-use frender_csr::event_listener::{HandleEvent, PinnedRegisterUpdate};
+use frender_csr_core::event_listener::{HandleEvent, PinnedRegisterUpdate};
 
 mod handle_js_cast_event {
     use frender_common::HandleEvent;
@@ -42,7 +42,7 @@ mod handle_js_cast_event {
 pub mod unpinned {
     use std::{borrow::Cow, cell::RefCell, rc::Rc};
 
-    use frender_csr::event_listener::{HandleEvent, RegisterUpdate};
+    use frender_csr_core::event_listener::{HandleEvent, RegisterUpdate};
     use frender_events::web::JsCastEventType;
 
     use super::handle_js_cast_event::HandleJsCastEvent;
diff --git a/packages/frender-dom/src/event_listener.rs b/packages/frender-dom/src/event_listener.rs
@@ -1,5 +1,5 @@
 use frender_common::HandleEvent;
-use frender_csr::event_listener::{PinnedRegisterUpdate, RegisterUpdate};
+use frender_csr_core::event_listener::{PinnedRegisterUpdate, RegisterUpdate};
 
 use crate::event_types::EventType;
 
diff --git a/packages/frender-dom/src/lib.rs b/packages/frender-dom/src/lib.rs
@@ -1,6 +1,6 @@
 pub use event_listener::OnEvent;
 pub use frender_common::Empty;
-pub use frender_csr::{
+pub use frender_csr_core::{
     event_listener::{HandleEvent, MaybeHandleEvent, PinnedRegisterUpdate, RegisterUpdate},
     StateUnmount,
 };
diff --git a/packages/frender-dom/src/render.rs b/packages/frender-dom/src/render.rs
@@ -1,4 +1,4 @@
-pub use frender_csr::render::{RenderContext, RenderWithContext};
+pub use frender_csr_core::render::{RenderContext, RenderWithContext};
 
 pub use self::text::{
     KnownValueForText, KnownValueKindForText, RenderTextFrom, RenderTextFromKnown, TextKind,
diff --git a/packages/frender-dom/src/render/text.rs b/packages/frender-dom/src/render/text.rs
@@ -6,7 +6,7 @@ use frender_common::{
     },
     TempStr,
 };
-use frender_csr::render::RenderWithContext;
+use frender_csr_core::render::RenderWithContext;
 
 use crate::{string_element::StringElement, ui_handle::UiHandle};
 
diff --git a/packages/frender/Cargo.toml b/packages/frender/Cargo.toml
@@ -22,7 +22,6 @@ hooks = { version = "3.0.0-alpha", default-features = false, features = [
 ], optional = true }
 frender-events = { version = "0.1.0", path = "../frender-events" }
 async-str-iter = { version = "0.1.0", path = "../async-str-iter" }
-frender-csr = { version = "0.1.0", path = "../frender-csr", optional = true }
 frender-csr-web = { version = "0.1.0", path = "../frender-csr-web", optional = true }
 frender-render-with = { version = "0.1.0", path = "../frender-render-with", optional = true }
 frender-keyed-elements = { version = "0.1.0", path = "../frender-keyed-elements", optional = true }
@@ -65,15 +64,15 @@ nightly = ["frender-render-with?/nightly"]
 html = ["csr"] # TODO: remove
 html-components = ["html", "frender-html/components"]
 either = [
+    #
     "dep:either",
     "frender-ssr/either",
     "frender-html/either",
-    "frender-csr?/either",
 ]
 web = ["frender-csr-web"]
 spawn = ["frender-csr-web?/spawn"]
-ssr = ["frender-keyed-elements?/ssr"] # TODO: remove ssr feature
-csr = ["ssr", "frender-csr", "frender-keyed-elements?/csr"]
+ssr = ["frender-keyed-elements?/ssr"]
+csr = ["ssr", "frender-keyed-elements?/csr"] # TODO: remove ssr feature
 RenderWith = ["dep:frender-render-with"]
 KeyedElements = ["dep:frender-keyed-elements"]
 ToElement = []
diff --git a/packages/frender/src/elements/synced_collection/state.rs b/packages/frender/src/elements/synced_collection/state.rs
@@ -1,11 +1,11 @@
 use std::{cell::RefCell, pin::Pin, rc::Rc, task::Poll};
 
-use frender_csr::{
-    render::{RenderContext, RenderWithContext},
-    StateUnmount,
-};
 use frender_html::{
-    dom::ui_handle::{UiHandle, UnmountedUiHandle},
+    dom::{
+        render::{RenderContext, RenderWithContext},
+        ui_handle::{UiHandle, UnmountedUiHandle},
+        StateUnmount,
+    },
     experimental::{UnpinnedRenderStateKind, UnpinnedRenderStateKindPollRender},
     CsrElement, HtmlRenderContext, RenderHtml,
 };
diff --git a/packages/frender/src/elements/synced_collection/to_element/csr.rs b/packages/frender/src/elements/synced_collection/to_element/csr.rs
@@ -1,9 +1,9 @@
 use std::{cell::RefCell, marker::PhantomData, pin::Pin, rc::Rc};
 
-use frender_csr::render::RenderContext as _;
 use frender_html::{
     dom::{
         behaviors::{NodeRenderSelf, NodeWithRenderContextAfterSelf as _},
+        render::RenderContext as _,
         ui_handle::{UiHandle, UnmountedUiHandle},
     },
     experimental::{
@@ -383,7 +383,6 @@ where
                             *mount_state = MountState::MountedAndUpToDate;
 
                             if cursor_should_skip {
-                                use frender_csr::render::RenderContext;
                                 render_context.mark_cursor_skipped()
                             }
 
diff --git a/packages/frender/src/hooks_ext/element.rs b/packages/frender/src/hooks_ext/element.rs
@@ -6,9 +6,8 @@ pub use self::with_to_element::WithToElement;
 
 use std::{marker::PhantomData, pin::Pin, task::Poll};
 
-use frender_csr::StateUnmount;
-
 use frender_html::{
+    dom::StateUnmount,
     experimental::{
         self, PinnedRenderStateKind, PinnedRenderStateKindPollRender, PinnedStateOfKind,
         PinnedUiHandleOfKind, RenderInitPinned, UnpinnedRenderStateKind,
@@ -626,7 +625,7 @@ where
                 render_context,
                 |render_context| {
                     signal_hook.map(|value| {
-                        use frender_csr::render::RenderContext as _;
+                        use frender_html::dom::render::RenderContext as _;
                         let element = F::owned_part_into_csr_element(mut_part, value, owned_part);
                         let (state_init, render_init) =
                             element.pinned_render_init(render_context.renderer_mut());
diff --git a/packages/frender/src/hooks_ext/form_control.rs b/packages/frender/src/hooks_ext/form_control.rs
@@ -1,9 +1,8 @@
 use std::{borrow::Borrow, marker::PhantomData, pin::Pin, task::Poll};
 
 use frender_common::{IntoStaticStr, PrimarilyBorrow, ToStaticStr};
-use frender_csr::StateUnmount;
 use frender_html::{
-    dom::RegisterUpdate,
+    dom::{RegisterUpdate, StateUnmount},
     form_control::{
         element::FormControlElement,
         input::{InputValue, InputValueKind},
diff --git a/packages/frender/src/memo/csr.rs b/packages/frender/src/memo/csr.rs
@@ -2,17 +2,15 @@ use std::marker::PhantomData;
 use std::pin::Pin;
 use std::task::Poll;
 
-use frender_csr::StateUnmount;
-use frender_html::dom::ui_handle::UnmountedUiHandle as _;
-use frender_html::experimental::{PinnedStateOfKind, PinnedUiHandleOfKind, RenderInitPinned};
 use frender_html::{
+    dom::{ui_handle::UnmountedUiHandle as _, StateUnmount},
     experimental::{
-        self, PinnedRenderStateKind, PinnedRenderStateKindPollRender, UnpinnedRenderStateKind,
+        self, PinnedRenderStateKind, PinnedRenderStateKindPollRender, PinnedStateOfKind,
+        PinnedUiHandleOfKind, RenderInitPinned, UnpinnedRenderStateKind,
         UnpinnedRenderStateKindPollRender,
     },
-    CsrElement, RenderHtml,
+    CsrElement, HtmlRenderContext, RenderHtml, RenderStateKind,
 };
-use frender_html::{HtmlRenderContext, RenderStateKind};
 
 use crate::fn_traits::{FnOnce1, FnOnce2};
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-pub use frender_csr::render::{RenderContext, RenderWithContext};`
	`1`	`+pub use frender_csr_core::render::{RenderContext, RenderWithContext};`
`2`	`2`
`3`	`3`	`pub use self::text::{`
`4`	`4`	`KnownValueForText, KnownValueKindForText, RenderTextFrom, RenderTextFromKnown, TextKind,`