Merge branch 'main' into jk/fix-form-inputs

Cargo.lock

@@ -2317,7 +2317,7 @@ dependencies = [
 name = "dioxus-cli-config"
 version = "0.5.0-alpha.0"
 dependencies = [
- "cargo_toml 0.16.3",
+ "cargo_toml 0.18.0",
  "clap 4.4.18",
  "once_cell",
  "serde",

packages/cli-config/Cargo.toml

@@ -13,7 +13,7 @@ clap = { version = "4.2", features = ["derive"], optional = true }
 serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0.79"
 toml = { workspace = true, optional = true }
-cargo_toml = { version = "0.16.0", optional = true }
+cargo_toml = { version = "0.18.0", optional = true }
 once_cell = "1.18.0"
 tracing = { workspace = true }
 

packages/cli/src/cli/serve.rs

@@ -2,6 +2,7 @@ use dioxus_cli_config::Platform;
 use manganis_cli_support::AssetManifest;
 
 use super::*;
+use cargo_toml::Dependency::{Detailed, Inherited, Simple};
 use std::{fs::create_dir_all, io::Write, path::PathBuf};
 
 /// Run the WASM project on dev-server
@@ -41,10 +42,23 @@ impl Serve {
 
         crate_config.set_cargo_args(self.serve.cargo_args);
 
-        let platform = self
+        let mut platform = self.serve.platform;
-            .serve
+
-            .platform
+        if platform.is_none() {
-            .unwrap_or(crate_config.dioxus_config.application.default_platform);
+            if let Some(dependency) = &crate_config.manifest.dependencies.get("dioxus") {
+                let features = match dependency {
+                    Inherited(detail) => detail.features.to_vec(),
+                    Detailed(detail) => detail.features.to_vec(),
+                    Simple(_) => vec![],
+                };
+
+                platform = features
+                    .iter()
+                    .find_map(|platform| serde_json::from_str(&format!(r#""{}""#, platform)).ok());
+            }
+        }
+
+        let platform = platform.unwrap_or(crate_config.dioxus_config.application.default_platform);
 
         match platform {
             Platform::Web => {