wrapper/tailwindcss
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

ensure glob entry without pattern is scanner correctly

Browse source
This commit is contained in:
Robin Malfait 2024-10-28 20:04:22 +01:00 • committed by Jordan Pittman
parent 8e68a9a1c4
commit b5f25329a2
2 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/oxide/src/glob.rs
View file

@ -47,7 +47,13 @@ pub fn hoist_static_glob_parts(entries: &Vec<GlobEntry>) -> Vec<GlobEntry> {
let pattern = match dynamic_part {
Some(dynamic_part) => dynamic_part,
None => "**/*".to_owned(),
None => {
if base.is_dir() {
"**/*".to_owned()
} else {
"".to_owned()
}
}
};
result.push(GlobEntry {

16
crates/oxide/src/lib.rs
View file

@ -271,17 +271,27 @@ impl Scanner {
// Turn `Vec<&GlobEntry>` in `Vec<GlobEntry>`
let glob_sources: Vec<_> = glob_sources.into_iter().cloned().collect();
let hoisted = hoist_static_glob_parts(&glob_sources);
dbg!(&glob_sources, &hoisted);
for source in &hoisted {
// We need to combine the base and the pattern, otherwise a pattern that looks like
// `*.html`, will never match a path that looks like
// If the pattern is empty, then the base points to a specific file or folder already
// if it doesn't contain any dynamic parts. In that case we can use the base as the
// pattern.
//
// Otherwise we need to combine the base and the pattern, otherwise a pattern that
// looks like `*.html`, will never match a path that looks like
// `/my-project/project-a/index.html`, because it contains `/`.
//
// We can't prepend `**/`, because then `/my-project/project-a/nested/index.html` would
// match as well.
//
// Instead we combine the base and the pattern as a single glob pattern.
let Ok(glob) = Glob::new(&format!("{}/{}", source.base, source.pattern)) else {
let mut full_pattern = source.base.clone();
if !source.pattern.is_empty() {
full_pattern.push('/');
full_pattern.push_str(&source.pattern);
}
let Ok(glob) = Glob::new(&full_pattern) else {
continue;
};