Merge pull request #419 from PrefectHQ/vue-3-3

Remove some 3.3. shims

src/types/maybe.ts

@@ -1,7 +1,5 @@
-import { Ref, UnwrapRef } from 'vue'
+import { UnwrapRef } from 'vue'
 
 export type MaybePromise<T = unknown> = T | Promise<T>
-export type MaybeRef<T = unknown> = T | Ref<T>
 export type MaybeUnwrapRef<T = unknown> = T | UnwrapRef<T>
-export type MaybeRefOrGetter<T = unknown> = MaybeRef<T> | (() => T)
 export type MaybeArray<T = unknown> = T | T[]

src/useBoolean/useBoolean.ts

@@ -1,5 +1,4 @@
-import { ref, Ref } from 'vue'
-import { MaybeRef } from '@/types/maybe'
+import { ref, Ref, MaybeRef } from 'vue'
 
 type UseBoolean = {
   value: Ref<boolean>,

src/useClickOutside/useClickOutside.ts

@@ -1,7 +1,5 @@
-import { onScopeDispose } from 'vue'
-import { MaybeRefOrGetter } from '@/types/maybe'
+import { MaybeRefOrGetter, onScopeDispose, toValue } from 'vue'
 import { useGlobalEventListener } from '@/useGlobalEventListener'
-import { toValue } from '@/utilities/vue'
 
 type ClickOutsideEntry = {
   element: MaybeRefOrGetter<Element>,

src/useEventListener/useEventListener.ts

@@ -1,7 +1,5 @@
-import { ref, watch } from 'vue'
-import { MaybeRefOrGetter } from '@/types/maybe'
+import { ref, watch, toValue, MaybeRefOrGetter } from 'vue'
 import { tryOnScopeDispose } from '@/utilities/tryOnScopeDispose'
-import { toValue } from '@/utilities/vue'
 
 export type UseEventListener = {
   add: () => void,

src/useIntersectionObserver/useIntersectionObserver.ts

@@ -1,6 +1,4 @@
-import { onMounted, onUnmounted, ref, Ref, unref, watch } from 'vue'
-import { MaybeRef, MaybeRefOrGetter } from '@/types/maybe'
-import { toValue } from '@/utilities/vue'
+import { onMounted, onUnmounted, ref, Ref, unref, watch, toValue, MaybeRef, MaybeRefOrGetter } from 'vue'
 
 export type UseIntersectionObserverResponse = {
   observe: (element: MaybeRefOrGetter<HTMLElement | undefined>) => void,

src/useIsSame/useIsSame.ts

@@ -1,5 +1,4 @@
-import { computed, ComputedRef, ref } from 'vue'
-import { MaybeRef } from '@/types/maybe'
+import { computed, ComputedRef, ref, MaybeRef } from 'vue'
 import { isSame } from '@/utilities/isSame'
 
 export function useIsSame(valueA: MaybeRef, valueB: MaybeRef): ComputedRef<boolean> {

src/useKeyDown/useKeyDown.ts

@@ -1,5 +1,5 @@
-import { ComputedRef, computed, reactive, unref } from 'vue'
-import { MaybeArray, MaybeRef } from '@/types/maybe'
+import { ComputedRef, computed, reactive, unref, MaybeRef } from 'vue'
+import { MaybeArray } from '@/types/maybe'
 import { asArray } from '@/utilities/arrays'
 import { tryOnScopeDispose } from '@/utilities/tryOnScopeDispose'
 

src/useNow/useNow.ts

@@ -1,5 +1,4 @@
-import { ref, Ref } from 'vue'
-import { MaybeRef } from '@/types/maybe'
+import { ref, Ref, MaybeRef } from 'vue'
 import { tryOnScopeDispose } from '@/utilities/tryOnScopeDispose'
 
 export type UseNow = {

src/usePositionStickyObserver/usePositionStickyObserver.ts

@@ -1,7 +1,5 @@
-import { Ref, computed, ref, watch } from 'vue'
-import { MaybeRefOrGetter } from '@/types/maybe'
+import { Ref, computed, ref, watch, toRef, toValue, MaybeRefOrGetter } from 'vue'
 import { useIntersectionObserver } from '@/useIntersectionObserver'
-import { toValue } from '@/utilities/vue'
 
 export type UsePositionStickyObserverResponse = {
   stuck: Ref<boolean>,
@@ -21,7 +19,7 @@ export function usePositionStickyObserver(
   element: MaybeRefOrGetter<HTMLElement | undefined>,
   options?: MaybeRefOrGetter<UsePositionStickyObserverOptions>,
 ): UsePositionStickyObserverResponse {
-  const elementRef = computed(() => toValue(element))
+  const elementRef = toRef(element)
   const stuck = ref(false)
 
   const observerOptions = computed(() => {

src/useScrollLinking/useScrollLinking.ts

@@ -1,5 +1,4 @@
-import { onMounted, onUnmounted, ref, Ref } from 'vue'
-import { MaybeRef } from '@/types/maybe'
+import { onMounted, onUnmounted, ref, Ref, MaybeRef } from 'vue'
 
 type DisconnectScrollLink = () => void
 type UseScrollLinking = {

src/useSubscription/types/subscription.ts

@@ -1,4 +1,4 @@
-import { MaybeRef } from '@/types/maybe'
+import { MaybeRef } from 'vue'
 import { SubscriptionManager } from '@/useSubscription/models/manager'
 import { Subscription } from '@/useSubscription/models/subscription'
 import { Action, ActionArguments, ActionParamsRequired, ActionResponse } from '@/useSubscription/types/action'

src/useSubscription/useSubscriptionWithDependencies.ts

@@ -1,6 +1,5 @@
 import isEqual from 'lodash.isequal'
-import { reactive, ref, Ref, toRaw, watch } from 'vue'
-import { MaybeRef } from '@/types/maybe'
+import { reactive, ref, Ref, toRaw, watch, MaybeRef } from 'vue'
 import { Action, SubscriptionOptions, UseSubscription, ActionArguments, MappedSubscription } from '@/useSubscription/types'
 import { useSubscription } from '@/useSubscription/useSubscription'
 

src/useValidation/useValidation.ts

@@ -1,6 +1,6 @@
-import { computed, onMounted, onUnmounted, reactive, ref, ToRefs, watch, unref, Ref, WatchStopHandle, toRef } from 'vue'
+import { computed, onMounted, onUnmounted, reactive, ref, ToRefs, watch, unref, Ref, MaybeRef, MaybeRefOrGetter, WatchStopHandle, toRef } from 'vue'
 import { NoInfer } from '@/types/generics'
-import { MaybeArray, MaybePromise, MaybeRefOrGetter, MaybeRef } from '@/types/maybe'
+import { MaybeArray, MaybePromise } from '@/types/maybe'
 import { isValidationAbortedError } from '@/useValidation/ValidationAbortedError'
 import { ValidationRuleExecutor } from '@/useValidation/ValidationExecutor'
 import { ValidationObserverUnregister, VALIDATION_OBSERVER_INJECTION_KEY } from '@/useValidationObserver/useValidationObserver'

src/useVisibilityObserver/useVisibilityObserver.ts

@@ -1,5 +1,4 @@
-import { computed, onMounted, ref, Ref } from 'vue'
-import { MaybeRef } from '@/types/maybe'
+import { computed, onMounted, ref, Ref, MaybeRef } from 'vue'
 import { useIntersectionObserver, UseIntersectionObserverOptions } from '@/useIntersectionObserver'
 
 export type UseVisibilityObserverResponse = {