chore(projects): merge branch main into example

.vscode/settings.json

@@ -3,7 +3,7 @@
     "source.fixAll.eslint": "explicit",
     "source.organizeImports": "never"
   },
-  "eslint.experimental.useFlatConfig": true,
+  "eslint.useFlatConfig": true,
   "editor.formatOnSave": false,
   "eslint.validate": ["html", "css", "scss", "json", "jsonc"],
   "i18n-ally.displayLanguage": "zh-cn",

CHANGELOG.md

@@ -1,6 +1,25 @@
 # Changelog
 
 
+## [v1.2.7](https://github.com/honghuangdc/soybean-admin/compare/v1.2.6...v1.2.7) (2024-07-12)
+
+###    🛠 Optimizations
+
+- **projects**: supports custom menu icon sizes &nbsp;-&nbsp; by @wynn-w in https://github.com/honghuangdc/soybean-admin/issues/534 [<samp>(e035e)</samp>](https://github.com/honghuangdc/soybean-admin/commit/e035eab)
+
+### &nbsp;&nbsp;&nbsp;🏡 Chore
+
+- **deps**:
+  - update deps &nbsp;-&nbsp; by @honghuangdc [<samp>(72ede)</samp>](https://github.com/honghuangdc/soybean-admin/commit/72ede8b)
+  - update deps &nbsp;-&nbsp; by @honghuangdc [<samp>(be13c)</samp>](https://github.com/honghuangdc/soybean-admin/commit/be13ca2)
+  - update deps &nbsp;-&nbsp; by @honghuangdc [<samp>(752ec)</samp>](https://github.com/honghuangdc/soybean-admin/commit/752ec1e)
+- **projects**:
+  - Fix deprecated configuration config &nbsp;-&nbsp; by @paynezhuang in https://github.com/honghuangdc/soybean-admin/issues/524 [<samp>(0d20e)</samp>](https://github.com/honghuangdc/soybean-admin/commit/0d20e4c)
+
+### &nbsp;&nbsp;&nbsp;❤️ Contributors
+
+[![honghuangdc](https://github.com/honghuangdc.png?size=48)](https://github.com/honghuangdc)&nbsp;&nbsp;[![wynn-w](https://github.com/wynn-w.png?size=48)](https://github.com/wynn-w)&nbsp;&nbsp;[![paynezhuang](https://github.com/paynezhuang.png?size=48)](https://github.com/paynezhuang)&nbsp;&nbsp;
+
 ## [v1.2.6](https://github.com/honghuangdc/soybean-admin/compare/v1.2.5...v1.2.6) (2024-06-21)
 
 ### &nbsp;&nbsp;&nbsp;🐞 Bug Fixes

package.json

@@ -1,7 +1,7 @@
 {
   "name": "soybean-admin",
   "type": "module",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "description": "A fresh and elegant admin template, based on Vue3、Vite3、TypeScript、NaiveUI and UnoCSS. 一个基于Vue3、Vite3、TypeScript、NaiveUI and UnoCSS的清新优雅的中后台模版。",
   "author": {
     "name": "Soybean",
@@ -58,7 +58,7 @@
     "@vueuse/core": "10.11.0",
     "clipboard": "2.0.11",
     "dayjs": "1.11.11",
-    "echarts": "5.5.0",
+    "echarts": "5.5.1",
     "jsbarcode": "3.11.6",
     "lodash-es": "4.17.21",
     "naive-ui": "2.38.2",
@@ -66,49 +66,49 @@
     "pinia": "2.1.7",
     "print-js": "1.6.0",
     "swiper": "11.1.1",
-    "tailwind-merge": "2.3.0",
+    "tailwind-merge": "2.4.0",
     "vditor": "3.10.4",
-    "vue": "3.4.29",
+    "vue": "3.4.31",
-    "vue-draggable-plus": "0.5.0",
+    "vue-draggable-plus": "0.5.2",
     "vue-i18n": "9.13.1",
-    "vue-router": "4.3.3",
+    "vue-router": "4.4.0",
     "wangeditor": "4.7.15",
     "xgplayer": "3.0.17"
   },
   "devDependencies": {
     "@amap/amap-jsapi-types": "0.0.8",
     "@elegant-router/vue": "0.3.7",
-    "@iconify/json": "2.2.220",
+    "@iconify/json": "2.2.226",
     "@sa/scripts": "workspace:*",
     "@sa/uno-preset": "workspace:*",
     "@soybeanjs/eslint-config": "1.3.7",
     "@types/bmapgl": "0.0.5",
     "@types/lodash-es": "4.17.12",
-    "@types/node": "20.14.6",
+    "@types/node": "20.14.10",
     "@types/nprogress": "0.2.3",
-    "@unocss/eslint-config": "0.61.0",
+    "@unocss/eslint-config": "0.61.3",
-    "@unocss/preset-icons": "0.61.0",
+    "@unocss/preset-icons": "0.61.3",
-    "@unocss/preset-uno": "0.61.0",
+    "@unocss/preset-uno": "0.61.3",
-    "@unocss/transformer-directives": "0.61.0",
+    "@unocss/transformer-directives": "0.61.3",
-    "@unocss/transformer-variant-group": "0.61.0",
+    "@unocss/transformer-variant-group": "0.61.3",
-    "@unocss/vite": "0.61.0",
+    "@unocss/vite": "0.61.3",
     "@vitejs/plugin-vue": "5.0.5",
     "@vitejs/plugin-vue-jsx": "4.0.0",
-    "eslint": "9.5.0",
+    "eslint": "9.6.0",
-    "eslint-plugin-vue": "9.26.0",
+    "eslint-plugin-vue": "9.27.0",
     "lint-staged": "15.2.7",
-    "sass": "1.77.6",
+    "sass": "1.77.7",
     "simple-git-hooks": "2.11.1",
-    "tsx": "4.15.6",
+    "tsx": "4.16.2",
-    "typescript": "5.4.5",
+    "typescript": "5.5.3",
     "unplugin-icons": "0.19.0",
-    "unplugin-vue-components": "0.27.0",
+    "unplugin-vue-components": "0.27.2",
-    "vite": "5.3.1",
+    "vite": "5.3.3",
     "vite-plugin-progress": "0.0.7",
     "vite-plugin-svg-icons": "2.0.1",
-    "vite-plugin-vue-devtools": "7.3.2",
+    "vite-plugin-vue-devtools": "7.3.5",
     "vue-eslint-parser": "9.4.3",
-    "vue-tsc": "2.0.21"
+    "vue-tsc": "2.0.26"
   },
   "simple-git-hooks": {
     "commit-msg": "pnpm sa git-commit-verify",

packages/axios/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/axios",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "exports": {
     ".": "./src/index.ts"
   },
@@ -12,8 +12,8 @@
   "dependencies": {
     "@sa/utils": "workspace:*",
     "axios": "1.7.2",
-    "axios-retry": "4.4.0",
+    "axios-retry": "4.4.1",
-    "qs": "6.12.1"
+    "qs": "6.12.3"
   },
   "devDependencies": {
     "@types/qs": "6.9.15"

packages/color/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/color",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "exports": {
     ".": "./src/index.ts"
   },

packages/hooks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/hooks",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "exports": {
     ".": "./src/index.ts"
   },

packages/materials/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/materials",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "exports": {
     ".": "./src/index.ts"
   },

packages/ofetch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/fetch",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "exports": {
     ".": "./src/index.ts"
   },

packages/scripts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/scripts",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "bin": {
     "sa": "./bin.ts"
   },
@@ -19,9 +19,9 @@
     "cac": "6.7.14",
     "consola": "3.2.3",
     "enquirer": "2.4.1",
-    "execa": "9.2.0",
+    "execa": "9.3.0",
     "kolorist": "1.8.0",
     "npm-check-updates": "16.14.20",
-    "rimraf": "5.0.7"
+    "rimraf": "6.0.1"
   }
 }

packages/uno-preset/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/uno-preset",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "exports": {
     ".": "./src/index.ts"
   },

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/utils",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "exports": {
     ".": "./src/index.ts"
   },

src/store/modules/route/shared.ts

@@ -123,7 +123,7 @@ function getGlobalMenuByBaseRoute(route: RouteLocationNormalizedLoaded | Elegant
   const { SvgIconVNode } = useSvgIcon();
 
   const { name, path } = route;
-  const { title, i18nKey, icon = import.meta.env.VITE_MENU_ICON, localIcon } = route.meta ?? {};
+  const { title, i18nKey, icon = import.meta.env.VITE_MENU_ICON, localIcon, iconFontSize } = route.meta ?? {};
 
   const label = i18nKey ? $t(i18nKey) : title!;
 
@@ -133,7 +133,7 @@ function getGlobalMenuByBaseRoute(route: RouteLocationNormalizedLoaded | Elegant
     i18nKey,
     routeKey: name as RouteKey,
     routePath: path as RouteMap[RouteKey],
-    icon: SvgIconVNode({ icon, localIcon, fontSize: 20 })
+    icon: SvgIconVNode({ icon, localIcon, fontSize: iconFontSize || 20 })
   };
 
   return menu;

src/typings/router.d.ts

@@ -42,6 +42,8 @@ declare module 'vue-router' {
      * In "src/assets/svg-icon", if it is set, the icon will be ignored
      */
     localIcon?: string;
+    /** Icon size. width and height are the same. */
+    iconFontSize?: number;
     /** Router order */
     order?: number | null;
     /** The outer link of the route */