Fix bundling/path errors, sidecar support, iOS/Android simulator support, asset hotreload fixes, serverfn hotrelad, native tailwind support (#2779)

* wip: fix manganis import path * upgrade tauri bundler, convert todo!() to unimplemented!() * feat: mobile hotreloading + ios asset configuration * remove oid demo and its associated env vars * nuke all the things that cause cache thrashing * swap to Asset type * add some more logs * display impl for attrvalue * dont panic on collect failure * cut down web deps to 150 * clean up deps in a lot of places, simplify build scripts * clean up asset resolution and cli-dev profile * wire up absolute paths for manganis asset in a particular mode * move document related things around to shorten compile times * move most things to `document::Item` and then decompose the cli-config * switch link to stylesheet for clarity in examples * move manganis workspace example to examples folder * decompose manganis-cli-support * dont need mobile demo anymore * remove gloo dialogs * html doesnt need document * rename hotreload to devtools * really clean up the html crate * fix weird rsx spacing * clean up desktop to use callback * clean up document a bit * re-wire up devsocket * fix utf css * yeeeet that js out of here * synthetic web system works * web crate almost done being cleaned up * desktop mostly cleaned up too * clean up cli a bit * more cli cleanup * cli builds again * clean up cli, inline structs, cut down number of unique types where possible * hotreload works again for desktop and this time, mobile too * cfg out tungstenite * devserver err * more refactor to cli builder * switch to unbounded_send * new structure is much cleaner * add http serve subcommand * bundled hotreload * kick stylsheets * clean up a bit more, split up eventloop * amazingly serve seems done * change from pub to pub(crate) in cli * remove tools * bit more polish to cli * fix issue with join * gracefully handle fullstack without a server * fullstack mobile demo * fix launch function, move projects into example-projects folder * hoist examples * add "run" command * clean up launch * remove old manual websocket receiver * doctor command * allow desktop to scroll * cut apart router crate * dont put launch in prelude * use dioxus::launch where possible * rename rsx, cut out hotreload tests * remove liveview project * bump native * fix compile for renderers * move sync event response out of interpreter * move render in serve * rollback settings change * cli compiles, huzzah! * change uris for asset * fix asset * new tui screen * new cargo-like tui works * very very verty close * it works! very small bug with incorrect grapheme calc * Clean up devserver a bit * status sytem * tidy up debug filters * clean up logging situation * Fix a number of bugs with log printing * new printing system is more reliable * wire up more stuff * things working but fullstack is having issues * fullstack works again! * hotreloading bundled assets works again * bundled hotreload and beginnings of macos bundling * Hotreload desktop * combined server builds * add build handle * fix fullstack assets * make open async, add some hooks for ios * migrate filemap to runner * wip global crate system * fixup bundles + organize asset * fix asset location bug * all the bundled reloading! * open ios simulator! * full hotreload support for mobile + serverfn * basic cleanups * clean up dx * Move filemap * fix cutting of newlines * assets workibg, some android * hoist wry/tao * use sync locks and headers to fix issues with android * desktop -> mac/win/linux with alias * better logging * feat: workspace (entire computer!) hotreload * should rebuild toggle, ios simulator bootup * proper mobile support in launch * more robust handling of assets * fix cargo * bring back some of tauri bundle * make warnings go away, clippy happy on cli * some final clippy cleanups * fmt * move manganis to its own folder * upgrade bundle to stable * drastically slim down manganis, prepping for merge * typos, failing test, docsrs config * remove static gen test * nix static gen test * we use --platform web instead of --platform fullstack now * only bind dev urls in desktop/mobile * install gtk * nix static gen * split build dir by app name
2024-10-25 17:23:45 -07:00
1 parent ef436e4ed0
commit 7ec3453ca3
@@ -10,45 +10,37 @@ homepage = "https://dioxuslabs.com"
 keywords = ["dom", "ui", "gui", "react"]

 [dependencies]
-rustc-hash = { workspace = true }
+dioxus-core-types = { workspace = true }
+const_format = { workspace = true }
+futures-channel = { workspace = true }
+generational-box = { workspace = true }
 longest-increasing-subsequence = { workspace = true }
-futures-util = { workspace = true, default-features = false, features = [
-    "alloc",
-    "std",
-] }
+rustc-hash = { workspace = true }
+rustversion = { workspace = true }
 slab = { workspace = true }
 slotmap = { workspace = true }
-futures-channel = { workspace = true }
 tracing = { workspace = true }
-serde = {workspace = true, optional = true, features = ["derive"] }
-generational-box = { workspace = true }
-rustversion = { workspace = true }
-const_format = { workspace = true }
 warnings = { workspace = true }
-manganis = { workspace = true, default-features = false, optional = true }
+futures-util = { workspace = true, default-features = false, features = ["alloc", "std"] }
+serde = { workspace = true, optional = true, features = ["derive"] }

 [dev-dependencies]
-tokio = { workspace = true, features = ["full"] }
-tracing-fluent-assertions = "0.3.0"
 dioxus = { workspace = true }
-dioxus-html = { workspace = true, features = ["serialize"] }
-pretty_assertions = "1.3.0"
-rand = { workspace = true }
 dioxus-ssr = { workspace = true }
-reqwest = { workspace = true}
+dioxus-html = { workspace = true, features = ["serialize"] }
+tokio = { workspace = true, features = ["full"] }
+rand = { workspace = true }
+reqwest = { workspace = true }
 tracing-subscriber = { workspace = true }
+tracing-fluent-assertions = "0.3.0"
+pretty_assertions = "1.3.0"

 [dev-dependencies.web-sys]
 version = "0.3.56"
-features = [
-    "Document",
-    "HtmlElement",
-    "Window"
-]
+features = ["Document", "HtmlElement", "Window"]

 [features]
 serialize = ["dep:serde"]
-manganis = ["dep:manganis"]

 [package.metadata.docs.rs]
 cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples"]
@@ -313,10 +313,20 @@ impl DynamicValuePool {
 #[derive(Debug, Clone, PartialEq)]
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 pub struct HotReloadTemplateWithLocation {
-    pub location: String,
+    pub key: TemplateGlobalKey,
    pub template: HotReloadedTemplate,
 }

+#[doc(hidden)]
+#[derive(Debug, Clone, PartialEq, Hash, PartialOrd, Eq, Ord)]
+#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
+pub struct TemplateGlobalKey {
+    pub file: String,
+    pub line: usize,
+    pub column: usize,
+    pub index: usize,
+}
+
 type StaticTemplateArray = &'static [TemplateNode];

 #[doc(hidden)]
@@ -40,6 +40,7 @@ pub mod internal {
        DynamicLiteralPool, DynamicValuePool, FmtSegment, FmtedSegments, HotReloadAttributeValue,
        HotReloadDynamicAttribute, HotReloadDynamicNode, HotReloadLiteral,
        HotReloadTemplateWithLocation, HotReloadedTemplate, HotreloadedLiteral, NamedAttribute,
+        TemplateGlobalKey,
    };

    #[doc(hidden)]
@@ -1,3 +1,5 @@
+use dioxus_core_types::DioxusFormattable;
+
 use crate::innerlude::VProps;
 use crate::prelude::RenderError;
 use crate::{any_props::BoxedAnyProps, innerlude::ScopeState};
@@ -722,9 +724,9 @@ impl Attribute {
    ///
    /// "Volatile" refers to whether or not Dioxus should always override the value. This helps prevent the UI in
    /// some renderers stay in sync with the VirtualDom's understanding of the world
-    pub fn new(
+    pub fn new<T>(
        name: &'static str,
-        value: impl IntoAttributeValue,
+        value: impl IntoAttributeValue<T>,
        namespace: Option<&'static str>,
        volatile: bool,
    ) -> Attribute {
@@ -1000,7 +1002,7 @@ where
 }

 /// A value that can be converted into an attribute value
-pub trait IntoAttributeValue {
+pub trait IntoAttributeValue<T = ()> {
    /// Convert into an attribute value
    fn into_value(self) -> AttributeValue;
 }
@@ -1078,21 +1080,24 @@ impl<T: IntoAttributeValue> IntoAttributeValue for Option<T> {
    }
 }

-#[cfg(feature = "manganis")]
-impl IntoAttributeValue for manganis::ImageAsset {
+pub struct AnyFmtMarker;
+impl<T> IntoAttributeValue<AnyFmtMarker> for T
+where
+    T: DioxusFormattable,
+{
    fn into_value(self) -> AttributeValue {
-        AttributeValue::Text(self.path().to_string())
+        AttributeValue::Text(self.format().to_string())
    }
 }

 /// A trait for anything that has a dynamic list of attributes
 pub trait HasAttributes {
    /// Push an attribute onto the list of attributes
-    fn push_attribute(
+    fn push_attribute<T>(
        self,
        name: &'static str,
        ns: Option<&'static str>,
-        attr: impl IntoAttributeValue,
+        attr: impl IntoAttributeValue<T>,
        volatile: bool,
    ) -> Self;
 }