Skip to content

Bump tailwind-merge from 2.5.5 to 2.6.0 #5831

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Dec 23, 2024
Merged

Bump tailwind-merge from 2.5.5 to 2.6.0 #5831

merged 1 commit into from
Dec 23, 2024

Conversation

@dependabot
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Dec 23, 2024 •
edited by pr-codex bot
Loading

Bumps tailwind-merge from 2.5.5 to 2.6.0.

Release notes

Sourced from tailwind-merge's releases.

v2.6.0

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! ❤️

Commits
  • 1a92c35 v2.6.0
  • 6480375 add changelog for v2.6.0
  • 7bb2dc0 Merge pull request #509 from dcastil/renovate/rollup-plugin-node-resolve-16.x
  • 19eb0a1 chore(deps): update dependency @​rollup/plugin-node-resolve to v16
  • d6f1014 Merge pull request #508 from dcastil/renovate/codspeed-vitest-plugin-4.x
  • d039e29 chore(deps): update dependency @​codspeed/vitest-plugin to v4
  • 4aac490 Merge pull request #507 from dcastil/renovate/migrate-config
  • 433e532 chore(config): migrate config .github/renovate.json
  • 31da3f2 fix unsupported import assertion
  • 34078ee Merge pull request #506 from dcastil/other/upgrade-github-workflows-to-node-22
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

PR-Codex overview

This PR primarily updates the version of tailwind-merge from ^2.5.5 to ^2.6.0 across multiple package.json files and makes several adjustments in the pnpm-lock.yaml file, including dependency versions and structures.

Detailed summary

  • Updated tailwind-merge from ^2.5.5 to ^2.6.0 in:
    • apps/playground-web/package.json
    • apps/portal/package.json
    • apps/wallet-ui/package.json
    • apps/dashboard/package.json
  • Adjusted dependency versions and structures in pnpm-lock.yaml, including:
    • Various dependencies now include @swc/[email protected].
    • Updated version specifications for several packages, ensuring compatibility and improvements.

✨ Ask PR-Codex anything about this PR by commenting with /codex {your question}

@dependabot
Bump tailwind-merge from 2.5.5 to 2.6.0
d9ca1df 
Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.5.5 to 2.6.0.
- [Release notes](https://github.com/dcastil/tailwind-merge/releases)
- [Commits](dcastil/tailwind-merge@v2.5.5...v2.6.0)

---
updated-dependencies:
- dependency-name: tailwind-merge
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot requested review from a team and jakubkrehel as code owners December 23, 2024 20:34
@dependabot dependabot bot added Dependencies Pull requests that update a dependency file javascript Pull requests that update Javascript code labels Dec 23, 2024
@changeset-bot
Copy link

changeset-bot bot commented Dec 23, 2024

⚠️ No Changeset found

Latest commit: d9ca1df

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@vercel
Copy link

vercel bot commented Dec 23, 2024 •
edited
Loading

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

Name Status Preview Comments Updated (UTC)
docs-v2 ✅ Ready (Inspect) Visit Preview 💬 Add feedback Dec 23, 2024 8:47pm
thirdweb_playground ✅ Ready (Inspect) Visit Preview 💬 Add feedback Dec 23, 2024 8:47pm
thirdweb-www ✅ Ready (Inspect) Visit Preview 💬 Add feedback Dec 23, 2024 8:47pm
wallet-ui ✅ Ready (Inspect) Visit Preview 💬 Add feedback Dec 23, 2024 8:47pm

@graphite-app
Copy link
Contributor

graphite-app bot commented Dec 23, 2024

How to use the Graphite Merge Queue

Add either label to this PR to merge it via the merge queue:

  • merge-queue - adds this PR to the back of the merge queue
  • hotfix - for urgent hot fixes, skip the queue and merge this PR next

You must have a Graphite account in order to use the merge queue. Sign up using this link.

An organization admin has enabled the Graphite Merge Queue in this repository.

Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue.

@github-actions github-actions bot added Dashboard Involves changes to the Dashboard. Playground Changes involving the Playground codebase. Portal Involves changes to the Portal (docs) codebase. Ecosystem Portal Involves changes to the Ecosystem Portal labels Dec 23, 2024
@socket-security
Copy link

socket-security bot commented Dec 23, 2024

New and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Package New capabilities Transitives Size Publisher
npm/[email protected] None 0 713 kB dcas

🚮 Removed packages: npm/[email protected]

View full report↗︎

@gregfromstl gregfromstl added the merge-queue Adds the pull request to Graphite's merge queue. label Dec 23, 2024
@gregfromstl Graphite App
Copy link
Contributor

gregfromstl commented Dec 23, 2024

Merge activity

  • Dec 23, 5:34 PM EST: The merge label 'merge-queue' was detected. This PR will be added to the Graphite merge queue once it meets the requirements.

@gregfromstl gregfromstl merged commit 2d84d48 into main Dec 23, 2024
29 of 30 checks passed
@gregfromstl gregfromstl deleted the dependabot/npm_and_yarn/tailwind-merge-2.6.0 branch December 23, 2024 22:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jakubkrehel jakubkrehel Awaiting requested review from jakubkrehel

1 more reviewer

@gregfromstl gregfromstl gregfromstl approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Dashboard Involves changes to the Dashboard. Dependencies Pull requests that update a dependency file Ecosystem Portal Involves changes to the Ecosystem Portal javascript Pull requests that update Javascript code merge-queue Adds the pull request to Graphite's merge queue. Playground Changes involving the Playground codebase. Portal Involves changes to the Portal (docs) codebase.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@gregfromstl