From c30711528c3276d8e0051ab953bbd18a1ab047fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Nov 2023 14:51:32 +0630 Subject: [PATCH] [dependabot] npm: bump tailwind-merge from 1.14.0 to 2.0.0 (#81) Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 1.14.0 to 2.0.0. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](https://github.com/dcastil/tailwind-merge/compare/v1.14.0...v2.0.0) --- updated-dependencies: - dependency-name: tailwind-merge dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- apps/myanmar_calendar/package.json | 2 +- pnpm-lock.yaml | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/myanmar_calendar/package.json b/apps/myanmar_calendar/package.json index d4bbc0b..a9b405a 100644 --- a/apps/myanmar_calendar/package.json +++ b/apps/myanmar_calendar/package.json @@ -57,7 +57,7 @@ "react-icons": "^4.11.0", "react-redux": "^8.1.3", "sonner": "^1.2.0", - "tailwind-merge": "^1.14.0", + "tailwind-merge": "^2.0.0", "tailwindcss-animate": "^1.0.6", "vite": "^4.5.0", "workbox-precaching": "^7.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c2b71a8..d44a93f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -123,8 +123,8 @@ importers: specifier: ^1.2.0 version: 1.2.0(react-dom@18.2.0)(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.6 version: 1.0.7(tailwindcss@3.3.5) @@ -12681,8 +12681,10 @@ packages: resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==} 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):