From f86d222bda53ce66a9147bb7fd6f98af86b6bde3 Mon Sep 17 00:00:00 2001 From: Maxwell Barvian Date: Sun, 7 Jul 2024 13:48:24 -0700 Subject: [PATCH] Add tailwind-merge as devDep --- packages/tailwind-merge/README.md | 20 ++++++++++++++++++++ packages/tailwind-merge/package.json | 1 + site/pages/index.mdx | 5 ++--- 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 packages/tailwind-merge/README.md diff --git a/packages/tailwind-merge/README.md b/packages/tailwind-merge/README.md new file mode 100644 index 0000000..4d78b3a --- /dev/null +++ b/packages/tailwind-merge/README.md @@ -0,0 +1,20 @@ +# @fluid-tailwind/tailwind-merge + +The official tailwind-merge plugin for `fluid-tailwind`. + +## Installation + +Install the plugin: + +```sh +npm install --save @fluid-tailwind/tailwind-merge +``` + +Then include it after any other [tailwind-merge plugins](https://github.com/dcastil/tailwind-merge/blob/v2.3.0/docs/configuration.md#using-tailwind-merge-plugins): + +```js +import { extendTailwindMerge } from 'tailwind-merge' +import { withFluid } from '@fluid-tailwind/tailwind-merge' + +export const twMerge = extendTailwindMerge(/* ... */, withFluid) +``` diff --git a/packages/tailwind-merge/package.json b/packages/tailwind-merge/package.json index 779a96b..ee6b9ee 100644 --- a/packages/tailwind-merge/package.json +++ b/packages/tailwind-merge/package.json @@ -33,6 +33,7 @@ "tailwind-merge": "~2.4.0" }, "devDependencies": { + "tailwind-merge": "~2.4.0", "bun": "^1.1.17", "@types/bun": "^1.1.3", "tsup": "^8.1.0", diff --git a/site/pages/index.mdx b/site/pages/index.mdx index 33e6342..78cfb48 100644 --- a/site/pages/index.mdx +++ b/site/pages/index.mdx @@ -358,12 +358,11 @@ you'll need to pass them in to the extractor as well: npm install --save @fluid-tailwind/tailwind-merge ``` -For best results, include it after any other tailwind-merge plugins: +For best results, include it after any other [tailwind-merge plugins](https://github.com/dcastil/tailwind-merge/blob/v2.3.0/docs/configuration.md#using-tailwind-merge-plugins): -```js +```js mark=", withFluid" import { extendTailwindMerge } from 'tailwind-merge' import { withFluid } from '@fluid-tailwind/tailwind-merge' export const twMerge = extendTailwindMerge(/* ... */, withFluid) ``` -