From 2968359f466e98ebba1ea1cd0bb726e5bf632242 Mon Sep 17 00:00:00 2001 From: winches <329487092@qq.com> Date: Mon, 10 Mar 2025 23:13:44 +0800 Subject: [PATCH 1/4] Revert "fix: revert to use previous version (#5012)" This reverts commit 1d01df254d6df9bc524d29d767236823b33a96fd. --- apps/docs/package.json | 2 +- packages/core/system-rsc/package.json | 2 +- packages/core/theme/package.json | 4 ++-- pnpm-lock.yaml | 30 +++++++++++++-------------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/apps/docs/package.json b/apps/docs/package.json index 6be25d060f..69e5a1f7af 100644 --- a/apps/docs/package.json +++ b/apps/docs/package.json @@ -100,7 +100,7 @@ "sharp": "^0.32.1", "shelljs": "^0.8.4", "swr": "2.2.5", - "tailwind-variants": "0.3.1", + "tailwind-variants": "1.0.0", "unified": "^11.0.5", "unist-util-visit": "5.0.0", "usehooks-ts": "3.1.0", diff --git a/packages/core/system-rsc/package.json b/packages/core/system-rsc/package.json index 01e0f3341a..a83b20856a 100644 --- a/packages/core/system-rsc/package.json +++ b/packages/core/system-rsc/package.json @@ -42,7 +42,7 @@ "@heroui/react-utils": "workspace:*", "@heroui/shared-utils": "workspace:*", "react": "18.3.0", - "tailwind-variants": "0.3.1", + "tailwind-variants": "1.0.0", "clean-package": "2.2.0" }, "dependencies": { diff --git a/packages/core/theme/package.json b/packages/core/theme/package.json index e9dc5c4858..7a6f4ce4a4 100644 --- a/packages/core/theme/package.json +++ b/packages/core/theme/package.json @@ -51,8 +51,8 @@ "deepmerge": "4.3.1", "flat": "^5.0.2", "clsx": "^1.2.1", - "tailwind-variants": "0.3.1", - "tailwind-merge": "2.5.4", + "tailwind-variants": "1.0.0", + "tailwind-merge": "3.0.2", "@heroui/shared-utils": "workspace:*" }, "peerDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e76a16194c..667ddd26fa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -518,8 +518,8 @@ importers: specifier: 2.2.5 version: 2.2.5(react@18.3.0) tailwind-variants: - specifier: 0.3.1 - version: 0.3.1(tailwindcss@4.0.6) + specifier: 1.0.0 + version: 1.0.0(tailwindcss@4.0.6) unified: specifier: ^11.0.5 version: 11.0.5 @@ -3514,8 +3514,8 @@ importers: specifier: 18.3.0 version: 18.3.0 tailwind-variants: - specifier: 0.3.1 - version: 0.3.1(tailwindcss@4.0.6) + specifier: 1.0.0 + version: 1.0.0(tailwindcss@4.0.6) packages/core/theme: dependencies: @@ -3538,11 +3538,11 @@ importers: specifier: ^5.0.2 version: 5.0.2 tailwind-merge: - specifier: 2.5.4 - version: 2.5.4 + specifier: 3.0.2 + version: 3.0.2 tailwind-variants: - specifier: 0.3.1 - version: 0.3.1(tailwindcss@4.0.6) + specifier: 1.0.0 + version: 1.0.0(tailwindcss@4.0.6) devDependencies: '@types/color': specifier: ^4.2.0 @@ -14719,11 +14719,11 @@ packages: resolution: {integrity: sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==} engines: {node: '>=10.0.0'} - tailwind-merge@2.5.4: - resolution: {integrity: sha512-0q8cfZHMu9nuYP/b5Shb7Y7Sh1B7Nnl5GqNr1U+n2p6+mybvRtayrQ+0042Z5byvTA8ihjlP8Odo8/VnHbZu4Q==} + tailwind-merge@3.0.2: + resolution: {integrity: sha512-l7z+OYZ7mu3DTqrL88RiKrKIqO3NcpEO8V/Od04bNpvk0kiIFndGEoqfuzvj4yuhRkHKjRkII2z+KS2HfPcSxw==} - tailwind-variants@0.3.1: - resolution: {integrity: sha512-krn67M3FpPwElg4FsZrOQd0U26o7UDH/QOkK8RNaiCCrr052f6YJPBUfNKnPo/s/xRzNPtv1Mldlxsg8Tb46BQ==} + tailwind-variants@1.0.0: + resolution: {integrity: sha512-2WSbv4ulEEyuBKomOunut65D8UZwxrHoRfYnxGcQNnHqlSCp2+B7Yz2W+yrNDrxRodOXtGD/1oCcKGNBnUqMqA==} engines: {node: '>=16.x', pnpm: '>=7.x'} peerDependencies: tailwindcss: '*' @@ -28985,11 +28985,11 @@ snapshots: string-width: 4.2.3 strip-ansi: 6.0.1 - tailwind-merge@2.5.4: {} + tailwind-merge@3.0.2: {} - tailwind-variants@0.3.1(tailwindcss@4.0.6): + tailwind-variants@1.0.0(tailwindcss@4.0.6): dependencies: - tailwind-merge: 2.5.4 + tailwind-merge: 3.0.2 tailwindcss: 4.0.6 tailwindcss@4.0.0: {} From b69e2556c1c44088ea326389e4adb4cffb5df5a8 Mon Sep 17 00:00:00 2001 From: winches <329487092@qq.com> Date: Mon, 10 Mar 2025 23:14:06 +0800 Subject: [PATCH 2/4] fix: adapt tailwind merge config --- .vscode/settings.json | 1 - .../core/theme/src/utils/tw-merge-config.ts | 36 ++++++++++--------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index fe28926d9f..6ff0738e09 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,7 +7,6 @@ "tailwindCSS.experimental.configFile": { "apps/docs/styles/globals.css": "apps/docs/**/*", "packages/storybook/.storybook/style.css": ["packages/core/theme/**/*", "packages/components/**/*"], - }, "tailwindCSS.experimental.classRegex": [ ["([\"'`][^\"'`]*.*?[\"'`])", "[\"'`]([^\"'`]*).*?[\"'`]"] diff --git a/packages/core/theme/src/utils/tw-merge-config.ts b/packages/core/theme/src/utils/tw-merge-config.ts index fcde3b2466..8ab7a75c75 100644 --- a/packages/core/theme/src/utils/tw-merge-config.ts +++ b/packages/core/theme/src/utils/tw-merge-config.ts @@ -1,22 +1,24 @@ export const COMMON_UNITS = ["small", "medium", "large"]; export const twMergeConfig = { - theme: { - opacity: ["disabled"], - spacing: ["divider"], - borderWidth: COMMON_UNITS, - borderRadius: COMMON_UNITS, - }, - classGroups: { - shadow: [{shadow: COMMON_UNITS}], - "font-size": [{text: ["tiny", ...COMMON_UNITS]}], - "bg-image": [ - "bg-stripe-gradient-default", - "bg-stripe-gradient-primary", - "bg-stripe-gradient-secondary", - "bg-stripe-gradient-success", - "bg-stripe-gradient-warning", - "bg-stripe-gradient-danger", - ], + extend: { + theme: { + spacing: ["divider"], + radius: COMMON_UNITS, + }, + classGroups: { + shadow: [{shadow: COMMON_UNITS}], + opacity: [{opacity: ["disabled"]}], + "font-size": [{text: ["tiny", ...COMMON_UNITS]}], + "border-w": [{border: COMMON_UNITS}], + "bg-image": [ + "bg-stripe-gradient-default", + "bg-stripe-gradient-primary", + "bg-stripe-gradient-secondary", + "bg-stripe-gradient-success", + "bg-stripe-gradient-warning", + "bg-stripe-gradient-danger", + ], + }, }, }; From e5ddff7dc5cc064b4c7b4a50750392351a31b104 Mon Sep 17 00:00:00 2001 From: winches <329487092@qq.com> Date: Mon, 10 Mar 2025 23:16:13 +0800 Subject: [PATCH 3/4] fix: adapt tailwind merge config --- .changeset/brave-wombats-smash.md | 89 +++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 .changeset/brave-wombats-smash.md diff --git a/.changeset/brave-wombats-smash.md b/.changeset/brave-wombats-smash.md new file mode 100644 index 0000000000..5ff533af91 --- /dev/null +++ b/.changeset/brave-wombats-smash.md @@ -0,0 +1,89 @@ +--- +"@heroui/use-intersection-observer": patch +"@heroui/use-data-scroll-overflow": patch +"@heroui/use-aria-accordion-item": patch +"@heroui/use-aria-modal-overlay": patch +"@heroui/use-safe-layout-effect": patch +"@heroui/use-aria-multiselect": patch +"@heroui/use-infinite-scroll": patch +"@heroui/use-scroll-position": patch +"@heroui/react-rsc-utils": patch +"@heroui/scroll-shadow": patch +"@heroui/use-aria-accordion": patch +"@heroui/autocomplete": patch +"@heroui/number-input": patch +"@heroui/use-update-effect": patch +"@heroui/dom-animation": patch +"@heroui/stories-utils": patch +"@heroui/breadcrumbs": patch +"@heroui/date-picker": patch +"@heroui/use-callback-ref": patch +"@heroui/framer-utils": patch +"@heroui/shared-icons": patch +"@heroui/shared-utils": patch +"@heroui/date-input": patch +"@heroui/pagination": patch +"@heroui/use-aria-button": patch +"@heroui/react-utils": patch +"@heroui/accordion": patch +"@heroui/input-otp": patch +"@heroui/use-disclosure": patch +"@heroui/use-is-mounted": patch +"@heroui/use-pagination": patch +"@heroui/use-real-shape": patch +"@heroui/aria-utils": patch +"@heroui/test-utils": patch +"@heroui/calendar": patch +"@heroui/checkbox": patch +"@heroui/dropdown": patch +"@heroui/progress": patch +"@heroui/skeleton": patch +"@heroui/use-aria-link": patch +"@heroui/use-clipboard": patch +"@heroui/use-draggable": patch +"@heroui/use-is-mobile": patch +"@heroui/use-ref-state": patch +"@heroui/divider": patch +"@heroui/listbox": patch +"@heroui/popover": patch +"@heroui/snippet": patch +"@heroui/spinner": patch +"@heroui/tooltip": patch +"@heroui/avatar": patch +"@heroui/button": patch +"@heroui/drawer": patch +"@heroui/navbar": patch +"@heroui/ripple": patch +"@heroui/select": patch +"@heroui/slider": patch +"@heroui/spacer": patch +"@heroui/switch": patch +"@heroui/use-measure": patch +"@heroui/alert": patch +"@heroui/badge": patch +"@heroui/image": patch +"@heroui/input": patch +"@heroui/modal": patch +"@heroui/radio": patch +"@heroui/table": patch +"@heroui/toast": patch +"@heroui/use-resize": patch +"@heroui/card": patch +"@heroui/chip": patch +"@heroui/code": patch +"@heroui/form": patch +"@heroui/link": patch +"@heroui/menu": patch +"@heroui/tabs": patch +"@heroui/user": patch +"@heroui/system-rsc": patch +"@heroui/use-image": patch +"@heroui/use-theme": patch +"@heroui/kbd": patch +"@heroui/use-ssr": patch +"@heroui/system": patch +"@heroui/react": patch +"@heroui/theme": patch +--- + +Fix tailwind merge config From fb69ebc869db8a50ef67659147be37c8ebc86c5f Mon Sep 17 00:00:00 2001 From: winches <329487092@qq.com> Date: Mon, 10 Mar 2025 23:19:11 +0800 Subject: [PATCH 4/4] fix: adapt tailwind merge config --- .../core/theme/src/utils/tw-merge-config.ts | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/packages/core/theme/src/utils/tw-merge-config.ts b/packages/core/theme/src/utils/tw-merge-config.ts index 8ab7a75c75..b4768ea396 100644 --- a/packages/core/theme/src/utils/tw-merge-config.ts +++ b/packages/core/theme/src/utils/tw-merge-config.ts @@ -1,24 +1,22 @@ export const COMMON_UNITS = ["small", "medium", "large"]; export const twMergeConfig = { - extend: { - theme: { - spacing: ["divider"], - radius: COMMON_UNITS, - }, - classGroups: { - shadow: [{shadow: COMMON_UNITS}], - opacity: [{opacity: ["disabled"]}], - "font-size": [{text: ["tiny", ...COMMON_UNITS]}], - "border-w": [{border: COMMON_UNITS}], - "bg-image": [ - "bg-stripe-gradient-default", - "bg-stripe-gradient-primary", - "bg-stripe-gradient-secondary", - "bg-stripe-gradient-success", - "bg-stripe-gradient-warning", - "bg-stripe-gradient-danger", - ], - }, + theme: { + spacing: ["divider"], + radius: COMMON_UNITS, + }, + classGroups: { + shadow: [{shadow: COMMON_UNITS}], + opacity: [{opacity: ["disabled"]}], + "font-size": [{text: ["tiny", ...COMMON_UNITS]}], + "border-w": [{border: COMMON_UNITS}], + "bg-image": [ + "bg-stripe-gradient-default", + "bg-stripe-gradient-primary", + "bg-stripe-gradient-secondary", + "bg-stripe-gradient-success", + "bg-stripe-gradient-warning", + "bg-stripe-gradient-danger", + ], }, };