From 9c96f6534f8c1262ad537dc4930e5f40c0591b67 Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 15 Jun 2023 05:32:41 +0200 Subject: [PATCH] Add package `tailwind-merge` Closes https://github.com/pietervdvn/MapComplete/issues/1461 --- package-lock.json | 15 +++++++++++++++ package.json | 1 + 2 files changed, 16 insertions(+) diff --git a/package-lock.json b/package-lock.json index 9e447c28c6..0699a585cd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -47,6 +47,7 @@ "prompt-sync": "^4.2.0", "showdown": "^2.1.0", "svg-path-parser": "^1.1.0", + "tailwind-merge": "^1.13.1", "tailwindcss": "^3.1.8", "vite-node": "^0.28.3", "vitest": "^0.28.3", @@ -10008,6 +10009,15 @@ "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" }, + "node_modules/tailwind-merge": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-1.13.1.tgz", + "integrity": "sha512-tRtRN22TDokGi2TuYSvuHQuuW6BJ/zlUEG+iYpAQ9i66msc/0eU/+HPccbPnNNH0mCPp0Ob8thaC8Uy9CxHitQ==", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/dcastil" + } + }, "node_modules/tailwindcss": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz", @@ -19611,6 +19621,11 @@ "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" }, + "tailwind-merge": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-1.13.1.tgz", + "integrity": "sha512-tRtRN22TDokGi2TuYSvuHQuuW6BJ/zlUEG+iYpAQ9i66msc/0eU/+HPccbPnNNH0mCPp0Ob8thaC8Uy9CxHitQ==" + }, "tailwindcss": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz", diff --git a/package.json b/package.json index 49f101af74..5add2483ca 100644 --- a/package.json +++ b/package.json @@ -99,6 +99,7 @@ "prompt-sync": "^4.2.0", "showdown": "^2.1.0", "svg-path-parser": "^1.1.0", + "tailwind-merge": "^1.13.1", "tailwindcss": "^3.1.8", "vite-node": "^0.28.3", "vitest": "^0.28.3",