use babel for instrumentation

.babelrc

@@ -7,5 +7,10 @@
         "modules": false
       }
     ]
-  ]
+  ],
+  "env": {
+    "test": {
+      "plugins": ["istanbul"]
+    }
+  }
 }

.eslintrc.json

@@ -51,6 +51,7 @@
     "quote-props": "off",
     "react/jsx-filename-extension": "off",
     "no-script-url": "off",
-    "jsx-a11y/anchor-is-valid": "off"
+    "jsx-a11y/anchor-is-valid": "off",
+    "import/no-extraneous-dependencies": "off"
   }
 }

grunt/aliases.yaml

@@ -29,13 +29,15 @@ setup:
   - copy:discovery_vars
 
 test:prod:
+  - env:test
   - clean:temp
   - clean:coverage
   - clean:release
   - copy:release
-  - babel
+  - babel:temp
+  - babel:release
   - string-replace:final
-  - exec:nyc-instrument
+  - babel:instrument
   - server:once
   - puppet:prod
   - coverage-report:coveralls

grunt/babel.js

@@ -39,6 +39,16 @@ module.exports = {
       },
     ],
   },
+  instrument: {
+    files: [
+      {
+        expand: true,
+        cwd: 'dist/js',
+        src: '**/*.js',
+        dest: 'test/coverage/instrument',
+      },
+    ],
+  },
   temp: {
     files: [
       {

grunt/coverage-report.js

@@ -1,28 +1,45 @@
-'use strict';
+/* eslint-disable global-require */
 /**
  * creating coverage task
  *
  * @module grunt/coverage
  */
-module.exports = function (grunt) {
+module.exports = function(grunt) {
+  const COVERAGE_HTML_OUTPUT_DIR = 'test/coverage/reports/html';
+  const COVERAGE_LCOV_OUTPUT_DIR = 'test/coverage/reports/lcov';
+  const COVERAGE_COLLECTION_FILE = 'test/coverage/coverage.json';
 
-  var istanbul = require('istanbul');
-  var COVERAGE_HTML_OUTPUT_DIR = 'test/coverage/reports/html';
-  var COVERAGE_LCOV_OUTPUT_DIR = 'test/coverage/reports/lcov';
-  var COVERAGE_COLLECTION_FILE = 'test/coverage/coverage.json';
+  grunt.registerMultiTask('coverage-report', function() {
+    const istanbul = require('istanbul');
+    const options = this.options({ htmlReport: false });
 
-  grunt.registerMultiTask('coverage-report', function () {
+    // get the coverage object from the collection file generated
+    const coverageObject = grunt.file.readJSON(COVERAGE_COLLECTION_FILE);
 
-    var options = this.options({ htmlReport: false });
+    /**
+     * For some reason, possible configuration? -- the instrumentor adds a base prefix to the paths
+     * this breaks when we try to run through them, so this will remove that base from all the coverage paths
+     */
+    const normalizedCoverageObject = Object.keys(coverageObject).reduce(
+      (acc, k) => {
+        const newPath = k.replace(/^dist\/js\//g, '');
 
-    // get the coverage object from the collection file generated
-    var coverageObject = grunt.file.readJSON(COVERAGE_COLLECTION_FILE);
-    var collector = new istanbul.Collector();
-    collector.add(coverageObject);
+        return {
+          ...acc,
+          [newPath]: {
+            ...coverageObject[k],
+            path: newPath,
+          },
+        };
+      },
+      {}
+    );
+    const collector = new istanbul.Collector();
+    collector.add(normalizedCoverageObject);
 
     // Generate a quick summary to be shown in the output
-    var finalCoverage = collector.getFinalCoverage();
-    var summary = istanbul.utils.summarizeCoverage(finalCoverage);
+    const finalCoverage = collector.getFinalCoverage();
+    const summary = istanbul.utils.summarizeCoverage(finalCoverage);
 
     // Output the percentages of the coverage
     grunt.log.ok('Coverage:');
@@ -34,23 +51,21 @@ module.exports = function (grunt) {
     // write reports
     if (options.htmlReport) {
       istanbul.Report.create('html', {
-        dir: COVERAGE_HTML_OUTPUT_DIR
+        dir: COVERAGE_HTML_OUTPUT_DIR,
       }).writeReport(collector, true);
     }
 
     istanbul.Report.create('lcov', {
-      dir: COVERAGE_LCOV_OUTPUT_DIR
+      dir: COVERAGE_LCOV_OUTPUT_DIR,
     }).writeReport(collector, true);
   });
 
   return {
-    'coveralls': {
-      htmlReport: false
+    coveralls: {
+      htmlReport: false,
     },
-    'html': {
-      htmlReport: true
-    }
-  }
+    html: {
+      htmlReport: true,
+    },
+  };
 };
-
-

grunt/env.js

@@ -11,21 +11,24 @@ module.exports = {
   dev: {
     NODE_ENV: 'development',
     SERVER_ENV: 'dev',
-    TARGET: 'dev'
+    TARGET: 'dev',
   },
   prod: {
     NODE_ENV: 'production',
     SERVER_ENV: 'dev',
-    TARGET: 'prod'
+    TARGET: 'prod',
+  },
+  test: {
+    NODE_ENV: 'test',
   },
   'release-prod': {
     NODE_ENV: 'production',
     SERVER_ENV: 'release',
-    TARGET: 'prod'
+    TARGET: 'prod',
   },
   'release-dev': {
     NODE_ENV: 'development',
     SERVER_ENV: 'release',
-    TARGET: 'dev'
-  }
+    TARGET: 'dev',
+  },
 };