diff --git a/apps/dashboard/package.json b/apps/dashboard/package.json index 3c207cbaf84..cbd24db392a 100644 --- a/apps/dashboard/package.json +++ b/apps/dashboard/package.json @@ -98,7 +98,7 @@ "spdx-correct": "^3.2.0", "stripe": "17.7.0", "swagger-ui-react": "^5.21.0", - "tailwind-merge": "^2.6.0", + "tailwind-merge": "^3.2.0", "tailwindcss-animate": "^1.0.7", "thirdweb": "workspace:*", "tiny-invariant": "^1.3.3", diff --git a/apps/login/package.json b/apps/login/package.json index da9c85170e4..96e1c031f7e 100644 --- a/apps/login/package.json +++ b/apps/login/package.json @@ -31,7 +31,7 @@ "react-dom": "19.1.0", "server-only": "^0.0.1", "sonner": "2.0.3", - "tailwind-merge": "^2.6.0", + "tailwind-merge": "^3.2.0", "tailwindcss-animate": "^1.0.7", "thirdweb": "workspace:*" }, diff --git a/apps/playground-web/package.json b/apps/playground-web/package.json index 25d35041e26..4ade599ca58 100644 --- a/apps/playground-web/package.json +++ b/apps/playground-web/package.json @@ -45,7 +45,7 @@ "react-pick-color": "^2.0.0", "server-only": "^0.0.1", "shiki": "1.27.0", - "tailwind-merge": "^2.6.0", + "tailwind-merge": "^3.2.0", "thirdweb": "workspace:*", "use-debounce": "^10.0.4", "zod": "3.24.3" diff --git a/apps/portal/package.json b/apps/portal/package.json index a99c9f41b46..b92a420603a 100644 --- a/apps/portal/package.json +++ b/apps/portal/package.json @@ -49,7 +49,7 @@ "remark-gfm": "3.0.1", "server-only": "^0.0.1", "shiki": "1.27.0", - "tailwind-merge": "^2.6.0", + "tailwind-merge": "^3.2.0", "tailwindcss-animate": "^1.0.7", "thirdweb": "workspace:*", "tiny-invariant": "^1.3.3", diff --git a/apps/wallet-ui/package.json b/apps/wallet-ui/package.json index a801748da4b..75758551916 100644 --- a/apps/wallet-ui/package.json +++ b/apps/wallet-ui/package.json @@ -27,7 +27,7 @@ "react-hook-form": "7.55.0", "server-only": "^0.0.1", "sonner": "2.0.3", - "tailwind-merge": "^2.6.0", + "tailwind-merge": "^3.2.0", "tailwindcss-animate": "^1.0.7", "thirdweb": "workspace:*", "tiny-invariant": "^1.3.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 95fcf57b1f2..9309acf85f9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -290,8 +290,8 @@ importers: specifier: ^5.21.0 version: 5.21.0(@types/react@19.1.2)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) tailwind-merge: - specifier: ^2.6.0 - version: 2.6.0 + specifier: ^3.2.0 + version: 3.2.0 tailwindcss-animate: specifier: ^1.0.7 version: 1.0.7(tailwindcss@3.4.17) @@ -477,8 +477,8 @@ importers: specifier: 2.0.3 version: 2.0.3(react-dom@19.1.0(react@19.1.0))(react@19.1.0) tailwind-merge: - specifier: ^2.6.0 - version: 2.6.0 + specifier: ^3.2.0 + version: 3.2.0 tailwindcss-animate: specifier: ^1.0.7 version: 1.0.7(tailwindcss@3.4.17) @@ -607,8 +607,8 @@ importers: specifier: 1.27.0 version: 1.27.0 tailwind-merge: - specifier: ^2.6.0 - version: 2.6.0 + specifier: ^3.2.0 + version: 3.2.0 thirdweb: specifier: workspace:* version: link:../../packages/thirdweb @@ -755,8 +755,8 @@ importers: specifier: 1.27.0 version: 1.27.0 tailwind-merge: - specifier: ^2.6.0 - version: 2.6.0 + specifier: ^3.2.0 + version: 3.2.0 tailwindcss-animate: specifier: ^1.0.7 version: 1.0.7(tailwindcss@3.4.17) @@ -894,8 +894,8 @@ importers: specifier: 2.0.3 version: 2.0.3(react-dom@19.1.0(react@19.1.0))(react@19.1.0) tailwind-merge: - specifier: ^2.6.0 - version: 2.6.0 + specifier: ^3.2.0 + version: 3.2.0 tailwindcss-animate: specifier: ^1.0.7 version: 1.0.7(tailwindcss@3.4.17) @@ -14194,8 +14194,8 @@ packages: tabbable@6.2.0: resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==} - tailwind-merge@2.6.0: - resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==} + tailwind-merge@3.2.0: + resolution: {integrity: sha512-FQT/OVqCD+7edmmJpsgCsY820RTD5AkBryuG5IUqR5YQZSdj5xlH5nLgH7YPths7WsLPSpSBNneJdM8aS8aeFA==} tailwindcss-animate@1.0.7: resolution: {integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==} @@ -26812,8 +26812,8 @@ snapshots: '@typescript-eslint/parser': 7.14.1(eslint@8.57.0)(typescript@5.8.3) eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint@8.57.0))(eslint@8.57.0) - eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0) + eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.31.0)(eslint@8.57.0) + eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.0) eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.0) eslint-plugin-react: 7.37.5(eslint@8.57.0) eslint-plugin-react-hooks: 5.2.0(eslint@8.57.0) @@ -26852,7 +26852,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint@8.57.0))(eslint@8.57.0): + eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0)(eslint@8.57.0): dependencies: '@nolyfill/is-core-module': 1.0.39 debug: 4.4.0(supports-color@8.1.1) @@ -26863,7 +26863,7 @@ snapshots: tinyglobby: 0.2.13 unrs-resolver: 1.6.3 optionalDependencies: - eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0) + eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.0) transitivePeerDependencies: - supports-color @@ -26903,14 +26903,14 @@ snapshots: - bluebird - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0): + eslint-module-utils@2.12.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0)(eslint@8.57.0))(eslint@8.57.0): dependencies: debug: 3.2.7 optionalDependencies: '@typescript-eslint/parser': 7.14.1(eslint@8.57.0)(typescript@5.8.3) eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint@8.57.0))(eslint@8.57.0) + eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.31.0)(eslint@8.57.0) transitivePeerDependencies: - supports-color @@ -26925,7 +26925,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0): + eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.0): dependencies: '@rtsao/scc': 1.1.0 array-includes: 3.1.8 @@ -26936,7 +26936,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.31.0)(eslint@8.57.0))(eslint@8.57.0) hasown: 2.0.2 is-core-module: 2.16.1 is-glob: 4.0.3 @@ -33597,7 +33597,7 @@ snapshots: tabbable@6.2.0: {} - tailwind-merge@2.6.0: {} + tailwind-merge@3.2.0: {} tailwindcss-animate@1.0.7(tailwindcss@3.4.17): dependencies: