Skip to content

Commit c11478c

Browse files
committed
undo tailwind-merge custom alias
1 parent 3e79fc8 commit c11478c

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

bun.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/ui/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,8 @@
275275
"magic-string": "0.30.21",
276276
"oxc-parser": "0.112.0",
277277
"package-manager-detector": "1.6.0",
278-
"tailwind-merge@2": "npm:tailwind-merge@2.6.1",
279-
"tailwind-merge@3": "npm:tailwind-merge@3.4.0"
278+
"tailwind-merge-v2": "npm:tailwind-merge@2.6.1",
279+
"tailwind-merge-v3": "npm:tailwind-merge@3.4.0"
280280
},
281281
"devDependencies": {
282282
"@farmfe/core": "1.7.11",

packages/ui/src/helpers/tailwind-merge.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { extendTailwindMerge as extendTailwindMerge_v2 } from "tailwind-merge@2";
2-
import { extendTailwindMerge as extendTailwindMerge_v3, type ClassNameValue } from "tailwind-merge@3";
1+
import { extendTailwindMerge as extendTailwindMerge_v2 } from "tailwind-merge-v2";
2+
import { extendTailwindMerge as extendTailwindMerge_v3, type ClassNameValue } from "tailwind-merge-v3";
33
import { getPrefix, getVersion } from "../store";
44

55
const cache = new Map<string | undefined, ReturnType<typeof extendTailwindMerge_v3>>();

0 commit comments

Comments
 (0)