Merge branch 'canary'

Author: knalli

.eslintrc

@@ -22,7 +22,7 @@
     "comma-spacing": [1, {"before": false, "after": true}],
     "comma-style": [1, "last"],
     "eol-last": 1,
-    "indent": [1, 2, {"SwitchCase": 1}],
+    "indent": [1, 2, {"SwitchCase": 1, "FunctionDeclaration": {"parameters": "first"}, "FunctionExpression": {"parameters": "first"}}],
     "keyword-spacing": 1,
     "semi": 2,
     "quotes": [1, "single"]

.nvmrc

@@ -1 +1 @@
-6.10
+8.2

.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: node_js
 node_js:
-  - "6.10"
+  - "8.2"
 
 addons:
   code_climate:
@@ -12,7 +12,7 @@ before_script:
   - sh -e /etc/init.d/xvfb start
 
 after_script:
-  - if [ "$TEST_SCOPE" == "" ]; then npm install -g codeclimate-test-reporter && codeclimate-test-reporter < build/coverage/report/lcov.info; fi
+  - if [ "$TEST_SCOPE" == "" ]; then npm install -g codeclimate-test-reporter && codeclimate-test-reporter < build/coverage/lcov.info; fi
 
 env:
   matrix:

karma.conf.js

@@ -30,9 +30,9 @@ var AVAILABLE_SCOPES = [], isValidScope, injectByScope, getAffectiveScope, isDef
     }
     return prefix + 'bower_components/' + path;
   },
-    isDefaultScope = function (scope) {
-      return !isValidScope(scope);
-    };
+  isDefaultScope = function (scope) {
+    return !isValidScope(scope);
+  };
 })();
 
 /**
@@ -156,7 +156,7 @@ module.exports = function (config) {
     reporters : (() => {
       let reporters = ['progress'];
       if (isDefaultScope(scope)) {
-        reporters.push('coverage');
+        reporters.push('coverage-istanbul');
       }
       if (sourcelabsConfig.enabled) {
         reporters.push('saucelabs');
@@ -226,17 +226,22 @@ module.exports = function (config) {
               plugins : ['transform-runtime'],
             },
           },
-          // {
-          //   enforce : 'pre',
-          //   test : /\.js$/,
-          //   include : [
-          //     path.resolve('src/')
-          //   ],
-          //   exclude : [
-          //     /(node_modules|bower_components)/,
-          //   ],
-          //   loader : 'babel-istanbul-loader',
-          // },
+          {
+            enforce : 'post',
+            test : /\.js$/,
+            use: {
+              loader : 'istanbul-instrumenter-loader',
+              options : {
+                esModules : true,
+              },
+            },
+            include : [
+              path.resolve('src/')
+            ],
+            exclude : [
+              /(node_modules|bower_components)/,
+            ],
+          },
           {
             test : /vertx-eventbus\.js$/,
             loader : 'imports-loader',
@@ -261,12 +266,19 @@ module.exports = function (config) {
       noInfo : true
     },
 
-    coverageReporter : (() => {
+    coverageIstanbulReporter : (() => {
       if (isDefaultScope(scope)) {
         return {
+          fixWebpackSourcePaths: true,
+          reports: [
+            'text-summary',
+            'lcovonly',
+          ],
           dir : 'build/coverage',
-          subdir : 'report',
-          type : 'lcov'
+          lcovonly: {
+            subdir : 'report',
+            type : 'lcov',
+          },
         };
       }
     })(),
@@ -306,7 +318,11 @@ module.exports = function (config) {
       } else if (process.env.TRAVIS) {
         browsers.push('Firefox');
       } else {
-        browsers.push('Chrome');
+        if (process.env.NO_HEADLESS) {
+          browsers.push('Chrome');
+        } else {
+          browsers.push('ChromeHeadless');
+        }
       }
       return browsers;
     })(),