npm - @ionyx-apps/cli - Versions diffs - 0.3.2 → 0.3.4 - Mend

@ionyx-apps/cli 0.3.2 → 0.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

package/bin/ionyx.exe CHANGED Viewed

Binary file

package/ionyx-cli/Cargo.toml CHANGED Viewed

@@ -1,6 +1,6 @@
 [package]
 name = "ionyx-cli"
-version = "0.3.2"
+version = "0.3.4"
 edition = "2021"
 description = "Ionyx Framework CLI Tool"
 authors = ["Ionyx Team"]
@@ -23,10 +23,11 @@ handlebars = "4.5"
 zip = "0.6"
 reqwest = { version = "0.11", features = ["json"] }
 futures = "0.3"
-include_dir = "0.7"
 dialoguer = "0.11"
 os_info = "3.8"
 toml = "0.8"
+include_dir = "0.7"
 [workspace]
 exclude = [
     "src/templates/basic/src-ionyx",

package/ionyx-cli/src/commands/build.rs CHANGED Viewed

@@ -1,53 +1,53 @@
-use anyhow::Result;
-use colored::*;
-use tokio::process::Command;
-use std::path::Path;
-pub async fn execute(target: &str, minify: bool) -> Result<()> {
-    println!("🔨 Building Ionyx project for target: {}", target.cyan());
-    if !Path::new("package.json").exists() {
-        return Err(anyhow::anyhow!("No package.json found. Please run this command in an Ionyx project directory."));
-    }
-    // 1. Build Frontend
-    println!("🌐 Building frontend...");
-    let fe_status = if cfg!(target_os = "windows") {
-        Command::new("cmd")
-            .args(&["/C", "npm", "run", "build"])
-            .env("BUILD_TARGET", target)
-            .env("MINIFY", if minify { "true" } else { "false" })
-            .status()
-            .await?
-    } else {
-        Command::new("npm")
-            .args(&["run", "build"])
-            .env("BUILD_TARGET", target)
-            .env("MINIFY", if minify { "true" } else { "false" })
-            .status()
-            .await?
-    };
-    if !fe_status.success() {
-        return Err(anyhow::anyhow!("Frontend build failed"));
-    }
-    // 2. Build Backend
-    println!("🦀 Building Rust backend host...");
-    let mut be_cmd = Command::new("cargo");
-    be_cmd.args(&["build", "--release"]);
-    if Path::new("src-ionyx").exists() {
-        be_cmd.current_dir("src-ionyx");
-    }
-    let be_status = be_cmd.status().await?;
-    if !be_status.success() {
-        return Err(anyhow::anyhow!("Backend build failed"));
-    }
-    println!("\n✅ Full build completed successfully!");
-    println!("📦 Backend binary: src-ionyx/target/release/ionyx-host");
-    Ok(())
-}
+use anyhow::Result;
+use colored::*;
+use tokio::process::Command;
+use std::path::Path;
+pub async fn execute(target: &str, minify: bool) -> Result<()> {
+    println!("🔨 Building Ionyx project for target: {}", target.cyan());
+    if !Path::new("package.json").exists() {
+        return Err(anyhow::anyhow!("No package.json found. Please run this command in an Ionyx project directory."));
+    }
+    // 1. Build Frontend
+    println!("🌐 Building frontend...");
+    let fe_status = if cfg!(target_os = "windows") {
+        Command::new("cmd")
+            .args(&["/C", "npm", "run", "build"])
+            .env("BUILD_TARGET", target)
+            .env("MINIFY", if minify { "true" } else { "false" })
+            .status()
+            .await?
+    } else {
+        Command::new("npm")
+            .args(&["run", "build"])
+            .env("BUILD_TARGET", target)
+            .env("MINIFY", if minify { "true" } else { "false" })
+            .status()
+            .await?
+    };
+    if !fe_status.success() {
+        return Err(anyhow::anyhow!("Frontend build failed"));
+    }
+    // 2. Build Backend
+    println!("🦀 Building Rust backend host...");
+    let mut be_cmd = Command::new("cargo");
+    be_cmd.args(&["build", "--release"]);
+    if Path::new("src-ionyx").exists() {
+        be_cmd.current_dir("src-ionyx");
+    }
+    let be_status = be_cmd.status().await?;
+    if !be_status.success() {
+        return Err(anyhow::anyhow!("Backend build failed"));
+    }
+    println!("\n✅ Full build completed successfully!");
+    println!("📦 Backend binary: src-ionyx/target/release/ionyx-host");
+    Ok(())
+}

package/ionyx-cli/src/templates/basic/frontend/dist/index.html ADDED Viewed

	@@ -0,0 +1 @@
1	+ <html><body><h1>Placeholder</h1></body></html>

package/ionyx-cli/src/templates/basic/src-ionyx/Cargo.toml CHANGED Viewed

@@ -1,6 +1,6 @@
 [package]
 name = "my-ionyx-app"
-version = "0.3.2"
+version = "0.3.4"
 edition = "2021"
 [workspace]
@@ -15,7 +15,6 @@ path = "main.rs"
 [dependencies]
 ionyx = { path = "../../../../../../src-ionyx" }
-include_dir = { version = "0.7", features = ["glob"] }
 anyhow = "1.0"
 wry = "0.54"
 tao = "0.34"

package/ionyx-cli/src/templates/basic/src-ionyx/src/protocol.rs CHANGED Viewed

@@ -1,31 +1,34 @@
 use std::borrow::Cow;
 use wry::http::{Request, Response, StatusCode};
-#[cfg(not(debug_assertions))]
-use include_dir::{include_dir, Dir};
+use std::path::{PathBuf};
+use std::fs;
 // Configuration'dan frontendDist path'ini oku
-fn get_frontend_dist_path() -> String {
+fn get_frontend_dist_path() -> PathBuf {
     // Önce Ionyx config dosyasını okumaya çalış
     if let Ok(config_content) = std::fs::read_to_string("ionyx.config.toml") {
         for line in config_content.lines() {
             if line.trim().starts_with("frontendDist") {
-                if let Some(path) = line.split('=').nth(1) {
-                    return path.trim().trim_matches('"').to_string();
+                if let Some(path_str) = line.split('=').nth(1) {
+                    let clean_path = path_str.trim().trim_matches('"');
+                    return PathBuf::from(clean_path);
                 }
             }
         }
     }
-    // Varsayılan path
-    "../frontend/dist".to_string()
-}
+    // Varsayılan path: exe yanındaki dist klasörü
+    if let Ok(exe_path) = std::env::current_exe() {
+        if let Some(exe_dir) = exe_path.parent() {
+            let dist = exe_dir.join("dist");
+            if dist.exists() {
+                return dist;
+            }
+        }
+    }
-// Release modunda frontend/dist içindeki dosyaları binary'ye gömer.
-// Configuration'dan dinamik path okur.
-#[cfg(not(debug_assertions))]
-static EMBEDDED_ASSETS: Dir<'static> = include_dir!("../frontend/dist");
+    PathBuf::from("dist")
+}
 pub struct CustomProtocolHandler;
@@ -35,9 +38,11 @@ impl CustomProtocolHandler {
     }
     pub fn handle_request(&self, request: Request<Vec<u8>>) -> Response<Cow<'static, [u8]>> {
+        let uri_path = request.uri().path();
         #[cfg(debug_assertions)]
         {
-            let _uri_path = request.uri().path();
+            let _uri_path = uri_path;
             let _dist_path = get_frontend_dist_path();
             let _unused_ct = Self::get_content_type("index.html");
             return Response::builder()
@@ -49,33 +54,31 @@ impl CustomProtocolHandler {
         #[cfg(not(debug_assertions))]
         {
-            let uri_path = request.uri().path();
+            let dist_dir = get_frontend_dist_path();
             let clean_path = uri_path.trim_start_matches('/');
             let file_path = if clean_path.is_empty() { "index.html" } else { clean_path };
+            let full_path = dist_dir.join(file_path);
-            match EMBEDDED_ASSETS.get_file(file_path) {
-                Some(file) => {
-                    let content_type = Self::get_content_type(file_path);
+            if let Ok(contents) = fs::read(&full_path) {
+                let content_type = Self::get_content_type(file_path);
+                Response::builder()
+                    .status(StatusCode::OK)
+                    .header("Content-Type", content_type)
+                    .body(Cow::Owned(contents))
+                    .unwrap()
+            } else {
+                let index_path = dist_dir.join("index.html");
+                if let Ok(index_contents) = fs::read(&index_path) {
                     Response::builder()
                         .status(StatusCode::OK)
-                        .header("Content-Type", content_type)
-                        .body(Cow::Borrowed::<'static, [u8]>(file.contents()))
+                        .header("Content-Type", "text/html")
+                        .body(Cow::Owned(index_contents))
+                        .unwrap()
+                } else {
+                    Response::builder()
+                        .status(StatusCode::NOT_FOUND)
+                        .body(Cow::Borrowed(&b"404 Not Found"[..]))
                         .unwrap()
-                }
-                None => {
-                    // SPA (Single Page Application) desteği: Dosya bulunamazsa index.html'i dön
-                    if let Some(index_file) = EMBEDDED_ASSETS.get_file("index.html") {
-                        Response::builder()
-                            .status(StatusCode::OK)
-                            .header("Content-Type", "text/html")
-                            .body(Cow::Borrowed::<'static, [u8]>(index_file.contents()))
-                            .unwrap()
-                    } else {
-                        Response::builder()
-                            .status(StatusCode::NOT_FOUND)
-                            .body(Cow::Borrowed(&b"404 Not Found"[..]))
-                            .unwrap()
-                    }
                 }
             }
         }
@@ -97,5 +100,4 @@ impl CustomProtocolHandler {
             _ => "application/octet-stream",
         }
     }
-}
+}

package/ionyx-cli/src/templates/frontend/dist/index.html ADDED Viewed

	@@ -0,0 +1 @@
1	+ <html><body><h1>Placeholder</h1></body></html>

package/ionyx-cli/src/templates/leptos/Cargo.toml CHANGED Viewed

@@ -1,13 +1,12 @@
 [package]
 name = "my-ionyx-app"
-version = "0.3.2"
+version = "0.3.4"
 edition = "2021"
 [lib]
 crate-type = ["cdylib"]
 [dependencies]
-include_dir = { version = "0.7", features = ["glob"] }
 leptos = { version = "0.6", features = ["csr"] }
 wasm-bindgen = "0.2"
 console_log = "1.0"

package/ionyx-cli/src/templates/leptos/frontend/dist/index.html ADDED Viewed

	@@ -0,0 +1 @@
1	+ <html><body><h1>Placeholder</h1></body></html>

package/ionyx-cli/src/templates/leptos/src-ionyx/Cargo.toml CHANGED Viewed

@@ -1,6 +1,6 @@
 [package]
 name = "my-ionyx-app"
-version = "0.3.2"
+version = "0.3.4"
 edition = "2021"
 [workspace]
@@ -11,7 +11,6 @@ path = "main.rs"
 [dependencies]
 ionyx = { path = "../../../../../../src-ionyx" }
-include_dir = { version = "0.7", features = ["glob"] }
 anyhow = "1.0"
 wry = "0.54"
 tao = "0.34"

package/ionyx-cli/src/templates/leptos/src-ionyx/src/protocol.rs CHANGED Viewed

@@ -1,31 +1,34 @@
 use std::borrow::Cow;
 use wry::http::{Request, Response, StatusCode};
-#[cfg(not(debug_assertions))]
-use include_dir::{include_dir, Dir};
+use std::path::{PathBuf};
+use std::fs;
 // Configuration'dan frontendDist path'ini oku
-fn get_frontend_dist_path() -> String {
+fn get_frontend_dist_path() -> PathBuf {
     // Önce Ionyx config dosyasını okumaya çalış
     if let Ok(config_content) = std::fs::read_to_string("ionyx.config.toml") {
         for line in config_content.lines() {
             if line.trim().starts_with("frontendDist") {
-                if let Some(path) = line.split('=').nth(1) {
-                    return path.trim().trim_matches('"').to_string();
+                if let Some(path_str) = line.split('=').nth(1) {
+                    let clean_path = path_str.trim().trim_matches('"');
+                    return PathBuf::from(clean_path);
                 }
             }
         }
     }
-    // Varsayılan path
-    "../frontend/dist".to_string()
-}
+    // Varsayılan path: exe yanındaki dist klasörü
+    if let Ok(exe_path) = std::env::current_exe() {
+        if let Some(exe_dir) = exe_path.parent() {
+            let dist = exe_dir.join("dist");
+            if dist.exists() {
+                return dist;
+            }
+        }
+    }
-// Release modunda frontend/dist içindeki dosyaları binary'ye gömer.
-// Configuration'dan dinamik path okur.
-#[cfg(not(debug_assertions))]
-static EMBEDDED_ASSETS: Dir<'static> = include_dir!("../frontend/dist");
+    PathBuf::from("dist")
+}
 pub struct CustomProtocolHandler;
@@ -35,9 +38,12 @@ impl CustomProtocolHandler {
     }
     pub fn handle_request(&self, request: Request<Vec<u8>>) -> Response<Cow<'static, [u8]>> {
+        let uri_path = request.uri().path();
         #[cfg(debug_assertions)]
         {
-            let _uri_path = request.uri().path();
+            let _uri_path = uri_path;
+            let _dist_path = get_frontend_dist_path();
             let _unused_ct = Self::get_content_type("index.html");
             return Response::builder()
                 .status(StatusCode::NOT_FOUND)
@@ -48,33 +54,31 @@ impl CustomProtocolHandler {
         #[cfg(not(debug_assertions))]
         {
-            let uri_path = request.uri().path();
+            let dist_dir = get_frontend_dist_path();
             let clean_path = uri_path.trim_start_matches('/');
             let file_path = if clean_path.is_empty() { "index.html" } else { clean_path };
+            let full_path = dist_dir.join(file_path);
-            match EMBEDDED_ASSETS.get_file(file_path) {
-                Some(file) => {
-                    let content_type = Self::get_content_type(file_path);
+            if let Ok(contents) = fs::read(&full_path) {
+                let content_type = Self::get_content_type(file_path);
+                Response::builder()
+                    .status(StatusCode::OK)
+                    .header("Content-Type", content_type)
+                    .body(Cow::Owned(contents))
+                    .unwrap()
+            } else {
+                let index_path = dist_dir.join("index.html");
+                if let Ok(index_contents) = fs::read(&index_path) {
                     Response::builder()
                         .status(StatusCode::OK)
-                        .header("Content-Type", content_type)
-                        .body(Cow::Borrowed::<'static, [u8]>(file.contents()))
+                        .header("Content-Type", "text/html")
+                        .body(Cow::Owned(index_contents))
+                        .unwrap()
+                } else {
+                    Response::builder()
+                        .status(StatusCode::NOT_FOUND)
+                        .body(Cow::Borrowed(&b"404 Not Found"[..]))
                         .unwrap()
-                }
-                None => {
-                    // SPA (Single Page Application) desteği: Dosya bulunamazsa index.html'i dön
-                    if let Some(index_file) = EMBEDDED_ASSETS.get_file("index.html") {
-                        Response::builder()
-                            .status(StatusCode::OK)
-                            .header("Content-Type", "text/html")
-                            .body(Cow::Borrowed::<'static, [u8]>(index_file.contents()))
-                            .unwrap()
-                    } else {
-                        Response::builder()
-                            .status(StatusCode::NOT_FOUND)
-                            .body(Cow::Borrowed(&b"404 Not Found"[..]))
-                            .unwrap()
-                    }
                 }
             }
         }
@@ -96,5 +100,4 @@ impl CustomProtocolHandler {
             _ => "application/octet-stream",
         }
     }
-}
+}

package/ionyx-cli/src/templates/mod.rs CHANGED Viewed

@@ -82,8 +82,8 @@ fn copy_embedded_dir(dir: &Dir<'static>, dst: &str) -> Result<()> {
     fs::create_dir_all(dst)?;
     for entry in dir.entries() {
-        let path = entry.path();
-        let name = path.file_name().unwrap().to_str().unwrap();
+        let entry_path = entry.path();
+        let name = entry_path.file_name().unwrap().to_str().unwrap();
         let dst_path = format!("{}/{}", dst, name);
         if let Some(subdir) = entry.as_dir() {

package/ionyx-cli/src/templates/react/frontend/dist/index.html ADDED Viewed

	@@ -0,0 +1 @@
1	+ <html><body><h1>Placeholder</h1></body></html>

package/ionyx-cli/src/templates/react/src-ionyx/Cargo.toml CHANGED Viewed

@@ -1,6 +1,6 @@
 [package]
 name = "my-ionyx-app"
-version = "0.3.2"
+version = "0.3.4"
 edition = "2021"
 [workspace]
@@ -15,7 +15,6 @@ path = "main.rs"
 [dependencies]
 ionyx = { path = "../../../../../../src-ionyx" }
-include_dir = { version = "0.7", features = ["glob"] }
 anyhow = "1.0"
 wry = "0.54"
 tao = "0.34"

package/ionyx-cli/src/templates/react/src-ionyx/src/protocol.rs CHANGED Viewed

@@ -1,31 +1,34 @@
 use std::borrow::Cow;
 use wry::http::{Request, Response, StatusCode};
-#[cfg(not(debug_assertions))]
-use include_dir::{include_dir, Dir};
+use std::path::{PathBuf};
+use std::fs;
 // Configuration'dan frontendDist path'ini oku
-fn get_frontend_dist_path() -> String {
+fn get_frontend_dist_path() -> PathBuf {
     // Önce Ionyx config dosyasını okumaya çalış
     if let Ok(config_content) = std::fs::read_to_string("ionyx.config.toml") {
         for line in config_content.lines() {
             if line.trim().starts_with("frontendDist") {
-                if let Some(path) = line.split('=').nth(1) {
-                    return path.trim().trim_matches('"').to_string();
+                if let Some(path_str) = line.split('=').nth(1) {
+                    let clean_path = path_str.trim().trim_matches('"');
+                    return PathBuf::from(clean_path);
                 }
             }
         }
     }
-    // Varsayılan path
-    "../frontend/dist".to_string()
-}
+    // Varsayılan path: exe yanındaki dist klasörü
+    if let Ok(exe_path) = std::env::current_exe() {
+        if let Some(exe_dir) = exe_path.parent() {
+            let dist = exe_dir.join("dist");
+            if dist.exists() {
+                return dist;
+            }
+        }
+    }
-// Release modunda frontend/dist içindeki dosyaları binary'ye gömer.
-// Configuration'dan dinamik path okur.
-#[cfg(not(debug_assertions))]
-static EMBEDDED_ASSETS: Dir<'static> = include_dir!("../frontend/dist");
+    PathBuf::from("dist")
+}
 pub struct CustomProtocolHandler;
@@ -35,9 +38,11 @@ impl CustomProtocolHandler {
     }
     pub fn handle_request(&self, request: Request<Vec<u8>>) -> Response<Cow<'static, [u8]>> {
+        let uri_path = request.uri().path();
         #[cfg(debug_assertions)]
         {
-            let _uri_path = request.uri().path();
+            let _uri_path = uri_path;
             let _dist_path = get_frontend_dist_path();
             let _unused_ct = Self::get_content_type("index.html");
             return Response::builder()
@@ -49,33 +54,31 @@ impl CustomProtocolHandler {
         #[cfg(not(debug_assertions))]
         {
-            let uri_path = request.uri().path();
+            let dist_dir = get_frontend_dist_path();
             let clean_path = uri_path.trim_start_matches('/');
             let file_path = if clean_path.is_empty() { "index.html" } else { clean_path };
+            let full_path = dist_dir.join(file_path);
-            match EMBEDDED_ASSETS.get_file(file_path) {
-                Some(file) => {
-                    let content_type = Self::get_content_type(file_path);
+            if let Ok(contents) = fs::read(&full_path) {
+                let content_type = Self::get_content_type(file_path);
+                Response::builder()
+                    .status(StatusCode::OK)
+                    .header("Content-Type", content_type)
+                    .body(Cow::Owned(contents))
+                    .unwrap()
+            } else {
+                let index_path = dist_dir.join("index.html");
+                if let Ok(index_contents) = fs::read(&index_path) {
                     Response::builder()
                         .status(StatusCode::OK)
-                        .header("Content-Type", content_type)
-                        .body(Cow::Borrowed::<'static, [u8]>(file.contents()))
+                        .header("Content-Type", "text/html")
+                        .body(Cow::Owned(index_contents))
+                        .unwrap()
+                } else {
+                    Response::builder()
+                        .status(StatusCode::NOT_FOUND)
+                        .body(Cow::Borrowed(&b"404 Not Found"[..]))
                         .unwrap()
-                }
-                None => {
-                    // SPA (Single Page Application) desteği: Dosya bulunamazsa index.html'i dön
-                    if let Some(index_file) = EMBEDDED_ASSETS.get_file("index.html") {
-                        Response::builder()
-                            .status(StatusCode::OK)
-                            .header("Content-Type", "text/html")
-                            .body(Cow::Borrowed::<'static, [u8]>(index_file.contents()))
-                            .unwrap()
-                    } else {
-                        Response::builder()
-                            .status(StatusCode::NOT_FOUND)
-                            .body(Cow::Borrowed(&b"404 Not Found"[..]))
-                            .unwrap()
-                    }
                 }
             }
         }
@@ -97,5 +100,4 @@ impl CustomProtocolHandler {
             _ => "application/octet-stream",
         }
     }
-}
+}

package/ionyx-cli/src/templates/src-ionyx/Cargo.toml CHANGED Viewed

@@ -1,6 +1,6 @@
 [package]
 name = "my-ionyx-app"
-version = "0.3.2"
+version = "0.3.4"
 edition = "2021"
 [[bin]]
@@ -8,7 +8,6 @@ name = "my-ionyx-app"
 path = "main.rs"
 [dependencies]
-include_dir = { version = "0.7", features = ["glob"] }
 ionyx = "1.0.0"
 anyhow = "1.0"

package/ionyx-cli/src/templates/svelte/frontend/dist/index.html ADDED Viewed

	@@ -0,0 +1 @@
1	+ <html><body><h1>Placeholder</h1></body></html>

package/ionyx-cli/src/templates/svelte/src-ionyx/Cargo.toml CHANGED Viewed

@@ -1,6 +1,6 @@
 [package]
 name = "my-ionyx-app"
-version = "0.3.2"
+version = "0.3.4"
 edition = "2021"
 [workspace]
@@ -15,7 +15,6 @@ path = "main.rs"
 [dependencies]
 ionyx = { path = "../../../../../../src-ionyx" }
-include_dir = { version = "0.7", features = ["glob"] }
 anyhow = "1.0"
 wry = "0.54"
 tao = "0.34"

package/ionyx-cli/src/templates/svelte/src-ionyx/src/protocol.rs CHANGED Viewed

@@ -1,31 +1,34 @@
 use std::borrow::Cow;
 use wry::http::{Request, Response, StatusCode};
-#[cfg(not(debug_assertions))]
-use include_dir::{include_dir, Dir};
+use std::path::{PathBuf};
+use std::fs;
 // Configuration'dan frontendDist path'ini oku
-fn get_frontend_dist_path() -> String {
+fn get_frontend_dist_path() -> PathBuf {
     // Önce Ionyx config dosyasını okumaya çalış
     if let Ok(config_content) = std::fs::read_to_string("ionyx.config.toml") {
         for line in config_content.lines() {
             if line.trim().starts_with("frontendDist") {
-                if let Some(path) = line.split('=').nth(1) {
-                    return path.trim().trim_matches('"').to_string();
+                if let Some(path_str) = line.split('=').nth(1) {
+                    let clean_path = path_str.trim().trim_matches('"');
+                    return PathBuf::from(clean_path);
                 }
             }
         }
     }
-    // Varsayılan path
-    "../frontend/dist".to_string()
-}
+    // Varsayılan path: exe yanındaki dist klasörü
+    if let Ok(exe_path) = std::env::current_exe() {
+        if let Some(exe_dir) = exe_path.parent() {
+            let dist = exe_dir.join("dist");
+            if dist.exists() {
+                return dist;
+            }
+        }
+    }
-// Release modunda frontend/dist içindeki dosyaları binary'ye gömer.
-// Configuration'dan dinamik path okur.
-#[cfg(not(debug_assertions))]
-static EMBEDDED_ASSETS: Dir<'static> = include_dir!("../frontend/dist");
+    PathBuf::from("dist")
+}
 pub struct CustomProtocolHandler;
@@ -35,9 +38,11 @@ impl CustomProtocolHandler {
     }
     pub fn handle_request(&self, request: Request<Vec<u8>>) -> Response<Cow<'static, [u8]>> {
+        let uri_path = request.uri().path();
         #[cfg(debug_assertions)]
         {
-            let _uri_path = request.uri().path();
+            let _uri_path = uri_path;
             let _dist_path = get_frontend_dist_path();
             let _unused_ct = Self::get_content_type("index.html");
             return Response::builder()
@@ -49,33 +54,31 @@ impl CustomProtocolHandler {
         #[cfg(not(debug_assertions))]
         {
-            let uri_path = request.uri().path();
+            let dist_dir = get_frontend_dist_path();
             let clean_path = uri_path.trim_start_matches('/');
             let file_path = if clean_path.is_empty() { "index.html" } else { clean_path };
+            let full_path = dist_dir.join(file_path);
-            match EMBEDDED_ASSETS.get_file(file_path) {
-                Some(file) => {
-                    let content_type = Self::get_content_type(file_path);
+            if let Ok(contents) = fs::read(&full_path) {
+                let content_type = Self::get_content_type(file_path);
+                Response::builder()
+                    .status(StatusCode::OK)
+                    .header("Content-Type", content_type)
+                    .body(Cow::Owned(contents))
+                    .unwrap()
+            } else {
+                let index_path = dist_dir.join("index.html");
+                if let Ok(index_contents) = fs::read(&index_path) {
                     Response::builder()
                         .status(StatusCode::OK)
-                        .header("Content-Type", content_type)
-                        .body(Cow::Borrowed::<'static, [u8]>(file.contents()))
+                        .header("Content-Type", "text/html")
+                        .body(Cow::Owned(index_contents))
+                        .unwrap()
+                } else {
+                    Response::builder()
+                        .status(StatusCode::NOT_FOUND)
+                        .body(Cow::Borrowed(&b"404 Not Found"[..]))
                         .unwrap()
-                }
-                None => {
-                    // SPA (Single Page Application) desteği: Dosya bulunamazsa index.html'i dön
-                    if let Some(index_file) = EMBEDDED_ASSETS.get_file("index.html") {
-                        Response::builder()
-                            .status(StatusCode::OK)
-                            .header("Content-Type", "text/html")
-                            .body(Cow::Borrowed::<'static, [u8]>(index_file.contents()))
-                            .unwrap()
-                    } else {
-                        Response::builder()
-                            .status(StatusCode::NOT_FOUND)
-                            .body(Cow::Borrowed(&b"404 Not Found"[..]))
-                            .unwrap()
-                    }
                 }
             }
         }
@@ -97,5 +100,4 @@ impl CustomProtocolHandler {
             _ => "application/octet-stream",
         }
     }
-}
+}

package/ionyx-cli/src/templates/vanilla/frontend/dist/index.html ADDED Viewed

	@@ -0,0 +1 @@
1	+ <html><body><h1>Placeholder</h1></body></html>

package/ionyx-cli/src/templates/vanilla/src-ionyx/Cargo.toml CHANGED Viewed

@@ -1,6 +1,6 @@
 [package]
 name = "my-ionyx-app"
-version = "0.3.2"
+version = "0.3.4"
 edition = "2021"
 [workspace]
@@ -15,7 +15,6 @@ path = "main.rs"
 [dependencies]
 ionyx = { path = "../../../../../../src-ionyx" }
-include_dir = { version = "0.7", features = ["glob"] }
 anyhow = "1.0"
 wry = "0.54"
 tao = "0.34"

package/ionyx-cli/src/templates/vanilla/src-ionyx/src/protocol.rs CHANGED Viewed

@@ -1,31 +1,34 @@
 use std::borrow::Cow;
 use wry::http::{Request, Response, StatusCode};
-#[cfg(not(debug_assertions))]
-use include_dir::{include_dir, Dir};
+use std::path::{PathBuf};
+use std::fs;
 // Configuration'dan frontendDist path'ini oku
-fn get_frontend_dist_path() -> String {
+fn get_frontend_dist_path() -> PathBuf {
     // Önce Ionyx config dosyasını okumaya çalış
     if let Ok(config_content) = std::fs::read_to_string("ionyx.config.toml") {
         for line in config_content.lines() {
             if line.trim().starts_with("frontendDist") {
-                if let Some(path) = line.split('=').nth(1) {
-                    return path.trim().trim_matches('"').to_string();
+                if let Some(path_str) = line.split('=').nth(1) {
+                    let clean_path = path_str.trim().trim_matches('"');
+                    return PathBuf::from(clean_path);
                 }
             }
         }
     }
-    // Varsayılan path
-    "../frontend/dist".to_string()
-}
+    // Varsayılan path: exe yanındaki dist klasörü
+    if let Ok(exe_path) = std::env::current_exe() {
+        if let Some(exe_dir) = exe_path.parent() {
+            let dist = exe_dir.join("dist");
+            if dist.exists() {
+                return dist;
+            }
+        }
+    }
-// Release modunda frontend/dist içindeki dosyaları binary'ye gömer.
-// Configuration'dan dinamik path okur.
-#[cfg(not(debug_assertions))]
-static EMBEDDED_ASSETS: Dir<'static> = include_dir!("../frontend/dist");
+    PathBuf::from("dist")
+}
 pub struct CustomProtocolHandler;
@@ -35,9 +38,11 @@ impl CustomProtocolHandler {
     }
     pub fn handle_request(&self, request: Request<Vec<u8>>) -> Response<Cow<'static, [u8]>> {
+        let uri_path = request.uri().path();
         #[cfg(debug_assertions)]
         {
-            let _uri_path = request.uri().path();
+            let _uri_path = uri_path;
             let _dist_path = get_frontend_dist_path();
             let _unused_ct = Self::get_content_type("index.html");
             return Response::builder()
@@ -49,33 +54,31 @@ impl CustomProtocolHandler {
         #[cfg(not(debug_assertions))]
         {
-            let uri_path = request.uri().path();
+            let dist_dir = get_frontend_dist_path();
             let clean_path = uri_path.trim_start_matches('/');
             let file_path = if clean_path.is_empty() { "index.html" } else { clean_path };
+            let full_path = dist_dir.join(file_path);
-            match EMBEDDED_ASSETS.get_file(file_path) {
-                Some(file) => {
-                    let content_type = Self::get_content_type(file_path);
+            if let Ok(contents) = fs::read(&full_path) {
+                let content_type = Self::get_content_type(file_path);
+                Response::builder()
+                    .status(StatusCode::OK)
+                    .header("Content-Type", content_type)
+                    .body(Cow::Owned(contents))
+                    .unwrap()
+            } else {
+                let index_path = dist_dir.join("index.html");
+                if let Ok(index_contents) = fs::read(&index_path) {
                     Response::builder()
                         .status(StatusCode::OK)
-                        .header("Content-Type", content_type)
-                        .body(Cow::Borrowed::<'static, [u8]>(file.contents()))
+                        .header("Content-Type", "text/html")
+                        .body(Cow::Owned(index_contents))
+                        .unwrap()
+                } else {
+                    Response::builder()
+                        .status(StatusCode::NOT_FOUND)
+                        .body(Cow::Borrowed(&b"404 Not Found"[..]))
                         .unwrap()
-                }
-                None => {
-                    // SPA (Single Page Application) desteği: Dosya bulunamazsa index.html'i dön
-                    if let Some(index_file) = EMBEDDED_ASSETS.get_file("index.html") {
-                        Response::builder()
-                            .status(StatusCode::OK)
-                            .header("Content-Type", "text/html")
-                            .body(Cow::Borrowed::<'static, [u8]>(index_file.contents()))
-                            .unwrap()
-                    } else {
-                        Response::builder()
-                            .status(StatusCode::NOT_FOUND)
-                            .body(Cow::Borrowed(&b"404 Not Found"[..]))
-                            .unwrap()
-                    }
                 }
             }
         }
@@ -97,5 +100,4 @@ impl CustomProtocolHandler {
             _ => "application/octet-stream",
         }
     }
-}
+}

package/ionyx-cli/src/templates/vue/frontend/dist/index.html ADDED Viewed

	@@ -0,0 +1 @@
1	+ <html><body><h1>Placeholder</h1></body></html>

package/ionyx-cli/src/templates/vue/src-ionyx/Cargo.toml CHANGED Viewed

@@ -1,6 +1,6 @@
 [package]
 name = "my-ionyx-app"
-version = "0.3.2"
+version = "0.3.4"
 edition = "2021"
 [workspace]
@@ -15,7 +15,6 @@ path = "main.rs"
 [dependencies]
 ionyx = { path = "../../../../../../src-ionyx" }
-include_dir = { version = "0.7", features = ["glob"] }
 anyhow = "1.0"
 wry = "0.54"
 tao = "0.34"

package/ionyx-cli/src/templates/vue/src-ionyx/src/protocol.rs CHANGED Viewed

@@ -1,13 +1,34 @@
 use std::borrow::Cow;
 use wry::http::{Request, Response, StatusCode};
+use std::path::{PathBuf};
+use std::fs;
-#[cfg(not(debug_assertions))]
-use include_dir::{include_dir, Dir};
+// Configuration'dan frontendDist path'ini oku
+fn get_frontend_dist_path() -> PathBuf {
+    // Önce Ionyx config dosyasını okumaya çalış
+    if let Ok(config_content) = std::fs::read_to_string("ionyx.config.toml") {
+        for line in config_content.lines() {
+            if line.trim().starts_with("frontendDist") {
+                if let Some(path_str) = line.split('=').nth(1) {
+                    let clean_path = path_str.trim().trim_matches('"');
+                    return PathBuf::from(clean_path);
+                }
+            }
+        }
+    }
+    // Varsayılan path: exe yanındaki dist klasörü
+    if let Ok(exe_path) = std::env::current_exe() {
+        if let Some(exe_dir) = exe_path.parent() {
+            let dist = exe_dir.join("dist");
+            if dist.exists() {
+                return dist;
+            }
+        }
+    }
-// Release modunda frontend/dist içindeki dosyaları binary'ye gömer.
-// Path hatasını engellemek için doğru path kullanıyoruz.
-#[cfg(not(debug_assertions))]
-static EMBEDDED_ASSETS: Dir<'static> = include_dir!("../frontend/dist");
+    PathBuf::from("dist")
+}
 pub struct CustomProtocolHandler;
@@ -17,9 +38,12 @@ impl CustomProtocolHandler {
     }
     pub fn handle_request(&self, request: Request<Vec<u8>>) -> Response<Cow<'static, [u8]>> {
+        let uri_path = request.uri().path();
         #[cfg(debug_assertions)]
         {
-            let _uri_path = request.uri().path();
+            let _uri_path = uri_path;
+            let _dist_path = get_frontend_dist_path();
             let _unused_ct = Self::get_content_type("index.html");
             return Response::builder()
                 .status(StatusCode::NOT_FOUND)
@@ -30,33 +54,31 @@ impl CustomProtocolHandler {
         #[cfg(not(debug_assertions))]
         {
-            let uri_path = request.uri().path();
+            let dist_dir = get_frontend_dist_path();
             let clean_path = uri_path.trim_start_matches('/');
             let file_path = if clean_path.is_empty() { "index.html" } else { clean_path };
+            let full_path = dist_dir.join(file_path);
-            match EMBEDDED_ASSETS.get_file(file_path) {
-                Some(file) => {
-                    let content_type = Self::get_content_type(file_path);
+            if let Ok(contents) = fs::read(&full_path) {
+                let content_type = Self::get_content_type(file_path);
+                Response::builder()
+                    .status(StatusCode::OK)
+                    .header("Content-Type", content_type)
+                    .body(Cow::Owned(contents))
+                    .unwrap()
+            } else {
+                let index_path = dist_dir.join("index.html");
+                if let Ok(index_contents) = fs::read(&index_path) {
                     Response::builder()
                         .status(StatusCode::OK)
-                        .header("Content-Type", content_type)
-                        .body(Cow::Borrowed::<'static, [u8]>(file.contents()))
+                        .header("Content-Type", "text/html")
+                        .body(Cow::Owned(index_contents))
+                        .unwrap()
+                } else {
+                    Response::builder()
+                        .status(StatusCode::NOT_FOUND)
+                        .body(Cow::Borrowed(&b"404 Not Found"[..]))
                         .unwrap()
-                }
-                None => {
-                    // SPA (Single Page Application) desteği: Dosya bulunamazsa index.html'i dön
-                    if let Some(index_file) = EMBEDDED_ASSETS.get_file("index.html") {
-                        Response::builder()
-                            .status(StatusCode::OK)
-                            .header("Content-Type", "text/html")
-                            .body(Cow::Borrowed::<'static, [u8]>(index_file.contents()))
-                            .unwrap()
-                    } else {
-                        Response::builder()
-                            .status(StatusCode::NOT_FOUND)
-                            .body(Cow::Borrowed(&b"404 Not Found"[..]))
-                            .unwrap()
-                    }
                 }
             }
         }
@@ -78,5 +100,4 @@ impl CustomProtocolHandler {
             _ => "application/octet-stream",
         }
     }
-}
+}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@ionyx-apps/cli",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Ionyx Framework CLI - High-performance desktop apps with Rust and WebGPU",
   "main": "index.js",
   "type": "commonjs",