Merge pull request #48 from conversant/release/2.5.1

Release/2.5.1

Author: msahagu2

karma.conf.js

@@ -1,5 +1,5 @@
 'use strict';
-
+var path = require('path');
 
 module.exports = function(config) {
     config.set({
@@ -13,13 +13,22 @@ module.exports = function(config) {
         ],
 
         preprocessors: {
-            'test/**/*.test.js': ['webpack', 'sourcemap']
+            'test/**/*.test.js': ['webpack', 'sourcemap'],
+
+			'lib/**/*.js': ['coverage']
         },
 
         webpack: {
 			devtool: 'inline-source-map',
 			module: {
-				postLoaders: []
+                rules: [
+                    {
+                        test: /\.js$/,
+                        use: { loader: 'istanbul-instrumenter-loader' },
+                        include: path.resolve('lib/'),
+                        exclude: /((test|node_modules)\/)|(lib\/detect\/(browser.js|environment.js))/
+                    }
+                ]
 			}
 		},
 
@@ -29,6 +38,14 @@ module.exports = function(config) {
 
         reporters: ['progress'],
 
+		coverageReporter: {
+        	type: 'lcov',
+			dir: 'coverage',
+            instrumenterOptions: {
+                istanbul: { noCompact: true }
+            }
+		},
+
         frameworks: ['mocha'],
 
 		customLaunchers: {
@@ -40,29 +57,15 @@ module.exports = function(config) {
 
 		// Number of browsers to run in parallel [set to 1 to avoid timing-based tests from failing]
 		concurrency: 1,
-		// Using SafariNative launcher to due changes in Mojave: https://github.com/karma-runner/karma-safari-launcher/issues/29
-		browsers: ['Firefox', 'Chrome', 'SafariNative']
+		browsers: ['Firefox', 'Chrome']
 
     });
 
-	if (process.argv.indexOf('--with-coverage') > -1) {
-		config.webpack.module.postLoaders.push({
-			test: /\.js$/,
-			exclude: /((test|node_modules)\/)|(lib\/detect\/(browser.js|environment.js))/,
-			loader: 'istanbul-instrumenter'
-		});
-
-		config.reporters.push('coverage');
-
-		config.coverageReporter = {
-			dir: 'coverage',
-			type: 'lcov'
-		};
-	}
-
 	if (process.env.TRAVIS) {
 		config.browsers = ['Firefox', 'Chrome_travis_ci'];
 	}
 
-
+    if (process.argv.indexOf('--with-coverage') > -1) {
+        config.reporters.push('coverage');
+    }
 };