Skip to content

Commit

Permalink
fix(deps): ⬆️ update dependency tailwind-merge to ^0.8.0 (#186)
Browse files Browse the repository at this point in the history
* fix(deps): ⬆️ update dependency tailwind-merge to ^0.8.0

* fix(twMerge): 🐛 major change issue

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Navin Moorthy <navin007.a@gmail.com>
  • Loading branch information
3 people committed Oct 22, 2021
1 parent f2b09f7 commit 3e033ec
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 22 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"reakit-system": "^0.15.2",
"reakit-utils": "^0.15.2",
"reakit-warning": "^0.6.2",
"tailwind-merge": "^0.7.1"
"tailwind-merge": "^0.8.0"
},
"devDependencies": {
"@babel/cli": "7.15.7",
Expand Down
26 changes: 9 additions & 17 deletions src/utils/tailwindMerge.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
import { createTailwindMerge } from "tailwind-merge";
import { extendTailwindMerge } from "tailwind-merge";

export { cx } from "@renderlesskit/react";

export const tcm = createTailwindMerge(getDefaultConfig => {
const defaultConfig = getDefaultConfig();

return {
...defaultConfig,
classGroups: {
...defaultConfig.classGroups,
"font-size": [
...defaultConfig.classGroups["font-size"],
// Defined custom text presets
{
text: ["cxs", "paragraph-cxs", "paragraph-sm", "2base"],
},
],
},
};
export const tcm = extendTailwindMerge({
classGroups: {
"font-size": [
{
text: ["cxs", "paragraph-cxs", "paragraph-sm", "2base"],
},
],
},
});
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16043,10 +16043,10 @@ table@^6.0.9:
string-width "^4.2.3"
strip-ansi "^6.0.1"

tailwind-merge@^0.7.1:
version "0.7.1"
resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-0.7.1.tgz#aed4f2b7a6c70d5aa975615ed537d6b063ca445b"
integrity sha512-syMwChXiUACPIvv/pNsjHpbylJKuWwiYDsJNl1D9Pe5n7J0trQAf7vcqv9qGcpIe/zYDPl0kjbUr74zii3yM8w==
tailwind-merge@^0.8.0:
version "0.8.0"
resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-0.8.0.tgz#54ec7ca5db09419278a5c65529d33ca55f07403e"
integrity sha512-ryCp1LuSru+5e0nTzZanPGqPetJonV2cIgS8Vk+kOmG2gxPRW6gbRi9H9HiPdLjswE0sCmQ6RYdgDmEQ7lBD3Q==
dependencies:
hashlru "^2.3.0"

Expand Down

1 comment on commit 3e033ec

@vercel
Copy link

@vercel vercel bot commented on 3e033ec Oct 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.