feat: downgrade vueuse to 9.0

chizukicn · Dec 1, 2023 · 09e97c1 · 09e97c1
1 parent 54dc44a
commit 09e97c1
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 27 deletions.
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -30,13 +30,13 @@
     "prepublish": "pnpm build"
   },
   "peerDependencies": {
+    "@vueuse/core": ">=9.0.0",
     "vue": "^3.0.0-0"
   },
   "dependencies": {
     "@hoci/core": "workspace:*",
     "@hoci/shared": "workspace:*",
-    "@vueuse/core": ">=10.5.0",
-    "maybe-types": "^0.1.0",
+    "maybe-types": "^0.2.0",
     "tslx": "^0.1.1"
   }
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -33,8 +33,8 @@
   },
   "dependencies": {
     "@hoci/shared": "workspace:*",
-    "@vueuse/core": ">=10.5.0",
-    "maybe-types": "^0.1.0",
+    "@vueuse/core": "9.0.0",
+    "maybe-types": "^0.2.0",
     "tslx": "^0.1.1"
   }
 }
diff --git a/packages/core/src/affix/index.ts b/packages/core/src/affix/index.ts
@@ -1,8 +1,8 @@
 import { computed, inject, provide, ref, watchPostEffect } from "vue";
 import type { InjectionKey, MaybeRefOrGetter, PropType, Ref } from "vue";
-import { toReactive, useElementBounding, useElementVisibility, useEventListener } from "@vueuse/core";
+import { useElementBounding, useElementVisibility, useEventListener } from "@vueuse/core";
 import type { CSSProperties } from "tslx";
-import { defineHookComponent, defineHookEmits, defineHookProps, isWindow, throttleByRaf, useElement } from "@hoci/shared";
+import { defineHookComponent, defineHookEmits, defineHookProps, isWindow, throttleByRaf, toReactive, useElement } from "@hoci/shared";
 import { px } from "tslx";
 export const affixProps = defineHookProps(
   {

diff --git a/packages/core/src/selection/index.ts b/packages/core/src/selection/index.ts
@@ -1,4 +1,4 @@
-import { isDefined, syncRef, toReactive } from "@vueuse/core";
+import { isDefined, syncRef } from "@vueuse/core";
 import type { InjectionKey, PropType } from "vue";
 import {
   computed,
@@ -14,6 +14,7 @@ import {
   defineHookProps,
   getFirstChilld,
   labelPropType,
+  toReactive,
   useSharedConfig,
   valuePropType
 } from "@hoci/shared";

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -28,12 +28,12 @@
     "prepublish": "pnpm build"
   },
   "peerDependencies": {
+    "@vueuse/core": ">=9.0.0",
     "vue": "^3.0.0-0"
   },
   "dependencies": {
-    "@vueuse/core": ">=10.5.0",
     "defu": "^6.1.2",
-    "maybe-types": "^0.1.0",
+    "maybe-types": "^0.2.0",
     "type-fest": "^4.4.0"
   }
 }
diff --git a/packages/shared/src/composables/element.ts b/packages/shared/src/composables/element.ts
@@ -1,7 +1,7 @@
-import type { MaybeRefOrGetter } from "@vueuse/core";
-import { toRef, useMounted } from "@vueuse/core";
-import type { Ref } from "vue";
+import type { MaybeRefOrGetter, Ref } from "vue";
+import { useMounted } from "@vueuse/core";
 import { computed } from "vue";
+import { toRef } from "./vueuse";
 
 export function useElement<E extends Element = HTMLElement>(elementSelector: MaybeRefOrGetter<string | Element | undefined | null>, defaultValue?: Ref<E | null | undefined> | MaybeRefOrGetter<E | null | undefined>) {
   const selectorRef = toRef(elementSelector);

diff --git a/packages/shared/src/composables/index.ts b/packages/shared/src/composables/index.ts
@@ -1 +1,2 @@
 export * from "./element";
+export * from "./vueuse";
diff --git a/packages/shared/src/composables/vueuse.ts b/packages/shared/src/composables/vueuse.ts
@@ -0,0 +1,27 @@
+import { toReactive as _toReactive, noop } from "@vueuse/core";
+import { toRef as _toRef, customRef, readonly, ref } from "vue";
+import type { ComputedRef, MaybeRefOrGetter, Ref, ToRef, UnwrapNestedRefs } from "vue";
+
+export const toReactive = _toReactive as <T>(value: T) => UnwrapNestedRefs<T>;
+
+
+export function toRef<T>(r: () => T): Readonly<Ref<T>>;
+export function toRef<T>(r: ComputedRef<T>): ComputedRef<T>;
+export function toRef<T>(r: MaybeRefOrGetter<T>): Ref<T>;
+export function toRef<T>(r: T): Ref<T>;
+export function toRef<T extends object, K extends keyof T>(object: T, key: K): ToRef<T[K]>;
+export function toRef<T extends object, K extends keyof T>(object: T, key: K, defaultValue: T[K]): ToRef<Exclude<T[K], undefined>>;
+export function toRef(...args: any[]) {
+  if (args.length !== 1) {
+    return _toRef(...args as [any, any]);
+  };
+  const r = args[0];
+  return typeof r === "function"
+    ? readonly(customRef(() => ({ get: r as any, set: noop })))
+    : ref(r);
+}
+
+/**
+ * @deprecated use `toRef` instead
+ */
+export const resolveRef = toRef;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/selection.test.ts b/test/selection.test.ts
@@ -1,4 +1,3 @@
-import {useSelectionList} from "hoci";
 import { it } from "vitest";
 
 it("should select items", () => {
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export * from "./element";
		export * from "./vueuse";