Merge branch 'develop'

Author: Matteo Gabriele

src/bootstrap.js

@@ -32,20 +32,12 @@ export default function bootstrap () {
       return resolve()
     })
   })
+  .then(() => onAnalyticsReady())
   .then(() => {
-    return onAnalyticsReady()
-  })
-  .then(() => {
-    // we first need to add trackers to be able to track
-    // every other aspect of the application
     createTrackers()
-    // trigger the plugin `ready` callback right after the trackers
     ready()
-    // add exceptions auto tracking
     exceptionAutoTracking()
-    // add page auto tracking
     pageAutoTracking()
-    // track every untracked events before analytics was ready
     untracked()
   })
   .catch(error => {

src/index.js

@@ -1,27 +1,30 @@
 import bootstrap from './bootstrap'
-import * as config from './config'
+import { update } from './config'
 import { onAnalyticsReady } from './helpers'
+import event from 'lib/event'
+import exception from 'lib/exception'
+import page from 'lib/page'
+import query from 'lib/query'
+import require from 'lib/require'
+import set from 'lib/set'
+import social from 'lib/social'
+import time from 'lib/time'
+import untracked from 'lib/untracked'
 
 export default function install (Vue, options = {}) {
-  Vue.prototype.$ga = Vue.$ga = [
-    'event',
-    'exception',
-    'page',
-    'query',
-    'require',
-    'set',
-    'social',
-    'time',
-    'untracked'
-  ].reduce((features, feature) => {
-    return {
-      ...features,
-      [feature]: require(`./lib/${feature}`).default
-    }
-  }, {})
-
-  config.update(options)
+  Vue.prototype.$ga = Vue.$ga = {
+    event,
+    exception,
+    page,
+    query,
+    require,
+    set,
+    social,
+    time,
+    untracked
+  }
 
+  update(options)
   bootstrap()
 }
 

src/lib/require.js

@@ -1,6 +1,6 @@
 import query from 'lib/query'
 
-export default function require (...args) {
+export default function (...args) {
   if (args.length == 2) {
     query('require', args[0], args[1])
     return

yarn.lock

@@ -4929,8 +4929,8 @@ webpack-sources@^1.0.1:
     source-map "~0.5.3"
 
 webpack@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.4.1.tgz#4c3f4f3fb318155a4db0cb6a36ff05c5697418f4"
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.6.0.tgz#a89a929fbee205d35a4fa2cc487be9cbec8898bc"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"