From 84091bb954649e9c69f35dd1a2a3a60fcf8268d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 14 Jul 2024 02:36:23 +0000 Subject: [PATCH] build(deps): bump tailwind-merge from 2.3.0 to 2.4.0 Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.3.0 to 2.4.0. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](https://github.com/dcastil/tailwind-merge/compare/v2.3.0...v2.4.0) --- updated-dependencies: - dependency-name: tailwind-merge dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- apps/console-fb/package.json | 2 +- apps/console-sc/package.json | 2 +- apps/console/package.json | 2 +- apps/playground/package.json | 2 +- apps/web/package.json | 2 +- packages/skeleton-ui/package.json | 2 +- packages/ui/package.json | 2 +- pnpm-lock.yaml | 84 +++++++++++++++---------------- 8 files changed, 49 insertions(+), 49 deletions(-) diff --git a/apps/console-fb/package.json b/apps/console-fb/package.json index 8cf7e5e9..a4ef6c0b 100644 --- a/apps/console-fb/package.json +++ b/apps/console-fb/package.json @@ -90,7 +90,7 @@ "sveltekit-rate-limiter": "0.5.1", "sveltekit-superforms": "2.15.2", "sveltekit-view-transition": "0.5.3", - "tailwind-merge": "2.3.0", + "tailwind-merge": "2.4.0", "tailwind-variants": "0.2.1", "tailwindcss": "3.4.4", "tailwindcss-animate": "1.0.7", diff --git a/apps/console-sc/package.json b/apps/console-sc/package.json index 46ee2357..7a5bf427 100644 --- a/apps/console-sc/package.json +++ b/apps/console-sc/package.json @@ -57,7 +57,7 @@ "sveltekit-rate-limiter": "0.5.1", "sveltekit-superforms": "2.15.2", "sveltekit-view-transition": "0.5.3", - "tailwind-merge": "2.3.0", + "tailwind-merge": "2.4.0", "tailwind-variants": "0.2.1", "tailwindcss": "3.4.4", "tailwindcss-animate": "1.0.7", diff --git a/apps/console/package.json b/apps/console/package.json index a45f1c85..0e21e1d5 100644 --- a/apps/console/package.json +++ b/apps/console/package.json @@ -92,7 +92,7 @@ "sveltekit-rate-limiter": "0.5.1", "sveltekit-superforms": "2.15.2", "sveltekit-view-transition": "0.5.3", - "tailwind-merge": "2.3.0", + "tailwind-merge": "2.4.0", "tailwind-variants": "0.2.1", "tailwindcss": "3.4.4", "tailwindcss-animate": "1.0.7", diff --git a/apps/playground/package.json b/apps/playground/package.json index df2d622d..0875c232 100644 --- a/apps/playground/package.json +++ b/apps/playground/package.json @@ -75,7 +75,7 @@ "sveltekit-rate-limiter": "0.5.1", "sveltekit-superforms": "2.15.2", "sveltekit-view-transition": "0.5.3", - "tailwind-merge": "2.3.0", + "tailwind-merge": "2.4.0", "tailwind-variants": "0.2.1", "tailwindcss": "3.4.4", "tailwindcss-animate": "1.0.7", diff --git a/apps/web/package.json b/apps/web/package.json index cafac780..95a66c11 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -40,7 +40,7 @@ "lucide-svelte": "0.399.0", "mode-watcher": "0.3.1", "svelte": "4.2.18", - "tailwind-merge": "2.3.0", + "tailwind-merge": "2.4.0", "tailwindcss": "3.4.4", "typescript": "5.5.3", "vitest": "1.6.0" diff --git a/packages/skeleton-ui/package.json b/packages/skeleton-ui/package.json index a5299b48..2290bc5f 100644 --- a/packages/skeleton-ui/package.json +++ b/packages/skeleton-ui/package.json @@ -57,7 +57,7 @@ "postcss-import": "16.1.0", "postcss-load-config": "6.0.1", "sveltekit-superforms": "2.15.2", - "tailwind-merge": "2.3.0", + "tailwind-merge": "2.4.0", "tailwind-variants": "0.2.1", "tailwindcss": "3.4.4", "tslib": "2.6.3", diff --git a/packages/ui/package.json b/packages/ui/package.json index 5300f2d3..2c1b3487 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -40,7 +40,7 @@ "svelte-sonner": "0.3.25", "sveltekit-superforms": "2.15.2", "swiper": "11.1.4", - "tailwind-merge": "2.3.0", + "tailwind-merge": "2.4.0", "tailwind-variants": "0.2.1", "vaul-svelte": "0.3.2", "zod": "3.23.8" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b0d02228..81942b70 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -253,8 +253,8 @@ importers: specifier: 0.5.3 version: 0.5.3(@sveltejs/kit@2.5.18(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.3(@types/node@20.14.10)(terser@5.31.1)))(svelte@4.2.18)(vite@5.3.3(@types/node@20.14.10)(terser@5.31.1)))(svelte@4.2.18) tailwind-merge: - specifier: 2.3.0 - version: 2.3.0 + specifier: 2.4.0 + version: 2.4.0 tailwind-variants: specifier: 0.2.1 version: 0.2.1(tailwindcss@3.4.4) @@ -340,7 +340,7 @@ importers: version: 5.4.1(@sveltejs/kit@2.5.18(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.3(@types/node@20.14.10)(terser@5.31.1)))(svelte@4.2.18)(vite@5.3.3(@types/node@20.14.10)(terser@5.31.1))) '@sveltejs/enhanced-img': specifier: 0.3.0 - version: 0.3.0(rollup@4.18.0)(svelte@4.2.18) + version: 0.3.0(rollup@2.79.1)(svelte@4.2.18) '@sveltejs/kit': specifier: 2.5.18 version: 2.5.18(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.3(@types/node@20.14.10)(terser@5.31.1)))(svelte@4.2.18)(vite@5.3.3(@types/node@20.14.10)(terser@5.31.1)) @@ -403,16 +403,16 @@ importers: version: 3.6.0 flowbite: specifier: 2.4.1 - version: 2.4.1(rollup@4.18.0) + version: 2.4.1(rollup@2.79.1) flowbite-svelte: specifier: 0.46.14 - version: 0.46.14(rollup@4.18.0)(svelte@4.2.18) + version: 0.46.14(rollup@2.79.1)(svelte@4.2.18) flowbite-svelte-blocks: specifier: 1.1.3 - version: 1.1.3(rollup@4.18.0)(svelte@4.2.18) + version: 1.1.3(rollup@2.79.1)(svelte@4.2.18) flowbite-svelte-icons: specifier: 1.6.1 - version: 1.6.1(svelte@4.2.18)(tailwind-merge@2.3.0)(tailwindcss@3.4.4) + version: 1.6.1(svelte@4.2.18)(tailwind-merge@2.4.0)(tailwindcss@3.4.4) flowbite-typography: specifier: 1.0.3 version: 1.0.3(tailwindcss@3.4.4) @@ -483,8 +483,8 @@ importers: specifier: 0.5.3 version: 0.5.3(@sveltejs/kit@2.5.18(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.3(@types/node@20.14.10)(terser@5.31.1)))(svelte@4.2.18)(vite@5.3.3(@types/node@20.14.10)(terser@5.31.1)))(svelte@4.2.18) tailwind-merge: - specifier: 2.3.0 - version: 2.3.0 + specifier: 2.4.0 + version: 2.4.0 tailwind-variants: specifier: 0.2.1 version: 0.2.1(tailwindcss@3.4.4) @@ -634,8 +634,8 @@ importers: specifier: 0.5.3 version: 0.5.3(@sveltejs/kit@2.5.18(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.3(@types/node@20.14.10)(terser@5.31.1)))(svelte@4.2.18)(vite@5.3.3(@types/node@20.14.10)(terser@5.31.1)))(svelte@4.2.18) tailwind-merge: - specifier: 2.3.0 - version: 2.3.0 + specifier: 2.4.0 + version: 2.4.0 tailwind-variants: specifier: 0.2.1 version: 0.2.1(tailwindcss@3.4.4) @@ -864,8 +864,8 @@ importers: specifier: 0.5.3 version: 0.5.3(@sveltejs/kit@2.5.18(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.3(@types/node@20.14.10)(terser@5.31.1)))(svelte@4.2.18)(vite@5.3.3(@types/node@20.14.10)(terser@5.31.1)))(svelte@4.2.18) tailwind-merge: - specifier: 2.3.0 - version: 2.3.0 + specifier: 2.4.0 + version: 2.4.0 tailwind-variants: specifier: 0.2.1 version: 0.2.1(tailwindcss@3.4.4) @@ -964,8 +964,8 @@ importers: specifier: 4.2.18 version: 4.2.18 tailwind-merge: - specifier: 2.3.0 - version: 2.3.0 + specifier: 2.4.0 + version: 2.4.0 tailwindcss: specifier: 3.4.4 version: 3.4.4 @@ -1101,8 +1101,8 @@ importers: specifier: 2.15.2 version: 2.15.2(@sveltejs/kit@2.5.18(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.3(@types/node@20.14.10)(terser@5.31.1)))(svelte@4.2.18)(vite@5.3.3(@types/node@20.14.10)(terser@5.31.1)))(svelte@4.2.18) tailwind-merge: - specifier: 2.3.0 - version: 2.3.0 + specifier: 2.4.0 + version: 2.4.0 tailwind-variants: specifier: 0.2.1 version: 0.2.1(tailwindcss@3.4.4) @@ -1179,8 +1179,8 @@ importers: specifier: 11.1.4 version: 11.1.4 tailwind-merge: - specifier: 2.3.0 - version: 2.3.0 + specifier: 2.4.0 + version: 2.4.0 tailwind-variants: specifier: 0.2.1 version: 0.2.1(tailwindcss@3.4.4) @@ -3540,9 +3540,11 @@ packages: '@inlang/paraglide-js-adapter-unplugin@1.4.29': resolution: {integrity: sha512-CDhQ69M9Ej8wfY/8P2rdNzwq6ux69A4nlFJqPcWffEX21xMaWGlt8JNspjMjc158KpAYyBGB8bFgTZ5K6o1fwg==} + deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. '@inlang/paraglide-js-adapter-vite@1.2.40': resolution: {integrity: sha512-2+mAYI4hDMTr7AAei5CNzjqpjzOvsnlGrVvHrohtYs+Jn+tayokDaO7iL5o9k9SYrlXBZ7tUshAw88UQ1+f82Q==} + deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. '@inlang/paraglide-js@1.11.1': resolution: {integrity: sha512-WSAsGiSQ1lRWMB4sj/gIykrlRvyXWNde+Lv+/4DYxIc5122FBnWl3X2dGJeBCUHOFKmQbgJL1XKrjVDfWyRrXg==} @@ -4272,7 +4274,7 @@ packages: peerDependencies: '@sveltejs/vite-plugin-svelte': ^3.0.0 svelte: ^4.0.0 || ^5.0.0-next.0 - vite: 5.2.13 + vite: ^5.0.3 '@sveltejs/kit@2.5.7': resolution: {integrity: sha512-6uedTzrb7nQrw6HALxnPrPaXdIN2jJJTzTIl96Z3P5NiG+OAfpdPbrWrvkJ3GN4CfWqrmU4dJqwMMRMTD/C7ow==} @@ -9623,8 +9625,8 @@ packages: tabbable@6.2.0: resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==} - tailwind-merge@2.3.0: - resolution: {integrity: sha512-vkYrLpIP+lgR0tQCG6AP7zZXCTLc1Lnv/CCRT3BqJ9CZ3ui2++GPaGb1x/ILsINIMSYqqvrpqjUFsMNLlW99EA==} + tailwind-merge@2.4.0: + resolution: {integrity: sha512-49AwoOQNKdqKPd9CViyH5wJoSKsCDjUlzL8DxuGp3P1FsGY36NJDAa18jLZcaHAUUuTj+JB8IAo8zWgBNvBF7A==} tailwind-variants@0.2.1: resolution: {integrity: sha512-2xmhAf4UIc3PijOUcJPA1LP4AbxhpcHuHM2C26xM0k81r0maAO6uoUSHl3APmvHZcY5cZCY/bYuJdfFa4eGoaw==} @@ -16718,35 +16720,35 @@ snapshots: flattie@1.1.1: {} - flowbite-datepicker@1.3.0(rollup@4.18.0): + flowbite-datepicker@1.3.0(rollup@2.79.1): dependencies: - '@rollup/plugin-node-resolve': 15.2.3(rollup@4.18.0) - flowbite: 2.4.1(rollup@4.18.0) + '@rollup/plugin-node-resolve': 15.2.3(rollup@2.79.1) + flowbite: 2.4.1(rollup@2.79.1) transitivePeerDependencies: - rollup - flowbite-svelte-blocks@1.1.3(rollup@4.18.0)(svelte@4.2.18): + flowbite-svelte-blocks@1.1.3(rollup@2.79.1)(svelte@4.2.18): dependencies: - flowbite: 2.4.1(rollup@4.18.0) - flowbite-svelte: 0.46.14(rollup@4.18.0)(svelte@4.2.18) + flowbite: 2.4.1(rollup@2.79.1) + flowbite-svelte: 0.46.14(rollup@2.79.1)(svelte@4.2.18) svelte: 4.2.18 - tailwind-merge: 2.3.0 + tailwind-merge: 2.4.0 transitivePeerDependencies: - rollup - flowbite-svelte-icons@1.6.1(svelte@4.2.18)(tailwind-merge@2.3.0)(tailwindcss@3.4.4): + flowbite-svelte-icons@1.6.1(svelte@4.2.18)(tailwind-merge@2.4.0)(tailwindcss@3.4.4): dependencies: svelte: 4.2.18 - tailwind-merge: 2.3.0 + tailwind-merge: 2.4.0 tailwindcss: 3.4.4 - flowbite-svelte@0.46.14(rollup@4.18.0)(svelte@4.2.18): + flowbite-svelte@0.46.14(rollup@2.79.1)(svelte@4.2.18): dependencies: '@floating-ui/dom': 1.6.7 apexcharts: 3.50.0 - flowbite: 2.4.1(rollup@4.18.0) + flowbite: 2.4.1(rollup@2.79.1) svelte: 4.2.18 - tailwind-merge: 2.3.0 + tailwind-merge: 2.4.0 transitivePeerDependencies: - rollup @@ -16757,10 +16759,10 @@ snapshots: lodash.merge: 4.6.2 tailwindcss: 3.4.4 - flowbite@2.4.1(rollup@4.18.0): + flowbite@2.4.1(rollup@2.79.1): dependencies: '@popperjs/core': 2.11.8 - flowbite-datepicker: 1.3.0(rollup@4.18.0) + flowbite-datepicker: 1.3.0(rollup@2.79.1) mini-svg-data-uri: 1.4.4 transitivePeerDependencies: - rollup @@ -20465,7 +20467,7 @@ snapshots: prismjs: 1.29.0 sveld: 0.20.0(@babel/core@7.24.7)(postcss-load-config@4.0.2(postcss@8.4.39))(postcss@8.4.39) svelte: 4.2.18 - tailwind-merge: 2.3.0 + tailwind-merge: 2.4.0 zod: 3.23.8 transitivePeerDependencies: - '@babel/core' @@ -20495,7 +20497,7 @@ snapshots: prismjs: 1.29.0 sveld: 0.20.0(@babel/core@7.24.7)(postcss-load-config@4.0.2(postcss@8.4.39))(postcss@8.4.39) svelte: 4.2.18 - tailwind-merge: 2.3.0 + tailwind-merge: 2.4.0 zod: 3.23.8 transitivePeerDependencies: - '@babel/core' @@ -20652,13 +20654,11 @@ snapshots: tabbable@6.2.0: {} - tailwind-merge@2.3.0: - dependencies: - '@babel/runtime': 7.24.7 + tailwind-merge@2.4.0: {} tailwind-variants@0.2.1(tailwindcss@3.4.4): dependencies: - tailwind-merge: 2.3.0 + tailwind-merge: 2.4.0 tailwindcss: 3.4.4 tailwindcss-animate@1.0.7(tailwindcss@3.4.4):