Merge branch 'main' into main

.github/workflows/ci.yml

@@ -17,7 +17,6 @@ env:
 jobs:
  test:
  name: Test
- if: github.actor != 'dependabot[bot]' && !contains(github.event.head_commit.message, '[skip ci]')
  runs-on: ${{ matrix.os }}
  strategy:
  matrix:
@@ -56,7 +55,6 @@ jobs:
 
  lint:
  name: Lint
- if: github.actor != 'dependabot[bot]' && !contains(github.event.head_commit.message, '[skip ci]')
  runs-on: ${{ matrix.os }}
  strategy:
  matrix:
@@ -109,7 +107,6 @@ jobs:
  ci-ok:
  name: CI OK
  runs-on: ubuntu-latest
- if: github.actor != 'dependabot[bot]' && !contains(github.event.head_commit.message, '[skip ci]') && always()
  needs: [test, check, lint]
  env:
  FAILURE: ${{ contains(join(needs.*.result, ','), 'failure') }}

apps/backend-mock/package.json

@@ -14,7 +14,7 @@
  "nitropack": "^2.9.7"
  },
  "devDependencies": {
- "@types/jsonwebtoken": "^9.0.6",
+ "@types/jsonwebtoken": "^9.0.7",
  "h3": "^1.12.0"
  }
 }

apps/web-antd/package.json

@@ -40,11 +40,11 @@
  "@vben/styles": "workspace:*",
  "@vben/types": "workspace:*",
  "@vben/utils": "workspace:*",
- "@vueuse/core": "^11.0.3",
+ "@vueuse/core": "^11.1.0",
  "ant-design-vue": "^4.2.4",
  "dayjs": "^1.11.13",
  "pinia": "2.2.2",
- "vue": "^3.5.5",
+ "vue": "^3.5.6",
  "vue-router": "^4.4.5"
  }
 }

apps/web-ele/package.json

@@ -40,11 +40,11 @@
  "@vben/styles": "workspace:*",
  "@vben/types": "workspace:*",
  "@vben/utils": "workspace:*",
- "@vueuse/core": "^11.0.3",
+ "@vueuse/core": "^11.1.0",
  "dayjs": "^1.11.13",
  "element-plus": "^2.8.3",
  "pinia": "2.2.2",
- "vue": "^3.5.5",
+ "vue": "^3.5.6",
  "vue-router": "^4.4.5"
  },
  "devDependencies": {

apps/web-naive/package.json

@@ -40,10 +40,10 @@
  "@vben/styles": "workspace:*",
  "@vben/types": "workspace:*",
  "@vben/utils": "workspace:*",
- "@vueuse/core": "^11.0.3",
+ "@vueuse/core": "^11.1.0",
  "naive-ui": "^2.39.0",
  "pinia": "2.2.2",
- "vue": "^3.5.5",
+ "vue": "^3.5.6",
  "vue-router": "^4.4.5"
  }
 }

docs/.vitepress/config/shared.mts

@@ -11,6 +11,10 @@ import {
 } from '@nolebase/vitepress-plugin-git-changelog/vite';
 import tailwind from 'tailwindcss';
 import { defineConfig, postcssIsolateStyles } from 'vitepress';
+import {
+ groupIconMdPlugin,
+ groupIconVitePlugin,
+} from 'vitepress-plugin-group-icons';
 
 import { demoPreviewPlugin } from './plugins/demo-preview';
 import { search as zhSearch } from './zh.mts';
@@ -21,6 +25,7 @@ export const shared = defineConfig({
  markdown: {
  preConfig(md) {
  md.use(demoPreviewPlugin);
+ md.use(groupIconMdPlugin);
  },
  },
  pwa: pwa(),
@@ -79,6 +84,7 @@ export const shared = defineConfig({
  }),
  GitChangelogMarkdownSection(),
  viteArchiverPlugin({ outputDir: '.vitepress' }),
+ groupIconVitePlugin(),
  ],
  server: {
  fs: {

docs/.vitepress/theme/index.ts

@@ -11,6 +11,7 @@ import { initHmPlugin } from './plugins/hm';
 
 import './styles';
 
+import 'virtual:group-icons.css';
 import '@nolebase/vitepress-plugin-git-changelog/client/style.css';
 
 export default {

docs/package.json

@@ -13,13 +13,14 @@
  "@vben/styles": "workspace:*",
  "lucide-vue-next": "^0.441.0",
  "medium-zoom": "^1.1.0",
- "radix-vue": "^1.9.5"
+ "radix-vue": "^1.9.5",
+ "vitepress-plugin-group-icons": "^1.2.4"
  },
  "devDependencies": {
  "@nolebase/vitepress-plugin-git-changelog": "^2.5.0",
  "@vben/vite-config": "workspace:*",
  "@vite-pwa/vitepress": "^0.5.3",
  "vitepress": "^1.3.4",
- "vue": "^3.5.5"
+ "vue": "^3.5.6"
  }
 }

docs/src/guide/introduction/quick-start.md

@@ -30,12 +30,12 @@ git -v
 
 ::: code-group
 
-```bash [GitHub]
+```sh [GitHub]
 # clone 代码
 git clone https://github.com/vbenjs/vue-vben-admin.git
 ```
 
-```bash [Gitee]
+```sh [Gitee]
 # clone 代码
 # Gitee 的代码可能不是最新的
 git clone https://gitee.com/annsion/vue-vben-admin.git

internal/lint-configs/eslint-config/package.json

@@ -34,14 +34,14 @@
  "devDependencies": {
  "@eslint/js": "^9.10.0",
  "@types/eslint": "^9.6.1",
- "@typescript-eslint/eslint-plugin": "^8.5.0",
- "@typescript-eslint/parser": "^8.5.0",
+ "@typescript-eslint/eslint-plugin": "^8.6.0",
+ "@typescript-eslint/parser": "^8.6.0",
  "eslint": "^9.10.0",
  "eslint-config-prettier": "^9.1.0",
  "eslint-plugin-eslint-comments": "^3.2.0",
  "eslint-plugin-jsdoc": "^50.2.3",
  "eslint-plugin-jsonc": "^2.16.0",
- "eslint-plugin-n": "^17.10.2",
+ "eslint-plugin-n": "^17.10.3",
  "eslint-plugin-no-only-tests": "^3.3.0",
  "eslint-plugin-perfectionist": "^3.6.0",
  "eslint-plugin-prettier": "^5.2.1",

internal/lint-configs/stylelint-config/package.json

@@ -28,7 +28,7 @@
  "stylelint-scss": "^6.6.0"
  },
  "devDependencies": {
- "postcss": "^8.4.45",
+ "postcss": "^8.4.47",
  "postcss-html": "^1.7.0",
  "postcss-scss": "^4.0.9",
  "prettier": "^3.3.3",

internal/node-utils/package.json

@@ -33,7 +33,7 @@
  "chalk": "^5.3.0",
  "consola": "^3.2.3",
  "dayjs": "^1.11.13",
- "execa": "^9.3.1",
+ "execa": "^9.4.0",
  "find-up": "^7.0.0",
  "nanoid": "^5.0.7",
  "ora": "^8.1.0",

internal/tailwind-config/package.json

@@ -46,17 +46,17 @@
  "tailwindcss": "^3.4.3"
  },
  "dependencies": {
- "@iconify/json": "^2.2.247",
+ "@iconify/json": "^2.2.250",
  "@iconify/tailwind": "^1.1.3",
  "@tailwindcss/nesting": "0.0.0-insiders.565cd3e",
  "@tailwindcss/typography": "^0.5.15",
  "autoprefixer": "^10.4.20",
  "cssnano": "^7.0.6",
- "postcss": "^8.4.45",
+ "postcss": "^8.4.47",
  "postcss-antd-fixes": "^0.2.0",
  "postcss-import": "^16.1.0",
  "postcss-preset-env": "^10.0.3",
- "tailwindcss": "^3.4.11",
+ "tailwindcss": "^3.4.12",
  "tailwindcss-animate": "^1.0.7"
  },
  "devDependencies": {

internal/tsconfig/package.json

@@ -20,6 +20,6 @@
  ],
  "dependencies": {
  "@vben/types": "workspace:*",
- "vite": "^5.4.5"
+ "vite": "^5.4.6"
  }
 }

internal/vite-config/package.json

@@ -28,7 +28,7 @@
  },
  "dependencies": {
  "@intlify/unplugin-vue-i18n": "^5.0.0",
- "@jspm/generator": "^2.3.0",
+ "@jspm/generator": "^2.3.1",
  "archiver": "^7.0.1",
  "cheerio": "1.0.0",
  "get-port": "^7.1.0",
@@ -43,14 +43,14 @@
  "@types/archiver": "^6.0.2",
  "@types/html-minifier-terser": "^7.0.2",
  "@vben/node-utils": "workspace:*",
- "@vitejs/plugin-vue": "^5.1.3",
+ "@vitejs/plugin-vue": "^5.1.4",
  "@vitejs/plugin-vue-jsx": "^4.0.1",
  "dayjs": "^1.11.13",
  "dotenv": "^16.4.5",
  "rollup": "^4.21.3",
  "rollup-plugin-visualizer": "^5.12.0",
- "sass": "^1.78.0",
- "vite": "^5.4.5",
+ "sass": "^1.79.1",
+ "vite": "^5.4.6",
  "vite-plugin-compression": "^0.5.1",
  "vite-plugin-dts": "4.2.1",
  "vite-plugin-html": "^3.2.2"

internal/vite-config/src/config/application.ts

@@ -112,6 +112,7 @@ function createCssOptions(injectGlobalScss = true) {
  }
  return content;
  },
+ api: 'modern-compiler',
  },
  }
  : {},

package.json

@@ -64,7 +64,7 @@
  "@changesets/changelog-github": "^0.5.0",
  "@changesets/cli": "^2.27.8",
  "@types/jsdom": "^21.1.7",
- "@types/node": "^22.5.4",
+ "@types/node": "^22.5.5",
  "@vben/commitlint-config": "workspace:*",
  "@vben/eslint-config": "workspace:*",
  "@vben/prettier-config": "workspace:*",
@@ -74,24 +74,24 @@
  "@vben/turbo-run": "workspace:*",
  "@vben/vite-config": "workspace:*",
  "@vben/vsh": "workspace:*",
- "@vitejs/plugin-vue": "^5.1.3",
+ "@vitejs/plugin-vue": "^5.1.4",
  "@vitejs/plugin-vue-jsx": "^4.0.1",
  "@vue/test-utils": "^2.4.6",
  "autoprefixer": "^10.4.20",
  "cross-env": "^7.0.3",
- "cspell": "^8.14.2",
+ "cspell": "^8.14.4",
  "husky": "^9.1.6",
  "is-ci": "^3.0.1",
  "jsdom": "^25.0.0",
  "lint-staged": "^15.2.10",
  "rimraf": "^6.0.1",
- "tailwindcss": "^3.4.11",
+ "tailwindcss": "^3.4.12",
  "turbo": "^2.1.2",
  "typescript": "^5.6.2",
  "unbuild": "^2.0.0",
- "vite": "^5.4.5",
+ "vite": "^5.4.6",
  "vitest": "^2.1.1",
- "vue": "^3.5.5",
+ "vue": "^3.5.6",
  "vue-tsc": "^2.1.6"
  },
  "engines": {
@@ -109,7 +109,7 @@
  "@ctrl/tinycolor": "4.1.0",
  "clsx": "2.1.1",
  "pinia": "2.2.2",
- "vue": "3.5.5"
+ "vue": "3.5.6"
  },
  "neverBuiltDependencies": [
  "canvas",

packages/@core/base/icons/package.json

@@ -36,6 +36,6 @@
  "dependencies": {
  "@iconify/vue": "^4.1.2",
  "lucide-vue-next": "^0.441.0",
- "vue": "^3.5.5"
+ "vue": "^3.5.6"
  }
 }

packages/@core/base/shared/package.json

@@ -71,8 +71,8 @@
  "dependencies": {
  "@ctrl/tinycolor": "^4.1.0",
  "@tanstack/vue-store": "^0.5.5",
- "@vue/reactivity": "^3.5.5",
- "@vue/shared": "^3.5.5",
+ "@vue/reactivity": "^3.5.6",
+ "@vue/shared": "^3.5.6",
  "clsx": "^2.1.1",
  "defu": "^6.1.4",
  "lodash.clonedeep": "^4.5.0",

packages/@core/base/typings/package.json

@@ -38,7 +38,7 @@
  }
  },
  "dependencies": {
- "vue": "^3.5.5",
+ "vue": "^3.5.6",
  "vue-router": "^4.4.5"
  }
 }

packages/@core/composables/package.json

@@ -36,10 +36,10 @@
  },
  "dependencies": {
  "@vben-core/shared": "workspace:*",
- "@vueuse/core": "^11.0.3",
+ "@vueuse/core": "^11.1.0",
  "radix-vue": "^1.9.5",
  "sortablejs": "^1.15.3",
- "vue": "^3.5.5"
+ "vue": "^3.5.6"
  },
  "devDependencies": {
  "@types/sortablejs": "^1.15.8"

packages/@core/preferences/package.json

@@ -31,7 +31,7 @@
  "dependencies": {
  "@vben-core/shared": "workspace:*",
  "@vben-core/typings": "workspace:*",
- "@vueuse/core": "^11.0.3",
- "vue": "^3.5.5"
+ "@vueuse/core": "^11.1.0",
+ "vue": "^3.5.6"
  }
 }

packages/@core/ui-kit/form-ui/package.json

@@ -41,9 +41,9 @@
  "@vben-core/shadcn-ui": "workspace:*",
  "@vben-core/shared": "workspace:*",
  "@vee-validate/zod": "^4.13.2",
- "@vueuse/core": "^11.0.3",
+ "@vueuse/core": "^11.1.0",
  "vee-validate": "^4.13.2",
- "vue": "^3.5.5",
+ "vue": "^3.5.6",
  "zod": "^3.23.8",
  "zod-defaults": "^0.1.3"
  }

packages/@core/ui-kit/form-ui/src/form-render/form-field.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { ZodType } from 'zod';
 
-import type { FormSchema } from '../types';
+import type { FormSchema, MaybeComponentProps } from '../types';
 
 import { computed } from 'vue';
 
@@ -26,6 +26,7 @@ import { isEventObjectLike } from './helper';
 interface Props extends FormSchema {}
 
 const {
+ commonComponentProps,
  component,
  componentProps,
  dependencies,
@@ -38,7 +39,11 @@ const {
  labelWidth,
  renderComponentContent,
  rules,
-} = defineProps<Props>();
+} = defineProps<
+ {
+ commonComponentProps: MaybeComponentProps;
+ } & Props
+>();
 
 const { componentBindEventMap, componentMap, isVertical } = useFormContext();
 const formRenderProps = injectRenderFormProps();
@@ -133,6 +138,7 @@ const computedProps = computed(() => {
  : componentProps;
 
  return {
+ ...commonComponentProps,
  ...finalComponentProps,
  ...dynamicComponentProps.value,
  };