tailwind-merge
Advanced tools
Comparing version 2.5.2-dev.9a68667c3a6710512dedcee4e74cbd60dbe57f38 to 2.5.2-dev.9ec63389aa42499fdc05a8b8a036f394bc6b146f
{ | ||
"name": "tailwind-merge", | ||
"version": "2.5.2-dev.9a68667c3a6710512dedcee4e74cbd60dbe57f38", | ||
"version": "2.5.2-dev.9ec63389aa42499fdc05a8b8a036f394bc6b146f", | ||
"description": "Merge Tailwind CSS classes without style conflicts", | ||
@@ -69,20 +69,20 @@ "keywords": [ | ||
"@rollup/plugin-babel": "^6.0.4", | ||
"@rollup/plugin-node-resolve": "^15.2.3", | ||
"@rollup/plugin-typescript": "^11.1.6", | ||
"@typescript-eslint/eslint-plugin": "^8.3.0", | ||
"@typescript-eslint/parser": "^8.3.0", | ||
"@vitest/coverage-v8": "^2.0.5", | ||
"@rollup/plugin-node-resolve": "^15.3.0", | ||
"@rollup/plugin-typescript": "^12.1.0", | ||
"@typescript-eslint/eslint-plugin": "^8.8.0", | ||
"@typescript-eslint/parser": "^8.8.0", | ||
"@vitest/coverage-v8": "^2.1.1", | ||
"babel-plugin-annotate-pure-calls": "^0.4.0", | ||
"babel-plugin-polyfill-regenerator": "^0.6.2", | ||
"eslint": "^8.57.0", | ||
"eslint-plugin-import": "^2.29.1", | ||
"eslint": "^8.57.1", | ||
"eslint-plugin-import": "^2.30.0", | ||
"globby": "^11.1.0", | ||
"prettier": "^3.3.3", | ||
"rollup": "^4.21.2", | ||
"rollup-plugin-delete": "^2.0.0", | ||
"rollup": "^4.22.5", | ||
"rollup-plugin-delete": "^2.1.0", | ||
"rollup-plugin-dts": "^6.1.1", | ||
"tslib": "^2.7.0", | ||
"typescript": "^5.5.4", | ||
"vitest": "^2.0.5", | ||
"zx": "^8.1.5" | ||
"typescript": "^5.6.2", | ||
"vitest": "^2.1.1", | ||
"zx": "^8.1.8" | ||
}, | ||
@@ -89,0 +89,0 @@ "publishConfig": { |
@@ -6,3 +6,3 @@ <!-- This file is autogenerated. If you want to change this content, please do the changes in `./docs/README.md` instead. --> | ||
<a href="https://github.com/dcastil/tailwind-merge"> | ||
<img src="https://github.com/dcastil/tailwind-merge/raw/9a68667c3a6710512dedcee4e74cbd60dbe57f38/assets/logo.svg" alt="tailwind-merge" height="150px" /> | ||
<img src="https://github.com/dcastil/tailwind-merge/raw/9ec63389aa42499fdc05a8b8a036f394bc6b146f/assets/logo.svg" alt="tailwind-merge" height="150px" /> | ||
</a> | ||
@@ -29,12 +29,12 @@ </div> | ||
- [What is it for](https://github.com/dcastil/tailwind-merge/tree/9a68667c3a6710512dedcee4e74cbd60dbe57f38/docs/what-is-it-for.md) | ||
- [When and how to use it](https://github.com/dcastil/tailwind-merge/tree/9a68667c3a6710512dedcee4e74cbd60dbe57f38/docs/when-and-how-to-use-it.md) | ||
- [Features](https://github.com/dcastil/tailwind-merge/tree/9a68667c3a6710512dedcee4e74cbd60dbe57f38/docs/features.md) | ||
- [Limitations](https://github.com/dcastil/tailwind-merge/tree/9a68667c3a6710512dedcee4e74cbd60dbe57f38/docs/limitations.md) | ||
- [Configuration](https://github.com/dcastil/tailwind-merge/tree/9a68667c3a6710512dedcee4e74cbd60dbe57f38/docs/configuration.md) | ||
- [Recipes](https://github.com/dcastil/tailwind-merge/tree/9a68667c3a6710512dedcee4e74cbd60dbe57f38/docs/recipes.md) | ||
- [API reference](https://github.com/dcastil/tailwind-merge/tree/9a68667c3a6710512dedcee4e74cbd60dbe57f38/docs/api-reference.md) | ||
- [Writing plugins](https://github.com/dcastil/tailwind-merge/tree/9a68667c3a6710512dedcee4e74cbd60dbe57f38/docs/writing-plugins.md) | ||
- [Versioning](https://github.com/dcastil/tailwind-merge/tree/9a68667c3a6710512dedcee4e74cbd60dbe57f38/docs/versioning.md) | ||
- [Contributing](https://github.com/dcastil/tailwind-merge/tree/9a68667c3a6710512dedcee4e74cbd60dbe57f38/docs/contributing.md) | ||
- [Similar packages](https://github.com/dcastil/tailwind-merge/tree/9a68667c3a6710512dedcee4e74cbd60dbe57f38/docs/similar-packages.md) | ||
- [What is it for](https://github.com/dcastil/tailwind-merge/tree/9ec63389aa42499fdc05a8b8a036f394bc6b146f/docs/what-is-it-for.md) | ||
- [When and how to use it](https://github.com/dcastil/tailwind-merge/tree/9ec63389aa42499fdc05a8b8a036f394bc6b146f/docs/when-and-how-to-use-it.md) | ||
- [Features](https://github.com/dcastil/tailwind-merge/tree/9ec63389aa42499fdc05a8b8a036f394bc6b146f/docs/features.md) | ||
- [Limitations](https://github.com/dcastil/tailwind-merge/tree/9ec63389aa42499fdc05a8b8a036f394bc6b146f/docs/limitations.md) | ||
- [Configuration](https://github.com/dcastil/tailwind-merge/tree/9ec63389aa42499fdc05a8b8a036f394bc6b146f/docs/configuration.md) | ||
- [Recipes](https://github.com/dcastil/tailwind-merge/tree/9ec63389aa42499fdc05a8b8a036f394bc6b146f/docs/recipes.md) | ||
- [API reference](https://github.com/dcastil/tailwind-merge/tree/9ec63389aa42499fdc05a8b8a036f394bc6b146f/docs/api-reference.md) | ||
- [Writing plugins](https://github.com/dcastil/tailwind-merge/tree/9ec63389aa42499fdc05a8b8a036f394bc6b146f/docs/writing-plugins.md) | ||
- [Versioning](https://github.com/dcastil/tailwind-merge/tree/9ec63389aa42499fdc05a8b8a036f394bc6b146f/docs/versioning.md) | ||
- [Contributing](https://github.com/dcastil/tailwind-merge/tree/9ec63389aa42499fdc05a8b8a036f394bc6b146f/docs/contributing.md) | ||
- [Similar packages](https://github.com/dcastil/tailwind-merge/tree/9ec63389aa42499fdc05a8b8a036f394bc6b146f/docs/similar-packages.md) |
@@ -213,4 +213,6 @@ export interface Config<ClassGroupIds extends string, ThemeGroupIds extends string> | ||
| 'border-color-b' | ||
| 'border-color-e' | ||
| 'border-color-l' | ||
| 'border-color-r' | ||
| 'border-color-s' | ||
| 'border-color-t' | ||
@@ -217,0 +219,0 @@ | 'border-color-x' |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
712673
15596