feat: ✨ vue restore to replace vue-demi

inhiblab · web-flow · commit c90b0bf857ff · 2023-02-15T14:06:10.000+08:00
feat: vue restore to replace vue-demi
diff --git a/packages/hooks/package.json b/packages/hooks/package.json
@@ -53,8 +53,10 @@
 		"marked": "^4.0.17",
 		"qs": "^6.11.0",
 		"query-string": "^7.1.1",
-		"screenfull": "^5.0.0",
-		"vue-demi": "^0.13.11"
+		"screenfull": "^5.0.0"
+	},
+  "peerDependencies": {
+		"vue": "^3.2.25"
 	},
 	"repository": "https://github.com/InhiblabCore/vue-hooks-plus",
 	"homepage": "https://github.com/InhiblabCore/vue-hooks-plus",
diff --git a/packages/hooks/src/createUseStorageState/index.ts b/packages/hooks/src/createUseStorageState/index.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-empty */
-import { unref, ref, Ref, UnwrapRef, watchEffect } from 'vue-demi'
+import { unref, ref, Ref, UnwrapRef, watchEffect } from 'vue'
 
 export interface IFuncUpdater<T> {
   (previousState?: T): T
diff --git a/packages/hooks/src/types.d.ts b/packages/hooks/src/types.d.ts
@@ -1,5 +1,5 @@
 declare module '*.vue' {
-  import { DefineComponent } from 'vue-demi'
+  import { DefineComponent } from 'vue'
   // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
   const component: DefineComponent<{}, {}, any>
   export default component
diff --git a/packages/hooks/src/useCookieState/index.ts b/packages/hooks/src/useCookieState/index.ts
@@ -1,5 +1,5 @@
 import Cookies from 'js-cookie'
-import { ref } from 'vue-demi'
+import { ref } from 'vue'
 import { isFunction } from '../utils/isFunction'
 
 export type UseCookieStateType = string | undefined
diff --git a/packages/hooks/src/useCounter/index.ts b/packages/hooks/src/useCounter/index.ts
@@ -1,4 +1,4 @@
-import { Ref, ref } from 'vue-demi'
+import { Ref, ref } from 'vue'
 import { isNumber } from '../utils'
 
 export interface UseCounterOptions {
diff --git a/packages/hooks/src/useDarkMode/index.ts b/packages/hooks/src/useDarkMode/index.ts
@@ -1,4 +1,4 @@
-import { watchEffect, computed, ComputedRef } from 'vue-demi'
+import { watchEffect, computed, ComputedRef } from 'vue'
 import useLocalStorageState from '../useLocalStorageState'
 
 import useMedia from '../useMedia'
diff --git a/packages/hooks/src/useDrag/index.ts b/packages/hooks/src/useDrag/index.ts
@@ -1,4 +1,4 @@
-import { ref } from 'vue-demi'
+import { ref } from 'vue'
 import type { BasicTarget } from '../utils/domTarget'
 import { getTargetElement } from '../utils/domTarget'
 import useEffectWithTarget from '../utils/useEffectWithTarget'
diff --git a/packages/hooks/src/useDrop/index.ts b/packages/hooks/src/useDrop/index.ts
@@ -1,7 +1,7 @@
 import { BasicTarget } from '../utils/domTarget'
 import { getTargetElement } from '../utils/domTarget'
 import useEffectWithTarget from '../utils/useEffectWithTarget'
-import { ref } from 'vue-demi'
+import { ref } from 'vue'
 
 export interface UseDropOptions {
   /**
diff --git a/packages/hooks/src/useEventEmitter/event.ts b/packages/hooks/src/useEventEmitter/event.ts
@@ -1,5 +1,5 @@
 import _ from 'lodash'
-import { ref, watchEffect } from 'vue-demi'
+import { ref, watchEffect } from 'vue'
 
 type SubscriptionParams<T = any> = {
   params: T
diff --git a/packages/hooks/src/useEventEmitter/index.ts b/packages/hooks/src/useEventEmitter/index.ts
@@ -1,4 +1,4 @@
-import { watchEffect, computed, ref } from 'vue-demi'
+import { watchEffect, computed, ref } from 'vue'
 import { EventEmitter, eventEmitterOverall } from './event'
 
 export type UseEventEmitterType<T = void> = EventEmitter<T> | typeof eventEmitterOverall
diff --git a/packages/hooks/src/useEventListener/index.ts b/packages/hooks/src/useEventListener/index.ts
@@ -1,4 +1,4 @@
-import { ref } from 'vue-demi'
+import { ref } from 'vue'
 import { BasicTarget } from '../utils/domTarget'
 import { getTargetElement } from '../utils/domTarget'
 import useEffectWithTarget from '../utils/useEffectWithTarget'
diff --git a/packages/hooks/src/useExternal/index.ts b/packages/hooks/src/useExternal/index.ts
@@ -1,5 +1,5 @@
-import { Ref } from 'vue-demi'
-import { watchEffect, ref, unref, computed } from 'vue-demi'
+import { Ref } from 'vue'
+import { watchEffect, ref, unref, computed } from 'vue'
 
 export interface UseExternalOptions {
   /**
diff --git a/packages/hooks/src/useFavicon/index.ts b/packages/hooks/src/useFavicon/index.ts
@@ -1,4 +1,4 @@
-import { watchEffect, computed, Ref, unref } from 'vue-demi'
+import { watchEffect, computed, Ref, unref } from 'vue'
 
 const UseFaviconImgTypeMap = {
   SVG: 'image/svg+xml',
diff --git a/packages/hooks/src/useFetchs/index.ts b/packages/hooks/src/useFetchs/index.ts
@@ -1,4 +1,4 @@
-import { createApp, defineComponent, ref, UnwrapRef, watch, watchEffect } from 'vue-demi'
+import { createApp, defineComponent, ref, UnwrapRef, watch, watchEffect } from 'vue'
 import { UseRequestService, UseRequestOptions } from '../useRequest/types'
 import useRequest from '../useRequest'
 
diff --git a/packages/hooks/src/useFormatResult/index.ts b/packages/hooks/src/useFormatResult/index.ts
@@ -1,4 +1,4 @@
-import { computed, Ref, ComputedRef, unref } from 'vue-demi'
+import { computed, Ref, ComputedRef, unref } from 'vue'
 
 function useFormatResult<TData, FData>(
   data: TData | Ref<TData>,
diff --git a/packages/hooks/src/useFullscreen/index.ts b/packages/hooks/src/useFullscreen/index.ts
@@ -1,5 +1,5 @@
 import screenfull from 'screenfull'
-import { onUnmounted, ref } from 'vue-demi'
+import { onUnmounted, ref } from 'vue'
 import { BasicTarget } from '../utils/domTarget'
 import { getTargetElement } from '../utils/domTarget'
 
diff --git a/packages/hooks/src/useHover/index.ts b/packages/hooks/src/useHover/index.ts
@@ -1,4 +1,4 @@
-import { Ref } from 'vue-demi'
+import { Ref } from 'vue'
 import { useBoolean } from '../index'
 import useEventListener from '../useEventListener'
 import { BasicTarget } from '../utils/domTarget'
diff --git a/packages/hooks/src/useInViewport/index.ts b/packages/hooks/src/useInViewport/index.ts
@@ -1,5 +1,5 @@
 import 'intersection-observer'
-import { ref } from 'vue-demi'
+import { ref } from 'vue'
 import { BasicTarget } from '../utils/domTarget'
 import { getTargetElement } from '../utils/domTarget'
 import useEffectWithTarget from '../utils/useEffectWithTarget'
diff --git a/packages/hooks/src/useInterval/index.ts b/packages/hooks/src/useInterval/index.ts
@@ -1,4 +1,4 @@
-import { watchEffect, ref, Ref, isRef, unref } from 'vue-demi'
+import { watchEffect, ref, Ref, isRef, unref } from 'vue'
 
 function useInterval(
   /**
diff --git a/packages/hooks/src/useKeyPress/index.ts b/packages/hooks/src/useKeyPress/index.ts
@@ -1,4 +1,4 @@
-import { ref } from 'vue-demi'
+import { ref } from 'vue'
 import { isFunction, isNumber, isString } from 'lodash'
 import { BasicTarget, getTargetElement } from '../utils/domTarget'
 import useDeepCompareEffectWithTarget from '../utils/useDeepCompareWithTarget'
diff --git a/packages/hooks/src/useMap/index.ts b/packages/hooks/src/useMap/index.ts
@@ -1,4 +1,4 @@
-import { ref, Ref, markRaw } from 'vue-demi'
+import { ref, Ref, markRaw } from 'vue'
 
 type UseMapValue<K, T> = Iterable<readonly [K, T]>
 
diff --git a/packages/hooks/src/useMedia/index.ts b/packages/hooks/src/useMedia/index.ts
@@ -1,4 +1,4 @@
-import { watchEffect, ref } from 'vue-demi'
+import { watchEffect, ref } from 'vue'
 
 export default function useMedia(
   /**
diff --git a/packages/hooks/src/useMouse/index.ts b/packages/hooks/src/useMouse/index.ts
@@ -1,7 +1,7 @@
 import useEventListener from '../useEventListener'
 import { BasicTarget } from '../utils/domTarget'
 import { getTargetElement } from '../utils/domTarget'
-import { ref } from 'vue-demi'
+import { ref } from 'vue'
 
 export interface UseMouseCursorState {
   screenX: number
diff --git a/packages/hooks/src/useNetwork/index.ts b/packages/hooks/src/useNetwork/index.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-unused-vars */
-import { watchEffect, ref } from 'vue-demi'
+import { watchEffect, ref } from 'vue'
 
 export interface UseNetworkState {
   since?: Date
diff --git a/packages/hooks/src/usePreview/index.ts b/packages/hooks/src/usePreview/index.ts
@@ -1,5 +1,5 @@
 import { marked } from 'marked'
-import { Ref, computed, unref, ref, watchEffect, createApp, VueElement } from 'vue-demi'
+import { Ref, computed, unref, ref, watchEffect, createApp, VueElement } from 'vue'
 
 export default function usePreview(
   md: Parameters<typeof createApp> | Ref<string> | string | VueElement,
diff --git a/packages/hooks/src/usePrevious/index.ts b/packages/hooks/src/usePrevious/index.ts
@@ -1,4 +1,4 @@
-import { ComputedRef, Ref, ref, watchEffect } from 'vue-demi'
+import { ComputedRef, Ref, ref, watchEffect } from 'vue'
 
 export type UsePreviousShouldUpdateFunc<T> = (prev: T | undefined, next: T) => boolean
 const defaultShouldUpdate = <T>(a?: T, b?: T) => !Object.is(a, b)
diff --git a/packages/hooks/src/useRequest/Fetch.ts b/packages/hooks/src/useRequest/Fetch.ts
@@ -1,4 +1,4 @@
-import { Ref, unref, watchEffect } from 'vue-demi'
+import { Ref, unref, watchEffect } from 'vue'
 import {
   UseRequestFetchState,
   UseRequestOptions,
diff --git a/packages/hooks/src/useRequest/plugins/useAutoRunPlugin.ts b/packages/hooks/src/useRequest/plugins/useAutoRunPlugin.ts
@@ -1,4 +1,4 @@
-import { unref, ref, watch, watchEffect } from 'vue-demi'
+import { unref, ref, watch, watchEffect } from 'vue'
 import { UseRequestFetchState, UseRequestPlugin } from '../types'
 
 // support refreshDeps & ready
diff --git a/packages/hooks/src/useRequest/plugins/useCachePlugin.ts b/packages/hooks/src/useRequest/plugins/useCachePlugin.ts
@@ -1,4 +1,4 @@
-import { ref, watchEffect, onUnmounted } from 'vue-demi'
+import { ref, watchEffect, onUnmounted } from 'vue'
 import { UseRequestPlugin } from '../types'
 import * as cache from '../utils/cache'
 import { CachedData } from '../utils/cache'
diff --git a/packages/hooks/src/useRequest/plugins/useThrottlePlugin.ts b/packages/hooks/src/useRequest/plugins/useThrottlePlugin.ts
@@ -1,4 +1,4 @@
-import { computed, unref, watchEffect } from 'vue-demi'
+import { computed, unref, watchEffect } from 'vue'
 import { DebouncedFunc, ThrottleSettings } from 'lodash'
 import throttle from 'lodash/throttle'
 import { UseRequestPlugin } from '../types'
diff --git a/packages/hooks/src/useRequest/types.ts b/packages/hooks/src/useRequest/types.ts
@@ -1,4 +1,4 @@
-import { Ref, WatchSource } from 'vue-demi'
+import { Ref, WatchSource } from 'vue'
 import { CachedData } from './utils/cache'
 import UseRequestFetch from './Fetch'
 
diff --git a/packages/hooks/src/useRequest/useRequestImplement.ts b/packages/hooks/src/useRequest/useRequestImplement.ts
@@ -1,4 +1,4 @@
-import { ref, reactive, toRefs, onMounted, onUnmounted, unref } from 'vue-demi'
+import { ref, reactive, toRefs, onMounted, onUnmounted, unref } from 'vue'
 
 import Fetch from './Fetch'
 import { UseRequestOptions, UseRequestPlugin, useRequestResult, UseRequestService } from './types'
diff --git a/packages/hooks/src/useScroll/index.ts b/packages/hooks/src/useScroll/index.ts
@@ -1,4 +1,4 @@
-import { ref, Ref } from 'vue-demi'
+import { ref, Ref } from 'vue'
 import { BasicTarget } from '../utils/domTarget'
 import { getTargetElement } from '../utils/domTarget'
 import useEffectWithTarget from '../utils/useEffectWithTarget'
diff --git a/packages/hooks/src/useSet/index.ts b/packages/hooks/src/useSet/index.ts
@@ -1,4 +1,4 @@
-import { ref, Ref, markRaw } from 'vue-demi'
+import { ref, Ref, markRaw } from 'vue'
 
 interface UseSetActions<T> {
   add: (value: T) => void
diff --git a/packages/hooks/src/useSetState/index.ts b/packages/hooks/src/useSetState/index.ts
@@ -1,4 +1,4 @@
-import { ref, Ref, unref, UnwrapRef, readonly, DeepReadonly, UnwrapNestedRefs } from 'vue-demi'
+import { ref, Ref, unref, UnwrapRef, readonly, DeepReadonly, UnwrapNestedRefs } from 'vue'
 import merge from 'lodash/merge'
 
 type UseSetStateType<S> = S | (() => S) | Ref<S> | (() => Ref<S>)
diff --git a/packages/hooks/src/useSize/index.ts b/packages/hooks/src/useSize/index.ts
@@ -1,4 +1,4 @@
-import { onMounted, reactive, toRefs, Ref } from 'vue-demi'
+import { onMounted, reactive, toRefs, Ref } from 'vue'
 import useWinResize from '../useWinResize'
 
 import { BasicTarget, getTargetElement } from '../utils/domTarget'
diff --git a/packages/hooks/src/useThrottle/index.ts b/packages/hooks/src/useThrottle/index.ts
@@ -1,4 +1,4 @@
-import { Ref, ref, watch } from 'vue-demi'
+import { Ref, ref, watch } from 'vue'
 import useThrottleFn from '../useThrottleFn'
 
 export interface UseThrottleOptions {
diff --git a/packages/hooks/src/useThrottleFn/index.ts b/packages/hooks/src/useThrottleFn/index.ts
@@ -1,5 +1,5 @@
 import throttle from 'lodash/throttle'
-import { onUnmounted, ref, computed } from 'vue-demi'
+import { onUnmounted, ref, computed } from 'vue'
 import { UseThrottleOptions } from '../useThrottle'
 
 type noop = (...args: any) => any
diff --git a/packages/hooks/src/useTimeout/index.ts b/packages/hooks/src/useTimeout/index.ts
@@ -1,4 +1,4 @@
-import { watchEffect, Ref, unref } from 'vue-demi'
+import { watchEffect, Ref, unref } from 'vue'
 
 function useTimeout(
   fn: () => void,
diff --git a/packages/hooks/src/useTitle/index.ts b/packages/hooks/src/useTitle/index.ts
@@ -1,4 +1,4 @@
-import { ref, Ref, onUnmounted, onMounted, watch, isRef, unref } from 'vue-demi'
+import { ref, Ref, onUnmounted, onMounted, watch, isRef, unref } from 'vue'
 
 import isBrowser from '../utils/isBrowser'
 
diff --git a/packages/hooks/src/useToggle/index.ts b/packages/hooks/src/useToggle/index.ts
@@ -1,4 +1,4 @@
-import { computed, Ref, ref, UnwrapRef } from 'vue-demi'
+import { computed, Ref, ref, UnwrapRef } from 'vue'
 
 export interface UseToggleActions<T> {
   setLeft: () => void
diff --git a/packages/hooks/src/useTrackedEffect/index.ts b/packages/hooks/src/useTrackedEffect/index.ts
@@ -1,4 +1,4 @@
-import { Ref, watch } from 'vue-demi'
+import { Ref, watch } from 'vue'
 
 export type UseTrackedEffect = (
   changes?: number[],
diff --git a/packages/hooks/src/useUpdate/index.ts b/packages/hooks/src/useUpdate/index.ts
@@ -1,4 +1,4 @@
-import { ref } from 'vue-demi'
+import { ref } from 'vue'
 
 export default function useUpdate() {
   const update = ref({})
diff --git a/packages/hooks/src/useUrlState/index.ts b/packages/hooks/src/useUrlState/index.ts
@@ -1,5 +1,5 @@
 import qs from 'qs'
-import { Ref, ref, watch } from 'vue-demi'
+import { Ref, ref, watch } from 'vue'
 import { useLocalStorageState } from '../index'
 import { isFunction } from '../utils'
 
diff --git a/packages/hooks/src/useVirtualList/index.ts b/packages/hooks/src/useVirtualList/index.ts
@@ -1,4 +1,4 @@
-import { computed, Ref, watch, ref, reactive } from 'vue-demi'
+import { computed, Ref, watch, ref, reactive } from 'vue'
 import useSize from '../useSize'
 import { getTargetElement } from '../utils/domTarget'
 
diff --git a/packages/hooks/src/useWebSocket/index.ts b/packages/hooks/src/useWebSocket/index.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-unused-vars */
-import { watch, ref, Ref, onUnmounted, unref } from 'vue-demi'
+import { watch, ref, Ref, onUnmounted, unref } from 'vue'
 
 export enum ReadyState {
   Connecting = 0,
diff --git a/packages/hooks/src/useWhyDidYouUpdate/index.ts b/packages/hooks/src/useWhyDidYouUpdate/index.ts
@@ -1,4 +1,4 @@
-import { computed, watch } from 'vue-demi'
+import { computed, watch } from 'vue'
 
 export type IProps = Record<string, any>
 
diff --git a/packages/hooks/src/useWinResize/index.ts b/packages/hooks/src/useWinResize/index.ts
@@ -1,4 +1,4 @@
-import { onMounted, onBeforeUnmount, nextTick } from 'vue-demi'
+import { onMounted, onBeforeUnmount, nextTick } from 'vue'
 
 export default function useWinResize(Action = () => {}) {
   const fn = () => {
diff --git a/packages/hooks/src/utils/createEffectWithTarget.ts b/packages/hooks/src/utils/createEffectWithTarget.ts
@@ -1,4 +1,4 @@
-import { onUnmounted, ref, watchEffect, WatchSource } from 'vue-demi'
+import { onUnmounted, ref, watchEffect, WatchSource } from 'vue'
 import depsAreSame, { DependencyList } from './depsAreSame'
 import { BasicTarget } from './domTarget'
 import { getTargetElement } from './domTarget'
diff --git a/packages/hooks/src/utils/depsAreSame.ts b/packages/hooks/src/utils/depsAreSame.ts
@@ -1,4 +1,4 @@
-import { WatchSource } from 'vue-demi'
+import { WatchSource } from 'vue'
 
 export type DependencyList = WatchSource | any[] | any
 
diff --git a/packages/hooks/src/utils/domTarget.ts b/packages/hooks/src/utils/domTarget.ts
@@ -1,5 +1,5 @@
-import { isRef } from 'vue-demi';
-import type { Ref } from 'vue-demi';
+import { isRef } from 'vue';
+import type { Ref } from 'vue';
 import isBrowser from './isBrowser';
 
 type TargetValue<T> = T | undefined | null;
diff --git a/packages/hooks/src/utils/useDeepCompareWithTarget.ts b/packages/hooks/src/utils/useDeepCompareWithTarget.ts
@@ -1,4 +1,4 @@
-import { ref } from 'vue-demi'
+import { ref } from 'vue'
 import isEqual from 'lodash/isEqual'
 import { EffectCallback } from './createEffectWithTarget'
 import { DependencyList } from './depsAreSame'
diff --git a/packages/use-immer/src/index.ts b/packages/use-immer/src/index.ts
@@ -1,5 +1,5 @@
 import produce, { Draft, freeze } from 'immer'
-import { ShallowRef, shallowRef } from 'vue-demi'
+import { ShallowRef, shallowRef } from 'vue'
 
 export type DraftFunction<S> = (draft: Draft<S>) => void
 export type Updater<S> = (arg: S | DraftFunction<S>) => void
diff --git a/packages/use-worker/src/hook/useDeepCompareWithTarget.ts b/packages/use-worker/src/hook/useDeepCompareWithTarget.ts
@@ -1,4 +1,4 @@
-import { computed, ref, WatchSource } from 'vue-demi'
+import { computed, ref, WatchSource } from 'vue'
 import { isEqual } from 'lodash'
 
 export type EffectCallback = () => void
diff --git a/packages/use-worker/src/useWorker.ts b/packages/use-worker/src/useWorker.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-unused-vars */
-import { computed, ref, watchEffect } from 'vue-demi'
+import { computed, ref, watchEffect } from 'vue'
 import useDeepCompareEffect from './hook/useDeepCompareWithTarget'
 import createWorkerBlobUrl from './lib/createWorkerBlobUrl'
 import WORKER_STATUS from './lib/status'
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Ref, ref } from 'vue-demi'`
	`1`	`+import { Ref, ref } from 'vue'`
`2`	`2`	`import { isNumber } from '../utils'`
`3`	`3`
`4`	`4`	`export interface UseCounterOptions {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { watchEffect, computed, ComputedRef } from 'vue-demi'`
	`1`	`+import { watchEffect, computed, ComputedRef } from 'vue'`
`2`	`2`	`import useLocalStorageState from '../useLocalStorageState'`
`3`	`3`
`4`	`4`	`import useMedia from '../useMedia'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { ref } from 'vue-demi'`
	`1`	`+import { ref } from 'vue'`
`2`	`2`	`import type { BasicTarget } from '../utils/domTarget'`
`3`	`3`	`import { getTargetElement } from '../utils/domTarget'`
`4`	`4`	`import useEffectWithTarget from '../utils/useEffectWithTarget'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { watchEffect, computed, ref } from 'vue-demi'`
	`1`	`+import { watchEffect, computed, ref } from 'vue'`
`2`	`2`	`import { EventEmitter, eventEmitterOverall } from './event'`
`3`	`3`
`4`	`4`	`export type UseEventEmitterType<T = void> = EventEmitter<T> \| typeof eventEmitterOverall`