diff --git a/client/package.json b/client/package.json index e396c901e9c2..fb60f7336411 100644 --- a/client/package.json +++ b/client/package.json @@ -37,7 +37,7 @@ "@johmun/vue-tags-input": "^2.1.0", "@popperjs/core": "^2.11.8", "@sentry/browser": "^7.74.0", - "@vueuse/core": "^9.10.0", + "@vueuse/core": "^10.5.0", "assert": "^2.0.0", "axios": "^0.25.0", "babel-runtime": "^6.26.0", diff --git a/client/src/composables/fileDrop.ts b/client/src/composables/fileDrop.ts index 9c0ecde034b0..0f4f16e927be 100644 --- a/client/src/composables/fileDrop.ts +++ b/client/src/composables/fileDrop.ts @@ -1,4 +1,4 @@ -import { type MaybeComputedRef, useEventListener } from "@vueuse/core"; +import { type MaybeRefOrGetter, useEventListener } from "@vueuse/core"; import { computed, type Ref, ref, unref } from "vue"; export type FileDropHandler = (event: DragEvent) => void; @@ -11,9 +11,9 @@ export type FileDropHandler = (event: DragEvent) => void; * @param idleTime how long to wait until state resets */ export function useFileDrop( - dropZone: MaybeComputedRef, + dropZone: MaybeRefOrGetter, onDrop: Ref | FileDropHandler, - solo: MaybeComputedRef, + solo: MaybeRefOrGetter, idleTime = 800 ) { /** returns if any bootstrap modal is open */ diff --git a/client/src/composables/filter/filter.d.ts b/client/src/composables/filter/filter.d.ts index 697df44754cf..6efd44fb92d3 100644 --- a/client/src/composables/filter/filter.d.ts +++ b/client/src/composables/filter/filter.d.ts @@ -1,4 +1,4 @@ -import type { MaybeComputedRef } from "@vueuse/core"; +import type { MaybeRefOrGetter } from "@vueuse/core"; import type { Ref } from "vue"; /** @@ -9,7 +9,7 @@ import type { Ref } from "vue"; * @param objectFields string array of fields to filter by on each object */ export declare function useFilterObjectArray( - array: MaybeComputedRef>, - filter: MaybeComputedRef, - objectFields: MaybeComputedRef> + array: MaybeRefOrGetter>, + filter: MaybeRefOrGetter, + objectFields: MaybeRefOrGetter> ): Ref; diff --git a/client/src/composables/sensors/animationFrameResizeObserver.ts b/client/src/composables/sensors/animationFrameResizeObserver.ts index 328d19e870c1..0b31ec6dabbb 100644 --- a/client/src/composables/sensors/animationFrameResizeObserver.ts +++ b/client/src/composables/sensors/animationFrameResizeObserver.ts @@ -1,4 +1,4 @@ -import type { MaybeComputedRef } from "@vueuse/core"; +import type { MaybeRefOrGetter } from "@vueuse/core"; import { resolveUnref } from "@vueuse/core"; import { useAnimationFrame } from "./animationFrame"; @@ -8,7 +8,7 @@ type CallbackValue = { clientSize: Size; scrollSize: Size }; export type AnimationFrameResizeObserverCallback = (newValue: CallbackValue, oldValue: CallbackValue) => void; export function useAnimationFrameResizeObserver( - element: MaybeComputedRef, + element: MaybeRefOrGetter, callback: AnimationFrameResizeObserverCallback ) { let clientSize = { width: 0, height: 0 }; diff --git a/client/src/composables/sensors/animationFrameScroll.ts b/client/src/composables/sensors/animationFrameScroll.ts index 6fd5bec8b353..97a1d0cf526d 100644 --- a/client/src/composables/sensors/animationFrameScroll.ts +++ b/client/src/composables/sensors/animationFrameScroll.ts @@ -1,10 +1,10 @@ -import type { MaybeComputedRef } from "@vueuse/core"; +import type { MaybeRefOrGetter } from "@vueuse/core"; import { resolveUnref } from "@vueuse/core"; import { reactive, ref } from "vue"; import { useAnimationFrame } from "./animationFrame"; -export function useAnimationFrameScroll(element: MaybeComputedRef) { +export function useAnimationFrameScroll(element: MaybeRefOrGetter) { const scrollLeft = ref(0); const scrollTop = ref(0); diff --git a/client/src/composables/sensors/animationFrameSize.ts b/client/src/composables/sensors/animationFrameSize.ts index b6436d8c8774..cf97466fbd6e 100644 --- a/client/src/composables/sensors/animationFrameSize.ts +++ b/client/src/composables/sensors/animationFrameSize.ts @@ -1,9 +1,9 @@ -import { type MaybeComputedRef, resolveUnref } from "@vueuse/core"; +import { type MaybeRefOrGetter, resolveUnref } from "@vueuse/core"; import { ref } from "vue"; import { useAnimationFrameResizeObserver } from "./animationFrameResizeObserver"; -export function useAnimationFrameSize(target: MaybeComputedRef) { +export function useAnimationFrameSize(target: MaybeRefOrGetter) { const width = ref(0); const height = ref(0); diff --git a/client/yarn.lock b/client/yarn.lock index 8c4f5b47cb5c..06a1161a1e9b 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -2571,10 +2571,10 @@ resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.11.11.tgz#d687e649dd7f3c4045b71f756cd80892d55d3bb1" integrity sha512-J/ZgSP9Yv0S+wfUfeRh9ynktcCvycfW4S9NbzkFdiHLBth+Ctdy5nYg3ZAqUKq7v3gcJce6rXo41zJV6IqsXsQ== -"@types/web-bluetooth@^0.0.16": - version "0.0.16" - resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz#1d12873a8e49567371f2a75fe3e7f7edca6662d8" - integrity sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ== +"@types/web-bluetooth@^0.0.18": + version "0.0.18" + resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.18.tgz#74bd1c8fd3a2058cb6fc76b188fcded50a83d866" + integrity sha512-v/ZHEj9xh82usl8LMR3GarzFY1IrbXJw5L4QfQhokjRV91q+SelFqxQWSep1ucXEZ22+dSTwLFkXeur25sPIbw== "@types/ws@^8.5.5": version "8.5.7" @@ -2736,27 +2736,27 @@ source-map "0.5.6" tsconfig "^7.0.0" -"@vueuse/core@^9.10.0": - version "9.10.0" - resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-9.10.0.tgz#2ef6e55ca773c5b2db1e3f13b8292af96dd32214" - integrity sha512-CxMewME07qeuzuT/AOIQGv0EhhDoojniqU6pC3F8m5VC76L47UT18DcX88kWlP3I7d3qMJ4u/PD8iSRsy3bmNA== +"@vueuse/core@^10.5.0": + version "10.5.0" + resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-10.5.0.tgz#04d1e6d26592bb997bb755a4830ea7583c3e8612" + integrity sha512-z/tI2eSvxwLRjOhDm0h/SXAjNm8N5ld6/SC/JQs6o6kpJ6Ya50LnEL8g5hoYu005i28L0zqB5L5yAl8Jl26K3A== dependencies: - "@types/web-bluetooth" "^0.0.16" - "@vueuse/metadata" "9.10.0" - "@vueuse/shared" "9.10.0" - vue-demi "*" + "@types/web-bluetooth" "^0.0.18" + "@vueuse/metadata" "10.5.0" + "@vueuse/shared" "10.5.0" + vue-demi ">=0.14.6" -"@vueuse/metadata@9.10.0": - version "9.10.0" - resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-9.10.0.tgz#1a5eb94ca755bd8e666505f47da7d88969cffdc7" - integrity sha512-G5VZhgTCapzU9rv0Iq2HBrVOSGzOKb+OE668NxhXNcTjUjwYxULkEhAw70FtRLMZc+hxcFAzDZlKYA0xcwNMuw== +"@vueuse/metadata@10.5.0": + version "10.5.0" + resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-10.5.0.tgz#7501a88cf5cbf7a515a03f0b8bbe3cecf30cad11" + integrity sha512-fEbElR+MaIYyCkeM0SzWkdoMtOpIwO72x8WsZHRE7IggiOlILttqttM69AS13nrDxosnDBYdyy3C5mR1LCxHsw== -"@vueuse/shared@9.10.0": - version "9.10.0" - resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-9.10.0.tgz#49874a0f9955d28689b3133de660367c63dbc030" - integrity sha512-vakHJ2ZRklAzqmcVBL38RS7BxdBA4+5poG9NsSyqJxrt9kz0zX3P5CXMy0Hm6LFbZXUgvKdqAS3pUH1zX/5qTQ== +"@vueuse/shared@10.5.0": + version "10.5.0" + resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-10.5.0.tgz#b3ac8c190a5dae41db5e1b60fe304a9b4247393c" + integrity sha512-18iyxbbHYLst9MqU1X1QNdMHIjks6wC7XTVf0KNOv5es/Ms6gjVFCAAWTVP2JStuGqydg3DT+ExpFORUEi9yhg== dependencies: - vue-demi "*" + vue-demi ">=0.14.6" "@webassemblyjs/ast@1.11.1": version "1.11.1" @@ -11674,7 +11674,7 @@ vue-demi@*: resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.1.tgz#1ed9af03a27642762bfed83d8750805302d0398d" integrity sha512-rt+yuCtXvscYot9SQQj3WKZJVSriPNqVkpVBNEHPzSgBv7QIYzsS410VqVgvx8f9AAPgjg+XPKvmV3vOqqkJQQ== -vue-demi@>=0.14.5: +vue-demi@>=0.14.5, vue-demi@>=0.14.6: version "0.14.6" resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.6.tgz#dc706582851dc1cdc17a0054f4fec2eb6df74c92" integrity sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==