From 9120d201434071263eb51212d4b288c470e93f2e Mon Sep 17 00:00:00 2001 From: Vben Date: Sun, 18 Aug 2024 08:43:00 +0800 Subject: [PATCH] chore: update deps and docs (#4184) * chore: update deps * chore: update docs * chore: update menu --- .github/workflows/deploy.yml | 8 +- README.ja-JP.md | 2 +- README.md | 2 +- README.zh-CN.md | 2 +- apps/backend-mock/package.json | 4 +- apps/web-antd/package.json | 2 +- apps/web-ele/package.json | 2 +- apps/web-naive/package.json | 2 +- docs/package.json | 2 +- docs/src/guide/essentials/development.md | 16 +- docs/src/guide/introduction/thin.md | 7 +- .../vite-config/src/plugins/nitro-mock.ts | 4 +- package.json | 11 +- packages/@core/base/icons/package.json | 2 +- packages/@core/base/shared/package.json | 2 +- packages/@core/base/typings/package.json | 2 +- packages/@core/composables/package.json | 2 +- packages/@core/preferences/package.json | 2 +- packages/@core/ui-kit/layout-ui/package.json | 2 +- packages/@core/ui-kit/menu-ui/package.json | 2 +- .../ui-kit/menu-ui/src/components/menu.vue | 2 +- .../menu-ui/src/components/sub-menu.vue | 10 +- packages/@core/ui-kit/shadcn-ui/package.json | 2 +- packages/@core/ui-kit/tabs-ui/package.json | 2 +- packages/effects/access/package.json | 2 +- packages/effects/chart-ui/package.json | 2 +- packages/effects/common-ui/package.json | 2 +- packages/effects/hooks/package.json | 2 +- packages/effects/layouts/package.json | 2 +- packages/locales/package.json | 2 +- packages/stores/package.json | 2 +- packages/types/package.json | 2 +- playground/package.json | 2 +- pnpm-lock.yaml | 840 ++++++++---------- 34 files changed, 443 insertions(+), 509 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 08ff80b7..ffffc48e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -27,7 +27,7 @@ jobs: uses: ./.github/actions/setup-node - name: Build - run: pnpm run build + run: pnpm build:play && pnpm build:docs - name: Sync Playground files uses: SamKirkland/FTP-Deploy-Action@v4.3.5 @@ -66,7 +66,7 @@ jobs: uses: ./.github/actions/setup-node - name: Build - run: pnpm run build + run: pnpm run build:antd - name: Sync files uses: SamKirkland/FTP-Deploy-Action@v4.3.5 @@ -97,7 +97,7 @@ jobs: uses: ./.github/actions/setup-node - name: Build - run: pnpm run build + run: pnpm run build:ele - name: Sync files uses: SamKirkland/FTP-Deploy-Action@v4.3.5 @@ -128,7 +128,7 @@ jobs: uses: ./.github/actions/setup-node - name: Build - run: pnpm run build + run: pnpm run build:naive - name: Sync files uses: SamKirkland/FTP-Deploy-Action@v4.3.5 diff --git a/README.ja-JP.md b/README.ja-JP.md index db51cad8..a4e9de0a 100644 --- a/README.ja-JP.md +++ b/README.ja-JP.md @@ -78,7 +78,7 @@ pnpm build ## 変更ログ -[CHANGELOG](https://github.com/vbenjs/vue-vben-admin/releases/latest) +[CHANGELOG](https://github.com/vbenjs/vue-vben-admin/releases) ## 貢献方法 diff --git a/README.md b/README.md index 7427a930..5540234a 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ pnpm build ## Change Log -[CHANGELOG](https://github.com/vbenjs/vue-vben-admin/releases/latest) +[CHANGELOG](https://github.com/vbenjs/vue-vben-admin/releases) ## How to contribute diff --git a/README.zh-CN.md b/README.zh-CN.md index e9c97680..bcda0087 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -128,7 +128,7 @@ pnpm build ## 更新日志 -[CHANGELOG](https://github.com/vbenjs/vue-vben-admin/releases/latest) +[CHANGELOG](https://github.com/vbenjs/vue-vben-admin/releases) ## Contributor diff --git a/apps/backend-mock/package.json b/apps/backend-mock/package.json index 5a45611b..3baef435 100644 --- a/apps/backend-mock/package.json +++ b/apps/backend-mock/package.json @@ -6,8 +6,8 @@ "license": "MIT", "author": "", "scripts": { - "start": "nitro dev", - "build": "nitro build" + "build": "nitro build", + "start": "nitro dev" }, "dependencies": { "nitropack": "^2.9.7" diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index f3877755..369b830a 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -44,7 +44,7 @@ "ant-design-vue": "^4.2.3", "dayjs": "^1.11.12", "pinia": "2.2.2", - "vue": "^3.4.37", + "vue": "^3.4.38", "vue-router": "^4.4.3" } } diff --git a/apps/web-ele/package.json b/apps/web-ele/package.json index f16e39ba..1a50ae74 100644 --- a/apps/web-ele/package.json +++ b/apps/web-ele/package.json @@ -44,7 +44,7 @@ "dayjs": "^1.11.12", "element-plus": "^2.8.0", "pinia": "2.2.2", - "vue": "^3.4.37", + "vue": "^3.4.38", "vue-router": "^4.4.3" }, "devDependencies": { diff --git a/apps/web-naive/package.json b/apps/web-naive/package.json index a4e73e0c..e27ab25b 100644 --- a/apps/web-naive/package.json +++ b/apps/web-naive/package.json @@ -43,7 +43,7 @@ "@vueuse/core": "^11.0.0", "naive-ui": "^2.39.0", "pinia": "2.2.2", - "vue": "^3.4.37", + "vue": "^3.4.38", "vue-router": "^4.4.3" } } diff --git a/docs/package.json b/docs/package.json index a13250df..5f74efbc 100644 --- a/docs/package.json +++ b/docs/package.json @@ -14,6 +14,6 @@ "@nolebase/vitepress-plugin-git-changelog": "^2.4.0", "@vite-pwa/vitepress": "^0.5.0", "vitepress": "^1.3.3", - "vue": "^3.4.37" + "vue": "^3.4.38" } } diff --git a/docs/src/guide/essentials/development.md b/docs/src/guide/essentials/development.md index 4b92b10f..ff731a2d 100644 --- a/docs/src/guide/essentials/development.md +++ b/docs/src/guide/essentials/development.md @@ -52,8 +52,18 @@ npm 脚本是项目常见的配置，用于执行一些常见的任务，比如 "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 turbo build", // 构建项目并分析 "build:analyze": "turbo build:analyze", - // 构建docker镜像 + // 构建本地 docker 镜像 "build:docker": "./build-local-docker-image.sh", + // 单独构建 web-antd 应用 + "build:antd": "pnpm run build --filter=@vben/web-antd", + // 单独构建文档 + "build:docs": "pnpm run build --filter=@vben/docs", + // 单独构建 web-ele 应用 + "build:ele": "pnpm run build --filter=@vben/web-ele", + // 单独构建 web-naive 应用 + "build:naive": "pnpm run build --filter=@vben/naive", + // 单独构建 playground 应用 + "build:play": "pnpm run build --filter=@vben/playground", // changeset 版本管理 "changeset": "pnpm exec changeset", // 检查项目各种问题 @@ -78,10 +88,10 @@ npm 脚本是项目常见的配置，用于执行一些常见的任务，比如 "dev:docs": "pnpm -F @vben/docs run dev", // 启动web-ele应用 "dev:ele": "pnpm -F @vben/web-ele run dev", - // 启动演示应用 - "dev:play": "pnpm -F @vben/playground run dev", // 启动web-naive应用 "dev:naive": "pnpm -F @vben/web-naive run dev", + // 启动演示应用 + "dev:play": "pnpm -F @vben/playground run dev", // 格式化代码 "format": "vsh lint --format", // lint 代码 diff --git a/docs/src/guide/introduction/thin.md b/docs/src/guide/introduction/thin.md index 818227e9..422a520d 100644 --- a/docs/src/guide/introduction/thin.md +++ b/docs/src/guide/introduction/thin.md @@ -28,12 +28,7 @@ apps/web-native ## Mock 服务精简 -如果你不需要`Mock`服务，你可以直接删除`apps/backend-mock`文件夹。同时在你的应用下`.env.development`文件中删除`VITE_NITRO_MOCK`变量。 - -```bash -# 是否开启 Nitro Mock服务，true 为开启，false 为关闭 -VITE_NITRO_MOCK=false -``` +如果你不需要`Mock`服务，你可以直接删除`apps/backend-mock`文件夹即可。 ## 安装依赖 diff --git a/internal/vite-config/src/plugins/nitro-mock.ts b/internal/vite-config/src/plugins/nitro-mock.ts index 99e8c06e..60d7327d 100644 --- a/internal/vite-config/src/plugins/nitro-mock.ts +++ b/internal/vite-config/src/plugins/nitro-mock.ts @@ -23,7 +23,9 @@ export const viteNitroMockPlugin = ({ const pkg = await getPackage(mockServerPackage); if (!pkg) { - consola.error(`Package ${mockServerPackage} not found.`); + consola.log( + `Package ${mockServerPackage} not found. Skip mock server.`, + ); return; } diff --git a/package.json b/package.json index 0ac67696..7673eeae 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,11 @@ "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 turbo build", "build:analyze": "turbo build:analyze", "build:docker": "./build-local-docker-image.sh", + "build:antd": "pnpm run build --filter=@vben/web-antd", + "build:docs": "pnpm run build --filter=@vben/docs", + "build:ele": "pnpm run build --filter=@vben/web-ele", + "build:naive": "pnpm run build --filter=@vben/naive", + "build:play": "pnpm run build --filter=@vben/playground", "changeset": "pnpm exec changeset", "check": "pnpm run check:circular && pnpm run check:dep && pnpm run check:type && pnpm check:cspell", "check:circular": "vsh check-circular", @@ -41,8 +46,8 @@ "dev:antd": "pnpm -F @vben/web-antd run dev", "dev:docs": "pnpm -F @vben/docs run dev", "dev:ele": "pnpm -F @vben/web-ele run dev", - "dev:play": "pnpm -F @vben/playground run dev", "dev:naive": "pnpm -F @vben/web-naive run dev", + "dev:play": "pnpm -F @vben/playground run dev", "format": "vsh lint --format", "lint": "vsh lint", "postinstall": "turbo run stub", @@ -87,7 +92,7 @@ "unbuild": "^2.0.0", "vite": "^5.4.1", "vitest": "^2.0.5", - "vue": "^3.4.37", + "vue": "^3.4.38", "vue-tsc": "^2.0.29" }, "engines": { @@ -105,7 +110,7 @@ "@ctrl/tinycolor": "4.1.0", "clsx": "2.1.1", "pinia": "2.2.2", - "vue": "3.4.37" + "vue": "3.4.38" }, "neverBuiltDependencies": [ "canvas", diff --git a/packages/@core/base/icons/package.json b/packages/@core/base/icons/package.json index 44d43335..dbc8a6e2 100644 --- a/packages/@core/base/icons/package.json +++ b/packages/@core/base/icons/package.json @@ -36,6 +36,6 @@ "dependencies": { "@iconify/vue": "^4.1.2", "lucide-vue-next": "^0.428.0", - "vue": "^3.4.37" + "vue": "^3.4.38" } } diff --git a/packages/@core/base/shared/package.json b/packages/@core/base/shared/package.json index 4316e7bf..a75b15ff 100644 --- a/packages/@core/base/shared/package.json +++ b/packages/@core/base/shared/package.json @@ -62,7 +62,7 @@ "dependencies": { "@ctrl/tinycolor": "^4.1.0", "@tanstack/vue-store": "^0.5.5", - "@vue/shared": "^3.4.37", + "@vue/shared": "^3.4.38", "clsx": "^2.1.1", "defu": "^6.1.4", "lodash.clonedeep": "^4.5.0", diff --git a/packages/@core/base/typings/package.json b/packages/@core/base/typings/package.json index 47d2d78c..590e874d 100644 --- a/packages/@core/base/typings/package.json +++ b/packages/@core/base/typings/package.json @@ -38,7 +38,7 @@ } }, "dependencies": { - "vue": "^3.4.37", + "vue": "^3.4.38", "vue-router": "^4.4.3" } } diff --git a/packages/@core/composables/package.json b/packages/@core/composables/package.json index e8485016..6e18264f 100644 --- a/packages/@core/composables/package.json +++ b/packages/@core/composables/package.json @@ -39,7 +39,7 @@ "@vueuse/core": "^11.0.0", "radix-vue": "^1.9.4", "sortablejs": "^1.15.2", - "vue": "^3.4.37" + "vue": "^3.4.38" }, "devDependencies": { "@types/sortablejs": "^1.15.8" diff --git a/packages/@core/preferences/package.json b/packages/@core/preferences/package.json index 2e043696..8b7cee1c 100644 --- a/packages/@core/preferences/package.json +++ b/packages/@core/preferences/package.json @@ -32,6 +32,6 @@ "@vben-core/shared": "workspace:*", "@vben-core/typings": "workspace:*", "@vueuse/core": "^11.0.0", - "vue": "^3.4.37" + "vue": "^3.4.38" } } diff --git a/packages/@core/ui-kit/layout-ui/package.json b/packages/@core/ui-kit/layout-ui/package.json index c0dd5f63..1e65d4c6 100644 --- a/packages/@core/ui-kit/layout-ui/package.json +++ b/packages/@core/ui-kit/layout-ui/package.json @@ -42,6 +42,6 @@ "@vben-core/shadcn-ui": "workspace:*", "@vben-core/typings": "workspace:*", "@vueuse/core": "^11.0.0", - "vue": "^3.4.37" + "vue": "^3.4.38" } } diff --git a/packages/@core/ui-kit/menu-ui/package.json b/packages/@core/ui-kit/menu-ui/package.json index c452f05c..3ccbe554 100644 --- a/packages/@core/ui-kit/menu-ui/package.json +++ b/packages/@core/ui-kit/menu-ui/package.json @@ -43,6 +43,6 @@ "@vben-core/shared": "workspace:*", "@vben-core/typings": "workspace:*", "@vueuse/core": "^11.0.0", - "vue": "^3.4.37" + "vue": "^3.4.38" } } diff --git a/packages/@core/ui-kit/menu-ui/src/components/menu.vue b/packages/@core/ui-kit/menu-ui/src/components/menu.vue index 0bbac3f0..159edd6d 100644 --- a/packages/@core/ui-kit/menu-ui/src/components/menu.vue +++ b/packages/@core/ui-kit/menu-ui/src/components/menu.vue @@ -683,7 +683,7 @@ $namespace: vben; } &__popup { - padding: 4px 0; + padding: 10px 0; border-radius: var(--menu-item-radius); .#{$namespace}-sub-menu-content, diff --git a/packages/@core/ui-kit/menu-ui/src/components/sub-menu.vue b/packages/@core/ui-kit/menu-ui/src/components/sub-menu.vue index e4b9795d..8787495c 100644 --- a/packages/@core/ui-kit/menu-ui/src/components/sub-menu.vue +++ b/packages/@core/ui-kit/menu-ui/src/components/sub-menu.vue @@ -68,11 +68,13 @@ const isFirstLevel = computed(() => { }); const contentProps = computed((): HoverCardContentProps => { - const side = - mode.value === 'horizontal' && isFirstLevel.value ? 'bottom' : 'right'; + const isHorizontal = mode.value === 'horizontal'; + const side = isHorizontal && isFirstLevel.value ? 'bottom' : 'right'; return { + collisionPadding: { top: 20 }, side, - sideOffset: isFirstLevel.value ? 5 : 10, + sideOffset: isHorizontal ? 5 : 10, + // sideOffset: 10, }; }); @@ -214,7 +216,7 @@ onBeforeUnmount(() => { ]" :content-props="contentProps" :open="true" - :open-delay="0" + :open-delay="30" >