Merge pull request #177 from dcastil/bugfix/176/fix-incorrect-class-group-conflicts-in-grid

Fix incorrect class group conflicts in grid-related classes

Author: dcastil

docs/similar-packages.md

@@ -1,10 +1,17 @@
 # Similar packages
 
+## TypeScript/JavaScript
+
 -   [@robit-dev/tailwindcss-class-combiner](https://www.npmjs.com/package/@robit-dev/tailwindcss-class-combiner)
 -   [tailshake](https://www.npmjs.com/package/tailshake)
 -   [tailwind-classlist](https://www.npmjs.com/package/tailwind-classlist)
 -   [tailwind-override](https://www.npmjs.com/package/tailwind-override)
 
+## Other languages
+
+-   [tailwind_merge](https://rubygems.org/gems/tailwind_merge) (Ruby)
+-   [Twix](https://hex.pm/packages/twix/0.1.0) (Elixir)
+
 ---
 
 Previous: [Contributing](./contributing.md)

src/lib/class-utils.ts

@@ -1,4 +1,4 @@
-import { ClassGroupId, Config, ClassGroup, ClassValidator, ThemeObject, ThemeGetter } from './types'
+import { ClassGroup, ClassGroupId, ClassValidator, Config, ThemeGetter, ThemeObject } from './types'
 
 export interface ClassPartObject {
     nextPart: Map<string, ClassPartObject>

src/lib/config-utils.ts

@@ -1,7 +1,7 @@
-import { createLruCache } from './lru-cache'
-import { Config } from './types'
 import { createClassUtils } from './class-utils'
+import { createLruCache } from './lru-cache'
 import { createSplitModifiers } from './modifier-utils'
+import { Config } from './types'
 
 export type ConfigUtils = ReturnType<typeof createConfigUtils>
 

src/lib/create-tailwind-merge.ts

@@ -1,7 +1,7 @@
 import { createConfigUtils } from './config-utils'
-import { Config } from './types'
 import { mergeClassList } from './merge-classlist'
 import { ClassNameValue, twJoin } from './tw-join'
+import { Config } from './types'
 
 type CreateConfigFirst = () => Config
 type CreateConfigSubsequent = (config: Config) => Config

src/lib/default-config.ts

@@ -2,12 +2,12 @@ import { fromTheme } from './from-theme'
 import {
     isAny,
     isArbitraryLength,
+    isArbitraryNumber,
     isArbitraryPosition,
     isArbitraryShadow,
     isArbitrarySize,
     isArbitraryUrl,
     isArbitraryValue,
-    isArbitraryNumber,
     isInteger,
     isLength,
     isTshirtSize,
@@ -1543,8 +1543,6 @@ export function getDefaultConfig() {
             'inset-x': ['right', 'left'],
             'inset-y': ['top', 'bottom'],
             flex: ['basis', 'grow', 'shrink'],
-            'col-start-end': ['col-start', 'col-end'],
-            'row-start-end': ['row-start', 'row-end'],
             gap: ['gap-x', 'gap-y'],
             p: ['px', 'py', 'pt', 'pr', 'pb', 'pl'],
             px: ['pr', 'pl'],