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/cli/src/settings.rs

@@ -1,13 +1,8 @@
+use crate::{Result, TraceSrc};
 use serde::{Deserialize, Serialize};
-use std::{
-    fs,
-    io::{Error, ErrorKind},
-    path::PathBuf,
-};
+use std::{fs, path::PathBuf};
 use tracing::{debug, error, warn};
 
-use crate::{CrateConfigError, TraceSrc};
-
 const GLOBAL_SETTINGS_FILE_NAME: &str = "dioxus/settings.toml";
 
 /// Describes cli settings from project or global level.
@@ -18,26 +13,26 @@ const GLOBAL_SETTINGS_FILE_NAME: &str = "dioxus/settings.toml";
 ///
 /// This allows users to control the cli settings with ease.
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
-pub struct CliSettings {
+pub(crate) struct CliSettings {
     /// Describes whether hot reload should always be on.
-    pub always_hot_reload: Option<bool>,
+    pub(crate) always_hot_reload: Option<bool>,
     /// Describes whether the CLI should always open the browser for Web targets.
-    pub always_open_browser: Option<bool>,
+    pub(crate) always_open_browser: Option<bool>,
     /// Describes whether desktop apps in development will be pinned always-on-top.
-    pub always_on_top: Option<bool>,
+    pub(crate) always_on_top: Option<bool>,
     /// Describes the interval in seconds that the CLI should poll for file changes on WSL.
     #[serde(default = "default_wsl_file_poll_interval")]
-    pub wsl_file_poll_interval: Option<u16>,
+    pub(crate) wsl_file_poll_interval: Option<u16>,
 }
 
 impl CliSettings {
     /// Load the settings from the local, global, or default config in that order
-    pub fn load() -> Self {
+    pub(crate) fn load() -> Self {
         Self::from_global().unwrap_or_default()
     }
 
     /// Get the current settings structure from global.
-    pub fn from_global() -> Option<Self> {
+    pub(crate) fn from_global() -> Option<Self> {
         let Some(path) = dirs::data_local_dir() else {
             warn!("failed to get local data directory, some config keys may be missing");
             return None;
@@ -63,18 +58,15 @@ impl CliSettings {
 
     /// Save the current structure to the global settings toml.
     /// This does not save to project-level settings.
-    pub fn save(self) -> Result<Self, CrateConfigError> {
+    pub(crate) fn save(self) -> Result<Self> {
         let path = Self::get_settings_path().ok_or_else(|| {
             error!(dx_src = ?TraceSrc::Dev, "failed to get settings path");
-            CrateConfigError::Io(Error::new(
-                ErrorKind::NotFound,
-                "failed to get settings path",
-            ))
+            anyhow::anyhow!("failed to get settings path")
         })?;
 
         let data = toml::to_string_pretty(&self).map_err(|e| {
             error!(dx_src = ?TraceSrc::Dev, ?self, "failed to parse config into toml");
-            CrateConfigError::Io(Error::new(ErrorKind::Other, e.to_string()))
+            anyhow::anyhow!("failed to parse config into toml: {e}")
         })?;
 
         // Create the directory structure if it doesn't exist.
@@ -86,21 +78,23 @@ impl CliSettings {
                 ?path,
                 "failed to create directories for settings file"
             );
-            return Err(CrateConfigError::Io(e));
+            return Err(
+                anyhow::anyhow!("failed to create directories for settings file: {e}").into(),
+            );
         }
 
         // Write the data.
         let result = fs::write(&path, data.clone());
         if let Err(e) = result {
             error!(?data, ?path, "failed to save global cli settings");
-            return Err(CrateConfigError::Io(e));
+            return Err(anyhow::anyhow!("failed to save global cli settings: {e}").into());
         }
 
         Ok(self)
     }
 
     /// Get the path to the settings toml file.
-    pub fn get_settings_path() -> Option<PathBuf> {
+    pub(crate) fn get_settings_path() -> Option<PathBuf> {
         let Some(path) = dirs::data_local_dir() else {
             warn!("failed to get local data directory, some config keys may be missing");
             return None;
@@ -110,7 +104,7 @@ impl CliSettings {
     }
 
     /// Modify the settings toml file
-    pub fn modify_settings(with: impl FnOnce(&mut CliSettings)) -> Result<(), CrateConfigError> {
+    pub(crate) fn modify_settings(with: impl FnOnce(&mut CliSettings)) -> Result<()> {
         let mut settings = Self::load();
         with(&mut settings);
         settings.save()?;