Merge pull request #189 from farreldarian/farrel/support-for-decimal-t-shirt-sizes

Update Regex to Support Decimal T-Shirt Sizes

Author: dcastil

src/lib/validators.ts

@@ -1,7 +1,7 @@
 const arbitraryValueRegex = /^\[(.+)\]$/
 const fractionRegex = /^\d+\/\d+$/
 const stringLengths = new Set(['px', 'full', 'screen'])
-const tshirtUnitRegex = /^(\d+)?(xs|sm|md|lg|xl)$/
+const tshirtUnitRegex = /^(\d+(\.\d+)?)?(xs|sm|md|lg|xl)$/
 const lengthUnitRegex = /\d+(%|px|r?em|[sdl]?v([hwib]|min|max)|pt|pc|in|cm|mm|cap|ch|ex|r?lh)/
 // Shadow always begins with x and y offset separated by underscore
 const shadowRegex = /^-?((\d+)?\.?(\d+)[a-z]+|0)_-?((\d+)?\.?(\d+)[a-z]+|0)/

tests/non-conflicting-classes.test.ts

@@ -3,4 +3,5 @@ import { twMerge } from '../src'
 test('merges non-conflicting classes correctly', () => {
     expect(twMerge('border-t border-white/10')).toBe('border-t border-white/10')
     expect(twMerge('border-t border-white')).toBe('border-t border-white')
+    expect(twMerge('text-3.5xl text-black')).toBe('text-3.5xl text-black')
 })

tests/validators.test.ts

@@ -103,6 +103,7 @@ describe('validators', () => {
         expect(isTshirtSize('lg')).toBe(true)
         expect(isTshirtSize('xl')).toBe(true)
         expect(isTshirtSize('2xl')).toBe(true)
+        expect(isTshirtSize('2.5xl')).toBe(true)
         expect(isTshirtSize('10xl')).toBe(true)
         expect(isTshirtSize('2xs')).toBe(true)
         expect(isTshirtSize('2lg')).toBe(true)