fix: 整理依赖，@vben/use 并入 @vben/hooks

     @vueuse相关放入@vben/utils

apps/admin/package.json

@@ -34,7 +34,6 @@
     "@vben/locale": "workspace:*",
     "@vben/request": "workspace:*",
     "@vben/styles": "workspace:*",
-    "@vben/use": "workspace:*",
     "@vben/utils": "workspace:*",
     "@vben/vbencomponents": "workspace:*",
     "dayjs": "^1.11.7",

apps/admin/src/app.vue

@@ -1,8 +1,9 @@
 <script lang="ts" setup>
 import { useLocale } from '@vben/locale'
-import { computedAsync, useWebTitle } from '@vben/use'
+import { useWebTitle } from '@vben/hooks'
+
 import { REDIRECT_NAME } from '@vben/constants'
-import { getGlobalConfig } from '@vben/utils'
+import { getGlobalConfig, computedAsync } from '@vben/utils'
 import AppProvider from '@/layout/components/app/AppProvider'
 import { dateEnUS, dateZhCN, enUS, zhCN } from 'naive-ui'
 import { useAppStore } from '@/store/modules/app'
@@ -13,7 +14,6 @@ const { title } = getGlobalConfig(import.meta.env)
 useWebTitle(title, (route) => route.name !== REDIRECT_NAME)
 const appStore = useAppStore()
 
-
 // Dynamic switch component library language
 const dateLocale = computedAsync(async () => {
   const message = {

apps/admin/src/hooks/event/use-event-listener.ts

@@ -1,6 +1,6 @@
 import type { Ref } from 'vue'
 import { ref, watch, unref } from 'vue'
-import { useThrottleFn, useDebounceFn } from '@vben/use'
+import { useThrottleFn, useDebounceFn } from '@vben/utils'
 
 export type RemoveEventFn = () => void
 export interface UseEventParams {

apps/admin/src/hooks/web/useAppContext.ts

@@ -1,4 +1,4 @@
-import { createContext, useContext } from '@vben/use'
+import { createContext, useContext } from '@vben/hooks'
 import { InjectionKey, Ref } from 'vue'
 
 export interface AppProviderContextProps {

apps/admin/src/hooks/web/useLockScreen.ts

@@ -1,85 +1,88 @@
-import {computed, onUnmounted, unref, watch, watchEffect} from 'vue';
-import {useThrottleFn} from '@vben/use';
+import { computed, onUnmounted, unref, watch, watchEffect } from 'vue'
+import { useThrottleFn } from '@vben/utils'
 
-import {useLockStore} from '@/store/lock';
-import {useConfigStore} from '@/store/config'
-import {useUserStore} from '@/store/user';
-import {useRootSetting} from '../setting/useRootSetting';
-import {BASIC_LOCK_PATH} from '@vben/constants'
-import {router} from "@/router";
+import { useLockStore } from '@/store/lock'
+import { useConfigStore } from '@/store/config'
+import { useUserStore } from '@/store/user'
+import { useRootSetting } from '../setting/useRootSetting'
+import { BASIC_LOCK_PATH } from '@vben/constants'
+import { router } from '@/router'
 
-const LOCK_PATH = BASIC_LOCK_PATH;
+const LOCK_PATH = BASIC_LOCK_PATH
 
 export function useLockScreen() {
-  const {getLockTime} = useRootSetting();
-  const lockStore = useLockStore();
-  const userStore = useUserStore();
+  const { getLockTime } = useRootSetting()
+  const lockStore = useLockStore()
+  const userStore = useUserStore()
   const configStore = useConfigStore()
 
-  let timeId: TimeoutHandle;
+  let timeId: TimeoutHandle
 
   function clear(): void {
-    window.clearTimeout(timeId);
+    window.clearTimeout(timeId)
   }
 
   function resetCalcLockTimeout(): void {
     // not login
     if (!userStore.getAccessToken) {
-      clear();
-      return;
+      clear()
+      return
     }
-    const lockTime = configStore.getProjectConfig.lockTime;
+    const lockTime = configStore.getProjectConfig.lockTime
     if (!lockTime || lockTime < 1) {
-      clear();
-      return;
+      clear()
+      return
     }
-    clear();
+    clear()
 
     timeId = setTimeout(() => {
-      lockPage();
-    }, lockTime * 60 * 1000);
+      lockPage()
+    }, lockTime * 60 * 1000)
   }
 
   function lockPage(): void {
     lockStore.setLockInfo({
       isLock: true,
-      pwd: undefined
-    });
+      pwd: undefined,
+    })
   }
 
   watchEffect((onClean) => {
     if (userStore.getAccessToken) {
-      resetCalcLockTimeout();
+      resetCalcLockTimeout()
     } else {
-      clear();
+      clear()
     }
     onClean(() => {
-      clear();
-    });
-  });
+      clear()
+    })
+  })
 
-  watch(() => lockStore.getLockInfo?.isLock,
+  watch(
+    () => lockStore.getLockInfo?.isLock,
     (newValue) => {
       if (newValue) {
         router.replace({
           path: LOCK_PATH,
-          query: {redirect: unref(router.currentRoute).path}
+          query: { redirect: unref(router.currentRoute).path },
         })
       }
-    }, {deep: true})
+    },
+    { deep: true },
+  )
 
   onUnmounted(() => {
-    clear();
-  });
+    clear()
+  })
 
-  const keyupFn = useThrottleFn(resetCalcLockTimeout, 2000);
+  const keyupFn = useThrottleFn(resetCalcLockTimeout, 2000)
 
   return computed(() => {
     if (unref(getLockTime)) {
-      return {onKeyup: keyupFn, onMousemove: keyupFn};
+      return { onKeyup: keyupFn, onMousemove: keyupFn }
     } else {
-      clear();
-      return {};
+      clear()
+      return {}
     }
-  });
+  })
 }

apps/admin/src/layout/components/useLockPage.ts

@@ -1,5 +1,5 @@
 import { computed, onUnmounted, watchEffect } from 'vue'
-import { useThrottleFn } from '@vben/use'
+import { useThrottleFn } from '@vben/hooks'
 import { useLockStore } from '@/store/lock'
 import { useUserStore } from '@/store/user'
 

apps/admin/src/pages/sys/lock/use-now.ts

@@ -1,5 +1,5 @@
 import { dateUtil } from '@vben/utils'
-import { tryOnMounted, tryOnUnmounted } from '@vben/use'
+import { tryOnMounted, tryOnUnmounted } from '@vben/utils'
 import { reactive, toRefs } from 'vue'
 
 export function useNow(immediate = true) {

apps/admin/src/store/multipleTab.ts

@@ -8,12 +8,12 @@ import { toRaw, unref } from 'vue'
 import { defineStore } from 'pinia'
 // import { store } from '/@/store';
 
-import { useGo, useRedo, useLocalStorage, RemovableRef } from '@vben/use'
+import { useGo, useRedo } from '@vben/hooks'
 // import { Persistent } from '/@/utils/cache/persistent';
 
 import { PageEnum } from '@vben/constants'
 import { PAGE_NOT_FOUND_ROUTE, REDIRECT_ROUTE } from '@/router/routes/basic'
-import { getRawRoute } from '@vben/utils'
+import { getRawRoute, useLocalStorage, RemovableRef } from '@vben/utils'
 import { useUserStore } from '@/store/user'
 // import { useRouter, useRoute } from 'vue-router'
 // import { router } from '@/router'

packages/components/package.json

@@ -11,7 +11,6 @@
     "@iconify/iconify": "^3.0.0",
     "@vben/constants": "workspace:*",
     "@vben/locale": "workspace:*",
-    "@vben/use": "workspace:*",
     "@vben/utils": "workspace:*",
     "qrcode": "^1.5.1",
     "vue": "3.2.45",

packages/components/src/count-to/index.vue

@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { ref, computed, watchEffect, unref, onMounted, watch } from 'vue'
-import { useTransition, TransitionPresets } from '@vben/use'
-import { isNumber } from '@vben/utils'
+import { isNumber, useTransition, TransitionPresets } from '@vben/utils'
 
 const props = defineProps({
   startVal: { type: Number, default: 0 },

packages/components/src/countdown-input/use-countdown.ts

@@ -1,5 +1,5 @@
 import { ref, unref } from 'vue'
-import { tryOnUnmounted } from '@vben/use'
+import { tryOnUnmounted } from '@vben/utils'
 
 export function useCountdown(count: number) {
   const currentCount = ref(count)

packages/components/src/time/index.vue

@@ -1,14 +1,14 @@
 <script setup lang="ts">
 import { ref, watch } from 'vue'
 import { useI18n } from '@vben/locale'
-import { useIntervalFn } from '@vben/use'
 import {
   formatToDateTime,
   formatToDate,
   dateUtil,
   isNumber,
   isObject,
   isString,
+  useIntervalFn,
 } from '@vben/utils'
 
 const ONE_SECONDS = 1000

packages/hooks/package.json

@@ -8,13 +8,15 @@
     "clean": "pnpm rimraf node_modules && pnpm rimraf dist && pnpm rimraf .turbo"
   },
   "dependencies": {
+  "@vben/locale": "workspace:*",
     "@vben/constants": "workspace:*",
     "@vben/utils": "workspace:*",
-    "@vben/use": "workspace:*",
-    "vue": "^3.2.45"
+    "vue": "^3.2.45",
+    "vue-router": "^4.1.6"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.6",
     "@vben/types": "workspace:*"
+
   }
 }

packages/hooks/src/index.ts

@@ -1,2 +1,6 @@
 export * from './usePromise'
 export * from './web'
+export * from './useTitle'
+export * from './usePage'
+export * from './useContext'
+export * from './useRefs'

packages/hooks/src/usePromise.ts

@@ -1,7 +1,11 @@
 import type { Ref, ShallowRef, UnwrapRef } from 'vue'
 import { effectScope, ref, shallowRef, unref, watch } from 'vue'
-import { containsProp, tryOnBeforeUnmount, useDebounceFn } from '@vben/use'
-import { isEqual } from '@vben/utils'
+import {
+  isEqual,
+  containsProp,
+  tryOnBeforeUnmount,
+  useDebounceFn,
+} from '@vben/utils'
 
 export interface UsePromiseConfig {
   /**

packages/use/src/use-title.ts → packages/hooks/src/useTitle.ts

@@ -2,7 +2,7 @@ import type { RouteLocationNormalizedLoaded } from 'vue-router'
 
 import { watch, unref } from 'vue'
 import { useRouter } from 'vue-router'
-import { useTitle as _useTitle } from '@vueuse/core'
+import { useTitle as _useTitle } from '@vben/utils'
 import { useI18n, useLocale } from '@vben/locale'
 
 /**

packages/layouts/package.json

@@ -13,7 +13,6 @@
     "@vben/hooks": "workspace:*",
     "@vben/locale": "workspace:*",
     "@vben/types": "workspace:*",
-    "@vben/use": "workspace:*",
     "@vben/utils": "workspace:*",
     "@vben/vbencomponents": "workspace:*",
     "vue": "3.2.45",

packages/layouts/src/components/FullScreen.vue

@@ -2,7 +2,7 @@
 import { computed, unref } from 'vue'
 import { useI18n } from '@vben/locale'
 
-import { useFullscreen } from '@vben/use'
+import { useFullscreen } from '@vben/utils'
 const { t } = useI18n()
 const { toggle, isFullscreen } = useFullscreen()
 

packages/layouts/src/components/breadcrumb/index.vue

@@ -2,7 +2,7 @@
 import { RouteLocationMatched, useRouter } from 'vue-router'
 import { h, ref, watchEffect } from 'vue'
 import { useI18n } from '@vben/locale'
-import { useGo } from '@vben/use'
+import { useGo } from '@vben/hooks'
 import { filterTree, isString } from '@vben/utils'
 import { REDIRECT_NAME } from '@vben/constants'
 import { VbenIconify } from '@vben/vbencomponents'

packages/layouts/src/components/search/AppSearchModal.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { useI18n } from '@vben/locale'
-import { useRefs } from '@vben/use'
+import { useRefs } from '@vben/hooks'
 import { computed, unref, ref } from 'vue'
 import AppSearchFooter from './AppSearchFooter.vue'
 import { useMenuSearch } from './useMenuSearch'

packages/layouts/src/components/search/useMenuSearch.ts

@@ -1,8 +1,13 @@
 import { ref, unref, Ref, nextTick, onMounted } from 'vue'
-import { cloneDeep, filterTree, forEachTree } from '@vben/utils'
-import { useDebounceFn, onKeyStroke } from '@vben/use'
+import {
+  cloneDeep,
+  filterTree,
+  forEachTree,
+  useDebounceFn,
+  onKeyStroke,
+} from '@vben/utils'
 import { useI18n } from '@vben/locale'
-import { useGo } from '@vben/use'
+import { useGo } from '@vben/hooks'
 import { getMenus } from '@/router'
 import { useScrollTo } from '@/hooks/event/use-scroll-to'
 

packages/layouts/src/components/tabs/index.vue

@@ -5,7 +5,7 @@ import { useRouter } from 'vue-router'
 import { computed, nextTick, ref, unref, watch } from 'vue'
 import { useI18n } from '@vben/locale'
 import { REDIRECT_NAME } from '@vben/constants'
-import { useGo } from '@vben/use'
+import { useGo } from '@vben/hooks'
 import TabRedo from './components/TabRedo.vue'
 import TabDropdown from './components/TabDropdown.vue'
 import { context } from '../../../bridge'

packages/layouts/src/data.ts

@@ -1,7 +1,9 @@
-import { computed, ref, unref } from 'vue'
-import { useElementSize } from '@vben/use'
+import { ref } from 'vue'
+import { useElementSize } from '@vben/utils'
 import { context } from '../bridge'
 export const layoutHeader = ref(null)
 // 获取header高度
+// @ts-ignore
 export const headerRef = ref<HTMLElement | null>(null)
+// @ts-ignore
 export const { height, width } = useElementSize(headerRef)

packages/locale/package.json

@@ -11,7 +11,6 @@
     "@vben/constants": "workspace:*",
     "@vben/types": "workspace:*",
     "@vben/utils": "workspace:*",
-    "@vben/use": "workspace:*",
     "vue": "3.2.45",
     "vue-i18n": "^9.2.2"
   }

packages/locale/src/store.ts

@@ -1,7 +1,7 @@
 import type { LocaleType } from '@vben/types'
 import { computed } from 'vue'
 import { LOCALE_KEY } from '@vben/constants'
-import { useLocalStorage } from '@vben/use'
+import { useLocalStorage } from '@vben/utils'
 import { localeSetting } from './config'
 
 const store = useLocalStorage(LOCALE_KEY, localeSetting)