From: Eduardo San Martin Morote Date: Tue, 5 Oct 2021 11:11:54 +0000 (+0200) Subject: feat: proper check of computed requiring @vue/composition-api@1.2.3 X-Git-Tag: pinia@2.0.0-rc.12~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b099ef4ee143ba9cf44e08c1eb607de395563020;p=thirdparty%2Fvuejs%2Fpinia.git feat: proper check of computed requiring @vue/composition-api@1.2.3 --- diff --git a/packages/pinia/package.json b/packages/pinia/package.json index 67269df6..e9f9dfbb 100644 --- a/packages/pinia/package.json +++ b/packages/pinia/package.json @@ -73,7 +73,7 @@ "vue-demi": "*" }, "peerDependencies": { - "@vue/composition-api": "^1.2.2", + "@vue/composition-api": "^1.2.3", "typescript": "^4.4.3", "vue": "^2.6.14 || ^3.2.0" }, diff --git a/packages/pinia/src/store.ts b/packages/pinia/src/store.ts index 96b8465f..ca0b69d4 100644 --- a/packages/pinia/src/store.ts +++ b/packages/pinia/src/store.ts @@ -77,15 +77,7 @@ const { assign } = Object function isComputed(value: ComputedRef | unknown): value is ComputedRef function isComputed(o: any): o is ComputedRef { - if (isVue2) { - const descriptor = o ? Object.getOwnPropertyDescriptor(o, 'value') : null - return (descriptor && - descriptor.get && - // TODO: make something in @vue/composition-api to be able to check this - descriptor.get.toString().length > 42) as boolean - } - // !!(isRef(o) && o.effect) - return o && o.effect + return !!(isRef(o) && (o as any).effect) } function createOptionsStore<