Merge pull request #19 from vbenjs/feature/type-check-0705

vince292007 · web-flow · commit ad6ae1d21d7c · 2024-07-05T11:14:57.000+08:00
fix: Typecheck and loop dependency problem repair
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -16,21 +16,17 @@ categories:
       - "enhancement"
   - title: "🐞 Bug Fixes"
     labels:
-      - "fix"
-      - "bugfix"
       - "bug"
   - title: 📝 Documentation updates
     labels:
       - "documentation"
-      - "docs"
   - title: 👻 Maintenance
     labels:
       - "chore"
       - "dependencies"
     collapse-after: 5
   - title: 🚦 Tests
     labels:
-      - "test"
       - "tests"
   - title: "Breaking"
     label: "breaking"
diff --git a/.tazerc.json b/.tazerc.json
@@ -1,3 +1,3 @@
 {
-  "exclude": ["zx", "eslint"]
+  "exclude": ["zx", "eslint", "eslint-plugin-unused-imports"]
 }
diff --git a/internal/lint-configs/eslint-config/package.json b/internal/lint-configs/eslint-config/package.json
@@ -46,7 +46,7 @@
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-regexp": "^2.6.0",
     "eslint-plugin-unicorn": "^54.0.0",
-    "eslint-plugin-unused-imports": "^4.0.0",
+    "eslint-plugin-unused-imports": "^3.2.0",
     "eslint-plugin-vitest": "^0.5.4",
     "eslint-plugin-vue": "^9.27.0",
     "globals": "^15.8.0",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "vben-admin",
-  "version": "5.0.0-alpha.1",
+  "name": "vben-admin-pro",
+  "version": "5.0.0",
   "private": true,
   "keywords": [
     "monorepo",
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/floating-button-group/floating-button-group.vue b/packages/@core/ui-kit/shadcn-ui/src/components/floating-button-group/floating-button-group.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/floating-button-group/index.ts b/packages/@core/ui-kit/shadcn-ui/src/components/floating-button-group/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/index.ts b/packages/@core/ui-kit/shadcn-ui/src/components/index.ts
@@ -8,7 +8,6 @@ export * from './checkbox';
 export * from './context-menu';
 export * from './count-to-animator';
 export * from './dropdown-menu';
-export * from './floating-button-group';
 export * from './full-screen';
 export * from './hover-card';
 export * from './icon';
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectContent.vue b/packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectContent.vue
@@ -12,7 +12,8 @@ import {
   useForwardPropsEmits,
 } from 'radix-vue';
 
-import { SelectScrollDownButton, SelectScrollUpButton } from '.';
+import SelectScrollDownButton from './SelectScrollDownButton.vue';
+import SelectScrollUpButton from './SelectScrollUpButton.vue';
 
 defineOptions({
   inheritAttrs: false,
diff --git a/packages/business/access/src/generate-menu-and-routes/generate-routes-backend.ts b/packages/business/access/src/generate-menu-and-routes/generate-routes-backend.ts
@@ -15,7 +15,7 @@ import { mapTree } from '@vben-core/toolkit';
 async function generateRoutesByBackend(
   options: GeneratorMenuAndRoutesOptions,
 ): Promise<RouteRecordRaw[]> {
-  const { fetchMenuListAsync, layoutMap, pageMap } = options;
+  const { fetchMenuListAsync, layoutMap = {}, pageMap = {} } = options;
 
   try {
     const menuRoutes = await fetchMenuListAsync?.();
diff --git a/packages/business/layouts/package.json b/packages/business/layouts/package.json
@@ -46,7 +46,6 @@
     "@vben-core/stores": "workspace:*",
     "@vben-core/tabs-ui": "workspace:*",
     "@vben-core/toolkit": "workspace:*",
-    "@vben/constants": "workspace:*",
     "@vben/locales": "workspace:*",
     "@vben/widgets": "workspace:*",
     "vue": "^3.4.31",
diff --git a/packages/business/layouts/src/basic/layout.vue b/packages/business/layouts/src/basic/layout.vue
@@ -152,7 +152,6 @@ function toggleSidebar() {
 
     <template #floating-groups>
       <VbenBackTop />
-      <!-- <VbenFloatingButtonGroup /> -->
     </template>
 
     <!-- logo -->
diff --git a/packages/business/layouts/src/basic/tabbar/use-tabs.ts b/packages/business/layouts/src/basic/tabbar/use-tabs.ts
@@ -2,7 +2,7 @@ import type { IContextMenuItem } from '@vben-core/tabs-ui';
 import type { TabItem } from '@vben-core/typings';
 import type {
   RouteLocationNormalized,
-  RouteRecordNormalized,
+  RouteLocationNormalizedGeneric,
 } from 'vue-router';
 
 import { computed, ref, watch } from 'vue';
@@ -34,8 +34,7 @@ function useTabs() {
   });
 
   const { locale } = useI18n();
-  const currentTabs =
-    ref<(RouteLocationNormalized | RouteRecordNormalized)[]>();
+  const currentTabs = ref<RouteLocationNormalizedGeneric[]>();
   watch([() => tabsStore.getTabs, () => locale.value], ([tabs, _]) => {
     currentTabs.value = tabs.map((item) => wrapperTabLocale(item));
   });
@@ -60,9 +59,7 @@ function useTabs() {
     await tabsStore.closeTabByKey(key, router);
   };
 
-  function wrapperTabLocale(
-    tab: RouteLocationNormalized | RouteRecordNormalized,
-  ) {
+  function wrapperTabLocale(tab: RouteLocationNormalizedGeneric) {
     return {
       ...tab,
       meta: {
diff --git a/packages/business/universal-ui/package.json b/packages/business/universal-ui/package.json
@@ -42,9 +42,7 @@
   "dependencies": {
     "@vben-core/design": "workspace:*",
     "@vben-core/iconify": "workspace:*",
-    "@vben-core/preferences": "workspace:*",
     "@vben-core/shadcn-ui": "workspace:*",
-    "@vben/chart-ui": "workspace:*",
     "@vben/locales": "workspace:*",
     "@vben/types": "workspace:*",
     "@vueuse/integrations": "^10.11.0",
diff --git a/packages/business/universal-ui/tsconfig.json b/packages/business/universal-ui/tsconfig.json
@@ -2,7 +2,7 @@
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@vben/tsconfig/web.json",
   "compilerOptions": {
-    "types": ["@vben/types/window"]
+    "types": ["@vben/types/global"]
   },
   "include": ["src"],
   "exclude": ["node_modules"]
diff --git a/packages/business/widgets/package.json b/packages/business/widgets/package.json
@@ -46,11 +46,8 @@
     "@vben-core/preferences": "workspace:*",
     "@vben-core/shadcn-ui": "workspace:*",
     "@vben-core/toolkit": "workspace:*",
-    "@vben/chart-ui": "workspace:*",
     "@vben/locales": "workspace:*",
     "@vueuse/core": "^10.11.0",
-    "@vueuse/integrations": "^10.11.0",
-    "qrcode": "^1.5.3",
     "vue": "^3.4.31",
     "vue-router": "^4.4.0"
   },
diff --git a/packages/business/widgets/src/preferences/blocks/layout/breadcrumb.vue b/packages/business/widgets/src/preferences/blocks/layout/breadcrumb.vue
@@ -37,12 +37,15 @@ const disableItem = computed(() => {
   <SwitchItem v-model="breadcrumbHideOnlyOne" :disabled="disableItem">
     {{ $t('preferences.breadcrumb.hide-only-one') }}
   </SwitchItem>
-  <SwitchItem v-model="breadcrumbShowHome" :disabled="disableItem">
-    {{ $t('preferences.breadcrumb.home') }}
-  </SwitchItem>
   <SwitchItem v-model="breadcrumbShowIcon" :disabled="disableItem">
     {{ $t('preferences.breadcrumb.icon') }}
   </SwitchItem>
+  <SwitchItem
+    v-model="breadcrumbShowHome"
+    :disabled="disableItem || !breadcrumbShowIcon"
+  >
+    {{ $t('preferences.breadcrumb.home') }}
+  </SwitchItem>
   <ToggleItem
     v-model="breadcrumbStyleType"
     :disabled="disableItem"
diff --git a/packages/types/global.d.ts b/packages/types/global.d.ts
@@ -5,3 +5,21 @@ import 'vue-router';
 declare module 'vue-router' {
   interface RouteMeta extends IRouteMeta {}
 }
+
+declare global {
+  // interface Window {
+  const __VBEN_ADMIN_METADATA__: {
+    authorEmail: string;
+    authorName: string;
+    authorUrl: string;
+    buildTime: string;
+    dependencies: Record<string, string>;
+    description: string;
+    devDependencies: Record<string, string>;
+    homepage: string;
+    license: string;
+    repositoryUrl: string;
+    version: string;
+  };
+  // }
+}
diff --git a/packages/types/package.json b/packages/types/package.json
@@ -28,9 +28,6 @@
     },
     "./global": {
       "types": "./global.d.ts"
-    },
-    "./window": {
-      "types": "./window.d.ts"
     }
   },
   "publishConfig": {
diff --git a/packages/types/window.d.ts b/packages/types/window.d.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/vsh/src/check-circular/index.ts b/scripts/vsh/src/check-circular/index.ts

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "exclude": ["zx", "eslint"]`
	`2`	`+ "exclude": ["zx", "eslint", "eslint-plugin-unused-imports"]`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "name": "vben-admin",`
`3`		`- "version": "5.0.0-alpha.1",`
	`2`	`+ "name": "vben-admin-pro",`
	`3`	`+ "version": "5.0.0",`
`4`	`4`	`"private": true,`
`5`	`5`	`"keywords": [`
`6`	`6`	`"monorepo",`