Skip to content

Commit

Permalink
chore: update deps and docs (vbenjs#4184)
Browse files Browse the repository at this point in the history
* chore: update deps

* chore: update docs

* chore: update menu
  • Loading branch information
anncwb authored Aug 18, 2024
1 parent 5f41c51 commit 9120d20
Show file tree
Hide file tree
Showing 34 changed files with 443 additions and 509 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
Expand Down Expand Up @@ -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/[email protected]
Expand Down Expand Up @@ -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/[email protected]
Expand Down Expand Up @@ -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/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion README.ja-JP.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

## 貢献方法

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions apps/backend-mock/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion apps/web-antd/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion apps/web-ele/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion apps/web-naive/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
16 changes: 13 additions & 3 deletions docs/src/guide/essentials/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -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",
// 检查项目各种问题
Expand All @@ -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 代码
Expand Down
7 changes: 1 addition & 6 deletions docs/src/guide/introduction/thin.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`文件夹即可。

## 安装依赖

Expand Down
4 changes: 3 additions & 1 deletion internal/vite-config/src/plugins/nitro-mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
11 changes: 8 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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": {
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/@core/base/icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@
"dependencies": {
"@iconify/vue": "^4.1.2",
"lucide-vue-next": "^0.428.0",
"vue": "^3.4.37"
"vue": "^3.4.38"
}
}
2 changes: 1 addition & 1 deletion packages/@core/base/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/@core/base/typings/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}
},
"dependencies": {
"vue": "^3.4.37",
"vue": "^3.4.38",
"vue-router": "^4.4.3"
}
}
2 changes: 1 addition & 1 deletion packages/@core/composables/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/@core/preferences/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/@core/ui-kit/layout-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/@core/ui-kit/menu-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/@core/ui-kit/menu-ui/src/components/menu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ $namespace: vben;
}
&__popup {
padding: 4px 0;
padding: 10px 0;
border-radius: var(--menu-item-radius);
.#{$namespace}-sub-menu-content,
Expand Down
10 changes: 6 additions & 4 deletions packages/@core/ui-kit/menu-ui/src/components/sub-menu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
});
Expand Down Expand Up @@ -214,7 +216,7 @@ onBeforeUnmount(() => {
]"
:content-props="contentProps"
:open="true"
:open-delay="0"
:open-delay="30"
>
<template #trigger>
<SubMenuContent
Expand Down
2 changes: 1 addition & 1 deletion packages/@core/ui-kit/shadcn-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@
"class-variance-authority": "^0.7.0",
"lucide-vue-next": "^0.428.0",
"radix-vue": "^1.9.4",
"vue": "^3.4.37"
"vue": "^3.4.38"
}
}
2 changes: 1 addition & 1 deletion packages/@core/ui-kit/tabs-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/effects/access/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
"@vben/stores": "workspace:*",
"@vben/types": "workspace:*",
"@vben/utils": "workspace:*",
"vue": "^3.4.37"
"vue": "^3.4.38"
}
}
2 changes: 1 addition & 1 deletion packages/effects/chart-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"@vben/preferences": "workspace:*",
"@vueuse/core": "^11.0.0",
"echarts": "^5.5.1",
"vue": "^3.4.37"
"vue": "^3.4.38"
}
}
2 changes: 1 addition & 1 deletion packages/effects/common-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@vben/types": "workspace:*",
"@vueuse/integrations": "^11.0.0",
"qrcode": "^1.5.4",
"vue": "^3.4.37",
"vue": "^3.4.38",
"vue-router": "^4.4.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/effects/hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@vben/stores": "workspace:*",
"@vben/types": "workspace:*",
"@vben/utils": "workspace:*",
"vue": "^3.4.37",
"vue": "^3.4.38",
"vue-router": "^4.4.3",
"watermark-js-plus": "^1.5.3"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/effects/layouts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@vben/types": "workspace:*",
"@vben/utils": "workspace:*",
"@vueuse/core": "^11.0.0",
"vue": "^3.4.37",
"vue": "^3.4.38",
"vue-router": "^4.4.3"
}
}
2 changes: 1 addition & 1 deletion packages/locales/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"dependencies": {
"@intlify/core-base": "^9.14.0",
"vue": "^3.4.37",
"vue": "^3.4.38",
"vue-i18n": "^9.14.0"
}
}
2 changes: 1 addition & 1 deletion packages/stores/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@vben-core/typings": "workspace:*",
"pinia": "2.2.2",
"pinia-plugin-persistedstate": "^3.2.1",
"vue": "^3.4.37",
"vue": "^3.4.38",
"vue-router": "^4.4.3"
}
}
2 changes: 1 addition & 1 deletion packages/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"dependencies": {
"@vben-core/typings": "workspace:*",
"vue": "^3.4.37",
"vue": "^3.4.38",
"vue-router": "^4.4.3"
}
}
2 changes: 1 addition & 1 deletion playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Loading

0 comments on commit 9120d20

Please sign in to comment.