Skip to content

refactor(theme)!: rename the ui.tv merge keys and drop deprecated gradient utilities - #7007

Merged
benjamincanac merged 1 commit into
v5from
fix/merge-config-rename
Sep 22, 2026
Merged

benjamincanac merged 1 commit into
v5from
fix/merge-config-rename

Conversation

@benjamincanac

Copy link
Copy Markdown
Member

🔗 Linked issue

Part of #6918, Epic H of #6610. Split out of #7006 so it lands whichever way that one goes.

❓ Type of change

  • 📖 Documentation (updates to the documentation or readme)
  • 🐞 Bug fix (a non-breaking change that fixes an issue)
  • 👌 Enhancement (improving an existing functionality)
  • ✨ New feature (a non-breaking change that adds functionality)
  • 🧹 Chore (updates to the build process or auxiliary tools and libraries)
  • ⚠️ Breaking change (fix or feature that would cause existing functionality to change)

📚 Description

Two cleanups that came out of measuring the cn swap and do not depend on it.

app.config.ui.tv drops the tw prefix. twMerge becomes merge and twMergeConfig becomes mergeConfig. The keys were named after tailwind-merge, which is an implementation detail of the engine rather than something you pick, and naming them after it means the public surface moves whenever the merger does. Same shape, same capability, TWMergeConfig unchanged since it is still that library's config type.

The themes move off bg-gradient-to-*. Tailwind deprecated it in favour of bg-linear-* in v4. Same CSS, so this is the 20 snapshot lines and nothing else. marquee.ts and page-aside.ts were the only files using it, and the rest of the deprecated v4 aliases (flex-shrink-*, flex-grow-*, overflow-ellipsis) appear nowhere in source.

It also removes the one case where tailwind-merge gets our own classes wrong: it reads bg-gradient-to-b as a background color, so a later bg-<color> on the same slot dropped the gradient. bg-linear-* is classified correctly. That was the only family left in a 200,000-chain differential over the generated themes.

📝 Checklist

  • I have linked an issue or discussion.
  • I have updated the documentation accordingly.

@benjamincanac benjamincanac added the v5 #6918 label Sep 22, 2026
@coderabbitai

coderabbitai Bot commented Sep 22, 2026

Copy link
Copy Markdown
Contributor

Review in Change Stack →

Navigate logical layers of code changes, visualize relationships, and explore their blast radius.

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Advanced

Run ID: 799ddaa0-3bf4-4fa9-b7ab-fcd6638bbba4

📥 Commits

Reviewing files that changed from the base of the PR and between da11742 and 29eea00.

⛔ Files ignored due to path filters (6)
  • test/components/__snapshots__/Marquee-vue.spec.ts.snap is excluded by !**/*.snap
  • test/components/__snapshots__/Marquee.spec.ts.snap is excluded by !**/*.snap
  • test/components/__snapshots__/PageAside-vue.spec.ts.snap is excluded by !**/*.snap
  • test/components/__snapshots__/PageAside.spec.ts.snap is excluded by !**/*.snap
  • test/components/__snapshots__/PageLogos-vue.spec.ts.snap is excluded by !**/*.snap
  • test/components/__snapshots__/PageLogos.spec.ts.snap is excluded by !**/*.snap
📒 Files selected for processing (6)
  • docs/content/docs/1.getting-started/3.migration.md
  • src/runtime/types/tv.ts
  • src/runtime/utils/tv.ts
  • src/theme/marquee.ts
  • src/theme/page-aside.ts
  • src/utils/defaults.ts

Included review availability: Your plan provides up to 8 included reviews per hour; 7 remain after this review.


📝 Walkthrough

Walkthrough

The TV configuration keys changed from twMerge and twMergeConfig to merge and mergeConfig. Default configuration and merger logic use the new keys. Marquee and PageAside themes now use bg-linear-* utilities instead of bg-gradient-to-*. The migration guide documents both changes.

Priority: ➖ Normal

Estimated code review effort: 2 (Simple) | ~10 minutes

Merge Risk: ⚪ Minimal · up to 29eea

The public configuration rename and Tailwind utility updates are documented and consistently wired through the implementation, with no remaining merge-blocking risk identified.

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 33.33% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 3 functions across 5 files. (1 skipped: 1… Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly summarizes both primary changes: renaming the UI merge keys and replacing deprecated gradient utilities.
Description check ✅ Passed The description directly explains the breaking configuration rename, theme utility updates, rationale, linked issue, and documentation changes.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Full details: Docstring Coverage

Explanation

Docstring coverage is 33.33% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 3 functions across 5 files. (1 skipped: 1 unsupported.)

  • Fix all pre-merge checks with AI
✨ Finishing Touches 💡 1
📝 Generate docstrings 💡
  • Commit to this branch
  • Create a new PR
🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@codspeed

codspeed Bot commented Sep 22, 2026

Copy link
Copy Markdown

Merging this PR will not alter performance

✅ 35 untouched benchmarks
⏩ 10 skipped benchmarks1


Comparing fix/merge-config-rename (29eea00) with v5 (da11742)

Open in CodSpeed

Footnotes

  1. 10 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports.

@pkg-pr-new

pkg-pr-new Bot commented Sep 22, 2026

Copy link
Copy Markdown
npm i https://pkg.pr.new/@nuxt/ui@7007

commit: 29eea00

@benjamincanac
benjamincanac merged commit cc23d3f into v5 Sep 22, 2026
12 checks passed
@benjamincanac
benjamincanac deleted the fix/merge-config-rename branch September 22, 2026 16:46

This branch was successfully deployed

1 active deployment
Preview – ui 29eea006 Deployed Sep 22, 2026 by vercel[bot]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

v5 #6918

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant