Skip to content

fix(deps): replace tailwind-merge aliases with peer dependency #1675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rishikesh183 wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −13
Open

fix(deps): replace tailwind-merge aliases with peer dependency #1675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions packages/ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,7 @@
"klona": "2.0.6",
"magic-string": "0.30.21",
"oxc-parser": "0.112.0",
"package-manager-detector": "1.6.0",
"tailwind-merge-v2": "npm:tailwind-merge@2.6.1",
"tailwind-merge-v3": "npm:tailwind-merge@3.4.0"
"package-manager-detector": "1.6.0"
},
"devDependencies": {
"@farmfe/core": "1.7.11",
Expand Down Expand Up @@ -313,6 +311,7 @@
"peerDependencies": {
"react": "^18 || ^19",
"react-dom": "^18 || ^19",
"tailwind-merge": "^2 || ^3",
"tailwindcss": "^3 || ^4"
},
"clean-package": {
Expand Down
16 changes: 6 additions & 10 deletions packages/ui/src/helpers/tailwind-merge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
import { extendTailwindMerge as extendTailwindMerge_v2 } from "tailwind-merge-v2";
import { extendTailwindMerge as extendTailwindMerge_v3, type ClassNameValue } from "tailwind-merge-v3";
import { getPrefix, getVersion } from "../store";
import { extendTailwindMerge, type ClassNameValue } from "tailwind-merge";
import { getPrefix } from "../store";

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

export function twMerge(...classLists: ClassNameValue[]): string {
const prefix = getPrefix();
const version = getVersion();

const cacheKey = `${prefix}.${version}`;
const cacheValue = cache.get(cacheKey);
const cacheValue = cache.get(prefix);

if (cacheValue) {
return cacheValue(...classLists);
}

const twMergeFn = (version === 3 ? extendTailwindMerge_v2 : extendTailwindMerge_v3)({
const twMergeFn = extendTailwindMerge({
extend: {
classGroups: {
"bg-image": ["bg-arrow-down-icon", "bg-check-icon", "bg-dash-icon", "bg-dot-icon"],
Expand All @@ -24,7 +20,7 @@ export function twMerge(...classLists: ClassNameValue[]): string {
},
prefix,
});
cache.set(cacheKey, twMergeFn);
cache.set(prefix, twMergeFn);

return twMergeFn(...classLists);
}
Loading