fix(bootstrap): extra hit on bootstrap (#142)

there is no need to send a config on bootstrap
MatteoGabriele · Jun 13, 2020 · 6586307 · 6586307
1 parent 656f3ab
commit 6586307
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 43 deletions.
diff --git a/__tests__/bootstrap.spec.js b/__tests__/bootstrap.spec.js
@@ -211,26 +211,4 @@ describe("bootstrap", () => {
       done();
     });
   });
-
-  it("should fire all the includes", () => {
-    getOptions.mockReturnValueOnce({
-      globalObjectName: "gtag",
-      disableScriptLoad: true,
-      enabled: true,
-      includes: [{ id: 2 }, { id: 3, params: { foo: 2 } }],
-      config: {
-        id: 1,
-        params: { foo: 1 }
-      }
-    });
-
-    global.window.gtag = jest.fn();
-
-    bootstrap();
-
-    const { calls } = global.window.gtag.mock;
-    expect(calls[1]).toEqual(["config", 1, { foo: 1 }]);
-    expect(calls[2]).toEqual(["config", 2]);
-    expect(calls[3]).toEqual(["config", 3, { foo: 2 }]);
-  });
 });
diff --git a/src/bootstrap.js b/src/bootstrap.js
@@ -11,8 +11,7 @@ export default function() {
   const {
     enabled,
     globalObjectName,
-    config: { id, params },
-    includes,
+    config,
     pageTrackerEnabled,
     onReady,
     disableScriptLoad
@@ -31,22 +30,6 @@ export default function() {
 
   window[globalObjectName]("js", new Date());
 
-  if (params) {
-    window[globalObjectName]("config", id, params);
-  } else {
-    window[globalObjectName]("config", id);
-  }
-
-  if (Array.isArray(includes)) {
-    includes.forEach(domain => {
-      if (domain.params) {
-        window[globalObjectName]("config", domain.id, domain.params);
-      } else {
-        window[globalObjectName]("config", domain.id);
-      }
-    });
-  }
-
   if (pageTrackerEnabled) {
     pageTracker();
   }
@@ -56,7 +39,7 @@ export default function() {
   }
 
   const domain = "https://www.googletagmanager.com";
-  const resource = `${domain}/gtag/js?id=${id}`;
+  const resource = `${domain}/gtag/js?id=${config.id}`;
 
   return loadScript(resource, domain)
     .then(() => {

diff --git a/src/page-tracker.js b/src/page-tracker.js
@@ -3,7 +3,7 @@ import { warn } from "./util";
 import pageview from "./api/pageview";
 import screenview from "./api/screenview";
 
-export const trackPage = (to, from) => {
+export const trackPage = (to = {}, from = {}) => {
   if (to.path === from.path) {
     return;
   }
@@ -55,7 +55,11 @@ export const init = Router => {
   const { onBeforeTrack, onAfterTrack } = getOptions();
 
   /* istanbul ignore next */
-  Router.onReady(() => {
+  Router.onReady(current => {
+    Vue.nextTick().then(() => {
+      trackPage(current);
+    });
+
     Router.afterEach((to, from) => {
       Vue.nextTick().then(() => {
         onBeforeTrack(to, from);