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

packages/signals/src/global/mod.rs

@@ -137,10 +137,38 @@ where
     /// This is useful for ensuring that the signal is unique across the application and accessible from
     /// outside the application too.
     #[track_caller]
-    pub const fn with_key(constructor: fn() -> R, key: &'static str) -> Self {
+    pub const fn with_name(constructor: fn() -> R, key: &'static str) -> Self {
         Self {
             constructor,
-            key: GlobalKey::new_from_str(key),
+            key: GlobalKey::File {
+                file: key,
+                line: 0,
+                column: 0,
+                index: 0,
+            },
+            phantom: std::marker::PhantomData,
+        }
+    }
+
+    /// Create this global signal with a specific key.
+    /// This is useful for ensuring that the signal is unique across the application and accessible from
+    /// outside the application too.
+    #[track_caller]
+    pub const fn with_location(
+        constructor: fn() -> R,
+        file: &'static str,
+        line: u32,
+        column: u32,
+        index: usize,
+    ) -> Self {
+        Self {
+            constructor,
+            key: GlobalKey::File {
+                file,
+                line: line as _,
+                column: column as _,
+                index: index as _,
+            },
             phantom: std::marker::PhantomData,
         }
     }
@@ -188,38 +216,36 @@ pub struct GlobalLazyContext {
 
 /// A key used to identify a signal in the global signal context
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
-pub struct GlobalKey<'a> {
-    // We create an extra wrapper around location so we can construct it manually for hot reloading
-    file: &'a str,
-    line: u32,
-    column: u32,
+pub enum GlobalKey<'a> {
+    /// A key derived from a `std::panic::Location` type
+    File {
+        /// The file name
+        file: &'a str,
+
+        /// The line number
+        line: u32,
+
+        /// The column number
+        column: u32,
+
+        /// The index of the signal in the file - used to disambiguate macro calls
+        index: u32,
+    },
+
+    /// A raw key derived just from a string
+    Raw(&'a str),
 }
 
 impl<'a> GlobalKey<'a> {
     /// Create a new key from a location
     pub const fn new(key: &'a Location<'a>) -> Self {
-        GlobalKey {
+        GlobalKey::File {
             file: key.file(),
             line: key.line(),
             column: key.column(),
+            index: 0,
         }
     }
-
-    /// Create a new key from a static string
-    #[allow(unused)]
-    pub const fn new_from_str(key: &'a str) -> Self {
-        GlobalKey {
-            file: key,
-            line: 0,
-            column: 0,
-        }
-    }
-}
-
-impl From<&'static str> for GlobalKey<'static> {
-    fn from(key: &'static str) -> Self {
-        Self::new_from_str(key)
-    }
 }
 
 impl From<&'static Location<'static>> for GlobalKey<'static> {
@@ -231,9 +257,7 @@ impl From<&'static Location<'static>> for GlobalKey<'static> {
 impl GlobalLazyContext {
     /// Get a signal with the given string key
     /// The key will be converted to a UUID with the appropriate internal namespace
-    pub fn get_signal_with_key<T>(&self, key: &str) -> Option<Signal<T>> {
-        let key = GlobalKey::new_from_str(key);
-
+    pub fn get_signal_with_key<T>(&self, key: GlobalKey) -> Option<Signal<T>> {
         self.map.borrow().get(&key).map(|f| {
             *f.downcast_ref::<Signal<T>>().unwrap_or_else(|| {
                 panic!(
@@ -265,7 +289,7 @@ mod tests {
         // we're using consts since it's harder than statics due to merging - these won't be merged
         const MYSIGNAL: GlobalSignal<i32> = GlobalSignal::new(|| 42);
         const MYSIGNAL2: GlobalSignal<i32> = GlobalSignal::new(|| 42);
-        const MYSIGNAL3: GlobalSignal<i32> = GlobalSignal::with_key(|| 42, "custom-keyed");
+        const MYSIGNAL3: GlobalSignal<i32> = GlobalSignal::with_name(|| 42, "custom-keyed");
 
         let a = MYSIGNAL.key();
         let b = MYSIGNAL.key();