diff --git a/.npmrc b/.npmrc index e7246cde..f4a1ad48 100644 --- a/.npmrc +++ b/.npmrc @@ -1,4 +1,4 @@ -# registry = "https://registry.npmmirror.com" +registry = "https://registry.npmmirror.com" public-hoist-pattern[]=husky public-hoist-pattern[]=eslint public-hoist-pattern[]=prettier diff --git a/README.ja-JP.md b/README.ja-JP.md index 89635775..db51cad8 100644 --- a/README.ja-JP.md +++ b/README.ja-JP.md @@ -78,7 +78,7 @@ pnpm build ## 変更ログ -[CHANGELOG](./CHANGELOG.zh_CN.md) +[CHANGELOG](https://github.com/vbenjs/vue-vben-admin/releases/latest) ## 貢献方法 diff --git a/README.md b/README.md index 3d2c4ec3..7427a930 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ pnpm build ## Change Log -[CHANGELOG](./CHANGELOG.zh_CN.md) +[CHANGELOG](https://github.com/vbenjs/vue-vben-admin/releases/latest) ## How to contribute diff --git a/README.zh-CN.md b/README.zh-CN.md index 5f55ec08..e9c97680 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -126,6 +126,10 @@ pnpm build Paypal Me +## 更新日志 + +[CHANGELOG](https://github.com/vbenjs/vue-vben-admin/releases/latest) + ## Contributor diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index 84d9accf..e64c3aa2 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -40,14 +40,14 @@ "@vben/styles": "workspace:*", "@vben/types": "workspace:*", "@vben/utils": "workspace:*", - "@vueuse/core": "^10.11.1", + "@vueuse/core": "^11.0.0", "ant-design-vue": "^4.2.3", "crypto-js": "^4.2.0", "dayjs": "^1.11.12", "echarts": "^5.5.1", "jsencrypt": "^3.3.2", "lodash-es": "^4.17.21", - "pinia": "2.2.1", + "pinia": "2.2.2", "vue": "^3.4.37", "vue-router": "^4.4.3" }, diff --git a/apps/web-ele/package.json b/apps/web-ele/package.json index 222b10aa..f16e39ba 100644 --- a/apps/web-ele/package.json +++ b/apps/web-ele/package.json @@ -40,10 +40,10 @@ "@vben/styles": "workspace:*", "@vben/types": "workspace:*", "@vben/utils": "workspace:*", - "@vueuse/core": "^10.11.1", + "@vueuse/core": "^11.0.0", "dayjs": "^1.11.12", "element-plus": "^2.8.0", - "pinia": "2.2.1", + "pinia": "2.2.2", "vue": "^3.4.37", "vue-router": "^4.4.3" }, diff --git a/apps/web-naive/package.json b/apps/web-naive/package.json index 8ddc4872..a4e73e0c 100644 --- a/apps/web-naive/package.json +++ b/apps/web-naive/package.json @@ -40,9 +40,9 @@ "@vben/styles": "workspace:*", "@vben/types": "workspace:*", "@vben/utils": "workspace:*", - "@vueuse/core": "^10.11.1", + "@vueuse/core": "^11.0.0", "naive-ui": "^2.39.0", - "pinia": "2.2.1", + "pinia": "2.2.2", "vue": "^3.4.37", "vue-router": "^4.4.3" } diff --git a/internal/lint-configs/eslint-config/package.json b/internal/lint-configs/eslint-config/package.json index 0dd96255..3b4639ba 100644 --- a/internal/lint-configs/eslint-config/package.json +++ b/internal/lint-configs/eslint-config/package.json @@ -27,7 +27,7 @@ } }, "dependencies": { - "eslint-config-turbo": "^2.0.13", + "eslint-config-turbo": "^2.0.14", "eslint-plugin-command": "^0.2.3", "eslint-plugin-import-x": "^3.1.0" }, @@ -42,8 +42,8 @@ "eslint-plugin-jsdoc": "^50.2.2", "eslint-plugin-jsonc": "^2.16.0", "eslint-plugin-n": "^17.10.2", - "eslint-plugin-no-only-tests": "^3.1.0", - "eslint-plugin-perfectionist": "^3.1.3", + "eslint-plugin-no-only-tests": "^3.3.0", + "eslint-plugin-perfectionist": "^3.2.0", "eslint-plugin-prettier": "^5.2.1", "eslint-plugin-regexp": "^2.6.0", "eslint-plugin-unicorn": "^55.0.0", diff --git a/internal/lint-configs/eslint-config/src/configs/typescript.ts b/internal/lint-configs/eslint-config/src/configs/typescript.ts index a97f0c04..0ac12df5 100644 --- a/internal/lint-configs/eslint-config/src/configs/typescript.ts +++ b/internal/lint-configs/eslint-config/src/configs/typescript.ts @@ -42,7 +42,8 @@ export async function typescript(): Promise { }, ], - '@typescript-eslint/consistent-type-definitions': ['warn', 'interface'], + // '@typescript-eslint/consistent-type-definitions': ['warn', 'interface'], + '@typescript-eslint/consistent-type-definitions': 'off', '@typescript-eslint/explicit-function-return-type': 'off', '@typescript-eslint/explicit-module-boundary-types': 'off', '@typescript-eslint/no-empty-function': [ diff --git a/internal/lint-configs/stylelint-config/package.json b/internal/lint-configs/stylelint-config/package.json index 8c5ee53f..b80b54f0 100644 --- a/internal/lint-configs/stylelint-config/package.json +++ b/internal/lint-configs/stylelint-config/package.json @@ -32,7 +32,7 @@ "postcss-html": "^1.7.0", "postcss-scss": "^4.0.9", "prettier": "^3.3.3", - "stylelint": "^16.8.1", + "stylelint": "^16.8.2", "stylelint-config-recommended": "^14.0.1", "stylelint-config-recommended-scss": "^14.1.0", "stylelint-config-recommended-vue": "^1.5.0", diff --git a/internal/node-utils/package.json b/internal/node-utils/package.json index 3aae01c3..18557b81 100644 --- a/internal/node-utils/package.json +++ b/internal/node-utils/package.json @@ -33,7 +33,7 @@ "chalk": "^5.3.0", "consola": "^3.2.3", "dayjs": "^1.11.12", - "execa": "^9.3.0", + "execa": "^9.3.1", "find-up": "^7.0.0", "nanoid": "^5.0.7", "ora": "^8.0.1", diff --git a/internal/tsconfig/package.json b/internal/tsconfig/package.json index 2edbf294..e3760318 100644 --- a/internal/tsconfig/package.json +++ b/internal/tsconfig/package.json @@ -20,6 +20,6 @@ ], "dependencies": { "@vben/types": "workspace:*", - "vite": "^5.4.0" + "vite": "^5.4.1" } } diff --git a/internal/vite-config/package.json b/internal/vite-config/package.json index 55e69a64..f99ce996 100644 --- a/internal/vite-config/package.json +++ b/internal/vite-config/package.json @@ -48,7 +48,7 @@ "rollup": "^4.20.0", "rollup-plugin-visualizer": "^5.12.0", "sass": "^1.77.8", - "vite": "^5.4.0", + "vite": "^5.4.1", "vite-plugin-compression": "^0.5.1", "vite-plugin-dts": "4.0.3", "vite-plugin-html": "^3.2.2" diff --git a/package.json b/package.json index 64ad505e..96550659 100644 --- a/package.json +++ b/package.json @@ -82,10 +82,10 @@ "lint-staged": "^15.2.9", "rimraf": "^6.0.1", "tailwindcss": "^3.4.10", - "turbo": "^2.0.13", + "turbo": "^2.0.14", "typescript": "^5.5.4", "unbuild": "^2.0.0", - "vite": "^5.4.0", + "vite": "^5.4.1", "vitest": "^2.0.5", "vue": "^3.4.37", "vue-tsc": "^2.0.29" @@ -94,7 +94,7 @@ "node": ">=20", "pnpm": ">=9" }, - "packageManager": "pnpm@9.7.0", + "packageManager": "pnpm@9.7.1", "pnpm": { "peerDependencyRules": { "allowedVersions": { @@ -102,9 +102,10 @@ } }, "overrides": { - "@ctrl/tinycolor": "^4.1.0", - "clsx": "^2.1.1", - "vue": "^3.4.37" + "@ctrl/tinycolor": "4.1.0", + "clsx": "2.1.1", + "pinia": "2.2.2", + "vue": "3.4.37" }, "neverBuiltDependencies": [ "canvas", diff --git a/packages/@core/base/design/src/design-tokens/dark/index.css b/packages/@core/base/design/src/design-tokens/dark/index.css index dab8980c..64811a35 100644 --- a/packages/@core/base/design/src/design-tokens/dark/index.css +++ b/packages/@core/base/design/src/design-tokens/dark/index.css @@ -351,7 +351,7 @@ --ring: 240 4.9% 83.9%; --sidebar: 240 10% 3.9%; --sidebar-deep: 240 10% 3.9%; - --header: 240 4.9% 83.9%; + --header: 240 10% 3.9%; } .dark[data-theme='neutral'], diff --git a/packages/@core/base/icons/package.json b/packages/@core/base/icons/package.json index 26639004..44d43335 100644 --- a/packages/@core/base/icons/package.json +++ b/packages/@core/base/icons/package.json @@ -35,7 +35,7 @@ }, "dependencies": { "@iconify/vue": "^4.1.2", - "lucide-vue-next": "^0.427.0", + "lucide-vue-next": "^0.428.0", "vue": "^3.4.37" } } diff --git a/packages/@core/base/typings/src/helper.d.ts b/packages/@core/base/typings/src/helper.d.ts index fdc85edf..8a6385b4 100644 --- a/packages/@core/base/typings/src/helper.d.ts +++ b/packages/@core/base/typings/src/helper.d.ts @@ -107,20 +107,23 @@ type MergeAll< ? MergeAll> : R; -export { - type AnyFunction, - type AnyNormalFunction, - type AnyPromiseFunction, - type DeepPartial, - type DeepReadonly, - type IntervalHandle, - type MaybeComputedRef, - type MaybeReadonlyRef, - type Merge, - type MergeAll, - type NonNullable, - type Nullable, - type ReadonlyRecordable, - type Recordable, - type TimeoutHandle, +type EmitType = (name: Name, ...args: any[]) => void; + +export type { + AnyFunction, + AnyNormalFunction, + AnyPromiseFunction, + DeepPartial, + DeepReadonly, + EmitType, + IntervalHandle, + MaybeComputedRef, + MaybeReadonlyRef, + Merge, + MergeAll, + NonNullable, + Nullable, + ReadonlyRecordable, + Recordable, + TimeoutHandle, }; diff --git a/packages/@core/composables/package.json b/packages/@core/composables/package.json index 02fb9e87..e8485016 100644 --- a/packages/@core/composables/package.json +++ b/packages/@core/composables/package.json @@ -36,7 +36,7 @@ }, "dependencies": { "@vben-core/shared": "workspace:*", - "@vueuse/core": "^10.11.1", + "@vueuse/core": "^11.0.0", "radix-vue": "^1.9.4", "sortablejs": "^1.15.2", "vue": "^3.4.37" diff --git a/packages/@core/composables/src/use-content-style.ts b/packages/@core/composables/src/use-content-style.ts index 7c9b777c..94aa2148 100644 --- a/packages/@core/composables/src/use-content-style.ts +++ b/packages/@core/composables/src/use-content-style.ts @@ -1,5 +1,5 @@ import type { CSSProperties } from 'vue'; -import { computed, nextTick, onMounted, ref } from 'vue'; +import { computed, onMounted, onUnmounted, ref } from 'vue'; import { CSS_VARIABLE_LAYOUT_CONTENT_HEIGHT, @@ -14,6 +14,7 @@ import { useCssVar, useDebounceFn } from '@vueuse/core'; * @zh_CN content style */ function useContentStyle() { + let resizeObserver: null | ResizeObserver = null; const contentElement = ref(null); const visibleDomRect = ref(null); const contentHeight = useCssVar(CSS_VARIABLE_LAYOUT_CONTENT_HEIGHT); @@ -41,12 +42,15 @@ function useContentStyle() { ); onMounted(() => { - nextTick(() => { - if (contentElement.value) { - const observer = new ResizeObserver(debouncedCalcHeight); - observer.observe(contentElement.value); - } - }); + if (contentElement.value && !resizeObserver) { + resizeObserver = new ResizeObserver(debouncedCalcHeight); + resizeObserver.observe(contentElement.value); + } + }); + + onUnmounted(() => { + resizeObserver?.disconnect(); + resizeObserver = null; }); return { contentElement, overlayStyle, visibleDomRect }; diff --git a/packages/@core/composables/src/use-sortable.test.ts b/packages/@core/composables/src/use-sortable.test.ts index 6210bb47..70aa2234 100644 --- a/packages/@core/composables/src/use-sortable.test.ts +++ b/packages/@core/composables/src/use-sortable.test.ts @@ -39,7 +39,7 @@ describe('useSortable', () => { expect(Sortable.default.create).toHaveBeenCalledWith( mockElement, expect.objectContaining({ - animation: 100, + animation: 300, delay: 400, delayOnTouchOnly: true, ...customOptions, diff --git a/packages/@core/composables/src/use-sortable.ts b/packages/@core/composables/src/use-sortable.ts index 527226fd..6659db83 100644 --- a/packages/@core/composables/src/use-sortable.ts +++ b/packages/@core/composables/src/use-sortable.ts @@ -18,7 +18,7 @@ function useSortable( // Sortable?.default?.mount?.(AutoScroll); const sortable = Sortable?.default?.create?.(sortableContainer, { - animation: 100, + animation: 300, delay: 400, delayOnTouchOnly: true, ...options, diff --git a/packages/@core/preferences/package.json b/packages/@core/preferences/package.json index 27365f6e..2e043696 100644 --- a/packages/@core/preferences/package.json +++ b/packages/@core/preferences/package.json @@ -31,7 +31,7 @@ "dependencies": { "@vben-core/shared": "workspace:*", "@vben-core/typings": "workspace:*", - "@vueuse/core": "^10.11.1", + "@vueuse/core": "^11.0.0", "vue": "^3.4.37" } } diff --git a/packages/@core/ui-kit/layout-ui/package.json b/packages/@core/ui-kit/layout-ui/package.json index f9299839..c0dd5f63 100644 --- a/packages/@core/ui-kit/layout-ui/package.json +++ b/packages/@core/ui-kit/layout-ui/package.json @@ -41,7 +41,7 @@ "@vben-core/icons": "workspace:*", "@vben-core/shadcn-ui": "workspace:*", "@vben-core/typings": "workspace:*", - "@vueuse/core": "^10.11.1", + "@vueuse/core": "^11.0.0", "vue": "^3.4.37" } } diff --git a/packages/@core/ui-kit/menu-ui/package.json b/packages/@core/ui-kit/menu-ui/package.json index 22ce331f..c452f05c 100644 --- a/packages/@core/ui-kit/menu-ui/package.json +++ b/packages/@core/ui-kit/menu-ui/package.json @@ -42,7 +42,7 @@ "@vben-core/shadcn-ui": "workspace:*", "@vben-core/shared": "workspace:*", "@vben-core/typings": "workspace:*", - "@vueuse/core": "^10.11.1", + "@vueuse/core": "^11.0.0", "vue": "^3.4.37" } } diff --git a/packages/@core/ui-kit/shadcn-ui/package.json b/packages/@core/ui-kit/shadcn-ui/package.json index 049e5fc6..69f96e00 100644 --- a/packages/@core/ui-kit/shadcn-ui/package.json +++ b/packages/@core/ui-kit/shadcn-ui/package.json @@ -46,9 +46,9 @@ "@vben-core/icons": "workspace:*", "@vben-core/shared": "workspace:*", "@vben-core/typings": "workspace:*", - "@vueuse/core": "^10.11.1", + "@vueuse/core": "^11.0.0", "class-variance-authority": "^0.7.0", - "lucide-vue-next": "^0.427.0", + "lucide-vue-next": "^0.428.0", "radix-vue": "^1.9.4", "vue": "^3.4.37" } diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/scrollbar/scrollbar.vue b/packages/@core/ui-kit/shadcn-ui/src/components/scrollbar/scrollbar.vue index fe612db4..b6444df0 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/scrollbar/scrollbar.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/scrollbar/scrollbar.vue @@ -1,5 +1,5 @@