From ae4a6d497e058958e6949f53698b8407bb36eef5 Mon Sep 17 00:00:00 2001 From: Fran Dios Date: Tue, 11 Aug 2020 19:54:57 +0900 Subject: [PATCH 1/2] Fix getAppTracking for Vue 3 support v2 instances have a `vm.$root` property while v3 ones have `vm.root` --- packages/vue-apollo-composable/src/util/loadingTracking.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/vue-apollo-composable/src/util/loadingTracking.ts b/packages/vue-apollo-composable/src/util/loadingTracking.ts index b09f16d9..7fe38591 100644 --- a/packages/vue-apollo-composable/src/util/loadingTracking.ts +++ b/packages/vue-apollo-composable/src/util/loadingTracking.ts @@ -11,7 +11,8 @@ export interface AppLoadingTracking extends LoadingTracking { } export function getAppTracking () { - const root: any = getCurrentInstance().$root + const vm = getCurrentInstance() + const root: any = vm.$root || vm.root let appTracking: AppLoadingTracking if (!root._apolloAppTracking) { From 75436c9e497d759583f1567e8d7c89ec59e883b5 Mon Sep 17 00:00:00 2001 From: Fran Dios Date: Wed, 12 Aug 2020 12:06:55 +0900 Subject: [PATCH 2/2] Add type to variable --- packages/vue-apollo-composable/src/util/loadingTracking.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vue-apollo-composable/src/util/loadingTracking.ts b/packages/vue-apollo-composable/src/util/loadingTracking.ts index 7fe38591..bd04706f 100644 --- a/packages/vue-apollo-composable/src/util/loadingTracking.ts +++ b/packages/vue-apollo-composable/src/util/loadingTracking.ts @@ -11,7 +11,7 @@ export interface AppLoadingTracking extends LoadingTracking { } export function getAppTracking () { - const vm = getCurrentInstance() + const vm: any = getCurrentInstance() const root: any = vm.$root || vm.root let appTracking: AppLoadingTracking