Fix code coverage

karma.conf.coverage.ts

@@ -1,44 +1,29 @@
-/* eslint-env node */
-'use strict';
-
-var baseConfig = require('./karma.conf');
+const baseConfig = require('./karma.conf');
 
 module.exports = function(config) {
   baseConfig(config);
 
   config.set({
     singleRun: true,
 
-    reporters: ['spec', 'summary', 'junit', 'coverage'],
-
-    specReporter: {
-      suppressPassed: true
-    },
+    reporters: ['progress', 'summary', 'junit', 'karma-typescript'],
 
     junitReporter: {
       outputDir: 'junit-reports',
       suite: require('./package.json').name
     },
 
-    coverageReporter: {
-      reporters: [
-        { type: 'lcovonly', subdir: '.' },
-        { type: 'json', subdir: '.' }
-      ]
+    karmaTypescriptConfig: {
+      reports: {
+        "lcovonly": {
+          directory: "coverage",
+          subdirectory: "."
+        },
+        "json": {
+          directory: "coverage",
+          subdirectory: "."
+        },
+      }
     },
-
-    browserify: {
-      debug: true,
-      transform: [
-        [
-          'browserify-istanbul',
-          {
-            instrumenterConfig: {
-              embedSource: true
-            }
-          }
-        ]
-      ]
-    }
   });
 };

karma.conf.ts

@@ -9,7 +9,8 @@ module.exports = function(config) {
     files: [
       { pattern: 'test/support/*.html', included: false },
       'test/support/global.ts', // NOTE: This must run before all tests
-      'test/**/*.test.ts'
+      'test/**/*.test.ts',
+      'lib/**/*.ts'
     ],
     browsers: ['ChromeHeadless'],
 
@@ -20,7 +21,7 @@ module.exports = function(config) {
     reporters: ['spec'],
 
     preprocessors: {
-      'test/**/*.ts': 'karma-typescript'
+      '**/*.ts': 'karma-typescript'
     },
 
     browserNoActivityTimeout: TEST_TIMEOUT,
@@ -41,13 +42,10 @@ module.exports = function(config) {
         sourceMap: true,
       },
       compilerOptions: {
-        module: "commonjs",
-        target: "ES5",
-        allowJs: false,
+        sourceMap: true,
         esModuleInterop: true
       },
-      include: ['test'],
-      exclude: ['node_modules', 'lib', 'test-e2e/*.ts']
+      include: ["lib", "test"],
     }
   });
 };

lib/middleware.ts

@@ -1,8 +1,6 @@
-'use strict';
+import Facade from 'segmentio-facade'
 
-var Facade = require('segmentio-facade');
-
-module.exports.SourceMiddlewareChain = function SourceMiddlewareChain() {
+export const SourceMiddlewareChain = function SourceMiddlewareChain() {
   var apply = middlewareChain(this);
 
   this.applyMiddlewares = function(facade, integrations, callback) {
@@ -20,7 +18,7 @@ module.exports.SourceMiddlewareChain = function SourceMiddlewareChain() {
   };
 };
 
-module.exports.IntegrationMiddlewareChain = function IntegrationMiddlewareChain() {
+export const IntegrationMiddlewareChain = function IntegrationMiddlewareChain() {
   var apply = middlewareChain(this);
 
   this.applyMiddlewares = function(facade, integration, callback) {
@@ -34,7 +32,7 @@ module.exports.IntegrationMiddlewareChain = function IntegrationMiddlewareChain(
   };
 };
 
-module.exports.DestinationMiddlewareChain = function DestinationMiddlewareChain() {
+export const DestinationMiddlewareChain = function DestinationMiddlewareChain() {
   var apply = middlewareChain(this);
 
   this.applyMiddlewares = function(facade, integration, callback) {
@@ -49,7 +47,7 @@ module.exports.DestinationMiddlewareChain = function DestinationMiddlewareChain(
 };
 
 // Chain is essentially a linked list of middlewares to run in order.
-function middlewareChain(dest) {
+export const middlewareChain = function middlewareChain(dest) {
   var middlewares = [];
 
   // Return a copy to prevent external mutations.
@@ -106,5 +104,3 @@ function executeChain(run, payload, middlewares, index) {
     }
   }
 }
-
-module.exports.middlewareChain = middlewareChain;

package.json

@@ -78,7 +78,6 @@
     "@typescript-eslint/parser": "^4.1.0",
     "assert": "1.5.0",
     "browserify": "16.5.2",
-    "browserify-istanbul": "^3.0.1",
     "buffer": "^4.9.2",
     "codeceptjs": "^2.6.5",
     "codecov": "^3.7.2",

test/middleware.test.ts

@@ -1,12 +1,11 @@
-'use strict';
+import assert from 'proclaim'
 
-var assert = require('proclaim');
-var Facade = require('segmentio-facade');
-var SourceMiddlewareChain = require('../build/middleware')
+const Facade = require('segmentio-facade');
+const SourceMiddlewareChain = require('../build/middleware')
   .SourceMiddlewareChain;
-var IntegrationMiddlewareChain = require('../build/middleware')
+const IntegrationMiddlewareChain = require('../build/middleware')
   .IntegrationMiddlewareChain;
-var middlewareChain = require('../build/middleware').middlewareChain;
+const middlewareChain = require('../build/middleware').middlewareChain;
 
 describe('middlewareChain', function() {
   var chain;

test/pageDefaults.test.ts

@@ -1,6 +1,6 @@
 import { pageDefaults }  from '../build/pageDefaults'
 import * as assert from 'proclaim'
-import sinon from 'sinon'
+import * as sinon from 'sinon'
 
 const el = document.createElement("link")
 el.setAttribute("rel", "canonical")