Merge pull request #76 from Edge-Explorer/dependabot/npm_and_yarn/frontend/tailwind-merge-3.7.0
Browse files- frontend/package-lock.json +4 -4
- frontend/package.json +1 -1
frontend/package-lock.json
CHANGED
|
@@ -16,7 +16,7 @@
|
|
| 16 |
"react-dom": "^19.2.8",
|
| 17 |
"react-icons": "^5.7.0",
|
| 18 |
"recharts": "^3.10.1",
|
| 19 |
-
"tailwind-merge": "^3.
|
| 20 |
"tailwindcss": "^4.3.1"
|
| 21 |
},
|
| 22 |
"devDependencies": {
|
|
@@ -2320,9 +2320,9 @@
|
|
| 2320 |
}
|
| 2321 |
},
|
| 2322 |
"node_modules/tailwind-merge": {
|
| 2323 |
-
"version": "3.
|
| 2324 |
-
"resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.
|
| 2325 |
-
"integrity": "sha512-
|
| 2326 |
"license": "MIT",
|
| 2327 |
"funding": {
|
| 2328 |
"type": "github",
|
|
|
|
| 16 |
"react-dom": "^19.2.8",
|
| 17 |
"react-icons": "^5.7.0",
|
| 18 |
"recharts": "^3.10.1",
|
| 19 |
+
"tailwind-merge": "^3.7.0",
|
| 20 |
"tailwindcss": "^4.3.1"
|
| 21 |
},
|
| 22 |
"devDependencies": {
|
|
|
|
| 2320 |
}
|
| 2321 |
},
|
| 2322 |
"node_modules/tailwind-merge": {
|
| 2323 |
+
"version": "3.7.0",
|
| 2324 |
+
"resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.7.0.tgz",
|
| 2325 |
+
"integrity": "sha512-XPPUyAc+cvspz3lHTcR/QgPfW2A0lv/xQNIjX3HGhLR+Nq2lHaLq5MtTesHn8GUr3W3DguT2KT5x3NVgRtYwmA==",
|
| 2326 |
"license": "MIT",
|
| 2327 |
"funding": {
|
| 2328 |
"type": "github",
|
frontend/package.json
CHANGED
|
@@ -18,7 +18,7 @@
|
|
| 18 |
"react-dom": "^19.2.8",
|
| 19 |
"react-icons": "^5.7.0",
|
| 20 |
"recharts": "^3.10.1",
|
| 21 |
-
"tailwind-merge": "^3.
|
| 22 |
"tailwindcss": "^4.3.1"
|
| 23 |
},
|
| 24 |
"devDependencies": {
|
|
|
|
| 18 |
"react-dom": "^19.2.8",
|
| 19 |
"react-icons": "^5.7.0",
|
| 20 |
"recharts": "^3.10.1",
|
| 21 |
+
"tailwind-merge": "^3.7.0",
|
| 22 |
"tailwindcss": "^4.3.1"
|
| 23 |
},
|
| 24 |
"devDependencies": {
|