Merge branch 'master' into typescript-extract-payload-types

Author: romansp

src/lib/page.js

@@ -85,28 +85,26 @@ export function autoTracking () {
     return
   }
 
-  if (autoTracking.pageviewOnLoad && router.history.ready) {
-    trackRoute(router.currentRoute)
-  }
+  router.onReady(() => {
+    if (autoTracking.pageviewOnLoad && router.history.ready) {
+      trackRoute(router.currentRoute)
+    }
 
-  config.router.afterEach(function (to, from) {
-    const { skipSamePath, shouldRouterUpdate } = autoTracking
+    router.afterEach(function (to, from) {
+      const { skipSamePath, shouldRouterUpdate } = autoTracking
 
-    // Default behaviour of the router when the `skipSamePath` is turned on.
-    // Skip router change when current and previous route have the same path
-    // https://github.com/MatteoGabriele/vue-analytics/issues/73
-    if (skipSamePath && to.path === from.path) {
-      return
-    }
+      // Default behaviour of the router when the `skipSamePath` is turned on.
+      // Skip router change when current and previous route have the same path
+      // https://github.com/MatteoGabriele/vue-analytics/issues/73
+      if (skipSamePath && to.path === from.path) {
+        return
+      }
 
-    // Adds a custom way to define when the router should track
-    if (typeof shouldRouterUpdate === 'function' && !shouldRouterUpdate(to, from)) {
-      return
-    }
+      // Adds a custom way to define when the router should track
+      if (typeof shouldRouterUpdate === 'function' && !shouldRouterUpdate(to, from)) {
+        return
+      }
 
-    // Fire tracking after the nextTick or it will still register the previous route
-    // https://github.com/MatteoGabriele/vue-analytics/issues/44
-    config.$vue.nextTick().then(() => {
       trackRoute(router.currentRoute)
     })
   })

vue-analytics.d.ts

@@ -28,11 +28,14 @@ declare module 'vue-analytics' {
     (route: VueRouter): void;
   }
 
+  interface SetFieldValue {
+    field: string;
+    value: any;
+  }
+
   interface setFn {
-    (fieldName: string, fieldValue: string): void;
-    (options: {
-      field: string, value: string
-    }): void;
+    (fieldName: string, fieldValue: any): void;
+    (options: Record<string, any>): void;
   }
 
   interface SocialPayload {
@@ -237,7 +240,7 @@ declare module 'vue-analytics' {
     disabled?: boolean | (() => boolean) | (() => Promise<boolean>) | Promise<boolean>,
     checkDuplicatedScript?: boolean,
     disableScriptLoader?: boolean
-    set?: { field: string, value: string }[],
+    set?: SetFieldValue[],
     commands?: any,
     beforeFirstHit?: () => void,
     ready?: () => void