Socket
Socket
Sign inDemoInstall

tailwind-merge

Package Overview
Dependencies
Maintainers
1
Versions
277
Alerts
File Explorer

Advanced tools

Socket logo

Install Socket

Detect and block malicious and high-risk dependencies

Install

tailwind-merge - npm Package Compare versions

Comparing version 2.2.0 to 2.2.1-dev.22dc7bba345f7149c92abf7fada4f442010790ff

30

package.json
{
"name": "tailwind-merge",
"version": "2.2.0",
"version": "2.2.1-dev.22dc7bba345f7149c92abf7fada4f442010790ff",
"description": "Merge Tailwind CSS classes without style conflicts",

@@ -64,28 +64,28 @@ "keywords": [

"dependencies": {
"@babel/runtime": "^7.23.5"
"@babel/runtime": "^7.23.7"
},
"devDependencies": {
"@babel/plugin-transform-runtime": "^7.23.4",
"@babel/preset-env": "^7.23.5",
"@babel/plugin-transform-runtime": "^7.23.7",
"@babel/preset-env": "^7.23.7",
"@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.0",
"@types/jest": "^29.5.10",
"@typescript-eslint/eslint-plugin": "^6.13.1",
"@typescript-eslint/parser": "^6.13.1",
"@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",
"babel-plugin-annotate-pure-calls": "^0.4.0",
"babel-plugin-polyfill-regenerator": "^0.5.3",
"eslint": "^8.54.0",
"eslint-plugin-import": "^2.29.0",
"babel-plugin-polyfill-regenerator": "^0.5.4",
"eslint": "^8.56.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^27.6.0",
"globby": "^11.1.0",
"jest": "^29.7.0",
"prettier": "^3.1.0",
"rollup": "^4.6.1",
"prettier": "^3.1.1",
"rollup": "^4.9.2",
"rollup-plugin-delete": "^2.0.0",
"rollup-plugin-dts": "^6.1.0",
"size-limit": "^11.0.0",
"size-limit": "^11.0.1",
"ts-jest": "^29.1.1",
"typescript": "^5.3.2",
"typescript": "^5.3.3",
"zx": "^7.2.3"

@@ -92,0 +92,0 @@ },

@@ -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/v2.2.0/assets/logo.svg" alt="tailwind-merge" height="150px" />
<img src="https://github.com/dcastil/tailwind-merge/raw/22dc7bba345f7149c92abf7fada4f442010790ff/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/v2.2.0/docs/what-is-it-for.md)
- [When and how to use it](https://github.com/dcastil/tailwind-merge/tree/v2.2.0/docs/when-and-how-to-use-it.md)
- [Features](https://github.com/dcastil/tailwind-merge/tree/v2.2.0/docs/features.md)
- [Limitations](https://github.com/dcastil/tailwind-merge/tree/v2.2.0/docs/limitations.md)
- [Configuration](https://github.com/dcastil/tailwind-merge/tree/v2.2.0/docs/configuration.md)
- [Recipes](https://github.com/dcastil/tailwind-merge/tree/v2.2.0/docs/recipes.md)
- [API reference](https://github.com/dcastil/tailwind-merge/tree/v2.2.0/docs/api-reference.md)
- [Writing plugins](https://github.com/dcastil/tailwind-merge/tree/v2.2.0/docs/writing-plugins.md)
- [Versioning](https://github.com/dcastil/tailwind-merge/tree/v2.2.0/docs/versioning.md)
- [Contributing](https://github.com/dcastil/tailwind-merge/tree/v2.2.0/docs/contributing.md)
- [Similar packages](https://github.com/dcastil/tailwind-merge/tree/v2.2.0/docs/similar-packages.md)
- [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)

@@ -7,2 +7,3 @@ const arbitraryValueRegex = /^\[(?:([a-z-]+):)?(.+)\]$/i

/\d+(%|px|r?em|[sdl]?v([hwib]|min|max)|pt|pc|in|cm|mm|cap|ch|ex|r?lh|cq(w|h|i|b|min|max))|\b(calc|min|max|clamp)\(.+\)|^0$/
const colorFunctionRegex = /^(rgba?|hsla?|hwb|(ok)?(lab|lch))\(.+\)$/
// Shadow always begins with x and y offset separated by underscore

@@ -88,3 +89,6 @@ const shadowRegex = /^-?((\d+)?\.?(\d+)[a-z]+|0)_-?((\d+)?\.?(\d+)[a-z]+|0)/

function isLengthOnly(value: string) {
return lengthUnitRegex.test(value)
// `colorFunctionRegex` check is necessary because color functions can have percentages in them which which would be incorrectly classified as lengths.
// For example, `hsl(0 0% 0%)` would be classified as a length without this check.
// I could also use lookbehind assertion in `lengthUnitRegex` but that isn't supported widely enough.
return lengthUnitRegex.test(value) && !colorFunctionRegex.test(value)
}

@@ -91,0 +95,0 @@

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

SocketSocket SOC 2 Logo

Product

  • Package Alerts
  • Integrations
  • Docs
  • Pricing
  • FAQ
  • Roadmap
  • Changelog

Packages

npm

Stay in touch

Get open source security insights delivered straight into your inbox.


  • Terms
  • Privacy
  • Security

Made with ⚡️ by Socket Inc