diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fca9570d..4e8a7365 100644 --- a/.github/workflows/ci.yml +++ b/.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') }} diff --git a/docs/.vitepress/config/shared.mts b/docs/.vitepress/config/shared.mts index 43ce9ffa..98e70313 100644 --- a/docs/.vitepress/config/shared.mts +++ b/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: { diff --git a/docs/.vitepress/theme/index.ts b/docs/.vitepress/theme/index.ts index e1888aa9..5a01fab6 100644 --- a/docs/.vitepress/theme/index.ts +++ b/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 { diff --git a/docs/package.json b/docs/package.json index 42c1d88c..7afa47e5 100644 --- a/docs/package.json +++ b/docs/package.json @@ -13,7 +13,8 @@ "@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", diff --git a/docs/src/guide/introduction/quick-start.md b/docs/src/guide/introduction/quick-start.md index d1ae8fbd..96225d89 100644 --- a/docs/src/guide/introduction/quick-start.md +++ b/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 diff --git a/internal/lint-configs/eslint-config/package.json b/internal/lint-configs/eslint-config/package.json index 6a649b9b..21395da2 100644 --- a/internal/lint-configs/eslint-config/package.json +++ b/internal/lint-configs/eslint-config/package.json @@ -41,7 +41,7 @@ "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", diff --git a/internal/tailwind-config/package.json b/internal/tailwind-config/package.json index 2a3d6e61..448aec1c 100644 --- a/internal/tailwind-config/package.json +++ b/internal/tailwind-config/package.json @@ -46,7 +46,7 @@ "tailwindcss": "^3.4.3" }, "dependencies": { - "@iconify/json": "^2.2.249", + "@iconify/json": "^2.2.250", "@iconify/tailwind": "^1.1.3", "@tailwindcss/nesting": "0.0.0-insiders.565cd3e", "@tailwindcss/typography": "^0.5.15", diff --git a/internal/vite-config/package.json b/internal/vite-config/package.json index 46779177..42340db1 100644 --- a/internal/vite-config/package.json +++ b/internal/vite-config/package.json @@ -43,13 +43,13 @@ "@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", + "sass": "^1.79.1", "vite": "^5.4.6", "vite-plugin-compression": "^0.5.1", "vite-plugin-dts": "4.2.1", diff --git a/internal/vite-config/src/config/application.ts b/internal/vite-config/src/config/application.ts index 184a8f19..c6809399 100644 --- a/internal/vite-config/src/config/application.ts +++ b/internal/vite-config/src/config/application.ts @@ -112,6 +112,7 @@ function createCssOptions(injectGlobalScss = true) { } return content; }, + api: 'modern-compiler', }, } : {}, diff --git a/package.json b/package.json index 51f3bf7d..89337fdd 100644 --- a/package.json +++ b/package.json @@ -74,12 +74,12 @@ "@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.3", + "cspell": "^8.14.4", "husky": "^9.1.6", "is-ci": "^3.0.1", "jsdom": "^25.0.0", diff --git a/packages/@core/ui-kit/form-ui/src/form-render/form-field.vue b/packages/@core/ui-kit/form-ui/src/form-render/form-field.vue index 6c0ecbdf..0819ca03 100644 --- a/packages/@core/ui-kit/form-ui/src/form-render/form-field.vue +++ b/packages/@core/ui-kit/form-ui/src/form-render/form-field.vue @@ -1,7 +1,7 @@