v0.7.0

New Features

• Allow passing false to twMerge by @dcastil in #25

Full Changelog: v0.6.0...v0.7.0

v0.6.0

New Features

• Allow passing null as argument to twMerge #20 by @dcastil

Bug Fixes

• Fix merges with important modifier not working when using prefixed classes by @dcastil in #22

Full Changelog: v0.5.2...v0.6.0

v0.5.2

Bug Fixes

• Add support for custom classes like cursor-[grab] by @dcastil in #19
• Fix incorrect conflicts in Font Variant Numeric classes by @dcastil in #18

Full Changelog: v0.5.1...v0.5.2

v0.5.1

Bug Fixes

• Fix incorrect conflict between ring and shadow by @dcastil in #15
• Fix not all JIT-enabled pseudo variants working by @dcastil in #14

Other

• Add CodeQL security analysis to repo by @dcastil in #10

Full Changelog: v0.5.0...v0.5.1

v0.5.0

New Features

• Add support for Tailwind CSS v2.2.6 by @dcastil in #8
• Delay twMerge initialization until first call by @dcastil in #7

Other

• Make logo in README version-specific by @dcastil in #6

Full Changelog: v0.4.0...v0.5.0

v0.4.0

Breaking Changes

• createTailwindMerge
  • Config type changed and returned object from getDefaultConfig changed. (#3)
    • dynamicClasses and standaloneClasses were merged into classGroups
    • conflictingGroups were renamed to conflictingClassGroups
    • Class group IDs are keys of classGroups object instead of full path to class group. E.g. dynamicClasses.foo.0 → foo.

New Features

• (Breaking change) Simplify config by @dcastil in #3
• Add support for Tailwind v2.2.5 by @dcastil in #2

Bug Fixes

• Fix non-conflicting border classes being merged incorrectly by @dcastil in #5

Full Changelog: v0.3.0...v0.4.0

v0.3.0

New Features

• Enable named class group collections by @dcastil in 16a3175
  • Class group collections in config can be an object, so you can use group references like dynamicClasses.flex.direction instead of just index-based ones like dynamicClasses.flex.0. More info on this in the createTailwindMerge() API reference.

Bug Fixes

• Fix small typos in README by @KeKs0r in #1

Other

• tailwind-merge now has a logo by @dcastil in 9402c8e, b969979, dae2aaa, e9e8806, 4e2d9f1
  
  

Full Changelog: v0.2.0...v0.3.0

v0.2.0

New Features

• Add support for important modifier by @dcastil in 17a9e9d
• Add support for per-side border colors by @dcastil in 6cd9ee2
• Add support for content utiltites by @dcastil in fd097c6
• Add support for caret color by @dcastil in fd097c6
• Add support for JIT-only prefixes by @dcastil in fd097c6
• Mark package as side effect-free by @dcastil in 6d00af3

Bug Fixes

• Fix classes like bottom-auto not being detected as Tailwind classesby @dcastil in ec65b84

Full Changelog: v0.1.2...v0.2.0

v0.1.2

Bug Fixes

• Fix errors when importing tailwind-merge as third party dependency. by @dcastil in 3335956

Full Changelog: v0.1.1...v0.1.2

v0.1.1

No changes here. Just testing automated npm publish.

Full Changelog: v0.1.0...v0.1.1