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

fix(deps): update dependency tailwind-merge to v3 #635

Merged
merged 1 commit into from
Feb 2, 2025

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented Feb 2, 2025

This PR contains the following updates:

Package Change Age Adoption Passing Confidence
tailwind-merge ^2.6.0 -> ^3.0.1 age adoption passing confidence

Release Notes

dcastil/tailwind-merge (tailwind-merge)

v3.0.1

Compare Source

Bug Fixes

Full Changelog: dcastil/tailwind-merge@v3.0.0...v3.0.1

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

v3.0.0

Compare Source

Tailwind CSS v4 is here and it's time to upgrade tailwind-merge to support it. tailwind-merge v3.0.0 is more accurate than ever and follows the Tailwind CSS spec more closely than in v2. That is thanks to Tailwind CSS v4 being more consistent than ever.

This release drops support for Tailwind CSS v3 and in turn adds support for Tailwind CSS v4. That means you should upgrade to Tailwind CSS v4 and tailwind-merge v3 together. All breaking changes are related to the Tailwind CSS v4 support.

Check out the migration guide and if you have any questions, feel free to create an issue.

Breaking Changes
New Features
Bug Fixes
Documentation

Full Changelog: dcastil/tailwind-merge@v2.6.0...v3.0.0

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

v2.6.0

Compare Source

New Features

Full Changelog: dcastil/tailwind-merge@v2.5.5...v2.6.0

Thanks to @​brandonmcconnell, @​manavm1990, @​langy, @​jamesreaco, @​roboflow, @​syntaxfm, @​getsentry, @​codecov, @​sourcegraph, a private sponsor and more via @​thnxdev for sponsoring tailwind-merge! ❤️


Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Enabled.

Rebasing: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.


  • If you want to rebase/retry this PR, check this box

This PR was generated by Mend Renovate. View the repository job log.

@renovate renovate bot requested a review from kenany as a code owner February 2, 2025 18:22
@renovate renovate bot enabled auto-merge (squash) February 2, 2025 18:22
@renovate renovate bot requested review from snpranav and vanpangea as code owners February 2, 2025 18:22
Copy link
Contributor Author

renovate bot commented Feb 2, 2025

⚠️ Artifact update problem

Renovate failed to update an artifact related to this branch. You probably do not want to merge this PR as-is.

♻ Renovate will retry this branch, including artifacts, only when one of the following happens:

  • any of the package files in this branch needs updating, or
  • the branch becomes conflicted, or
  • you click the rebase/retry checkbox if found above, or
  • you rename this PR's title to start with "rebase!" to trigger it manually

The artifact failure details are included below:

File name: package-lock.json
npm error code ERESOLVE
npm error ERESOLVE could not resolve
npm error
npm error While resolving: @pangeacyber/[email protected]
npm error Found: [email protected]
npm error node_modules/react
npm error   react@"19.0.0" from the root project
npm error   peer react@"^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" from @radix-ui/[email protected]
npm error   node_modules/@radix-ui/react-context
npm error     @radix-ui/react-context@"1.1.1" from @radix-ui/[email protected]
npm error     node_modules/@radix-ui/react-alert-dialog
npm error       @radix-ui/react-alert-dialog@"^1.1.5" from the root project
npm error     @radix-ui/react-context@"1.1.1" from @radix-ui/[email protected]
npm error     node_modules/@radix-ui/react-dialog
npm error       @radix-ui/react-dialog@"^1.1.5" from the root project
npm error       1 more (@radix-ui/react-alert-dialog)
npm error     5 more (@radix-ui/react-dropdown-menu, ...)
npm error   32 more (@radix-ui/react-direction, ...)
npm error
npm error Could not resolve dependency:
npm error peer react@"^17.0.2 || ^18.2.0" from @pangeacyber/[email protected]
npm error node_modules/@pangeacyber/react-auth
npm error   @pangeacyber/react-auth@"^0.0.14" from the root project
npm error
npm error Conflicting peer dependency: [email protected]
npm error node_modules/react
npm error   peer react@"^17.0.2 || ^18.2.0" from @pangeacyber/[email protected]
npm error   node_modules/@pangeacyber/react-auth
npm error     @pangeacyber/react-auth@"^0.0.14" from the root project
npm error
npm error Fix the upstream dependency conflict, or retry
npm error this command with --force or --legacy-peer-deps
npm error to accept an incorrect (and potentially broken) dependency resolution.
npm error
npm error
npm error For a full report see:
npm error /tmp/renovate/cache/others/npm/_logs/2025-02-02T18_22_17_304Z-eresolve-report.txt
npm error A complete log of this run can be found in: /tmp/renovate/cache/others/npm/_logs/2025-02-02T18_22_17_304Z-debug-0.log

@renovate renovate bot merged commit 56b083b into main Feb 2, 2025
3 of 5 checks passed
@renovate renovate bot deleted the renovate/tailwind-merge-3.x branch February 2, 2025 18:22
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.

0 participants