search for first valid platform in features

packages/cli/src/cli/serve.rs

@@ -2,8 +2,8 @@ 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};
-use cargo_toml::Dependency::{Simple, Inherited, Detailed};
 
 /// Run the WASM project on dev-server
 #[derive(Clone, Debug, Parser)]
@@ -42,27 +42,23 @@ impl Serve {
 
         crate_config.set_cargo_args(self.serve.cargo_args);
 
-        let mut platform = self
+        let mut platform = self.serve.platform;
-            .serve
-            .platform;
 
         if platform.is_none() {
             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![]
+                    Simple(_) => vec![],
                 };
 
                 platform = features
                     .iter()
-                    .next()
+                    .find_map(|platform| serde_json::from_str(&format!(r#""{}""#, platform)).ok());
-                    .and_then(|first_feature| serde_json::from_str(&format!(r#""{}""#, first_feature)).ok());
             }
         }
 
-        let platform = platform
+        let platform = platform.unwrap_or(crate_config.dioxus_config.application.default_platform);
-            .unwrap_or(crate_config.dioxus_config.application.default_platform);
 
         match platform {
             Platform::Web => {