Skip to content

Commit 3e26640

Browse files
Add change log
1 parent ed6deaf commit 3e26640

File tree

7 files changed

+42
-12
lines changed

7 files changed

+42
-12
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2121
- Ensure drop shadow utilities don't inherit unexpectedly ([#16471](https://github.com/tailwindlabs/tailwindcss/pull/16471))
2222
- Export backwards compatible config and plugin types from `tailwindcss/plugin` ([#16505](https://github.com/tailwindlabs/tailwindcss/pull/16505))
2323
- Ensure JavaScript plugins that emit nested rules referencing to the utility name work as expected ([#16539](https://github.com/tailwindlabs/tailwindcss/pull/16539))
24+
- Ensure that Next.js splat routes are automatically scanned for classes ([#16457](https://github.com/tailwindlabs/tailwindcss/pull/16457))
2425
- Upgrade: Report errors when updating dependencies ([#16504](https://github.com/tailwindlabs/tailwindcss/pull/16504))
2526
- Upgrade: Ensure a `darkMode` JS config setting with block syntax converts to use `@slot` ([#16507](https://github.com/tailwindlabs/tailwindcss/pull/16507))
2627

Cargo.lock

Lines changed: 16 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/oxide/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ walkdir = "2.5.0"
1616
ignore = "0.4.23"
1717
dunce = "1.0.5"
1818
bexpand = "1.2.0"
19-
glob-match = "0.2.1"
19+
fast-glob = "0.4.3"
2020

2121
[dev-dependencies]
2222
tempfile = "3.13.0"

crates/oxide/src/glob.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
use fast_glob::glob_match;
12
use fxhash::{FxHashMap, FxHashSet};
2-
use glob_match::glob_match;
33
use std::path::{Path, PathBuf};
44
use tracing::event;
55

@@ -173,7 +173,7 @@ pub fn path_matches_globs(path: &Path, globs: &[GlobEntry]) -> bool {
173173

174174
globs
175175
.iter()
176-
.any(|g| glob_match(&format!("{}/{}", g.base, g.pattern), &path))
176+
.any(|g| glob_match(&format!("{}/{}", g.base, g.pattern), path.as_bytes()))
177177
}
178178

179179
#[cfg(test)]

crates/oxide/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ use crate::scanner::allowed_paths::resolve_paths;
44
use crate::scanner::detect_sources::DetectSources;
55
use bexpand::Expression;
66
use bstr::ByteSlice;
7+
use fast_glob::glob_match;
78
use fxhash::{FxHashMap, FxHashSet};
89
use glob::optimize_patterns;
9-
use glob_match::glob_match;
1010
use paths::Path;
1111
use rayon::prelude::*;
1212
use scanner::allowed_paths::read_dir;

crates/oxide/tests/scanner.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,9 +434,9 @@ mod scanner {
434434
candidates,
435435
vec![
436436
"content-['(theme)']",
437-
"content-['[slug]']",
438437
"content-['[...slug]']",
439438
"content-['[[...slug]]']",
439+
"content-['[slug]']",
440440
],
441441
);
442442
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/**
2+
* A Map that can generate default values for keys that don't exist.
3+
* Generated default values are added to the map to avoid recomputation.
4+
*/
5+
export class DefaultMap<K, V> extends Map<K, V> {
6+
constructor(private factory: (key: K, self: DefaultMap<K, V>) => V) {
7+
super()
8+
}
9+
10+
get(key: K): V {
11+
let value = super.get(key)
12+
13+
if (value === undefined) {
14+
value = this.factory(key, this)
15+
this.set(key, value)
16+
}
17+
18+
return value
19+
}
20+
}

0 commit comments

Comments
 (0)