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
@@ -0,0 +1,85 @@
+use serde::{Deserialize, Serialize};
+use std::{
+    hash::{Hash, Hasher},
+    path::PathBuf,
+    time::SystemTime,
+};
+
+/// The location we'll write to the link section - needs to be serializable
+///
+/// This basically is 1:1 with `manganis/Asset` but with more metadata to be useful to the macro and cli
+#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
+pub struct ResourceAsset {
+    /// The input path `/assets/blah.css`
+    pub input: PathBuf,
+
+    /// The canonicalized asset
+    ///
+    /// `Users/dioxus/dev/app/assets/blah.css`
+    pub absolute: PathBuf,
+
+    /// The post-bundle name of the asset - do we include the `assets` name?
+    ///
+    /// `blahcss123.css`
+    pub bundled: String,
+}
+
+#[derive(Debug)]
+pub struct AssetError {}
+
+impl ResourceAsset {
+    pub fn parse_any(raw: &str) -> Result<Self, AssetError> {
+        // get the location where the asset is absolute, relative to
+        //
+        // IE
+        // /users/dioxus/dev/app/
+        // is the root of
+        // /users/dioxus/dev/app/assets/blah.css
+        let manifest_dir = std::env::var("CARGO_MANIFEST_DIR")
+            .map(PathBuf::from)
+            .unwrap();
+
+        // 1. the input file should be a pathbuf
+        let input = PathBuf::from(raw);
+
+        // 2. absolute path to the asset
+        let absolute = manifest_dir
+            .join(raw.trim_start_matches('/'))
+            .canonicalize()
+            .unwrap();
+
+        // 3. the bundled path is the unique name of the asset
+        let bundled = Self::make_unique_name(absolute.clone());
+
+        Ok(Self {
+            input,
+            absolute,
+            bundled,
+        })
+    }
+
+    fn make_unique_name(file_path: PathBuf) -> String {
+        // Create a hasher
+        let mut hash = std::collections::hash_map::DefaultHasher::new();
+
+        // Open the file to get its options
+        let file = std::fs::File::open(&file_path).unwrap();
+        let metadata = file.metadata().unwrap();
+        let modified = metadata.modified().unwrap_or(SystemTime::UNIX_EPOCH);
+
+        // Hash a bunch of metadata
+        // name, options, modified time, and maybe the version of our crate
+        // Hash the last time the file was updated and the file source. If either of these change, we need to regenerate the unique name
+        modified.hash(&mut hash);
+        file_path.hash(&mut hash);
+
+        let uuid = hash.finish();
+        let file_name = file_path.file_stem().unwrap().to_string_lossy();
+        let extension = file_path
+            .extension()
+            .map(|f| f.to_string_lossy())
+            .unwrap_or_default();
+
+        format!("{file_name}-{uuid:x}.{extension}")
+    }
+}
@@ -0,0 +1,5 @@
+mod asset;
+mod linker;
+
+pub use asset::*;
+pub use linker::*;
@@ -0,0 +1,69 @@
+/// Information about the manganis link section for a given platform
+#[derive(Debug, Clone, Copy)]
+pub struct LinkSection {
+    /// The link section we pass to the static
+    pub link_section: &'static str,
+    /// The name of the section we find in the binary
+    pub name: &'static str,
+}
+
+impl LinkSection {
+    /// The list of link sections for all supported platforms
+    pub const ALL: &'static [&'static LinkSection] =
+        &[Self::WASM, Self::MACOS, Self::WINDOWS, Self::ILLUMOS];
+
+    /// Returns the link section used in linux, android, fuchsia, psp, freebsd, and wasm32
+    pub const WASM: &'static LinkSection = &LinkSection {
+        link_section: "manganis",
+        name: "manganis",
+    };
+
+    /// Returns the link section used in macOS, iOS, tvOS
+    pub const MACOS: &'static LinkSection = &LinkSection {
+        link_section: "__DATA,manganis,regular,no_dead_strip",
+        name: "manganis",
+    };
+
+    /// Returns the link section used in windows
+    pub const WINDOWS: &'static LinkSection = &LinkSection {
+        link_section: "mg",
+        name: "mg",
+    };
+
+    /// Returns the link section used in illumos
+    pub const ILLUMOS: &'static LinkSection = &LinkSection {
+        link_section: "set_manganis",
+        name: "set_manganis",
+    };
+
+    /// The link section used on the current platform
+    pub const CURRENT: &'static LinkSection = {
+        #[cfg(any(
+            target_os = "none",
+            target_os = "linux",
+            target_os = "android",
+            target_os = "fuchsia",
+            target_os = "psp",
+            target_os = "freebsd",
+            target_arch = "wasm32"
+        ))]
+        {
+            Self::WASM
+        }
+
+        #[cfg(any(target_os = "macos", target_os = "ios", target_os = "tvos"))]
+        {
+            Self::MACOS
+        }
+
+        #[cfg(target_os = "windows")]
+        {
+            Self::WINDOWS
+        }
+
+        #[cfg(target_os = "illumos")]
+        {
+            Self::ILLUMOS
+        }
+    };
+}