From c78b49333ffc47942e1b56c6f18581c47408205b Mon Sep 17 00:00:00 2001 From: Dani Akash Date: Sun, 14 Sep 2025 22:36:47 +0530 Subject: [PATCH 1/2] feat: add twMerge to default callees --- lib/util/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/util/settings.js b/lib/util/settings.js index 6ac4cb6..59562e6 100644 --- a/lib/util/settings.js +++ b/lib/util/settings.js @@ -24,7 +24,7 @@ function getOption(context, name) { // Fallback to defaults switch (name) { case 'callees': - return ['classnames', 'clsx', 'ctl', 'cva', 'tv']; + return ['classnames', 'clsx', 'ctl', 'cva', 'tv', 'twMerge']; case 'ignoredKeys': return ['compoundVariants', 'defaultVariants']; case 'classRegex': From 2e00d488a846758979dc53a49031733d3e5207c1 Mon Sep 17 00:00:00 2001 From: Dani Akash Date: Sun, 14 Sep 2025 22:42:52 +0530 Subject: [PATCH 2/2] docs: updated default values for callees in docs --- docs/rules/classnames-order.md | 2 +- docs/rules/enforces-negative-arbitrary-values.md | 2 +- docs/rules/enforces-shorthand.md | 2 +- docs/rules/migration-from-tailwind-2.md | 2 +- docs/rules/no-arbitrary-value.md | 2 +- docs/rules/no-contradicting-classname.md | 2 +- docs/rules/no-custom-classname.md | 2 +- docs/rules/no-unnecessary-arbitrary-value.md | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/rules/classnames-order.md b/docs/rules/classnames-order.md index 5fb6f92..c8b2ec4 100644 --- a/docs/rules/classnames-order.md +++ b/docs/rules/classnames-order.md @@ -32,7 +32,7 @@ Examples of **correct** code for this rule: ... ``` -### `callees` (default: `["classnames", "clsx", "ctl", "cva", "tv"]`) +### `callees` (default: `["classnames", "clsx", "ctl", "cva", "tv", "twmerge"]`) If you use some utility library like [@netlify/classnames-template-literals](https://github.com/netlify/classnames-template-literals), you can add its name to the list to make sure it gets parsed by this rule. diff --git a/docs/rules/enforces-negative-arbitrary-values.md b/docs/rules/enforces-negative-arbitrary-values.md index 48f4632..13db41f 100644 --- a/docs/rules/enforces-negative-arbitrary-values.md +++ b/docs/rules/enforces-negative-arbitrary-values.md @@ -50,7 +50,7 @@ Examples of **correct** code for this rule: ... ``` -### `callees` (default: `["classnames", "clsx", "ctl", "cva", "tv"]`) +### `callees` (default: `["classnames", "clsx", "ctl", "cva", "tv", "twmerge"]`) If you use some utility library like [@netlify/classnames-template-literals](https://github.com/netlify/classnames-template-literals), you can add its name to the list to make sure it gets parsed by this rule. diff --git a/docs/rules/enforces-shorthand.md b/docs/rules/enforces-shorthand.md index 6b694fb..a43d02a 100644 --- a/docs/rules/enforces-shorthand.md +++ b/docs/rules/enforces-shorthand.md @@ -42,7 +42,7 @@ If indeed, you are using the `classnames-order` rule, then it'll be automaticall ... ``` -### `callees` (default: `["classnames", "clsx", "ctl", "cva", "tv"]`) +### `callees` (default: `["classnames", "clsx", "ctl", "cva", "tv", "twmerge"]`) If you use some utility library like [@netlify/classnames-template-literals](https://github.com/netlify/classnames-template-literals), you can add its name to the list to make sure it gets parsed by this rule. diff --git a/docs/rules/migration-from-tailwind-2.md b/docs/rules/migration-from-tailwind-2.md index c84cb64..cd3acb6 100644 --- a/docs/rules/migration-from-tailwind-2.md +++ b/docs/rules/migration-from-tailwind-2.md @@ -87,7 +87,7 @@ This rule will report the issue but **it will not fix it for you**... ... ``` -### `callees` (default: `["classnames", "clsx", "ctl", "cva", "tv"]`) +### `callees` (default: `["classnames", "clsx", "ctl", "cva", "tv", "twmerge"]`) If you use some utility library like [@netlify/classnames-template-literals](https://github.com/netlify/classnames-template-literals), you can add its name to the list to make sure it gets parsed by this rule. diff --git a/docs/rules/no-arbitrary-value.md b/docs/rules/no-arbitrary-value.md index 84f1e86..c69261e 100644 --- a/docs/rules/no-arbitrary-value.md +++ b/docs/rules/no-arbitrary-value.md @@ -32,7 +32,7 @@ Examples of **correct** code for this rule: ... ``` -### `callees` (default: `["classnames", "clsx", "ctl", "cva", "tv"]`) +### `callees` (default: `["classnames", "clsx", "ctl", "cva", "tv", "twmerge"]`) If you use some utility library like [@netlify/classnames-template-literals](https://github.com/netlify/classnames-template-literals), you can add its name to the list to make sure it gets parsed by this rule. diff --git a/docs/rules/no-contradicting-classname.md b/docs/rules/no-contradicting-classname.md index b96ad32..7cc0c0b 100644 --- a/docs/rules/no-contradicting-classname.md +++ b/docs/rules/no-contradicting-classname.md @@ -32,7 +32,7 @@ Examples of **correct** code for this rule: ... ``` -### `callees` (default: `["classnames", "clsx", "ctl", "cva", "tv"]`) +### `callees` (default: `["classnames", "clsx", "ctl", "cva", "tv", "twmerge"]`) If you use some utility library like [@netlify/classnames-template-literals](https://github.com/netlify/classnames-template-literals), you can add its name to the list to make sure it gets parsed by this rule. diff --git a/docs/rules/no-custom-classname.md b/docs/rules/no-custom-classname.md index ef63432..4f869f2 100644 --- a/docs/rules/no-custom-classname.md +++ b/docs/rules/no-custom-classname.md @@ -34,7 +34,7 @@ Examples of **correct** code for this rule: ... ``` -### `callees` (default: `["classnames", "clsx", "ctl", "cva", "tv"]`) +### `callees` (default: `["classnames", "clsx", "ctl", "cva", "tv", "twmerge"]`) If you use some utility library like [@netlify/classnames-template-literals](https://github.com/netlify/classnames-template-literals), you can add its name to the list to make sure it gets parsed by this rule. diff --git a/docs/rules/no-unnecessary-arbitrary-value.md b/docs/rules/no-unnecessary-arbitrary-value.md index 953a3a1..529dfef 100644 --- a/docs/rules/no-unnecessary-arbitrary-value.md +++ b/docs/rules/no-unnecessary-arbitrary-value.md @@ -63,7 +63,7 @@ Examples of **correct** code for negative arbitrary values: ... ``` -### `callees` (default: `["classnames", "clsx", "ctl", "cva", "tv"]`) +### `callees` (default: `["classnames", "clsx", "ctl", "cva", "tv", "twmerge"]`) If you use some utility library like [@netlify/classnames-template-literals](https://github.com/netlify/classnames-template-literals), you can add its name to the list to make sure it gets parsed by this rule.