swaits/dioxus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed input option error

Browse Source
This commit is contained in:
YuKun Liu committed 2022-05-11 11:12:23 +08:00
1 parent c6aa4e332d
commit dccd82091a
1 file changed
+24 -17
Download Patch File Download Diff File Expand all files Collapse all files
src/builder.rs
+24 -17
View File
@@ -354,7 +354,6 @@ pub fn gen_page(config: &DioxusConfig, serve: bool) -> String {
// like sass tool resources // like sass tool resources
// this function will return a array which file don't need copy to out_dir. // this function will return a array which file don't need copy to out_dir.
fn build_assets(config: &CrateConfig) -> Result<Vec<PathBuf>> { fn build_assets(config: &CrateConfig) -> Result<Vec<PathBuf>> {
let mut result = vec![]; let mut result = vec![];
let dioxus_config = &config.dioxus_config; let dioxus_config = &config.dioxus_config;
@@ -430,19 +429,23 @@ fn build_assets(config: &CrateConfig) -> Result<Vec<PathBuf>> {
}; };
let path = PathBuf::from(path); let path = PathBuf::from(path);
let path = config.asset_dir.join(path); let path = config.asset_dir.join(path);
let out_file =
format!("{}.css", path.file_stem().unwrap().to_str().unwrap());
let target_path = config
.out_dir
.join(
path.strip_prefix(&config.asset_dir)
.unwrap()
.parent()
.unwrap(),
)
.join(out_file);
if path.is_file() { if path.is_file() {
let res = sass.call( let res = sass.call(
"sass", "sass",
vec![ vec![
path.to_str().unwrap(), path.to_str().unwrap(),
path.parent() target_path.to_str().unwrap(),
.unwrap()
.join(format!(
"{}.css",
path.file_stem().unwrap().to_str().unwrap()
))
.to_str()
.unwrap(),
source_map, source_map,
], ],
); );
@@ -464,19 +467,23 @@ fn build_assets(config: &CrateConfig) -> Result<Vec<PathBuf>> {
}; };
let path = PathBuf::from(path); let path = PathBuf::from(path);
let path = config.asset_dir.join(path); let path = config.asset_dir.join(path);
let out_file =
format!("{}.css", path.file_stem().unwrap().to_str().unwrap());
let target_path = config
.out_dir
.join(
path.strip_prefix(&config.asset_dir)
.unwrap()
.parent()
.unwrap(),
)
.join(out_file);
if path.is_file() { if path.is_file() {
let res = sass.call( let res = sass.call(
"sass", "sass",
vec![ vec![
path.to_str().unwrap(), path.to_str().unwrap(),
path.parent() target_path.to_str().unwrap(),
.unwrap()
.join(format!(
"{}.css",
path.file_stem().unwrap().to_str().unwrap()
))
.to_str()
.unwrap(),
source_map, source_map,
], ],
); );