From e8e8f542d26aa5945e7c9681ecde655b3ddcf97f Mon Sep 17 00:00:00 2001 From: Hajime Mugishima Date: Tue, 28 Jul 2020 00:12:27 +0900 Subject: [PATCH] fix: Update @vue/composition-api to v0.6.1 (#1000) * chore: update deps * fix(useMutation,useSubscription): use "immediate" option * fix(type): paramToRef and paramToReactive * fix: remove unused import Co-authored-by: Guillaume Chau --- packages/test-e2e-composition/package.json | 2 +- packages/test-ssr-composition/package.json | 2 +- packages/vue-apollo-composable/package.json | 4 ++-- packages/vue-apollo-composable/src/useQuery.ts | 8 ++++++++ .../vue-apollo-composable/src/useSubscription.ts | 6 ++++++ .../src/util/loadingTracking.ts | 2 ++ .../src/util/paramToReactive.ts | 2 +- .../vue-apollo-composable/src/util/paramToRef.ts | 2 +- yarn.lock | 15 ++++++++++----- 9 files changed, 32 insertions(+), 11 deletions(-) diff --git a/packages/test-e2e-composition/package.json b/packages/test-e2e-composition/package.json index 837649f..94488cc 100644 --- a/packages/test-e2e-composition/package.json +++ b/packages/test-e2e-composition/package.json @@ -17,7 +17,7 @@ "dependencies": { "@vue/apollo-composable": "^4.0.0-alpha.8", "@vue/apollo-util": "^4.0.0-alpha.6", - "@vue/composition-api": "^0.3.2", + "@vue/composition-api": "^0.6.1", "core-js": "^3.1.2", "graphql-type-json": "^0.3.0", "marked": "^0.7.0", diff --git a/packages/test-ssr-composition/package.json b/packages/test-ssr-composition/package.json index d86b69c..866040a 100644 --- a/packages/test-ssr-composition/package.json +++ b/packages/test-ssr-composition/package.json @@ -23,7 +23,7 @@ }, "dependencies": { "@vue/apollo-composable": "^4.0.0-alpha.8", - "@vue/composition-api": "^0.3.3", + "@vue/composition-api": "^0.6.1", "core-js": "^3.1.2", "graphql-type-json": "^0.2.1", "isomorphic-fetch": "^2.2.1", diff --git a/packages/vue-apollo-composable/package.json b/packages/vue-apollo-composable/package.json index 10deb7a..78e56df 100644 --- a/packages/vue-apollo-composable/package.json +++ b/packages/vue-apollo-composable/package.json @@ -37,7 +37,7 @@ "throttle-debounce": "^2.1.0" }, "peerDependencies": { - "@vue/composition-api": "^0.3.4", + "@vue/composition-api": "^0.6.1", "apollo-client": "^2.0.0", "apollo-link": "^1.0.0", "graphql": "^14.5.8", @@ -46,7 +46,7 @@ }, "devDependencies": { "@types/throttle-debounce": "^2.1.0", - "@vue/composition-api": "^0.3.4", + "@vue/composition-api": "^0.6.1", "typescript": "^3.7.2" } } diff --git a/packages/vue-apollo-composable/src/useQuery.ts b/packages/vue-apollo-composable/src/useQuery.ts index 11fc215..d0c5bc4 100644 --- a/packages/vue-apollo-composable/src/useQuery.ts +++ b/packages/vue-apollo-composable/src/useQuery.ts @@ -326,6 +326,8 @@ export function useQuery< watch(documentRef, value => { currentDocument = value restart() + }, { + immediate: true }) // Applying variables @@ -340,6 +342,7 @@ export function useQuery< currentVariablesSerialized = serialized }, { deep: true, + immediate: true }) // Applying options @@ -355,6 +358,7 @@ export function useQuery< restart() }, { deep: true, + immediate: true }) // Fefetch @@ -407,6 +411,8 @@ export function useQuery< item.unsubscribeFns.forEach(fn => fn()) item.unsubscribeFns = [] }) + }, { + immediate: true }) } @@ -437,6 +443,8 @@ export function useQuery< } else { stop() } + }, { + immediate: true }) // Teardown diff --git a/packages/vue-apollo-composable/src/useSubscription.ts b/packages/vue-apollo-composable/src/useSubscription.ts index 5cf03ed..c88e605 100644 --- a/packages/vue-apollo-composable/src/useSubscription.ts +++ b/packages/vue-apollo-composable/src/useSubscription.ts @@ -207,6 +207,7 @@ export function useSubscription < restart() }, { deep: true, + immediate: true }) // Applying document @@ -214,6 +215,8 @@ export function useSubscription < watch(documentRef, value => { currentDocument = value restart() + }, { + immediate: true }) // Applying variables @@ -228,6 +231,7 @@ export function useSubscription < currentVariablesSerialized = serialized }, { deep: true, + immediate: true }) // Internal enabled returned to user @@ -250,6 +254,8 @@ export function useSubscription < } else { stop() } + }, { + immediate: true }) // Teardown diff --git a/packages/vue-apollo-composable/src/util/loadingTracking.ts b/packages/vue-apollo-composable/src/util/loadingTracking.ts index 3c88b32..d2214ec 100644 --- a/packages/vue-apollo-composable/src/util/loadingTracking.ts +++ b/packages/vue-apollo-composable/src/util/loadingTracking.ts @@ -67,6 +67,8 @@ function track (loading: Ref, type: keyof LoadingTracking) { tracking[type].value += mod appTracking[type].value += mod } + }, { + immediate: true }) onBeforeUnmount(() => { diff --git a/packages/vue-apollo-composable/src/util/paramToReactive.ts b/packages/vue-apollo-composable/src/util/paramToReactive.ts index 9424b11..45b40d2 100644 --- a/packages/vue-apollo-composable/src/util/paramToReactive.ts +++ b/packages/vue-apollo-composable/src/util/paramToReactive.ts @@ -1,7 +1,7 @@ import { Ref, isRef, reactive, computed } from '@vue/composition-api' import { ReactiveFunction } from './ReactiveFunction' -export function paramToReactive (param: T | Ref | ReactiveFunction): T | Ref { +export function paramToReactive (param: T | Ref | ReactiveFunction): T | Ref { if (isRef(param)) { return param } else if (typeof param === 'function') { diff --git a/packages/vue-apollo-composable/src/util/paramToRef.ts b/packages/vue-apollo-composable/src/util/paramToRef.ts index 961e168..477e0d7 100644 --- a/packages/vue-apollo-composable/src/util/paramToRef.ts +++ b/packages/vue-apollo-composable/src/util/paramToRef.ts @@ -7,6 +7,6 @@ export function paramToRef (param: T | Ref | ReactiveFunction): Ref } else if (typeof param === 'function') { return computed(param as ReactiveFunction) } else { - return ref(param) + return ref(param) as Ref } } diff --git a/yarn.lock b/yarn.lock index 6dff437..48a3efd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2672,12 +2672,12 @@ source-map "~0.6.1" vue-template-es2015-compiler "^1.9.0" -"@vue/composition-api@^0.3.2", "@vue/composition-api@^0.3.3", "@vue/composition-api@^0.3.4": - version "0.3.4" - resolved "https://registry.yarnpkg.com/@vue/composition-api/-/composition-api-0.3.4.tgz#43d2c3377173cfe1d02e51e3342bcf0fbde9c4b6" - integrity sha512-aMbg/pEk0PSQAIFyWWLqbAmaCCTx1kFq+49KZslIBJH9Wqos7eEPLtMv4gGxd/EcciBIgfbtUXaXGg/O3mheRA== +"@vue/composition-api@^0.6.1": + version "0.6.1" + resolved "https://registry.yarnpkg.com/@vue/composition-api/-/composition-api-0.6.1.tgz#0a32e7d18e4b69912e3547e11d0c85e770de6825" + integrity sha512-NfP6kiBDXkYWrzFwK9IBem5MQSXMujIl8QDBJuLx0Y/6pwK3PC+F7dFDhja+H03SE6WwLleZASM6+zY3BT3Bkw== dependencies: - tslib "^1.9.3" + tslib "^2.0.0" "@vue/eslint-config-standard@^4.0.0": version "4.0.0" @@ -14618,6 +14618,11 @@ tslib@^1, tslib@^1.9.0, tslib@^1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== +tslib@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.0.tgz#18d13fc2dce04051e20f074cc8387fd8089ce4f3" + integrity sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g== + tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"