Merge pull request #259 from BobbieGoede/refactor/utility-type-import…

…-consistency

refactor: import functions and types directly from `vue`

src/types/instance.ts

@@ -1,5 +1,5 @@
-import type { MaybeRef, VueInstance } from '@vueuse/core'
-import type { Ref, UnwrapRef } from 'vue'
+import type { VueInstance } from '@vueuse/core'
+import type { MaybeRef, Ref, UnwrapRef } from 'vue'
 import type { MotionProperties, MotionVariants, Variant } from './variants'
 
 export type PermissiveTarget = VueInstance | MotionTarget

src/useElementStyle.ts

@@ -1,5 +1,4 @@
-import type { MaybeRef } from '@vueuse/core'
-import type { Reactive } from 'vue'
+import type { MaybeRef, Reactive } from 'vue'
 import { watch } from 'vue'
 import { reactiveStyle } from './reactiveStyle'
 import type { MotionTarget, PermissiveTarget, StyleProperties } from './types'

src/useElementTransform.ts

@@ -1,6 +1,5 @@
-import type { MaybeRef } from '@vueuse/core'
 import { watch } from 'vue'
-import type { Reactive } from 'vue'
+import type { MaybeRef, Reactive } from 'vue'
 import { reactiveTransform } from './reactiveTransform'
 import type { MotionTarget, PermissiveTarget, TransformProperties } from './types'
 import { usePermissiveTarget } from './usePermissiveTarget'

src/useMotion.ts

@@ -1,4 +1,4 @@
-import type { MaybeRef } from '@vueuse/core'
+import type { MaybeRef } from 'vue'
 import type { MotionInstance, MotionVariants, PermissiveTarget, UseMotionOptions } from './types'
 import { useMotionControls } from './useMotionControls'
 import { useMotionFeatures } from './useMotionFeatures'

src/useMotionControls.ts

@@ -1,4 +1,4 @@
-import type { MaybeRef } from '@vueuse/core'
+import type { MaybeRef } from 'vue'
 import { isObject } from '@vueuse/core'
 import { ref, unref, watch } from 'vue'
 import type { MotionControls, MotionProperties, MotionTransitions, MotionVariants, Variant } from './types'

src/useMotionProperties.ts

@@ -1,6 +1,5 @@
-import type { MaybeRef } from '@vueuse/core'
 import { reactive, watch } from 'vue'
-import type { Reactive } from 'vue'
+import type { MaybeRef, Reactive } from 'vue'
 import type { MotionProperties, PermissiveTarget, StyleProperties, TransformProperties } from './types'
 import { useElementStyle } from './useElementStyle'
 import { useElementTransform } from './useElementTransform'

src/useMotionVariants.ts

@@ -1,5 +1,4 @@
-import type { MaybeRef } from '@vueuse/core'
-import type { Ref } from 'vue'
+import type { MaybeRef, Ref } from 'vue'
 import { computed, ref, unref } from 'vue'
 import type { MotionVariants, Variant } from './types'
 

src/usePermissiveTarget.ts

@@ -1,6 +1,6 @@
 import { watch } from 'vue'
 import { unrefElement } from '@vueuse/core'
-import type { MaybeRef } from '@vueuse/shared'
+import type { MaybeRef } from 'vue'
 import type { PermissiveTarget } from './types'
 
 export function usePermissiveTarget(target: MaybeRef<PermissiveTarget>, onTarget: (target: HTMLElement | SVGElement) => void) {

src/useReducedMotion.ts

@@ -1,4 +1,5 @@
-import { type Ref, computed } from 'vue'
+import { computed } from 'vue'
+import type { Ref } from 'vue'
 import { useMediaQuery } from '@vueuse/core'
 
 /**

src/useSpring.ts

@@ -1,4 +1,4 @@
-import type { MaybeRef } from '@vueuse/shared'
+import type { MaybeRef } from 'vue'
 import { animate } from 'popmotion'
 import type { MotionProperties, PermissiveMotionProperties, PermissiveTarget, Spring, SpringControls } from './types'
 import { useMotionValues } from './useMotionValues'

src/utils/element.ts

@@ -1,8 +1,6 @@
-import type { Ref } from '@vue/reactivity'
-import { ref } from '@vue/reactivity'
-import { watch } from '@vue/runtime-core'
+import { ref, watch } from 'vue'
 import type { VueInstance } from '@vueuse/core'
-import type { MaybeRef } from '@vueuse/shared'
+import type { MaybeRef, Ref } from 'vue'
 import type { MotionTarget, PermissiveTarget } from '../types'
 
 export function resolveElement(target: MaybeRef<PermissiveTarget>): Ref<MotionTarget> {