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

Update dependency tailwind-merge to v2.6.0 #211

Merged
merged 1 commit into from
Jan 25, 2025

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented Jan 13, 2025

This PR contains the following updates:

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

Release Notes

dcastil/tailwind-merge (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! ❤️

v2.5.5

Compare Source

Bug Fixes
Documentation

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

Thanks to @​brandonmcconnell, @​manavm1990, @​langy, @​jamesreaco, @​roboflow, @​syntaxfm, @​getsentry, @​codecov 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: Disabled by config. Please merge this manually once you are satisfied.

Rebasing: Whenever PR becomes conflicted, 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.

Copy link

vercel bot commented Jan 13, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
a-bd-me ❌ Failed (Inspect) Jan 13, 2025 11:41am

@the-coder-o the-coder-o merged commit 88d531d into main Jan 25, 2025
1 of 2 checks passed
Copy link
Contributor Author

renovate bot commented Jan 25, 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 warn ERESOLVE overriding peer dependency
npm warn While resolving: my-blog@3.0.0
npm warn Found: tailwindcss@3.4.17
npm warn node_modules/tailwindcss
npm warn   peer tailwindcss@"3.x" from tailwind-scrollbar@3.1.0
npm warn   node_modules/tailwind-scrollbar
npm warn     tailwind-scrollbar@"^3.1.0" from the root project
npm warn   2 more (tailwindcss-animate, the root project)
npm warn
npm warn Could not resolve dependency:
npm warn peer tailwindcss@"3.x" from tailwind-scrollbar@3.1.0
npm warn node_modules/tailwind-scrollbar
npm warn   tailwind-scrollbar@"^3.1.0" from the root project
npm error code ERESOLVE
npm error ERESOLVE could not resolve
npm error
npm error While resolving: react-calendar-heatmap@1.9.0
npm error Found: react@19.0.0
npm error node_modules/react
npm error   peer react@">=16.8.0" from @floating-ui/react@0.26.28
npm error   node_modules/@floating-ui/react
npm error     @floating-ui/react@"^0.26.16" from @headlessui/react@2.2.0
npm error     node_modules/@headlessui/react
npm error       @headlessui/react@"^2.0.0" from the root project
npm error   peer react@">=16.8.0" from @floating-ui/react-dom@2.1.2
npm error   node_modules/@floating-ui/react-dom
npm error     @floating-ui/react-dom@"^2.1.2" from @floating-ui/react@0.26.28
npm error     node_modules/@floating-ui/react
npm error       @floating-ui/react@"^0.26.16" from @headlessui/react@2.2.0
npm error       node_modules/@headlessui/react
npm error         @headlessui/react@"^2.0.0" from the root project
npm error     @floating-ui/react-dom@"^2.0.0" from @radix-ui/react-popper@1.2.1
npm error     node_modules/@radix-ui/react-popper
npm error       @radix-ui/react-popper@"1.2.1" from @radix-ui/react-menu@2.1.4
npm error       node_modules/@radix-ui/react-menu
npm error         @radix-ui/react-menu@"2.1.4" from @radix-ui/react-dropdown-menu@2.1.4
npm error         node_modules/@radix-ui/react-dropdown-menu
npm error       1 more (@radix-ui/react-tooltip)
npm error   66 more (@headlessui/react, @heroicons/react, ...)
npm error
npm error Could not resolve dependency:
npm error peer react@"^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0" from react-calendar-heatmap@1.9.0
npm error node_modules/react-calendar-heatmap
npm error   react-calendar-heatmap@"^1.9.0" from the root project
npm error
npm error Conflicting peer dependency: react@18.3.1
npm error node_modules/react
npm error   peer react@"^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0" from react-calendar-heatmap@1.9.0
npm error   node_modules/react-calendar-heatmap
npm error     react-calendar-heatmap@"^1.9.0" 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-01-25T10_03_59_605Z-eresolve-report.txt
npm error A complete log of this run can be found in: /tmp/renovate/cache/others/npm/_logs/2025-01-25T10_03_59_605Z-debug-0.log

@renovate renovate bot deleted the renovate/tailwind-merge-2.x-lockfile branch January 25, 2025 10:05
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.

1 participant