feat!: csr and ssr feature of frender-hook-element

Author: EqualMa

Cargo.lock

@@ -6,9 +6,18 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-frender-ssr = { path = "../frender-ssr", version = "0.1.0" }
-pin-project-lite = "0.2.9"
 hooks-core = { version = "3.0.0-alpha", default-features = false }
 syn-lite = "0.1.0"
-frender-html = { version = "0.1.0", path = "../frender-html" }
 frender-element = { version = "0.1.0", path = "../frender-element" }
+
+# csr
+pin-project-lite = { version = "0.2.9", optional = true }
+frender-csr = { path = "../frender-csr", version = "0.1.0", optional = true, features = [
+    "experimental",
+] }
+# ssr
+frender-ssr = { path = "../frender-ssr", version = "0.1.0", optional = true }
+
+[features]
+csr = ["dep:pin-project-lite", "dep:frender-csr", "frender-element/csr"]
+ssr = ["dep:frender-ssr", "frender-element/ssr"]

packages/frender-hook-element/Cargo.toml

@@ -1,7 +1,9 @@
 use std::{marker::PhantomData, pin::Pin};
 
-pub mod csr;
-pub mod ssr;
+#[cfg(feature = "csr")]
+mod csr;
+#[cfg(feature = "ssr")]
+mod ssr;
 
 pub struct HookElement<F>(pub F);
 

packages/frender-hook-element/src/hook_element.rs

@@ -1,6 +1,6 @@
 use std::{marker::PhantomData, pin::Pin, task::Poll};
 
-use frender_html::csr::{
+use frender_csr::{
     experimental::{
         self, HtmlRenderContext, PinnedRenderStateKind, PinnedRenderStateKindPollRender,
         PinnedUiHandleOfKind, RenderHtml, UnpinnedRenderStateKind,

packages/frender-hook-element/src/hook_element/csr.rs

@@ -1,16 +1,23 @@
-pub use self::hook_element::{new_fn_hook_element, HookElement};
+pub use self::hook_element::{new_fn_hook_element, HookElement, UseHookData};
 
 mod hook_element;
 
 pub mod component_fn_options {
+    #[cfg(feature = "ssr")]
+    #[cfg(feature = "csr")]
+    #[doc(no_inline)]
     pub use frender_element::Element;
 
+    #[cfg(feature = "ssr")]
     pub mod ssr_only {
-        pub use frender_ssr::SsrElement as Element;
+        #[doc(no_inline)]
+        pub use frender_element::SsrElement as Element;
     }
 
+    #[cfg(feature = "csr")]
     pub mod csr_only {
-        pub use frender_html::csr::CsrElement as Element;
+        #[doc(no_inline)]
+        pub use frender_element::CsrElement as Element;
     }
 }
 

packages/frender-hook-element/src/lib.rs

@@ -30,13 +30,13 @@ frender-dom-tokens = { version = "0.1.0", path = "../frender-dom-tokens" }
 frender-reactive-value = { version = "0.1.0", path = "../frender-reactive-value" }
 frender-to-element = { version = "0.1.0", path = "../frender-to-element", optional = true }
 frender-memo = { version = "0.1.0", path = "../frender-memo", optional = true }
-frender-hooks-ext = { version = "0.1.0", path = "../frender-hooks-ext", optional = true }
 frender-synced-collection = { version = "0.1.0", path = "../frender-synced-collection", optional = true }
 frender-html-components = { version = "0.1.0", path = "../frender-html-components", optional = true }
 
-[dependencies.frender-hook-element]
-path = "../frender-hook-element"
-version = "0.1.0"
+# hooks
+frender-hook-element = { version = "0.1.0", path = "../frender-hook-element", optional = true }
+frender-hooks-ext = { version = "0.1.0", path = "../frender-hooks-ext", optional = true }
+
 
 [dependencies.frender-macros]
 version = "1.0.0-alpha.8"
@@ -82,6 +82,7 @@ ssr = [
     "frender-memo?/ssr",
     "frender-hooks-ext?/ssr",
     "frender-synced-collection?/ssr",
+    "frender-hook-element?/ssr",
 ]
 csr = [
     #
@@ -95,6 +96,7 @@ csr = [
     "frender-memo?/experimental",
     "frender-hooks-ext?/csr",
     "frender-synced-collection?/csr",
+    "frender-hook-element?/csr",
 ]
 # default- features
 html-components = ["dep:frender-html-components"]
@@ -105,8 +107,11 @@ either = [
     "frender-element/either",
     "frender-hooks-ext?/either",
 ]
-hooks = ["frender-context?/hooks", "hooks_ext"]
+
+hooks = ["frender-context?/hooks", "hooks_ext", "HookElement"]
 hooks_ext = ["dep:frender-hooks-ext"]
+HookElement = ["dep:frender-hook-element"]
+
 ToElement = [
     "dep:frender-to-element",
     "frender-hooks-ext?/ToElement",

packages/frender/Cargo.toml

@@ -0,0 +1,7 @@
+pub use frender_hook_element::{
+    //
+    component_fn,
+    new_fn_hook_element,
+    HookElement,
+    UseHookData,
+};

packages/frender/src/elements/hook_element.rs

@@ -103,6 +103,9 @@ Empty as Empty,
 #[cfg(feature = "SyncedCollection")]
 pub mod synced_collection;
 
+#[cfg(feature = "HookElement")]
+pub mod hook_element;
+
 #[cfg(any(test, doc, doctest))]
 mod doc_macros;
 #[cfg(any(test, doc, doctest))]

packages/frender/src/elements/mod.rs

@@ -1,4 +1,12 @@
-// pub use frender_element::Element;
+#[cfg(feature = "csr")]
+#[cfg(feature = "ssr")]
+pub use frender_element::Element;
+
+#[cfg(feature = "csr")]
+pub use frender_element::CsrElement;
+
+#[cfg(feature = "ssr")]
+pub use frender_element::SsrElement;
 
 #[cfg(feature = "hooks_ext")]
 pub mod hooks_ext;
@@ -11,20 +19,17 @@ pub use frender_to_element::{RefToElementWithFn, ToElement, ToElementWithFn};
 #[cfg(feature = "SyncedCollection")]
 pub use elements::synced_collection::{SyncedCollection, SyncedVec};
 
+#[cfg(feature = "HookElement")]
+#[doc(no_inline)]
+pub use crate::elements::hook_element::component_fn;
+
 pub use frender_common::{either::EitherElement, EventListenerOptions, HandleEventWithOptions};
-pub use frender_hook_element::new_fn_hook_element;
 pub use frender_macros::component;
 pub use frender_reactive_value::{
     non_reactive::Uncached, static_or_temp_ref::StaticOrTempRef, temp_into_static::TempIntoStatic,
     temp_ref::TempRef,
 };
 
-// #[cfg(feature = "csr")]
-// pub use frender_hook_element::frender_csr as csr;
-
-// #[cfg(feature = "ssr")]
-// pub use frender_hook_element::frender_ssr as ssr;
-
 pub use frender_ssr as ssr;
 
 pub use prelude::*;
@@ -37,9 +42,6 @@ pub use prelude::*;
 //     pub use frender_html::html::{components, components as intrinsic_components};
 // }
 
-pub use frender_hook_element as hook_element;
-pub use frender_hook_element::component_fn;
-
 pub use event::*;
 pub use frender_events::event;
 
@@ -178,18 +180,22 @@ pub mod macros {
 // endregion
 
 pub mod prelude {
-    // #[cfg(all(feature = "csr", feature = "ssr"))]
-    // pub use crate::Element;
+    #[cfg(feature = "csr")]
+    #[cfg(feature = "ssr")]
+    pub use crate::Element;
 
-    pub use crate::rsx;
+    #[cfg(feature = "csr")]
+    pub use crate::CsrElement;
 
-    pub use frender_common::{HandleEvent, MaybeHandleEvent};
+    #[cfg(feature = "ssr")]
+    pub use crate::SsrElement;
 
-    pub use frender_hook_element::component_fn;
+    pub use crate::rsx;
 
-    pub use frender_element::CsrElement;
+    pub use frender_common::{HandleEvent, MaybeHandleEvent};
 
-    pub use frender_element::Element;
+    #[cfg(feature = "HookElement")]
+    pub use crate::component_fn;
 
     #[cfg(feature = "KeyedElements")]
     pub use crate::{Keyed, KeyedElements};
@@ -206,13 +212,8 @@ pub mod prelude {
     #[cfg(feature = "hooks_ext")]
     pub use crate::hooks_ext::ShareValueExt as _;
 
-    // #[cfg(feature = "csr")]
-    // pub use frender_hook_element::frender_csr::{
-    //     CsrContext, CsrElement, CsrRenderState, ElementsLinkedVec,
-    // };
-
     // #[cfg(feature = "ssr")]
-    pub use frender_ssr::{SsrElement, SsrElementExt};
+    pub use frender_ssr::SsrElementExt;
 }
 
 #[macro_export]
@@ -228,8 +229,12 @@ macro_rules! rsx {
 
 #[doc(hidden)]
 pub mod __private {
+    #[cfg(feature = "HookElement")]
+    // #[cfg(feature = "proc-macro")]
+    #[doc(hidden)]
     pub use frender_hook_element::__private::hooks_core;
 
+    #[doc(hidden)]
     pub use frender_macros::rsx as impl_rsx;
 }