Extract some simple cleanups from 2779

Cargo.toml

@@ -84,7 +84,7 @@ dioxus-liveview = { path = "packages/liveview", version = "0.6.0-alpha.0" }
 dioxus-autofmt = { path = "packages/autofmt", version = "0.6.0-alpha.0" }
 dioxus-check = { path = "packages/check", version = "0.6.0-alpha.0" }
 dioxus-rsx = { path = "packages/rsx", version = "0.6.0-alpha.0" }
-rsx-rosetta = { path = "packages/rsx-rosetta", version = "0.6.0-alpha.0" }
+dioxus-rsx-rosetta = { path = "packages/rsx-rosetta", version = "0.6.0-alpha.0" }
 dioxus-signals = { path = "packages/signals", version = "0.6.0-alpha.0" }
 dioxus-cli-config = { path = "packages/cli-config", version = "0.6.0-alpha.0", default-features = false}
 generational-box = { path = "packages/generational-box", version = "0.6.0-alpha.0" }
@@ -147,12 +147,39 @@ once_cell = "1.17.1"
 uuid = "1.9.1"
 convert_case = "0.6.0"
 tokio-tungstenite = { version = "0.23.1" }
-
-# cli, cli-config
+gloo-timers = "0.3.0"
+fluent-uri = { version = "0.2.0", features = ["serde"] }
+internment = { version = "0.7.0" }
+proc-macro2-diagnostics = { version = "0.10", default-features = false }
+env_logger = "0.11.0"
+tracing-subscriber = "0.3.17"
+chrono = { version = "0.4.34" }
+gloo = { version = "0.8.0" }
+gloo-utils = { version = "0.1.6" }
+rustversion = "1.0.17"
+rand = "0.8.5"
+longest-increasing-subsequence = "0.1.0"
+trybuild = "1.0"
+js-sys = "0.3.56"
+web-sys = { version = "0.3.56", default-features = false }
 dirs = "5.0.1"
-
+cargo-config2 = "0.1.26"
 criterion = { version = "0.5" }
 
+# desktop
+wry = { version = "0.43.0", default-features = false }
+tao = { version = "0.30.0", features = ["rwh_05"] }
+webbrowser = "1.0.1"
+infer = "0.16.0"
+dunce = "1.0.2"
+urlencoding = "2.1.2"
+global-hotkey = "0.6.0"
+rfd = { version = "0.14", default-features = false }
+muda = "0.14.0"
+cocoa = "0.26"
+core-foundation = "0.10.0"
+objc = { version = "0.2.7", features = ["exception"] }
+objc_id = "0.1.1"
 
 [profile.dev.package.dioxus-core-macro]
 opt-level = 3

packages/cli-config/build.rs

@@ -1,13 +1,3 @@
-// warn if the "read-config" feature is enabled, but the DIOXUS_CONFIG environment variable is not set
-// This means that some library is trying to access the crate's configuration, but the dioxus CLI was not used to build the application.
-
 fn main() {
     built::write_built_file().expect("Failed to acquire build-time information");
-
-    println!("cargo:rerun-if-env-changed=DIOXUS_CONFIG");
-    let dioxus_config = std::env::var("DIOXUS_CONFIG");
-    let built_with_dioxus = dioxus_config.is_ok();
-    if cfg!(feature = "read-config") && !built_with_dioxus {
-        println!("cargo:warning=A library is trying to access the crate's configuration, but the dioxus CLI was not used to build the application. Information about the Dioxus CLI is available at https://dioxuslabs.com/learn/0.5/CLI/installation");
-    }
 }

packages/cli/Cargo.toml

@@ -89,7 +89,7 @@ brotli = "6.0.0"
 
 dioxus-autofmt = { workspace = true }
 dioxus-check = { workspace = true }
-rsx-rosetta = { workspace = true }
+dioxus-rsx-rosetta = { workspace = true }
 dioxus-rsx = { workspace = true, features = ["serde"]}
 dioxus-html = { workspace = true, features = ["hot-reload-context"] }
 dioxus-core = { workspace = true, features = ["serialize"] }

packages/cli/src/cli/translate.rs

@@ -50,7 +50,7 @@ impl Translate {
 }
 
 pub fn convert_html_to_formatted_rsx(dom: &Dom, component: bool) -> String {
-    let callbody = rsx_rosetta::rsx_from_html(dom);
+    let callbody = dioxus_rsx_rosetta::rsx_from_html(dom);
 
     match component {
         true => write_callbody_with_icon_section(callbody),
@@ -61,7 +61,7 @@ pub fn convert_html_to_formatted_rsx(dom: &Dom, component: bool) -> String {
 fn write_callbody_with_icon_section(mut callbody: CallBody) -> String {
     let mut svgs = vec![];
 
-    rsx_rosetta::collect_svgs(&mut callbody.body.roots, &mut svgs);
+    dioxus_rsx_rosetta::collect_svgs(&mut callbody.body.roots, &mut svgs);
 
     let mut out = write_component_body(dioxus_autofmt::write_block_out(&callbody).unwrap());
 
@@ -130,12 +130,3 @@ fn determine_input(file: Option<String>, raw: Option<String>) -> Result<String>
 
     Ok(buffer.trim().to_string())
 }
-
-#[test]
-fn generates_svgs() {
-    let st = include_str!("../../tests/svg.html");
-
-    let out = convert_html_to_formatted_rsx(&html_parser::Dom::parse(st).unwrap(), true);
-
-    println!("{}", out);
-}

packages/cli/src/main.rs

@@ -11,7 +11,6 @@ pub mod error;
 pub mod metadata;
 pub mod serve;
 pub mod settings;
-pub mod tools;
 pub mod tracer;
 
 pub(crate) use cli::*;