Update to tailwind-merge 2.4.0

barvian · Jul 7, 2024 · a192244 · a192244
1 parent 0b9542e
commit a192244
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 27 deletions.
diff --git a/packages/tailwind-merge/package.json b/packages/tailwind-merge/package.json
@@ -30,7 +30,7 @@
 		"prepublishOnly": "pnpm run build && pnpm run test"
 	},
 	"peerDependencies": {
-		"tailwind-merge": "^2.3.0"
+		"tailwind-merge": "~2.4.0"
 	},
 	"devDependencies": {
 		"bun": "^1.1.17",

diff --git a/packages/tailwind-merge/src/index.ts b/packages/tailwind-merge/src/index.ts
@@ -73,8 +73,15 @@ export function withFluid(config: Config<string, string>) {
 
 	return mergeConfigs(config, {
 		extend: {
-			classGroups,
-			ignoredVariants: [(variant) => variant.startsWith('~')]
+			classGroups
+		},
+		experimentalParseClassName({ className, parseClassName }) {
+			const parsed = parseClassName(className)
+
+			return {
+				...parsed,
+				modifiers: parsed.modifiers.filter((modifier) => !modifier.startsWith('~'))
+			}
 		}
 	})
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/site/pages/index.mdx b/site/pages/index.mdx
@@ -367,5 +367,3 @@ import { withFluid } from '@fluid-tailwind/tailwind-merge'
 export const twMerge = extendTailwindMerge(/* ... */, withFluid)
 ```
 
-{/* <Tip.Warn>tailwind-merge currently doesn't merge the fluid variants (i.e. `~sm/lg:`, `~@sm/lg:`) correctly.</Tip.Warn> */}
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -367,5 +367,3 @@ import { withFluid } from '@fluid-tailwind/tailwind-merge'
		export const twMerge = extendTailwindMerge(/* ... */, withFluid)
		```

		{/* <Tip.Warn>tailwind-merge currently doesn't merge the fluid variants (i.e. `~sm/lg:`, `~@sm/lg:`) correctly.</Tip.Warn> */}