Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Snyk] Upgrade tailwind-merge from 1.14.0 to 2.3.0 #2

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

paaschdigital
Copy link
Owner

This PR was automatically created by Snyk using the credentials of a real user.


![snyk-top-banner](https://github.com/andygongea/OWASP-Benchmark/assets/818805/c518c423-16fe-447e-b67f-ad5a49b5d123)

Snyk has created this PR to upgrade tailwind-merge from 1.14.0 to 2.3.0.

ℹ️ Keep your dependencies up-to-date. This makes it easier to fix existing vulnerabilities and to more quickly identify and fix newly disclosed vulnerabilities when they affect your project.


⚠️ Warning: This PR contains major version upgrade(s), and may be a breaking change.

  • The recommended version is 57 versions ahead of your current version.

  • The recommended version was released on 2 months ago.

Release notes
Package name: tailwind-merge
  • 2.3.0 - 2024-04-19

    New Features

    Documentation

    • Add tailwind-merge-go to similar packages in docs by @ Oudwins in #396

    Full Changelog: v2.2.2...v2.3.0

    Thanks to @ brandonmcconnell, @ manavm1990, @ langy and @ jamesreaco for sponsoring tailwind-merge! ❤️

  • 2.3.0-dev.f35c825ecd0e652f3418c6b65899dfe82a3e0ac0 - 2024-06-01
  • 2.3.0-dev.7777ceb96a28c636d9ceb514569e2d05d8c6df08 - 2024-05-13
  • 2.3.0-dev.7044f930d58878c566e4738ed72d83a3683af799 - 2024-05-01
  • 2.3.0-dev.6c517f60c9af1dcfdc2f665036d4ea7df17fb504 - 2024-05-01
  • 2.3.0-dev.69baa12170e9b648be67269647b931de2b5d2633 - 2024-04-19
  • 2.3.0-dev.1ab7486bf907f84dc885882396026f39b7bae254 - 2024-05-01
  • 2.2.2 - 2024-03-16

    Bug Fixes

    • Fix arbitrary shadow with inset not recognized by @ dcastil in #392

    Documentation

    Full Changelog: v2.2.1...v2.2.2

    Thanks to @ brandonmcconnell, @ manavm1990, @ langy, a private sponsor and @ jamesreaco for sponsoring tailwind-merge! ❤️

  • 2.2.2-dev.e96959a28d610e91628f22730ed24a34c3ebcfcc - 2024-03-24
  • 2.2.2-dev.dac08e4973b881d2f36a840ebf787ad4a4548562 - 2024-03-16
  • 2.2.2-dev.ad9ebca8376bc21adee6408b225351ac337282a3 - 2024-03-24
  • 2.2.2-dev.aae31bb8c707c0a9c025635d673272e2680a40b5 - 2024-04-19
  • 2.2.2-dev.428f6813ca4bd0030b497ef6748da82f03f89776 - 2024-04-19
  • 2.2.2-dev.361cf8c63c83993691571b078950461db883ca3a - 2024-04-02
  • 2.2.2-dev.2111ae2bcce162b38f843b46ff444ff78ba95b5b - 2024-03-16
  • 2.2.2-dev.103b94930110a3e1cddff53196eac2f6dd095d29 - 2024-04-19
  • 2.2.1 - 2024-01-22

    Bug Fixes

    • Fix stroke-color being incorrectly detected as stroke-width by @ dcastil in #371

    Full Changelog: v2.2.0...v2.2.1

    Thanks to @ brandonmcconnell, @ manavm1990 and @ langy for sponsoring tailwind-merge! ❤️

  • 2.2.1-dev.f1d7ac635dc6deb05a60dba84204fe2d0730d805 - 2024-02-01
  • 2.2.1-dev.d88bf4992cf7debf4d6b640460f67748e1e7f825 - 2024-03-03
  • 2.2.1-dev.873193791b32cc521137cda3b91fcbc34770af7e - 2024-03-03
  • 2.2.1-dev.7a76ee89e63e8acd0491c535606a4e9258771480 - 2024-03-03
  • 2.2.1-dev.742a07a1ae9fdbea9e775a9aea14dfa23e273648 - 2024-03-16
  • 2.2.1-dev.5f0f217e23db882e97a6d67407eb5ba5e79a2b43 - 2024-01-24
  • 2.2.1-dev.41117c80c51a6ed6859834f5f963147b163a6ec5 - 2024-03-03
  • 2.2.1-dev.2f939b28b03b1e0477e0fa9f1208b0b65d615fbe - 2024-01-22
  • 2.2.1-dev.2a60d7f6851efb174b3e45827565437a6d2e1eff - 2024-03-16
  • 2.2.1-dev.22dc7bba345f7149c92abf7fada4f442010790ff - 2024-01-22
  • 2.2.1-dev.13ac24e43e28d17ef8ecfacf4c953e651f093f61 - 2024-03-03
  • 2.2.0 - 2023-12-21

    New Features

    Full Changelog: v2.1.0...v2.2.0

    Thanks to @ brandonmcconnell, @ manavm1990, @ ErwinAI and @ langy for sponsoring tailwind-merge! ❤️

  • 2.2.0-dev.f9e4aa070e5b7eb66cf697cddc878196ff66619d - 2024-01-01
  • 2.2.0-dev.f015c8110f6e743e6da0c1a878aff3a24a4eae1c - 2024-01-22
  • 2.2.0-dev.ee02ebe9cf5e99fc01996052fb8c7977ef96555d - 2024-01-01
  • 2.2.0-dev.e874a79ba2e037c3f87d8f00b7b5929a53f330c2 - 2023-12-21
  • 2.2.0-dev.c4adf5dfaabc5ae436270dc8b6c45d679bfc0a9b - 2024-01-22
  • 2.2.0-dev.627d46673846683b8f25e5743a5a15932b780415 - 2023-12-26
  • 2.2.0-dev.602ce0219124998610ba7b9ddc000efcd1ba0585 - 2024-01-01
  • 2.1.0 - 2023-12-02

    New Features

    • Add ClassValidator type to package exports by @ dcastil in #348

    Bug Fixes

    • Fix display class not removed when it precedes line-clamp class by @ dcastil in #347

    Documentation

    Full Changelog: v2.0.0...v2.1.0

    Thanks to @ brandonmcconnell, @ manavm1990, @ ErwinAI and @ langy for sponsoring tailwind-merge! ❤️

  • 2.1.0-dev.a7e26a8ffd57062c065cad432dafa7b65be30515 - 2023-12-21
  • 2.1.0-dev.381f1179250196e8f7df5b5c814b42c353cd0e51 - 2023-12-02
  • 2.0.0 - 2023-10-29

    The tailwind-merge v2 release has been sitting here almost finished for 2 months already. But the timing was never quite right, especially thinking about the increased support needed after the release. In the meantime, the product of the company I work at launched in public beta and I married. Thank you for your patience.

    This release focuses on making it easier to configure the library for new users. Check out the migration guide and if you have any questions, feel free to create an issue.

    Breaking Changes

    • Fix background-image and background-position being merged incorrectly by @ dcastil in #300
      • Values for background-position and background-size can look very similar and Tailwind CSS uses the same bg- prefix for both groups. This results in some limitations for tailwind-merge. If you use background position or background size with arbitrary values, please read this section about how to use them.
    • Make types of available keys more strict and configurable through generics by @ kachkaev in #279
    • Make it possible to override elements with extendTailwindMerge by @ dcastil in #294
    • Separate validators better by @ dcastil in #292
    • Make conflictingClassGroupModifiers in config non-optional by @ dcastil in #291
    • Move separator to config by @ dcastil in #290
    • Remove module field from package.json by @ dcastil in #289
    • Remove deprecated exports by @ dcastil in #288
    • Transpile lib to more modern JS by @ dcastil in #287

    New Features

    Bug Fixes

    • Fix touch action classes overriding each other incorrectly by @ dcastil in #313
    • Fix background-image and background-position being merged incorrectly by @ dcastil in #300
    • Fix number validators accidentally returning true for empty strings by @ dcastil in #295
    • Rename lazy-initializaton.test.ts to lazy-initialization.test.ts by @ CrutchTheClutch in #284

    Documentation

    • Explain limitations of arbitrary values in bg-size and bg-position class groups in docs by @ dcastil in #328

    Full Changelog: v1.14.0...v2.0.0

    Thanks to @ quezlatch, @ brandonmcconnell, @ manavm1990 and @ ErwinAI for sponsoring tailwind-merge! ❤️

  • 2.0.0-dev.d93fe6feb63ad6562d9cf86d42f3fd701302ab72 - 2023-11-20
  • 2.0.0-dev.d89615ba03c03bc1a3c9507933c1b78d0edafc4b - 2023-12-02
  • 2.0.0-dev.cc270c5827182405a024ec5fe1509d88d218fdd9 - 2023-10-29
  • 2.0.0-dev.bf16993e2fff2cef0e4f5ad0b74fa497c8f731fa - 2023-12-01
  • 2.0.0-dev.bce8bc919fac299f12c9d04487f9aaf76882ce3c - 2023-10-29
  • 2.0.0-dev.ae35a5d1291e0ad83c909d6a4f3a43e94203b073 - 2023-10-29
  • 2.0.0-dev.aca28e8a82574e2955179ee947ff85070182cab1 - 2023-11-01
  • 2.0.0-dev.a5c366cc1a4deea4ca139c33c797a8af4bee52a6 - 2023-11-01
  • 2.0.0-dev.9fdc590af2e67468279d8d118a49bded9af48bef - 2023-11-18
  • 2.0.0-dev.9cdf1e249feaf3d9427e29e3fd67be5e093f8e7c - 2023-10-29
  • 2.0.0-dev.730b1c2e2e193d8a4e2236094b6aebd58c6ad3c9 - 2023-11-01
  • 2.0.0-dev.70f836073b2e091a58e92da1ad8905990f2da8f7 - 2023-12-02
  • 2.0.0-dev.6ccc4ac57049b0ad0bcb7726a8e01b0beb9d3d37 - 2023-11-01
  • 2.0.0-dev.552d019f902486865ce2f14b9651ddae0fee8ebe - 2023-11-18
  • 2.0.0-dev.50bc4ead9cc418b6faa2edaf2a56f8be6d6bfc45 - 2023-11-01
  • 2.0.0-dev.396e24514fd2318398b074bd69051260763ace07 - 2023-10-30
  • 2.0.0-dev.1b6ebb56585b7aca2757e0a3d74998f0d4831013 - 2023-10-29
  • 1.14.0 - 2023-07-16

    New Features

    • Improve support for arbitrary values by @ dcastil in #263
      • Previously, tailwind-merge checked the content of the arbitrary value portion of a class in most cases to understand whether the type of the arbitrary value is correct (e.g. it checked for number followed by length unit for the length type). That lead to the issue that a class like mt-[calc(theme(fontSize.4xl)/1.125)] would not be recognized correctly because no length unit is present in the arbitrary value.
      • I changed the check of the arbitrary value to also pass when a calc(), min(), max() and clamp() function is used in the arbitrary value.
      • In ambiguous cases, you can use data type labels to mark the type of a class. Read more
      • Moreover, I removed the check where the type of the arbitrary value is unambiguous. In the class mt-[…] the arbitrary value can only be a length, so I don't check for it. A consequence of this is that if you use non-Tailwind classes like mt-[this-is-totally-not-tailwind], tailwind-merge will recognize it as a Tailwind class from now on. Please don't use classes that look like Tailwind classes with arbitrary value but aren't Tailwind classes with tailwind-merge (in default config) to prevent incorrect merging behavior.

    Bug Fixes

    • Fix col-span-full class missing in default config by @ dcastil in #267
    • Fix arbitrary value with no present length unit not being recognized by @ dcastil in #263

    Documentation

    • Add missing info about where to call config functions to docs by @ dcastil in #264

    Full Changelog: v1.13.2...v1.14.0

from tailwind-merge GitHub release notes

Important

  • Warning: This PR contains a major version upgrade, and may be a breaking change.
  • Check the changes in this PR to ensure they won't cause issues with your project.
  • This PR was automatically created by Snyk using the credentials of a real user.

Note: You are seeing this because you or someone else with access to this repository has authorized Snyk to open upgrade PRs.

For more information:

Snyk has created this PR to upgrade tailwind-merge from 1.14.0 to 2.3.0.

See this package in npm:
tailwind-merge

See this project in Snyk:
https://app.snyk.io/org/paaschdigital/project/0dff2e5c-9208-4a33-be33-d4a9254890d7?utm_source=github&utm_medium=referral&page=upgrade-pr
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants