Skip to content

Commit 1466cf7

Browse files
authored
Merge branch 'main' into feat/canonicalize-multiple-to-one
2 parents 8f84633 + 6c40814 commit 1466cf7

File tree

45 files changed

+601
-3634
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+601
-3634
lines changed

.gitattributes

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/issue-triage.lock.yml

Lines changed: 0 additions & 3310 deletions
This file was deleted.

.github/workflows/issue-triage.md

Lines changed: 0 additions & 91 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10-
### Changed
11-
12-
- Remove the `postinstall` script from oxide ([#19149])(https://github.com/tailwindlabs/tailwindcss/pull/19149)
13-
1410
### Added
1511

1612
- _Experimental_: Add `@container-size` utility ([#18901](https://github.com/tailwindlabs/tailwindcss/pull/18901))
1713

14+
## [4.1.15] - 2025-10-20
15+
1816
### Fixed
1917

2018
- Fix Safari devtools rendering issue due to `color-mix` fallback ([#19069](https://github.com/tailwindlabs/tailwindcss/pull/19069))
@@ -25,6 +23,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2523
- Don’t index into strings with the `theme(…)` function ([#19111](https://github.com/tailwindlabs/tailwindcss/pull/19111))
2624
- Fix parsing issue when `\t` is used in at-rules ([#19130](https://github.com/tailwindlabs/tailwindcss/pull/19130))
2725
- Upgrade: Canonicalize utilities containing `0` values ([#19095](https://github.com/tailwindlabs/tailwindcss/pull/19095))
26+
- Upgrade: Migrate deprecated `break-words` to `wrap-break-word` ([#19157](https://github.com/tailwindlabs/tailwindcss/pull/19157))
27+
28+
### Changed
29+
30+
- Remove the `postinstall` script from oxide ([#19149])(https://github.com/tailwindlabs/tailwindcss/pull/19149)
2831

2932
## [4.1.14] - 2025-10-01
3033

@@ -3858,7 +3861,8 @@ No release notes
38583861

38593862
- Everything!
38603863

3861-
[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.14...HEAD
3864+
[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.15...HEAD
3865+
[4.1.15]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.14...v4.1.15
38623866
[4.1.14]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.13...v4.1.14
38633867
[4.1.13]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.12...v4.1.13
38643868
[4.1.12]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.11...v4.1.12

Cargo.lock

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

crates/ignore/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "ignore"
3-
version = "0.4.23" #:version
3+
version = "0.4.24" #:version
44
authors = ["Andrew Gallant <[email protected]>"]
55
description = """
66
A fast library for efficiently matching ignore files such as `.gitignore`
@@ -12,15 +12,15 @@ repository = "https://github.com/BurntSushi/ripgrep/tree/master/crates/ignore"
1212
readme = "README.md"
1313
keywords = ["glob", "ignore", "gitignore", "pattern", "file"]
1414
license = "Unlicense OR MIT"
15-
edition = "2021"
15+
edition = "2024"
1616

1717
[lib]
1818
name = "ignore"
1919
bench = false
2020

2121
[dependencies]
2222
crossbeam-deque = "0.8.3"
23-
globset = "0.4.16"
23+
globset = "0.4.17"
2424
log = "0.4.20"
2525
memchr = "2.6.3"
2626
same-file = "1.0.6"
@@ -37,7 +37,7 @@ version = "0.1.2"
3737

3838
[dev-dependencies]
3939
bstr = { version = "1.6.2", default-features = false, features = ["std"] }
40-
crossbeam-channel = "0.5.8"
40+
crossbeam-channel = "0.5.15"
4141

4242
[features]
4343
# DEPRECATED. It is a no-op. SIMD is done automatically through runtime

crates/ignore/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# ignore
2-
1+
ignore
2+
======
33
The ignore crate provides a fast recursive directory iterator that respects
44
various filters such as globs, file types and `.gitignore` files. This crate
55
also provides lower level direct access to gitignore and file type matchers.
@@ -29,6 +29,7 @@ recursively traverse the current directory while automatically filtering out
2929
files and directories according to ignore globs found in files like
3030
`.ignore` and `.gitignore`:
3131

32+
3233
```rust,no_run
3334
use ignore::Walk;
3435

crates/ignore/examples/walk.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ fn main() {
1818
let stdout_thread = std::thread::spawn(move || {
1919
let mut stdout = std::io::BufWriter::new(std::io::stdout());
2020
for dent in rx {
21-
stdout.write(&*Vec::from_path_lossy(dent.path())).unwrap();
22-
stdout.write(b"\n").unwrap();
21+
stdout
22+
.write_all(&Vec::from_path_lossy(dent.path()))
23+
.unwrap();
24+
stdout.write_all(b"\n").unwrap();
2325
}
2426
});
2527

0 commit comments

Comments
 (0)