Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for postfix modifier #214

Merged
merged 12 commits into from
Apr 2, 2023
Merged

Add support for postfix modifier #214

merged 12 commits into from
Apr 2, 2023

Commits on Apr 1, 2023

  1. add comment explaining why tailwind-merge doesn't support object syntax

    @dcastil
    dcastil committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    afdb064 View commit details
    Browse the repository at this point in the history

  2. move separator length check into init of splitModifiers

    @dcastil
    dcastil committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    d9274f1 View commit details
    Browse the repository at this point in the history

  3. move separator calculations into splitModifiers init

    @dcastil
    dcastil committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    ef3d372 View commit details
    Browse the repository at this point in the history

  4. add maybePostfixModifierPosition to result of splitModifiers

    @dcastil
    dcastil committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    d7c690e View commit details
    Browse the repository at this point in the history

  5. add optional conflictingClassGroupModifiers to Config type

    @dcastil
    dcastil committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    23a3ff5 View commit details
    Browse the repository at this point in the history

  6. add postfix modifier matching to mergeClassList

    @dcastil
    dcastil committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    49ea52d View commit details
    Browse the repository at this point in the history

  7. add conflictingClassGroupModifiers to default config

    @dcastil
    dcastil committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    37def5c View commit details
    Browse the repository at this point in the history

  8. add test for Tailwind CSS v3.3 features

    @dcastil
    dcastil committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    573754b View commit details
    Browse the repository at this point in the history

  9. check for class without potential modifier first 

    Necessary becayse the isAny validator matches classes with validators too eagerly
    @dcastil
    dcastil committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    9b35ce5 View commit details
    Browse the repository at this point in the history

  10. add postfix modifier tests

    @dcastil
    dcastil committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    ac390db View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2023

  1. add documentation for postfix modifier

    @dcastil
    dcastil committed Apr 2, 2023
    Configuration menu
    Copy the full SHA
    01505a6 View commit details
    Browse the repository at this point in the history

  2. remove info about unsupported postfix modifier from readme

    @dcastil
    dcastil committed Apr 2, 2023
    Configuration menu
    Copy the full SHA
    65f784b View commit details
    Browse the repository at this point in the history