Merge pull request #2 from dcastil/feature/add-support-for-tailwind-v…

…2.2.5 Add support for Tailwind v2.2.5
dcastil · Jul 21, 2021 · 1059108 · 1059108
2 parents a07844c + 5e5df7b
commit 1059108
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ twMerge('px-2 py-1 bg-red hover:bg-dark-red', 'p-3 bg-[#B91C1C]')
 // → 'hover:bg-dark-red p-3 bg-[#B91C1C]'
 ```
 
--   Supports Tailwind v2.0.0 up to v2.2.4, support for newer version will be added continuously
+-   Supports Tailwind v2.0.0 up to v2.2.5, support for newer version will be added continuously
 -   Works in Node >=12 and all modern browsers
 -   Fully typed
 -   [<!-- AUTOGENERATED START package-build-stats:gzipSize -->4.1 kB<!-- AUTOGENERATED END --> minified + gzipped](https://bundlephobia.com/package/tailwind-merge) (<!-- AUTOGENERATED START package-build-stats:composition -->95.7% self, 4.3% hashlru<!-- AUTOGENERATED END -->)

diff --git a/src/config/default-config.ts b/src/config/default-config.ts
@@ -377,7 +377,7 @@ export function getDefaultConfig() {
                  * Align Self
                  * @see https://tailwindcss.com/docs/align-self
                  */
-                ['auto', 'start', 'end', 'center', 'stretch'],
+                ['auto', 'start', 'end', 'center', 'stretch', 'baseline'],
             ],
             place: [
                 /**