Skip to content

Commit d047939

Browse files
committed
Update Tailwind CSS support to v3.4
1 parent 458b5fa commit d047939

17 files changed

+409
-124
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,12 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

7+
## v1.1.0 (2024-01-18)
8+
### Added
9+
- Add support for Tailwind CSS v3.4
10+
11+
### Fixed
12+
- Fix display class not removed when it precedes line-clamp class
13+
714
## v1.0.0 (2024-01-10)
815
- Initial Release

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
A PHP port of [tailwind-merge](https://github.com/dcastil/tailwind-merge) by [dcastil](https://github.com/dcastil).
1616
And clone and improve from [tailwind-merge-php](https://github.com/gehrisandro/tailwind-merge-php) by [gehrisandro](https://github.com/gehrisandro).
1717

18-
Supports Tailwind v3.0 up to v3.3.
18+
Supports Tailwind v3.0 up to v3.4.
1919

2020
If you find this package helpful, please consider sponsoring the maintainer:
2121
- Devanox Private Limited: **[github.com/sponsors/devanoxltd](https://github.com/sponsors/devanoxltd)**

composer.json

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
"require": {
1818
"php": "^8.2.0",
1919
"psr/simple-cache": "^3.0",
20-
"illuminate/support": "v10.40.0"
20+
"illuminate/support": "v10.41.0"
2121
},
2222
"require-dev": {
23-
"laravel/pint": "^v1.13.8",
23+
"laravel/pint": "v1.13.9",
2424
"nunomaduro/collision": "^7.10.0",
25-
"pestphp/pest": "v2.30.0",
26-
"pestphp/pest-plugin-arch": "^v2.6.0",
25+
"pestphp/pest": "v2.31.0",
26+
"pestphp/pest-plugin-arch": "v2.6.1",
2727
"pestphp/pest-plugin-mock": "^2.0",
2828
"pestphp/pest-plugin-type-coverage": "^v2.8.0",
29-
"phpstan/phpstan": "^1.10.55",
30-
"rector/rector": "^0.19.0",
29+
"phpstan/phpstan": "^1.10.56",
30+
"rector/rector": "^0.19.1",
3131
"symfony/var-dumper": "v7.0.2"
3232
},
3333
"autoload": {
@@ -66,6 +66,10 @@
6666
"@test:types",
6767
"@test:type-coverage",
6868
"@test:pest"
69+
],
70+
"refactor": [
71+
"@refactor:rector",
72+
"@refactor:lint"
6973
]
7074
}
7175
}

0 commit comments

Comments
 (0)