Merge branch 'main' into dependabot/npm_and_yarn/vite-5.4.1

delegit-xyz · Aug 20, 2024 · d493d64 · d493d64
2 parents 0ead72f + 486f12f
commit d493d64
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -42,9 +42,9 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-icons": "^5.3.0",
-    "react-router-dom": "^6.25.1",
+    "react-router-dom": "^6.26.1",
     "sonner": "^1.5.0",
-    "tailwind-merge": "^2.4.0",
+    "tailwind-merge": "^2.5.2",
     "tailwindcss-animate": "^1.0.7",
     "usehooks-ts": "^3.1.0"
   },
@@ -66,7 +66,7 @@
     "postcss": "^8.4.41",
     "prettier": "3.3.3",
     "tailwindcss": "^3.4.10",
-    "typescript": "^5.2.2",
+    "typescript": "^5.5.4",
     "vite": "^5.4.1",
     "vite-plugin-svgr": "^4.2.0"
   }

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml