diff --git a/package.json b/package.json index 54a6e84a..8e6aa5e5 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "react-use": "17.4.0", "react-use-clipboard": "1.0.9", "swr": "2.2.4", - "tailwind-merge": "1.14.0", + "tailwind-merge": "2.0.0", "tailwindcss-animate": "1.0.7", "use-debounce": "9.0.4", "zod": "3.22.4" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 892283e5..001e5a19 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -84,8 +84,8 @@ dependencies: specifier: 2.2.4 version: 2.2.4(react@18.2.0) tailwind-merge: - specifier: 1.14.0 - version: 1.14.0 + specifier: 2.0.0 + version: 2.0.0 tailwindcss-animate: specifier: 1.0.7 version: 1.0.7(tailwindcss@3.3.5) @@ -1569,7 +1569,7 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@radix-ui/primitive': 1.0.1 '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.33)(react@18.2.0) '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.14)(@types/react@18.2.33)(react-dom@18.2.0)(react@18.2.0) @@ -1590,7 +1590,7 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@types/react': 18.2.33 react: 18.2.0 dev: false @@ -1608,7 +1608,7 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.33)(react@18.2.0) '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.14)(@types/react@18.2.33)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.33)(react@18.2.0) @@ -1646,7 +1646,7 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.14)(@types/react@18.2.33)(react-dom@18.2.0)(react@18.2.0) '@types/react': 18.2.33 '@types/react-dom': 18.2.14 @@ -1667,7 +1667,7 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.33)(react@18.2.0) '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.33)(react@18.2.0) '@types/react': 18.2.33 @@ -1706,7 +1706,7 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.33)(react@18.2.0) '@types/react': 18.2.33 react: 18.2.0 @@ -1792,7 +1792,7 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.23.2 '@types/react': 18.2.33 react: 18.2.0 dev: false @@ -6449,8 +6449,10 @@ packages: resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} dev: true - /tailwind-merge@1.14.0: - resolution: {integrity: sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==} + /tailwind-merge@2.0.0: + resolution: {integrity: sha512-WO8qghn9yhsldLSg80au+3/gY9E4hFxIvQ3qOmlpXnqpDKoMruKfi/56BbbMg6fHTQJ9QD3cc79PoWqlaQE4rw==} + dependencies: + '@babel/runtime': 7.23.2 dev: false /tailwindcss-animate@1.0.7(tailwindcss@3.3.5):