feat: Enable tailwind-merge in cn utility by default #597

kingston · 2025-07-09T20:52:45Z

Summary by CodeRabbit

Here are the updated release notes based on the provided summary:

New Features
- Improved class name merging for Tailwind CSS components, resulting in better conflict resolution and more consistent styling.
Bug Fixes
- Simplified input component styling by removing unnecessary right padding options.
Chores
- Added new dependencies to support enhanced class name merging functionality.
- Reorganized and reformatted configuration files for improved readability and consistency.
- Added a new template to the authentication hooks configuration.

coderabbitai · 2025-07-09T20:52:53Z

Walkthrough

This update integrates the tailwind-merge library into the cn utility function in both the @baseplate-dev/react-generators and @baseplate-dev/ui-components packages, improving Tailwind CSS class merging. It also removes the rightPadding variant from input styles, updates dependencies, and reorganizes several JSON extractor files for consistency. Additionally, template deletion logic was simplified by directly checking template keys.

Changes

Files/Groups	Change Summary
`packages/react-generators/src/generators/core/react-components/templates/src/utils/cn.ts` `packages/ui-components/src/utils/cn.ts`	Updated `cn` utility to use `twMerge(clsx(...))` for improved Tailwind class merging.
`packages/react-generators/src/generators/core/react-components/templates/src/styles/input.ts` `packages/ui-components/src/styles/input.ts`	Removed `rightPadding` variant and its default from `inputVariants`.
`packages/react-generators/src/generators/core/react-components/templates/src/components/combobox/combobox.tsx` `packages/ui-components/src/components/combobox/combobox.tsx`	Updated usage of `inputVariants` in `ComboboxInput` to remove `rightPadding` override.
`packages/react-generators/src/constants/react-packages.ts` `packages/ui-components/package.json`	Added `tailwind-merge` as a dependency with version `3.3.1`.
`packages/react-generators/src/generators/core/react-tailwind/react-tailwind.generator.ts`	Added `tailwind-merge` as a production dependency in generator tasks.
`.changeset/eng-779-enable-tailwind-merge.md`	Added changeset documenting the integration of `tailwind-merge` and related changes.
`packages/fastify-generators/src/generators/auth/password-hasher-service/extractor.json` `packages/react-generators/src/generators/core/react-utils/extractor.json` `plugins/plugin-auth/src/auth/core/generators/auth-email-password/extractor.json` `plugins/plugin-auth/src/auth/core/generators/auth-hooks/extractor.json` `plugins/plugin-auth/src/auth/core/generators/auth-module/extractor.json` `plugins/plugin-auth/src/auth/core/generators/auth-routes/extractor.json` `plugins/plugin-auth/src/auth/core/generators/react-session/extractor.json`	Reformatted and reordered JSON properties for consistency; some new templates added (e.g., `use-required-user-id`).
`packages/project-builder-server/src/template-extractor/delete-template.ts`	Simplified logic for deleting templates by directly checking template name keys in JSON.

Sequence Diagram(s)

sequenceDiagram
  participant Component
  participant cnUtility
  participant clsx
  participant twMerge

  Component->>cnUtility: cn(...classNames)
  cnUtility->>clsx: clsx(...classNames)
  clsx-->>cnUtility: concatenatedClassString
  cnUtility->>twMerge: twMerge(concatenatedClassString)
  twMerge-->>cnUtility: mergedTailwindClassString
  cnUtility-->>Component: mergedTailwindClassString

Possibly related PRs

fix: Improve UI for Auth0 role editor view #554: Related to UI and user experience improvements in the Auth0 plugin, focusing on role editor functionality and component styling, which aligns with the class name merging and styling changes in this PR.

📜 Recent review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between d4bdf10 and 130abd3.

📒 Files selected for processing (1)

packages/project-builder-server/src/template-extractor/delete-template.ts (1 hunks)

🚧 Files skipped from review as they are similar to previous changes (1)

packages/project-builder-server/src/template-extractor/delete-template.ts

⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (2)

GitHub Check: Test E2E
GitHub Check: Lint

✨ Finishing Touches

📝 Generate Docstrings

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Explain this complex logic.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai explain this code block.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and explain its main purpose.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate docstrings to generate docstrings for this PR.
@coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

socket-security · 2025-07-09T20:53:25Z

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance	License
	tailwind-merge@3.3.1

View full report

vercel · 2025-07-09T20:53:46Z

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

Name	Status	Preview	Comments	Updated (UTC)
baseplate-project-builder-web	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jul 9, 2025 9:11pm

coderabbitai

Actionable comments posted: 1

🔭 Outside diff range comments (1)

plugins/plugin-auth/src/auth/core/generators/auth-module/extractor.json (1)
36-51: Update import-provider specifier to use .js extension
The resolveModuleSpecifier function does not rewrite file extensions, so a .ts suffix will be preserved in the generated imports and break under Node 16 ESM. Please update the packagePathSpecifier here to point at the compiled .js file.

• File: plugins/plugin-auth/src/auth/core/generators/auth-module/extractor.json
Lines: 36
Change:
- "packagePathSpecifier": "@baseplate-dev/fastify-generators:src/generators/pothos/pothos/generated/ts-import-providers.ts"
+ "packagePathSpecifier": "@baseplate-dev/fastify-generators:src/generators/pothos/pothos/generated/ts-import-providers.js"

🧹 Nitpick comments (4)

packages/react-generators/src/generators/core/react-utils/extractor.json (1)
8-8: Drop redundant importMapProviders stanza

The extractor can already infer providers for this template (see long-term learning #521). Keeping the empty object just adds noise and churn across PRs.
-      "importMapProviders": {},
packages/fastify-generators/src/generators/auth/password-hasher-service/extractor.json (1)
8-8: Redundant importMapProviders entry

As with the React extractor, the empty object is unnecessary and may be removed to keep these files minimal.
-      "importMapProviders": {},
packages/react-generators/src/generators/core/react-components/templates/src/utils/cn.ts (1)
1-1: Consider removing the @ts-nocheck directive.

The @ts-nocheck comment disables TypeScript checking for this file. Since this is a template file that will be used in generated projects, it's better to ensure type safety. Consider removing this directive and addressing any TypeScript issues instead.
-// @ts-nocheck
-
plugins/plugin-auth/src/auth/core/generators/auth-module/extractor.json (1)
92-125: Add an explicit group for user-session-service for consistency

Every other template is grouped (utils, module, constants, etc.). Omitting group here may cause uneven barrel exports or filtering.
@@
   "user-session-service": {
     "type": "ts",
     "fileOptions": { "kind": "singleton" },
     "generator": "@baseplate-dev/plugin-auth#auth/core/auth-module",
+    "group": "services",

📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 059edf7 and d4bdf10.

⛔ Files ignored due to path filters (7)

packages/react-generators/src/generators/core/react/generated/template-paths.ts is excluded by !**/generated/**, !**/generated/**
packages/react-generators/src/generators/core/react/generated/typed-templates.ts is excluded by !**/generated/**, !**/generated/**
plugins/plugin-auth/src/auth/core/generators/auth-hooks/generated/template-paths.ts is excluded by !**/generated/**, !**/generated/**
plugins/plugin-auth/src/auth/core/generators/auth-module/generated/template-paths.ts is excluded by !**/generated/**, !**/generated/**
plugins/plugin-auth/src/auth/core/generators/auth-module/generated/typed-templates.ts is excluded by !**/generated/**, !**/generated/**
plugins/plugin-auth/src/auth/core/generators/react-session/generated/template-paths.ts is excluded by !**/generated/**, !**/generated/**
pnpm-lock.yaml is excluded by !**/pnpm-lock.yaml

📒 Files selected for processing (18)

.changeset/eng-779-enable-tailwind-merge.md (1 hunks)
packages/fastify-generators/src/generators/auth/password-hasher-service/extractor.json (1 hunks)
packages/project-builder-server/src/template-extractor/delete-template.ts (1 hunks)
packages/react-generators/src/constants/react-packages.ts (1 hunks)
packages/react-generators/src/generators/core/react-components/templates/src/components/combobox/combobox.tsx (1 hunks)
packages/react-generators/src/generators/core/react-components/templates/src/styles/input.ts (0 hunks)
packages/react-generators/src/generators/core/react-components/templates/src/utils/cn.ts (1 hunks)
packages/react-generators/src/generators/core/react-tailwind/react-tailwind.generator.ts (1 hunks)
packages/react-generators/src/generators/core/react-utils/extractor.json (1 hunks)
packages/ui-components/package.json (1 hunks)
packages/ui-components/src/components/combobox/combobox.tsx (1 hunks)
packages/ui-components/src/styles/input.ts (0 hunks)
packages/ui-components/src/utils/cn.ts (1 hunks)
plugins/plugin-auth/src/auth/core/generators/auth-email-password/extractor.json (3 hunks)
plugins/plugin-auth/src/auth/core/generators/auth-hooks/extractor.json (4 hunks)
plugins/plugin-auth/src/auth/core/generators/auth-module/extractor.json (5 hunks)
plugins/plugin-auth/src/auth/core/generators/auth-routes/extractor.json (3 hunks)
plugins/plugin-auth/src/auth/core/generators/react-session/extractor.json (3 hunks)

💤 Files with no reviewable changes (2)

packages/react-generators/src/generators/core/react-components/templates/src/styles/input.ts
packages/ui-components/src/styles/input.ts

🧰 Additional context used

📓 Path-based instructions (5)

`**/*`: Use kebab-case for file names

**/*: Use kebab-case for file names

📄 Source: CodeRabbit Inference Engine (CLAUDE.md)