Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

2024-09-13 10:28:23 +08:00
parent a623f81fec bd6b724aaf
commit bfefaef1be
35 changed files with 478 additions and 161 deletions
--- a/packages/@core/base/icons/package.json
+++ b/packages/@core/base/icons/package.json
@@ -35,7 +35,7 @@
  },
  "dependencies": {
    "@iconify/vue": "^4.1.2",
-    "lucide-vue-next": "^0.439.0",
+    "lucide-vue-next": "^0.441.0",
    "vue": "^3.5.4"
  }
 }
--- a/packages/@core/base/shared/src/utils/merge.ts
+++ b/packages/@core/base/shared/src/utils/merge.ts
@@ -1 +1 @@
-export { defu as merge } from 'defu';
+export { createDefu as createMerge, defu as merge } from 'defu';