tailwind-merge
Advanced tools
Comparing version 2.2.1-dev.22dc7bba345f7149c92abf7fada4f442010790ff to 2.2.1-dev.2a60d7f6851efb174b3e45827565437a6d2e1eff
{ | ||
"name": "tailwind-merge", | ||
"version": "2.2.1-dev.22dc7bba345f7149c92abf7fada4f442010790ff", | ||
"version": "2.2.1-dev.2a60d7f6851efb174b3e45827565437a6d2e1eff", | ||
"description": "Merge Tailwind CSS classes without style conflicts", | ||
@@ -64,27 +64,27 @@ "keywords": [ | ||
"dependencies": { | ||
"@babel/runtime": "^7.23.7" | ||
"@babel/runtime": "^7.24.0" | ||
}, | ||
"devDependencies": { | ||
"@babel/plugin-transform-runtime": "^7.23.7", | ||
"@babel/preset-env": "^7.23.7", | ||
"@babel/plugin-transform-runtime": "^7.24.0", | ||
"@babel/preset-env": "^7.24.0", | ||
"@rollup/plugin-babel": "^6.0.4", | ||
"@rollup/plugin-node-resolve": "^15.2.3", | ||
"@rollup/plugin-typescript": "^11.1.5", | ||
"@size-limit/preset-small-lib": "^11.0.1", | ||
"@types/jest": "^29.5.11", | ||
"@typescript-eslint/eslint-plugin": "^6.16.0", | ||
"@typescript-eslint/parser": "^6.16.0", | ||
"@rollup/plugin-typescript": "^11.1.6", | ||
"@size-limit/preset-small-lib": "^11.0.2", | ||
"@types/jest": "^29.5.12", | ||
"@typescript-eslint/eslint-plugin": "^7.1.0", | ||
"@typescript-eslint/parser": "^7.1.0", | ||
"babel-plugin-annotate-pure-calls": "^0.4.0", | ||
"babel-plugin-polyfill-regenerator": "^0.5.4", | ||
"eslint": "^8.56.0", | ||
"babel-plugin-polyfill-regenerator": "^0.5.5", | ||
"eslint": "^8.57.0", | ||
"eslint-plugin-import": "^2.29.1", | ||
"eslint-plugin-jest": "^27.6.0", | ||
"eslint-plugin-jest": "^27.9.0", | ||
"globby": "^11.1.0", | ||
"jest": "^29.7.0", | ||
"prettier": "^3.1.1", | ||
"rollup": "^4.9.2", | ||
"prettier": "^3.2.5", | ||
"rollup": "^4.12.0", | ||
"rollup-plugin-delete": "^2.0.0", | ||
"rollup-plugin-dts": "^6.1.0", | ||
"size-limit": "^11.0.1", | ||
"ts-jest": "^29.1.1", | ||
"size-limit": "^11.0.2", | ||
"ts-jest": "^29.1.2", | ||
"typescript": "^5.3.3", | ||
@@ -91,0 +91,0 @@ "zx": "^7.2.3" |
@@ -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/22dc7bba345f7149c92abf7fada4f442010790ff/assets/logo.svg" alt="tailwind-merge" height="150px" /> | ||
<img src="https://github.com/dcastil/tailwind-merge/raw/2a60d7f6851efb174b3e45827565437a6d2e1eff/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/22dc7bba345f7149c92abf7fada4f442010790ff/docs/what-is-it-for.md) | ||
- [When and how to use it](https://github.com/dcastil/tailwind-merge/tree/22dc7bba345f7149c92abf7fada4f442010790ff/docs/when-and-how-to-use-it.md) | ||
- [Features](https://github.com/dcastil/tailwind-merge/tree/22dc7bba345f7149c92abf7fada4f442010790ff/docs/features.md) | ||
- [Limitations](https://github.com/dcastil/tailwind-merge/tree/22dc7bba345f7149c92abf7fada4f442010790ff/docs/limitations.md) | ||
- [Configuration](https://github.com/dcastil/tailwind-merge/tree/22dc7bba345f7149c92abf7fada4f442010790ff/docs/configuration.md) | ||
- [Recipes](https://github.com/dcastil/tailwind-merge/tree/22dc7bba345f7149c92abf7fada4f442010790ff/docs/recipes.md) | ||
- [API reference](https://github.com/dcastil/tailwind-merge/tree/22dc7bba345f7149c92abf7fada4f442010790ff/docs/api-reference.md) | ||
- [Writing plugins](https://github.com/dcastil/tailwind-merge/tree/22dc7bba345f7149c92abf7fada4f442010790ff/docs/writing-plugins.md) | ||
- [Versioning](https://github.com/dcastil/tailwind-merge/tree/22dc7bba345f7149c92abf7fada4f442010790ff/docs/versioning.md) | ||
- [Contributing](https://github.com/dcastil/tailwind-merge/tree/22dc7bba345f7149c92abf7fada4f442010790ff/docs/contributing.md) | ||
- [Similar packages](https://github.com/dcastil/tailwind-merge/tree/22dc7bba345f7149c92abf7fada4f442010790ff/docs/similar-packages.md) | ||
- [What is it for](https://github.com/dcastil/tailwind-merge/tree/2a60d7f6851efb174b3e45827565437a6d2e1eff/docs/what-is-it-for.md) | ||
- [When and how to use it](https://github.com/dcastil/tailwind-merge/tree/2a60d7f6851efb174b3e45827565437a6d2e1eff/docs/when-and-how-to-use-it.md) | ||
- [Features](https://github.com/dcastil/tailwind-merge/tree/2a60d7f6851efb174b3e45827565437a6d2e1eff/docs/features.md) | ||
- [Limitations](https://github.com/dcastil/tailwind-merge/tree/2a60d7f6851efb174b3e45827565437a6d2e1eff/docs/limitations.md) | ||
- [Configuration](https://github.com/dcastil/tailwind-merge/tree/2a60d7f6851efb174b3e45827565437a6d2e1eff/docs/configuration.md) | ||
- [Recipes](https://github.com/dcastil/tailwind-merge/tree/2a60d7f6851efb174b3e45827565437a6d2e1eff/docs/recipes.md) | ||
- [API reference](https://github.com/dcastil/tailwind-merge/tree/2a60d7f6851efb174b3e45827565437a6d2e1eff/docs/api-reference.md) | ||
- [Writing plugins](https://github.com/dcastil/tailwind-merge/tree/2a60d7f6851efb174b3e45827565437a6d2e1eff/docs/writing-plugins.md) | ||
- [Versioning](https://github.com/dcastil/tailwind-merge/tree/2a60d7f6851efb174b3e45827565437a6d2e1eff/docs/versioning.md) | ||
- [Contributing](https://github.com/dcastil/tailwind-merge/tree/2a60d7f6851efb174b3e45827565437a6d2e1eff/docs/contributing.md) | ||
- [Similar packages](https://github.com/dcastil/tailwind-merge/tree/2a60d7f6851efb174b3e45827565437a6d2e1eff/docs/similar-packages.md) |
@@ -8,4 +8,4 @@ const arbitraryValueRegex = /^\[(?:([a-z-]+):)?(.+)\]$/i | ||
const colorFunctionRegex = /^(rgba?|hsla?|hwb|(ok)?(lab|lch))\(.+\)$/ | ||
// Shadow always begins with x and y offset separated by underscore | ||
const shadowRegex = /^-?((\d+)?\.?(\d+)[a-z]+|0)_-?((\d+)?\.?(\d+)[a-z]+|0)/ | ||
// Shadow always begins with x and y offset separated by underscore optionally prepended by inset | ||
const shadowRegex = /^(inset_)?-?((\d+)?\.?(\d+)[a-z]+|0)_-?((\d+)?\.?(\d+)[a-z]+|0)/ | ||
const imageRegex = | ||
@@ -12,0 +12,0 @@ /^(url|image|image-set|cross-fade|element|(repeating-)?(linear|radial|conic)-gradient)\(.+\)$/ |
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
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
699063
Updated@babel/runtime@^7.24.0