From 28b54b587ae67846989436b4b4da024831d65f1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2024 09:52:04 +0800 Subject: [PATCH] chore(deps): bump the non-breaking-changes group with 3 updates (#4561) * chore(deps): bump the non-breaking-changes group with 3 updates Bumps the non-breaking-changes group with 3 updates: [@changesets/cli](https://github.com/changesets/changesets), [vue](https://github.com/vuejs/core) and [@vue/shared](https://github.com/vuejs/core/tree/HEAD/packages/shared). Updates `@changesets/cli` from 2.27.8 to 2.27.9 - [Release notes](https://github.com/changesets/changesets/releases) - [Changelog](https://github.com/changesets/changesets/blob/main/docs/modifying-changelog-format.md) - [Commits](https://github.com/changesets/changesets/compare/@changesets/cli@2.27.8...@changesets/cli@2.27.9) Updates `vue` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/vuejs/core/releases) - [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md) - [Commits](https://github.com/vuejs/core/compare/v3.5.10...v3.5.11) Updates `@vue/shared` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/vuejs/core/releases) - [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md) - [Commits](https://github.com/vuejs/core/commits/v3.5.11/packages/shared) --- updated-dependencies: - dependency-name: "@changesets/cli" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: non-breaking-changes - dependency-name: vue dependency-type: direct:production update-type: version-update:semver-patch dependency-group: non-breaking-changes - dependency-name: "@vue/shared" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: non-breaking-changes ... Signed-off-by: dependabot[bot] * chore: update deps --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- apps/backend-mock/api/menu/all.ts | 2 +- apps/backend-mock/api/user/info.ts | 1 - .../eslint-config/src/configs/unicorn.ts | 1 + package.json | 8 +- .../widgets/global-search/search-panel.vue | 2 +- packages/stores/src/modules/tabbar.ts | 2 +- .../src/views/examples/vxe-table/basic.vue | 2 +- pnpm-lock.yaml | 2924 +++++++---------- pnpm-workspace.yaml | 28 +- 9 files changed, 1197 insertions(+), 1773 deletions(-) diff --git a/apps/backend-mock/api/menu/all.ts b/apps/backend-mock/api/menu/all.ts index b27b7ea46f7..580cee4f933 100644 --- a/apps/backend-mock/api/menu/all.ts +++ b/apps/backend-mock/api/menu/all.ts @@ -1,7 +1,7 @@ import { verifyAccessToken } from '~/utils/jwt-utils'; import { unAuthorizedResponse } from '~/utils/response'; -export default eventHandler((event) => { +export default eventHandler(async (event) => { const userinfo = verifyAccessToken(event); if (!userinfo) { return unAuthorizedResponse(event); diff --git a/apps/backend-mock/api/user/info.ts b/apps/backend-mock/api/user/info.ts index e3526ae5b5c..cfa2346cb69 100644 --- a/apps/backend-mock/api/user/info.ts +++ b/apps/backend-mock/api/user/info.ts @@ -6,6 +6,5 @@ export default eventHandler((event) => { if (!userinfo) { return unAuthorizedResponse(event); } - return useResponseSuccess(userinfo); }); diff --git a/internal/lint-configs/eslint-config/src/configs/unicorn.ts b/internal/lint-configs/eslint-config/src/configs/unicorn.ts index a160726fb57..3ce6f81cd3f 100644 --- a/internal/lint-configs/eslint-config/src/configs/unicorn.ts +++ b/internal/lint-configs/eslint-config/src/configs/unicorn.ts @@ -26,6 +26,7 @@ export async function unicorn(): Promise { 'unicorn/prefer-at': 'off', 'unicorn/prefer-dom-node-text-content': 'off', 'unicorn/prefer-export-from': ['error', { ignoreUsedVariables: true }], + 'unicorn/prefer-global-this': 'off', 'unicorn/prefer-top-level-await': 'off', 'unicorn/prevent-abbreviations': 'off', }, diff --git a/package.json b/package.json index cb1d13aebb5..134ee34a84b 100644 --- a/package.json +++ b/package.json @@ -107,10 +107,10 @@ } }, "overrides": { - "@ctrl/tinycolor": "4.1.0", - "clsx": "2.1.1", - "pinia": "2.2.2", - "vue": "3.5.10" + "@ctrl/tinycolor": "catalog:", + "clsx": "catalog:", + "pinia": "catalog:", + "vue": "catalog:" }, "neverBuiltDependencies": [ "canvas", diff --git a/packages/effects/layouts/src/widgets/global-search/search-panel.vue b/packages/effects/layouts/src/widgets/global-search/search-panel.vue index 9f648ac3f6a..36ad5a94921 100644 --- a/packages/effects/layouts/src/widgets/global-search/search-panel.vue +++ b/packages/effects/layouts/src/widgets/global-search/search-panel.vue @@ -150,7 +150,7 @@ function removeItem(index: number) { } else { searchHistory.value.splice(index, 1); } - activeIndex.value = activeIndex.value - 1 >= 0 ? activeIndex.value - 1 : 0; + activeIndex.value = Math.max(activeIndex.value - 1, 0); scrollIntoView(); } diff --git a/packages/stores/src/modules/tabbar.ts b/packages/stores/src/modules/tabbar.ts index 6646ec9e773..0c3850e7869 100644 --- a/packages/stores/src/modules/tabbar.ts +++ b/packages/stores/src/modules/tabbar.ts @@ -209,7 +209,7 @@ export const useTabbarStore = defineStore('core-tabbar', { (item) => getTabPath(item) === getTabPath(tab), ); - if (index >= 0 && index < this.tabs.length - 1) { + if (index !== -1 && index < this.tabs.length - 1) { const rightTabs = this.tabs.slice(index + 1); const paths: string[] = []; diff --git a/playground/src/views/examples/vxe-table/basic.vue b/playground/src/views/examples/vxe-table/basic.vue index 69b0e090752..75c034c1b48 100644 --- a/playground/src/views/examples/vxe-table/basic.vue +++ b/playground/src/views/examples/vxe-table/basic.vue @@ -75,7 +75,7 @@ function changeLoading() {