emelie/zola
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make indented syntax available for SASS via the "sass" file extension

Browse source
This commit is contained in:
Erich Gubler 2018-03-17 12:57:03 -06:00
parent 9fbbcca3c6
commit ea4cc63aa9
2 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
components/site/src/lib.rs
View file

@ -537,17 +537,34 @@ impl Site {
sass_path sass_path
}; };
let sass_glob = format!("{}/**/*.scss", sass_path.display()); let mut options = Options::default();
let files = glob(&sass_glob) options.output_style = OutputStyle::Compressed;
let mut compiled_paths = self.compile_sass_glob(&sass_path, "scss", options.clone())?;
options.indented_syntax = true;
compiled_paths.extend(self.compile_sass_glob(&sass_path, "sass", options)?);
compiled_paths.sort();
for window in compiled_paths.windows(2) {
if window[0].1 == window[1].1 {
bail!("SASS path conflict: \"{}\" and \"{}\" both compile to \"{}\"", window[0].0.display(), window[1].0.display(), window[0].1.display());
}
}
Ok(())
}
fn compile_sass_glob(&self, sass_path: &Path, extension: &str, options: Options) -> Result<Vec<(PathBuf, PathBuf)>> {
let glob_string = format!("{}/**/*.{}", sass_path.display(), extension);
let files = glob(&glob_string)
.unwrap() .unwrap()
.filter_map(|e| e.ok()) .filter_map(|e| e.ok())
.filter(|entry| !entry.as_path().file_name().unwrap().to_string_lossy().starts_with('_')) .filter(|entry| !entry.as_path().file_name().unwrap().to_string_lossy().starts_with('_'))
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let mut sass_options = Options::default(); let mut compiled_paths = Vec::new();
sass_options.output_style = OutputStyle::Compressed;
for file in files { for file in files {
let css = compile_file(&file, sass_options.clone())?; let css = compile_file(&file, options.clone())?;
let path_inside_sass = file.strip_prefix(&sass_path).unwrap(); let path_inside_sass = file.strip_prefix(&sass_path).unwrap();
let parent_inside_sass = path_inside_sass.parent(); let parent_inside_sass = path_inside_sass.parent();
@ -556,10 +573,12 @@ impl Site {
if parent_inside_sass.is_some() { if parent_inside_sass.is_some() {
create_dir_all(&css_output_path.parent().unwrap())?; create_dir_all(&css_output_path.parent().unwrap())?;
} }
create_file(&css_output_path, &css)?; create_file(&css_output_path, &css)?;
compiled_paths.push((path_inside_sass.to_owned(), css_output_path));
} }
Ok(()) Ok(compiled_paths)
} }
pub fn render_aliases(&self) -> Result<()> { pub fn render_aliases(&self) -> Result<()> {

2
components/site/tests/site.rs
View file

@ -148,6 +148,8 @@ fn can_build_site_without_live_reload() {
assert!(file_contains!(public, "blog.css", "2rem")); // check include assert!(file_contains!(public, "blog.css", "2rem")); // check include
assert!(!file_exists!(public, "_included.css")); assert!(!file_exists!(public, "_included.css"));
assert!(file_exists!(public, "scss.css")); assert!(file_exists!(public, "scss.css"));
assert!(file_exists!(public, "sass.css"));
assert!(file_exists!(public, "nested_sass/sass.css"));
assert!(file_exists!(public, "nested_sass/scss.css")); assert!(file_exists!(public, "nested_sass/scss.css"));
// no live reload code // no live reload code