diff --git a/docs/rules/classnames-order.md b/docs/rules/classnames-order.md index 5fb6f922..c8b2ec46 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 48f4632e..13db41f3 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 6b694fbe..a43d02a9 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 c84cb64e..cd3acb69 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 84f1e861..c69261eb 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 b96ad32d..7cc0c0b6 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 ef634322..4f869f25 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 953a3a13..529dfef4 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. diff --git a/lib/util/settings.js b/lib/util/settings.js index 6ac4cb68..59562e63 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':