From 4fb3484285d174ac23a1da4432af4de5a87928ba Mon Sep 17 00:00:00 2001
From: johnjbarton <johnjbarton@johnjbarton.com>
Date: Thu, 8 Mar 2018 17:02:54 -0800
Subject: [PATCH 01/50] fix(common): Proxy function toString does not contain
 Proxy.

Recent change (https://www.chromestatus.com/feature/5666372071718912) means Proxied functions
no longer throw TypeError.  Change the test to conform to the new reality.
---
 common/stringify.js           | 4 ++--
 test/client/stringify.spec.js | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/common/stringify.js b/common/stringify.js
index 6df1d3e97..192a4847a 100644
--- a/common/stringify.js
+++ b/common/stringify.js
@@ -25,8 +25,8 @@ var stringify = function stringify (obj, depth) {
         return obj.toString().replace(/\{[\s\S]*\}/, '{ ... }')
       } catch (err) {
         if (err instanceof TypeError) {
-          // Proxy(function abc(...) { ... })
-          return 'Proxy(function ' + (obj.name || '') + '(...) { ... })'
+          // Support older browsers
+          return 'function ' + (obj.name || '') + '() { ... }'
         } else {
           throw err
         }
diff --git a/test/client/stringify.spec.js b/test/client/stringify.spec.js
index 603c2df03..e51c85d37 100644
--- a/test/client/stringify.spec.js
+++ b/test/client/stringify.spec.js
@@ -40,11 +40,8 @@ describe('stringify', function () {
   //   http://caniuse.com/#feat=proxy
   if (window.Proxy) {
     it('should serialize proxied functions', function () {
-      var abcProxy = new Proxy(function abc (a, b, c) { return 'whatever' }, {})
       var defProxy = new Proxy(function (d, e, f) { return 'whatever' }, {})
-
-      assert.deepEqual(stringify(abcProxy), 'Proxy(function abc(...) { ... })')
-      assert.deepEqual(stringify(defProxy), 'Proxy(function (...) { ... })')
+      assert.deepEqual(stringify(defProxy), 'function () { ... }')
     })
   }
 

From 0b2c6904f12ca3cf3b41a24eb9ff31ebae572d2c Mon Sep 17 00:00:00 2001
From: johnjbarton <johnjbarton@johnjbarton.com>
Date: Mon, 23 Apr 2018 09:15:41 -0700
Subject: [PATCH 02/50] docs: Outline the basic workflow. (#2974)

This short narative also helps introduce 'client' and 'context' terminology.
---
 docs/intro/03-how-it-works.md | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/docs/intro/03-how-it-works.md b/docs/intro/03-how-it-works.md
index 61a1ce111..eafdec9da 100644
--- a/docs/intro/03-how-it-works.md
+++ b/docs/intro/03-how-it-works.md
@@ -14,7 +14,28 @@ The server collects the results from all of the captured browsers and presents t
 
 This is only a very brief overview, as the internals of how Karma works aren't entirely necessary when using Karma.
 
-However, if you are interested in learning more, Karma itself originates from a university thesis, which goes into detail about the design
+## Outline of workflow.
+
+Here is roughly how Karma works:
+
+After starting up, Karma loads plugins and the configuration file, then starts its local web server which listens for connections.
+Any browser already waiting on websockets from the server will reconnect immediately. As part of loading the plugins, test reporters
+register for 'browser' events so they are ready for test results.
+
+Then karma launches zero, one, or more browsers, setting their start page the Karma server URL.
+
+When the browsers connect, Karma serves a 'client.html' page; when this page runs in the browser it connects back to the server via websockets.
+
+Once the server sees the websocket connection, it instructs the client -- over the websocket -- to execute tests.  The client page opens an iframe with a 'context.html' page from the server. The server generates this context.html page using the configuration. This page includes the test framework adapter, the code to be tested, and the test code.
+
+When the browser loads this context page, the onload event handler connects the context page to the client page via postMessage. The framework adapter is in charge at this point: it runs the test, reporting errors or success by messaging through the client page.
+
+Messages sent to the client page are forwarded through the websocket to the Karma server. The server re-dispatches these messages as 'browser' events.  The reporters listening to 'browser' events get the data; they may print it, save it to files, or forward the data to another service.
+Since the data is sent by the test framework adapter to the reporter, adapters and reporters almost always come in pairs, like karma-jasmine and karma-jasmine-reporter.  The detailed content of test-result data is of no concern to other parts of karma: only the reporter needs to know it format.
+
+Karma has many variations and options that may cause different workflow with different configurations.
+
+If you are interested in learning more about the design, Karma itself originates from a university thesis, which goes into detail about the design
 and implementation, and it is available to read [right here].
 
 [right here]: https://github.com/karma-runner/karma/raw/master/thesis.pdf

From a3ff6c84481271c0578ca2b7b4396b804b02e76a Mon Sep 17 00:00:00 2001
From: johnjbarton <johnjbarton@johnjbarton.com>
Date: Mon, 23 Apr 2018 09:23:15 -0700
Subject: [PATCH 03/50] feat(grunt): run check_clean before starting release.
 (#2978)

* fix(package.json): sinon-chai 2.13 is not compatible with sinon 4.x

* feat(grunt): run check_clean before starting release.

By checking early we avoid pushing a new version to github that is not then published to npm.
---
 gruntfile.js | 2 ++
 package.json | 1 +
 2 files changed, 3 insertions(+)

diff --git a/gruntfile.js b/gruntfile.js
index 0a1b6f1ce..3ae8f22bc 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -131,6 +131,7 @@ module.exports = function (grunt) {
     }
   })
 
+  grunt.loadNpmTasks('grunt-check-clean')
   grunt.loadTasks('tasks')
   require('load-grunt-tasks')(grunt)
 
@@ -141,6 +142,7 @@ module.exports = function (grunt) {
 
   grunt.registerTask('release', 'Build, bump and publish to NPM.', function (type) {
     grunt.task.run([
+      'check_clean',
       'npm-contributors',
       'bump:' + (type || 'patch') + ':bump-only',
       'build',
diff --git a/package.json b/package.json
index 0ffdcc382..fe3fd7087 100644
--- a/package.json
+++ b/package.json
@@ -397,6 +397,7 @@
     "grunt-browserify": "^5.0.0",
     "grunt-bump": "^0.8.0",
     "grunt-cli": "^1.1.0",
+    "grunt-check-clean": "^0.1.2",
     "grunt-contrib-watch": "^1.0.0",
     "grunt-conventional-changelog": "^6.0.1",
     "grunt-conventional-github-releaser": "^1.0.0",

From bc1453e3198faa53dd6b02a23b1d3b3911d6b467 Mon Sep 17 00:00:00 2001
From: johnjbarton <johnjbarton@johnjbarton.com>
Date: Mon, 30 Apr 2018 08:34:56 -0700
Subject: [PATCH 04/50] fix(build): pin npm version in appveyor to v3, compat
 with node 4 (#2983)

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 150f49eb8..40cf08a0d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,8 +13,8 @@ install:
   # Install Node.js
   - ps: Install-Product node $env:nodejs_version
 
-  # Upgrade npm
-  - npm install -g npm
+  # Install npm compat with node 4
+  - npm install -g npm@3
 
   # Output our current versions for debugging
   - node --version

From c3f05ef25de93e40d5a58920c495c48703f9ebfa Mon Sep 17 00:00:00 2001
From: Brian Di Palma <offler@gmail.com>
Date: Mon, 23 Apr 2018 10:33:56 +0100
Subject: [PATCH 05/50] fix(server): Remove Socket.IO listeners

Not removing Socket.IO listeners can cause memory issues
in long running processes that spawn many Karma instance.

Fixes #2980
---
 lib/server.js            | 4 ++++
 test/unit/server.spec.js | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/server.js b/lib/server.js
index dd015aca2..c9ddbe71e 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -425,6 +425,10 @@ Server.prototype._start = function (config, launcher, preprocess, fileList,
     }
 
     self.emitAsync('exit').then(function () {
+      // Remove Socket.IO listeners. `connection` callback closes over `Server`
+      // instance so it leaks Plugin state e.g. Webpack compilations.
+      socketServer.sockets.removeAllListeners()
+      socketServer.close()
       // don't wait forever on webServer.close() because
       // pending client connections prevent it from closing.
       var closeTimeout = setTimeout(removeAllListeners, webServerCloseTimeout)
diff --git a/test/unit/server.spec.js b/test/unit/server.spec.js
index 2274355db..a16a8ad83 100644
--- a/test/unit/server.spec.js
+++ b/test/unit/server.spec.js
@@ -65,13 +65,15 @@ describe('server', () => {
     }
 
     mockSocketServer = {
+      close: () => {},
       flashPolicyServer: {
         close: () => {}
       },
       sockets: {
         sockets: {},
         on: () => {},
-        emit: () => {}
+        emit: () => {},
+        removeAllListeners: () => {}
       }
     }
 

From b4fddd2ca10582ad7b0e880bf7e24172d5c99526 Mon Sep 17 00:00:00 2001
From: Brian Di Palma <offler@gmail.com>
Date: Thu, 26 Apr 2018 07:24:50 +0100
Subject: [PATCH 06/50] chore(appveyor): Remove npm upgrade step from AppVeyor
 script

Upgrading npm can cause build failures in older node.js versions
see https://github.com/karma-runner/karma/pull/2981 for details.
---
 appveyor.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 40cf08a0d..8e212bd91 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,9 +13,6 @@ install:
   # Install Node.js
   - ps: Install-Product node $env:nodejs_version
 
-  # Install npm compat with node 4
-  - npm install -g npm@3
-
   # Output our current versions for debugging
   - node --version
   - npm --version

From af9c84a379d3b02de03d0fc2d0402ea56a0a0462 Mon Sep 17 00:00:00 2001
From: Brian Di Palma <offler@gmail.com>
Date: Thu, 26 Apr 2018 09:18:03 +0100
Subject: [PATCH 07/50] fix(UTs): Correct proxy listeners expectation

Expectations added in https://github.com/karma-runner/karma/pull/2596
didn't match `EventEmitter` API for `listeners`.
---
 test/unit/middleware/proxy.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/unit/middleware/proxy.spec.js b/test/unit/middleware/proxy.spec.js
index 73bb0f9f9..d1047ac35 100644
--- a/test/unit/middleware/proxy.spec.js
+++ b/test/unit/middleware/proxy.spec.js
@@ -346,8 +346,8 @@ describe('middleware.proxy', () => {
     }
     var parsedProxyConfig = m.parseProxyConfig(proxy, config)
     expect(parsedProxyConfig).to.have.length(1)
-    expect(parsedProxyConfig[0].proxy.listeners('proxyReq', true)).to.equal(true)
-    expect(parsedProxyConfig[0].proxy.listeners('proxyRes', true)).to.equal(true)
+    expect(parsedProxyConfig[0].proxy.listeners('proxyReq')[0]).to.equal(config.proxyReq)
+    expect(parsedProxyConfig[0].proxy.listeners('proxyRes')[0]).to.equal(config.proxyRes)
   })
 
   it('should handle empty proxy config', () => {

From a5f75c07698f609e8085fc98a2d87e1090d6852d Mon Sep 17 00:00:00 2001
From: Pieter Mees <pietermees@users.noreply.github.com>
Date: Fri, 4 May 2018 11:21:27 -0400
Subject: [PATCH 08/50] chore(chokidar): Update chokidar to fix install issue
 on Node 10 / OSX

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fe3fd7087..cca0ea8b1 100644
--- a/package.json
+++ b/package.json
@@ -350,7 +350,7 @@
   "dependencies": {
     "bluebird": "^3.3.0",
     "body-parser": "^1.16.1",
-    "chokidar": "^1.4.1",
+    "chokidar": "^2.0.3",
     "colors": "^1.1.0",
     "combine-lists": "^1.0.0",
     "connect": "^3.6.0",

From 80cf39c4f2a327921d3d4d3d2edbb10448425bf2 Mon Sep 17 00:00:00 2001
From: Pieter Mees <pietermees@users.noreply.github.com>
Date: Fri, 4 May 2018 11:29:31 -0400
Subject: [PATCH 09/50] chore(appveyor): Add Node 10 to appveyor

---
 appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appveyor.yml b/appveyor.yml
index 8e212bd91..12f756f1c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,6 +5,7 @@ environment:
     - nodejs_version: "4"
     - nodejs_version: "6"
     - nodejs_version: "8"
+    - nodejs_version: "10"
 
 matrix:
   fast_finish: true

From 3add635f4efd183e91b6e36714c64d0c8b941a54 Mon Sep 17 00:00:00 2001
From: Pieter Mees <pietermees@users.noreply.github.com>
Date: Fri, 4 May 2018 11:29:58 -0400
Subject: [PATCH 10/50] chore(travis): Add Node 10 to Travis

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 95c0c269f..7dfc3ae9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ node_js:
   - 6
   - 8
   - 9
+  - 10
 
 env:
   global:

From 6c355f1fd3aae733e5d1fd221b876aafbea4076a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Usarz?= <lukasz.usarz@gmail.com>
Date: Fri, 4 May 2018 18:33:57 +0200
Subject: [PATCH 11/50] refactor(watcher): refactor lib/watcher.js to ES2015

---
 lib/watcher.js | 130 ++++++++++++++++++++-----------------------------
 1 file changed, 52 insertions(+), 78 deletions(-)

diff --git a/lib/watcher.js b/lib/watcher.js
index 284a45088..0af95c0e5 100644
--- a/lib/watcher.js
+++ b/lib/watcher.js
@@ -1,118 +1,92 @@
-var chokidar = require('chokidar')
-var mm = require('minimatch')
-var expandBraces = require('expand-braces')
+'use strict'
 
-var helper = require('./helper')
-var log = require('./logger').create('watcher')
+const chokidar = require('chokidar')
+const mm = require('minimatch')
+const expandBraces = require('expand-braces')
 
-var DIR_SEP = require('path').sep
+const helper = require('./helper')
+const log = require('./logger').create('watcher')
 
-// Get parent folder, that be watched (does not contain any special globbing character)
-var baseDirFromPattern = function (pattern) {
+const DIR_SEP = require('path').sep
+
+function baseDirFromPattern (pattern) {
   return pattern
-    .replace(/[/\\][^/\\]*\*.*$/, '')              // remove parts with *
-    .replace(/[/\\][^/\\]*[!+]\(.*$/, '')         // remove parts with !(...) and +(...)
+    .replace(/[/\\][^/\\]*\*.*$/, '') // remove parts with *
+    .replace(/[/\\][^/\\]*[!+]\(.*$/, '') // remove parts with !(...) and +(...)
     .replace(/[/\\][^/\\]*\)\?.*$/, '') || DIR_SEP // remove parts with (...)?
 }
 
-var watchPatterns = function (patterns, watcher) {
-  // filter only unique non url patterns paths
-  var pathsToWatch = []
-  var uniqueMap = {}
-  var path
+function watchPatterns (patterns, watcher) {
+  let pathsToWatch = new Set()
 
   // expand ['a/{b,c}'] to ['a/b', 'a/c']
-  patterns = expandBraces(patterns)
-
-  patterns.forEach(function (pattern) {
-    path = baseDirFromPattern(pattern)
-    if (!uniqueMap[path]) {
-      uniqueMap[path] = true
-      pathsToWatch.push(path)
-    }
-  })
+  expandBraces(patterns)
+    .forEach(path => pathsToWatch.add(baseDirFromPattern(path)))
 
+  pathsToWatch = Array.from(pathsToWatch)
   // watch only common parents, no sub paths
-  pathsToWatch.forEach(function (path) {
-    if (!pathsToWatch.some(function (p) {
-      return p !== path && path.substr(0, p.length + 1) === p + DIR_SEP
-    })) {
+  pathsToWatch.forEach(path => {
+    if (!pathsToWatch.some(p => p !== path && path.substr(0, p.length + 1) === p + DIR_SEP)) {
       watcher.add(path)
       log.debug('Watching "%s"', path)
     }
   })
 }
 
-// Function to test if a path should be ignored by chokidar.
-var createIgnore = function (patterns, excludes) {
+function checkAnyPathMatch (patterns, path) {
+  return patterns.some(pattern => mm(path, pattern, {dot: true}))
+}
+
+function createIgnore (patterns, excludes) {
   return function (path, stat) {
     if (!stat || stat.isDirectory()) {
       return false
     }
 
-    // Check if the path matches any of the watched patterns.
-    if (!patterns.some(function (pattern) {
-      return mm(path, pattern, {dot: true})
-    })) {
-      return true
-    }
-
-    // Check if the path matches any of the exclude patterns.
-    if (excludes.some(function (pattern) {
-      return mm(path, pattern, {dot: true})
-    })) {
-      return true
-    }
-
-    return false
+    return !checkAnyPathMatch(patterns, path) || checkAnyPathMatch(excludes, path)
   }
 }
 
-var onlyWatchedTrue = function (pattern) {
-  return pattern.watched
-}
-
-var getWatchedPatterns = function (patternObjects) {
-  return patternObjects.filter(onlyWatchedTrue).map(function (patternObject) {
-    return patternObject.pattern
-  })
+function getWatchedPatterns (patterns) {
+  return patterns
+    .reduce((array, pattern) => {
+      if (pattern.watched) {
+        array.push(pattern.pattern)
+      }
+      return array
+    }, [])
 }
 
 exports.watch = function (patterns, excludes, fileList, usePolling, emitter) {
-  var watchedPatterns = getWatchedPatterns(patterns)
-  var options = {
+  const watchedPatterns = getWatchedPatterns(patterns)
+
+  const watcher = new chokidar.FSWatcher({
     usePolling: usePolling,
     ignorePermissionErrors: true,
     ignoreInitial: true,
     ignored: createIgnore(watchedPatterns, excludes)
-  }
-  var chokidarWatcher = new chokidar.FSWatcher(options)
+  })
 
-  watchPatterns(watchedPatterns, chokidarWatcher)
+  watchPatterns(watchedPatterns, watcher)
 
-  var bind = function (fn) {
-    return function (path) {
-      return fn.call(fileList, helper.normalizeWinPath(path))
-    }
-  }
+  watcher
+    .on('add', path => fileList.addFile(helper.normalizeWinPath(path)))
+    .on('change', path => fileList.changeFile(helper.normalizeWinPath(path)))
+    .on('unlink', path => fileList.removeFile(helper.normalizeWinPath(path)))
+    .on('error', log.debug.bind(log))
 
-  // register events
-  chokidarWatcher.on('add', bind(fileList.addFile))
-    .on('change', bind(fileList.changeFile))
-    .on('unlink', bind(fileList.removeFile))
-    // If we don't subscribe; unhandled errors from Chokidar will bring Karma down
-    // (see GH Issue #959)
-    .on('error', function (e) {
-      log.debug(e)
-    })
-
-  emitter.on('exit', function (done) {
-    chokidarWatcher.close()
+  emitter.on('exit', done => {
+    watcher.close()
     done()
   })
 
-  return chokidarWatcher
+  return watcher
 }
 
-exports.watch.$inject = ['config.files', 'config.exclude', 'fileList', 'config.usePolling',
-  'emitter']
+exports.watch.$inject = [
+  'config.files',
+  'config.exclude',
+  'fileList',
+  'config.usePolling',
+  'emitter'
+]

From a328150d686cd622899200e71db4aa3a16394366 Mon Sep 17 00:00:00 2001
From: dignifiedquire <dignifiedquire@gmail.com>
Date: Fri, 4 May 2018 18:38:50 +0200
Subject: [PATCH 12/50] chore(deps): update yarn.lock

---
 yarn.lock | 1037 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 994 insertions(+), 43 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index afff03b87..6ac0cdf3a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,19 @@
 # yarn lockfile v1
 
 
+"@sinonjs/formatio@^2.0.0":
+  version "2.0.0"
+  resolved "http://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz#84db7e9eb5531df18a8c5e0bfb6e449e55e654b2"
+  dependencies:
+    samsam "1.3.0"
+
+JSONStream@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.10.0.tgz#74349d0d89522b71f30f0a03ff9bd20ca6f12ac0"
+  dependencies:
+    jsonparse "0.0.5"
+    through ">=2.2.7 <3"
+
 JSONStream@^1.0.3, JSONStream@^1.0.4:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"
@@ -43,6 +56,13 @@ acorn-jsx@^3.0.0:
   dependencies:
     acorn "^3.0.4"
 
+acorn-node@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.3.0.tgz#5f86d73346743810ef1269b901dbcbded020861b"
+  dependencies:
+    acorn "^5.4.1"
+    xtend "^4.0.1"
+
 acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
@@ -55,6 +75,10 @@ acorn@^5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7"
 
+acorn@^5.4.1:
+  version "5.5.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
+
 addressparser@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-1.0.1.tgz#47afbe1a2a9262191db6838e4fd1d39b40821746"
@@ -139,6 +163,13 @@ anymatch@^1.3.0:
     micromatch "^2.1.5"
     normalize-path "^2.0.0"
 
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  dependencies:
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
+
 aproba@^1.0.3:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -187,10 +218,18 @@ arr-diff@^2.0.0:
   dependencies:
     arr-flatten "^1.0.1"
 
-arr-flatten@^1.0.1:
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+
+arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
 
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+
 array-differ@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
@@ -240,6 +279,10 @@ array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
 
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+
 arraybuffer.slice@0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"
@@ -290,6 +333,10 @@ assertion-error@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
 
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+
 ast-types@0.x.x:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.10.1.tgz#f52fca9715579a14f841d67d7f8d25432ab6a3dd"
@@ -308,7 +355,7 @@ async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
 
-async@1.x, async@^1.4.0, async@^1.5.0, async@~1.5.2:
+async@1.x, async@^1.4.0, async@^1.5.0, async@^1.5.2, async@~1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
@@ -318,7 +365,7 @@ async@2.0.1:
   dependencies:
     lodash "^4.8.0"
 
-async@^2.0.0, async@^2.1.2:
+async@^2.0.0, async@^2.1.2, async@^2.5.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
   dependencies:
@@ -328,6 +375,10 @@ async@~0.2.9:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
 
+async@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9"
+
 async@~2.1.2:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/async/-/async-2.1.5.tgz#e587c68580994ac67fc56ff86d3ac56bdbe810bc"
@@ -338,6 +389,10 @@ asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
+atob@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
+
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
@@ -490,6 +545,18 @@ base64id@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
 
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
 bcrypt-pbkdf@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
@@ -616,6 +683,21 @@ braces@^1.8.2:
     preserve "^0.2.0"
     repeat-element "^1.1.2"
 
+braces@^2.3.0, braces@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -651,6 +733,14 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
+browserify-cache-api@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-cache-api/-/browserify-cache-api-3.0.1.tgz#96247e853f068fd6e0d45cc73f0bb2cd9778ef02"
+  dependencies:
+    async "^1.5.2"
+    through2 "^2.0.0"
+    xtend "^4.0.0"
+
 browserify-cipher@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a"
@@ -667,6 +757,15 @@ browserify-des@^1.0.0:
     des.js "^1.0.0"
     inherits "^2.0.1"
 
+browserify-incremental@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/browserify-incremental/-/browserify-incremental-3.1.1.tgz#0713cb7587247a632a9f08cf1bd169b878b62a8a"
+  dependencies:
+    JSONStream "^0.10.0"
+    browserify-cache-api "^3.0.0"
+    through2 "^2.0.0"
+    xtend "^4.0.0"
+
 browserify-rsa@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
@@ -744,6 +843,59 @@ browserify@^14.5.0:
     vm-browserify "~0.0.1"
     xtend "^4.0.0"
 
+browserify@^16.0.0, browserify@^16.1.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/browserify/-/browserify-16.2.0.tgz#04ba47c4150555532978453818160666aa3bd8a7"
+  dependencies:
+    JSONStream "^1.0.3"
+    assert "^1.4.0"
+    browser-pack "^6.0.1"
+    browser-resolve "^1.11.0"
+    browserify-zlib "~0.2.0"
+    buffer "^5.0.2"
+    cached-path-relative "^1.0.0"
+    concat-stream "^1.6.0"
+    console-browserify "^1.1.0"
+    constants-browserify "~1.0.0"
+    crypto-browserify "^3.0.0"
+    defined "^1.0.0"
+    deps-sort "^2.0.0"
+    domain-browser "^1.2.0"
+    duplexer2 "~0.1.2"
+    events "^2.0.0"
+    glob "^7.1.0"
+    has "^1.0.0"
+    htmlescape "^1.1.0"
+    https-browserify "^1.0.0"
+    inherits "~2.0.1"
+    insert-module-globals "^7.0.0"
+    labeled-stream-splicer "^2.0.0"
+    mkdirp "^0.5.0"
+    module-deps "^6.0.0"
+    os-browserify "~0.3.0"
+    parents "^1.0.1"
+    path-browserify "~0.0.0"
+    process "~0.11.0"
+    punycode "^1.3.2"
+    querystring-es3 "~0.2.0"
+    read-only-stream "^2.0.0"
+    readable-stream "^2.0.2"
+    resolve "^1.1.4"
+    shasum "^1.0.0"
+    shell-quote "^1.6.1"
+    stream-browserify "^2.0.0"
+    stream-http "^2.0.0"
+    string_decoder "^1.1.1"
+    subarg "^1.0.0"
+    syntax-error "^1.1.1"
+    through2 "^2.0.0"
+    timers-browserify "^1.0.1"
+    tty-browserify "0.0.1"
+    url "~0.11.0"
+    util "~0.10.1"
+    vm-browserify "^1.0.0"
+    xtend "^4.0.0"
+
 browserstack@1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.0.tgz#b565425ad62ed72c1082a1eb979d5313c7d4754f"
@@ -761,6 +913,10 @@ buffer-crc32@^0.2.1:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
 
+buffer-from@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
+
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
@@ -776,6 +932,21 @@ buffers@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"
 
+build@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/build/-/build-0.1.4.tgz#707fe026ffceddcacbfdcdf356eafda64f151046"
+  dependencies:
+    cssmin "0.3.x"
+    jsmin "1.x"
+    jxLoader "*"
+    moo-server "*"
+    promised-io "*"
+    timespan "2.x"
+    uglify-js "1.x"
+    walker "1.x"
+    winston "*"
+    wrench "1.3.x"
+
 buildmail@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/buildmail/-/buildmail-4.0.1.tgz#877f7738b78729871c9a105e3b837d2be11a7a72"
@@ -808,6 +979,20 @@ bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
 
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
 cached-path-relative@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.1.tgz#d09c4b52800aa4c078e2dd81a869aac90d2e54e7"
@@ -924,7 +1109,7 @@ chokidar@1.6.1:
   optionalDependencies:
     fsevents "^1.0.0"
 
-chokidar@^1.4.1:
+chokidar@^1.0.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
@@ -939,6 +1124,28 @@ chokidar@^1.4.1:
   optionalDependencies:
     fsevents "^1.0.0"
 
+chokidar@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.3.tgz#dcbd4f6cbb2a55b4799ba8a840ac527e5f4b1176"
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.0"
+    braces "^2.3.0"
+    glob-parent "^3.1.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^2.1.1"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+    upath "^1.0.0"
+  optionalDependencies:
+    fsevents "^1.1.2"
+
+chownr@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
+
 ci-info@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.2.tgz#03561259db48d0474c8bdc90f5b47b068b6bbfb4"
@@ -958,6 +1165,15 @@ circular-json@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.4.0.tgz#c448ea998b7fe31ecf472ec29c6b608e2e2a62fd"
 
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
@@ -1006,6 +1222,13 @@ coffeescript@^1.12.7:
   version "1.12.7"
   resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.12.7.tgz#e57ee4c4867cf7f606bfc4a0f2d550c0981ddd27"
 
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
 color-convert@^1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
@@ -1016,7 +1239,7 @@ color-name@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
 
-colors@1.0.3:
+colors@1.0.3, colors@1.0.x:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
 
@@ -1078,7 +1301,7 @@ component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
 
-component-emitter@1.2.1, component-emitter@^1.2.0:
+component-emitter@1.2.1, component-emitter@^1.2.0, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
 
@@ -1115,6 +1338,15 @@ concat-stream@~1.5.0, concat-stream@~1.5.1:
     readable-stream "~2.0.0"
     typedarray "~0.0.5"
 
+concat-stream@~1.6.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
 connect@^3.6.0:
   version "3.6.5"
   resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.5.tgz#fb8dde7ba0763877d0ec9df9dac0b4b40e72c7da"
@@ -1305,6 +1537,10 @@ cookiejar@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.1.tgz#41ad57b1b555951ec171412a81942b1e8200d34a"
 
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+
 core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
@@ -1391,6 +1627,10 @@ crypto-browserify@^3.0.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
+cssmin@0.3.x:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/cssmin/-/cssmin-0.3.2.tgz#ddce4c547b510ae0d594a8f1fbf8aaf8e2c5c00d"
+
 cucumber-expressions@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cucumber-expressions/-/cucumber-expressions-3.0.0.tgz#4cf424813dae396cc9dab714b8104b459befc32c"
@@ -1502,6 +1742,10 @@ custom-event@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
 
+cycle@1.0.x:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2"
+
 d@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
@@ -1545,7 +1789,7 @@ dateformat@^1.0.11, dateformat@^1.0.12, dateformat@^1.0.6, dateformat@~1.0.12:
     get-stdin "^4.0.1"
     meow "^3.3.0"
 
-debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.6.8, debug@~2.6.4, debug@~2.6.6, debug@~2.6.9:
+debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@~2.6.4, debug@~2.6.6, debug@~2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
@@ -1567,6 +1811,10 @@ decamelize@^1.0.0, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+
 deep-eql@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
@@ -1588,6 +1836,25 @@ define-properties@^1.1.2:
     foreach "^2.0.5"
     object-keys "^1.0.8"
 
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
 defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
@@ -1663,6 +1930,14 @@ detective@^4.0.0:
     acorn "^5.2.1"
     defined "^1.0.0"
 
+detective@^5.0.2:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/detective/-/detective-5.1.0.tgz#7a20d89236d7b331ccea65832e7123b5551bb7cb"
+  dependencies:
+    acorn-node "^1.3.0"
+    defined "^1.0.0"
+    minimist "^1.1.1"
+
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
@@ -1705,6 +1980,10 @@ dom-serialize@^2.2.0:
     extend "^3.0.0"
     void-elements "^2.0.0"
 
+domain-browser@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+
 domain-browser@~1.1.0:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
@@ -2071,6 +2350,10 @@ events@^1.1.1, events@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
 
+events@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-2.0.0.tgz#cbbb56bf3ab1ac18d71c43bb32c86255062769f2"
+
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
@@ -2100,6 +2383,18 @@ expand-brackets@^0.1.4:
   dependencies:
     is-posix-bracket "^0.1.0"
 
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 expand-range@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"
@@ -2119,6 +2414,19 @@ expand-tilde@^1.2.2:
   dependencies:
     os-homedir "^1.0.1"
 
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
 extend@3, extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
@@ -2137,6 +2445,19 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 extract-zip@^1.6.5:
   version "1.6.6"
   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.6.tgz#1290ede8d20d0872b429fd3f351ca128ec5ef85c"
@@ -2154,6 +2475,10 @@ extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
 
+eyes@0.1.x:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
+
 fast-deep-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
@@ -2232,6 +2557,15 @@ fill-range@^2.1.0:
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
 finalhandler@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.6.tgz#007aea33d1a4d3e42017f624848ad58d212f814f"
@@ -2304,7 +2638,7 @@ follow-redirects@1.0.0:
   dependencies:
     debug "^2.2.0"
 
-for-in@^1.0.1:
+for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
 
@@ -2346,7 +2680,7 @@ form-data@~2.1.1:
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
-formatio@1.2.0, formatio@^1.2.0:
+formatio@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.2.0.tgz#f3b2167d9068c4698a8d51f4f760a39a54d818eb"
   dependencies:
@@ -2356,6 +2690,12 @@ formidable@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.1.1.tgz#96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9"
 
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  dependencies:
+    map-cache "^0.2.2"
+
 fs-access@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a"
@@ -2392,6 +2732,12 @@ fs-finder@^1.8.1:
     operator-compare "~1.0.1"
     q "~1.0.0"
 
+fs-minipass@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  dependencies:
+    minipass "^2.2.1"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -2403,6 +2749,13 @@ fsevents@^1.0.0:
     nan "^2.3.0"
     node-pre-gyp "^0.6.39"
 
+fsevents@^1.1.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.3.tgz#08292982e7059f6674c93d8b829c1e8604979ac0"
+  dependencies:
+    nan "^2.9.2"
+    node-pre-gyp "^0.9.0"
+
 fstream-ignore@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
@@ -2502,6 +2855,10 @@ get-uri@2:
     ftp "~0.3.10"
     readable-stream "2"
 
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+
 getobject@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/getobject/-/getobject-0.1.0.tgz#047a449789fa160d018f5486ed91320b6ec7885c"
@@ -2569,6 +2926,13 @@ glob-parent@^2.0.0:
   dependencies:
     is-glob "^2.0.0"
 
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
 glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -2670,12 +3034,28 @@ grunt-auto-release@^0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/grunt-auto-release/-/grunt-auto-release-0.0.7.tgz#4a1be3254b10a17b341e402f51b85191e86cf4d1"
 
+grunt-browserify@^5.0.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/grunt-browserify/-/grunt-browserify-5.3.0.tgz#47fd8cf8bac58fe2de683afdc57f7f3a80ca792d"
+  dependencies:
+    async "^2.5.0"
+    browserify "^16.0.0"
+    browserify-incremental "^3.1.1"
+    glob "^7.1.2"
+    lodash "^4.17.4"
+    resolve "^1.1.6"
+    watchify "^3.6.1"
+
 grunt-bump@^0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/grunt-bump/-/grunt-bump-0.8.0.tgz#d3ffe0cf3cf0b38e09607b78538f42a531eafe55"
   dependencies:
     semver "^5.1.0"
 
+grunt-check-clean@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/grunt-check-clean/-/grunt-check-clean-0.1.2.tgz#02bb10f7e9f2878782120de1966d36649f2cb414"
+
 grunt-cli@^1.1.0, grunt-cli@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/grunt-cli/-/grunt-cli-1.2.0.tgz#562b119ebb069ddb464ace2845501be97b35b6a8"
@@ -2863,6 +3243,33 @@ has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
 
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
 has@^1.0.0, has@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
@@ -3068,10 +3475,22 @@ iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@~0.4.13:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
+iconv-lite@^0.4.4:
+  version "0.4.21"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.21.tgz#c47f8733d02171189ebc4a400f3218d348094798"
+  dependencies:
+    safer-buffer "^2.1.0"
+
 ieee754@^1.1.4:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
 
+ignore-walk@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  dependencies:
+    minimatch "^3.0.4"
+
 ignore@^3.3.3, ignore@^3.3.6:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
@@ -3177,6 +3596,18 @@ irregular-plurals@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.4.0.tgz#2ca9b033651111855412f16be5d77c62a458a766"
 
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  dependencies:
+    kind-of "^6.0.0"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -3207,10 +3638,38 @@ is-ci@^1.0.10:
   dependencies:
     ci-info "^1.0.0"
 
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  dependencies:
+    kind-of "^6.0.0"
+
 is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
 
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
 is-dotfile@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
@@ -3221,14 +3680,24 @@ is-equal-shallow@^0.1.3:
   dependencies:
     is-primitive "^2.0.0"
 
-is-extendable@^0.1.1:
+is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
 
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  dependencies:
+    is-plain-object "^2.0.4"
+
 is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
 
+is-extglob@^2.1.0, is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+
 is-finite@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
@@ -3255,6 +3724,18 @@ is-glob@^2.0.0, is-glob@^2.0.1:
   dependencies:
     is-extglob "^1.0.0"
 
+is-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  dependencies:
+    is-extglob "^2.1.0"
+
+is-glob@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  dependencies:
+    is-extglob "^2.1.1"
+
 is-my-json-valid@^2.12.4:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz#3da98914a70a22f0a8563ef1511a246c6fc55471"
@@ -3280,6 +3761,10 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
@@ -3288,6 +3773,12 @@ is-object@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
 
+is-odd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
+  dependencies:
+    is-number "^4.0.0"
+
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -3304,6 +3795,12 @@ is-path-inside@^1.0.0:
   dependencies:
     path-is-inside "^1.0.1"
 
+is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  dependencies:
+    isobject "^3.0.1"
+
 is-posix-bracket@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
@@ -3360,6 +3857,10 @@ is-windows@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
 
+is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+
 isarray@0.0.1, isarray@~0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -3386,6 +3887,10 @@ isobject@^2.0.0:
   dependencies:
     isarray "1.0.0"
 
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+
 isomorphic-fetch@^2.1.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
@@ -3393,7 +3898,7 @@ isomorphic-fetch@^2.1.1:
     node-fetch "^1.0.1"
     whatwg-fetch ">=0.10.0"
 
-isstream@~0.1.2:
+isstream@0.1.x, isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
@@ -3436,6 +3941,10 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
+js-yaml@0.3.x:
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-0.3.7.tgz#d739d8ee86461e54b354d6a7d7d1f2ad9a167f62"
+
 js-yaml@3.x, js-yaml@^3.9.1:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
@@ -3458,6 +3967,10 @@ jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
 
+jsmin@1.x:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/jsmin/-/jsmin-1.0.1.tgz#e7bd0dcd6496c3bf4863235bf461a3d98aa3b98c"
+
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
@@ -3510,6 +4023,10 @@ jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
 
+jsonparse@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-0.0.5.tgz#330542ad3f0a654665b778f3eb2d9a9fa507ac64"
+
 jsonparse@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
@@ -3533,10 +4050,19 @@ jsx-ast-utils@^2.0.0:
   dependencies:
     array-includes "^3.0.3"
 
-just-extend@^1.1.26:
+just-extend@^1.1.27:
   version "1.1.27"
   resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-1.1.27.tgz#ec6e79410ff914e472652abfa0e603c03d60e905"
 
+jxLoader@*:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jxLoader/-/jxLoader-0.1.1.tgz#0134ea5144e533b594fc1ff25ff194e235c53ecd"
+  dependencies:
+    js-yaml "0.3.x"
+    moo-server "1.3.x"
+    promised-io "*"
+    walker "1.x"
+
 karma-browserify@^5.0.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/karma-browserify/-/karma-browserify-5.1.2.tgz#48016359d722312a3530aa1dbbab7663e022d779"
@@ -3669,7 +4195,7 @@ kew@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b"
 
-kind-of@^3.0.2:
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   dependencies:
@@ -3681,6 +4207,14 @@ kind-of@^4.0.0:
   dependencies:
     is-buffer "^1.1.5"
 
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+
 klaw@^1.0.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
@@ -3865,13 +4399,9 @@ loggly@^1.1.0:
     request "2.75.x"
     timespan "2.3.x"
 
-lolex@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.6.0.tgz#3a9a0283452a47d7439e72731b9e07d7386e49f6"
-
-lolex@^2.2.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.3.1.tgz#3d2319894471ea0950ef64692ead2a5318cff362"
+lolex@^2.1.2, lolex@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.3.2.tgz#85f9450425103bf9e7a60668ea25dc43274ca807"
 
 longest@^1.0.1:
   version "1.0.1"
@@ -3930,10 +4460,26 @@ mailgun-js@^0.7.0:
     q "~1.4.0"
     tsscmp "~1.0.0"
 
+makeerror@1.0.x:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+  dependencies:
+    tmpl "1.0.x"
+
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
 
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  dependencies:
+    object-visit "^1.0.0"
+
 "match-stream@>= 0.0.2 < 1":
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/match-stream/-/match-stream-0.0.2.tgz#99eb050093b34dffade421b9ac0b410a9cfa17cf"
@@ -3999,6 +4545,24 @@ micromatch@^2.1.5, micromatch@^2.3.7:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
+micromatch@^3.1.4:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -4042,7 +4606,7 @@ minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
-minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
+minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
@@ -4050,6 +4614,26 @@ minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
 
+minipass@^2.2.1, minipass@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.2.4.tgz#03c824d84551ec38a8d1bb5bc350a5a30a354a40"
+  dependencies:
+    safe-buffer "^5.1.1"
+    yallist "^3.0.0"
+
+minizlib@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  dependencies:
+    minipass "^2.2.1"
+
+mixin-deep@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
 mkdirp@0.5, mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
@@ -4105,6 +4689,26 @@ module-deps@^4.0.8:
     through2 "^2.0.0"
     xtend "^4.0.0"
 
+module-deps@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-6.0.2.tgz#660217d1602b863ac8d4d16951a3720dd9aa4c80"
+  dependencies:
+    JSONStream "^1.0.3"
+    browser-resolve "^1.7.0"
+    cached-path-relative "^1.0.0"
+    concat-stream "~1.6.0"
+    defined "^1.0.0"
+    detective "^5.0.2"
+    duplexer2 "^0.1.2"
+    inherits "^2.0.1"
+    parents "^1.0.0"
+    readable-stream "^2.0.2"
+    resolve "^1.4.0"
+    stream-combiner2 "^1.1.1"
+    subarg "^1.0.0"
+    through2 "^2.0.0"
+    xtend "^4.0.0"
+
 module-not-found-error@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/module-not-found-error/-/module-not-found-error-1.0.1.tgz#cf8b4ff4f29640674d6cdd02b0e3bc523c2bbdc0"
@@ -4113,6 +4717,10 @@ moment@~2.5.0:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.5.1.tgz#7146a3900533064ca799d5e792f4e480ee0e82bc"
 
+moo-server@*, moo-server@1.3.x:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/moo-server/-/moo-server-1.3.0.tgz#5dc79569565a10d6efed5439491e69d2392e58f1"
+
 ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
@@ -4146,6 +4754,31 @@ nan@^2.3.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
 
+nan@^2.9.2:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+
+nanomatch@^1.2.9:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-odd "^2.0.0"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+native-promise-only@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/native-promise-only/-/native-promise-only-0.8.1.tgz#20a318c30cb45f71fe7adfbf7b21c99c1472ef11"
+
 natives@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.1.tgz#011acce1f7cbd87f7ba6b3093d6cd9392be1c574"
@@ -4154,6 +4787,14 @@ natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
 
+needle@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d"
+  dependencies:
+    debug "^2.1.2"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
@@ -4162,13 +4803,13 @@ netmask@~1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
 
-nise@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/nise/-/nise-1.2.0.tgz#079d6cadbbcb12ba30e38f1c999f36ad4d6baa53"
+nise@^1.0.1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/nise/-/nise-1.3.3.tgz#c17a850066a8a1dfeb37f921da02441afc4a82ba"
   dependencies:
-    formatio "^1.2.0"
-    just-extend "^1.1.26"
-    lolex "^1.6.0"
+    "@sinonjs/formatio" "^2.0.0"
+    just-extend "^1.1.27"
+    lolex "^2.3.2"
     path-to-regexp "^1.7.0"
     text-encoding "^0.6.4"
 
@@ -4205,6 +4846,21 @@ node-pre-gyp@^0.6.39:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
+node-pre-gyp@^0.9.0:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.9.1.tgz#f11c07516dd92f87199dbc7e1838eab7cd56c9e0"
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.0"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.1.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4"
+
 node-uuid@~1.4.7:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
@@ -4284,12 +4940,23 @@ normalize-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
 
-normalize-path@^2.0.0, normalize-path@^2.0.1:
+normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   dependencies:
     remove-trailing-separator "^1.0.1"
 
+npm-bundled@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
+
+npm-packlist@^1.1.6:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a"
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
 npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
@@ -4319,10 +4986,24 @@ object-component@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
 
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
 object-keys@^1.0.8:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
 
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  dependencies:
+    isobject "^3.0.0"
+
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
@@ -4330,6 +5011,12 @@ object.omit@^2.0.0:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
 
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  dependencies:
+    isobject "^3.0.1"
+
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
@@ -4408,6 +5095,12 @@ osenv@^0.1.4:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
+outpipe@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/outpipe/-/outpipe-1.1.1.tgz#50cf8616365e87e031e29a5ec9339a3da4725fa2"
+  dependencies:
+    shell-quote "^1.4.2"
+
 "over@>= 0.0.5 < 1":
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/over/-/over-0.0.5.tgz#f29852e70fd7e25f360e013a8ec44c82aedb5708"
@@ -4511,10 +5204,18 @@ parseurl@~1.3.0, parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
 
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+
 path-browserify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
 
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
@@ -4643,6 +5344,10 @@ pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
 
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+
 prelude-ls@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.0.3.tgz#443920ce8940a8294b993fbfcee63b9a8920dce0"
@@ -4681,6 +5386,10 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
+promised-io@*:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/promised-io/-/promised-io-0.3.5.tgz#4ad217bb3658bcaae9946b17a8668ecd851e1356"
+
 prop-types@^15.6.0:
   version "15.6.0"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
@@ -4974,6 +5683,13 @@ regex-cache@^0.4.2:
   dependencies:
     is-equal-shallow "^0.1.3"
 
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@@ -5152,6 +5868,10 @@ resolve-pkg@^0.1.0:
   dependencies:
     resolve-from "^2.0.0"
 
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+
 resolve@1.1.7, resolve@1.1.x, resolve@~1.1.0, resolve@~1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
@@ -5168,6 +5888,12 @@ resolve@^1.1.3, resolve@^1.1.4, resolve@^1.2.0, resolve@^1.3.3:
   dependencies:
     path-parse "^1.0.5"
 
+resolve@^1.1.6, resolve@^1.4.0:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
+  dependencies:
+    path-parse "^1.0.5"
+
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -5175,6 +5901,10 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
@@ -5218,7 +5948,21 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0,
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
-samsam@1.x:
+safe-buffer@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  dependencies:
+    ret "~0.1.10"
+
+safer-buffer@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+
+samsam@1.3.0, samsam@1.x, samsam@^1.1.3:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50"
 
@@ -5238,6 +5982,10 @@ saucelabs@^1.4.0:
   dependencies:
     https-proxy-agent "^1.0.0"
 
+sax@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+
 semver-regex@1.0.0, semver-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-1.0.0.tgz#92a4969065f9c70c694753d55248fc68f8f652c9"
@@ -5262,6 +6010,24 @@ set-immediate-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
 
+set-value@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.1"
+    to-object-path "^0.3.0"
+
+set-value@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
 "setimmediate@>= 1.0.1 < 2", "setimmediate@>= 1.0.2 < 2", setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
@@ -5294,7 +6060,7 @@ shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
 
-shell-quote@^1.6.1:
+shell-quote@^1.4.2, shell-quote@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
   dependencies:
@@ -5311,17 +6077,21 @@ sinon-chai@^2.7.0:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/sinon-chai/-/sinon-chai-2.14.0.tgz#da7dd4cc83cd6a260b67cca0f7a9fdae26a1205d"
 
-sinon@^4.1.2:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-4.1.3.tgz#fc599eda47ed9f1a694ce774b94ab44260bd7ac5"
+sinon@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-3.3.0.tgz#9132111b4bbe13c749c2848210864250165069b1"
   dependencies:
+    build "^0.1.4"
     diff "^3.1.0"
     formatio "1.2.0"
     lodash.get "^4.4.2"
-    lolex "^2.2.0"
-    nise "^1.2.0"
-    supports-color "^4.4.0"
-    type-detect "^4.0.5"
+    lolex "^2.1.2"
+    native-promise-only "^0.8.1"
+    nise "^1.0.1"
+    path-to-regexp "^1.7.0"
+    samsam "^1.1.3"
+    text-encoding "0.6.4"
+    type-detect "^4.0.0"
 
 slack-node@~0.2.0:
   version "0.2.0"
@@ -5356,6 +6126,33 @@ smtp-connection@2.12.0:
     httpntlm "1.6.1"
     nodemailer-shared "1.1.0"
 
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
 sntp@1.x.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
@@ -5431,12 +6228,26 @@ socks@~1.1.5:
     ip "^1.1.4"
     smart-buffer "^1.0.13"
 
+source-map-resolve@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a"
+  dependencies:
+    atob "^2.0.0"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
 source-map-support@^0.4.15:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
   dependencies:
     source-map "^0.5.6"
 
+source-map-url@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+
 source-map@0.5.6:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
@@ -5475,6 +6286,12 @@ spdx-license-ids@^1.0.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
 
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  dependencies:
+    extend-shallow "^3.0.0"
+
 split2@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
@@ -5523,6 +6340,10 @@ stack-generator@^2.0.1:
   dependencies:
     stackframe "^1.0.4"
 
+stack-trace@0.0.x:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
+
 stackframe@^1.0.3, stackframe@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.0.4.tgz#357b24a992f9427cba6b545d96a14ed2cbca187b"
@@ -5542,6 +6363,13 @@ stacktrace-js@^2.0.0:
     stack-generator "^2.0.1"
     stacktrace-gps "^3.0.1"
 
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
 statuses@1, "statuses@>= 1.3.1 < 2":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
@@ -5609,6 +6437,12 @@ string-width@^2.1.0, string-width@^2.1.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
+string_decoder@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  dependencies:
+    safe-buffer "~5.1.0"
+
 string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
@@ -5703,7 +6537,7 @@ supports-color@^3.1.0:
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^4.0.0, supports-color@^4.4.0:
+supports-color@^4.0.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
   dependencies:
@@ -5756,7 +6590,19 @@ tar@^2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
-text-encoding@^0.6.4:
+tar@^4:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.2.tgz#60685211ba46b38847b1ae7ee1a24d744a2cd462"
+  dependencies:
+    chownr "^1.0.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.2.4"
+    minizlib "^1.1.0"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.2"
+
+text-encoding@0.6.4, text-encoding@^0.6.4:
   version "0.6.4"
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
 
@@ -5811,7 +6657,7 @@ timers-browserify@^1.0.1:
   dependencies:
     process "~0.11.0"
 
-timespan@2.3.x:
+timespan@2.3.x, timespan@2.x:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/timespan/-/timespan-2.3.0.tgz#4902ce040bd13d845c8f59b27e9d59bad6f39929"
 
@@ -5839,6 +6685,10 @@ tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
+tmpl@1.0.x:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+
 to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
@@ -5851,6 +6701,28 @@ to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
 
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
 tough-cookie@~2.3.0, tough-cookie@~2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
@@ -5881,6 +6753,10 @@ tsscmp@~1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.5.tgz#7dc4a33af71581ab4337da91d85ca5427ebd9a97"
 
+tty-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811"
+
 tty-browserify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
@@ -5905,7 +6781,7 @@ type-check@~0.3.1, type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-detect@^4.0.0, type-detect@^4.0.5:
+type-detect@^4.0.0:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.5.tgz#d70e5bc81db6de2a381bcaca0c6e0cbdc7635de2"
 
@@ -5924,6 +6800,10 @@ ua-parser-js@^0.7.9:
   version "0.7.17"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
 
+uglify-js@1.x:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-1.3.5.tgz#4b5bfff9186effbaa888e4c9e94bd9fc4c94929d"
+
 uglify-js@^2.6:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
@@ -5964,6 +6844,15 @@ underscore@~1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
 
+union-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^0.4.3"
+
 universalify@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
@@ -5972,6 +6861,13 @@ unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
 
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
 unzip@~0.1.9:
   version "0.1.11"
   resolved "https://registry.yarnpkg.com/unzip/-/unzip-0.1.11.tgz#89749c63b058d7d90d619f86b98aa1535d3b97f0"
@@ -5983,6 +6879,10 @@ unzip@~0.1.9:
     readable-stream "~1.0.31"
     setimmediate ">= 1.0.1 < 2"
 
+upath@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.5.tgz#02cab9ecebe95bbec6d5fc2566325725ab6d1a73"
+
 upper-case-first@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/upper-case-first/-/upper-case-first-1.1.2.tgz#5d79bedcff14419518fd2edb0a0507c9b6859115"
@@ -5993,6 +6893,10 @@ upper-case@^1.0.3, upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
 
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+
 url@~0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -6000,7 +6904,13 @@ url@~0.11.0:
     punycode "1.3.2"
     querystring "0.2.0"
 
-useragent@^2.1.12:
+use@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.0.tgz#14716bf03fdfefd03040aef58d8b4b85f3a7c544"
+  dependencies:
+    kind-of "^6.0.2"
+
+useragent@2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.2.1.tgz#cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"
   dependencies:
@@ -6061,6 +6971,10 @@ verror@1.10.0, verror@^1.9.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
+vm-browserify@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.0.1.tgz#a15d7762c4c48fa6bf9f3309a21340f00ed23063"
+
 vm-browserify@~0.0.1:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
@@ -6082,6 +6996,24 @@ walkdir@^0.0.11:
   version "0.0.11"
   resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.0.11.tgz#a16d025eb931bd03b52f308caed0f40fcebe9532"
 
+walker@1.x:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+  dependencies:
+    makeerror "1.0.x"
+
+watchify@^3.6.1:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/watchify/-/watchify-3.11.0.tgz#03f1355c643955e7ab8dcbf399f624644221330f"
+  dependencies:
+    anymatch "^1.3.0"
+    browserify "^16.1.0"
+    chokidar "^1.0.0"
+    defined "^1.0.0"
+    outpipe "^1.1.0"
+    through2 "^2.0.0"
+    xtend "^4.0.0"
+
 wd@^1.4.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/wd/-/wd-1.5.0.tgz#45c96a16ff9f8c0f9e7ca90f806a8b48bd0034d6"
@@ -6136,6 +7068,17 @@ window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
+winston@*:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.2.tgz#3ca01f763116fc48db61053b7544e750431f8db0"
+  dependencies:
+    async "~1.0.0"
+    colors "1.0.x"
+    cycle "1.0.x"
+    eyes "0.1.x"
+    isstream "0.1.x"
+    stack-trace "0.0.x"
+
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
@@ -6152,6 +7095,10 @@ wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
+wrench@1.3.x:
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/wrench/-/wrench-1.3.9.tgz#6f13ec35145317eb292ca5f6531391b244111411"
+
 write@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
@@ -6178,7 +7125,7 @@ xregexp@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
 
-xtend@^4.0.0, xtend@~4.0.1:
+xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
@@ -6186,6 +7133,10 @@ yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
+yallist@^3.0.0, yallist@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+
 yargs@~3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"

From 095fc7e04cc7abb3f44a275a6c7a8b693a260f28 Mon Sep 17 00:00:00 2001
From: lukasz <lukasz.usarz@gmail.com>
Date: Tue, 1 May 2018 17:10:53 +0200
Subject: [PATCH 13/50] refactor(formatters): refactor formatters.js

---
 config.tpl.coffee                 |   3 +-
 config.tpl.js                     |   3 +-
 config.tpl.ls                     |   4 +-
 config.tpl.ts                     |   3 +-
 lib/init/formatters.js            | 166 ++++++++++++------------------
 lib/utils/file-utils.js           |  19 ++++
 test/unit/init/formatters.spec.js |   4 +-
 7 files changed, 96 insertions(+), 106 deletions(-)
 create mode 100644 lib/utils/file-utils.js

diff --git a/config.tpl.coffee b/config.tpl.coffee
index 7b340dcc2..c7f15de80 100644
--- a/config.tpl.coffee
+++ b/config.tpl.coffee
@@ -25,7 +25,8 @@ module.exports = (config) ->
 
     # preprocess matching files before serving them to the browser
     # available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
-    preprocessors: %PREPROCESSORS%
+    preprocessors: {%PREPROCESSORS%
+    }
 
 
     # test results reporter to use
diff --git a/config.tpl.js b/config.tpl.js
index ede8f4c22..d50e11359 100644
--- a/config.tpl.js
+++ b/config.tpl.js
@@ -25,7 +25,8 @@ module.exports = function(config) {
 
     // preprocess matching files before serving them to the browser
     // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
-    preprocessors: %PREPROCESSORS%,
+    preprocessors: {%PREPROCESSORS%
+    },
 
 
     // test results reporter to use
diff --git a/config.tpl.ls b/config.tpl.ls
index abca7e0b3..c185ae4dd 100644
--- a/config.tpl.ls
+++ b/config.tpl.ls
@@ -25,8 +25,8 @@ module.exports = (config) ->
 
     # preprocess matching files before serving them to the browser
     # available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
-    preprocessors: %PREPROCESSORS%
-
+    preprocessors: {%PREPROCESSORS%
+    }
 
     # test results reporter to use
     # possible values: 'dots', 'progress'
diff --git a/config.tpl.ts b/config.tpl.ts
index 918889aba..1a90a3284 100644
--- a/config.tpl.ts
+++ b/config.tpl.ts
@@ -25,7 +25,8 @@ module.exports = (config) => {
 
     // preprocess matching files before serving them to the browser
     // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
-    preprocessors: %PREPROCESSORS%,
+    preprocessors: {%PREPROCESSORS%
+    },
 
 
     // test results reporter to use
diff --git a/lib/init/formatters.js b/lib/init/formatters.js
index f479e09a2..3c7231370 100644
--- a/lib/init/formatters.js
+++ b/lib/init/formatters.js
@@ -1,129 +1,97 @@
-var fs = require('graceful-fs')
-var util = require('util')
-var path = require('path')
-
-var JS_TEMPLATE_PATH = path.join(__dirname, '/../../config.tpl.js')
-var COFFEE_TEMPLATE_PATH = path.join(__dirname, '/../../config.tpl.coffee')
-var JS_REQUIREJS_TEMPLATE_PATH = path.join(__dirname, '/../../requirejs.config.tpl.js')
-var COFFEE_REQUIREJS_TEMPLATE_PATH = path.join(__dirname, '/../../requirejs.config.tpl.coffee')
-var COFFEE_REGEXP = /\.coffee$/
-var LIVE_TEMPLATE_PATH = path.join(__dirname, '/../../config.tpl.ls')
-var LIVE_REGEXP = /\.ls$/
-var TYPE_TEMPLATE_PATH = path.join(__dirname, '/../../config.tpl.ts')
-var TYPE_REGEXP = /\.ts$/
-
-var isCoffeeFile = function (filename) {
-  return COFFEE_REGEXP.test(filename)
-}
+'use strict'
 
-var isLiveFile = function (filename) {
-  return LIVE_REGEXP.test(filename)
-}
+const path = require('path')
+const FileUtils = require('../utils/file-utils')
 
-var isTypeFile = function (filename) {
-  return TYPE_REGEXP.test(filename)
+function quote (value) {
+  return `'${value}'`
 }
 
-var JavaScriptFormatter = function () {
-  var quote = function (value) {
-    return "'" + value + "'"
-  }
+function formatLine (items) {
+  return items.map(quote).join(', ')
+}
 
-  var quoteNonIncludedPattern = function (value) {
-    return util.format('{pattern: %s, included: false}', quote(value))
-  }
+function formatMultiLines (items) {
+  return items
+    .map(file => '\n      ' + file)
+    .join(',')
+}
 
-  var pad = function (str, pad) {
-    return str.replace(/\n/g, '\n' + pad).replace(/\s+$/gm, '')
-  }
+function formatFiles (includedFiles, onlyServedFiles) {
+  const lines = []
+    .concat(includedFiles.map(quote))
+    .concat(onlyServedFiles.map(file => `{ pattern: ${quote(file)}, included: false }`))
 
-  var formatQuottedList = function (list) {
-    return list.map(quote).join(', ')
-  }
-
-  this.TEMPLATE_FILE_PATH = JS_TEMPLATE_PATH
-  this.REQUIREJS_TEMPLATE_FILE = JS_REQUIREJS_TEMPLATE_PATH
+  return formatMultiLines(lines)
+}
 
-  this.formatFiles = function (includedFiles, onlyServedFiles) {
-    var files = includedFiles.map(quote)
+function formatPreprocessors (preprocessors) {
+  const lines = Object.keys(preprocessors)
+    .map(pattern => `${quote(pattern)}: [${formatLine(preprocessors[pattern])}]`)
 
-    onlyServedFiles.forEach(function (onlyServedFile) {
-      files.push(quoteNonIncludedPattern(onlyServedFile))
-    })
+  return formatMultiLines(lines)
+}
 
-    files = files.map(function (file) {
-      return '\n      ' + file
-    })
+function getConfigPath (file) {
+  return path.join(__dirname, `/../../${file}`)
+}
 
-    return files.join(',')
+class JavaScriptFormatter {
+  constructor () {
+    this.TEMPLATE_FILE_PATH = getConfigPath('config.tpl.js')
+    this.REQUIREJS_TEMPLATE_FILE = getConfigPath('requirejs.config.tpl.js')
   }
 
-  this.formatPreprocessors = function (preprocessors) {
-    var lines = []
-    Object.keys(preprocessors).forEach(function (pattern) {
-      lines.push('  ' + quote(pattern) + ': [' + formatQuottedList(preprocessors[pattern]) + ']')
-    })
+  generateConfigFile (answers) {
+    const replacements = this.formatAnswers(answers)
 
-    return pad('{\n' + lines.join(',\n') + '\n}', '    ')
+    return FileUtils
+      .readFile(this.TEMPLATE_FILE_PATH)
+      .replace(/%(.*)%/g, (a, key) => replacements[key])
   }
 
-  this.formatFrameworks = formatQuottedList
+  writeConfigFile (path, answers) {
+    FileUtils.saveFile(path, this.generateConfigFile(answers))
+  }
 
-  this.formatBrowsers = formatQuottedList
+  writeRequirejsConfigFile (path) {
+    FileUtils.copyFile(this.REQUIREJS_TEMPLATE_FILE, path)
+  }
 
-  this.formatAnswers = function (answers) {
+  formatAnswers (answers) {
     return {
       DATE: new Date(),
       BASE_PATH: answers.basePath,
-      FRAMEWORKS: this.formatFrameworks(answers.frameworks),
-      FILES: this.formatFiles(answers.files, answers.onlyServedFiles),
-      EXCLUDE: this.formatFiles(answers.exclude, []),
+      FRAMEWORKS: formatLine(answers.frameworks),
+      FILES: formatFiles(answers.files, answers.onlyServedFiles),
+      EXCLUDE: formatFiles(answers.exclude, []),
       AUTO_WATCH: answers.autoWatch ? 'true' : 'false',
-      BROWSERS: this.formatBrowsers(answers.browsers),
-      PREPROCESSORS: this.formatPreprocessors(answers.preprocessors)
+      BROWSERS: formatLine(answers.browsers),
+      PREPROCESSORS: formatPreprocessors(answers.preprocessors)
     }
   }
-
-  this.generateConfigFile = function (answers) {
-    var template = fs.readFileSync(this.TEMPLATE_FILE_PATH).toString()
-    var replacements = this.formatAnswers(answers)
-
-    return template.replace(/%(.*)%/g, function (a, key) {
-      return replacements[key]
-    })
-  }
-
-  this.writeConfigFile = function (path, answers) {
-    fs.writeFileSync(path, this.generateConfigFile(answers))
-  }
-
-  this.generateRequirejsConfigFile = function () {
-    var template = fs.readFileSync(this.REQUIREJS_TEMPLATE_FILE).toString()
-    return template
-  }
-
-  this.writeRequirejsConfigFile = function (path) {
-    fs.writeFileSync(path, this.generateRequirejsConfigFile())
-  }
 }
 
-var CoffeeFormatter = function () {
-  JavaScriptFormatter.call(this)
-
-  this.TEMPLATE_FILE_PATH = COFFEE_TEMPLATE_PATH
-  this.REQUIREJS_TEMPLATE_FILE = COFFEE_REQUIREJS_TEMPLATE_PATH
+class CoffeeFormatter extends JavaScriptFormatter {
+  constructor () {
+    super()
+    this.TEMPLATE_FILE_PATH = getConfigPath('config.tpl.coffee')
+    this.REQUIREJS_TEMPLATE_FILE = getConfigPath('requirejs.config.tpl.coffee')
+  }
 }
 
-var LiveFormatter = function () {
-  JavaScriptFormatter.call(this)
-
-  this.TEMPLATE_FILE_PATH = LIVE_TEMPLATE_PATH
+class LiveFormatter extends JavaScriptFormatter {
+  constructor () {
+    super()
+    this.TEMPLATE_FILE_PATH = getConfigPath('config.tpl.ls')
+  }
 }
 
-var TypeFormatter = function () {
-  JavaScriptFormatter.call(this)
-
-  this.TEMPLATE_FILE_PATH = TYPE_TEMPLATE_PATH
+class TypeFormatter extends JavaScriptFormatter {
+  constructor () {
+    super()
+    this.TEMPLATE_FILE_PATH = getConfigPath('config.tpl.ts')
+  }
 }
 
 exports.JavaScript = JavaScriptFormatter
@@ -132,15 +100,15 @@ exports.Live = LiveFormatter
 exports.Type = TypeFormatter
 
 exports.createForPath = function (path) {
-  if (isCoffeeFile(path)) {
+  if (/\.coffee$/.test(path)) {
     return new CoffeeFormatter()
   }
 
-  if (isLiveFile(path)) {
+  if (/\.ls$/.test(path)) {
     return new LiveFormatter()
   }
 
-  if (isTypeFile(path)) {
+  if (/\.ts$/.test(path)) {
     return new TypeFormatter()
   }
 
diff --git a/lib/utils/file-utils.js b/lib/utils/file-utils.js
new file mode 100644
index 000000000..7cec11c25
--- /dev/null
+++ b/lib/utils/file-utils.js
@@ -0,0 +1,19 @@
+'use strict'
+
+const fs = require('graceful-fs')
+
+const FileUtils = {
+  readFile (path) {
+    return fs.readFileSync(path).toString()
+  },
+
+  saveFile (path, content) {
+    fs.writeFileSync(path, content)
+  },
+
+  copyFile (src, dest) {
+    FileUtils.saveFile(dest, FileUtils.readFile(src))
+  }
+}
+
+module.exports = FileUtils
diff --git a/test/unit/init/formatters.spec.js b/test/unit/init/formatters.spec.js
index 3a46667ca..2d45b1006 100644
--- a/test/unit/init/formatters.spec.js
+++ b/test/unit/init/formatters.spec.js
@@ -55,7 +55,7 @@ describe('init/formatters', () => {
         }))
 
         expect(replacements.FILES).to.equal(
-          "\n      'test-main.js',\n      {pattern: 'src/*.js', included: false}"
+          "\n      'test-main.js',\n      { pattern: 'src/*.js', included: false }"
         )
       })
 
@@ -63,7 +63,7 @@ describe('init/formatters', () => {
         var replacements = formatter.formatAnswers(createAnswers({preprocessors: {'*.coffee': ['coffee']}}))
 
         expect(replacements.PREPROCESSORS).to.equal(
-          "{\n      '*.coffee': ['coffee']\n    }"
+          "\n      '*.coffee': ['coffee']"
         )
       })
     })

From 57b7938bae658ac00d4fc31470050fc57269ee85 Mon Sep 17 00:00:00 2001
From: Georgii Dolzhykov <thorn.mailbox@gmail.com>
Date: Tue, 15 May 2018 03:47:32 +0300
Subject: [PATCH 14/50] docs(Files): Increase the discoverability of the custom
 middleware feature. (#2999)

Also minor content improvements.
---
 docs/config/02-files.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/config/02-files.md b/docs/config/02-files.md
index 141fe36df..7cd632082 100644
--- a/docs/config/02-files.md
+++ b/docs/config/02-files.md
@@ -17,12 +17,12 @@
 
 
 ## Included, served, watched
-Each pattern is either a simple string or an object with four properties:
+Each pattern is either a simple string or an object with the following properties:
 
 ### `pattern`
 * **Type.** String
-* **No Default.**
-* **Description.** The pattern to use for matching. This property is mandatory.
+* **No Default.** This property is mandatory.
+* **Description.** The pattern to use for matching.
 
 ### `type`
 * **Type.** String
@@ -143,6 +143,7 @@ proxies: {
 * In-memory caching of files.
 * Watching for updates in the files.
 * Proxies to alter file paths.
+* Support for custom middlewares (the `middleware` configuration option).
 
 
 [glob]: https://github.com/isaacs/node-glob

From 2bb4e3691cc79ea7d46096c6cf154e5f3acc82af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Usarz?= <lukasz.usarz@gmail.com>
Date: Tue, 15 May 2018 18:01:28 +0200
Subject: [PATCH 15/50] fix: remove support of jsVersion configuration property
 (#3002)

Fixes #2911
---
 docs/config/01-configuration-file.md | 12 ------------
 lib/middleware/karma.js              | 26 --------------------------
 test/client/karma.conf.js            |  2 --
 test/e2e/tag.feature                 |  3 ---
 4 files changed, 43 deletions(-)

diff --git a/docs/config/01-configuration-file.md b/docs/config/01-configuration-file.md
index 8b40bbc49..a2bb5f5bb 100644
--- a/docs/config/01-configuration-file.md
+++ b/docs/config/01-configuration-file.md
@@ -794,18 +794,6 @@ All of Karma's urls get prefixed with the `urlRoot`. This is helpful when using
 sometimes you might want to proxy a url that is already taken by Karma.
 
 
-## jsVersion
-**Type:** Number
-
-**Default:** `0`
-
-**Description:** The JavaScript version to use in the Firefox browser.
-
-If `> 0`, Karma will add a JavaScript version tag to the included JavaScript files.
-
-Note: This will only be applied to the Firefox browser up to version 58. Support for JavaScript version was [removed](https://bugzilla.mozilla.org/show_bug.cgi?id=1428745) in Firefox 59. This property is deprecated and will be removed in the next major release of Karma.
-
-
 [plugins]: plugins.html
 [config/files]: files.html
 [config/browsers]: browsers.html
diff --git a/lib/middleware/karma.js b/lib/middleware/karma.js
index 4d8d0ea3a..b9d06fcfc 100644
--- a/lib/middleware/karma.js
+++ b/lib/middleware/karma.js
@@ -14,7 +14,6 @@
 var path = require('path')
 var util = require('util')
 var url = require('url')
-var useragent = require('useragent')
 var _ = require('lodash')
 
 var log = require('../logger').create('middleware:karma')
@@ -72,17 +71,6 @@ var getXUACompatibleUrl = function (url) {
   return value
 }
 
-var isFirefox = function (req) {
-  if (!(req && req.headers)) {
-    return false
-  }
-
-  // Browser check
-  var firefox = useragent.is(req.headers['user-agent']).firefox
-
-  return firefox
-}
-
 var createKarmaMiddleware = function (
   filesPromise,
   serveStaticFile,
@@ -99,7 +87,6 @@ var createKarmaMiddleware = function (
     var customContextFile = injector.get('config.customContextFile')
     var customDebugFile = injector.get('config.customDebugFile')
     var customClientContextFile = injector.get('config.customClientContextFile')
-    var jsVersion = injector.get('config.jsVersion')
     var includeCrossOriginAttribute = injector.get('config.crossOriginAttribute')
 
     var requestUrl = request.normalizedUrl.replace(/\?.*/, '')
@@ -221,19 +208,6 @@ var createKarmaMiddleware = function (
             var scriptFileType = (fileType || fileExt.substring(1))
             var scriptType = (SCRIPT_TYPE[scriptFileType] || 'text/javascript')
 
-            // In case there is a JavaScript version specified and this is a Firefox browser
-            if (jsVersion && jsVersion > 0 && isFirefox(request)) {
-              var agent = useragent.parse(request.headers['user-agent'])
-
-              log.warn('jsVersion configuration property is deprecated and will be removed in the next major release of Karma.')
-
-              if (agent.major < 59) {
-                scriptType += ';version=' + jsVersion
-              } else {
-                log.warn('jsVersion is not supported in Firefox 59+ (see https://bugzilla.mozilla.org/show_bug.cgi?id=1428745 for more details). Ignoring.')
-              }
-            }
-
             var crossOriginAttribute = includeCrossOriginAttribute ? CROSSORIGIN_ATTRIBUTE : ''
             scriptTags.push(util.format(SCRIPT_TAG, scriptType, filePath, crossOriginAttribute))
           }
diff --git a/test/client/karma.conf.js b/test/client/karma.conf.js
index 1ffff3041..4422ca7cb 100644
--- a/test/client/karma.conf.js
+++ b/test/client/karma.conf.js
@@ -156,8 +156,6 @@ module.exports = function (config) {
 
     forceJSONP: true,
 
-    jsVersion: 0,
-
     browserStack: {
       project: 'Karma'
     }
diff --git a/test/e2e/tag.feature b/test/e2e/tag.feature
index 63c3ff35a..960fa0f10 100644
--- a/test/e2e/tag.feature
+++ b/test/e2e/tag.feature
@@ -8,7 +8,6 @@ Feature: JavaScript Tag
       """
       files = ['tag/tag.js', 'tag/test-with-version.js'];
       browsers = ['Firefox']
-      jsVersion = 1.8
       plugins = [
         'karma-jasmine',
         'karma-firefox-launcher'
@@ -26,7 +25,6 @@ Feature: JavaScript Tag
       """
       files = ['tag/tag.js', 'tag/test-with-version.js'];
       browsers = ['Chrome'];
-      jsVersion = 1.8;
       plugins = [
         'karma-jasmine',
         'karma-chrome-launcher'
@@ -72,4 +70,3 @@ Feature: JavaScript Tag
       .
       Chrome
       """
-      
\ No newline at end of file

From e1fbdcbdfdf7e8beb4925416219ea28ffdee4c89 Mon Sep 17 00:00:00 2001
From: Yaroslav Admin <devoto13@gmail.com>
Date: Thu, 17 May 2018 18:50:44 +0200
Subject: [PATCH 16/50] refactor: migrate Executor to ES2015 (#3003)

---
 lib/executor.js            | 76 +++++++++++++++++++++-----------------
 lib/server.js              |  2 +-
 test/unit/executor.spec.js | 20 +++++-----
 3 files changed, 55 insertions(+), 43 deletions(-)

diff --git a/lib/executor.js b/lib/executor.js
index a20451b1b..55694c4b8 100644
--- a/lib/executor.js
+++ b/lib/executor.js
@@ -1,60 +1,70 @@
-var log = require('./logger').create()
+'use strict'
 
-var Executor = function (capturedBrowsers, config, emitter) {
-  var self = this
-  var executionScheduled = false
-  var pendingCount = 0
-  var runningBrowsers
+const log = require('./logger').create()
 
-  var schedule = function () {
-    var nonReady = []
+class Executor {
+  constructor (capturedBrowsers, config, emitter) {
+    this.capturedBrowsers = capturedBrowsers
+    this.config = config
+    this.emitter = emitter
 
-    if (!capturedBrowsers.length) {
-      log.warn('No captured browser, open %s//%s:%s%s', config.protocol, config.hostname,
-        config.port, config.urlRoot)
+    this.executionScheduled = false
+    this.pendingCount = 0
+    this.runningBrowsers = null
+
+    // bind all the events
+    this.emitter.on('run_complete', () => this.onRunComplete())
+    this.emitter.on('browser_complete', () => this.onBrowserComplete())
+  }
+
+  schedule () {
+    const nonReady = []
+
+    if (!this.capturedBrowsers.length) {
+      log.warn('No captured browser, open %s//%s:%s%s', this.config.protocol, this.config.hostname,
+        this.config.port, this.config.urlRoot)
       return false
     }
 
-    if (capturedBrowsers.areAllReady(nonReady)) {
+    if (this.capturedBrowsers.areAllReady(nonReady)) {
       log.debug('All browsers are ready, executing')
-      log.debug('Captured %s browsers', capturedBrowsers.length)
-      executionScheduled = false
-      capturedBrowsers.clearResults()
-      capturedBrowsers.setAllToExecuting()
-      pendingCount = capturedBrowsers.length
-      runningBrowsers = capturedBrowsers.clone()
-      emitter.emit('run_start', runningBrowsers)
-      self.socketIoSockets.emit('execute', config.client)
+      log.debug('Captured %s browsers', this.capturedBrowsers.length)
+      this.executionScheduled = false
+      this.capturedBrowsers.clearResults()
+      this.capturedBrowsers.setAllToExecuting()
+      this.pendingCount = this.capturedBrowsers.length
+      this.runningBrowsers = this.capturedBrowsers.clone()
+      this.emitter.emit('run_start', this.runningBrowsers)
+      this.socketIoSockets.emit('execute', this.config.client)
       return true
     }
 
     log.info('Delaying execution, these browsers are not ready: ' + nonReady.join(', '))
-    executionScheduled = true
+    this.executionScheduled = true
     return false
   }
 
-  this.schedule = schedule
-
-  this.onRunComplete = function () {
-    if (executionScheduled) {
-      schedule()
+  onRunComplete () {
+    if (this.executionScheduled) {
+      this.schedule()
     }
   }
 
-  this.onBrowserComplete = function () {
-    pendingCount--
+  onBrowserComplete () {
+    this.pendingCount--
 
-    if (!pendingCount) {
+    if (!this.pendingCount) {
       // Ensure run_complete is emitted in the next tick
       // so it is never emitted before browser_complete
-      setTimeout(function () {
-        emitter.emit('run_complete', runningBrowsers, runningBrowsers.getResults())
+      setTimeout(() => {
+        this.emitter.emit('run_complete', this.runningBrowsers, this.runningBrowsers.getResults())
       }, 0)
     }
   }
+}
 
-  // bind all the events
-  emitter.bind(this)
+Executor.factory = function (capturedBrowsers, config, emitter) {
+  return new Executor(capturedBrowsers, config, emitter)
 }
 
 module.exports = Executor
diff --git a/lib/server.js b/lib/server.js
index c9ddbe71e..160a8130f 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -93,7 +93,7 @@ var Server = function (cliOptions, done) {
     fileList: ['type', FileList],
     webServer: ['factory', ws.create],
     socketServer: ['factory', createSocketIoServer],
-    executor: ['type', Executor],
+    executor: ['factory', Executor.factory],
     // TODO(vojta): remove
     customFileHandlers: ['value', []],
     // TODO(vojta): remove, once karma-dart does not rely on it
diff --git a/test/unit/executor.spec.js b/test/unit/executor.spec.js
index 21279aa18..a09382c4f 100644
--- a/test/unit/executor.spec.js
+++ b/test/unit/executor.spec.js
@@ -1,14 +1,16 @@
-var Browser = require('../../lib/browser')
-var BrowserCollection = require('../../lib/browser_collection')
-var EventEmitter = require('../../lib/events').EventEmitter
-var Executor = require('../../lib/executor')
+'use strict'
+
+const Browser = require('../../lib/browser')
+const BrowserCollection = require('../../lib/browser_collection')
+const EventEmitter = require('../../lib/events').EventEmitter
+const Executor = require('../../lib/executor')
 
 describe('executor', () => {
-  var emitter
-  var capturedBrowsers
-  var config
-  var spy
-  var executor
+  let emitter
+  let capturedBrowsers
+  let config
+  let spy
+  let executor
 
   beforeEach(() => {
     config = {client: {}}

From 639cd272870285aba72d5c319066ce9134e6b9f0 Mon Sep 17 00:00:00 2001
From: Yaroslav Admin <devoto13@gmail.com>
Date: Thu, 17 May 2018 20:58:02 +0200
Subject: [PATCH 17/50] refactor: migrate helper to ES2015 (#3005)

---
 lib/helper.js            | 103 ++++++++++++++++++++-------------------
 test/unit/helper.spec.js |  48 +++++++++---------
 2 files changed, 78 insertions(+), 73 deletions(-)

diff --git a/lib/helper.js b/lib/helper.js
index e0b32c8ac..cdf051f01 100644
--- a/lib/helper.js
+++ b/lib/helper.js
@@ -1,26 +1,29 @@
-var fs = require('graceful-fs')
-var path = require('path')
-var _ = require('lodash')
-var useragent = require('useragent')
-var Promise = require('bluebird')
-var mm = require('minimatch')
-
-exports.browserFullNameToShort = function (fullName) {
-  var agent = useragent.parse(fullName)
-  var isKnown = agent.family !== 'Other' && agent.os.family !== 'Other'
+'use strict'
+
+const fs = require('graceful-fs')
+const path = require('path')
+const _ = require('lodash')
+const useragent = require('useragent')
+const Promise = require('bluebird')
+const mm = require('minimatch')
+
+exports.browserFullNameToShort = (fullName) => {
+  const agent = useragent.parse(fullName)
+  const isKnown = agent.family !== 'Other' && agent.os.family !== 'Other'
   return isKnown ? agent.toAgent() + ' (' + agent.os + ')' : fullName
 }
 
-exports.isDefined = function (value) {
+exports.isDefined = (value) => {
   return !_.isUndefined(value)
 }
-var parser = function (pattern, out) {
+
+const parser = (pattern, out) => {
   if (pattern.length === 0) return out
-  var p = /^(\[[^\]]*\]|[*+@?]\((.+?)\))/g
-  var matches = p.exec(pattern)
+  const p = /^(\[[^\]]*\]|[*+@?]\((.+?)\))/g
+  const matches = p.exec(pattern)
   if (!matches) {
-    var c = pattern[0]
-    var t = 'word'
+    const c = pattern[0]
+    let t = 'word'
     if (c === '*') {
       t = 'star'
     } else if (c === '?') {
@@ -38,7 +41,7 @@ var parser = function (pattern, out) {
   return parser(pattern.substring(matches[0].length), out)
 }
 
-var gsParser = function (pattern, out) {
+const gsParser = (pattern, out) => {
   if (pattern === '**') {
     out.glob_star++
     return out
@@ -46,18 +49,18 @@ var gsParser = function (pattern, out) {
   return parser(pattern, out)
 }
 
-var compareWeightObject = function (w1, w2) {
+const compareWeightObject = (w1, w2) => {
   return exports.mmComparePatternWeights(
     [w1.glob_star, w1.star, w1.ext_glob, w1.range, w1.optional],
     [w2.glob_star, w2.star, w2.ext_glob, w2.range, w2.optional]
   )
 }
 
-exports.mmPatternWeight = function (pattern) {
-  var m = new mm.Minimatch(pattern)
+exports.mmPatternWeight = (pattern) => {
+  const m = new mm.Minimatch(pattern)
   if (!m.globParts) return [0, 0, 0, 0, 0, 0]
-  var result = m.globParts.reduce(function (prev, p) {
-    var r = p.reduce(function (prev, p) {
+  const result = m.globParts.reduce((prev, p) => {
+    const r = p.reduce((prev, p) => {
       return gsParser(p, prev)
     }, {glob_star: 0, ext_glob: 0, word: 0, star: 0, optional: 0, range: 0})
     if (prev === undefined) return r
@@ -67,8 +70,8 @@ exports.mmPatternWeight = function (pattern) {
   return [result.glob_sets, result.glob_star, result.star, result.ext_glob, result.range, result.optional]
 }
 
-exports.mmComparePatternWeights = function (weight1, weight2) {
-  var n1, n2, diff
+exports.mmComparePatternWeights = (weight1, weight2) => {
+  let n1, n2, diff
   n1 = weight1[0]
   n2 = weight2[0]
   diff = n1 - n2
@@ -82,28 +85,28 @@ exports.isObject = _.isObject
 exports.isArray = _.isArray
 exports.isNumber = _.isNumber
 
-var ABS_URL = /^https?:\/\//
-exports.isUrlAbsolute = function (url) {
+const ABS_URL = /^https?:\/\//
+exports.isUrlAbsolute = (url) => {
   return ABS_URL.test(url)
 }
 
-exports.camelToSnake = function (camelCase) {
-  return camelCase.replace(/[A-Z]/g, function (match, pos) {
+exports.camelToSnake = (camelCase) => {
+  return camelCase.replace(/[A-Z]/g, (match, pos) => {
     return (pos > 0 ? '_' : '') + match.toLowerCase()
   })
 }
 
-exports.ucFirst = function (word) {
+exports.ucFirst = (word) => {
   return word.charAt(0).toUpperCase() + word.substr(1)
 }
 
-exports.dashToCamel = function (dash) {
-  var words = dash.split('-')
+exports.dashToCamel = (dash) => {
+  const words = dash.split('-')
   return words.shift() + words.map(exports.ucFirst).join('')
 }
 
-exports.arrayRemove = function (collection, item) {
-  var idx = collection.indexOf(item)
+exports.arrayRemove = (collection, item) => {
+  const idx = collection.indexOf(item)
 
   if (idx !== -1) {
     collection.splice(idx, 1)
@@ -114,15 +117,15 @@ exports.arrayRemove = function (collection, item) {
 }
 
 exports.merge = function () {
-  var args = Array.prototype.slice.call(arguments, 0)
+  const args = Array.prototype.slice.call(arguments, 0)
   args.unshift({})
   return _.merge.apply({}, args)
 }
 
-exports.formatTimeInterval = function (time) {
-  var mins = Math.floor(time / 60000)
-  var secs = (time - mins * 60000) / 1000
-  var str = secs + (secs === 1 ? ' sec' : ' secs')
+exports.formatTimeInterval = (time) => {
+  const mins = Math.floor(time / 60000)
+  const secs = (time - mins * 60000) / 1000
+  let str = secs + (secs === 1 ? ' sec' : ' secs')
 
   if (mins) {
     str = mins + (mins === 1 ? ' min ' : ' mins ') + str
@@ -131,20 +134,20 @@ exports.formatTimeInterval = function (time) {
   return str
 }
 
-var replaceWinPath = function (path) {
+const replaceWinPath = (path) => {
   return _.isString(path) ? path.replace(/\\/g, '/') : path
 }
 
 exports.normalizeWinPath = process.platform === 'win32' ? replaceWinPath : _.identity
 
-exports.mkdirIfNotExists = function mkdir (directory, done) {
+exports.mkdirIfNotExists = (directory, done) => {
   // TODO(vojta): handle if it's a file
   /* eslint-disable handle-callback-err */
-  fs.stat(directory, function (err, stat) {
+  fs.stat(directory, (err, stat) => {
     if (stat && stat.isDirectory()) {
       done()
     } else {
-      mkdir(path.dirname(directory), function () {
+      exports.mkdirIfNotExists(path.dirname(directory), () => {
         fs.mkdir(directory, done)
       })
     }
@@ -152,17 +155,17 @@ exports.mkdirIfNotExists = function mkdir (directory, done) {
   /* eslint-enable handle-callback-err */
 }
 
-exports.defer = function () {
-  var resolve
-  var reject
-  var promise = new Promise(function () {
-    resolve = arguments[0]
-    reject = arguments[1]
+exports.defer = () => {
+  let res
+  let rej
+  const promise = new Promise((resolve, reject) => {
+    res = resolve
+    rej = reject
   })
 
   return {
-    resolve: resolve,
-    reject: reject,
+    resolve: res,
+    reject: rej,
     promise: promise
   }
 }
diff --git a/test/unit/helper.spec.js b/test/unit/helper.spec.js
index c937bb95d..1cf286c07 100644
--- a/test/unit/helper.spec.js
+++ b/test/unit/helper.spec.js
@@ -1,11 +1,13 @@
-var path = require('path')
+'use strict'
+
+const path = require('path')
 
 describe('helper', () => {
-  var helper = require('../../lib/helper')
+  const helper = require('../../lib/helper')
 
   describe('browserFullNameToShort', () => {
     // helper function
-    var expecting = (name) => expect(helper.browserFullNameToShort(name))
+    const expecting = (name) => expect(helper.browserFullNameToShort(name))
 
     it('should parse iOS', () => {
       expecting(
@@ -119,7 +121,7 @@ describe('helper', () => {
   })
 
   describe('isDefined', () => {
-    var isDefined = helper.isDefined
+    const isDefined = helper.isDefined
 
     it('should return true if defined', () => {
       expect(isDefined()).to.equal(false)
@@ -133,7 +135,7 @@ describe('helper', () => {
   })
 
   describe('camelToSnake', () => {
-    var camelToSnake = helper.camelToSnake
+    const camelToSnake = helper.camelToSnake
 
     it('should convert camelCase string to snake_case', () => {
       expect(camelToSnake('OneMoreThing')).to.equal('one_more_thing')
@@ -141,7 +143,7 @@ describe('helper', () => {
   })
 
   describe('dashToCamel', () => {
-    var dashToCamel = helper.dashToCamel
+    const dashToCamel = helper.dashToCamel
 
     it('should convert dash-case to camelCase', () => {
       expect(dashToCamel('one-more-thing')).to.equal('oneMoreThing')
@@ -150,14 +152,14 @@ describe('helper', () => {
   })
 
   describe('arrayRemove', () => {
-    var arrayRemove = helper.arrayRemove
+    const arrayRemove = helper.arrayRemove
 
     it('should remove object from array', () => {
-      var a = 'one'
-      var b = []
-      var c = {}
-      var d = () => null
-      var collection = [a, b, c, d]
+      const a = 'one'
+      const b = []
+      const c = {}
+      const d = () => null
+      const collection = [a, b, c, d]
 
       expect(arrayRemove(collection, b)).to.equal(true)
       expect(collection).to.deep.equal([a, c, d])
@@ -175,8 +177,8 @@ describe('helper', () => {
 
   describe('merge', () => {
     it('should copy properties to first argument', () => {
-      var destination = {a: 1, b: 2}
-      var result = helper.merge(destination, {a: 4, c: 5})
+      const destination = {a: 1, b: 2}
+      const result = helper.merge(destination, {a: 4, c: 5})
 
       expect(destination.a).to.equal(1)
       expect(result).to.deep.equal({a: 4, b: 2, c: 5})
@@ -211,17 +213,17 @@ describe('helper', () => {
   })
 
   describe('mkdirIfNotExists', () => {
-    var fsMock = require('mocks').fs
-    var loadFile = require('mocks').loadFile
+    const fsMock = require('mocks').fs
+    const loadFile = require('mocks').loadFile
 
-    var fs = fsMock.create({
+    const fs = fsMock.create({
       home: {'some.js': fsMock.file()}
     })
 
     // load file under test
-    var m = loadFile(path.join(__dirname, '/../../lib/helper.js'), {'graceful-fs': fs, lodash: require('lodash')})
+    const m = loadFile(path.join(__dirname, '/../../lib/helper.js'), {'graceful-fs': fs, lodash: require('lodash')})
 
-    var mkdirIfNotExists = m.exports.mkdirIfNotExists
+    const mkdirIfNotExists = m.exports.mkdirIfNotExists
 
     it('should not do anything, if dir already exists', (done) => {
       mkdirIfNotExists('/home', done)
@@ -229,7 +231,7 @@ describe('helper', () => {
 
     it('should create directory if it does not exist', (done) => {
       mkdirIfNotExists('/home/new', () => {
-        var stat = fs.statSync('/home/new')
+        const stat = fs.statSync('/home/new')
         expect(stat).to.exist
         expect(stat.isDirectory()).to.equal(true)
         done()
@@ -238,7 +240,7 @@ describe('helper', () => {
 
     it('should create even parent directories if it does not exist', (done) => {
       mkdirIfNotExists('/home/new/parent/child', () => {
-        var stat = fs.statSync('/home/new/parent/child')
+        const stat = fs.statSync('/home/new/parent/child')
         expect(stat).to.exist
         expect(stat.isDirectory()).to.equal(true)
         done()
@@ -247,7 +249,7 @@ describe('helper', () => {
   })
 
   describe('mmComparePatternWeights', () => {
-    var helper = require('../../lib/helper')
+    const helper = require('../../lib/helper')
     it('should compare right on equal', () => {
       helper.mmComparePatternWeights([1, 2, 3], [1, 2, 3]).should.be.equal(0)
     })
@@ -266,7 +268,7 @@ describe('helper', () => {
   })
 
   describe('mmPatternWeight', () => {
-    var helper = require('../../lib/helper')
+    const helper = require('../../lib/helper')
     it('should calculate right weight of empty', () => {
       helper.mmPatternWeight('').should.be.deep.equal([0, 0, 0, 0, 0, 0])
     })

From 582f96f3124a2640fa1884a3e101e87338285986 Mon Sep 17 00:00:00 2001
From: Yaroslav Admin <devoto13@gmail.com>
Date: Fri, 18 May 2018 01:28:28 +0200
Subject: [PATCH 18/50] refactor: migrate File and FileList to ES2015 (#3004)

---
 lib/file-list.js                   | 612 ++++++++++++++---------------
 lib/file.js                        |  45 +--
 lib/server.js                      |   2 +-
 test/unit/file-list.spec.js        | 114 +++---
 test/unit/middleware/karma.spec.js |  10 +-
 5 files changed, 384 insertions(+), 399 deletions(-)

diff --git a/lib/file-list.js b/lib/file-list.js
index 070e65189..b3b27b866 100644
--- a/lib/file-list.js
+++ b/lib/file-list.js
@@ -1,29 +1,25 @@
-// File List
-// =========
-//
-// The List is an object for tracking all files that karma knows about
-// currently.
+'use strict'
 
 // Dependencies
 // ------------
 
-var Promise = require('bluebird')
-var mm = require('minimatch')
-var Glob = require('glob').Glob
-var fs = Promise.promisifyAll(require('graceful-fs'))
-var pathLib = require('path')
-var _ = require('lodash')
+const Promise = require('bluebird')
+const mm = require('minimatch')
+const Glob = require('glob').Glob
+const fs = Promise.promisifyAll(require('graceful-fs'))
+const pathLib = require('path')
+const _ = require('lodash')
 
-var File = require('./file')
-var Url = require('./url')
-var helper = require('./helper')
-var log = require('./logger').create('watcher')
-var createPatternObject = require('./config').createPatternObject
+const File = require('./file')
+const Url = require('./url')
+const helper = require('./helper')
+const log = require('./logger').create('watcher')
+const createPatternObject = require('./config').createPatternObject
 
 // Constants
 // ---------
 
-var GLOB_OPTS = {
+const GLOB_OPTS = {
   cwd: '/',
   follow: true,
   nodir: true,
@@ -33,211 +29,203 @@ var GLOB_OPTS = {
 // Helper Functions
 // ----------------
 
-function byPath (a, b) {
+const byPath = (a, b) => {
   if (a.path > b.path) return 1
   if (a.path < b.path) return -1
 
   return 0
 }
 
-// Constructor
-//
-// patterns      - Array
-// excludes      - Array
-// emitter       - EventEmitter
-// preprocess    - Function
-// batchInterval - Number
-var List = function (patterns, excludes, emitter, preprocess, autoWatchBatchDelay) {
-  // Store options
-  this._patterns = patterns
-  this._excludes = excludes
-  this._emitter = emitter
-  this._preprocess = Promise.promisify(preprocess)
-  this._autoWatchBatchDelay = autoWatchBatchDelay
-
-  // The actual list of files
-  this.buckets = new Map()
-
-  // Internal tracker if we are refreshing.
-  // When a refresh is triggered this gets set
-  // to the promise that `this._refresh` returns.
-  // So we know we are refreshing when this promise
-  // is still pending, and we are done when it's either
-  // resolved or rejected.
-  this._refreshing = Promise.resolve()
-
-  var self = this
-
-  // Emit the `file_list_modified` event.
-  // This function is debounced to the value of `autoWatchBatchDelay`
-  // to avoid reloading while files are still being modified.
-  function emit () {
-    self._emitter.emit('file_list_modified', self.files)
-  }
-  var debouncedEmit = _.debounce(emit, self._autoWatchBatchDelay)
-  self._emitModified = function (immediate) {
-    immediate ? emit() : debouncedEmit()
-  }
-}
-
-// Private Interface
-// -----------------
-
-// Is the given path matched by any exclusion filter
-//
-// path - String
-//
-// Returns `undefined` if no match, otherwise the matching
-// pattern.
-List.prototype._isExcluded = function (path) {
-  return _.find(this._excludes, function (pattern) {
-    return mm(path, pattern)
-  })
-}
+/**
+ * The List is an object for tracking all files that karma knows about
+ * currently.
+ */
+class FileList {
+  /**
+   * @param {Array} patterns
+   * @param {Array} excludes
+   * @param {EventEmitter} emitter
+   * @param {Function} preprocess
+   * @param {number} autoWatchBatchDelay
+   */
+  constructor (patterns, excludes, emitter, preprocess, autoWatchBatchDelay) {
+    // Store options
+    this._patterns = patterns
+    this._excludes = excludes
+    this._emitter = emitter
+    this._preprocess = Promise.promisify(preprocess)
+    this._autoWatchBatchDelay = autoWatchBatchDelay
+
+    // The actual list of files
+    this.buckets = new Map()
+
+    // Internal tracker if we are refreshing.
+    // When a refresh is triggered this gets set
+    // to the promise that `this._refresh` returns.
+    // So we know we are refreshing when this promise
+    // is still pending, and we are done when it's either
+    // resolved or rejected.
+    this._refreshing = Promise.resolve()
+
+    // Emit the `file_list_modified` event.
+    // This function is debounced to the value of `autoWatchBatchDelay`
+    // to avoid reloading while files are still being modified.
+    const emit = () => {
+      this._emitter.emit('file_list_modified', this.files)
+    }
 
-// Find the matching include pattern for the given path.
-//
-// path - String
-//
-// Returns the match or `undefined` if none found.
-List.prototype._isIncluded = function (path) {
-  return _.find(this._patterns, function (pattern) {
-    return mm(path, pattern.pattern)
-  })
-}
+    const debouncedEmit = _.debounce(emit, this._autoWatchBatchDelay)
+    this._emitModified = (immediate) => {
+      immediate ? emit() : debouncedEmit()
+    }
+  }
 
-// Find the given path in the bucket corresponding
-// to the given pattern.
-//
-// path    - String
-// pattern - Object
-//
-// Returns a File or undefined
-List.prototype._findFile = function (path, pattern) {
-  if (!path || !pattern) return
-  if (!this.buckets.has(pattern.pattern)) return
-
-  return _.find(Array.from(this.buckets.get(pattern.pattern)), function (file) {
-    return file.originalPath === path
-  })
-}
+  // Private Interface
+  // -----------------
+
+  // Is the given path matched by any exclusion filter
+  //
+  // path - String
+  //
+  // Returns `undefined` if no match, otherwise the matching
+  // pattern.
+  _isExcluded (path) {
+    return _.find(this._excludes, (pattern) => mm(path, pattern))
+  }
 
-// Is the given path already in the files list.
-//
-// path - String
-//
-// Returns a boolean.
-List.prototype._exists = function (path) {
-  var self = this
-
-  var patterns = this._patterns.filter(function (pattern) {
-    return mm(path, pattern.pattern)
-  })
-
-  return !!_.find(patterns, function (pattern) {
-    return self._findFile(path, pattern)
-  })
-}
+  // Find the matching include pattern for the given path.
+  //
+  // path - String
+  //
+  // Returns the match or `undefined` if none found.
+  _isIncluded (path) {
+    return _.find(this._patterns, (pattern) => mm(path, pattern.pattern))
+  }
 
-// Check if we are currently refreshing
-List.prototype._isRefreshing = function () {
-  return this._refreshing.isPending()
-}
+  // Find the given path in the bucket corresponding
+  // to the given pattern.
+  //
+  // path    - String
+  // pattern - Object
+  //
+  // Returns a File or undefined
+  _findFile (path, pattern) {
+    if (!path || !pattern) return
+    if (!this.buckets.has(pattern.pattern)) return
+
+    return _.find(Array.from(this.buckets.get(pattern.pattern)), (file) => {
+      return file.originalPath === path
+    })
+  }
 
-// Do the actual work of refreshing
-List.prototype._refresh = function () {
-  var self = this
-  var buckets = this.buckets
-  var matchedFiles = new Set()
+  // Is the given path already in the files list.
+  //
+  // path - String
+  //
+  // Returns a boolean.
+  _exists (path) {
+    const patterns = this._patterns.filter((pattern) => mm(path, pattern.pattern))
 
-  var promise = Promise.map(this._patterns, function (patternObject) {
-    var pattern = patternObject.pattern
-    var type = patternObject.type
+    return !!_.find(patterns, (pattern) => this._findFile(path, pattern))
+  }
 
-    if (helper.isUrlAbsolute(pattern)) {
-      buckets.set(pattern, new Set([new Url(pattern, type)]))
-      return Promise.resolve()
-    }
+  // Check if we are currently refreshing
+  _isRefreshing () {
+    return this._refreshing.isPending()
+  }
 
-    var mg = new Glob(pathLib.normalize(pattern), GLOB_OPTS)
-    var files = mg.found
-    buckets.set(pattern, new Set())
+  // Do the actual work of refreshing
+  _refresh () {
+    const buckets = this.buckets
+    const matchedFiles = new Set()
 
-    if (_.isEmpty(files)) {
-      log.warn('Pattern "%s" does not match any file.', pattern)
-      return
-    }
+    let promise
+    promise = Promise.map(this._patterns, (patternObject) => {
+      const pattern = patternObject.pattern
+      const type = patternObject.type
 
-    return Promise.map(files, function (path) {
-      if (self._isExcluded(path)) {
-        log.debug('Excluded file "%s"', path)
+      if (helper.isUrlAbsolute(pattern)) {
+        buckets.set(pattern, new Set([new Url(pattern, type)]))
         return Promise.resolve()
       }
 
-      if (matchedFiles.has(path)) {
-        return Promise.resolve()
+      const mg = new Glob(pathLib.normalize(pattern), GLOB_OPTS)
+      const files = mg.found
+      buckets.set(pattern, new Set())
+
+      if (_.isEmpty(files)) {
+        log.warn('Pattern "%s" does not match any file.', pattern)
+        return
       }
 
-      matchedFiles.add(path)
+      return Promise.map(files, (path) => {
+        if (this._isExcluded(path)) {
+          log.debug('Excluded file "%s"', path)
+          return Promise.resolve()
+        }
+
+        if (matchedFiles.has(path)) {
+          return Promise.resolve()
+        }
 
-      var mtime = mg.statCache[path].mtime
-      var doNotCache = patternObject.nocache
-      var type = patternObject.type
-      var file = new File(path, mtime, doNotCache, type)
+        matchedFiles.add(path)
 
-      if (file.doNotCache) {
-        log.debug('Not preprocessing "%s" due to nocache')
-        return Promise.resolve(file)
-      }
+        const mtime = mg.statCache[path].mtime
+        const doNotCache = patternObject.nocache
+        const type = patternObject.type
+        const file = new File(path, mtime, doNotCache, type)
 
-      return self._preprocess(file).then(function () {
-        return file
-      })
-    })
-    .then(function (files) {
-      files = _.compact(files)
+        if (file.doNotCache) {
+          log.debug('Not preprocessing "%s" due to nocache')
+          return Promise.resolve(file)
+        }
 
-      if (_.isEmpty(files)) {
-        log.warn('All files matched by "%s" were excluded or matched by prior matchers.', pattern)
-      } else {
-        buckets.set(pattern, new Set(files))
-      }
+        return this._preprocess(file).then(() => {
+          return file
+        })
+      })
+        .then((files) => {
+          files = _.compact(files)
+
+          if (_.isEmpty(files)) {
+            log.warn('All files matched by "%s" were excluded or matched by prior matchers.', pattern)
+          } else {
+            buckets.set(pattern, new Set(files))
+          }
+        })
     })
-  })
-  .then(function () {
-    if (self._refreshing !== promise) {
-      return self._refreshing
-    }
-    self.buckets = buckets
-    self._emitModified(true)
-    return self.files
-  })
+      .then(() => {
+        if (this._refreshing !== promise) {
+          return this._refreshing
+        }
+        this.buckets = buckets
+        this._emitModified(true)
+        return this.files
+      })
 
-  return promise
-}
+    return promise
+  }
 
-// Public Interface
-// ----------------
+  // Public Interface
+  // ----------------
 
-Object.defineProperty(List.prototype, 'files', {
-  get: function () {
-    var self = this
-    var uniqueFlat = function (list) {
+  get files () {
+    const uniqueFlat = (list) => {
       return _.uniq(_.flatten(list), 'path')
     }
 
-    var expandPattern = function (p) {
-      return Array.from(self.buckets.get(p.pattern) || []).sort(byPath)
+    const expandPattern = (p) => {
+      return Array.from(this.buckets.get(p.pattern) || []).sort(byPath)
     }
 
-    var served = this._patterns.filter(function (pattern) {
+    const served = this._patterns.filter((pattern) => {
       return pattern.served
     })
-    .map(expandPattern)
+      .map(expandPattern)
 
-    var lookup = {}
-    var included = {}
-    this._patterns.forEach(function (p) {
+    const lookup = {}
+    const included = {}
+    this._patterns.forEach((p) => {
       // This needs to be here sadly, as plugins are modifiying
       // the _patterns directly resulting in elements not being
       // instantiated properly
@@ -245,9 +233,9 @@ Object.defineProperty(List.prototype, 'files', {
         p = createPatternObject(p)
       }
 
-      var bucket = expandPattern(p)
-      bucket.forEach(function (file) {
-        var other = lookup[file.path]
+      const bucket = expandPattern(p)
+      bucket.forEach((file) => {
+        const other = lookup[file.path]
         if (other && other.compare(p) < 0) return
         lookup[file.path] = p
         if (p.included) {
@@ -263,148 +251,144 @@ Object.defineProperty(List.prototype, 'files', {
       included: _.values(included)
     }
   }
-})
-
-// Reglob all patterns to update the list.
-//
-// Returns a promise that is resolved when the refresh
-// is completed.
-List.prototype.refresh = function () {
-  this._refreshing = this._refresh()
-  return this._refreshing
-}
-
-// Set new patterns and excludes and update
-// the list accordingly
-//
-// patterns - Array, the new patterns.
-// excludes - Array, the new exclude patterns.
-//
-// Returns a promise that is resolved when the refresh
-// is completed.
-List.prototype.reload = function (patterns, excludes) {
-  this._patterns = patterns
-  this._excludes = excludes
-
-  // Wait until the current refresh is done and then do a
-  // refresh to ensure a refresh actually happens
-  return this.refresh()
-}
 
-// Add a new file from the list.
-// This is called by the watcher
-//
-// path - String, the path of the file to update.
-//
-// Returns a promise that is resolved when the update
-// is completed.
-List.prototype.addFile = function (path) {
-  var self = this
-
-  // Ensure we are not adding a file that should be excluded
-  var excluded = this._isExcluded(path)
-  if (excluded) {
-    log.debug('Add file "%s" ignored. Excluded by "%s".', path, excluded)
-
-    return Promise.resolve(this.files)
+  // Reglob all patterns to update the list.
+  //
+  // Returns a promise that is resolved when the refresh
+  // is completed.
+  refresh () {
+    this._refreshing = this._refresh()
+    return this._refreshing
   }
 
-  var pattern = this._isIncluded(path)
-
-  if (!pattern) {
-    log.debug('Add file "%s" ignored. Does not match any pattern.', path)
-    return Promise.resolve(this.files)
+  // Set new patterns and excludes and update
+  // the list accordingly
+  //
+  // patterns - Array, the new patterns.
+  // excludes - Array, the new exclude patterns.
+  //
+  // Returns a promise that is resolved when the refresh
+  // is completed.
+  reload (patterns, excludes) {
+    this._patterns = patterns
+    this._excludes = excludes
+
+    // Wait until the current refresh is done and then do a
+    // refresh to ensure a refresh actually happens
+    return this.refresh()
   }
 
-  if (this._exists(path)) {
-    log.debug('Add file "%s" ignored. Already in the list.', path)
-    return Promise.resolve(this.files)
-  }
+  // Add a new file from the list.
+  // This is called by the watcher
+  //
+  // path - String, the path of the file to update.
+  //
+  // Returns a promise that is resolved when the update
+  // is completed.
+  addFile (path) {
+    // Ensure we are not adding a file that should be excluded
+    const excluded = this._isExcluded(path)
+    if (excluded) {
+      log.debug('Add file "%s" ignored. Excluded by "%s".', path, excluded)
+
+      return Promise.resolve(this.files)
+    }
 
-  var file = new File(path)
-  this.buckets.get(pattern.pattern).add(file)
-
-  return Promise.all([
-    fs.statAsync(path),
-    this._refreshing
-  ]).spread(function (stat) {
-    file.mtime = stat.mtime
-    return self._preprocess(file)
-  })
-  .then(function () {
-    log.info('Added file "%s".', path)
-    self._emitModified()
-    return self.files
-  })
-}
+    const pattern = this._isIncluded(path)
 
-// Update the `mtime` of a file.
-// This is called by the watcher
-//
-// path - String, the path of the file to update.
-//
-// Returns a promise that is resolved when the update
-// is completed.
-List.prototype.changeFile = function (path) {
-  var self = this
-
-  var pattern = this._isIncluded(path)
-  var file = this._findFile(path, pattern)
-
-  if (!pattern || !file) {
-    log.debug('Changed file "%s" ignored. Does not match any file in the list.', path)
-    return Promise.resolve(this.files)
-  }
+    if (!pattern) {
+      log.debug('Add file "%s" ignored. Does not match any pattern.', path)
+      return Promise.resolve(this.files)
+    }
 
-  return Promise.all([
-    fs.statAsync(path),
-    this._refreshing
-  ]).spread(function (stat) {
-    if (stat.mtime <= file.mtime) throw new Promise.CancellationError()
-
-    file.mtime = stat.mtime
-    return self._preprocess(file)
-  })
-  .then(function () {
-    log.info('Changed file "%s".', path)
-    self._emitModified()
-    return self.files
-  })
-  .catch(Promise.CancellationError, function () {
-    return self.files
-  })
-}
+    if (this._exists(path)) {
+      log.debug('Add file "%s" ignored. Already in the list.', path)
+      return Promise.resolve(this.files)
+    }
 
-// Remove a file from the list.
-// This is called by the watcher
-//
-// path - String, the path of the file to update.
-//
-// Returns a promise that is resolved when the update
-// is completed.
-List.prototype.removeFile = function (path) {
-  var self = this
+    const file = new File(path)
+    this.buckets.get(pattern.pattern).add(file)
 
-  return Promise.try(function () {
-    var pattern = self._isIncluded(path)
-    var file = self._findFile(path, pattern)
+    return Promise.all([
+      fs.statAsync(path),
+      this._refreshing
+    ]).spread((stat) => {
+      file.mtime = stat.mtime
+      return this._preprocess(file)
+    })
+      .then(() => {
+        log.info('Added file "%s".', path)
+        this._emitModified()
+        return this.files
+      })
+  }
+
+  // Update the `mtime` of a file.
+  // This is called by the watcher
+  //
+  // path - String, the path of the file to update.
+  //
+  // Returns a promise that is resolved when the update
+  // is completed.
+  changeFile (path) {
+    const pattern = this._isIncluded(path)
+    const file = this._findFile(path, pattern)
 
     if (!pattern || !file) {
-      log.debug('Removed file "%s" ignored. Does not match any file in the list.', path)
-      return self.files
+      log.debug('Changed file "%s" ignored. Does not match any file in the list.', path)
+      return Promise.resolve(this.files)
     }
 
-    self.buckets.get(pattern.pattern).delete(file)
+    return Promise.all([
+      fs.statAsync(path),
+      this._refreshing
+    ]).spread((stat) => {
+      if (stat.mtime <= file.mtime) throw new Promise.CancellationError()
+
+      file.mtime = stat.mtime
+      return this._preprocess(file)
+    })
+      .then(() => {
+        log.info('Changed file "%s".', path)
+        this._emitModified()
+        return this.files
+      })
+      .catch(Promise.CancellationError, () => {
+        return this.files
+      })
+  }
+
+  // Remove a file from the list.
+  // This is called by the watcher
+  //
+  // path - String, the path of the file to update.
+  //
+  // Returns a promise that is resolved when the update
+  // is completed.
+  removeFile (path) {
+    return Promise.try(() => {
+      const pattern = this._isIncluded(path)
+      const file = this._findFile(path, pattern)
+
+      if (!pattern || !file) {
+        log.debug('Removed file "%s" ignored. Does not match any file in the list.', path)
+        return this.files
+      }
+
+      this.buckets.get(pattern.pattern).delete(file)
+
+      log.info('Removed file "%s".', path)
+      this._emitModified()
+      return this.files
+    })
+  }
+}
 
-    log.info('Removed file "%s".', path)
-    self._emitModified()
-    return self.files
-  })
+FileList.factory = function (patterns, excludes, emitter, preprocess, autoWatchBatchDelay) {
+  return new FileList(patterns, excludes, emitter, preprocess, autoWatchBatchDelay)
 }
 
-// Inject dependencies
-List.$inject = ['config.files', 'config.exclude', 'emitter', 'preprocess',
+FileList.factory.$inject = ['config.files', 'config.exclude', 'emitter', 'preprocess',
   'config.autoWatchBatchDelay']
 
-// PUBLIC
-module.exports = List
+module.exports = FileList
diff --git a/lib/file.js b/lib/file.js
index 0dd0a4827..094df9e0e 100644
--- a/lib/file.js
+++ b/lib/file.js
@@ -1,35 +1,30 @@
-// File
-// ====
-//
-// File object used for tracking files in `file-list.js`
+'use strict'
 
-// Dependencies
-// ------------
+/**
+ * File object used for tracking files in `file-list.js`.
+ */
+class File {
+  constructor (path, mtime, doNotCache, type) {
+    // used for serving (processed path, eg some/file.coffee -> some/file.coffee.js)
+    this.path = path
 
-var _ = require('lodash')
+    // original absolute path, id of the file
+    this.originalPath = path
 
-// Constructor
-var File = function (path, mtime, doNotCache, type) {
-  // used for serving (processed path, eg some/file.coffee -> some/file.coffee.js)
-  this.path = path
+    // where the content is stored (processed)
+    this.contentPath = path
 
-  // original absolute path, id of the file
-  this.originalPath = path
+    this.mtime = mtime
+    this.isUrl = false
 
-  // where the content is stored (processed)
-  this.contentPath = path
+    this.doNotCache = doNotCache === undefined ? false : doNotCache
 
-  this.mtime = mtime
-  this.isUrl = false
+    this.type = type
+  }
 
-  this.doNotCache = _.isUndefined(doNotCache) ? false : doNotCache
-
-  this.type = type
-}
-
-File.prototype.toString = function () {
-  return this.path
+  toString () {
+    return this.path
+  }
 }
 
-// PUBLIC
 module.exports = File
diff --git a/lib/server.js b/lib/server.js
index 160a8130f..9b6c861df 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -90,7 +90,7 @@ var Server = function (cliOptions, done) {
     launcher: ['type', Launcher],
     config: ['value', config],
     preprocess: ['factory', preprocessor.createPreprocessor],
-    fileList: ['type', FileList],
+    fileList: ['factory', FileList.factory],
     webServer: ['factory', ws.create],
     socketServer: ['factory', createSocketIoServer],
     executor: ['factory', Executor.factory],
diff --git a/test/unit/file-list.spec.js b/test/unit/file-list.spec.js
index 9a6ad1af0..42a61a6e1 100644
--- a/test/unit/file-list.spec.js
+++ b/test/unit/file-list.spec.js
@@ -1,33 +1,35 @@
-var Promise = require('bluebird')
-var EventEmitter = require('events').EventEmitter
-var mocks = require('mocks')
-var proxyquire = require('proxyquire')
-var pathLib = require('path')
-var _ = require('lodash')
+'use strict'
 
-var helper = require('../../lib/helper')
-var config = require('../../lib/config')
+const Promise = require('bluebird')
+const EventEmitter = require('events').EventEmitter
+const mocks = require('mocks')
+const proxyquire = require('proxyquire')
+const pathLib = require('path')
+const _ = require('lodash')
+
+const helper = require('../../lib/helper')
+const config = require('../../lib/config')
 
 // create an array of pattern objects from given strings
-var patterns = function () {
+const patterns = function () {
   return Array.from(arguments).map((str) => new config.Pattern(str))
 }
 
-function pathsFrom (files) {
+const pathsFrom = (files) => {
   return _.map(Array.from(files), 'path')
 }
 
-function findFile (path, files) {
+const findFile = (path, files) => {
   return Array.from(files).find((file) => file.path === path)
 }
 
-var PATTERN_LIST = {
+const PATTERN_LIST = {
   '/some/*.js': ['/some/a.js', '/some/b.js'],
   '*.txt': ['/c.txt', '/a.txt', '/b.txt'],
   '/a.*': ['/a.txt']
 }
 
-var MG = {
+const MG = {
   statCache: {
     '/some/a.js': {mtime: new Date()},
     '/some/b.js': {mtime: new Date()},
@@ -36,7 +38,7 @@ var MG = {
     '/c.txt': {mtime: new Date()}
   }
 }
-var mockFs = mocks.fs.create({
+const mockFs = mocks.fs.create({
   some: {
     '0.js': mocks.fs.file('2012-04-04'),
     'a.js': mocks.fs.file('2012-04-04'),
@@ -53,14 +55,14 @@ var mockFs = mocks.fs.create({
 })
 
 describe('FileList', () => {
-  var list
-  var emitter
-  var preprocess
-  var patternList
-  var mg
-  var modified
-  var glob
-  var List = list = emitter = preprocess = patternList = mg = modified = glob = null
+  let list
+  let emitter
+  let preprocess
+  let patternList
+  let mg
+  let modified
+  let glob
+  let List = list = emitter = preprocess = patternList = mg = modified = glob = null
 
   beforeEach(() => {})
 
@@ -106,7 +108,7 @@ describe('FileList', () => {
     })
 
     it('returns only served files', () => {
-      var files = [
+      const files = [
         new config.Pattern('/a.*', true), // served: true
         new config.Pattern('/some/*.js', false) // served: false
       ]
@@ -119,7 +121,7 @@ describe('FileList', () => {
     })
 
     it('marks no cache files', () => {
-      var files = [
+      const files = [
         new config.Pattern('/a.*'), // nocach: false
         new config.Pattern('/some/*.js', true, true, true, true) // nocache: true
       ]
@@ -140,7 +142,7 @@ describe('FileList', () => {
     })
 
     it('returns a flat array of included files', () => {
-      var files = [
+      const files = [
         new config.Pattern('/a.*', true, false), // included: false
         new config.Pattern('/some/*.js') // included: true
       ]
@@ -265,8 +267,8 @@ describe('FileList', () => {
       return list.refresh().then((files) => {
         expect(list.buckets.size).to.equal(2)
 
-        var first = pathsFrom(list.buckets.get('/some/*.js'))
-        var second = pathsFrom(list.buckets.get('*.txt'))
+        const first = pathsFrom(list.buckets.get('/some/*.js'))
+        const second = pathsFrom(list.buckets.get('*.txt'))
 
         expect(first).to.contain('/some/a.js', '/some/b.js')
         expect(second).to.contain('/a.txt', '/b.txt', '/c.txt')
@@ -276,8 +278,8 @@ describe('FileList', () => {
     it('uses the file from the first matcher if two matchers match the same file', () => {
       list = new List(patterns('/a.*', '*.txt'), [], emitter, preprocess, 100)
       return list.refresh().then(() => {
-        var first = pathsFrom(list.buckets.get('/a.*'))
-        var second = pathsFrom(list.buckets.get('*.txt'))
+        const first = pathsFrom(list.buckets.get('/a.*'))
+        const second = pathsFrom(list.buckets.get('*.txt'))
 
         expect(first).to.contain('/a.txt')
         expect(second).not.to.contain('/a.txt')
@@ -285,16 +287,16 @@ describe('FileList', () => {
     })
 
     it('cancels refreshs', () => {
-      var checkResult = (files) => {
+      const checkResult = (files) => {
         expect(_.map(files.served, 'path')).to.contain('/some/a.js', '/some/b.js', '/some/c.js')
       }
 
-      var p1 = list.refresh().then(checkResult)
+      const p1 = list.refresh().then(checkResult)
       patternList['/some/*.js'].push('/some/c.js')
       mg.statCache['/some/c.js'] = {mtime: new Date(Date.now() + 5000)}
-      var p2 = list.refresh().then(checkResult)
-      var called = false
-      var callback = (data) => {
+      const p2 = list.refresh().then(checkResult)
+      let called = false
+      const callback = (data) => {
         expect(called).to.be.false
         expect(data.served[0].mtime.toString()).to.not.equal(data.served[2].mtime.toString())
         expect(data.served[0].mtime.toString()).to.equal(data.served[1].mtime.toString())
@@ -309,10 +311,10 @@ describe('FileList', () => {
 
     it('sets the mtime for all files', () => {
       return list.refresh().then((files) => {
-        var bucket = list.buckets.get('/some/*.js')
+        const bucket = list.buckets.get('/some/*.js')
 
-        var file1 = findFile('/some/a.js', bucket)
-        var file2 = findFile('/some/b.js', bucket)
+        const file1 = findFile('/some/a.js', bucket)
+        const file2 = findFile('/some/b.js', bucket)
 
         expect(file1.mtime).to.be.eql(mg.statCache['/some/a.js'].mtime)
         expect(file2.mtime).to.be.eql(mg.statCache['/some/b.js'].mtime)
@@ -323,10 +325,10 @@ describe('FileList', () => {
       list = new List(patterns('/some/world/../*.js', '*.txt'), [], emitter, preprocess)
 
       return list.refresh().then((files) => {
-        var bucket = list.buckets.get('/some/world/../*.js')
+        const bucket = list.buckets.get('/some/world/../*.js')
 
-        var file1 = findFile('/some/a.js', bucket)
-        var file2 = findFile('/some/b.js', bucket)
+        const file1 = findFile('/some/a.js', bucket)
+        const file2 = findFile('/some/b.js', bucket)
 
         expect(file1.mtime).to.be.eql(mg.statCache['/some/a.js'].mtime)
         expect(file2.mtime).to.be.eql(mg.statCache['/some/b.js'].mtime)
@@ -353,7 +355,7 @@ describe('FileList', () => {
       list = new List(patterns('*.txt'), ['/a.*', '**/b.txt'], emitter, preprocess)
 
       return list.refresh().then((files) => {
-        var bucket = pathsFrom(list.buckets.get('*.txt'))
+        const bucket = pathsFrom(list.buckets.get('*.txt'))
 
         expect(bucket).to.contain('/c.txt')
         expect(bucket).not.to.contain('/a.txt')
@@ -366,8 +368,8 @@ describe('FileList', () => {
 
       return list.refresh()
         .then((files) => {
-          var bucket = list.buckets.get('http://some.com')
-          var file = findFile('http://some.com', bucket)
+          const bucket = list.buckets.get('http://some.com')
+          const file = findFile('http://some.com', bucket)
 
           expect(file).to.have.property('isUrl', true)
         })
@@ -392,7 +394,7 @@ describe('FileList', () => {
     })
 
     it('fires modified before resolving promise after subsequent calls', () => {
-      var modified = sinon.stub()
+      const modified = sinon.stub()
       emitter.on('file_list_modified', modified)
 
       return list.refresh().then(() => {
@@ -427,7 +429,7 @@ describe('FileList', () => {
   })
 
   describe('addFile', () => {
-    var clock = null
+    let clock = null
 
     beforeEach(() => {
       patternList = PATTERN_LIST
@@ -493,14 +495,14 @@ describe('FileList', () => {
       return list.refresh().then((before) => {
         return list.addFile('/some/d.js').then((files) => {
           expect(pathsFrom(files.served)).to.contain('/some/d.js')
-          var bucket = list.buckets.get('/some/*.js')
+          const bucket = list.buckets.get('/some/*.js')
           expect(pathsFrom(bucket)).to.contain('/some/d.js')
         })
       })
     })
 
     it('fires "file_list_modified"', () => {
-      var modified = sinon.stub()
+      const modified = sinon.stub()
       emitter.on('file_list_modified', modified)
 
       return list.refresh().then(() => {
@@ -555,7 +557,7 @@ describe('FileList', () => {
   })
 
   describe('changeFile', () => {
-    var clock = null
+    let clock = null
 
     beforeEach(() => {
       patternList = PATTERN_LIST
@@ -598,7 +600,7 @@ describe('FileList', () => {
     it('updates mtime and fires "file_list_modified"', () => {
       // MATCH: /some/a.js, /some/b.js
       list = new List(patterns('/some/*.js', '/a.*'), [], emitter, preprocess, 100)
-      var modified = sinon.stub()
+      const modified = sinon.stub()
       emitter.on('file_list_modified', modified)
 
       return list.refresh().then((files) => {
@@ -617,7 +619,7 @@ describe('FileList', () => {
       // MATCH: /some/a.js
       list = new List(patterns('/some/*.js', '/a.*'), ['/some/b.js'], emitter, preprocess)
 
-      var modified = sinon.stub()
+      const modified = sinon.stub()
       emitter.on('file_list_modified', modified)
 
       return list.refresh().then((files) => {
@@ -635,7 +637,7 @@ describe('FileList', () => {
       // MATCH: /some/a.js, /some/b.js, /a.txt
       list = new List(patterns('/some/*.js', '/a.*'), [], emitter, preprocess)
 
-      var modified = sinon.stub()
+      const modified = sinon.stub()
       emitter.on('file_list_modified', modified)
 
       return list.refresh().then((files) => {
@@ -664,7 +666,7 @@ describe('FileList', () => {
   })
 
   describe('removeFile', () => {
-    var clock = null
+    let clock = null
 
     beforeEach(() => {
       patternList = PATTERN_LIST
@@ -708,7 +710,7 @@ describe('FileList', () => {
       // MATCH: /some/a.js, /some/b.js, /a.txt
       list = new List(patterns('/some/*.js', '/a.*'), [], emitter, preprocess, 100)
 
-      var modified = sinon.stub()
+      const modified = sinon.stub()
       emitter.on('file_list_modified', modified)
 
       return list.refresh().then((files) => {
@@ -747,12 +749,12 @@ describe('FileList', () => {
     // Rule of thumb: Always wait on the promises returned by list.addFile, list.changeFile,
     // and list.removeFile.
 
-    var clock = null
+    let clock = null
 
     beforeEach(() => {
       patternList = PATTERN_LIST
       mg = MG
-      Promise.setScheduler(function (fn) { fn() })
+      Promise.setScheduler((fn) => { fn() })
 
       preprocess = sinon.spy((file, done) => process.nextTick(done))
       emitter = new EventEmitter()
@@ -929,7 +931,7 @@ describe('FileList', () => {
 
         expect(preprocess).to.not.have.been.called
 
-        var promise = new Promise((resolve) => {
+        const promise = new Promise((resolve) => {
           emitter.once('file_list_modified', () => _.defer(() => {
             resolve()
           }))
diff --git a/test/unit/middleware/karma.spec.js b/test/unit/middleware/karma.spec.js
index edb29293c..ae76de2b2 100644
--- a/test/unit/middleware/karma.spec.js
+++ b/test/unit/middleware/karma.spec.js
@@ -1,3 +1,5 @@
+'use strict'
+
 var mocks = require('mocks')
 
 var helper = require('../../../lib/helper')
@@ -14,9 +16,11 @@ describe('middleware.karma', () => {
   var nextSpy
   var response
 
-  var MockFile = function (path, sha, type) {
-    File.call(this, path, undefined, undefined, type)
-    this.sha = sha || 'sha-default'
+  class MockFile extends File {
+    constructor (path, sha, type) {
+      super(path, undefined, undefined, type)
+      this.sha = sha || 'sha-default'
+    }
   }
 
   var fsMock = mocks.fs.create({

From adaefd5c3e99b416bf75acdbb88531af9ec6c7f1 Mon Sep 17 00:00:00 2001
From: Yaroslav Admin <devoto13@gmail.com>
Date: Fri, 18 May 2018 01:29:22 +0200
Subject: [PATCH 19/50] refactor: migrate index to ES2015 (#3006)

---
 lib/index.js            | 18 +++++++++---------
 test/unit/index.spec.js |  6 ++++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 9d09178b0..4d906a437 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,20 +1,20 @@
-// index module
+'use strict'
 
-var constants = require('./constants')
-var Server = require('./server')
-var runner = require('./runner')
-var stopper = require('./stopper')
-var launcher = require('./launcher')
-var cfg = require('./config')
+const constants = require('./constants')
+const Server = require('./server')
+const runner = require('./runner')
+const stopper = require('./stopper')
+const launcher = require('./launcher')
+const cfg = require('./config')
 
 // TODO: remove in 1.0
-var oldServer = {
+const oldServer = {
   start: function (cliOptions, done) {
     console.error('WARN `start` method is deprecated since 0.13. It will be removed in 0.14. Please use \n' +
       '  server = new Server(config, [done])\n' +
       '  server.start()\n' +
       'instead.')
-    var server = new Server(cliOptions, done)
+    const server = new Server(cliOptions, done)
     server.start()
   }
 }
diff --git a/test/unit/index.spec.js b/test/unit/index.spec.js
index ab1d979e0..8adc84f4f 100644
--- a/test/unit/index.spec.js
+++ b/test/unit/index.spec.js
@@ -1,7 +1,9 @@
-var cfg = require('../../lib/config')
+'use strict'
+
+const cfg = require('../../lib/config')
 
 describe('index', () => {
-  var index = require('../../lib/index')
+  const index = require('../../lib/index')
 
   it('should expose the `config` object', () => {
     expect(index.config.parseConfig).to.be.eq(cfg.parseConfig)

From af8c6e407fa88de1b8ee034cf41a4c83ad832877 Mon Sep 17 00:00:00 2001
From: Georgii Dolzhykov <thorn.mailbox@gmail.com>
Date: Sat, 19 May 2018 02:29:32 +0300
Subject: [PATCH 20/50] fix: a missed argument in a debug message (#3009)

---
 lib/file-list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/file-list.js b/lib/file-list.js
index b3b27b866..13129cd32 100644
--- a/lib/file-list.js
+++ b/lib/file-list.js
@@ -176,7 +176,7 @@ class FileList {
         const file = new File(path, mtime, doNotCache, type)
 
         if (file.doNotCache) {
-          log.debug('Not preprocessing "%s" due to nocache')
+          log.debug('Not preprocessing "%s" due to nocache', pattern)
           return Promise.resolve(file)
         }
 

From 6847ca04df4eecfc413bb75807b0146ba0d157a5 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Mon, 21 May 2018 23:18:45 +0900
Subject: [PATCH 21/50] fix(docs): Remove mention of pre 1.0.0 version (#3010)

---
 docs/about/01-versioning.md | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/docs/about/01-versioning.md b/docs/about/01-versioning.md
index b5b326628..7c5ce6802 100644
--- a/docs/about/01-versioning.md
+++ b/docs/about/01-versioning.md
@@ -1,20 +1,12 @@
-Karma uses [Semantic Versioning]. There are some special rules at the moment,
-as we have not yet released a `1.0.0`.
+Karma uses [Semantic Versioning].
 
-* Minor versions could introduce breaking changes.
-* Patch versions are expected to be compatible at all times.
+It is recommended that you add Karma by running:
 
-It is recommended that you add the following entry to your `package.json`
-file, either manually
-```javascript
-{
-  "devDependencies": {
-    "karma": "^0.13.0"
-  }
-}
+```bash
+$ yarn add --dev karma
 ```
 
-or by running
+or: 
 
 ```bash
 $ npm --save-dev install karma

From a0535709412d5fa1c630a6206148507562c4dbb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Usarz?= <lukasz.usarz@gmail.com>
Date: Tue, 22 May 2018 01:35:06 +0200
Subject: [PATCH 22/50] refactor(init): refactor karma init (#2998)

---
 lib/init.js               | 100 ++++++++++++++++----------------------
 lib/init/log-queue.js     |  15 ++++++
 lib/init/state_machine.js |  98 +++++++++++++++++++------------------
 3 files changed, 107 insertions(+), 106 deletions(-)
 create mode 100644 lib/init/log-queue.js

diff --git a/lib/init.js b/lib/init.js
index a257e05b2..0eef4f03e 100755
--- a/lib/init.js
+++ b/lib/init.js
@@ -1,30 +1,26 @@
-var readline = require('readline')
-var path = require('path')
-var glob = require('glob')
-var mm = require('minimatch')
-var exec = require('child_process').exec
+'use strict'
 
-var helper = require('./helper')
-var logger = require('./logger')
+const readline = require('readline')
+const path = require('path')
+const glob = require('glob')
+const mm = require('minimatch')
+const exec = require('child_process').exec
 
-var log = logger.create('init')
+const helper = require('./helper')
+const logger = require('./logger')
 
-var StateMachine = require('./init/state_machine')
-var COLOR_SCHEME = require('./init/color_schemes')
-var formatters = require('./init/formatters')
+const log = logger.create('init')
+const logQueue = require('./init/log-queue')
+
+const StateMachine = require('./init/state_machine')
+const COLOR_SCHEME = require('./init/color_schemes')
+const formatters = require('./init/formatters')
 
 // TODO(vojta): coverage
 // TODO(vojta): html preprocessors
 // TODO(vojta): SauceLabs
 // TODO(vojta): BrowserStack
 
-var logQueue = []
-var printLogQueue = function () {
-  while (logQueue.length) {
-    logQueue.shift()()
-  }
-}
-
 var NODE_MODULES_DIR = path.resolve(__dirname, '../..')
 
 // Karma is not in node_modules, probably a symlink,
@@ -33,7 +29,7 @@ if (!/node_modules$/.test(NODE_MODULES_DIR)) {
   NODE_MODULES_DIR = path.resolve('node_modules')
 }
 
-var installPackage = function (pkgName) {
+function installPackage (pkgName) {
   // Do not install if already installed.
   try {
     require(NODE_MODULES_DIR + '/' + pkgName)
@@ -42,7 +38,7 @@ var installPackage = function (pkgName) {
 
   log.debug('Missing plugin "%s". Installing...', pkgName)
 
-  var options = {
+  const options = {
     cwd: path.resolve(NODE_MODULES_DIR, '..')
   }
 
@@ -65,22 +61,22 @@ var installPackage = function (pkgName) {
   })
 }
 
-var validatePattern = function (pattern) {
+function validatePattern (pattern) {
   if (!glob.sync(pattern).length) {
     log.warn('There is no file matching this pattern.\n')
   }
 }
 
-var validateBrowser = function (name) {
+function validateBrowser (name) {
   // TODO(vojta): check if the path resolves to a binary
   installPackage('karma-' + name.toLowerCase().replace('canary', '') + '-launcher')
 }
 
-var validateFramework = function (name) {
+function validateFramework (name) {
   installPackage('karma-' + name)
 }
 
-var validateRequireJs = function (useRequire) {
+function validateRequireJs (useRequire) {
   if (useRequire) {
     validateFramework('requirejs')
   }
@@ -127,9 +123,7 @@ var questions = [{
   hint: 'This will generate test-main.js/coffee that configures RequireJS and starts the tests.',
   options: ['no', 'yes'],
   boolean: true,
-  condition: function (answers) {
-    return answers.requirejs
-  }
+  condition: answers => answers.requirejs
 }, {
   id: 'includedFiles',
   question: 'Which files do you want to include with <script> tag ?',
@@ -138,9 +132,7 @@ var questions = [{
     'Enter empty string to move to the next question.',
   multiple: true,
   validate: validatePattern,
-  condition: function (answers) {
-    return answers.requirejs && !answers.generateTestMain
-  }
+  condition: answers => answers.requirejs && !answers.generateTestMain
 }, {
   id: 'autoWatch',
   question: 'Do you want Karma to watch all the files and run the tests on change ?',
@@ -149,10 +141,10 @@ var questions = [{
   boolean: true
 }]
 
-var getBasePath = function (configFilePath, cwd) {
-  var configParts = path.dirname(configFilePath).split(path.sep)
-  var cwdParts = cwd.split(path.sep)
-  var base = []
+function getBasePath (configFilePath, cwd) {
+  const configParts = path.dirname(configFilePath).split(path.sep)
+  const cwdParts = cwd.split(path.sep)
+  const base = []
 
   while (configParts.length && configParts[0] === cwdParts[0]) {
     configParts.shift()
@@ -160,7 +152,7 @@ var getBasePath = function (configFilePath, cwd) {
   }
 
   while (configParts.length) {
-    var part = configParts.shift()
+    const part = configParts.shift()
     if (part === '..') {
       base.unshift(cwdParts.pop())
     } else if (part !== '.') {
@@ -171,8 +163,8 @@ var getBasePath = function (configFilePath, cwd) {
   return base.join(path.sep)
 }
 
-var processAnswers = function (answers, basePath, testMainFile) {
-  var processedAnswers = {
+function processAnswers (answers, basePath, testMainFile) {
+  const processedAnswers = {
     basePath: basePath,
     files: answers.files,
     onlyServedFiles: [],
@@ -198,10 +190,8 @@ var processAnswers = function (answers, basePath, testMainFile) {
     }
   }
 
-  var allPatterns = answers.files.concat(answers.includedFiles || [])
-  if (allPatterns.some(function (pattern) {
-    return mm(pattern, '**/*.coffee')
-  })) {
+  const allPatterns = answers.files.concat(answers.includedFiles || [])
+  if (allPatterns.some(pattern => mm(pattern, '**/*.coffee'))) {
     installPackage('karma-coffee-preprocessor')
     processedAnswers.preprocessors['**/*.coffee'] = ['coffee']
   }
@@ -212,18 +202,14 @@ var processAnswers = function (answers, basePath, testMainFile) {
 exports.init = function (config) {
   logger.setupFromConfig(config)
 
-  var colorScheme = COLOR_SCHEME.ON
-
-  if (helper.isDefined(config.colors)) {
-    colorScheme = config.colors ? COLOR_SCHEME.ON : COLOR_SCHEME.OFF
-  }
+  const colorScheme = !helper.isDefined(config.colors) || config.colors ? COLOR_SCHEME.ON : COLOR_SCHEME.OFF
   // need to be registered before creating readlineInterface
   process.stdin.on('keypress', function (s, key) {
     sm.onKeypress(key)
   })
 
-  var rli = readline.createInterface(process.stdin, process.stdout)
-  var sm = new StateMachine(rli, colorScheme)
+  const rli = readline.createInterface(process.stdin, process.stdout)
+  const sm = new StateMachine(rli, colorScheme)
 
   rli.on('line', sm.onLine.bind(sm))
 
@@ -233,17 +219,15 @@ exports.init = function (config) {
     process.exit(0)
   })
 
-  sm.on('next_question', printLogQueue)
-
   sm.process(questions, function (answers) {
-    var cwd = process.cwd()
-    var configFile = config.configFile || 'karma.conf.js'
-    var isCoffee = path.extname(configFile) === '.coffee'
-    var testMainFile = isCoffee ? 'test-main.coffee' : 'test-main.js'
-    var formatter = formatters.createForPath(configFile)
-    var processedAnswers = processAnswers(answers, getBasePath(configFile, cwd), testMainFile)
-    var configFilePath = path.resolve(cwd, configFile)
-    var testMainFilePath = path.resolve(cwd, testMainFile)
+    const cwd = process.cwd()
+    const configFile = config.configFile || 'karma.conf.js'
+    const isCoffee = path.extname(configFile) === '.coffee'
+    const testMainFile = isCoffee ? 'test-main.coffee' : 'test-main.js'
+    const formatter = formatters.createForPath(configFile)
+    const processedAnswers = processAnswers(answers, getBasePath(configFile, cwd), testMainFile)
+    const configFilePath = path.resolve(cwd, configFile)
+    const testMainFilePath = path.resolve(cwd, testMainFile)
 
     if (isCoffee) {
       installPackage('coffee-script')
diff --git a/lib/init/log-queue.js b/lib/init/log-queue.js
new file mode 100644
index 000000000..db9043b9c
--- /dev/null
+++ b/lib/init/log-queue.js
@@ -0,0 +1,15 @@
+'use strict'
+
+const logQueue = []
+function printLogQueue () {
+  logQueue.forEach(log => log())
+  logQueue.length = 0
+}
+
+function push (log) {
+  logQueue.push(log)
+}
+
+module.exports = {
+  printLogQueue, push
+}
diff --git a/lib/init/state_machine.js b/lib/init/state_machine.js
index 3761a65d6..789087bd4 100644
--- a/lib/init/state_machine.js
+++ b/lib/init/state_machine.js
@@ -1,32 +1,35 @@
-var util = require('util')
-var EventEmitter = require('events').EventEmitter
-
-var StateMachine = function (rli, colors) {
-  var questions
-  var currentQuestion
-  var answers
-  var currentOptions
-  var currentOptionsPointer
-  var currentQuestionId
-  var done
-
-  EventEmitter.call(this)
-
-  var showPrompt = function () {
-    rli.write(colors.ANSWER)
-    rli.prompt()
+'use strict'
+
+const logQueue = require('./log-queue')
+
+var questions
+var currentQuestion
+var answers
+var currentOptions
+var currentOptionsPointer
+var currentQuestionId
+var done
+
+class StateMachine {
+  constructor (rli, colors) {
+    this.rli = rli
+    this.colors = colors
   }
 
-  this.onKeypress = function (key) {
+  showPrompt () {
+    this.rli.write(this.colors.ANSWER)
+    this.rli.prompt()
+  }
+
+  onKeypress (key) {
     if (!currentOptions || !key) {
       return
     }
 
     if (key.name === 'tab' || key.name === 'right' || key.name === 'down') {
-      this.suggestNextOption()
+      this.suggestOption(currentOptionsPointer + 1)
     } else if (key.name === 'left' || key.name === 'up') {
-      currentOptionsPointer = currentOptionsPointer + currentOptions.length - 2
-      this.suggestNextOption()
+      this.suggestOption(currentOptionsPointer - 1)
     }
 
     if (!key.ctrl && !key.meta && key.name !== 'enter' && key.name !== 'return') {
@@ -34,28 +37,35 @@ var StateMachine = function (rli, colors) {
     }
   }
 
-  this.suggestNextOption = function () {
+  suggestOption (index) {
     if (!currentOptions) {
       return
     }
 
-    currentOptionsPointer = (currentOptionsPointer + 1) % currentOptions.length
-    rli._deleteLineLeft()
-    rli._deleteLineRight()
-    rli.write(currentOptions[currentOptionsPointer])
+    if (index === -1) {
+      currentOptionsPointer = currentOptions.length - 1
+    } else if (index === currentOptions.length) {
+      currentOptionsPointer = 0
+    } else {
+      currentOptionsPointer = index
+    }
+
+    this.rli._deleteLineLeft()
+    this.rli._deleteLineRight()
+    this.rli.write(currentOptions[currentOptionsPointer])
   }
 
-  this.kill = function () {
+  kill () {
     currentOptions = null
     currentQuestionId = null
-    rli.write('\n' + colors.RESET + '\n')
-    rli.close()
+    this.rli.write('\n' + this.colors.RESET + '\n')
+    this.rli.close()
   }
 
-  this.onLine = function (line) {
+  onLine (line) {
     if (currentQuestionId) {
-      rli.write(colors.RESET)
-      line = line.trim().replace(colors.ANSWER, '').replace(colors.RESET, '')
+      this.rli.write(this.colors.RESET)
+      line = line.trim().replace(this.colors.ANSWER, '').replace(this.colors.RESET, '')
 
       if (currentOptions) {
         currentOptionsPointer = currentOptions.indexOf(line)
@@ -80,7 +90,7 @@ var StateMachine = function (rli, colors) {
         answers[currentQuestionId] = answers[currentQuestionId] || []
         if (line !== null) {
           answers[currentQuestionId].push(line)
-          showPrompt()
+          this.showPrompt()
 
           if (currentOptions) {
             currentOptions.splice(currentOptionsPointer, 1)
@@ -96,38 +106,32 @@ var StateMachine = function (rli, colors) {
     }
   }
 
-  this.nextQuestion = function () {
+  nextQuestion () {
     currentQuestion = questions.shift()
 
     while (currentQuestion && currentQuestion.condition && !currentQuestion.condition(answers)) {
       currentQuestion = questions.shift()
     }
 
-    this.emit('next_question', currentQuestion)
+    logQueue.printLogQueue()
 
     if (currentQuestion) {
       currentQuestionId = null
 
-      rli.write('\n' + colors.question(currentQuestion.question) + '\n')
-      rli.write(currentQuestion.hint + '\n')
-      showPrompt()
+      this.rli.write('\n' + this.colors.question(currentQuestion.question) + '\n')
+      this.rli.write(currentQuestion.hint + '\n')
+      this.showPrompt()
 
       currentOptions = currentQuestion.options || null
-      currentOptionsPointer = -1
       currentQuestionId = currentQuestion.id
-
-      this.suggestNextOption()
+      this.suggestOption(0)
     } else {
-      currentQuestionId = null
-      currentOptions = null
-
-      // end
       this.kill()
       done(answers)
     }
   }
 
-  this.process = function (_questions, _done) {
+  process (_questions, _done) {
     questions = _questions
     answers = {}
     done = _done
@@ -136,6 +140,4 @@ var StateMachine = function (rli, colors) {
   }
 }
 
-util.inherits(StateMachine, EventEmitter)
-
 module.exports = StateMachine

From 667b47efbe42800189efc9ba697f07c2671a7845 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Marcos=20Duarte?= <joumd86@gmail.com>
Date: Mon, 21 May 2018 19:51:34 -0400
Subject: [PATCH 23/50] fix(deps): Update log4js in package.json (#2996)

Repair for problem found through npm audit, see https://docs.npmjs.com/getting-started/running-a-security-audit.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cca0ea8b1..6173bcfac 100644
--- a/package.json
+++ b/package.json
@@ -363,7 +363,7 @@
     "http-proxy": "^1.13.0",
     "isbinaryfile": "^3.0.0",
     "lodash": "^4.17.4",
-    "log4js": "^2.3.9",
+    "log4js": "^2.5.3",
     "mime": "^1.3.4",
     "minimatch": "^3.0.2",
     "optimist": "^0.6.1",

From 8197408188ce4eb6161e640ac35e3271d6aeb2ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Usarz?= <lukasz.usarz@gmail.com>
Date: Thu, 24 May 2018 01:31:34 +0200
Subject: [PATCH 24/50] refactor(events): refactor karma EventEmitter (#3012)

---
 lib/events.js            | 85 +++++++++++++++-------------------------
 lib/launchers/base.js    |  4 +-
 lib/server.js            | 14 +++++--
 test/unit/events.spec.js |  6 +--
 4 files changed, 48 insertions(+), 61 deletions(-)

diff --git a/lib/events.js b/lib/events.js
index 5e0876d33..29951849b 100644
--- a/lib/events.js
+++ b/lib/events.js
@@ -1,75 +1,58 @@
-var events = require('events')
-var util = require('util')
+'use strict'
 
-var helper = require('./helper')
+const EventEmitter = require('events').EventEmitter
+const helper = require('./helper')
 
-var bindAllEvents = function (object, context) {
-  context = context || this
+function bufferEvents (emitter, eventsToBuffer) {
+  const listeners = []
+  const eventsToReply = []
 
-  var bindMethod = function (method) {
-    context.on(helper.camelToSnake(method.substr(2)), function () {
-      var args = Array.prototype.slice.call(arguments, 0)
-      args.push(context)
-      object[method].apply(object, args)
-    })
+  function genericListener () {
+    eventsToReply.push(Array.from(arguments))
   }
 
-  for (var method in object) {
-    if (helper.isFunction(object[method]) && method.substr(0, 2) === 'on') {
-      bindMethod(method)
-    }
-  }
-}
-
-var bufferEvents = function (emitter, eventsToBuffer) {
-  var listeners = []
-  var eventsToReply = []
-  var genericListener = function () {
-    eventsToReply.push(Array.prototype.slice.call(arguments))
-  }
-
-  eventsToBuffer.forEach(function (eventName) {
-    var listener = genericListener.bind(null, eventName)
+  eventsToBuffer.forEach((eventName) => {
+    const listener = genericListener.bind(null, eventName)
     listeners.push(listener)
     emitter.on(eventName, listener)
   })
 
   return function () {
-    if (!eventsToReply) {
-      return
-    }
-
-    // remove all buffering listeners
-    listeners.forEach(function (listener, i) {
+    listeners.forEach((listener, i) => {
       emitter.removeListener(eventsToBuffer[i], listener)
     })
 
-    // reply
-    eventsToReply.forEach(function (args) {
-      events.EventEmitter.prototype.emit.apply(emitter, args)
+    eventsToReply.forEach((args) => {
+      EventEmitter.prototype.emit.apply(emitter, args)
     })
 
-    // free-up
-    listeners = eventsToReply = null
+    listeners.length = 0
+    eventsToReply.length = 0
   }
 }
 
-// TODO(vojta): log.debug all events
-var EventEmitter = function () {
-  this.bind = bindAllEvents
+class KarmaEventEmitter extends EventEmitter {
+  bind (object) {
+    Object.keys(object).forEach((method) => {
+      if (method.startsWith('on') && helper.isFunction(object[method])) {
+        this.on(helper.camelToSnake(method.substr(2)), function () {
+          object[method].apply(object, Array.from(arguments).concat(this))
+        })
+      }
+    })
+  }
 
-  this.emitAsync = function (name) {
+  emitAsync (name) {
     // TODO(vojta): allow passing args
     // TODO(vojta): ignore/throw if listener call done() multiple times
-    var pending = this.listeners(name).length
-    var deferred = helper.defer()
-    var done = function () {
+    let pending = this.listeners(name).length
+    const deferred = helper.defer()
+
+    this.emit(name, () => {
       if (!--pending) {
         deferred.resolve()
       }
-    }
-
-    this.emit(name, done)
+    })
 
     if (!pending) {
       deferred.resolve()
@@ -79,9 +62,5 @@ var EventEmitter = function () {
   }
 }
 
-util.inherits(EventEmitter, events.EventEmitter)
-
-// PUBLISH
-exports.EventEmitter = EventEmitter
-exports.bindAll = bindAllEvents
+exports.EventEmitter = KarmaEventEmitter
 exports.bufferEvents = bufferEvents
diff --git a/lib/launchers/base.js b/lib/launchers/base.js
index 0ddb0dae9..c63a94a8a 100644
--- a/lib/launchers/base.js
+++ b/lib/launchers/base.js
@@ -24,7 +24,9 @@ var BaseLauncher = function (id, emitter) {
   Object.keys(EventEmitter.prototype).forEach(function (method) {
     this[method] = EventEmitter.prototype[method]
   }, this)
-  KarmaEventEmitter.call(this)
+
+  this.bind = KarmaEventEmitter.prototype.bind.bind(this)
+  this.emitAsync = KarmaEventEmitter.prototype.emitAsync.bind(this)
 
   this.id = id
   this.state = null
diff --git a/lib/server.js b/lib/server.js
index 9b6c861df..c05e0976d 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -21,7 +21,8 @@ var FileList = require('./file-list')
 var reporter = require('./reporter')
 var helper = require('./helper')
 var events = require('./events')
-var EventEmitter = events.EventEmitter
+var KarmaEventEmitter = events.EventEmitter
+var EventEmitter = require('events').EventEmitter
 var Executor = require('./executor')
 var Browser = require('./browser')
 var BrowserCollection = require('./browser_collection')
@@ -32,7 +33,7 @@ const karmaJsPath = path.join(__dirname, '/../static/karma.js')
 const contextJsPath = path.join(__dirname, '/../static/context.js')
 
 // Dynamic dependence on brwoserify
-var browserify = null;
+var browserify = null
 
 /**
  * Bundles a static resource using Browserify.
@@ -71,7 +72,12 @@ function createSocketIoServer (webServer, executor, config) {
 
 // Constructor
 var Server = function (cliOptions, done) {
-  EventEmitter.call(this)
+  Object.keys(EventEmitter.prototype).forEach(function (method) {
+    this[method] = EventEmitter.prototype[method]
+  }, this)
+  
+  this.bind = KarmaEventEmitter.prototype.bind.bind(this)
+  this.emitAsync = KarmaEventEmitter.prototype.emitAsync.bind(this)
 
   logger.setupFromConfig(cliOptions)
 
@@ -156,7 +162,7 @@ Server.prototype.refreshFiles = function () {
 // ---------------
 
 Server.prototype._start = function (config, launcher, preprocess, fileList,
-                                    capturedBrowsers, executor, done) {
+  capturedBrowsers, executor, done) {
   var self = this
   if (config.detached) {
     this._detach(config, done)
diff --git a/test/unit/events.spec.js b/test/unit/events.spec.js
index cf35f345a..70defe502 100644
--- a/test/unit/events.spec.js
+++ b/test/unit/events.spec.js
@@ -1,4 +1,4 @@
-var e = require('../../lib/events')
+const e = require('../../lib/events')
 
 describe('events', () => {
   var emitter
@@ -98,7 +98,7 @@ describe('events', () => {
     it('should take emitter as second argument', () => {
       var object = sinon.stub({onFoo: () => {}})
 
-      e.bindAll(object, emitter)
+      emitter.bind(object)
       emitter.emit('foo')
       emitter.emit('bar')
 
@@ -108,7 +108,7 @@ describe('events', () => {
     it('should append "context" to event arguments', () => {
       var object = sinon.stub({onFoo: () => {}})
 
-      e.bindAll(object, emitter)
+      emitter.bind(object)
       emitter.emit('foo', 'event-argument')
 
       expect(object.onFoo).to.have.been.calledWith('event-argument', emitter)

From a9c61c27b4e500ac938fad831bc446560a369720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Usarz?= <lukasz.usarz@gmail.com>
Date: Thu, 24 May 2018 18:24:10 +0200
Subject: [PATCH 25/50] refactor: setup 'arrow-parens' eslint rule (#3013)

---
 .eslintrc              | 5 ++++-
 lib/init/formatters.js | 6 +++---
 lib/init/log-queue.js  | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index e3578aadf..4a60c0ebe 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,3 +1,6 @@
 {
-  "extends": "standard"
+  "extends": "standard",
+  "rules": {
+    "arrow-parens": [2, "always"]
+  }
 }
diff --git a/lib/init/formatters.js b/lib/init/formatters.js
index 3c7231370..dc398b0df 100644
--- a/lib/init/formatters.js
+++ b/lib/init/formatters.js
@@ -13,21 +13,21 @@ function formatLine (items) {
 
 function formatMultiLines (items) {
   return items
-    .map(file => '\n      ' + file)
+    .map((file) => '\n      ' + file)
     .join(',')
 }
 
 function formatFiles (includedFiles, onlyServedFiles) {
   const lines = []
     .concat(includedFiles.map(quote))
-    .concat(onlyServedFiles.map(file => `{ pattern: ${quote(file)}, included: false }`))
+    .concat(onlyServedFiles.map((file) => `{ pattern: ${quote(file)}, included: false }`))
 
   return formatMultiLines(lines)
 }
 
 function formatPreprocessors (preprocessors) {
   const lines = Object.keys(preprocessors)
-    .map(pattern => `${quote(pattern)}: [${formatLine(preprocessors[pattern])}]`)
+    .map((pattern) => `${quote(pattern)}: [${formatLine(preprocessors[pattern])}]`)
 
   return formatMultiLines(lines)
 }
diff --git a/lib/init/log-queue.js b/lib/init/log-queue.js
index db9043b9c..feeb29f43 100644
--- a/lib/init/log-queue.js
+++ b/lib/init/log-queue.js
@@ -2,7 +2,7 @@
 
 const logQueue = []
 function printLogQueue () {
-  logQueue.forEach(log => log())
+  logQueue.forEach((log) => log())
   logQueue.length = 0
 }
 

From 685f98804403ba7c442c059932a0891734ffe475 Mon Sep 17 00:00:00 2001
From: Yaroslav Admin <devoto13@gmail.com>
Date: Fri, 25 May 2018 01:42:07 +0200
Subject: [PATCH 26/50] refactor: migrate Url to ES2015 (#3015)

---
 lib/url.js | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/lib/url.js b/lib/url.js
index 6753ea7af..908982bf8 100644
--- a/lib/url.js
+++ b/lib/url.js
@@ -1,17 +1,18 @@
-// Url
-// ===
-//
-// Url object used for tracking files in `file-list.js`
+'use strict'
 
-var Url = function (path, type) {
-  this.path = path
-  this.type = type
-  this.isUrl = true
-}
+/**
+ * Url object used for tracking files in `file-list.js`.
+ */
+class Url {
+  constructor (path, type) {
+    this.path = path
+    this.type = type
+    this.isUrl = true
+  }
 
-Url.prototype.toString = function () {
-  return this.path
+  toString () {
+    return this.path
+  }
 }
 
-// PUBLIC
 module.exports = Url

From 8e542485b289ff8b10849abab90990881df2732f Mon Sep 17 00:00:00 2001
From: Yaroslav Admin <devoto13@gmail.com>
Date: Fri, 25 May 2018 01:51:57 +0200
Subject: [PATCH 27/50] Prepare BaseReporter for conversion to class (#3017)

* refactor: prepared BaseReporter for converstion to ES2015 class

* refactor: import BaseReporter directly instead of using mocks
---
 lib/reporters/base.js            |  98 +++++++++++++++--------------
 test/unit/reporters/base.spec.js | 104 +++++++++++++++----------------
 2 files changed, 100 insertions(+), 102 deletions(-)

diff --git a/lib/reporters/base.js b/lib/reporters/base.js
index 5ed57ced2..40822cfef 100644
--- a/lib/reporters/base.js
+++ b/lib/reporters/base.js
@@ -1,23 +1,43 @@
-var util = require('util')
+'use strict'
 
-var constants = require('../constants')
-var helper = require('../helper')
+const util = require('util')
 
-var BaseReporter = function (formatError, reportSlow, useColors, browserConsoleLogOptions, adapter) {
+const constants = require('../constants')
+const helper = require('../helper')
+
+const BaseReporter = function (formatError, reportSlow, useColors, browserConsoleLogOptions, adapter) {
   this.adapters = [adapter || process.stdout.write.bind(process.stdout)]
 
-  this.onRunStart = function () {
+  this.USE_COLORS = false
+  this.EXCLUSIVELY_USE_COLORS = undefined
+  this.LOG_SINGLE_BROWSER = '%s: %s\n'
+  this.LOG_MULTI_BROWSER = '%s %s: %s\n'
+
+  this.SPEC_FAILURE = '%s %s FAILED' + '\n'
+  this.SPEC_SLOW = '%s SLOW %s: %s\n'
+  this.ERROR = '%s ERROR\n'
+
+  this.FINISHED_ERROR = ' ERROR'
+  this.FINISHED_SUCCESS = ' SUCCESS'
+  this.FINISHED_DISCONNECTED = ' DISCONNECTED'
+
+  this.X_FAILED = ' (%d FAILED)'
+
+  this.TOTAL_SUCCESS = 'TOTAL: %d SUCCESS\n'
+  this.TOTAL_FAILED = 'TOTAL: %d FAILED, %d SUCCESS\n'
+
+  this.onRunStart = () => {
     this._browsers = []
   }
 
-  this.onBrowserStart = function (browser) {
+  this.onBrowserStart = (browser) => {
     this._browsers.push(browser)
   }
 
-  this.renderBrowser = function (browser) {
-    var results = browser.lastResult
-    var totalExecuted = results.success + results.failed
-    var msg = util.format('%s: Executed %d of %d', browser, totalExecuted, results.total)
+  this.renderBrowser = (browser) => {
+    const results = browser.lastResult
+    const totalExecuted = results.success + results.failed
+    let msg = util.format('%s: Executed %d of %d', browser, totalExecuted, results.total)
 
     if (results.failed) {
       msg += util.format(this.X_FAILED, results.failed)
@@ -43,32 +63,31 @@ var BaseReporter = function (formatError, reportSlow, useColors, browserConsoleL
     return msg
   }
 
-  this.renderBrowser = this.renderBrowser.bind(this)
-
   this.write = function () {
-    var msg = util.format.apply(null, Array.prototype.slice.call(arguments))
-    var self = this
-    this.adapters.forEach(function (adapter) {
+    const msg = util.format.apply(null, Array.prototype.slice.call(arguments))
+    this.adapters.forEach((adapter) => {
       if (!helper.isDefined(adapter.colors)) {
         adapter.colors = useColors
       }
-      if (!helper.isDefined(self.EXCLUSIVELY_USE_COLORS) || adapter.colors === self.EXCLUSIVELY_USE_COLORS) {
+      if (!helper.isDefined(this.EXCLUSIVELY_USE_COLORS) || adapter.colors === this.EXCLUSIVELY_USE_COLORS) {
         return adapter(msg)
       }
     })
   }
 
-  this.writeCommonMsg = this.write
+  this.writeCommonMsg = function () {
+    this.write.apply(this, arguments)
+  }
 
-  this.onBrowserError = function (browser, error) {
+  this.onBrowserError = (browser, error) => {
     this.writeCommonMsg(util.format(this.ERROR, browser) + formatError(error, '  '))
   }
 
-  this.onBrowserLog = function (browser, log, type) {
+  this.onBrowserLog = (browser, log, type) => {
     if (!browserConsoleLogOptions || !browserConsoleLogOptions.terminal) return
     type = type.toUpperCase()
     if (browserConsoleLogOptions.level) {
-      var logPriority = constants.LOG_PRIORITIES.indexOf(browserConsoleLogOptions.level.toUpperCase())
+      const logPriority = constants.LOG_PRIORITIES.indexOf(browserConsoleLogOptions.level.toUpperCase())
       if (constants.LOG_PRIORITIES.indexOf(type) > logPriority) return
     }
     if (!helper.isString(log)) {
@@ -82,7 +101,7 @@ var BaseReporter = function (formatError, reportSlow, useColors, browserConsoleL
     }
   }
 
-  this.onSpecComplete = function (browser, result) {
+  this.onSpecComplete = (browser, result) => {
     if (result.skipped) {
       this.specSkipped(browser, result)
     } else if (result.success) {
@@ -92,28 +111,31 @@ var BaseReporter = function (formatError, reportSlow, useColors, browserConsoleL
     }
 
     if (reportSlow && result.time > reportSlow) {
-      var specName = result.suite.join(' ') + ' ' + result.description
-      var time = helper.formatTimeInterval(result.time)
+      const specName = result.suite.join(' ') + ' ' + result.description
+      const time = helper.formatTimeInterval(result.time)
 
       this.writeCommonMsg(util.format(this.SPEC_SLOW, browser, time, specName))
     }
   }
 
-  this.specSuccess = this.specSkipped = function () {
+  this.specSuccess = () => {
   }
 
-  this.specFailure = function (browser, result) {
-    var specName = result.suite.join(' ') + ' ' + result.description
-    var msg = util.format(this.SPEC_FAILURE, browser, specName)
+  this.specSkipped = () => {
+  }
+
+  this.specFailure = (browser, result) => {
+    const specName = result.suite.join(' ') + ' ' + result.description
+    let msg = util.format(this.SPEC_FAILURE, browser, specName)
 
-    result.log.forEach(function (log) {
+    result.log.forEach((log) => {
       msg += formatError(log, '\t')
     })
 
     this.writeCommonMsg(msg)
   }
 
-  this.onRunComplete = function (browsers, results) {
+  this.onRunComplete = (browsers, results) => {
     if (browsers.length > 1 && !results.error && !results.disconnected) {
       if (!results.failed) {
         this.write(this.TOTAL_SUCCESS, results.success)
@@ -122,24 +144,6 @@ var BaseReporter = function (formatError, reportSlow, useColors, browserConsoleL
       }
     }
   }
-
-  this.USE_COLORS = false
-  this.EXCLUSIVELY_USE_COLORS = undefined
-  this.LOG_SINGLE_BROWSER = '%s: %s\n'
-  this.LOG_MULTI_BROWSER = '%s %s: %s\n'
-
-  this.SPEC_FAILURE = '%s %s FAILED' + '\n'
-  this.SPEC_SLOW = '%s SLOW %s: %s\n'
-  this.ERROR = '%s ERROR\n'
-
-  this.FINISHED_ERROR = ' ERROR'
-  this.FINISHED_SUCCESS = ' SUCCESS'
-  this.FINISHED_DISCONNECTED = ' DISCONNECTED'
-
-  this.X_FAILED = ' (%d FAILED)'
-
-  this.TOTAL_SUCCESS = 'TOTAL: %d SUCCESS\n'
-  this.TOTAL_FAILED = 'TOTAL: %d FAILED, %d SUCCESS\n'
 }
 
 BaseReporter.decoratorFactory = function (formatError, reportSlow, useColors, browserConsoleLogOptions) {
diff --git a/test/unit/reporters/base.spec.js b/test/unit/reporters/base.spec.js
index 38efff419..d1d6dbe3e 100644
--- a/test/unit/reporters/base.spec.js
+++ b/test/unit/reporters/base.spec.js
@@ -1,26 +1,20 @@
-var path = require('path')
+'use strict'
 
-describe('reporter', function () {
-  var loadFile = require('mocks').loadFile
-  var m = null
+describe('reporter', () => {
+  const BaseReporter = require('../../../lib/reporters/base')
 
-  beforeEach(function () {
-    m = loadFile(path.join(__dirname, '/../../../lib/reporters/base.js'))
-    return m
-  })
-
-  return describe('Progress', function () {
-    var reporter
-    var adapter = reporter = null
+  describe('Progress', () => {
+    let reporter
+    let adapter = reporter = null
 
-    beforeEach(function () {
+    beforeEach(() => {
       adapter = sinon.spy()
-      reporter = new m.BaseReporter(null, null, false, {terminal: true}, adapter)
+      reporter = new BaseReporter(null, null, false, {terminal: true}, adapter)
       return reporter
     })
 
-    it('should write to all registered adapters', function () {
-      var anotherAdapter = sinon.spy()
+    it('should write to all registered adapters', () => {
+      const anotherAdapter = sinon.spy()
       reporter.adapters.push(anotherAdapter)
 
       reporter.write('some')
@@ -28,8 +22,8 @@ describe('reporter', function () {
       return expect(anotherAdapter).to.have.been.calledWith('some')
     })
 
-    it('should omit adapters not using the right color', function () {
-      var anotherAdapter = sinon.spy()
+    it('should omit adapters not using the right color', () => {
+      const anotherAdapter = sinon.spy()
       anotherAdapter.colors = true
       reporter.EXCLUSIVELY_USE_COLORS = false
       reporter.adapters.push(anotherAdapter)
@@ -38,9 +32,9 @@ describe('reporter', function () {
       return expect(anotherAdapter).to.not.have.been.called
     })
 
-    it('should not call non-colored adapters when wrong default setting', function () {
-      var reporter = new m.BaseReporter(null, null, true, {}, adapter)
-      var anotherAdapter = sinon.spy()
+    it('should not call non-colored adapters when wrong default setting', () => {
+      const reporter = new BaseReporter(null, null, true, {}, adapter)
+      const anotherAdapter = sinon.spy()
       reporter.adapters.push(anotherAdapter)
       reporter.EXCLUSIVELY_USE_COLORS = false
       reporter.write('some')
@@ -48,9 +42,9 @@ describe('reporter', function () {
       return expect(anotherAdapter).to.not.have.been.called
     })
 
-    it('should call colored adapters regardless of default setting', function () {
-      var reporter = new m.BaseReporter(null, null, true, {}, adapter)
-      var anotherAdapter = sinon.spy()
+    it('should call colored adapters regardless of default setting', () => {
+      const reporter = new BaseReporter(null, null, true, {}, adapter)
+      const anotherAdapter = sinon.spy()
       reporter.adapters.push(anotherAdapter)
       reporter.EXCLUSIVELY_USE_COLORS = false
       adapter.colors = false
@@ -59,8 +53,8 @@ describe('reporter', function () {
       return expect(anotherAdapter).to.not.have.been.called
     })
 
-    it('should call all adapters if EXCLUSIVELY_USE_COLORS is undefined', function () {
-      var anotherAdapter = sinon.spy()
+    it('should call all adapters if EXCLUSIVELY_USE_COLORS is undefined', () => {
+      const anotherAdapter = sinon.spy()
       anotherAdapter.colors = true
       reporter.adapters.push(anotherAdapter)
       reporter.write('some')
@@ -68,14 +62,14 @@ describe('reporter', function () {
       expect(anotherAdapter).to.have.been.calledWith('some')
     })
 
-    it('should format', function () {
+    it('should format', () => {
       reporter.write('Success: %d Failure: %d', 10, 20)
 
       return expect(adapter).to.have.been.calledWith('Success: 10 Failure: 20')
     })
 
-    it('should format log messages correctly for single browser', function () {
-      var writeSpy = sinon.spy(reporter, 'writeCommonMsg')
+    it('should format log messages correctly for single browser', () => {
+      const writeSpy = sinon.spy(reporter, 'writeCommonMsg')
 
       reporter._browsers = ['Chrome']
       reporter.onBrowserLog('Chrome', 'Message', 'LOG')
@@ -83,12 +77,12 @@ describe('reporter', function () {
       return expect(writeSpy).to.have.been.calledWith('LOG: Message\n')
     })
 
-    it('should not log if lower priority than browserConsoleLogOptions "error"', function () {
-      var reporter = new m.BaseReporter(null, null, true, {
+    it('should not log if lower priority than browserConsoleLogOptions "error"', () => {
+      const reporter = new BaseReporter(null, null, true, {
         level: 'error',
         terminal: true
       }, adapter)
-      var writeSpy = sinon.spy(reporter, 'writeCommonMsg')
+      const writeSpy = sinon.spy(reporter, 'writeCommonMsg')
 
       reporter._browsers = ['Chrome']
       reporter.onBrowserLog('Chrome', 'Message', 'WARN')
@@ -96,12 +90,12 @@ describe('reporter', function () {
       return writeSpy.should.have.not.been.called
     })
 
-    it('should not log if lower priority than browserConsoleLogOptions "warn"', function () {
-      var reporter = new m.BaseReporter(null, null, true, {
+    it('should not log if lower priority than browserConsoleLogOptions "warn"', () => {
+      const reporter = new BaseReporter(null, null, true, {
         level: 'warn',
         terminal: true
       }, adapter)
-      var writeSpy = sinon.spy(reporter, 'writeCommonMsg')
+      const writeSpy = sinon.spy(reporter, 'writeCommonMsg')
 
       reporter._browsers = ['Chrome']
       reporter.onBrowserLog('Chrome', 'Message', 'LOG')
@@ -109,12 +103,12 @@ describe('reporter', function () {
       return writeSpy.should.have.not.been.called
     })
 
-    it('should not log if lower priority than browserConsoleLogOptions "log"', function () {
-      var reporter = new m.BaseReporter(null, null, true, {
+    it('should not log if lower priority than browserConsoleLogOptions "log"', () => {
+      const reporter = new BaseReporter(null, null, true, {
         level: 'log',
         terminal: true
       }, adapter)
-      var writeSpy = sinon.spy(reporter, 'writeCommonMsg')
+      const writeSpy = sinon.spy(reporter, 'writeCommonMsg')
 
       reporter._browsers = ['Chrome']
       reporter.onBrowserLog('Chrome', 'Message', 'INFO')
@@ -122,12 +116,12 @@ describe('reporter', function () {
       return writeSpy.should.have.not.been.called
     })
 
-    it('should not log if lower priority than browserConsoleLogOptions "info"', function () {
-      var reporter = new m.BaseReporter(null, null, true, {
+    it('should not log if lower priority than browserConsoleLogOptions "info"', () => {
+      const reporter = new BaseReporter(null, null, true, {
         level: 'info',
         terminal: true
       }, adapter)
-      var writeSpy = sinon.spy(reporter, 'writeCommonMsg')
+      const writeSpy = sinon.spy(reporter, 'writeCommonMsg')
 
       reporter._browsers = ['Chrome']
       reporter.onBrowserLog('Chrome', 'Message', 'DEBUG')
@@ -135,12 +129,12 @@ describe('reporter', function () {
       return writeSpy.should.have.not.been.called
     })
 
-    it('should log if higher priority than browserConsoleLogOptions "warn"', function () {
-      var reporter = new m.BaseReporter(null, null, true, {
+    it('should log if higher priority than browserConsoleLogOptions "warn"', () => {
+      const reporter = new BaseReporter(null, null, true, {
         level: 'warn',
         terminal: true
       }, adapter)
-      var writeSpy = sinon.spy(reporter, 'writeCommonMsg')
+      const writeSpy = sinon.spy(reporter, 'writeCommonMsg')
 
       reporter._browsers = ['Chrome']
       reporter.onBrowserLog('Chrome', 'Message', 'ERROR')
@@ -148,12 +142,12 @@ describe('reporter', function () {
       return writeSpy.should.have.been.called
     })
 
-    it('should log if higher priority than browserConsoleLogOptions "log"', function () {
-      var reporter = new m.BaseReporter(null, null, true, {
+    it('should log if higher priority than browserConsoleLogOptions "log"', () => {
+      const reporter = new BaseReporter(null, null, true, {
         level: 'log',
         terminal: true
       }, adapter)
-      var writeSpy = sinon.spy(reporter, 'writeCommonMsg')
+      const writeSpy = sinon.spy(reporter, 'writeCommonMsg')
 
       reporter._browsers = ['Chrome']
       reporter.onBrowserLog('Chrome', 'Message', 'WARN')
@@ -161,12 +155,12 @@ describe('reporter', function () {
       return writeSpy.should.have.been.called
     })
 
-    it('should log if higher priority than browserConsoleLogOptions "info"', function () {
-      var reporter = new m.BaseReporter(null, null, true, {
+    it('should log if higher priority than browserConsoleLogOptions "info"', () => {
+      const reporter = new BaseReporter(null, null, true, {
         level: 'info',
         terminal: true
       }, adapter)
-      var writeSpy = sinon.spy(reporter, 'writeCommonMsg')
+      const writeSpy = sinon.spy(reporter, 'writeCommonMsg')
 
       reporter._browsers = ['Chrome']
       reporter.onBrowserLog('Chrome', 'Message', 'LOG')
@@ -174,12 +168,12 @@ describe('reporter', function () {
       return writeSpy.should.have.been.called
     })
 
-    it('should log if higher priority than browserConsoleLogOptions "debug"', function () {
-      var reporter = new m.BaseReporter(null, null, true, {
+    it('should log if higher priority than browserConsoleLogOptions "debug"', () => {
+      const reporter = new BaseReporter(null, null, true, {
         level: 'debug',
         terminal: true
       }, adapter)
-      var writeSpy = sinon.spy(reporter, 'writeCommonMsg')
+      const writeSpy = sinon.spy(reporter, 'writeCommonMsg')
 
       reporter._browsers = ['Chrome']
       reporter.onBrowserLog('Chrome', 'Message', 'INFO')
@@ -187,8 +181,8 @@ describe('reporter', function () {
       return writeSpy.should.have.been.called
     })
 
-    return it('should format log messages correctly for multi browsers', function () {
-      var writeSpy = sinon.spy(reporter, 'writeCommonMsg')
+    return it('should format log messages correctly for multi browsers', () => {
+      const writeSpy = sinon.spy(reporter, 'writeCommonMsg')
 
       reporter._browsers = ['Chrome', 'Firefox']
       reporter.onBrowserLog('Chrome', 'Message', 'LOG')

From c1526a1add26c9d4caaf39237171204d6cf20e89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Usarz?= <lukasz.usarz@gmail.com>
Date: Fri, 25 May 2018 17:03:56 +0200
Subject: [PATCH 28/50] refactor(reporter): update lib/reporter/multi.js to ES6
 (#3018)

---
 lib/reporters/multi.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/reporters/multi.js b/lib/reporters/multi.js
index eba03f6a3..482b1a4aa 100644
--- a/lib/reporters/multi.js
+++ b/lib/reporters/multi.js
@@ -1,18 +1,19 @@
-var helper = require('../helper')
+'use strict'
 
-var MultiReporter = function (reporters) {
-  this.addAdapter = function (adapter) {
-    reporters.forEach(function (reporter) {
-      reporter.adapters.push(adapter)
-    })
+const helper = require('../helper')
+
+class MultiReporter {
+  constructor (reporters) {
+    this._reporters = reporters
+  }
+
+  addAdapter (adapter) {
+    this._reporters.forEach((reporter) => reporter.adapters.push(adapter))
   }
 
-  this.removeAdapter = function (adapter) {
-    reporters.forEach(function (reporter) {
-      helper.arrayRemove(reporter.adapters, adapter)
-    })
+  removeAdapter (adapter) {
+    this._reporters.forEach((reporter) => helper.arrayRemove(reporter.adapters, adapter))
   }
 }
 
-// PUBLISH
 module.exports = MultiReporter

From 65b658a8ba33831c1cf22e56bf484f42da232617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Kapalla?= <pkapalla@xesenix.pl>
Date: Mon, 28 May 2018 17:47:19 +0200
Subject: [PATCH 29/50] fix(common): stringify error on 'Cannot convert a
 Symbol value to a string' (#2990)

Fixes #2856
---
 common/stringify.js           | 2 ++
 test/client/stringify.spec.js | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/common/stringify.js b/common/stringify.js
index 192a4847a..aece384d3 100644
--- a/common/stringify.js
+++ b/common/stringify.js
@@ -14,6 +14,8 @@ var stringify = function stringify (obj, depth) {
   }
 
   switch (typeof obj) {
+    case 'symbol':
+      return obj.toString()
     case 'string':
       return "'" + obj + "'"
     case 'undefined':
diff --git a/test/client/stringify.spec.js b/test/client/stringify.spec.js
index e51c85d37..19bceab4e 100644
--- a/test/client/stringify.spec.js
+++ b/test/client/stringify.spec.js
@@ -4,6 +4,10 @@ var assert = require('assert')
 var stringify = require('../../common/stringify')
 
 describe('stringify', function () {
+  it('should serialize symbols', function () {
+    assert.deepEqual(stringify(Symbol.for('x')), 'Symbol(x)')
+  })
+
   it('should serialize string', function () {
     assert.deepEqual(stringify('aaa'), "'aaa'")
   })

From 538081c462dc35ee05f07dd53555451f51dc4178 Mon Sep 17 00:00:00 2001
From: johnjbarton <johnjbarton@johnjbarton.com>
Date: Tue, 29 May 2018 09:19:07 -0700
Subject: [PATCH 30/50] fix(stringify): guard Symobl from IE (#3023)

---
 test/client/stringify.spec.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/test/client/stringify.spec.js b/test/client/stringify.spec.js
index 19bceab4e..45a91c289 100644
--- a/test/client/stringify.spec.js
+++ b/test/client/stringify.spec.js
@@ -4,9 +4,13 @@ var assert = require('assert')
 var stringify = require('../../common/stringify')
 
 describe('stringify', function () {
-  it('should serialize symbols', function () {
-    assert.deepEqual(stringify(Symbol.for('x')), 'Symbol(x)')
-  })
+  if (window && window.Symbol) {
+    // IE does not support Symbol
+    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Symbol
+    it('should serialize symbols', function () {
+      assert.deepEqual(stringify(Symbol.for('x')), 'Symbol(x)')
+    })
+  }
 
   it('should serialize string', function () {
     assert.deepEqual(stringify('aaa'), "'aaa'")

From 36b550f0634a36579aadf3cd3372bfc327ab23b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Usarz?= <lukasz.usarz@gmail.com>
Date: Tue, 29 May 2018 18:20:13 +0200
Subject: [PATCH 31/50] refactor: update eslint configuration (#3020)

---
 .eslintrc                      |  3 ++-
 lib/config.js                  |  2 +-
 lib/init.js                    |  6 +++---
 lib/launcher.js                |  2 +-
 lib/logger.js                  |  4 ++--
 lib/reporter.js                |  2 +-
 lib/server.js                  |  2 +-
 lib/watcher.js                 | 16 ++++++++--------
 package.json                   |  3 ++-
 test/unit/preprocessor.spec.js |  2 +-
 test/unit/server.spec.js       |  2 +-
 11 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 4a60c0ebe..48e539e81 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,7 @@
 {
   "extends": "standard",
   "rules": {
-    "arrow-parens": [2, "always"]
+    "arrow-parens": [2, "always"],
+    "space-before-function-paren": ["error", "always"]
   }
 }
diff --git a/lib/config.js b/lib/config.js
index cd60dc078..488ae41fe 100644
--- a/lib/config.js
+++ b/lib/config.js
@@ -431,7 +431,7 @@ function parseConfig (configFilePath, cliOptions) {
   if (config.hostname === null && config.listenAddress !== null) {
     log.warn('ListenAddress was set to %s but hostname was left as the default: ' +
       '%s. If your browsers fail to connect, consider changing the hostname option.',
-      config.listenAddress, defaultHostname)
+    config.listenAddress, defaultHostname)
   }
   // restore values that weren't overwritten by the user
   if (config.hostname === null) {
diff --git a/lib/init.js b/lib/init.js
index 0eef4f03e..f8fae6055 100755
--- a/lib/init.js
+++ b/lib/init.js
@@ -123,7 +123,7 @@ var questions = [{
   hint: 'This will generate test-main.js/coffee that configures RequireJS and starts the tests.',
   options: ['no', 'yes'],
   boolean: true,
-  condition: answers => answers.requirejs
+  condition: (answers) => answers.requirejs
 }, {
   id: 'includedFiles',
   question: 'Which files do you want to include with <script> tag ?',
@@ -132,7 +132,7 @@ var questions = [{
     'Enter empty string to move to the next question.',
   multiple: true,
   validate: validatePattern,
-  condition: answers => answers.requirejs && !answers.generateTestMain
+  condition: (answers) => answers.requirejs && !answers.generateTestMain
 }, {
   id: 'autoWatch',
   question: 'Do you want Karma to watch all the files and run the tests on change ?',
@@ -191,7 +191,7 @@ function processAnswers (answers, basePath, testMainFile) {
   }
 
   const allPatterns = answers.files.concat(answers.includedFiles || [])
-  if (allPatterns.some(pattern => mm(pattern, '**/*.coffee'))) {
+  if (allPatterns.some((pattern) => mm(pattern, '**/*.coffee'))) {
     installPackage('karma-coffee-preprocessor')
     processedAnswers.preprocessors['**/*.coffee'] = ['coffee']
   }
diff --git a/lib/launcher.js b/lib/launcher.js
index 56292e1bf..84b5cce16 100644
--- a/lib/launcher.js
+++ b/lib/launcher.js
@@ -43,7 +43,7 @@ var Launcher = function (server, emitter, injector) {
   this.launchSingle = function (protocol, hostname, port, urlRoot, upstreamProxy, processKillTimeout) {
     var self = this
     return function (name) {
-      name = (name + '').trim();
+      name = (name + '').trim()
       if (upstreamProxy) {
         protocol = upstreamProxy.protocol
         hostname = upstreamProxy.hostname
diff --git a/lib/logger.js b/lib/logger.js
index d029b831d..cd8783ab4 100644
--- a/lib/logger.js
+++ b/lib/logger.js
@@ -45,7 +45,7 @@ var setup = function (level, colors, appenders) {
       })
     }
   } else {
-    appenders = {'console' : constant.CONSOLE_APPENDER}
+    appenders = {'console': constant.CONSOLE_APPENDER}
   }
 
   log4js.configure({
@@ -110,6 +110,6 @@ var create = function (name, level) {
 exports.create = create
 exports.setup = setup
 exports.setupFromConfig = setupFromConfig
-exports._rebindLog4js4testing = function(mockLog4js) {
+exports._rebindLog4js4testing = function (mockLog4js) {
   log4js = mockLog4js
 }
diff --git a/lib/reporter.js b/lib/reporter.js
index 50ee65256..752c14f69 100644
--- a/lib/reporter.js
+++ b/lib/reporter.js
@@ -79,7 +79,7 @@ var createErrorFormatter = function (config, emitter, SourceMapConsumer) {
           var sourcePath = resolve(path, original.source)
           var formattedColumn = column ? util.format(':%s', column) : ''
           return util.format('%s:%d:%d <- %s:%d%s', sourcePath, original.line, original.column,
-              path, line, formattedColumn)
+            path, line, formattedColumn)
         } catch (e) {
           log.warn('SourceMap position not found for trace: %s', msg)
           // Fall back to non-source-mapped formatting.
diff --git a/lib/server.js b/lib/server.js
index c05e0976d..c9d52ddf2 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -75,7 +75,7 @@ var Server = function (cliOptions, done) {
   Object.keys(EventEmitter.prototype).forEach(function (method) {
     this[method] = EventEmitter.prototype[method]
   }, this)
-  
+
   this.bind = KarmaEventEmitter.prototype.bind.bind(this)
   this.emitAsync = KarmaEventEmitter.prototype.emitAsync.bind(this)
 
diff --git a/lib/watcher.js b/lib/watcher.js
index 0af95c0e5..8f4c1ea2b 100644
--- a/lib/watcher.js
+++ b/lib/watcher.js
@@ -21,12 +21,12 @@ function watchPatterns (patterns, watcher) {
 
   // expand ['a/{b,c}'] to ['a/b', 'a/c']
   expandBraces(patterns)
-    .forEach(path => pathsToWatch.add(baseDirFromPattern(path)))
+    .forEach((path) => pathsToWatch.add(baseDirFromPattern(path)))
 
   pathsToWatch = Array.from(pathsToWatch)
   // watch only common parents, no sub paths
-  pathsToWatch.forEach(path => {
-    if (!pathsToWatch.some(p => p !== path && path.substr(0, p.length + 1) === p + DIR_SEP)) {
+  pathsToWatch.forEach((path) => {
+    if (!pathsToWatch.some((p) => p !== path && path.substr(0, p.length + 1) === p + DIR_SEP)) {
       watcher.add(path)
       log.debug('Watching "%s"', path)
     }
@@ -34,7 +34,7 @@ function watchPatterns (patterns, watcher) {
 }
 
 function checkAnyPathMatch (patterns, path) {
-  return patterns.some(pattern => mm(path, pattern, {dot: true}))
+  return patterns.some((pattern) => mm(path, pattern, {dot: true}))
 }
 
 function createIgnore (patterns, excludes) {
@@ -70,12 +70,12 @@ exports.watch = function (patterns, excludes, fileList, usePolling, emitter) {
   watchPatterns(watchedPatterns, watcher)
 
   watcher
-    .on('add', path => fileList.addFile(helper.normalizeWinPath(path)))
-    .on('change', path => fileList.changeFile(helper.normalizeWinPath(path)))
-    .on('unlink', path => fileList.removeFile(helper.normalizeWinPath(path)))
+    .on('add', (path) => fileList.addFile(helper.normalizeWinPath(path)))
+    .on('change', (path) => fileList.changeFile(helper.normalizeWinPath(path)))
+    .on('unlink', (path) => fileList.removeFile(helper.normalizeWinPath(path)))
     .on('error', log.debug.bind(log))
 
-  emitter.on('exit', done => {
+  emitter.on('exit', (done) => {
     watcher.close()
     done()
   })
diff --git a/package.json b/package.json
index 6173bcfac..266cc4c38 100644
--- a/package.json
+++ b/package.json
@@ -455,7 +455,8 @@
   "version": "2.0.2",
   "license": "MIT",
   "scripts": {
-    "lint": "eslint client/**/*.js common/**/*.js context/**/*.js gruntfile.js wallaby.js lib/**/*.js test/unit/**/*.js test/client/*.js test/e2e/**/*.js static/debug.js",
+    "lint": "eslint . --ext js --ignore-pattern *.tpl.js",
+    "lint:fix": "eslint . --ext js --ignore-pattern *.tpl.js --fix",
     "test": "grunt test",
     "build": "grunt build",
     "test:appveyor": "grunt test-appveyor",
diff --git a/test/unit/preprocessor.spec.js b/test/unit/preprocessor.spec.js
index cddca6c68..e0f4a48c0 100644
--- a/test/unit/preprocessor.spec.js
+++ b/test/unit/preprocessor.spec.js
@@ -64,7 +64,7 @@ describe('preprocessor', () => {
     })
 
     var injector = new di.Injector([{
-      'preprocessor:fake': ['factory', function () { return fakePreprocessor } ]
+      'preprocessor:fake': ['factory', function () { return fakePreprocessor }]
     }, emitterSetting])
     pp = m.createPreprocessor({'**/*.js': ['fake']}, null, injector)
 
diff --git a/test/unit/server.spec.js b/test/unit/server.spec.js
index a16a8ad83..e5fdcc24f 100644
--- a/test/unit/server.spec.js
+++ b/test/unit/server.spec.js
@@ -93,7 +93,7 @@ describe('server', () => {
         callback && callback()
       }),
       removeAllListeners: () => {},
-      close: sinon.spy(callback => callback && callback())
+      close: sinon.spy((callback) => callback && callback())
     }
 
     sinon.stub(server._injector, 'get')

From 0ca3a26acd16e3edfe0afd1133de9a636db0428c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Usarz?= <lukasz.usarz@gmail.com>
Date: Wed, 30 May 2018 16:46:09 +0200
Subject: [PATCH 32/50] refactor: refactor lib/reporter in to ES6 (#3021)

---
 lib/reporter.js         | 140 ++++++++++++++++------------------------
 lib/utils/path-utils.js |   9 +++
 2 files changed, 66 insertions(+), 83 deletions(-)
 create mode 100644 lib/utils/path-utils.js

diff --git a/lib/reporter.js b/lib/reporter.js
index 752c14f69..8b70f288c 100644
--- a/lib/reporter.js
+++ b/lib/reporter.js
@@ -1,31 +1,24 @@
-var util = require('util')
-var resolve = require('url').resolve
-var SourceMapConsumer = require('source-map').SourceMapConsumer
-var _ = require('lodash')
+'use strict'
 
-var log = require('./logger').create('reporter')
-var MultiReporter = require('./reporters/multi')
-var baseReporterDecoratorFactory = require('./reporters/base').decoratorFactory
+const resolve = require('url').resolve
+const SourceMapConsumer = require('source-map').SourceMapConsumer
+const _ = require('lodash')
 
-var createErrorFormatter = function (config, emitter, SourceMapConsumer) {
-  var basePath = config.basePath
-  var urlRoot = config.urlRoot === '/' ? '' : (config.urlRoot || '')
-  var lastServedFiles = []
+const PathUtils = require('./utils/path-utils')
+const log = require('./logger').create('reporter')
+const MultiReporter = require('./reporters/multi')
+const baseReporterDecoratorFactory = require('./reporters/base').decoratorFactory
 
-  emitter.on('file_list_modified', function (files) {
+function createErrorFormatter (config, emitter, SourceMapConsumer) {
+  const basePath = config.basePath
+  const urlRoot = config.urlRoot === '/' ? '' : (config.urlRoot || '')
+  let lastServedFiles = []
+
+  emitter.on('file_list_modified', (files) => {
     lastServedFiles = files.served
   })
 
-  var findFile = function (path) {
-    for (var i = 0; i < lastServedFiles.length; i++) {
-      if (lastServedFiles[i].path === path) {
-        return lastServedFiles[i]
-      }
-    }
-    return null
-  }
-
-  var URL_REGEXP = new RegExp('(?:https?:\\/\\/' +
+  const URL_REGEXP = new RegExp('(?:https?:\\/\\/' +
     config.hostname + '(?:\\:' + config.port + ')?' + ')?\\/?' +
     urlRoot + '\\/?' +
     '(base/|absolute)' + // prefix, including slash for base/ to create relative paths.
@@ -35,15 +28,14 @@ var createErrorFormatter = function (config, emitter, SourceMapConsumer) {
     '(\\:(\\d+))?' + // column
     '', 'g')
 
-  var getSourceMapConsumer = (function () {
-    var cache = new WeakMap()
-    return function (sourceMap) {
-      if (!cache.has(sourceMap)) {
-        cache.set(sourceMap, new SourceMapConsumer(sourceMap))
-      }
-      return cache.get(sourceMap)
+  const cache = new WeakMap()
+
+  function getSourceMapConsumer (sourceMap) {
+    if (!cache.has(sourceMap)) {
+      cache.set(sourceMap, new SourceMapConsumer(sourceMap))
     }
-  }())
+    return cache.get(sourceMap)
+  }
 
   return function (input, indentation) {
     indentation = _.isString(indentation) ? indentation : ''
@@ -55,69 +47,56 @@ var createErrorFormatter = function (config, emitter, SourceMapConsumer) {
       input = JSON.stringify(input, null, indentation)
     }
 
-    // remove domain and timestamp from source files
-    // and resolve base path / absolute path urls into absolute path
     var msg = input.replace(URL_REGEXP, function (_, prefix, path, __, ___, line, ____, column) {
-      // Find the file using basePath + path, but use the more readable path down below.
-      var file = findFile(prefix === 'base/' ? basePath + '/' + path : path)
+      const normalizedPath = prefix === 'base/' ? `${basePath}/${path}` : path
+      const file = lastServedFiles.find((file) => file.path === normalizedPath)
 
       if (file && file.sourceMap && line) {
-        line = parseInt(line || '0', 10)
-
-        column = parseInt(column, 10)
+        line = +line
+        column = +column
 
         // When no column is given and we default to 0, it doesn't make sense to only search for smaller
         // or equal columns in the sourcemap, let's search for equal or greater columns.
-        var bias = column ? SourceMapConsumer.GREATEST_LOWER_BOUND : SourceMapConsumer.LEAST_UPPER_BOUND
+        const bias = column ? SourceMapConsumer.GREATEST_LOWER_BOUND : SourceMapConsumer.LEAST_UPPER_BOUND
 
         try {
-          var original = getSourceMapConsumer(file.sourceMap)
-            .originalPositionFor({line: line, column: (column || 0), bias: bias})
+          const original = getSourceMapConsumer(file.sourceMap).originalPositionFor({ line, column: (column || 0), bias })
 
           // Source maps often only have a local file name, resolve to turn into a full path if
           // the path is not absolute yet.
-          var sourcePath = resolve(path, original.source)
-          var formattedColumn = column ? util.format(':%s', column) : ''
-          return util.format('%s:%d:%d <- %s:%d%s', sourcePath, original.line, original.column,
-            path, line, formattedColumn)
+          return `${PathUtils.formatPathMapping(resolve(path, original.source), original.line, original.column)} <- ${PathUtils.formatPathMapping(path, line, column)}`
         } catch (e) {
-          log.warn('SourceMap position not found for trace: %s', msg)
-          // Fall back to non-source-mapped formatting.
+          log.warn(`SourceMap position not found for trace: ${input}`)
         }
       }
 
-      var result = path + (line ? ':' + line : '') + (column ? ':' + column : '')
-      return result || prefix
+      return PathUtils.formatPathMapping(path, line, column) || prefix
     })
 
-    // indent every line
     if (indentation) {
       msg = indentation + msg.replace(/\n/g, '\n' + indentation)
     }
 
-    // allow the user to format the error
-    if (config.formatError) {
-      return config.formatError(msg)
-    }
-
-    return msg + '\n'
+    return config.formatError ? config.formatError(msg) : msg + '\n'
   }
 }
 
-var createReporters = function (names, config, emitter, injector) {
-  var errorFormatter = createErrorFormatter(config, emitter, SourceMapConsumer)
-  var reporters = []
+function createReporters (names, config, emitter, injector) {
+  const errorFormatter = createErrorFormatter(config, emitter, SourceMapConsumer)
+  const reporters = []
 
-  // TODO(vojta): instantiate all reporters through DI
-  names.forEach(function (name) {
+  names.forEach((name) => {
     if (['dots', 'progress'].indexOf(name) !== -1) {
-      var Cls = require('./reporters/' + name)
-      var ClsColor = require('./reporters/' + name + '_color')
-      reporters.push(new Cls(errorFormatter, config.reportSlowerThan, config.colors, config.browserConsoleLogOptions))
-      return reporters.push(new ClsColor(errorFormatter, config.reportSlowerThan, config.colors, config.browserConsoleLogOptions))
+      [
+        require('./reporters/' + name),
+        require('./reporters/' + name + '_color')
+      ].forEach((Reporter) => {
+        reporters.push(new Reporter(errorFormatter, config.reportSlowerThan, config.colors, config.browserConsoleLogOptions))
+      })
+      return
     }
 
-    var locals = {
+    const locals = {
       baseReporterDecorator: ['factory', baseReporterDecoratorFactory],
       formatError: ['value', errorFormatter]
     }
@@ -126,31 +105,27 @@ var createReporters = function (names, config, emitter, injector) {
       log.debug('Trying to load reporter: %s', name)
       reporters.push(injector.createChild([locals], ['reporter:' + name]).get('reporter:' + name))
     } catch (e) {
-      if (e.message.indexOf('No provider for "reporter:' + name + '"') !== -1) {
-        log.error('Can not load reporter "%s", it is not registered!\n  ' +
-          'Perhaps you are missing some plugin?', name)
+      if (e.message.indexOf(`No provider for "reporter:${name}"`) !== -1) {
+        log.error(`Can not load reporter "${name}", it is not registered!\n  Perhaps you are missing some plugin?`)
       } else {
-        log.error('Can not load "%s"!\n  ' + e.stack, name)
+        log.error(`Can not load "${name}"!\n ${e.stack}`)
       }
       emitter.emit('load_error', 'reporter', name)
       return
     }
-    var colorName = name + '_color'
-    if (names.indexOf(colorName) !== -1) {
-      return
-    }
-    try {
-      log.debug('Trying to load color-version of reporter: %s (%s)', name, colorName)
-      reporters.push(injector.createChild([locals], ['reporter:' + name + '_color']).get('reporter:' + name))
-    } catch (e) {
-      log.debug('Couldn\'t load color-version.')
+
+    const colorName = name + '_color'
+    if (names.indexOf(colorName) === -1) {
+      try {
+        log.debug(`Trying to load color-version of reporter: ${name} (${colorName})`)
+        reporters.push(injector.createChild([locals], ['reporter:' + colorName]).get('reporter:' + name))
+      } catch (e) {
+        log.debug('Couldn\'t load color-version.')
+      }
     }
   })
 
-  // bind all reporters
-  reporters.forEach(function (reporter) {
-    emitter.bind(reporter)
-  })
+  reporters.forEach((reporter) => emitter.bind(reporter))
 
   return new MultiReporter(reporters)
 }
@@ -162,5 +137,4 @@ createReporters.$inject = [
   'injector'
 ]
 
-// PUBLISH
 exports.createReporters = createReporters
diff --git a/lib/utils/path-utils.js b/lib/utils/path-utils.js
new file mode 100644
index 000000000..0990e9168
--- /dev/null
+++ b/lib/utils/path-utils.js
@@ -0,0 +1,9 @@
+'use strict'
+
+const PathUtils = {
+  formatPathMapping (path, line, column) {
+    return path + (line ? `:${line}` : '') + (column ? `:${column}` : '')
+  }
+}
+
+module.exports = PathUtils

From f5cda4d40d7a35f234bfd17da7319e3c93d5a1c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Usarz?= <lukasz.usarz@gmail.com>
Date: Thu, 31 May 2018 01:34:25 +0200
Subject: [PATCH 33/50] refactor: Update lib/launcher to ES6 (#3014)

---
 lib/launcher.js            | 200 +++++++++++++------------------------
 test/unit/launcher.spec.js |   6 +-
 2 files changed, 72 insertions(+), 134 deletions(-)

diff --git a/lib/launcher.js b/lib/launcher.js
index 84b5cce16..f0fde7054 100644
--- a/lib/launcher.js
+++ b/lib/launcher.js
@@ -1,16 +1,17 @@
-var Promise = require('bluebird')
-var Jobs = require('qjobs')
+'use strict'
 
-var helper = require('./helper')
-var log = require('./logger').create('launcher')
+const Promise = require('bluebird')
+const Jobs = require('qjobs')
 
-var baseDecorator = require('./launchers/base').decoratorFactory
-var captureTimeoutDecorator = require('./launchers/capture_timeout').decoratorFactory
-var retryDecorator = require('./launchers/retry').decoratorFactory
-var processDecorator = require('./launchers/process').decoratorFactory
+const log = require('./logger').create('launcher')
+
+const baseDecorator = require('./launchers/base').decoratorFactory
+const captureTimeoutDecorator = require('./launchers/capture_timeout').decoratorFactory
+const retryDecorator = require('./launchers/retry').decoratorFactory
+const processDecorator = require('./launchers/process').decoratorFactory
 
 // TODO(vojta): remove once nobody uses it
-var baseBrowserDecoratorFactory = function (
+const baseBrowserDecoratorFactory = function (
   baseLauncherDecorator,
   captureTimeoutLauncherDecorator,
   retryLauncherDecorator,
@@ -25,34 +26,22 @@ var baseBrowserDecoratorFactory = function (
   }
 }
 
-var Launcher = function (server, emitter, injector) {
+function Launcher (server, emitter, injector) {
   this._browsers = []
-  var lastStartTime
-  var self = this
-
-  var getBrowserById = function (id) {
-    for (var i = 0; i < self._browsers.length; i++) {
-      if (self._browsers[i].id === id) {
-        return self._browsers[i]
-      }
-    }
+  let lastStartTime
 
-    return null
-  }
+  const getBrowserById = (id) => this._browsers.find((browser) => browser.id === id)
 
-  this.launchSingle = function (protocol, hostname, port, urlRoot, upstreamProxy, processKillTimeout) {
-    var self = this
-    return function (name) {
-      name = (name + '').trim()
-      if (upstreamProxy) {
-        protocol = upstreamProxy.protocol
-        hostname = upstreamProxy.hostname
-        port = upstreamProxy.port
-        urlRoot = upstreamProxy.path + urlRoot.substr(1)
-      }
-      var url = protocol + '//' + hostname + ':' + port + urlRoot
+  this.launchSingle = (protocol, hostname, port, urlRoot, upstreamProxy, processKillTimeout) => {
+    if (upstreamProxy) {
+      protocol = upstreamProxy.protocol
+      hostname = upstreamProxy.hostname
+      port = upstreamProxy.port
+      urlRoot = upstreamProxy.path + urlRoot.substr(1)
+    }
 
-      var locals = {
+    return (name) => {
+      const locals = {
         id: ['value', Launcher.generateId()],
         name: ['value', name],
         processKillTimeout: ['value', processKillTimeout],
@@ -71,81 +60,53 @@ var Launcher = function (server, emitter, injector) {
       try {
         var browser = injector.createChild([locals], ['launcher:' + name]).get('launcher:' + name)
       } catch (e) {
-        if (e.message.indexOf('No provider for "launcher:' + name + '"') !== -1) {
-          log.error('Cannot load browser "%s": it is not registered! ' +
-            'Perhaps you are missing some plugin?', name)
+        if (e.message.indexOf(`No provider for "launcher:${name}"`) !== -1) {
+          log.error(`Cannot load browser "${name}": it is not registered! Perhaps you are missing some plugin?`)
         } else {
-          log.error('Cannot load browser "%s"!\n  ' + e.stack, name)
+          log.error(`Cannot load browser "${name}"!\n  ` + e.stack)
         }
 
         emitter.emit('load_error', 'launcher', name)
         return
       }
 
-      // TODO(vojta): remove in v1.0 (BC for old launchers)
-      if (!browser.forceKill) {
-        browser.forceKill = function () {
-          var me = this
-          return new Promise(function (resolve) {
-            me.kill(resolve)
-          })
-        }
+      this.jobs.add((args, done) => {
+        log.info(`Starting browser ${browser.displayName || browser.name}`)
 
-        browser.restart = function () {
-          var me = this
-          this.kill(function () {
-            me.start(url)
-          })
-        }
-      }
+        browser.on('browser_process_failure', () => done(browser.error))
 
-      self.jobs.add(function (args, done) {
-        log.info('Starting browser %s', helper.isDefined(browser.displayName) ? browser.displayName : browser.name)
-
-        browser.on('browser_process_failure', function () {
-          done(browser.error)
+        browser.on('done', () => {
+          if (!browser.error && browser.state !== browser.STATE_RESTARTING) {
+            done(null, browser)
+          }
         })
 
-        browser.on('done', function () {
-          // We are not done if there was an error as first the retry takes
-          // place which we catch with `browser_process_failure` if it fails
-          if (browser.error || browser.state === browser.STATE_RESTARTING) return
-
-          done(null, browser)
-        })
-
-        browser.start(url)
+        browser.start(`${protocol}//${hostname}:${port}${urlRoot}`)
       }, [])
 
-      self.jobs.run()
-      self._browsers.push(browser)
+      this.jobs.run()
+      this._browsers.push(browser)
     }
   }
 
-  this.launch = function (names, concurrency) {
+  this.launch = (names, concurrency) => {
     log.info(
       'Launching browser%s %s with %s',
       names.length > 1 ? 's' : '',
       names.join(', '),
-      concurrency === Infinity ? 'unlimited concurrency' : 'concurrency ' + concurrency
+      concurrency === Infinity ? 'unlimited concurrency' : `concurrency ${concurrency}`
     )
-    this.jobs = new Jobs({maxConcurrency: concurrency})
+    this.jobs = new Jobs({ maxConcurrency: concurrency })
 
-    var self = this
     lastStartTime = Date.now()
 
-    if (server.loadErrors.length === 0) {
-      names.forEach(function (name) {
-        injector.invoke(self.launchSingle, self)(name)
-      })
+    if (server.loadErrors.length) {
+      this.jobs.add((args, done) => done(), [])
     } else {
-      // Empty task to ensure `end` is emitted
-      this.jobs.add(function (args, done) {
-        done()
-      }, [])
+      names.forEach((name) => injector.invoke(this.launchSingle, this)(name))
     }
 
-    this.jobs.on('end', function (err) {
+    this.jobs.on('end', (err) => {
       log.debug('Finished all browsers')
 
       if (err) {
@@ -155,7 +116,7 @@ var Launcher = function (server, emitter, injector) {
 
     this.jobs.run()
 
-    return self._browsers
+    return this._browsers
   }
 
   this.launch.$inject = [
@@ -173,76 +134,53 @@ var Launcher = function (server, emitter, injector) {
     'config.processKillTimeout'
   ]
 
-  this.kill = function (id, callback) {
-    var browser = getBrowserById(id)
+  this.kill = (id, callback) => {
     callback = callback || function () {}
+    const browser = getBrowserById(id)
 
-    if (!browser) {
-      process.nextTick(callback)
-      return false
+    if (browser) {
+      browser.forceKill().then(callback)
+      return true
     }
-
-    browser.forceKill().then(callback)
-    return true
+    process.nextTick(callback)
+    return false
   }
 
-  this.restart = function (id) {
-    var browser = getBrowserById(id)
-
-    if (!browser) {
-      return false
+  this.restart = (id) => {
+    const browser = getBrowserById(id)
+    if (browser) {
+      browser.restart()
+      return true
     }
-
-    browser.restart()
-    return true
+    return false
   }
 
-  this.killAll = function (callback) {
+  this.killAll = (callback) => {
+    callback = callback || function () {}
     log.debug('Disconnecting all browsers')
 
-    var remaining = 0
-    var finish = function () {
-      remaining--
-      if (!remaining && callback) {
-        callback()
-      }
-    }
-
-    if (!self._browsers.length) {
+    if (!this._browsers.length) {
       return process.nextTick(callback)
     }
 
-    self._browsers.forEach(function (browser) {
-      remaining++
-      browser.forceKill().then(finish)
-    })
+    Promise.all(
+      this._browsers
+        .map((browser) => browser.forceKill())
+    ).then(callback)
   }
 
-  this.areAllCaptured = function () {
-    return !self._browsers.some(function (browser) {
-      return !browser.isCaptured()
-    })
-  }
+  this.areAllCaptured = () => this._browsers.every((browser) => browser.isCaptured())
 
-  this.markCaptured = function (id) {
-    self._browsers.forEach(function (browser) {
-      if (browser.id === id) {
-        browser.markCaptured()
-        log.debug('%s (id %s) captured in %d secs', browser.name, browser.id,
-          (Date.now() - lastStartTime) / 1000)
-      }
-    })
+  this.markCaptured = (id) => {
+    const browser = getBrowserById(id)
+    browser.markCaptured()
+    log.debug(`${browser.name} (id ${browser.id}) captured in ${(Date.now() - lastStartTime) / 1000} secs`)
   }
 
-  // register events
   emitter.on('exit', this.killAll)
 }
 
 Launcher.$inject = ['server', 'emitter', 'injector']
+Launcher.generateId = () => Math.floor(Math.random() * 100000000).toString()
 
-Launcher.generateId = function () {
-  return '' + Math.floor(Math.random() * 100000000)
-}
-
-// PUBLISH
 exports.Launcher = Launcher
diff --git a/test/unit/launcher.spec.js b/test/unit/launcher.spec.js
index 8b69955d5..d00ffa684 100644
--- a/test/unit/launcher.spec.js
+++ b/test/unit/launcher.spec.js
@@ -1,3 +1,5 @@
+'use strict'
+
 var Promise = require('bluebird')
 var di = require('di')
 
@@ -61,9 +63,7 @@ function ScriptBrowser (id, name, baseBrowserDecorator) {
 describe('launcher', () => {
   // mock out id generator
   var lastGeneratedId = null
-  launcher.Launcher.generateId = () => {
-    return ++lastGeneratedId
-  }
+  launcher.Launcher.generateId = () => ++lastGeneratedId
 
   before(() => {
     Promise.setScheduler((fn) => fn())

From 642b17752eee00f4db775f49970e2111ab1a73df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Usarz?= <lukasz.usarz@gmail.com>
Date: Mon, 4 Jun 2018 18:14:04 +0200
Subject: [PATCH 34/50] refactor(server): update server.js to ES6 (#3027)

---
 lib/server.js | 711 ++++++++++++++++++++++----------------------------
 1 file changed, 306 insertions(+), 405 deletions(-)

diff --git a/lib/server.js b/lib/server.js
index c9d52ddf2..dad58884d 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -1,62 +1,52 @@
-var SocketIO = require('socket.io')
-var di = require('di')
-var util = require('util')
-var Promise = require('bluebird')
-var spawn = require('child_process').spawn
-var tmp = require('tmp')
-var fs = require('fs')
-var path = require('path')
-var root = global || window || this
-
-var cfg = require('./config')
-var logger = require('./logger')
-var constant = require('./constants')
-var watcher = require('./watcher')
-var plugin = require('./plugin')
-
-var ws = require('./web-server')
-var preprocessor = require('./preprocessor')
-var Launcher = require('./launcher').Launcher
-var FileList = require('./file-list')
-var reporter = require('./reporter')
-var helper = require('./helper')
-var events = require('./events')
-var KarmaEventEmitter = events.EventEmitter
-var EventEmitter = require('events').EventEmitter
-var Executor = require('./executor')
-var Browser = require('./browser')
-var BrowserCollection = require('./browser_collection')
-var EmitterWrapper = require('./emitter_wrapper')
-var processWrapper = new EmitterWrapper(process)
+'use strict'
+
+const SocketIO = require('socket.io')
+const di = require('di')
+const util = require('util')
+const Promise = require('bluebird')
+const spawn = require('child_process').spawn
+const tmp = require('tmp')
+const fs = require('fs')
+const path = require('path')
+const root = global || window || this
+
+const cfg = require('./config')
+const logger = require('./logger')
+const constant = require('./constants')
+const watcher = require('./watcher')
+const plugin = require('./plugin')
+
+const ws = require('./web-server')
+const preprocessor = require('./preprocessor')
+const Launcher = require('./launcher').Launcher
+const FileList = require('./file-list')
+const reporter = require('./reporter')
+const helper = require('./helper')
+const events = require('./events')
+const KarmaEventEmitter = events.EventEmitter
+const EventEmitter = require('events').EventEmitter
+const Executor = require('./executor')
+const Browser = require('./browser')
+const BrowserCollection = require('./browser_collection')
+const EmitterWrapper = require('./emitter_wrapper')
+const processWrapper = new EmitterWrapper(process)
 
 const karmaJsPath = path.join(__dirname, '/../static/karma.js')
 const contextJsPath = path.join(__dirname, '/../static/context.js')
 
-// Dynamic dependence on brwoserify
-var browserify = null
-
-/**
- * Bundles a static resource using Browserify.
- * @param {string} inPath the path to the file to browserify
- * @param {string} outPath the path to output the bundle to
- * @returns {Promise}
- */
 function bundleResource (inPath, outPath) {
+  const browserify = require('browserify')
   return new Promise((resolve, reject) => {
-    browserify = browserify || require('browserify')
-    var bundler = browserify(inPath)
-    bundler.bundle().pipe(fs.createWriteStream(outPath))
-      .once('finish', () => {
-        resolve()
-      })
-      .once('error', (e) => {
-        reject(e)
-      })
+    browserify(inPath)
+      .bundle()
+      .pipe(fs.createWriteStream(outPath))
+      .once('finish', () => resolve())
+      .once('error', (e) => reject(e))
   })
 }
 
 function createSocketIoServer (webServer, executor, config) {
-  var server = new SocketIO(webServer, {
+  const server = new SocketIO(webServer, {
     // avoid destroying http upgrades from socket.io to get proxied websockets working
     destroyUpgrade: false,
     path: config.urlRoot + 'socket.io/',
@@ -70,426 +60,337 @@ function createSocketIoServer (webServer, executor, config) {
   return server
 }
 
-// Constructor
-var Server = function (cliOptions, done) {
-  Object.keys(EventEmitter.prototype).forEach(function (method) {
-    this[method] = EventEmitter.prototype[method]
-  }, this)
-
-  this.bind = KarmaEventEmitter.prototype.bind.bind(this)
-  this.emitAsync = KarmaEventEmitter.prototype.emitAsync.bind(this)
-
-  logger.setupFromConfig(cliOptions)
-
-  this.log = logger.create()
-
-  this.loadErrors = []
-
-  var config = cfg.parseConfig(cliOptions.configFile, cliOptions)
-
-  var modules = [{
-    helper: ['value', helper],
-    logger: ['value', logger],
-    done: ['value', done || process.exit],
-    emitter: ['value', this],
-    server: ['value', this],
-    launcher: ['type', Launcher],
-    config: ['value', config],
-    preprocess: ['factory', preprocessor.createPreprocessor],
-    fileList: ['factory', FileList.factory],
-    webServer: ['factory', ws.create],
-    socketServer: ['factory', createSocketIoServer],
-    executor: ['factory', Executor.factory],
-    // TODO(vojta): remove
-    customFileHandlers: ['value', []],
-    // TODO(vojta): remove, once karma-dart does not rely on it
-    customScriptTypes: ['value', []],
-    reporter: ['factory', reporter.createReporters],
-    capturedBrowsers: ['factory', BrowserCollection.factory],
-    args: ['value', {}],
-    timer: ['value', {
-      setTimeout: function () {
-        return setTimeout.apply(root, arguments)
-      },
-      clearTimeout: function (timeoutId) {
-        clearTimeout(timeoutId)
-      }
+class Server extends KarmaEventEmitter {
+  constructor (cliOptions, done) {
+    super()
+    logger.setupFromConfig(cliOptions)
+
+    this.log = logger.create()
+
+    this.loadErrors = []
+
+    const config = cfg.parseConfig(cliOptions.configFile, cliOptions)
+
+    let modules = [{
+      helper: ['value', helper],
+      logger: ['value', logger],
+      done: ['value', done || process.exit],
+      emitter: ['value', this],
+      server: ['value', this],
+      launcher: ['type', Launcher],
+      config: ['value', config],
+      preprocess: ['factory', preprocessor.createPreprocessor],
+      fileList: ['factory', FileList.factory],
+      webServer: ['factory', ws.create],
+      socketServer: ['factory', createSocketIoServer],
+      executor: ['factory', Executor.factory],
+      // TODO(vojta): remove
+      customFileHandlers: ['value', []],
+      // TODO(vojta): remove, once karma-dart does not rely on it
+      customScriptTypes: ['value', []],
+      reporter: ['factory', reporter.createReporters],
+      capturedBrowsers: ['factory', BrowserCollection.factory],
+      args: ['value', {}],
+      timer: ['value', {
+        setTimeout () {
+          return setTimeout.apply(root, arguments)
+        },
+        clearTimeout
+      }]
     }]
-  }]
 
-  this._setUpLoadErrorListener()
-  // Load the plugins
-  modules = modules.concat(plugin.resolve(config.plugins, this))
-
-  this._injector = new di.Injector(modules)
-}
+    this.on('load_error', (type, name) => {
+      this.log.debug(`Registered a load error of type ${type} with name ${name}`)
+      this.loadErrors.push([type, name])
+    })
 
-// Inherit from events.EventEmitter
-util.inherits(Server, EventEmitter)
+    modules = modules.concat(plugin.resolve(config.plugins, this))
+    this._injector = new di.Injector(modules)
+  }
 
-// Public Methods
-// --------------
+  start () {
+    this._injector.invoke(this._start, this)
+  }
 
-// Start the server
-Server.prototype.start = function () {
-  this._injector.invoke(this._start, this)
-}
+  get (token) {
+    return this._injector.get(token)
+  }
 
-/**
- * Backward-compatibility with karma-intellij bundled with WebStorm.
- * Deprecated since version 0.13, to be removed in 0.14
- */
-Server.start = function (cliOptions, done) {
-  var server = new Server(cliOptions, done)
-  server.start()
-}
+  refreshFiles () {
+    return this._fileList ? this._fileList.refresh() : Promise.resolve()
+  }
 
-// Get properties from the injector
-//
-// token - String
-Server.prototype.get = function (token) {
-  return this._injector.get(token)
-}
+  _start (config, launcher, preprocess, fileList, capturedBrowsers, executor, done) {
+    if (config.detached) {
+      this._detach(config, done)
+      return
+    }
 
-// Force a refresh of the file list
-Server.prototype.refreshFiles = function () {
-  if (!this._fileList) return Promise.resolve()
+    this._fileList = fileList
 
-  return this._fileList.refresh()
-}
+    config.frameworks.forEach((framework) => this._injector.get('framework:' + framework))
 
-// Private Methods
-// ---------------
+    const webServer = this._injector.get('webServer')
+    const socketServer = this._injector.get('socketServer')
 
-Server.prototype._start = function (config, launcher, preprocess, fileList,
-  capturedBrowsers, executor, done) {
-  var self = this
-  if (config.detached) {
-    this._detach(config, done)
-    return
-  }
+    const singleRunDoneBrowsers = Object.create(null)
+    const singleRunBrowsers = new BrowserCollection(new EventEmitter())
+    let singleRunBrowserNotCaptured = false
 
-  self._fileList = fileList
+    webServer.on('error', (e) => {
+      if (e.code === 'EADDRINUSE') {
+        this.log.warn('Port %d in use', config.port)
+        config.port++
+        webServer.listen(config.port, config.listenAddress)
+      } else {
+        throw e
+      }
+    })
 
-  config.frameworks.forEach(function (framework) {
-    self._injector.get('framework:' + framework)
-  })
+    const afterPreprocess = () => {
+      if (config.autoWatch) {
+        this._injector.invoke(watcher.watch)
+      }
 
-  var webServer = self._injector.get('webServer')
-  var socketServer = self._injector.get('socketServer')
+      const startWebServer = () => {
+        webServer.listen(config.port, config.listenAddress, () => {
+          this.log.info(`Karma v${constant.VERSION} server started at ${config.protocol}//${config.listenAddress}:${config.port}${config.urlRoot}`)
+
+          this.emit('listening', config.port)
+          if (config.browsers && config.browsers.length) {
+            this._injector.invoke(launcher.launch, launcher).forEach((browserLauncher) => {
+              singleRunDoneBrowsers[browserLauncher.id] = false
+            })
+          }
+          if (this.loadErrors.length > 0) {
+            this.log.error('Found %d load error%s', this.loadErrors.length, this.loadErrors.length === 1 ? '' : 's')
+            process.exitCode = 1
+            process.kill(process.pid, 'SIGINT')
+          }
+        })
+      }
 
-  // A map of launched browsers.
-  var singleRunDoneBrowsers = Object.create(null)
+      if (fs.existsSync(karmaJsPath) && fs.existsSync(contextJsPath)) {
+        startWebServer()
+      } else {
+        this.log.info('Front-end scripts not present. Compiling...')
+        Promise.all([
+          bundleResource(path.join(__dirname, '/../client/main.js'), karmaJsPath),
+          bundleResource(path.join(__dirname, '/../context/main.js'), contextJsPath)
+        ])
+          .then(startWebServer)
+          .catch((error) => {
+            this.log.error('Front-end script compile failed with error: ' + error)
+            process.exitCode = 1
+            process.kill(process.pid, 'SIGINT')
+          })
+      }
+    }
 
-  // Passing fake event emitter, so that it does not emit on the global,
-  // we don't care about these changes.
-  var singleRunBrowsers = new BrowserCollection(new EventEmitter())
+    fileList.refresh().then(afterPreprocess, afterPreprocess)
 
-  // Some browsers did not get captured.
-  var singleRunBrowserNotCaptured = false
+    this.on('browsers_change', () => socketServer.sockets.emit('info', capturedBrowsers.serialize()))
 
-  webServer.on('error', function (e) {
-    if (e.code === 'EADDRINUSE') {
-      self.log.warn('Port %d in use', config.port)
-      config.port++
-      webServer.listen(config.port, config.listenAddress)
-    } else {
-      throw e
-    }
-  })
+    this.on('browser_register', (browser) => {
+      launcher.markCaptured(browser.id)
 
-  var afterPreprocess = function () {
-    if (config.autoWatch) {
-      self._injector.invoke(watcher.watch)
-    }
+      if (launcher.areAllCaptured()) {
+        this.emit('browsers_ready')
 
-    var startWebServer = function () {
-      webServer.listen(config.port, config.listenAddress, function () {
-        self.log.info('Karma v%s server started at %s//%s:%s%s', constant.VERSION,
-          config.protocol, config.listenAddress, config.port, config.urlRoot)
+        if (config.autoWatch) {
+          executor.schedule()
+        }
+      }
+    })
 
-        self.emit('listening', config.port)
-        if (config.browsers && config.browsers.length) {
-          self._injector.invoke(launcher.launch, launcher).forEach(function (browserLauncher) {
-            singleRunDoneBrowsers[browserLauncher.id] = false
-          })
+    if (config.browserConsoleLogOptions && config.browserConsoleLogOptions.path) {
+      const configLevel = config.browserConsoleLogOptions.level || 'debug'
+      const configFormat = config.browserConsoleLogOptions.format || '%b %T: %m'
+      const configPath = config.browserConsoleLogOptions.path
+      this.log.info(`Writing browser console to file: ${configPath}`)
+      const browserLogFile = fs.openSync(configPath, 'w+')
+      const levels = ['log', 'error', 'warn', 'info', 'debug']
+      this.on('browser_log', function (browser, message, level) {
+        if (levels.indexOf(level.toLowerCase()) > levels.indexOf(configLevel)) {
+          return
         }
-        var noLoadErrors = self.loadErrors.length
-        if (noLoadErrors > 0) {
-          self.log.error('Found %d load error%s', noLoadErrors, noLoadErrors === 1 ? '' : 's')
-          process.exitCode = 1
-          process.kill(process.pid, 'SIGINT')
+        if (!helper.isString(message)) {
+          message = util.inspect(message, { showHidden: false, colors: false })
         }
+        const logMap = {'%m': message, '%t': level.toLowerCase(), '%T': level.toUpperCase(), '%b': browser}
+        const logString = configFormat.replace(/%[mtTb]/g, (m) => logMap[m])
+        this.log.debug(`Writing browser console line: ${logString}`)
+        fs.writeSync(browserLogFile, logString + '\n')
       })
     }
 
-    // Check if the static files haven't been compiled
-    if (!(fs.existsSync(karmaJsPath) && fs.existsSync(contextJsPath))) {
-      self.log.info('Front-end scripts not present. Compiling...')
-      var mainPromise = bundleResource(path.join(__dirname, '/../client/main.js'), karmaJsPath)
-      var contextPromise = bundleResource(path.join(__dirname, '/../context/main.js'), contextJsPath)
-      Promise.all([mainPromise, contextPromise]).then(() => {
-        startWebServer()
-      }).catch((error) => {
-        self.log.error('Front-end script compile failed with error: ' + error)
-        process.exitCode = 1
-        process.kill(process.pid, 'SIGINT')
-      })
-    } else {
-      startWebServer()
-    }
-  }
-
-  fileList.refresh().then(afterPreprocess, afterPreprocess)
+    socketServer.sockets.on('connection', (socket) => {
+      this.log.debug('A browser has connected on socket ' + socket.id)
 
-  self.on('browsers_change', function () {
-    // TODO(vojta): send only to interested browsers
-    socketServer.sockets.emit('info', capturedBrowsers.serialize())
-  })
+      const replySocketEvents = events.bufferEvents(socket, ['start', 'info', 'karma_error', 'result', 'complete'])
 
-  self.on('browser_register', function (browser) {
-    launcher.markCaptured(browser.id)
+      socket.on('complete', (data, ack) => ack())
 
-    // TODO(vojta): This is lame, browser can get captured and then
-    // crash (before other browsers get captured).
-    if (launcher.areAllCaptured()) {
-      self.emit('browsers_ready')
+      socket.on('register', (info) => {
+        let newBrowser = info.id ? (capturedBrowsers.getById(info.id) || singleRunBrowsers.getById(info.id)) : null
 
-      if (config.autoWatch) {
-        executor.schedule()
-      }
-    }
-  })
+        if (newBrowser) {
+          newBrowser.reconnect(socket)
 
-  if (config.browserConsoleLogOptions && config.browserConsoleLogOptions.path) {
-    var configLevel = config.browserConsoleLogOptions.level || 'debug'
-    var configFormat = config.browserConsoleLogOptions.format || '%b %T: %m'
-    var configPath = config.browserConsoleLogOptions.path
-    self.log.info('Writing browser console to file: %s', configPath)
-    var browserLogFile = fs.openSync(configPath, 'w+')
-    var levels = ['log', 'error', 'warn', 'info', 'debug']
-    self.on('browser_log', function (browser, message, level) {
-      if (levels.indexOf(level.toLowerCase()) > levels.indexOf(configLevel)) return
-      if (!helper.isString(message)) {
-        message = util.inspect(message, {showHidden: false, colors: false})
-      }
-      var logMap = {'%m': message, '%t': level.toLowerCase(), '%T': level.toUpperCase(), '%b': browser}
-      var logString = configFormat.replace(/%[mtTb]/g, function (m) {
-        return logMap[m]
-      })
-      self.log.debug('Writing browser console line: %s', logString)
-      fs.writeSync(browserLogFile, logString + '\n')
-    })
-  }
+          // We are restarting a previously disconnected browser.
+          if (newBrowser.state === Browser.STATE_DISCONNECTED && config.singleRun) {
+            newBrowser.execute(config.client)
+          }
+        } else {
+          newBrowser = this._injector.createChild([{
+            id: ['value', info.id || null],
+            fullName: ['value', (helper.isDefined(info.displayName) ? info.displayName : info.name)],
+            socket: ['value', socket]
+          }]).invoke(Browser.factory)
 
-  var EVENTS_TO_REPLY = ['start', 'info', 'karma_error', 'result', 'complete']
-  socketServer.sockets.on('connection', function (socket) {
-    self.log.debug('A browser has connected on socket ' + socket.id)
+          newBrowser.init()
 
-    var replySocketEvents = events.bufferEvents(socket, EVENTS_TO_REPLY)
+          if (config.singleRun) {
+            newBrowser.execute(config.client)
+            singleRunBrowsers.add(newBrowser)
+          }
+        }
 
-    socket.on('complete', function (data, ack) {
-      ack()
+        replySocketEvents()
+      })
     })
 
-    socket.on('register', function (info) {
-      var newBrowser
-      var isRestart
-
-      if (info.id) {
-        newBrowser = capturedBrowsers.getById(info.id) || singleRunBrowsers.getById(info.id)
+    const emitRunCompleteIfAllBrowsersDone = () => {
+      if (Object.keys(singleRunDoneBrowsers).every((key) => singleRunDoneBrowsers[key])) {
+        const results = singleRunBrowsers.getResults()
+        if (singleRunBrowserNotCaptured) {
+          results.exitCode = 1
+        } else if (results.success + results.failed === 0 && !config.failOnEmptyTestSuite) {
+          results.exitCode = 0
+          this.log.warn('Test suite was empty.')
+        }
+        this.emit('run_complete', singleRunBrowsers, results)
       }
+    }
 
-      if (newBrowser) {
-        isRestart = newBrowser.state === Browser.STATE_DISCONNECTED
-        newBrowser.reconnect(socket)
+    this.on('browser_complete', (completedBrowser) => {
+      if (completedBrowser.lastResult.disconnected && completedBrowser.disconnectsCount <= config.browserDisconnectTolerance) {
+        this.log.info(`Restarting ${completedBrowser.name} (${completedBrowser.disconnectsCount} of ${config.browserDisconnectTolerance} attempts)`)
 
-        // We are restarting a previously disconnected browser.
-        if (isRestart && config.singleRun) {
-          newBrowser.execute(config.client)
+        if (!launcher.restart(completedBrowser.id)) {
+          this.emit('browser_restart_failure', completedBrowser)
         }
       } else {
-        newBrowser = self._injector.createChild([{
-          id: ['value', info.id || null],
-          fullName: ['value', (helper.isDefined(info.displayName) ? info.displayName : info.name)],
-          socket: ['value', socket]
-        }]).invoke(Browser.factory)
-
-        newBrowser.init()
-
-        // execute in this browser immediately
-        if (config.singleRun) {
-          newBrowser.execute(config.client)
-          singleRunBrowsers.add(newBrowser)
-        }
+        this.emit('browser_complete_with_no_more_retries', completedBrowser)
       }
-
-      replySocketEvents()
     })
-  })
 
-  var emitRunCompleteIfAllBrowsersDone = function () {
-    // all browsers done
-    var isDone = Object.keys(singleRunDoneBrowsers).reduce(function (isDone, id) {
-      return isDone && singleRunDoneBrowsers[id]
-    }, true)
-
-    if (isDone) {
-      var results = singleRunBrowsers.getResults()
-      if (singleRunBrowserNotCaptured) {
-        results.exitCode = 1
-      } else if (results.success + results.failed === 0 && !config.failOnEmptyTestSuite) {
-        results.exitCode = 0
-        self.log.warn('Test suite was empty.')
-      }
-      self.emit('run_complete', singleRunBrowsers, results)
-    }
-  }
+    if (config.singleRun) {
+      this.on('browser_restart_failure', (completedBrowser) => {
+        singleRunDoneBrowsers[completedBrowser.id] = true
+        emitRunCompleteIfAllBrowsersDone()
+      })
+      this.on('browser_complete_with_no_more_retries', function (completedBrowser) {
+        singleRunDoneBrowsers[completedBrowser.id] = true
 
-  self.on('browser_complete', function (completedBrowser) {
-    if (completedBrowser.lastResult.disconnected &&
-      completedBrowser.disconnectsCount <= config.browserDisconnectTolerance) {
-      self.log.info('Restarting %s (%d of %d attempts)', completedBrowser.name,
-        completedBrowser.disconnectsCount, config.browserDisconnectTolerance)
+        if (launcher.kill(completedBrowser.id)) {
+          // workaround to supress "disconnect" warning
+          completedBrowser.state = Browser.STATE_DISCONNECTED
+        }
 
-      if (!launcher.restart(completedBrowser.id)) {
-        self.emit('browser_restart_failure', completedBrowser)
-      }
-    } else {
-      self.emit('browser_complete_with_no_more_retries', completedBrowser)
-    }
-  })
+        emitRunCompleteIfAllBrowsersDone()
+      })
 
-  if (config.singleRun) {
-    self.on('browser_restart_failure', function (completedBrowser) {
-      singleRunDoneBrowsers[completedBrowser.id] = true
-      emitRunCompleteIfAllBrowsersDone()
-    })
-    self.on('browser_complete_with_no_more_retries', function (completedBrowser) {
-      singleRunDoneBrowsers[completedBrowser.id] = true
+      this.on('browser_process_failure', (browserLauncher) => {
+        singleRunDoneBrowsers[browserLauncher.id] = true
+        singleRunBrowserNotCaptured = true
 
-      if (launcher.kill(completedBrowser.id)) {
-        // workaround to supress "disconnect" warning
-        completedBrowser.state = Browser.STATE_DISCONNECTED
-      }
+        emitRunCompleteIfAllBrowsersDone()
+      })
 
-      emitRunCompleteIfAllBrowsersDone()
-    })
+      this.on('run_complete', function (browsers, results) {
+        this.log.debug('Run complete, exiting.')
+        disconnectBrowsers(results.exitCode)
+      })
 
-    self.on('browser_process_failure', function (browserLauncher) {
-      singleRunDoneBrowsers[browserLauncher.id] = true
-      singleRunBrowserNotCaptured = true
+      this.emit('run_start', singleRunBrowsers)
+    }
 
-      emitRunCompleteIfAllBrowsersDone()
-    })
+    if (config.autoWatch) {
+      this.on('file_list_modified', () => {
+        this.log.debug('List of files has changed, trying to execute')
+        if (config.restartOnFileChange) {
+          socketServer.sockets.emit('stop')
+        }
+        executor.schedule()
+      })
+    }
 
-    self.on('run_complete', function (browsers, results) {
-      self.log.debug('Run complete, exiting.')
-      disconnectBrowsers(results.exitCode)
-    })
+    const webServerCloseTimeout = 3000
+    const disconnectBrowsers = (code) => {
+      const sockets = socketServer.sockets.sockets
 
-    self.emit('run_start', singleRunBrowsers)
-  }
+      Object.keys(sockets).forEach((id) => {
+        const socket = sockets[id]
+        socket.removeAllListeners('disconnect')
+        if (!socket.disconnected) {
+          process.nextTick(socket.disconnect.bind(socket))
+        }
+      })
 
-  if (config.autoWatch) {
-    self.on('file_list_modified', function () {
-      self.log.debug('List of files has changed, trying to execute')
-      if (config.restartOnFileChange) {
-        socketServer.sockets.emit('stop')
+      let removeAllListenersDone = false
+      const removeAllListeners = () => {
+        if (removeAllListenersDone) {
+          return
+        }
+        removeAllListenersDone = true
+        webServer.removeAllListeners()
+        processWrapper.removeAllListeners()
+        done(code || 0)
       }
-      executor.schedule()
-    })
-  }
 
-  var webServerCloseTimeout = 3000
-  var disconnectBrowsers = function (code) {
-    // Slightly hacky way of removing disconnect listeners
-    // to suppress "browser disconnect" warnings
-    // TODO(vojta): change the client to not send the event (if disconnected by purpose)
-    var sockets = socketServer.sockets.sockets
-
-    Object.keys(sockets).forEach(function (id) {
-      var socket = sockets[id]
-      socket.removeAllListeners('disconnect')
-      if (!socket.disconnected) {
-        // Disconnect asynchronously. Socket.io mutates the `sockets.sockets` array
-        // underneath us so this would skip every other browser/socket.
-        process.nextTick(socket.disconnect.bind(socket))
-      }
-    })
+      this.emitAsync('exit').then(() => {
+        socketServer.sockets.removeAllListeners()
+        socketServer.close()
+        const closeTimeout = setTimeout(removeAllListeners, webServerCloseTimeout)
 
-    var removeAllListenersDone = false
-    var removeAllListeners = function () {
-      // make sure we don't execute cleanup twice
-      if (removeAllListenersDone) {
-        return
-      }
-      removeAllListenersDone = true
-      webServer.removeAllListeners()
-      processWrapper.removeAllListeners()
-      done(code || 0)
+        webServer.close(() => {
+          clearTimeout(closeTimeout)
+          removeAllListeners()
+        })
+      })
     }
 
-    self.emitAsync('exit').then(function () {
-      // Remove Socket.IO listeners. `connection` callback closes over `Server`
-      // instance so it leaks Plugin state e.g. Webpack compilations.
-      socketServer.sockets.removeAllListeners()
-      socketServer.close()
-      // don't wait forever on webServer.close() because
-      // pending client connections prevent it from closing.
-      var closeTimeout = setTimeout(removeAllListeners, webServerCloseTimeout)
-
-      // shutdown the server...
-      webServer.close(function () {
-        clearTimeout(closeTimeout)
-        removeAllListeners()
-      })
+    processWrapper.on('SIGINT', () => disconnectBrowsers(process.exitCode))
+    processWrapper.on('SIGTERM', disconnectBrowsers)
+
+    processWrapper.on('uncaughtException', (error) => {
+      this.log.error(error)
+      disconnectBrowsers(1)
     })
   }
 
-  processWrapper.on('SIGINT', function () {
-    disconnectBrowsers(process.exitCode)
-  })
-  processWrapper.on('SIGTERM', disconnectBrowsers)
-
-  // Handle all unhandled exceptions, so we don't just exit but
-  // disconnect the browsers before exiting.
-  processWrapper.on('uncaughtException', function (error) {
-    self.log.error(error)
-    disconnectBrowsers(1)
-  })
-}
-
-Server.prototype._setUpLoadErrorListener = function () {
-  var self = this
-  self.on('load_error', function (type, name) {
-    self.log.debug('Registered a load error of type %s with name %s', type, name)
-    self.loadErrors.push([type, name])
-  })
-}
-
-Server.prototype._detach = function (config, done) {
-  var log = this.log
-  var tmpFile = tmp.fileSync({keep: true})
-  log.info('Starting karma detached')
-  log.info('Run "karma stop" to stop the server.')
-  log.debug('Writing config to tmp-file %s', tmpFile.name)
-  config.detached = false
-  try {
-    fs.writeFileSync(tmpFile.name, JSON.stringify(config), 'utf8')
-  } catch (e) {
-    log.error("Couldn't write temporary configuration file")
-    done(1)
-    return
+  _detach (config, done) {
+    const tmpFile = tmp.fileSync({ keep: true })
+    this.log.info('Starting karma detached')
+    this.log.info('Run "karma stop" to stop the server.')
+    this.log.debug(`Writing config to tmp-file ${tmpFile.name}`)
+    config.detached = false
+    try {
+      fs.writeFileSync(tmpFile.name, JSON.stringify(config), 'utf8')
+    } catch (e) {
+      this.log.error("Couldn't write temporary configuration file")
+      done(1)
+      return
+    }
+    const child = spawn(process.argv[0], [path.resolve(__dirname, '../lib/detached.js'), tmpFile.name], {
+      detached: true,
+      stdio: 'ignore'
+    })
+    child.unref()
   }
-  var child = spawn(process.argv[0], [path.resolve(__dirname, '../lib/detached.js'), tmpFile.name], {
-    detached: true,
-    stdio: 'ignore'
-  })
-  child.unref()
 }
 
-// Export
-// ------
+Server.prototype._start.$inject = ['config', 'launcher', 'preprocess', 'fileList', 'capturedBrowsers', 'executor', 'done']
 
 module.exports = Server

From bc9acd355a09eafa76a48dbe03c7c88909285bc9 Mon Sep 17 00:00:00 2001
From: johnjbarton <johnjbarton@johnjbarton.com>
Date: Mon, 4 Jun 2018 13:34:02 -0700
Subject: [PATCH 35/50] fix(lint): exempt built files (#3024)

---
 .eslintignore | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.eslintignore b/.eslintignore
index 32bb882d2..4ca69cb10 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1 +1,4 @@
-test/e2e/support/error/under-test.js
\ No newline at end of file
+test/e2e/support/error/under-test.js
+static/karma.js
+static/context.js
+tmp/*

From 31d9a08892f51308efbe7c467c379b3f70f1e416 Mon Sep 17 00:00:00 2001
From: johnjbarton <johnjbarton@johnjbarton.com>
Date: Mon, 4 Jun 2018 14:33:47 -0700
Subject: [PATCH 36/50] fix(flaky-test): Add time to beforeEach() to allow
 plugins to load on first pass. (#3025)

Loading plugins in beforeEach seems unwise: the it() blocks potentially run against different environments. In particular the first it() block runs with the timer already worn down by the plugin load and often the timeout hits on my mac air before the test passes.Until we can restructure this code a longer timeout avoids flaky tests.
---
 test/unit/server.spec.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/unit/server.spec.js b/test/unit/server.spec.js
index e5fdcc24f..04abbf381 100644
--- a/test/unit/server.spec.js
+++ b/test/unit/server.spec.js
@@ -17,7 +17,10 @@ describe('server', () => {
   var fileListOnResolve = fileListOnReject = mockLauncher = null
   var mockFileList = mockWebServer = mockSocketServer = mockExecutor = doneSpy = null
 
-  beforeEach(() => {
+  // Use regular function not arrow so 'this' is mocha 'this'.
+  beforeEach(function () {
+    // The first call to new Server() loads plugins and it can take >2000ms.
+    this.timeout(4000)
     browserCollection = new BrowserCollection()
     doneSpy = sinon.spy()
 

From c1a95675f8fc435b8215caba8a0c77aa92d8dd34 Mon Sep 17 00:00:00 2001
From: johnjbarton <johnjbarton@johnjbarton.com>
Date: Thu, 7 Jun 2018 08:28:19 -0700
Subject: [PATCH 37/50] refactor(middleware): update middleware/common to ES6
 (#3028)

---
 lib/middleware/common.js | 65 ++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 36 deletions(-)

diff --git a/lib/middleware/common.js b/lib/middleware/common.js
index 2eea405d8..d338f2b06 100644
--- a/lib/middleware/common.js
+++ b/lib/middleware/common.js
@@ -1,41 +1,44 @@
 /**
  * This module contains some common helpers shared between middlewares
  */
+'use strict'
 
-var mime = require('mime')
-var _ = require('lodash')
-var parseRange = require('range-parser')
-var Buffer = require('safe-buffer').Buffer
+const mime = require('mime')
+const _ = require('lodash')
+const parseRange = require('range-parser')
+const Buffer = require('safe-buffer').Buffer
 
-var log = require('../logger').create('web-server')
+const log = require('../logger').create('web-server')
 
-var PromiseContainer = function () {
-  var promise
+class PromiseContainer {
+  constructor () {
+    this.promise = null
+  }
 
-  this.then = function (success, error) {
+  then (success, error) {
     error = error || _.noop
-    return promise.then(success).catch(error)
+    return this.promise.then(success).catch(error)
   }
 
-  this.set = function (newPromise) {
-    promise = newPromise
+  set (newPromise) {
+    this.promise = newPromise
   }
 }
 
-var serve404 = function (response, path) {
+function serve404 (response, path) {
   log.warn('404: ' + path)
   response.writeHead(404)
   return response.end('NOT FOUND')
 }
 
-var createServeFile = function (fs, directory, config) {
-  var cache = Object.create(null)
+function createServeFile (fs, directory, config) {
+  const cache = Object.create(null)
 
   return function (filepath, rangeHeader, response, transform, content, doNotCache) {
-    var responseData
+    let responseData
 
-    var convertForRangeRequest = function () {
-      var range = parseRange(responseData.length, rangeHeader)
+    const convertForRangeRequest = function () {
+      const range = parseRange(responseData.length, rangeHeader)
       if (range === -2) {
         // malformed header string
         return 200
@@ -46,8 +49,8 @@ var createServeFile = function (fs, directory, config) {
       } else if (range.type === 'bytes') {
         responseData = Buffer.from(responseData)
         if (range.length === 1) {
-          var start = range[0].start
-          var end = range[0].end
+          const start = range[0].start
+          const end = range[0].end
           response.setHeader(
             'Content-Range',
             'bytes ' + start + '-' + end + '/' + responseData.length
@@ -76,7 +79,7 @@ var createServeFile = function (fs, directory, config) {
 
     if (config && config.customHeaders && config.customHeaders.length > 0) {
       config.customHeaders.forEach(function (header) {
-        var regex = new RegExp(header.match)
+        const regex = new RegExp(header.match)
         if (regex.test(filepath)) {
           log.debug('setting header: ' + header.name + ' for: ' + filepath)
           response.setHeader(header.name, header.value)
@@ -91,12 +94,7 @@ var createServeFile = function (fs, directory, config) {
       // call custom transform fn to transform the data
       responseData = (transform && transform(content)) || content
 
-      if (rangeHeader) {
-        var code = convertForRangeRequest()
-        response.writeHead(code)
-      } else {
-        response.writeHead(200)
-      }
+      response.writeHead(rangeHeader ? convertForRangeRequest() : 200)
 
       log.debug('serving (cached): ' + filepath)
       return response.end(responseData)
@@ -116,12 +114,7 @@ var createServeFile = function (fs, directory, config) {
       // call custom transform fn to transform the data
       responseData = (transform && transform(data.toString())) || data
 
-      if (rangeHeader) {
-        var code = convertForRangeRequest()
-        response.writeHead(code)
-      } else {
-        response.writeHead(200)
-      }
+      response.writeHead(rangeHeader ? convertForRangeRequest() : 200)
 
       log.debug('serving: ' + filepath)
       return response.end(responseData)
@@ -129,20 +122,20 @@ var createServeFile = function (fs, directory, config) {
   }
 }
 
-var setNoCacheHeaders = function (response) {
+function setNoCacheHeaders (response) {
   response.setHeader('Cache-Control', 'no-cache')
   response.setHeader('Pragma', 'no-cache')
   response.setHeader('Expires', (new Date(0)).toUTCString())
 }
 
-var setHeavyCacheHeaders = function (response) {
+function setHeavyCacheHeaders (response) {
   response.setHeader('Cache-Control', 'public, max-age=31536000')
 }
 
-var initializeMimeTypes = function (config) {
+function initializeMimeTypes (config) {
   if (config && config.mime) {
     _.forEach(config.mime, function (value, key) {
-      var map = {}
+      const map = {}
       map[key] = value
       mime.define(map)
     })

From 011a90c5945ad8141bd9b8063e12e0410780957d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Usarz?= <lukasz.usarz@gmail.com>
Date: Fri, 8 Jun 2018 17:00:32 +0200
Subject: [PATCH 38/50] refactor(server): refactor bundleResource in
 lib/server.js (#3029)

---
 .eslintignore                        |  1 +
 .gitignore                           |  1 +
 lib/server.js                        | 72 ++++++++++-----------------
 lib/utils/bundle-utils.js            | 27 ++++++++++
 lib/utils/file-utils.js              |  6 +++
 lib/utils/path-utils.js              |  7 +++
 test/unit/server.spec.js             | 73 ++++++++++++++--------------
 test/unit/utils/bundle-utils.spec.js | 42 ++++++++++++++++
 test/unit/utils/path-utils.spec.js   |  9 ++++
 9 files changed, 156 insertions(+), 82 deletions(-)
 create mode 100644 lib/utils/bundle-utils.js
 create mode 100644 test/unit/utils/bundle-utils.spec.js
 create mode 100644 test/unit/utils/path-utils.spec.js

diff --git a/.eslintignore b/.eslintignore
index 4ca69cb10..93626b9ee 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,4 +1,5 @@
 test/e2e/support/error/under-test.js
+test/unit/fixtures/bundled.js
 static/karma.js
 static/context.js
 tmp/*
diff --git a/.gitignore b/.gitignore
index 10ed8f9d7..52a47db45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,5 @@ test/e2e/coverageRequirejs/coverage
 test/e2e/coffee-coverage/coverage
 test-results.xml
 test/unit/test.log
+test/unit/fixtures/bundled.js
 .DS_Store
diff --git a/lib/server.js b/lib/server.js
index dad58884d..1f2054e26 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -8,6 +8,7 @@ const spawn = require('child_process').spawn
 const tmp = require('tmp')
 const fs = require('fs')
 const path = require('path')
+const BundleUtils = require('./utils/bundle-utils')
 const root = global || window || this
 
 const cfg = require('./config')
@@ -31,20 +32,6 @@ const BrowserCollection = require('./browser_collection')
 const EmitterWrapper = require('./emitter_wrapper')
 const processWrapper = new EmitterWrapper(process)
 
-const karmaJsPath = path.join(__dirname, '/../static/karma.js')
-const contextJsPath = path.join(__dirname, '/../static/context.js')
-
-function bundleResource (inPath, outPath) {
-  const browserify = require('browserify')
-  return new Promise((resolve, reject) => {
-    browserify(inPath)
-      .bundle()
-      .pipe(fs.createWriteStream(outPath))
-      .once('finish', () => resolve())
-      .once('error', (e) => reject(e))
-  })
-}
-
 function createSocketIoServer (webServer, executor, config) {
   const server = new SocketIO(webServer, {
     // avoid destroying http upgrades from socket.io to get proxied websockets working
@@ -152,39 +139,32 @@ class Server extends KarmaEventEmitter {
         this._injector.invoke(watcher.watch)
       }
 
-      const startWebServer = () => {
-        webServer.listen(config.port, config.listenAddress, () => {
-          this.log.info(`Karma v${constant.VERSION} server started at ${config.protocol}//${config.listenAddress}:${config.port}${config.urlRoot}`)
-
-          this.emit('listening', config.port)
-          if (config.browsers && config.browsers.length) {
-            this._injector.invoke(launcher.launch, launcher).forEach((browserLauncher) => {
-              singleRunDoneBrowsers[browserLauncher.id] = false
-            })
-          }
-          if (this.loadErrors.length > 0) {
-            this.log.error('Found %d load error%s', this.loadErrors.length, this.loadErrors.length === 1 ? '' : 's')
-            process.exitCode = 1
-            process.kill(process.pid, 'SIGINT')
-          }
-        })
-      }
-
-      if (fs.existsSync(karmaJsPath) && fs.existsSync(contextJsPath)) {
-        startWebServer()
-      } else {
-        this.log.info('Front-end scripts not present. Compiling...')
-        Promise.all([
-          bundleResource(path.join(__dirname, '/../client/main.js'), karmaJsPath),
-          bundleResource(path.join(__dirname, '/../context/main.js'), contextJsPath)
-        ])
-          .then(startWebServer)
-          .catch((error) => {
-            this.log.error('Front-end script compile failed with error: ' + error)
-            process.exitCode = 1
-            process.kill(process.pid, 'SIGINT')
+      return Promise.all([
+        BundleUtils.bundleResourceIfNotExist('client/main.js', 'static/karma.js'),
+        BundleUtils.bundleResourceIfNotExist('context/main.js', 'static/context.js')
+      ])
+        .then(() => {
+          webServer.listen(config.port, config.listenAddress, () => {
+            this.log.info(`Karma v${constant.VERSION} server started at ${config.protocol}//${config.listenAddress}:${config.port}${config.urlRoot}`)
+
+            this.emit('listening', config.port)
+            if (config.browsers && config.browsers.length) {
+              this._injector.invoke(launcher.launch, launcher).forEach((browserLauncher) => {
+                singleRunDoneBrowsers[browserLauncher.id] = false
+              })
+            }
+            if (this.loadErrors.length > 0) {
+              this.log.error('Found %d load error%s', this.loadErrors.length, this.loadErrors.length === 1 ? '' : 's')
+              process.exitCode = 1
+              process.kill(process.pid, 'SIGINT')
+            }
           })
-      }
+        })
+        .catch((error) => {
+          this.log.error('Front-end script compile failed with error: ' + error)
+          process.exitCode = 1
+          process.kill(process.pid, 'SIGINT')
+        })
     }
 
     fileList.refresh().then(afterPreprocess, afterPreprocess)
diff --git a/lib/utils/bundle-utils.js b/lib/utils/bundle-utils.js
new file mode 100644
index 000000000..143815985
--- /dev/null
+++ b/lib/utils/bundle-utils.js
@@ -0,0 +1,27 @@
+'use strict'
+const PathUtils = require('./path-utils')
+const fs = require('fs')
+const Promise = require('bluebird')
+
+const BundleUtils = {
+  bundleResource (inPath, outPath) {
+    return new Promise((resolve, reject) => {
+      require('browserify')(inPath)
+        .bundle()
+        .pipe(fs.createWriteStream(outPath))
+        .once('finish', () => resolve())
+        .once('error', (e) => reject(e))
+    })
+  },
+
+  bundleResourceIfNotExist (inPath, outPath) {
+    inPath = PathUtils.calculateAbsolutePath(inPath)
+    outPath = PathUtils.calculateAbsolutePath(outPath)
+
+    return fs.existsSync(outPath)
+      ? Promise.resolve()
+      : BundleUtils.bundleResource(inPath, outPath)
+  }
+}
+
+module.exports = BundleUtils
diff --git a/lib/utils/file-utils.js b/lib/utils/file-utils.js
index 7cec11c25..423905dc8 100644
--- a/lib/utils/file-utils.js
+++ b/lib/utils/file-utils.js
@@ -13,6 +13,12 @@ const FileUtils = {
 
   copyFile (src, dest) {
     FileUtils.saveFile(dest, FileUtils.readFile(src))
+  },
+
+  removeFileIfExists (src) {
+    if (fs.existsSync(src)) {
+      fs.unlinkSync(src)
+    }
   }
 }
 
diff --git a/lib/utils/path-utils.js b/lib/utils/path-utils.js
index 0990e9168..5fd062a26 100644
--- a/lib/utils/path-utils.js
+++ b/lib/utils/path-utils.js
@@ -1,9 +1,16 @@
 'use strict'
 
+const path = require('path')
+
 const PathUtils = {
   formatPathMapping (path, line, column) {
     return path + (line ? `:${line}` : '') + (column ? `:${column}` : '')
+  },
+
+  calculateAbsolutePath (karmaRelativePath) {
+    return path.join(__dirname, '..', '..', karmaRelativePath)
   }
+
 }
 
 module.exports = PathUtils
diff --git a/test/unit/server.spec.js b/test/unit/server.spec.js
index 04abbf381..022d7ecbe 100644
--- a/test/unit/server.spec.js
+++ b/test/unit/server.spec.js
@@ -1,7 +1,6 @@
 var Server = require('../../lib/server')
+var BundleUtils = require('../../lib/utils/bundle-utils')
 var BrowserCollection = require('../../lib/browser_collection')
-var fs = require('fs')
-var path = require('path')
 
 describe('server', () => {
   var mockConfig
@@ -110,18 +109,19 @@ describe('server', () => {
   // server._start()
   // ============================================================================
   describe('_start', () => {
-    it('should compile static resources on first run', function (done) {
-      this.timeout(5000)
+    it('should compile static resources', (done) => {
+      sinon.spy(BundleUtils, 'bundleResourceIfNotExist')
+
       server._start(mockConfig, mockLauncher, null, mockFileList, browserCollection, mockExecutor, doneSpy)
-      fileListOnResolve()
 
-      setTimeout(() => {
-        expect(fs.existsSync(path.join(__dirname, '/../../static/karma.js')) && fs.existsSync(path.join(__dirname, '/../../static/context.js'))).to.be.true
+      fileListOnResolve().then(() => {
+        expect(BundleUtils.bundleResourceIfNotExist).to.have.been.calledWith('client/main.js', 'static/karma.js')
+        expect(BundleUtils.bundleResourceIfNotExist).to.have.been.calledWith('context/main.js', 'static/context.js')
         done()
-      }, 4000)
+      })
     })
 
-    it('should start the web server after all files have been preprocessed successfully', () => {
+    it('should start the web server after all files have been preprocessed successfully', (done) => {
       server._start(mockConfig, mockLauncher, null, mockFileList, browserCollection, mockExecutor, doneSpy)
 
       expect(mockFileList.refresh).to.have.been.called
@@ -129,13 +129,14 @@ describe('server', () => {
       expect(mockWebServer.listen).not.to.have.been.called
       expect(server._injector.invoke).not.to.have.been.calledWith(mockLauncher.launch, mockLauncher)
 
-      fileListOnResolve()
-
-      expect(mockWebServer.listen).to.have.been.called
-      expect(server._injector.invoke).to.have.been.calledWith(mockLauncher.launch, mockLauncher)
+      fileListOnResolve().then(() => {
+        expect(mockWebServer.listen).to.have.been.called
+        expect(server._injector.invoke).to.have.been.calledWith(mockLauncher.launch, mockLauncher)
+        done()
+      })
     })
 
-    it('should start the web server after all files have been preprocessed with an error', () => {
+    it('should start the web server after all files have been preprocessed with an error', (done) => {
       server._start(mockConfig, mockLauncher, null, mockFileList, browserCollection, mockExecutor, doneSpy)
 
       expect(mockFileList.refresh).to.have.been.called
@@ -143,25 +144,27 @@ describe('server', () => {
       expect(mockWebServer.listen).not.to.have.been.called
       expect(server._injector.invoke).not.to.have.been.calledWith(mockLauncher.launch, mockLauncher)
 
-      fileListOnReject()
-
-      expect(mockWebServer.listen).to.have.been.called
-      expect(server._injector.invoke).to.have.been.calledWith(mockLauncher.launch, mockLauncher)
+      fileListOnReject().then(() => {
+        expect(mockWebServer.listen).to.have.been.called
+        expect(server._injector.invoke).to.have.been.calledWith(mockLauncher.launch, mockLauncher)
+        done()
+      })
     })
 
-    it('should launch browsers after the web server has started', () => {
+    it('should launch browsers after the web server has started', (done) => {
       server._start(mockConfig, mockLauncher, null, mockFileList, browserCollection, mockExecutor, doneSpy)
 
       expect(mockWebServer.listen).not.to.have.been.called
       expect(server._injector.invoke).not.to.have.been.calledWith(mockLauncher.launch, mockLauncher)
 
-      fileListOnResolve()
-
-      expect(mockWebServer.listen).to.have.been.called
-      expect(server._injector.invoke).to.have.been.calledWith(mockLauncher.launch, mockLauncher)
+      fileListOnResolve().then(() => {
+        expect(mockWebServer.listen).to.have.been.called
+        expect(server._injector.invoke).to.have.been.calledWith(mockLauncher.launch, mockLauncher)
+        done()
+      })
     })
 
-    it('should listen on the listenAddress in the config', () => {
+    it('should listen on the listenAddress in the config', (done) => {
       server._start(mockConfig, mockLauncher, null, mockFileList, browserCollection, mockExecutor, doneSpy)
 
       expect(mockWebServer.listen).not.to.have.been.called
@@ -169,10 +172,11 @@ describe('server', () => {
 
       expect(mockConfig.listenAddress).to.be.equal('127.0.0.1')
 
-      fileListOnResolve()
-
-      expect(mockWebServer.listen).to.have.been.calledWith(9876, '127.0.0.1')
-      expect(mockConfig.listenAddress).to.be.equal('127.0.0.1')
+      fileListOnResolve().then(() => {
+        expect(mockWebServer.listen).to.have.been.calledWith(9876, '127.0.0.1')
+        expect(mockConfig.listenAddress).to.be.equal('127.0.0.1')
+        done()
+      })
     })
 
     it('should try next port if already in use', () => {
@@ -183,17 +187,13 @@ describe('server', () => {
 
       expect(mockConfig.port).to.be.equal(9876)
 
-      fileListOnResolve()
-
-      expect(mockWebServer.listen).to.have.been.calledWith(9876)
-
       webServerOnError({code: 'EADDRINUSE'})
 
       expect(mockWebServer.listen).to.have.been.calledWith(9877)
       expect(mockConfig.port).to.be.equal(9877)
     })
 
-    it('should emit a listening event once server begin accepting connections', () => {
+    it('should emit a listening event once server begin accepting connections', (done) => {
       server._start(mockConfig, mockLauncher, null, mockFileList, browserCollection, mockExecutor, doneSpy)
 
       var listening = sinon.spy()
@@ -201,9 +201,10 @@ describe('server', () => {
 
       expect(listening).not.to.have.been.called
 
-      fileListOnResolve()
-
-      expect(listening).to.have.been.calledWith(9876)
+      fileListOnResolve().then(() => {
+        expect(listening).to.have.been.calledWith(9876)
+        done()
+      })
     })
 
     it('should emit a browsers_ready event once all the browsers are captured', () => {
diff --git a/test/unit/utils/bundle-utils.spec.js b/test/unit/utils/bundle-utils.spec.js
new file mode 100644
index 000000000..bedc574d9
--- /dev/null
+++ b/test/unit/utils/bundle-utils.spec.js
@@ -0,0 +1,42 @@
+'use strict'
+
+const BundleUtils = require('../../../lib/utils/bundle-utils')
+const PathUtils = require('../../../lib/utils/path-utils')
+const FileUtils = require('../../../lib/utils/file-utils')
+const fs = require('fs')
+
+const sandbox = sinon.sandbox.create()
+
+describe('BundleUtils.bundleResource', () => {
+  beforeEach(() => FileUtils.removeFileIfExists(PathUtils.calculateAbsolutePath('test/unit/fixtures/bundled.js')))
+
+  it('create bundle file in requested output path', (done) => {
+    BundleUtils.bundleResource('test/unit/fixtures/format-error-root.js', 'test/unit/fixtures/bundled.js')
+      .then(() => {
+        expect(fs.existsSync(PathUtils.calculateAbsolutePath('test/unit/fixtures/bundled.js'))).to.be.true
+        done()
+      })
+  })
+})
+
+describe('BundleUtils.bundleResourceIfNotExist', () => {
+  beforeEach(() => {
+    sandbox.stub(BundleUtils, 'bundleResource').resolves()
+  })
+
+  afterEach(() => sandbox.restore())
+
+  it('bundle resource when output path file not exists', () => {
+    sandbox.stub(fs, 'existsSync').returns(false)
+
+    BundleUtils.bundleResourceIfNotExist('context/main.js', 'static/context.js')
+    expect(BundleUtils.bundleResource).to.have.been.called
+  })
+
+  it('does not bundle resource when output path file exists', () => {
+    sandbox.stub(fs, 'existsSync').returns(true)
+
+    BundleUtils.bundleResourceIfNotExist('context/main.js', 'static/context.js')
+    expect(BundleUtils.bundleResource).to.not.have.been.called
+  })
+})
diff --git a/test/unit/utils/path-utils.spec.js b/test/unit/utils/path-utils.spec.js
new file mode 100644
index 000000000..e53ab971d
--- /dev/null
+++ b/test/unit/utils/path-utils.spec.js
@@ -0,0 +1,9 @@
+'use strict'
+const PathUtils = require('../../../lib/utils/path-utils')
+const fs = require('fs')
+
+describe('PathUtils.calculateAbsolutePath', () => {
+  it('returns absolute path from karma project relative path', () => {
+    expect(fs.existsSync(PathUtils.calculateAbsolutePath('logo/banner.png'))).to.be.true
+  })
+})

From e8ca4ecefe92bd28494467503b09f3588b787cf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Usarz?= <lukasz.usarz@gmail.com>
Date: Sat, 9 Jun 2018 17:53:42 +0200
Subject: [PATCH 39/50] refactor: update lib/runner to ES6 (#3033)

---
 lib/runner.js | 49 +++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/lib/runner.js b/lib/runner.js
index 5f74cd199..3ff5cccbe 100644
--- a/lib/runner.js
+++ b/lib/runner.js
@@ -1,36 +1,37 @@
-var http = require('http')
+'use strict'
 
-var constant = require('./constants')
-var helper = require('./helper')
-var cfg = require('./config')
-var logger = require('./logger')
-var log = logger.create('runner')
+const http = require('http')
 
-var parseExitCode = function (buffer, defaultCode, failOnEmptyTestSuite) {
-  var tailPos = buffer.length - Buffer.byteLength(constant.EXIT_CODE) - 2
+const constant = require('./constants')
+const helper = require('./helper')
+const cfg = require('./config')
+const logger = require('./logger')
+const log = logger.create('runner')
+
+function parseExitCode (buffer, defaultExitCode, failOnEmptyTestSuite) {
+  const tailPos = buffer.length - Buffer.byteLength(constant.EXIT_CODE) - 2
 
   if (tailPos < 0) {
-    return {exitCode: defaultCode, buffer: buffer}
+    return { exitCode: defaultExitCode, buffer }
   }
 
-  // tail buffer which might contain the message
-  var tail = buffer.slice(tailPos)
-  var tailStr = tail.toString()
+  const tail = buffer.slice(tailPos)
+  const tailStr = tail.toString()
   if (tailStr.substr(0, tailStr.length - 2) === constant.EXIT_CODE) {
-    var emptyInt = parseInt(tailStr.substr(-2, 1), 10)
-    var exitCode = parseInt(tailStr.substr(-1), 10)
+    const emptyInt = parseInt(tailStr.substr(-2, 1), 10)
+    let exitCode = parseInt(tailStr.substr(-1), 10)
     if (failOnEmptyTestSuite === false && emptyInt === 0) {
       log.warn('Test suite was empty.')
       exitCode = 0
     }
-    return {exitCode: exitCode, buffer: buffer.slice(0, tailPos)}
+    return { exitCode, buffer: buffer.slice(0, tailPos) }
   }
 
-  return {exitCode: defaultCode, buffer: buffer}
+  return { exitCode: defaultExitCode, buffer }
 }
 
 // TODO(vojta): read config file (port, host, urlRoot)
-exports.run = function (config, done) {
+function run (config, done) {
   config = config || {}
 
   logger.setupFromConfig(config)
@@ -38,8 +39,8 @@ exports.run = function (config, done) {
   done = helper.isFunction(done) ? done : process.exit
   config = cfg.parseConfig(config.configFile, config)
 
-  var exitCode = 1
-  var options = {
+  let exitCode = 1
+  const options = {
     hostname: config.hostname,
     path: config.urlRoot + 'run',
     port: config.port,
@@ -49,16 +50,14 @@ exports.run = function (config, done) {
     }
   }
 
-  var request = http.request(options, function (response) {
+  const request = http.request(options, function (response) {
     response.on('data', function (buffer) {
-      var parsedResult = parseExitCode(buffer, exitCode, config.failOnEmptyTestSuite)
+      const parsedResult = parseExitCode(buffer, exitCode, config.failOnEmptyTestSuite)
       exitCode = parsedResult.exitCode
       process.stdout.write(parsedResult.buffer)
     })
 
-    response.on('end', function () {
-      done(exitCode)
-    })
+    response.on('end', () => done(exitCode))
   })
 
   request.on('error', function (e) {
@@ -79,3 +78,5 @@ exports.run = function (config, done) {
     colors: config.colors
   }))
 }
+
+exports.run = run

From 558e2f0f0a36d2b74c6aff7b8c582d5789ea49e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Usarz?= <lukasz.usarz@gmail.com>
Date: Mon, 11 Jun 2018 16:59:10 +0200
Subject: [PATCH 40/50] refactor: update lib/plugin.js to ES6 (#3036)

---
 lib/plugin.js | 55 +++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/lib/plugin.js b/lib/plugin.js
index cfc60e35f..253de0ef0 100644
--- a/lib/plugin.js
+++ b/lib/plugin.js
@@ -1,24 +1,25 @@
-var fs = require('graceful-fs')
-var path = require('path')
+'use strict'
 
-var helper = require('./helper')
-var log = require('./logger').create('plugin')
+const fs = require('graceful-fs')
+const path = require('path')
+const helper = require('./helper')
 
-var IGNORED_PACKAGES = ['karma-cli', 'karma-runner.github.com']
+const log = require('./logger').create('plugin')
 
-exports.resolve = function (plugins, emitter) {
-  var modules = []
+const IGNORED_PACKAGES = ['karma-cli', 'karma-runner.github.com']
 
-  var requirePlugin = function (name) {
-    log.debug('Loading plugin %s.', name)
+function resolve (plugins, emitter) {
+  const modules = []
+
+  function requirePlugin (name) {
+    log.debug(`Loading plugin ${name}.`)
     try {
       modules.push(require(name))
     } catch (e) {
       if (e.code === 'MODULE_NOT_FOUND' && e.message.indexOf(name) !== -1) {
-        log.error('Cannot find plugin "%s".\n  Did you forget to install it?\n' +
-          '  npm install %s --save-dev', name, name)
+        log.error(`Cannot find plugin "${name}".\n  Did you forget to install it?\n  npm install ${name} --save-dev`)
       } else {
-        log.error('Error during loading "%s" plugin:\n  %s', name, e.message)
+        log.error(`Error during loading "${name}" plugin:\n  ${e.message}`)
       }
       emitter.emit('load_error', 'plug_in', name)
     }
@@ -30,25 +31,23 @@ exports.resolve = function (plugins, emitter) {
         requirePlugin(plugin)
         return
       }
-      var pluginDirectory = path.normalize(path.join(__dirname, '/../..'))
-      var regexp = new RegExp('^' + plugin.replace('*', '.*'))
-
-      log.debug('Loading %s from %s', plugin, pluginDirectory)
-      fs.readdirSync(pluginDirectory).filter(function (pluginName) {
-        return IGNORED_PACKAGES.indexOf(pluginName) === -1 && regexp.test(pluginName)
-      }).forEach(function (pluginName) {
-        requirePlugin(pluginDirectory + '/' + pluginName)
-      })
-      return
-    }
-    if (helper.isObject(plugin)) {
-      log.debug('Loading inlined plugin (defining %s).', Object.keys(plugin).join(', '))
+      const pluginDirectory = path.normalize(path.join(__dirname, '/../..'))
+      const regexp = new RegExp(`^${plugin.replace('*', '.*')}`)
+
+      log.debug(`Loading ${plugin} from ${pluginDirectory}`)
+      fs.readdirSync(pluginDirectory)
+        .filter((pluginName) => IGNORED_PACKAGES.indexOf(pluginName) === -1 && regexp.test(pluginName))
+        .forEach((pluginName) => requirePlugin(pluginDirectory + '/' + pluginName))
+    } else if (helper.isObject(plugin)) {
+      log.debug(`Loading inlined plugin (defining ${Object.keys(plugin).join(', ')}).`)
       modules.push(plugin)
-      return
+    } else {
+      log.error(`Invalid plugin ${plugin}`)
+      emitter.emit('load_error', 'plug_in', plugin)
     }
-    log.error('Invalid plugin %s', plugin)
-    emitter.emit('load_error', 'plug_in', plugin)
   })
 
   return modules
 }
+
+exports.resolve = resolve

From d6060d4e2bdddcafc69b4abef511b332ae8bbd48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Usarz?= <lukasz.usarz@gmail.com>
Date: Mon, 11 Jun 2018 17:23:01 +0200
Subject: [PATCH 41/50] fix(test): update bundleResource test timeout (#3038)

---
 test/unit/utils/bundle-utils.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/utils/bundle-utils.spec.js b/test/unit/utils/bundle-utils.spec.js
index bedc574d9..8972e502d 100644
--- a/test/unit/utils/bundle-utils.spec.js
+++ b/test/unit/utils/bundle-utils.spec.js
@@ -16,7 +16,7 @@ describe('BundleUtils.bundleResource', () => {
         expect(fs.existsSync(PathUtils.calculateAbsolutePath('test/unit/fixtures/bundled.js'))).to.be.true
         done()
       })
-  })
+  }).timeout(5000)
 })
 
 describe('BundleUtils.bundleResourceIfNotExist', () => {

From f47d9010181740a4e0f21799e900da9ef80ae0a2 Mon Sep 17 00:00:00 2001
From: lukasz <lukasz.usarz@gmail.com>
Date: Sat, 9 Jun 2018 08:34:11 +0200
Subject: [PATCH 42/50] refactor(middleware): update
 lib/middleware/source_files to ES6

---
 lib/middleware/source_files.js | 39 ++++++++++++++--------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/lib/middleware/source_files.js b/lib/middleware/source_files.js
index 46fbfe0c6..5fd236ccd 100644
--- a/lib/middleware/source_files.js
+++ b/lib/middleware/source_files.js
@@ -1,19 +1,16 @@
-var querystring = require('querystring')
-var _ = require('lodash')
+'use strict'
 
-var common = require('./common')
-var logger = require('../logger')
-var log = logger.create('middleware:source-files')
+const querystring = require('querystring')
+const common = require('./common')
 
-// Files is a Set
-var findByPath = function (files, path) {
-  return _.find(Array.from(files), function (file) {
-    return file.path === path
-  })
+const log = require('../logger').create('middleware:source-files')
+
+function findByPath (files, path) {
+  return Array.from(files).find((file) => file.path === path)
 }
 
-var composeUrl = function (url, basePath, urlRoot, mustEscape) {
-  return (mustEscape ? querystring.unescape(url) : url)
+function composeUrl (url, basePath, urlRoot) {
+  return url
     .replace(urlRoot, '/')
     .replace(/\?.*$/, '')
     .replace(/^\/absolute/, '')
@@ -21,11 +18,11 @@ var composeUrl = function (url, basePath, urlRoot, mustEscape) {
 }
 
 // Source Files middleware is responsible for serving all the source files under the test.
-var createSourceFilesMiddleware = function (filesPromise, serveFile, basePath, urlRoot) {
+function createSourceFilesMiddleware (filesPromise, serveFile, basePath, urlRoot) {
   return function (request, response, next) {
-    var requestedFilePath = composeUrl(request.url, basePath, urlRoot, true)
+    const requestedFilePath = composeUrl(request.url, basePath, urlRoot)
     // When a path contains HTML-encoded characters (e.g %2F used by Jenkins for branches with /)
-    var requestedFilePathUnescaped = composeUrl(request.url, basePath, urlRoot, false)
+    const requestedFilePathUnescaped = composeUrl(querystring.unescape(request.url), basePath, urlRoot)
 
     request.pause()
 
@@ -34,18 +31,15 @@ var createSourceFilesMiddleware = function (filesPromise, serveFile, basePath, u
 
     return filesPromise.then(function (files) {
       // TODO(vojta): change served to be a map rather then an array
-      var file = findByPath(files.served, requestedFilePath) ||
-                 findByPath(files.served, requestedFilePathUnescaped)
-      var rangeHeader = request.headers['range']
+      const file = findByPath(files.served, requestedFilePath) || findByPath(files.served, requestedFilePathUnescaped)
+      const rangeHeader = request.headers['range']
 
       if (file) {
         serveFile(file.contentPath || file.path, rangeHeader, response, function () {
           if (/\?\w+/.test(request.url)) {
-            // files with timestamps - cache one year, rely on timestamps
-            common.setHeavyCacheHeaders(response)
+            common.setHeavyCacheHeaders(response) // files with timestamps - cache one year, rely on timestamps
           } else {
-            // without timestamps - no cache (debug)
-            common.setNoCacheHeaders(response)
+            common.setNoCacheHeaders(response) // without timestamps - no cache (debug)
           }
         }, file.content, file.doNotCache)
       } else {
@@ -61,5 +55,4 @@ createSourceFilesMiddleware.$inject = [
   'filesPromise', 'serveFile', 'config.basePath', 'config.urlRoot'
 ]
 
-// PUBLIC API
 exports.create = createSourceFilesMiddleware

From 5272aa3770f22b9ff63a3bf14277471795d1aa8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Usarz?= <lukasz.usarz@gmail.com>
Date: Tue, 12 Jun 2018 01:47:10 +0200
Subject: [PATCH 43/50] refactor(web-server): refactor lib/web-server to be
 more ES6 (#3034)

---
 lib/server.js     |  4 +--
 lib/web-server.js | 92 +++++++++++++++++++++--------------------------
 2 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/lib/server.js b/lib/server.js
index 1f2054e26..e4b2c2e5a 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -17,7 +17,7 @@ const constant = require('./constants')
 const watcher = require('./watcher')
 const plugin = require('./plugin')
 
-const ws = require('./web-server')
+const createWebServer = require('./web-server').createWebServer
 const preprocessor = require('./preprocessor')
 const Launcher = require('./launcher').Launcher
 const FileList = require('./file-list')
@@ -68,7 +68,7 @@ class Server extends KarmaEventEmitter {
       config: ['value', config],
       preprocess: ['factory', preprocessor.createPreprocessor],
       fileList: ['factory', FileList.factory],
-      webServer: ['factory', ws.create],
+      webServer: ['factory', createWebServer],
       socketServer: ['factory', createSocketIoServer],
       executor: ['factory', Executor.factory],
       // TODO(vojta): remove
diff --git a/lib/web-server.js b/lib/web-server.js
index 8df084d5d..9534ff9a9 100644
--- a/lib/web-server.js
+++ b/lib/web-server.js
@@ -1,49 +1,45 @@
-var fs = require('graceful-fs')
-var http = require('http')
-var https = require('https')
-var path = require('path')
-var connect = require('connect')
-var Promise = require('bluebird')
-
-var common = require('./middleware/common')
-var runnerMiddleware = require('./middleware/runner')
-var stopperMiddleware = require('./middleware/stopper')
-var stripHostMiddleware = require('./middleware/strip_host')
-var karmaMiddleware = require('./middleware/karma')
-var sourceFilesMiddleware = require('./middleware/source_files')
-var proxyMiddleware = require('./middleware/proxy')
-
-var log = require('./logger').create('web-server')
-
-var createCustomHandler = function (customFileHandlers, /* config.basePath */ basePath) {
+'use strict'
+
+const fs = require('graceful-fs')
+const http = require('http')
+const https = require('https')
+const path = require('path')
+const connect = require('connect')
+const Promise = require('bluebird')
+
+const common = require('./middleware/common')
+const runnerMiddleware = require('./middleware/runner')
+const stopperMiddleware = require('./middleware/stopper')
+const stripHostMiddleware = require('./middleware/strip_host')
+const karmaMiddleware = require('./middleware/karma')
+const sourceFilesMiddleware = require('./middleware/source_files')
+const proxyMiddleware = require('./middleware/proxy')
+
+const log = require('./logger').create('web-server')
+
+function createCustomHandler (customFileHandlers, config) {
   return function (request, response, next) {
-    for (var i = 0; i < customFileHandlers.length; i++) {
-      if (customFileHandlers[i].urlRegex.test(request.url)) {
-        return customFileHandlers[i].handler(request, response, 'fake/static', 'fake/adapter',
-          basePath, 'fake/root')
-      }
-    }
-
-    return next()
+    const handler = customFileHandlers.find((handler) => handler.urlRegex.test(request.url))
+    return handler
+      ? handler.handler(request, response, 'fake/static', 'fake/adapter', config.basePath, 'fake/root')
+      : next()
   }
 }
 
-createCustomHandler.$inject = ['customFileHandlers', 'config.basePath']
+createCustomHandler.$inject = ['customFileHandlers', 'config']
 
-var createWebServer = function (injector, emitter, fileList) {
-  var config = injector.get('config')
+function createWebServer (injector, emitter, fileList) {
+  const config = injector.get('config')
   common.initializeMimeTypes(config)
-  var serveStaticFile = common.createServeFile(fs, path.normalize(path.join(__dirname, '/../static')), config)
-  var serveFile = common.createServeFile(fs, null, config)
-  var filesPromise = new common.PromiseContainer()
+  const serveStaticFile = common.createServeFile(fs, path.normalize(path.join(__dirname, '/../static')), config)
+  const serveFile = common.createServeFile(fs, null, config)
+  const filesPromise = new common.PromiseContainer()
 
   // Set an empty list of files to avoid race issues with
   // file_list_modified not having been emitted yet
   filesPromise.set(Promise.resolve(fileList.files))
 
-  emitter.on('file_list_modified', function (files) {
-    filesPromise.set(Promise.resolve(files))
-  })
+  emitter.on('file_list_modified', (files) => filesPromise.set(Promise.resolve(files)))
 
   // locals for webserver module
   // NOTE(vojta): figure out how to do this with DI
@@ -53,15 +49,13 @@ var createWebServer = function (injector, emitter, fileList) {
     filesPromise: ['value', filesPromise]
   }])
 
-  var proxyMiddlewareInstance = injector.invoke(proxyMiddleware.create)
+  const proxyMiddlewareInstance = injector.invoke(proxyMiddleware.create)
 
   log.debug('Instantiating middleware')
-  var handler = connect()
+  const handler = connect()
 
   if (config.beforeMiddleware) {
-    config.beforeMiddleware.forEach(function (middleware) {
-      handler.use(injector.get('middleware:' + middleware))
-    })
+    config.beforeMiddleware.forEach((middleware) => handler.use(injector.get('middleware:' + middleware)))
   }
 
   handler.use(injector.invoke(runnerMiddleware.create))
@@ -76,17 +70,13 @@ var createWebServer = function (injector, emitter, fileList) {
   handler.use(injector.invoke(createCustomHandler))
 
   if (config.middleware) {
-    config.middleware.forEach(function (middleware) {
-      handler.use(injector.get('middleware:' + middleware))
-    })
+    config.middleware.forEach((middleware) => handler.use(injector.get('middleware:' + middleware)))
   }
 
-  handler.use(function (request, response) {
-    common.serve404(response, request.url)
-  })
+  handler.use((request, response) => common.serve404(response, request.url))
 
-  var serverClass = http
-  var serverArguments = [handler]
+  let serverClass = http
+  const serverArguments = [handler]
 
   if (config.protocol === 'https:') {
     serverClass = https
@@ -97,7 +87,7 @@ var createWebServer = function (injector, emitter, fileList) {
     serverClass = config.httpModule
   }
 
-  var server = serverClass.createServer.apply(null, serverArguments)
+  const server = serverClass.createServer.apply(null, serverArguments)
 
   server.on('upgrade', function (req, socket, head) {
     log.debug('upgrade %s', req.url)
@@ -107,5 +97,5 @@ var createWebServer = function (injector, emitter, fileList) {
   return server
 }
 
-// PUBLIC API
-exports.create = createWebServer
+createWebServer.$inject = ['injector', 'emitter', 'fileList']
+exports.createWebServer = createWebServer

From 0dc8ea4ab5d281e62d324ab02bc79acd1bdd38b1 Mon Sep 17 00:00:00 2001
From: lukasz <lukasz.usarz@gmail.com>
Date: Sat, 9 Jun 2018 09:17:03 +0200
Subject: [PATCH 44/50] refactor: unify style of functions declarations

---
 client/karma.js                           |  6 +++---
 client/updater.js                         |  6 +++---
 common/stringify.js                       |  5 +++--
 context/karma.js                          |  6 +++---
 docs/config/01-configuration-file.md      |  2 +-
 lib/launchers/base.js                     |  2 +-
 lib/launchers/capture_timeout.js          |  2 +-
 lib/launchers/process.js                  |  4 ++--
 lib/launchers/retry.js                    |  2 +-
 lib/logger.js                             |  6 +++---
 lib/middleware/karma.js                   | 10 +++++-----
 lib/middleware/proxy.js                   | 14 +++++++-------
 lib/middleware/runner.js                  |  2 +-
 lib/middleware/stopper.js                 |  2 +-
 lib/middleware/strip_host.js              |  2 +-
 lib/preprocessor.js                       |  8 ++++----
 lib/reporters/base_color.js               |  2 +-
 lib/reporters/dots.js                     |  2 +-
 lib/reporters/dots_color.js               |  2 +-
 lib/reporters/progress.js                 |  2 +-
 lib/reporters/progress_color.js           |  2 +-
 tasks/test.js                             |  4 ++--
 test/client/karma.spec.js                 |  4 ++--
 test/client/mocks.js                      |  4 ++--
 test/client/stringify.spec.js             |  2 +-
 test/e2e/step_definitions/core_steps.js   |  2 +-
 test/e2e/support/proxy.js                 |  2 +-
 test/e2e/support/reconnecting/test.js     |  2 +-
 test/e2e/support/tag/tag.js               |  4 ++--
 test/unit/init/formatters.spec.js         |  2 +-
 test/unit/middleware/karma.spec.js        |  2 +-
 test/unit/middleware/source_files.spec.js |  4 ++--
 32 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/client/karma.js b/client/karma.js
index 6a456c759..ff4217c62 100644
--- a/client/karma.js
+++ b/client/karma.js
@@ -2,7 +2,7 @@ var stringify = require('../common/stringify')
 var constant = require('./constants')
 var util = require('../common/util')
 
-var Karma = function (socket, iframe, opener, navigator, location) {
+function Karma (socket, iframe, opener, navigator, location) {
   var startEmitted = false
   var reloadingContext = false
   var self = this
@@ -47,7 +47,7 @@ var Karma = function (socket, iframe, opener, navigator, location) {
   }
 
   var childWindow = null
-  var navigateContextTo = function (url) {
+  function navigateContextTo (url) {
     if (self.config.useIframe === false) {
       // run in new window
       if (self.config.runInParent === false) {
@@ -98,7 +98,7 @@ var Karma = function (socket, iframe, opener, navigator, location) {
 
   this.stringify = stringify
 
-  var clearContext = function () {
+  function clearContext () {
     reloadingContext = true
 
     navigateContextTo('about:blank')
diff --git a/client/updater.js b/client/updater.js
index c5c0cf425..b1562e1cf 100644
--- a/client/updater.js
+++ b/client/updater.js
@@ -1,7 +1,7 @@
 var VERSION = require('./constants').VERSION
 
-var StatusUpdater = function (socket, titleElement, bannerElement, browsersElement) {
-  var updateBrowsersInfo = function (browsers) {
+function StatusUpdater (socket, titleElement, bannerElement, browsersElement) {
+  function updateBrowsersInfo (browsers) {
     if (!browsersElement) {
       return
     }
@@ -14,7 +14,7 @@ var StatusUpdater = function (socket, titleElement, bannerElement, browsersEleme
     browsersElement.innerHTML = items.join('\n')
   }
 
-  var updateBanner = function (status) {
+  function updateBanner (status) {
     return function (param) {
       if (!titleElement || !bannerElement) {
         return
diff --git a/common/stringify.js b/common/stringify.js
index aece384d3..491a08d87 100644
--- a/common/stringify.js
+++ b/common/stringify.js
@@ -1,10 +1,11 @@
 var serialize = require('dom-serialize')
 var instanceOf = require('./util').instanceOf
-var isNode = function (obj) {
+
+function isNode (obj) {
   return (obj.tagName || obj.nodeName) && obj.nodeType
 }
 
-var stringify = function stringify (obj, depth) {
+function stringify (obj, depth) {
   if (depth === 0) {
     return '...'
   }
diff --git a/context/karma.js b/context/karma.js
index aac5a396f..2403ee898 100644
--- a/context/karma.js
+++ b/context/karma.js
@@ -2,7 +2,7 @@
 var stringify = require('../common/stringify')
 
 // Define our context Karma constructor
-var ContextKarma = function (callParentKarmaMethod) {
+function ContextKarma (callParentKarmaMethod) {
   // Define local variables
   var hasError = false
   var self = this
@@ -30,7 +30,7 @@ var ContextKarma = function (callParentKarmaMethod) {
   }
 
   // Define our start handler
-  var UNIMPLEMENTED_START = function () {
+  function UNIMPLEMENTED_START () {
     this.error('You need to include some adapter that implements __karma__.start method!')
   }
   // all files loaded, let's start the execution
@@ -98,7 +98,7 @@ var ContextKarma = function (callParentKarmaMethod) {
     }
 
     // If we want to overload our console, then do it
-    var getConsole = function (currentWindow) {
+    function getConsole (currentWindow) {
       return currentWindow.console || {
         log: function () {},
         info: function () {},
diff --git a/docs/config/01-configuration-file.md b/docs/config/01-configuration-file.md
index a2bb5f5bb..02ab11bdb 100644
--- a/docs/config/01-configuration-file.md
+++ b/docs/config/01-configuration-file.md
@@ -458,7 +458,7 @@ The plugin must provide an express/connect middleware function (details about th
 
 **Example:**
 ```javascript
-var CustomMiddlewareFactory = function (config) {
+function CustomMiddlewareFactory (config) {
   return function (request, response, /* next */) {
     response.writeHead(200)
     return response.end("content!")
diff --git a/lib/launchers/base.js b/lib/launchers/base.js
index c63a94a8a..7a1c95ee3 100644
--- a/lib/launchers/base.js
+++ b/lib/launchers/base.js
@@ -15,7 +15,7 @@ var BEING_FORCE_KILLED = 6
 /**
  * Base launcher that any custom launcher extends.
  */
-var BaseLauncher = function (id, emitter) {
+function BaseLauncher (id, emitter) {
   if (this.start) {
     return
   }
diff --git a/lib/launchers/capture_timeout.js b/lib/launchers/capture_timeout.js
index fe0e166db..d520fb57a 100644
--- a/lib/launchers/capture_timeout.js
+++ b/lib/launchers/capture_timeout.js
@@ -3,7 +3,7 @@ var log = require('../logger').create('launcher')
 /**
  * Kill browser if it does not capture in given `captureTimeout`.
  */
-var CaptureTimeoutLauncher = function (timer, captureTimeout) {
+function CaptureTimeoutLauncher (timer, captureTimeout) {
   if (!captureTimeout) {
     return
   }
diff --git a/lib/launchers/process.js b/lib/launchers/process.js
index 8d6a2063f..5975e5bf9 100644
--- a/lib/launchers/process.js
+++ b/lib/launchers/process.js
@@ -2,7 +2,7 @@ var path = require('path')
 var log = require('../logger').create('launcher')
 var env = process.env
 
-var ProcessLauncher = function (spawn, tempDir, timer, processKillTimeout) {
+function ProcessLauncher (spawn, tempDir, timer, processKillTimeout) {
   var self = this
   var onExitCallback
   var killTimeout = processKillTimeout || 2000
@@ -164,7 +164,7 @@ ProcessLauncher.decoratorFactory = function (timer) {
   return function (launcher, processKillTimeout) {
     var spawn = require('child_process').spawn
 
-    var spawnWithoutOutput = function () {
+    function spawnWithoutOutput () {
       var proc = spawn.apply(null, arguments)
       proc.stdout.resume()
       proc.stderr.resume()
diff --git a/lib/launchers/retry.js b/lib/launchers/retry.js
index f7f076827..257bde30a 100644
--- a/lib/launchers/retry.js
+++ b/lib/launchers/retry.js
@@ -1,6 +1,6 @@
 var log = require('../logger').create('launcher')
 
-var RetryLauncher = function (retryLimit) {
+function RetryLauncher (retryLimit) {
   var self = this
 
   this._retryLimit = retryLimit
diff --git a/lib/logger.js b/lib/logger.js
index cd8783ab4..8c58ec22f 100644
--- a/lib/logger.js
+++ b/lib/logger.js
@@ -21,7 +21,7 @@ var constant = require('./constants')
 //   to allow for fine grained configuration of log4js. For more information
 //   see https://github.com/nomiddlename/log4js-node.
 //   *Array* is also accepted for backwards compatibility.
-var setup = function (level, colors, appenders) {
+function setup (level, colors, appenders) {
   // Turn color on/off on the console appenders with pattern layout
   var pattern = colors ? constant.COLOR_PATTERN : constant.NO_COLOR_PATTERN
   if (appenders) {
@@ -69,7 +69,7 @@ var setup = function (level, colors, appenders) {
 //   to allow for fine grained configuration of log4js. For more information
 //   see https://github.com/nomiddlename/log4js-node.
 //   *Array* is also accepted for backwards compatibility.
-var setupFromConfig = function (config, appenders) {
+function setupFromConfig (config, appenders) {
   var useColors = true
   var logLevel = constant.LOG_INFO
 
@@ -90,7 +90,7 @@ const loggerCache = {}
 //   If the `name = 'socket.io'` this will create a special wrapper
 //   to be used as a logger for socket.io.
 // * `level`, which defaults to the global level.
-var create = function (name, level) {
+function create (name, level) {
   name = name || 'karma'
   var logger
   if (loggerCache.hasOwnProperty(name)) {
diff --git a/lib/middleware/karma.js b/lib/middleware/karma.js
index b9d06fcfc..5b4ac8718 100644
--- a/lib/middleware/karma.js
+++ b/lib/middleware/karma.js
@@ -18,7 +18,7 @@ var _ = require('lodash')
 
 var log = require('../logger').create('middleware:karma')
 
-var urlparse = function (urlStr) {
+function urlparse (urlStr) {
   var urlObj = url.parse(urlStr, true)
   urlObj.query = urlObj.query || {}
   return urlObj
@@ -44,7 +44,7 @@ var FILE_TYPES = [
   'module'
 ]
 
-var filePathToUrlPath = function (filePath, basePath, urlRoot, proxyPath) {
+function filePathToUrlPath (filePath, basePath, urlRoot, proxyPath) {
   if (filePath.indexOf(basePath) === 0) {
     return proxyPath + urlRoot.substr(1) + 'base' + filePath.substr(basePath.length)
   }
@@ -52,7 +52,7 @@ var filePathToUrlPath = function (filePath, basePath, urlRoot, proxyPath) {
   return proxyPath + urlRoot.substr(1) + 'absolute' + filePath
 }
 
-var getXUACompatibleMetaElement = function (url) {
+function getXUACompatibleMetaElement (url) {
   var tag = ''
   var urlObj = urlparse(url)
   if (urlObj.query['x-ua-compatible']) {
@@ -62,7 +62,7 @@ var getXUACompatibleMetaElement = function (url) {
   return tag
 }
 
-var getXUACompatibleUrl = function (url) {
+function getXUACompatibleUrl (url) {
   var value = ''
   var urlObj = urlparse(url)
   if (urlObj.query['x-ua-compatible']) {
@@ -71,7 +71,7 @@ var getXUACompatibleUrl = function (url) {
   return value
 }
 
-var createKarmaMiddleware = function (
+function createKarmaMiddleware (
   filesPromise,
   serveStaticFile,
   serveFile,
diff --git a/lib/middleware/proxy.js b/lib/middleware/proxy.js
index 8bcef9e36..d493b2e3c 100644
--- a/lib/middleware/proxy.js
+++ b/lib/middleware/proxy.js
@@ -4,8 +4,8 @@ var _ = require('lodash')
 
 var log = require('../logger').create('proxy')
 
-var parseProxyConfig = function (proxies, config) {
-  var endsWithSlash = function (str) {
+function parseProxyConfig (proxies, config) {
+  function endsWithSlash (str) {
     return str.substr(-1) === '/'
   }
 
@@ -96,16 +96,16 @@ var parseProxyConfig = function (proxies, config) {
  * @param urlRoot The URL root that karma is mounted on
  * @return {Function} handler function
  */
-var createProxyHandler = function (proxies, urlRoot) {
+function createProxyHandler (proxies, urlRoot) {
   if (!proxies.length) {
-    var nullProxy = function createNullProxy (request, response, next) {
+    const nullProxy = function (request, response, next) {
       return next()
     }
     nullProxy.upgrade = function upgradeNullProxy () {}
     return nullProxy
   }
 
-  var middleware = function createProxy (request, response, next) {
+  function createProxy (request, response, next) {
     var proxyRecord = _.find(proxies, function (p) {
       return request.url.indexOf(p.path) === 0
     })
@@ -119,7 +119,7 @@ var createProxyHandler = function (proxies, urlRoot) {
     proxyRecord.proxy.web(request, response)
   }
 
-  middleware.upgrade = function upgradeProxy (request, socket, head) {
+  createProxy.upgrade = function upgradeProxy (request, socket, head) {
     // special-case karma's route to avoid upgrading it
     if (request.url.indexOf(urlRoot) === 0) {
       log.debug('NOT upgrading proxyWebSocketRequest %s', request.url)
@@ -140,7 +140,7 @@ var createProxyHandler = function (proxies, urlRoot) {
     proxyRecord.proxy.ws(request, socket, head)
   }
 
-  return middleware
+  return createProxy
 }
 
 exports.create = function (/* config */config, /* config.proxies */proxies) {
diff --git a/lib/middleware/runner.js b/lib/middleware/runner.js
index 22e62dd41..a90cf5a73 100644
--- a/lib/middleware/runner.js
+++ b/lib/middleware/runner.js
@@ -12,7 +12,7 @@ var constant = require('../constants')
 var json = require('body-parser').json()
 
 // TODO(vojta): disable when single-run mode
-var createRunnerMiddleware = function (emitter, fileList, capturedBrowsers, reporter, executor,
+function createRunnerMiddleware (emitter, fileList, capturedBrowsers, reporter, executor,
   /* config.protocol */ protocol, /* config.hostname */ hostname, /* config.port */
   port, /* config.urlRoot */ urlRoot, config) {
   return function (request, response, next) {
diff --git a/lib/middleware/stopper.js b/lib/middleware/stopper.js
index 8d41cee00..97d8c7523 100644
--- a/lib/middleware/stopper.js
+++ b/lib/middleware/stopper.js
@@ -4,7 +4,7 @@
 
 var log = require('../logger').create('middleware:stopper')
 
-var createStopperMiddleware = function (urlRoot) {
+function createStopperMiddleware (urlRoot) {
   return function (request, response, next) {
     if (request.url !== urlRoot + 'stop') return next()
     response.writeHead(200)
diff --git a/lib/middleware/strip_host.js b/lib/middleware/strip_host.js
index 1dd75b323..984f89f2d 100644
--- a/lib/middleware/strip_host.js
+++ b/lib/middleware/strip_host.js
@@ -3,7 +3,7 @@
  * This to handle requests that uses (normally over proxies) an absoluteURI as request path
  */
 
-var createStripHostMiddleware = function () {
+function createStripHostMiddleware () {
   return function (request, response, next) {
     function stripHostFromUrl (url) {
       return url.replace(/^http[s]?:\/\/([a-z\-.:\d]+)\//, '/')
diff --git a/lib/preprocessor.js b/lib/preprocessor.js
index 1c47849f4..7d1c8bfb4 100644
--- a/lib/preprocessor.js
+++ b/lib/preprocessor.js
@@ -6,13 +6,13 @@ var combineLists = require('combine-lists')
 
 var log = require('./logger').create('preprocess')
 
-var sha1 = function (data) {
+function sha1 (data) {
   var hash = crypto.createHash('sha1')
   hash.update(data)
   return hash.digest('hex')
 }
 
-var createNextProcessor = function (preprocessors, file, done) {
+function createNextProcessor (preprocessors, file, done) {
   return function nextPreprocessor (error, content) {
     // normalize B-C
     if (arguments.length === 1 && typeof error === 'string') {
@@ -37,14 +37,14 @@ var createNextProcessor = function (preprocessors, file, done) {
   }
 }
 
-var createPreprocessor = function (config, basePath, injector) {
+function createPreprocessor (config, basePath, injector) {
   var alreadyDisplayedErrors = {}
   var instances = {}
   var patterns = Object.keys(config)
 
   var emitter = injector.get('emitter')
 
-  var instantiatePreprocessor = function (name) {
+  function instantiatePreprocessor (name) {
     if (alreadyDisplayedErrors[name]) {
       return
     }
diff --git a/lib/reporters/base_color.js b/lib/reporters/base_color.js
index d25abbc56..cfe572a6c 100644
--- a/lib/reporters/base_color.js
+++ b/lib/reporters/base_color.js
@@ -1,6 +1,6 @@
 require('colors')
 
-var BaseColorReporter = function () {
+function BaseColorReporter () {
   this.USE_COLORS = true
 
   this.LOG_SINGLE_BROWSER = '%s: ' + '%s'.cyan + '\n'
diff --git a/lib/reporters/dots.js b/lib/reporters/dots.js
index 019d861e4..4a5dd84f1 100644
--- a/lib/reporters/dots.js
+++ b/lib/reporters/dots.js
@@ -1,6 +1,6 @@
 var BaseReporter = require('./base')
 
-var DotsReporter = function (formatError, reportSlow, useColors, browserConsoleLogOptions) {
+function DotsReporter (formatError, reportSlow, useColors, browserConsoleLogOptions) {
   BaseReporter.call(this, formatError, reportSlow, useColors, browserConsoleLogOptions)
 
   var DOTS_WRAP = 80
diff --git a/lib/reporters/dots_color.js b/lib/reporters/dots_color.js
index 312fa26e4..331bfe7a0 100644
--- a/lib/reporters/dots_color.js
+++ b/lib/reporters/dots_color.js
@@ -1,7 +1,7 @@
 var DotsReporter = require('./dots')
 var BaseColorReporter = require('./base_color')
 
-var DotsColorReporter = function (formatError, reportSlow, useColors, browserConsoleLogOptions) {
+function DotsColorReporter (formatError, reportSlow, useColors, browserConsoleLogOptions) {
   DotsReporter.call(this, formatError, reportSlow, useColors, browserConsoleLogOptions)
   BaseColorReporter.call(this)
   this.EXCLUSIVELY_USE_COLORS = true
diff --git a/lib/reporters/progress.js b/lib/reporters/progress.js
index eb2f4f27d..1f99928f6 100644
--- a/lib/reporters/progress.js
+++ b/lib/reporters/progress.js
@@ -1,6 +1,6 @@
 var BaseReporter = require('./base')
 
-var ProgressReporter = function (formatError, reportSlow, useColors, browserConsoleLogOptions) {
+function ProgressReporter (formatError, reportSlow, useColors, browserConsoleLogOptions) {
   BaseReporter.call(this, formatError, reportSlow, useColors, browserConsoleLogOptions)
 
   this.EXCLUSIVELY_USE_COLORS = false
diff --git a/lib/reporters/progress_color.js b/lib/reporters/progress_color.js
index f5c2c3a0c..572f2fa43 100644
--- a/lib/reporters/progress_color.js
+++ b/lib/reporters/progress_color.js
@@ -1,7 +1,7 @@
 var ProgressReporter = require('./progress')
 var BaseColorReporter = require('./base_color')
 
-var ProgressColorReporter = function (formatError, reportSlow, useColors, browserConsoleLogOptions) {
+function ProgressColorReporter (formatError, reportSlow, useColors, browserConsoleLogOptions) {
   ProgressReporter.call(this, formatError, reportSlow, useColors, browserConsoleLogOptions)
   BaseColorReporter.call(this)
   this.EXCLUSIVELY_USE_COLORS = true
diff --git a/tasks/test.js b/tasks/test.js
index 667f35e92..9a2dd3a56 100644
--- a/tasks/test.js
+++ b/tasks/test.js
@@ -12,7 +12,7 @@ module.exports = function (grunt) {
     var path = require('path')
     var cmd = path.join(__dirname, '..', 'bin', 'karma')
 
-    var spawnKarma = function (args, callback) {
+    function spawnKarma (args, callback) {
       grunt.log.writeln(['Running', cmd].concat(args).join(' '))
       var child
       if (process.platform === 'win32') {
@@ -24,7 +24,7 @@ module.exports = function (grunt) {
       child.stderr.pipe(process.stderr)
     }
 
-    var exec = function (args, failMsg) {
+    function exec (args, failMsg) {
       spawnKarma(args, function (err, result, code) {
         if (code) {
           console.error(err)
diff --git a/test/client/karma.spec.js b/test/client/karma.spec.js
index b041633b1..776d1da06 100644
--- a/test/client/karma.spec.js
+++ b/test/client/karma.spec.js
@@ -11,7 +11,7 @@ var MockSocket = require('./mocks').Socket
 describe('Karma', function () {
   var socket, k, ck, windowNavigator, windowLocation, windowStub, startSpy, iframe, clientWindow
 
-  var setTransportTo = function (transportName) {
+  function setTransportTo (transportName) {
     socket._setTransportNameTo(transportName)
     socket.emit('connect')
   }
@@ -72,7 +72,7 @@ describe('Karma', function () {
   })
 
   it('should remove reference to start even after syntax error', function () {
-    var ADAPTER_START_FN = function () {}
+    function ADAPTER_START_FN () {}
 
     ck.start = ADAPTER_START_FN
     ck.error('syntax error', '/some/file.js', 11)
diff --git a/test/client/mocks.js b/test/client/mocks.js
index 94ee80457..f49357d21 100644
--- a/test/client/mocks.js
+++ b/test/client/mocks.js
@@ -1,4 +1,4 @@
-var Emitter = function () {
+function Emitter () {
   var listeners = {}
 
   this.on = function (event, fn) {
@@ -22,7 +22,7 @@ var Emitter = function () {
   }
 }
 
-var MockSocket = function () {
+function MockSocket () {
   Emitter.call(this)
 
   this.socket = {transport: {name: 'websocket'}}
diff --git a/test/client/stringify.spec.js b/test/client/stringify.spec.js
index 45a91c289..aaeea7dd0 100644
--- a/test/client/stringify.spec.js
+++ b/test/client/stringify.spec.js
@@ -28,7 +28,7 @@ describe('stringify', function () {
 
   it('should serialize functions', function () {
     function abc (a, b, c) { return 'whatever' }
-    var def = function (d, e, f) { return 'whatever' }
+    function def (d, e, f) { return 'whatever' }
 
     var abcString = stringify(abc)
     var partsAbc = ['function', 'abc', '(a, b, c)', '{ ... }']
diff --git a/test/e2e/step_definitions/core_steps.js b/test/e2e/step_definitions/core_steps.js
index dbd638d0b..8c7ca3025 100644
--- a/test/e2e/step_definitions/core_steps.js
+++ b/test/e2e/step_definitions/core_steps.js
@@ -19,7 +19,7 @@ cucumber.defineSupportCode((a) => {
   var cleansingNeeded = true
   var additionalArgs = []
 
-  var cleanseIfNeeded = function () {
+  function cleanseIfNeeded () {
     if (cleansingNeeded) {
       try {
         rimraf.sync(tmpDir)
diff --git a/test/e2e/support/proxy.js b/test/e2e/support/proxy.js
index bd58e3474..3a92e65c9 100644
--- a/test/e2e/support/proxy.js
+++ b/test/e2e/support/proxy.js
@@ -1,7 +1,7 @@
 var http = require('http')
 var httpProxy = require('http-proxy')
 
-var Proxy = function () {
+function Proxy () {
   var self = this
   self.running = false
 
diff --git a/test/e2e/support/reconnecting/test.js b/test/e2e/support/reconnecting/test.js
index 6c292a368..238a51aaa 100644
--- a/test/e2e/support/reconnecting/test.js
+++ b/test/e2e/support/reconnecting/test.js
@@ -1,7 +1,7 @@
 /* globals plus */
 describe('plus', function () {
   // super hacky way to get the actual socket to manipulate it...
-  var socket = function () {
+  function socket () {
     return window.parent.karma.socket
   }
 
diff --git a/test/e2e/support/tag/tag.js b/test/e2e/support/tag/tag.js
index 0a411eabe..3f6b239c2 100644
--- a/test/e2e/support/tag/tag.js
+++ b/test/e2e/support/tag/tag.js
@@ -1,9 +1,9 @@
 /* eslint-disable no-unused-vars */
-var isFirefoxBefore59 = function () {
+function isFirefoxBefore59 () {
   return typeof InstallTrigger !== 'undefined' && parseFloat(navigator.userAgent.match(/\d+\.\d+$/)) < 59
 }
 
-var containsJsTag = function () {
+function containsJsTag () {
   var scripts = document.getElementsByTagName('script')
   for (var i = 0; i < scripts.length; i++) {
     if (scripts[i].type.indexOf(';version=') > -1) {
diff --git a/test/unit/init/formatters.spec.js b/test/unit/init/formatters.spec.js
index 2d45b1006..d6f783782 100644
--- a/test/unit/init/formatters.spec.js
+++ b/test/unit/init/formatters.spec.js
@@ -9,7 +9,7 @@ describe('init/formatters', () => {
     })
 
     describe('formatAnswers', () => {
-      var createAnswers = function (ans) {
+      function createAnswers (ans) {
         ans = ans || {}
         ans.frameworks = ans.frameworks || []
         ans.files = ans.files || []
diff --git a/test/unit/middleware/karma.spec.js b/test/unit/middleware/karma.spec.js
index ae76de2b2..6d1eab8e1 100644
--- a/test/unit/middleware/karma.spec.js
+++ b/test/unit/middleware/karma.spec.js
@@ -86,7 +86,7 @@ describe('middleware.karma', () => {
     return req
   }
 
-  var callHandlerWith = function (urlPath, next) {
+  function callHandlerWith (urlPath, next) {
     var promise = handler(normalizedHttpRequest(urlPath), response, next || nextSpy)
     if (promise && promise.done) promise.done()
   }
diff --git a/test/unit/middleware/source_files.spec.js b/test/unit/middleware/source_files.spec.js
index 92475d373..540e9cf0b 100644
--- a/test/unit/middleware/source_files.spec.js
+++ b/test/unit/middleware/source_files.spec.js
@@ -32,7 +32,7 @@ describe('middleware.source_files', function () {
 
   var serveFile = createServeFile(fsMock, null)
 
-  var createServer = function (f, s, basePath) {
+  function createServer (f, s, basePath) {
     var handler = createSourceFilesMiddleware(f.promise, s, basePath)
     return http.createServer(function (req, res) {
       next = sinon.spy(function (err) {
@@ -59,7 +59,7 @@ describe('middleware.source_files', function () {
     return next.reset()
   })
 
-  var servedFiles = function (list) {
+  function servedFiles (list) {
     return files.resolve({included: [], served: list})
   }
 

From 05dd09a73232c31545d713b90dcaad260da00ff8 Mon Sep 17 00:00:00 2001
From: johnjbarton <johnjbarton@johnjbarton.com>
Date: Thu, 14 Jun 2018 09:14:18 -0700
Subject: [PATCH 45/50] fix(config): Log the final config just before use.
 (#3041)

Many problems in karma use can be resolved by reading the config, but plugins can mutate the config.
Here debug logging will give the final result after any mutations.
---
 lib/server.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/server.js b/lib/server.js
index e4b2c2e5a..c5779f786 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -58,6 +58,8 @@ class Server extends KarmaEventEmitter {
 
     const config = cfg.parseConfig(cliOptions.configFile, cliOptions)
 
+    this.log.debug('Final config', JSON.stringify(config, null, 2))
+
     let modules = [{
       helper: ['value', helper],
       logger: ['value', logger],

From a19b8d4614287ea1c931d84715d7be2259182d51 Mon Sep 17 00:00:00 2001
From: lukasz <lukasz.usarz@gmail.com>
Date: Mon, 11 Jun 2018 14:40:03 +0200
Subject: [PATCH 46/50] fix(server): check available port before start server
 (fix #1476, fix #3011)

---
 lib/server.js                     | 66 +++++++++++------------
 lib/utils/net-utils.js            | 33 ++++++++++++
 test/unit/server.spec.js          | 90 ++++++++++++++-----------------
 test/unit/utils/net-utils.spec.js | 50 +++++++++++++++++
 4 files changed, 153 insertions(+), 86 deletions(-)
 create mode 100644 lib/utils/net-utils.js
 create mode 100644 test/unit/utils/net-utils.spec.js

diff --git a/lib/server.js b/lib/server.js
index c5779f786..f504f05f8 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -9,6 +9,7 @@ const tmp = require('tmp')
 const fs = require('fs')
 const path = require('path')
 const BundleUtils = require('./utils/bundle-utils')
+const NetUtils = require('./utils/net-utils')
 const root = global || window || this
 
 const cfg = require('./config')
@@ -97,8 +98,24 @@ class Server extends KarmaEventEmitter {
     this._injector = new di.Injector(modules)
   }
 
+  dieOnError (error) {
+    this.log.error(error)
+    process.exitCode = 1
+    process.kill(process.pid, 'SIGINT')
+  }
+
   start () {
-    this._injector.invoke(this._start, this)
+    const config = this.get('config')
+    return Promise.all([
+      BundleUtils.bundleResourceIfNotExist('client/main.js', 'static/karma.js'),
+      BundleUtils.bundleResourceIfNotExist('context/main.js', 'static/context.js')
+    ])
+      .then(() => NetUtils.getAvailablePort(config.port, config.listenAddress))
+      .then((port) => {
+        config.port = port
+        this._injector.invoke(this._start, this)
+      })
+      .catch(this.dieOnError.bind(this))
   }
 
   get (token) {
@@ -126,47 +143,26 @@ class Server extends KarmaEventEmitter {
     const singleRunBrowsers = new BrowserCollection(new EventEmitter())
     let singleRunBrowserNotCaptured = false
 
-    webServer.on('error', (e) => {
-      if (e.code === 'EADDRINUSE') {
-        this.log.warn('Port %d in use', config.port)
-        config.port++
-        webServer.listen(config.port, config.listenAddress)
-      } else {
-        throw e
-      }
-    })
+    webServer.on('error', this.dieOnError.bind(this))
 
     const afterPreprocess = () => {
       if (config.autoWatch) {
         this._injector.invoke(watcher.watch)
       }
 
-      return Promise.all([
-        BundleUtils.bundleResourceIfNotExist('client/main.js', 'static/karma.js'),
-        BundleUtils.bundleResourceIfNotExist('context/main.js', 'static/context.js')
-      ])
-        .then(() => {
-          webServer.listen(config.port, config.listenAddress, () => {
-            this.log.info(`Karma v${constant.VERSION} server started at ${config.protocol}//${config.listenAddress}:${config.port}${config.urlRoot}`)
-
-            this.emit('listening', config.port)
-            if (config.browsers && config.browsers.length) {
-              this._injector.invoke(launcher.launch, launcher).forEach((browserLauncher) => {
-                singleRunDoneBrowsers[browserLauncher.id] = false
-              })
-            }
-            if (this.loadErrors.length > 0) {
-              this.log.error('Found %d load error%s', this.loadErrors.length, this.loadErrors.length === 1 ? '' : 's')
-              process.exitCode = 1
-              process.kill(process.pid, 'SIGINT')
-            }
+      webServer.listen(config.port, config.listenAddress, () => {
+        this.log.info(`Karma v${constant.VERSION} server started at ${config.protocol}//${config.listenAddress}:${config.port}${config.urlRoot}`)
+
+        this.emit('listening', config.port)
+        if (config.browsers && config.browsers.length) {
+          this._injector.invoke(launcher.launch, launcher).forEach((browserLauncher) => {
+            singleRunDoneBrowsers[browserLauncher.id] = false
           })
-        })
-        .catch((error) => {
-          this.log.error('Front-end script compile failed with error: ' + error)
-          process.exitCode = 1
-          process.kill(process.pid, 'SIGINT')
-        })
+        }
+        if (this.loadErrors.length > 0) {
+          this.dieOnError(new Error(`Found ${this.loadErrors.length} load error${this.loadErrors.length === 1 ? '' : 's'}`))
+        }
+      })
     }
 
     fileList.refresh().then(afterPreprocess, afterPreprocess)
diff --git a/lib/utils/net-utils.js b/lib/utils/net-utils.js
new file mode 100644
index 000000000..7262ba40b
--- /dev/null
+++ b/lib/utils/net-utils.js
@@ -0,0 +1,33 @@
+'use strict'
+
+const Promise = require('bluebird')
+const net = require('net')
+
+const NetUtils = {
+  isPortAvailable (port, listenAddress) {
+    return new Promise((resolve, reject) => {
+      const server = net.createServer()
+
+      server.unref()
+      server.on('error', (err) => {
+        server.close()
+        if (err.code === 'EADDRINUSE' || err.code === 'EACCES') {
+          resolve(false)
+        } else {
+          reject(err)
+        }
+      })
+
+      server.listen(port, listenAddress, () => {
+        server.close(() => resolve(true))
+      })
+    })
+  },
+
+  getAvailablePort (port, listenAddress) {
+    return NetUtils.isPortAvailable(port, listenAddress)
+      .then((available) => available ? port : NetUtils.getAvailablePort(port + 1, listenAddress))
+  }
+}
+
+module.exports = NetUtils
diff --git a/test/unit/server.spec.js b/test/unit/server.spec.js
index 022d7ecbe..a13104739 100644
--- a/test/unit/server.spec.js
+++ b/test/unit/server.spec.js
@@ -1,5 +1,6 @@
 var Server = require('../../lib/server')
 var BundleUtils = require('../../lib/utils/bundle-utils')
+var NetUtils = require('../../lib/utils/net-utils')
 var BrowserCollection = require('../../lib/browser_collection')
 
 describe('server', () => {
@@ -105,23 +106,34 @@ describe('server', () => {
     webServerOnError = null
   })
 
-  // ============================================================================
-  // server._start()
-  // ============================================================================
-  describe('_start', () => {
-    it('should compile static resources', (done) => {
+  describe('start', () => {
+    beforeEach(() => {
       sinon.spy(BundleUtils, 'bundleResourceIfNotExist')
+      sinon.stub(NetUtils, 'getAvailablePort').resolves(9876)
+      sinon.stub(server, 'get').withArgs('config').returns({ port: 9876, listenAddress: '127.0.0.1' })
+    })
 
-      server._start(mockConfig, mockLauncher, null, mockFileList, browserCollection, mockExecutor, doneSpy)
-
-      fileListOnResolve().then(() => {
+    it('should compile static resources', (done) => {
+      server.start().then(() => {
         expect(BundleUtils.bundleResourceIfNotExist).to.have.been.calledWith('client/main.js', 'static/karma.js')
         expect(BundleUtils.bundleResourceIfNotExist).to.have.been.calledWith('context/main.js', 'static/context.js')
         done()
       })
     })
 
-    it('should start the web server after all files have been preprocessed successfully', (done) => {
+    it('should search for available port', (done) => {
+      server.start().then(() => {
+        expect(NetUtils.getAvailablePort).to.have.been.calledWith(9876, '127.0.0.1')
+        done()
+      })
+    })
+  })
+
+  // ============================================================================
+  // server._start()
+  // ============================================================================
+  describe('_start', () => {
+    it('should start the web server after all files have been preprocessed successfully', () => {
       server._start(mockConfig, mockLauncher, null, mockFileList, browserCollection, mockExecutor, doneSpy)
 
       expect(mockFileList.refresh).to.have.been.called
@@ -129,14 +141,12 @@ describe('server', () => {
       expect(mockWebServer.listen).not.to.have.been.called
       expect(server._injector.invoke).not.to.have.been.calledWith(mockLauncher.launch, mockLauncher)
 
-      fileListOnResolve().then(() => {
-        expect(mockWebServer.listen).to.have.been.called
-        expect(server._injector.invoke).to.have.been.calledWith(mockLauncher.launch, mockLauncher)
-        done()
-      })
+      fileListOnResolve()
+      expect(mockWebServer.listen).to.have.been.called
+      expect(server._injector.invoke).to.have.been.calledWith(mockLauncher.launch, mockLauncher)
     })
 
-    it('should start the web server after all files have been preprocessed with an error', (done) => {
+    it('should start the web server after all files have been preprocessed with an error', () => {
       server._start(mockConfig, mockLauncher, null, mockFileList, browserCollection, mockExecutor, doneSpy)
 
       expect(mockFileList.refresh).to.have.been.called
@@ -144,27 +154,23 @@ describe('server', () => {
       expect(mockWebServer.listen).not.to.have.been.called
       expect(server._injector.invoke).not.to.have.been.calledWith(mockLauncher.launch, mockLauncher)
 
-      fileListOnReject().then(() => {
-        expect(mockWebServer.listen).to.have.been.called
-        expect(server._injector.invoke).to.have.been.calledWith(mockLauncher.launch, mockLauncher)
-        done()
-      })
+      fileListOnReject()
+      expect(mockWebServer.listen).to.have.been.called
+      expect(server._injector.invoke).to.have.been.calledWith(mockLauncher.launch, mockLauncher)
     })
 
-    it('should launch browsers after the web server has started', (done) => {
+    it('should launch browsers after the web server has started', () => {
       server._start(mockConfig, mockLauncher, null, mockFileList, browserCollection, mockExecutor, doneSpy)
 
       expect(mockWebServer.listen).not.to.have.been.called
       expect(server._injector.invoke).not.to.have.been.calledWith(mockLauncher.launch, mockLauncher)
 
-      fileListOnResolve().then(() => {
-        expect(mockWebServer.listen).to.have.been.called
-        expect(server._injector.invoke).to.have.been.calledWith(mockLauncher.launch, mockLauncher)
-        done()
-      })
+      fileListOnResolve()
+      expect(mockWebServer.listen).to.have.been.called
+      expect(server._injector.invoke).to.have.been.calledWith(mockLauncher.launch, mockLauncher)
     })
 
-    it('should listen on the listenAddress in the config', (done) => {
+    it('should listen on the listenAddress in the config', () => {
       server._start(mockConfig, mockLauncher, null, mockFileList, browserCollection, mockExecutor, doneSpy)
 
       expect(mockWebServer.listen).not.to.have.been.called
@@ -172,28 +178,12 @@ describe('server', () => {
 
       expect(mockConfig.listenAddress).to.be.equal('127.0.0.1')
 
-      fileListOnResolve().then(() => {
-        expect(mockWebServer.listen).to.have.been.calledWith(9876, '127.0.0.1')
-        expect(mockConfig.listenAddress).to.be.equal('127.0.0.1')
-        done()
-      })
-    })
-
-    it('should try next port if already in use', () => {
-      server._start(mockConfig, mockLauncher, null, mockFileList, browserCollection, mockExecutor, doneSpy)
-
-      expect(mockWebServer.listen).not.to.have.been.called
-      expect(webServerOnError).not.to.be.null
-
-      expect(mockConfig.port).to.be.equal(9876)
-
-      webServerOnError({code: 'EADDRINUSE'})
-
-      expect(mockWebServer.listen).to.have.been.calledWith(9877)
-      expect(mockConfig.port).to.be.equal(9877)
+      fileListOnResolve()
+      expect(mockWebServer.listen).to.have.been.calledWith(9876, '127.0.0.1')
+      expect(mockConfig.listenAddress).to.be.equal('127.0.0.1')
     })
 
-    it('should emit a listening event once server begin accepting connections', (done) => {
+    it('should emit a listening event once server begin accepting connections', () => {
       server._start(mockConfig, mockLauncher, null, mockFileList, browserCollection, mockExecutor, doneSpy)
 
       var listening = sinon.spy()
@@ -201,10 +191,8 @@ describe('server', () => {
 
       expect(listening).not.to.have.been.called
 
-      fileListOnResolve().then(() => {
-        expect(listening).to.have.been.calledWith(9876)
-        done()
-      })
+      fileListOnResolve()
+      expect(listening).to.have.been.calledWith(9876)
     })
 
     it('should emit a browsers_ready event once all the browsers are captured', () => {
diff --git a/test/unit/utils/net-utils.spec.js b/test/unit/utils/net-utils.spec.js
new file mode 100644
index 000000000..23d32e4cf
--- /dev/null
+++ b/test/unit/utils/net-utils.spec.js
@@ -0,0 +1,50 @@
+'use strict'
+
+const NetUtils = require('../../../lib/utils/net-utils')
+const connect = require('connect')
+const net = require('net')
+
+describe('NetUtils.isPortAvailable', () => {
+  it('it is possible to run server on available port', (done) => {
+    NetUtils.isPortAvailable(9876, '127.0.0.1').then((available) => {
+      expect(available).to.be.true
+      const server = net
+        .createServer(connect())
+        .listen(9876, '127.0.0.1', () => {
+          server.close(done)
+        })
+    })
+  })
+
+  it('resolves with false when port is used', (done) => {
+    const server = net
+      .createServer(connect())
+      .listen(9876, '127.0.0.1', () => {
+        NetUtils.isPortAvailable(9876, '127.0.0.1').then((available) => {
+          expect(available).to.be.false
+          server.close(done)
+        })
+      })
+  })
+})
+
+describe('NetUtils.getAvailablePort', () => {
+  it('resolves with port when is available', (done) => {
+    NetUtils.getAvailablePort(9876, '127.0.0.1').then((port) => {
+      expect(port).to.equal(9876)
+      done()
+    })
+  })
+
+  it('resolves with next available port', (done) => {
+    const stub = sinon.stub(NetUtils, 'isPortAvailable')
+    stub.withArgs(9876).resolves(false)
+    stub.withArgs(9877).resolves(false)
+    stub.withArgs(9878).resolves(true)
+
+    NetUtils.getAvailablePort(9876, '127.0.0.1').then((port) => {
+      expect(port).to.equal(9878)
+      done()
+    })
+  })
+})

From c1eb236523f8dab7e5f7dc70f4ee016b8061f0ba Mon Sep 17 00:00:00 2001
From: Terry <zhangwenlp@vip.qq.com>
Date: Sat, 16 Jun 2018 00:00:39 +0800
Subject: [PATCH 47/50] fix(BaseReporter): log message correctly with just one
 browser (#3045)

---
 lib/reporters/base.js            |  2 +-
 test/unit/reporters/base.spec.js | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/reporters/base.js b/lib/reporters/base.js
index 40822cfef..d5227ef4a 100644
--- a/lib/reporters/base.js
+++ b/lib/reporters/base.js
@@ -136,7 +136,7 @@ const BaseReporter = function (formatError, reportSlow, useColors, browserConsol
   }
 
   this.onRunComplete = (browsers, results) => {
-    if (browsers.length > 1 && !results.error && !results.disconnected) {
+    if (browsers.length >= 1 && !results.error && !results.disconnected) {
       if (!results.failed) {
         this.write(this.TOTAL_SUCCESS, results.success)
       } else {
diff --git a/test/unit/reporters/base.spec.js b/test/unit/reporters/base.spec.js
index d1d6dbe3e..586cc913d 100644
--- a/test/unit/reporters/base.spec.js
+++ b/test/unit/reporters/base.spec.js
@@ -3,7 +3,7 @@
 describe('reporter', () => {
   const BaseReporter = require('../../../lib/reporters/base')
 
-  describe('Progress', () => {
+  describe('Base', () => {
     let reporter
     let adapter = reporter = null
 
@@ -181,7 +181,7 @@ describe('reporter', () => {
       return writeSpy.should.have.been.called
     })
 
-    return it('should format log messages correctly for multi browsers', () => {
+    it('should format log messages correctly for multi browsers', () => {
       const writeSpy = sinon.spy(reporter, 'writeCommonMsg')
 
       reporter._browsers = ['Chrome', 'Firefox']
@@ -189,5 +189,13 @@ describe('reporter', () => {
 
       return expect(writeSpy).to.have.been.calledWith('Chrome LOG: Message\n')
     })
+
+    it('should log messages correctly when complete with just one browser', () => {
+      const writeSpy = sinon.spy(reporter, 'write')
+      const mockResults = {error: false, disconnected: false}
+
+      reporter.onRunComplete(['Chrome'], mockResults)
+      return writeSpy.should.have.been.called
+    })
   })
 })

From a32ba27eeefcfe1e3ecd1ec7529a269ac13c0027 Mon Sep 17 00:00:00 2001
From: johnjbarton <johnjbarton@johnjbarton.com>
Date: Fri, 15 Jun 2018 11:13:25 -0700
Subject: [PATCH 48/50] refactor(server): Provide file-service handlers in the
 root injector. (#3042)

By removing the creation of file-service handlers from the webserver, we create functions with better focus
and we allow the file-service handlers to be used in beforeMiddlewaare. The only cost is that these objects are
now visible to all modules rather than being private to webserver. The potential for collision seems small.
---
 lib/server.js                |  6 ++++++
 lib/web-server.js            | 39 +++++++++++++++++++++++-------------
 test/unit/web-server.spec.js | 12 ++++++++++-
 3 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/lib/server.js b/lib/server.js
index f504f05f8..05af65c0c 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -18,6 +18,9 @@ const constant = require('./constants')
 const watcher = require('./watcher')
 const plugin = require('./plugin')
 
+const createServeFile = require('./web-server').createServeFile
+const createServeStaticFile = require('./web-server').createServeStaticFile
+const createFilesPromise = require('./web-server').createFilesPromise
 const createWebServer = require('./web-server').createWebServer
 const preprocessor = require('./preprocessor')
 const Launcher = require('./launcher').Launcher
@@ -72,6 +75,9 @@ class Server extends KarmaEventEmitter {
       preprocess: ['factory', preprocessor.createPreprocessor],
       fileList: ['factory', FileList.factory],
       webServer: ['factory', createWebServer],
+      serveFile: ['factory', createServeFile],
+      serveStaticFile: ['factory', createServeStaticFile],
+      filesPromise: ['factory', createFilesPromise],
       socketServer: ['factory', createSocketIoServer],
       executor: ['factory', Executor.factory],
       // TODO(vojta): remove
diff --git a/lib/web-server.js b/lib/web-server.js
index 9534ff9a9..bd63481d7 100644
--- a/lib/web-server.js
+++ b/lib/web-server.js
@@ -28,11 +28,7 @@ function createCustomHandler (customFileHandlers, config) {
 
 createCustomHandler.$inject = ['customFileHandlers', 'config']
 
-function createWebServer (injector, emitter, fileList) {
-  const config = injector.get('config')
-  common.initializeMimeTypes(config)
-  const serveStaticFile = common.createServeFile(fs, path.normalize(path.join(__dirname, '/../static')), config)
-  const serveFile = common.createServeFile(fs, null, config)
+function createFilesPromise (emitter, fileList) {
   const filesPromise = new common.PromiseContainer()
 
   // Set an empty list of files to avoid race issues with
@@ -41,13 +37,22 @@ function createWebServer (injector, emitter, fileList) {
 
   emitter.on('file_list_modified', (files) => filesPromise.set(Promise.resolve(files)))
 
-  // locals for webserver module
-  // NOTE(vojta): figure out how to do this with DI
-  injector = injector.createChild([{
-    serveFile: ['value', serveFile],
-    serveStaticFile: ['value', serveStaticFile],
-    filesPromise: ['value', filesPromise]
-  }])
+  return filesPromise
+}
+createFilesPromise.$inject = ['emitter', 'fileList']
+
+function createServeStaticFile (config) {
+  return common.createServeFile(fs, path.normalize(path.join(__dirname, '/../static')), config)
+}
+createServeStaticFile.$inject = ['config']
+
+function createServeFile (config) {
+  return common.createServeFile(fs, null, config)
+}
+createServeFile.$inject = ['config']
+
+function createWebServer (injector, config) {
+  common.initializeMimeTypes(config)
 
   const proxyMiddlewareInstance = injector.invoke(proxyMiddleware.create)
 
@@ -97,5 +102,11 @@ function createWebServer (injector, emitter, fileList) {
   return server
 }
 
-createWebServer.$inject = ['injector', 'emitter', 'fileList']
-exports.createWebServer = createWebServer
+createWebServer.$inject = ['injector', 'config']
+
+module.exports = {
+  createWebServer,
+  createServeFile,
+  createServeStaticFile,
+  createFilesPromise
+}
diff --git a/test/unit/web-server.spec.js b/test/unit/web-server.spec.js
index d429e443c..6d56cb04c 100644
--- a/test/unit/web-server.spec.js
+++ b/test/unit/web-server.spec.js
@@ -60,6 +60,9 @@ describe('web-server', () => {
         customFileHandlers: ['value', customFileHandlers],
         emitter: ['value', emitter],
         fileList: ['value', {files: {served: [], included: []}}],
+        filesPromise: ['factory', m.createFilesPromise],
+        serveStaticFile: ['factory', m.createServeStaticFile],
+        serveFile: ['factory', m.createServeFile],
         capturedBrowsers: ['value', null],
         reporter: ['value', null],
         executor: ['value', null],
@@ -83,7 +86,6 @@ describe('web-server', () => {
           }
         }]
       }])
-
       server = injector.invoke(m.createWebServer)
     })
 
@@ -167,6 +169,7 @@ describe('web-server', () => {
     })
 
     it('should serve no files when they are not available yet', () => {
+      servedFiles(new Set())
       return request(server)
         .get('/base/new.js')
         .expect(404)
@@ -226,6 +229,10 @@ describe('web-server', () => {
         customFileHandlers: ['value', customFileHandlers],
         emitter: ['value', emitter],
         fileList: ['value', {files: {served: [], included: []}}],
+        filesPromise: ['factory', m.createFilesPromise],
+        serveStaticFile: ['factory', m.createServeStaticFile],
+        serveFile: ['factory', m.createServeFile],
+
         capturedBrowsers: ['value', null],
         reporter: ['value', null],
         executor: ['value', null],
@@ -267,6 +274,9 @@ describe('web-server', () => {
         customFileHandlers: ['value', customFileHandlers],
         emitter: ['value', emitter],
         fileList: ['value', {files: {served: [], included: []}}],
+        filesPromise: ['factory', m.createFilesPromise],
+        serveStaticFile: ['factory', m.createServeStaticFile],
+        serveFile: ['factory', m.createServeFile],
         capturedBrowsers: ['value', null],
         reporter: ['value', null],
         executor: ['value', null],

From e0377d0704e5ebab5d0339a46b2dc420ee756e7d Mon Sep 17 00:00:00 2001
From: johnjbarton <johnjbarton@johnjbarton.com>
Date: Fri, 15 Jun 2018 12:31:13 -0700
Subject: [PATCH 49/50] chore: update contributors

---
 package.json | 108 +++++++++++++++++++++++++++------------------------
 1 file changed, 57 insertions(+), 51 deletions(-)

diff --git a/package.json b/package.json
index 266cc4c38..eac5fdd60 100644
--- a/package.json
+++ b/package.json
@@ -28,99 +28,99 @@
     "greenkeeperio-bot <support@greenkeeper.io>",
     "Karma Bot <karmarunnerbot@gmail.com>",
     "Maksim Ryzhikov <rv.maksim@gmail.com>",
-    "Christian Budde Christensen <budde377@gmail.com>",
     "johnjbarton <johnjbarton@johnjbarton.com>",
-    "taichi <ryushi@gmail.com>",
+    "Christian Budde Christensen <budde377@gmail.com>",
+    "Yaroslav Admin <devoto13@gmail.com>",
+    "ukasz Usarz <lukasz.usarz@gmail.com>",
     "Wesley Cho <wesley.cho@gmail.com>",
+    "taichi <ryushi@gmail.com>",
     "Liam Newman <bitwiseman@gmail.com>",
-    "Michał Gołębiowski-Owczarek <m.goleb@gmail.com>",
     "Todd Wolfson <todd@twolfson.com>",
-    "Yaroslav Admin <devoto13@gmail.com>",
+    "Michał Gołębiowski-Owczarek <m.goleb@gmail.com>",
     "Mark Trostler <mark@zzo.com>",
     "Ciro Nunes <ciroanunes@gmail.com>",
-    "Tim Cuthbertson <tim@gfxmonk.net>",
     "Pawel Kozlowski <pkozlowski.opensource@gmail.com>",
-    "Christian Budde Christensen <christi@n-bud.de>",
+    "lukasz <lukasz.usarz@gmail.com>",
     "Shyam Seshadri <shyamseshadri@gmail.com>",
+    "Christian Budde Christensen <christi@n-bud.de>",
     "Robo <hop2deep@gmail.com>",
+    "Tim Cuthbertson <tim@gfxmonk.net>",
     "Daniel Compton <desk@danielcompton.net>",
     "Mark Ethan Trostler <mark@zzo.com>",
     "Mourad <mourad@elmaouchi.com>",
     "Nick Malaguti <nmalaguti@palantir.com>",
-    "joshjb84 <joshjb84@hotmail.com>",
+    "Brian Di Palma <offler@gmail.com>",
     "Kim Joar Bekkelund <kjbekkelund@gmail.com>",
     "vivganes <vivek@vivekganesan.com>",
-    "Brian Ford <btford@umich.edu>",
-    "Marcello Nuccio <marcello.nuccio@gmail.com>",
-    "pavelgj <pavelgj@gmail.com>",
-    "Iristyle <Iristyle@github>",
-    "sylvain-hamel <sylvainhamel0@gmail.com>",
+    "joshjb84 <joshjb84@hotmail.com>",
+    "Pieter Mees <pietermees@users.noreply.github.com>",
+    "Jeff Jewiss <jeffjewiss@gmail.com>",
+    "Ilya Volodin <ivolodin@vistaprint.com>",
+    "Andrew Martin <sublimino@gmail.com>",
     "David Souther <davidsouther@gmail.com>",
+    "Iristyle <Iristyle@github>",
     "Jérémy Judéaux <jeremy.judeaux@volune.net>",
-    "Jeff Jewiss <jeffjewiss@gmail.com>",
-    "Jake Champion <jakechampion.jake2@googlemail.com>",
-    "Chris Hunt <chrahunt@gmail.com>",
-    "ywong <wongyok@gmail.com>",
     "Daniel Aleksandersen <code@daniel.priv.no>",
-    "Andrew Martin <sublimino@gmail.com>",
     "Aymeric Beaumet <aymeric@beaumet.me>",
-    "Ilya Volodin <ivolodin@vistaprint.com>",
+    "Jake Champion <jakechampion.jake2@googlemail.com>",
+    "Georgii Dolzhykov <thorn.mailbox@gmail.com>",
+    "Chris Hunt <chrahunt@gmail.com>",
+    "Brian Ford <btford@umich.edu>",
+    "Marcello Nuccio <marcello.nuccio@gmail.com>",
     "Chris Casola <chriscasola@gmail.com>",
-    "Ethan J. Brown <ethan_j_brown@hotmail.com>",
-    "Ezra Brooks <ezra.m.brooks@gmail.com>",
-    "ngiebel <ngiebel@starkinvestments.com>",
-    "Robin Liang <robin.gnail@gmail.com>",
-    "rdodev <rubenoz@gmail.com>",
+    "pavelgj <pavelgj@gmail.com>",
+    "sylvain-hamel <sylvainhamel0@gmail.com>",
+    "ywong <wongyok@gmail.com>",
+    "David Herges <dherges@users.noreply.github.com>",
     "Ruben Bridgewater <ruben.bridgewater@fintura.de>",
-    "David Pärsson <david@parsson.se>",
     "Réda Housni Alaoui <reda.housnialaoui@gmail.com>",
-    "Filipe Guerra <alias.mac@gmail.com>",
-    "Matt Lewis <matthew.lewis@socialsignin.co.uk>",
+    "Ethan J. Brown <ethan_j_brown@hotmail.com>",
+    "Ezra Brooks <ezra.m.brooks@gmail.com>",
     "Sammy Jelin <sjelin@gmail.com>",
-    "Andrew Morris <voltrevo@gmail.com>",
-    "Aseem Bansal <aseembansal@live.com>",
-    "Jonas Pommerening <jonas.pommerening@aixigo.de>",
+    "Matt Lewis <matthew.lewis@socialsignin.co.uk>",
+    "Filipe Guerra <alias.mac@gmail.com>",
+    "David Pärsson <david@parsson.se>",
+    "Bulat Shakirzyanov <mallluhuct@gmail.com>",
     "Shane Russell <shane1337@gmail.com>",
-    "ChangZhuo Chen (陳昌倬) <czchen@gmail.com>",
+    "Jonas Pommerening <jonas.pommerening@aixigo.de>",
     "Jonathan Freeman <freethejazz@gmail.com>",
-    "Josh <joshhunt180@gmail.com>",
     "Stefan Dragnev <dragnev@telerik.com>",
+    "Josh <joshhunt180@gmail.com>",
     "Steve Mao <maochenyan@gmail.com>",
     "Steve Mao <steve.mao@healthinteract.com.au>",
     "Steve Van Opstal <stevevanopstal@gmail.com>",
-    "Greenkeeper <support@greenkeeper.io>",
     "Sylvain Hamel <sylvainhamel0@gmail.com>",
-    "Bryan Smith <bryanrsmith@gmail.com>",
-    "KJ Tsanaktsidis <kjtsanaktsidis@gmail.com>",
+    "Greenkeeper <support@greenkeeper.io>",
+    "Andrew Morris <voltrevo@gmail.com>",
     "Thomas Parisot <thomas@oncle-tom.net>",
+    "KJ Tsanaktsidis <kjtsanaktsidis@gmail.com>",
     "Tom Erik Støwer <tomerik@getkahoot.com>",
+    "Aseem Bansal <aseembansal@live.com>",
+    "ChangZhuo Chen (陳昌倬) <czchen@gmail.com>",
     "Hugues Malphettes <hmalphettes@gmail.com>",
-    "Bulat Shakirzyanov <mallluhuct@gmail.com>",
     "Igor Minar <igor@angularjs.org>",
-    "Igor Minar <iiminar@gmail.com>",
-    "Kelly Jensen <kellyrayj@gmail.com>",
     "Vivek Ganesan <caliberoviv@gmail.com>",
     "Vladimir Starkov <iamstarkov@users.noreply.github.com>",
+    "Kelly Jensen <kellyrayj@gmail.com>",
+    "Igor Minar <iiminar@gmail.com>",
     "Kevin Huang <kevinziwenhuang@gmail.com>",
-    "Kevin WENNER <kevin.wenner@massmotionmedia.com>",
     "Parashuram <code@r.nparashuram.com>",
     "Pat Tullmann <pt@bebop.co>",
-    "DarthCharles <carlos.darth@gmail.com>",
+    "Kevin WENNER <kevin.wenner@massmotionmedia.com>",
     "PatrickJS <github@gdi2290.com>",
-    "Levi Thomason <me@levithomason.com>",
     "comdiv <fagim.sadykov@gmail.com>",
-    "David Herges <dherges@users.noreply.github.com>",
+    "Levi Thomason <me@levithomason.com>",
     "Luke Page <luke.a.page@gmail.com>",
+    "Bryan Smith <bryanrsmith@gmail.com>",
     "James Ford <jford@psyked.co.uk>",
-    "James Talmage <james@talmage.io>",
-    "Richard Harrington <rwharrington87@gmail.com>",
     "karmarunnerbot <karmarunnerbot@gmail.com>",
-    "lukasz <lukasz.usarz@gmail.com>",
+    "DarthCharles <carlos.darth@gmail.com>",
+    "Richard Harrington <rwharrington87@gmail.com>",
     "Roarke Gaskill <roarke.gaskill@gmail.com>",
-    "Justin Ridgewell <jridgewell@users.noreply.github.com>",
-    "KahWee Teng <t@kw.sg>",
-    "Karl Lindmark <karl.lindmark@ninetwozero.com>",
-    "Karol Fabjańczuk <karol.fabjanczuk@lemondemon.pl>",
+    "ngiebel <ngiebel@starkinvestments.com>",
+    "rdodev <rubenoz@gmail.com>",
+    "James Talmage <james@talmage.io>",
+    "Robin Liang <robin.gnail@gmail.com>",
     "Karolis Narkevicius <karolis.n@gmail.com>",
     "Keats <balthek@gmail.com>",
     "Keith Cirkel <github@keithcirkel.co.uk>",
@@ -172,6 +172,7 @@
     "Patrick Lussan <patrick.lussan@componize.com>",
     "Patrick Neschkudla <neschkudla@gmail.com>",
     "Patrik Henningsson <patrik.henningsson@gmail.com>",
+    "Paweł Kapalla <pkapalla@xesenix.pl>",
     "Pedro Araujo <pedrotcaraujo@gmail.com>",
     "Pete Bacon Darwin <pete@bacondarwin.com>",
     "Pete Swan <pete@indabamusic.com>",
@@ -208,6 +209,7 @@
     "Taylor Buley <buley@outlook.com>",
     "Taylor Hakes <taylor.hakes@gmail.com>",
     "Terin Stock <terinjokes@gmail.com>",
+    "Terry <zhangwenlp@vip.qq.com>",
     "Thai Pangsakulyanont @ Taskworld <thai.p@taskworld.com>",
     "Thomas Parisot <thomas.parisot@bbc.co.uk>",
     "Tim Olshansky <tim.olshansky@gmail.com>",
@@ -253,6 +255,7 @@
     "u812 <0u812@github.com>",
     "chalkerx@gmail.com>",
     "Aaron Powell <me@aaron-powell.com>",
+    "Adrien Crivelli <adrien.crivelli@gmail.com>",
     "Alejandro Mantecon Guillen <alemangui@gmail.com>",
     "Ales Rosina <alesrosina@users.noreply.github.com>",
     "Alexander Pepper <alexander.pepper@infopark.de>",
@@ -272,7 +275,6 @@
     "Bhavesh Kakadiya <bhavesh@superhuman.com>",
     "Brady Wied <brady@bswtechconsulting.com>",
     "Breno Calazans <breno@vtex.com.br>",
-    "Brian Di Palma <offler@gmail.com>",
     "Brian Donovan <donovan@squareup.com>",
     "Brian Donovan <me@brian-donovan.com>",
     "Brian M Hunt <brianmhunt@gmail.com>",
@@ -319,7 +321,6 @@
     "Fredrik Bonander <carl.fredrik.bonander@gmail.com>",
     "Gavin Aiken <gavin@aiken.org.uk>",
     "Geert Van Laethem <geert.van.laethem@pandora.be>",
-    "Georgii Dolzhykov <thorn.mailbox@gmail.com>",
     "Glenn Anderson <ondoher@gmail.com>",
     "Greg Thornton <xdissent@me.com>",
     "Gregory Cowan <g.cowan@amnzero.nl>",
@@ -344,8 +345,13 @@
     "Jon Bretman <jon.bretman@gmail.com>",
     "Jonathan ES Lin <ernsheong@gmail.com>",
     "Josh Lory <josh.lory@code.org>",
+    "João Marcos Duarte <joumd86@gmail.com>",
     "Julian Connor <julian.connor@venmo.com>",
-    "Jurko Gospodnetić <jurko.gospodnetic@pke.hr>"
+    "Jurko Gospodnetić <jurko.gospodnetic@pke.hr>",
+    "Justin Ridgewell <jridgewell@users.noreply.github.com>",
+    "KahWee Teng <t@kw.sg>",
+    "Karl Lindmark <karl.lindmark@ninetwozero.com>",
+    "Karol Fabjańczuk <karol.fabjanczuk@lemondemon.pl>"
   ],
   "dependencies": {
     "bluebird": "^3.3.0",

From 333e7d4060865f32372bf4a3365a6e47a6aeefa1 Mon Sep 17 00:00:00 2001
From: johnjbarton <johnjbarton@johnjbarton.com>
Date: Fri, 15 Jun 2018 12:31:20 -0700
Subject: [PATCH 50/50] chore: release v2.0.3

---
 CHANGELOG.md | 309 +++++++++++++++++++++++++++++++++++++++++++++++++++
 package.json |   2 +-
 2 files changed, 310 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ceb27b08..d73cc749b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,312 @@
+<a name="2.0.3"></a>
+## [2.0.3](https://github.com/karma-runner/karma/compare/v0.12.16...v2.0.3) (2018-06-15)
+
+
+### Bug Fixes
+
+* **BaseReporter:** log message correctly with just one browser ([#3045](https://github.com/karma-runner/karma/issues/3045)) ([c1eb236](https://github.com/karma-runner/karma/commit/c1eb236))
+* **browser:** don't add already active socket again on reconnect ([37a7958](https://github.com/karma-runner/karma/commit/37a7958))
+* **browser:** filter browser logging by level  ([35965d9](https://github.com/karma-runner/karma/commit/35965d9)), closes [#2228](https://github.com/karma-runner/karma/issues/2228)
+* **browser:** nicer "disconnect" - no more "Disconnectedundefined" ([a987d63](https://github.com/karma-runner/karma/commit/a987d63))
+* **build:** pin npm version in appveyor to v3, compat with node 4 ([#2983](https://github.com/karma-runner/karma/issues/2983)) ([bc1453e](https://github.com/karma-runner/karma/commit/bc1453e))
+* **ci:** Repaired AppVeyor for Node.js@0.12 ([cbfd98c](https://github.com/karma-runner/karma/commit/cbfd98c))
+* **cli:** override if an arg is defined multiple times ([31eb2c2](https://github.com/karma-runner/karma/commit/31eb2c2)), closes [#1192](https://github.com/karma-runner/karma/issues/1192)
+* **cli:** print UserAgent string verbatim if from an unknown browser ([9d97226](https://github.com/karma-runner/karma/commit/9d97226))
+* **cli:** restore shell completion in the npm package ([f56b5a5](https://github.com/karma-runner/karma/commit/f56b5a5)), closes [#2351](https://github.com/karma-runner/karma/issues/2351)
+* **cli:** Use `bin` field in package.json ([6823926](https://github.com/karma-runner/karma/commit/6823926)), closes [#1351](https://github.com/karma-runner/karma/issues/1351)
+* **client:** add ES5 shim ([14c30b7](https://github.com/karma-runner/karma/commit/14c30b7)), closes [#1529](https://github.com/karma-runner/karma/issues/1529)
+* **client:** add proxy support to stringify ([be10116](https://github.com/karma-runner/karma/commit/be10116))
+* **client:** does not throws an error for non DOM object that has `tagName` property ([ba55afb](https://github.com/karma-runner/karma/commit/ba55afb)), closes [#2139](https://github.com/karma-runner/karma/issues/2139)
+* **client:** don't crash if receive array-like results ([e095411](https://github.com/karma-runner/karma/commit/e095411)), closes [#2061](https://github.com/karma-runner/karma/issues/2061)
+* **client:** dynamic protocol for socket.io ([c986eef](https://github.com/karma-runner/karma/commit/c986eef)), closes [#1400](https://github.com/karma-runner/karma/issues/1400)
+* **client:** Fix stringify serializing objects ([0d0972a](https://github.com/karma-runner/karma/commit/0d0972a))
+* **client:** Revert back to old reloading detection ([f1c22d6](https://github.com/karma-runner/karma/commit/f1c22d6)), closes [#1656](https://github.com/karma-runner/karma/issues/1656)
+* **client:** serialise DOM objects ([1f73be4](https://github.com/karma-runner/karma/commit/1f73be4)), closes [#1106](https://github.com/karma-runner/karma/issues/1106)
+* **client:** Update location detection for socket.io ([7a23fa5](https://github.com/karma-runner/karma/commit/7a23fa5))
+* **client:** Use supported shim path. ([184f12e](https://github.com/karma-runner/karma/commit/184f12e))
+* **client:** Wait for childwindow to load ([c1bb15a](https://github.com/karma-runner/karma/commit/c1bb15a))
+* **client:** Wait for iframe to be loaded ([1631474](https://github.com/karma-runner/karma/commit/1631474)), closes [#1652](https://github.com/karma-runner/karma/issues/1652)
+* **client.html:** always open debug.html in a new browser process ([d176bcf](https://github.com/karma-runner/karma/commit/d176bcf))
+* **common:** fix AppVeyor build ([6c5e7d0](https://github.com/karma-runner/karma/commit/6c5e7d0))
+* **common:** more detailed info about error ([424aacc](https://github.com/karma-runner/karma/commit/424aacc))
+* **common:** Proxy function toString does not contain Proxy. ([4fb3484](https://github.com/karma-runner/karma/commit/4fb3484))
+* **common:** stringify error on 'Cannot convert a Symbol value to a string' ([#2990](https://github.com/karma-runner/karma/issues/2990)) ([65b658a](https://github.com/karma-runner/karma/commit/65b658a)), closes [#2856](https://github.com/karma-runner/karma/issues/2856)
+* **config:** [#1113](https://github.com/karma-runner/karma/issues/1113) Watching is not working properly on linux ([c91ffbc](https://github.com/karma-runner/karma/commit/c91ffbc))
+* **config:** add crossOriginAttribute config option ([1e465b1](https://github.com/karma-runner/karma/commit/1e465b1))
+* **config:** Call debug log methods after setting the loglevel based upon config/cli-options. ([a340dae](https://github.com/karma-runner/karma/commit/a340dae))
+* **config:** Call debug log methods after setting the loglevel based upon config/cli-options. ([99fd3f0](https://github.com/karma-runner/karma/commit/99fd3f0))
+* **config:** corrects spelling in example config template ([9fafc60](https://github.com/karma-runner/karma/commit/9fafc60))
+* **config:** Default remaining client options if any are set ([632dd5e](https://github.com/karma-runner/karma/commit/632dd5e)), closes [#961](https://github.com/karma-runner/karma/issues/961)
+* **config:** Error when browers option isn't array ([b695460](https://github.com/karma-runner/karma/commit/b695460))
+* **config:** Log the final config just before use. ([#3041](https://github.com/karma-runner/karma/issues/3041)) ([05dd09a](https://github.com/karma-runner/karma/commit/05dd09a))
+* **config:** Retry install with appveyor-retry.   ([17d5791](https://github.com/karma-runner/karma/commit/17d5791))
+* **config:** Workaround npm 5.4 windows bug ([ec47d81](https://github.com/karma-runner/karma/commit/ec47d81))
+* **context:** Updated postMessage listener to stop validating non-Karma messages ([306e565](https://github.com/karma-runner/karma/commit/306e565))
+* **debug-runner:** support asynchronous tests in the debug runner ([a36f3eb](https://github.com/karma-runner/karma/commit/a36f3eb)), closes [#2811](https://github.com/karma-runner/karma/issues/2811)
+* **deps:** freeze socket.io version ([73e300d](https://github.com/karma-runner/karma/commit/73e300d))
+* **deps:** Update dependencies ([b9a4ce9](https://github.com/karma-runner/karma/commit/b9a4ce9)), closes [#1410](https://github.com/karma-runner/karma/issues/1410)
+* **deps:** Update log4js in package.json ([#2996](https://github.com/karma-runner/karma/issues/2996)) ([667b47e](https://github.com/karma-runner/karma/commit/667b47e))
+* **deps:** update socket.io to version 2.0.3. ([3b7b019](https://github.com/karma-runner/karma/commit/3b7b019)), closes [#2821](https://github.com/karma-runner/karma/issues/2821) [#2777](https://github.com/karma-runner/karma/issues/2777)
+* **deps:** Upgrade connect 3. ([b490985](https://github.com/karma-runner/karma/commit/b490985)), closes [#1410](https://github.com/karma-runner/karma/issues/1410)
+* **docs:** fix stopper.stop wrong variable name. closes [#2244](https://github.com/karma-runner/karma/issues/2244) ([0745a00](https://github.com/karma-runner/karma/commit/0745a00))
+* **docs:** Remove mention of pre 1.0.0 version ([#3010](https://github.com/karma-runner/karma/issues/3010)) ([6847ca0](https://github.com/karma-runner/karma/commit/6847ca0))
+* **eslint:** Fix formatting for the new ESLint 1.8.0 ([dc1bbab](https://github.com/karma-runner/karma/commit/dc1bbab))
+* **executor:** ensure run_complete is emitted last ([9c894f9](https://github.com/karma-runner/karma/commit/9c894f9)), closes [#2210](https://github.com/karma-runner/karma/issues/2210)
+* **file_list:** follow symlinks ([ee26748](https://github.com/karma-runner/karma/commit/ee26748))
+* **file_list:** Incorrect response after remove and add file ([0dbc020](https://github.com/karma-runner/karma/commit/0dbc020))
+* **file-list:** always use file from first matcher ([74bfdf3](https://github.com/karma-runner/karma/commit/74bfdf3))
+* **file-list:** Ensure autowatchDelay is working ([0f33268](https://github.com/karma-runner/karma/commit/0f33268)), closes [#1520](https://github.com/karma-runner/karma/issues/1520)
+* **file-list:** Ensure autowatchDelay is working. ([655599a](https://github.com/karma-runner/karma/commit/655599a)), closes [#1520](https://github.com/karma-runner/karma/issues/1520)
+* **file-list:** Ensure files are sorted and unique ([9dc5f8b](https://github.com/karma-runner/karma/commit/9dc5f8b)), closes [#1498](https://github.com/karma-runner/karma/issues/1498) [#1499](https://github.com/karma-runner/karma/issues/1499)
+* **file-list:** ensure patterns are comparable ([4d1bf3e](https://github.com/karma-runner/karma/commit/4d1bf3e)), closes [#2194](https://github.com/karma-runner/karma/issues/2194)
+* **file-list:** Normalize glob patterns ([fb841a7](https://github.com/karma-runner/karma/commit/fb841a7)), closes [#1494](https://github.com/karma-runner/karma/issues/1494)
+* **file-list:** refresh resolves before 'file_list_modified' event ([65f1eca](https://github.com/karma-runner/karma/commit/65f1eca)), closes [#1550](https://github.com/karma-runner/karma/issues/1550)
+* **file-list:** Stop polluting global environment with core-js ([0988022](https://github.com/karma-runner/karma/commit/0988022))
+* **file-list:** Use correct find function ([4cfaae9](https://github.com/karma-runner/karma/commit/4cfaae9))
+* **file-list:** use lodash find() ([3bd15a7](https://github.com/karma-runner/karma/commit/3bd15a7)), closes [#1533](https://github.com/karma-runner/karma/issues/1533)
+* **file-list:** Use modified throttle instead of debounce ([cb2aafb](https://github.com/karma-runner/karma/commit/cb2aafb)), closes [#1545](https://github.com/karma-runner/karma/issues/1545)
+* **files:** Ignore included:false pattern ([db42a7f](https://github.com/karma-runner/karma/commit/db42a7f)), closes [#1530](https://github.com/karma-runner/karma/issues/1530)
+* **flaky-test:** Add time to beforeEach() to allow plugins to load on first pass. ([#3025](https://github.com/karma-runner/karma/issues/3025)) ([31d9a08](https://github.com/karma-runner/karma/commit/31d9a08))
+* **helper:** Ensure browser detection is handled in the unkown case ([9328f67](https://github.com/karma-runner/karma/commit/9328f67))
+* **helper:** Patched replaceWinPath from choking on `null` values ([caa4d21](https://github.com/karma-runner/karma/commit/caa4d21))
+* **init:** fix test-main.(js/coffee) generation ([d8521ef](https://github.com/karma-runner/karma/commit/d8521ef)), closes [#1120](https://github.com/karma-runner/karma/issues/1120) [#896](https://github.com/karma-runner/karma/issues/896)
+* **init:** Make the requirejs config template normalize paths ([54dcce3](https://github.com/karma-runner/karma/commit/54dcce3)), closes [/github.com/karma-runner/karma/issues/513#issuecomment-48616784](https://github.com//github.com/karma-runner/karma/issues/513/issues/issuecomment-48616784)
+* **karma:** Escape quotes for file names. This fixes issue [#1876](https://github.com/karma-runner/karma/issues/1876). ([9dff3f3](https://github.com/karma-runner/karma/commit/9dff3f3))
+* **launcher:** Allow dynamic browser launches ([2b7d703](https://github.com/karma-runner/karma/commit/2b7d703))
+* **launcher:** Continue with exit when SIGKILL fails ([1eaccb4](https://github.com/karma-runner/karma/commit/1eaccb4))
+* **launcher:** exclude concurrent browser on launcher restart ([96f8f14](https://github.com/karma-runner/karma/commit/96f8f14)), closes [#2280](https://github.com/karma-runner/karma/issues/2280)
+* **launcher:** send sigkill on timeout when force killing ([c615c1f](https://github.com/karma-runner/karma/commit/c615c1f))
+* **launchers:** Listen to the correct error event. ([45a6922](https://github.com/karma-runner/karma/commit/45a6922))
+* **lint:** exempt built files ([#3024](https://github.com/karma-runner/karma/issues/3024)) ([bc9acd3](https://github.com/karma-runner/karma/commit/bc9acd3))
+* **logging:** Summarize SKIPPED tests in debug.html. ([a01100f](https://github.com/karma-runner/karma/commit/a01100f)), closes [#1111](https://github.com/karma-runner/karma/issues/1111)
+* **logging:** Upgrade to log4js 2.x API. ([#2868](https://github.com/karma-runner/karma/issues/2868)) ([f6f8707](https://github.com/karma-runner/karma/commit/f6f8707)), closes [#2858](https://github.com/karma-runner/karma/issues/2858)
+* **middleware:** Actually serve the favicon. ([f12db63](https://github.com/karma-runner/karma/commit/f12db63))
+* **middleware:** add file type to absolute urls  ([bd1f799](https://github.com/karma-runner/karma/commit/bd1f799))
+* **middleware:** avoid using deprecated Buffer API ([018e6be](https://github.com/karma-runner/karma/commit/018e6be)), closes [/nodejs.org/api/deprecations.html#deprecations_dep0005](https://github.com//nodejs.org/api/deprecations.html/issues/deprecations_dep0005)
+* **middleware:** change to use vanilla for loop ([ac62cc0](https://github.com/karma-runner/karma/commit/ac62cc0)), closes [#2671](https://github.com/karma-runner/karma/issues/2671)
+* **middleware:** Correct spelling of middleware logger name ([9e9e7e6](https://github.com/karma-runner/karma/commit/9e9e7e6))
+* **middleware:** does not work with mootools ([#2591](https://github.com/karma-runner/karma/issues/2591)) ([2685e13](https://github.com/karma-runner/karma/commit/2685e13))
+* **middleware:** ensure Range headers adhere more closely to RFC 2616 ([8b1b4b1](https://github.com/karma-runner/karma/commit/8b1b4b1)), closes [#2310](https://github.com/karma-runner/karma/issues/2310)
+* **middleware:** fix WARN log when passing undefined error handler to promise.then ([20b87de](https://github.com/karma-runner/karma/commit/20b87de)), closes [#2227](https://github.com/karma-runner/karma/issues/2227)
+* **middleware:** Inject `config.urlRoot`. ([569ca0e](https://github.com/karma-runner/karma/commit/569ca0e)), closes [#1516](https://github.com/karma-runner/karma/issues/1516)
+* **middleware:** update `Buffer` usage ([3d94b8c](https://github.com/karma-runner/karma/commit/3d94b8c))
+* **package.json:** sinon-chai 2.13 is not compatible with sinon 4.x ([#2977](https://github.com/karma-runner/karma/issues/2977)) ([e095b05](https://github.com/karma-runner/karma/commit/e095b05))
+* **preprocessor:** Better handling of failing preprocessors ([a2376b8](https://github.com/karma-runner/karma/commit/a2376b8)), closes [#1521](https://github.com/karma-runner/karma/issues/1521)
+* **preprocessor:** calculate sha1 on content returned from a preprocessor ([6cf7955](https://github.com/karma-runner/karma/commit/6cf7955)), closes [#1204](https://github.com/karma-runner/karma/issues/1204)
+* **preprocessor:** Directory names with dots ([4b5e094](https://github.com/karma-runner/karma/commit/4b5e094))
+* **preprocessor:** Improve handling of failed preprocessors ([e726d1c](https://github.com/karma-runner/karma/commit/e726d1c)), closes [#1521](https://github.com/karma-runner/karma/issues/1521)
+* **preprocessor:** Lookup patterns once invoked ([00a2781](https://github.com/karma-runner/karma/commit/00a2781)), closes [#1340](https://github.com/karma-runner/karma/issues/1340)
+* **preprocessor:** renamed handeFile to readFileCallback ([92a8c81](https://github.com/karma-runner/karma/commit/92a8c81))
+* **preprocessor:** retry if fs.readFile fails ([4b60513](https://github.com/karma-runner/karma/commit/4b60513))
+* **preprocessor:** Throw error if can't open file ([bb4edde](https://github.com/karma-runner/karma/commit/bb4edde))
+* **preprocessor:** throw if retry fails ([2789bf5](https://github.com/karma-runner/karma/commit/2789bf5))
+* **preprocessor:** treat *.gz files as binary ([1b56932](https://github.com/karma-runner/karma/commit/1b56932))
+* **preprocessor:** treat *.swf files as binary ([62d7d38](https://github.com/karma-runner/karma/commit/62d7d38))
+* **preprocessor:** treat *.tgz, *.tbz2, *.txz & *.xz as binary ([7b64244](https://github.com/karma-runner/karma/commit/7b64244))
+* **proxy:** More useful proxyError log message ([96640a7](https://github.com/karma-runner/karma/commit/96640a7))
+* **proxy:** Pass protocol in target object to enable https requests ([142db90](https://github.com/karma-runner/karma/commit/142db90))
+* **proxy:** Port mixup and infinite loop ([05616a2](https://github.com/karma-runner/karma/commit/05616a2)), closes [#1987](https://github.com/karma-runner/karma/issues/1987)
+* **proxy:** proxy to correct port ([a483636](https://github.com/karma-runner/karma/commit/a483636))
+* **reporter:** Better handling of non string error ([82f1c12](https://github.com/karma-runner/karma/commit/82f1c12)), closes [#1969](https://github.com/karma-runner/karma/issues/1969) [#1988](https://github.com/karma-runner/karma/issues/1988)
+* **reporter:** Disable source maps for URLs without line number ([2080221](https://github.com/karma-runner/karma/commit/2080221)), closes [#1274](https://github.com/karma-runner/karma/issues/1274)
+* **reporter:** do not allow URL domains to span new lines ([2c13404](https://github.com/karma-runner/karma/commit/2c13404))
+* **reporter:** Enable sourcemaps for errors that without column # ([086a542](https://github.com/karma-runner/karma/commit/086a542))
+* **reporter:** Ensure errors use the source map. ([0407a22](https://github.com/karma-runner/karma/commit/0407a22)), closes [#1495](https://github.com/karma-runner/karma/issues/1495)
+* **reporter:** Fix issue causing error stack not to be parsed correctly ([ac4e1a9](https://github.com/karma-runner/karma/commit/ac4e1a9)), closes [#2930](https://github.com/karma-runner/karma/issues/2930)
+* **reporter:** inject correct config option ([80bd726](https://github.com/karma-runner/karma/commit/80bd726))
+* **reporter:** keep users exact formatError result ([17c2c43](https://github.com/karma-runner/karma/commit/17c2c43))
+* **reporter:** preserve base/absolute word in error ([b3798df](https://github.com/karma-runner/karma/commit/b3798df))
+* **reporter:** remove console.log ([b4e3694](https://github.com/karma-runner/karma/commit/b4e3694))
+* **reporter:** show file path correctly when urlRoot specified ([34dc7d3](https://github.com/karma-runner/karma/commit/34dc7d3)), closes [#2897](https://github.com/karma-runner/karma/issues/2897)
+* **reporter:** sourcemap not working in windows ([a9516af](https://github.com/karma-runner/karma/commit/a9516af)), closes [#1200](https://github.com/karma-runner/karma/issues/1200)
+* **reporter:** strip only hostname/port ([fbbeccf](https://github.com/karma-runner/karma/commit/fbbeccf)), closes [#2209](https://github.com/karma-runner/karma/issues/2209)
+* **reporters:**  cannot read property map of undefined  ([305df2c](https://github.com/karma-runner/karma/commit/305df2c)), closes [#1662](https://github.com/karma-runner/karma/issues/1662)
+* **reporters:** Fix results not being reported ([6303566](https://github.com/karma-runner/karma/commit/6303566))
+* **reporters:** Revert the backwards-incompatible log priority order changes ([316b944](https://github.com/karma-runner/karma/commit/316b944)), closes [#2582](https://github.com/karma-runner/karma/issues/2582)
+* **reporters:** Throwing error without loosing stack trace ([8a515ae](https://github.com/karma-runner/karma/commit/8a515ae))
+* **runner:** Fix typo in CSS class name for .idle ([fc5a7ce](https://github.com/karma-runner/karma/commit/fc5a7ce))
+* **runner:** Make process kill timeout configurable ([ffaa054](https://github.com/karma-runner/karma/commit/ffaa054)), closes [#2447](https://github.com/karma-runner/karma/issues/2447)
+* **runner:** Make process kill timeout configurable - Fix Build ([a128e5c](https://github.com/karma-runner/karma/commit/a128e5c)), closes [#2447](https://github.com/karma-runner/karma/issues/2447)
+* **runner:** Merge config.client.args with client.args provided by run ([91de383](https://github.com/karma-runner/karma/commit/91de383)), closes [#1746](https://github.com/karma-runner/karma/issues/1746)
+* **runner:** Remove null characters from terminal output ([3481500](https://github.com/karma-runner/karma/commit/3481500)), closes [#1343](https://github.com/karma-runner/karma/issues/1343)
+* **runner:** Test process kill timeout config ([99a1d48](https://github.com/karma-runner/karma/commit/99a1d48)), closes [#2447](https://github.com/karma-runner/karma/issues/2447)
+* **runner:** Wait for file list refresh to finish before running ([94cddc0](https://github.com/karma-runner/karma/commit/94cddc0))
+* **server:** check available port before start server (fix [#1476](https://github.com/karma-runner/karma/issues/1476), fix [#3011](https://github.com/karma-runner/karma/issues/3011)) ([a19b8d4](https://github.com/karma-runner/karma/commit/a19b8d4))
+* **server:** complete acknowledgment ([f4144b0](https://github.com/karma-runner/karma/commit/f4144b0))
+* **server:** exit with code 1 when failing due to missing browser ([86e2ef2](https://github.com/karma-runner/karma/commit/86e2ef2)), closes [#2403](https://github.com/karma-runner/karma/issues/2403)
+* **server:** Force clients disconnect on Windows ([28239f4](https://github.com/karma-runner/karma/commit/28239f4)), closes [#1109](https://github.com/karma-runner/karma/issues/1109)
+* **server:** Handle new socket.io internal format. ([3ab78d6](https://github.com/karma-runner/karma/commit/3ab78d6)), closes [#1782](https://github.com/karma-runner/karma/issues/1782)
+* **server:** log browser messages to the terminal ([d1f924c](https://github.com/karma-runner/karma/commit/d1f924c)), closes [#2187](https://github.com/karma-runner/karma/issues/2187)
+* **server:** Remove Socket.IO listeners ([c3f05ef](https://github.com/karma-runner/karma/commit/c3f05ef)), closes [#2980](https://github.com/karma-runner/karma/issues/2980)
+* **server:** Start webserver and browsers after preprocessing completed ([e0d2d23](https://github.com/karma-runner/karma/commit/e0d2d23))
+* **server:** switch to sync write ([6ec74ee](https://github.com/karma-runner/karma/commit/6ec74ee))
+* **server:** Update timers for limited execution environments ([9cfc1cd](https://github.com/karma-runner/karma/commit/9cfc1cd)), closes [#1519](https://github.com/karma-runner/karma/issues/1519)
+* **socket.io:** Force 0.9.16 which works with Chrome ([840ee5f](https://github.com/karma-runner/karma/commit/840ee5f))
+* **stringify:** guard Symobl from IE ([#3023](https://github.com/karma-runner/karma/issues/3023)) ([538081c](https://github.com/karma-runner/karma/commit/538081c))
+* invalid characters in the headers on Node 5.6.0 ([152337d](https://github.com/karma-runner/karma/commit/152337d))
+* **test:** locale in Expire header ([db04cf0](https://github.com/karma-runner/karma/commit/db04cf0)), closes [#1741](https://github.com/karma-runner/karma/issues/1741)
+* **test:** update bundleResource test timeout ([#3038](https://github.com/karma-runner/karma/issues/3038)) ([d6060d4](https://github.com/karma-runner/karma/commit/d6060d4))
+* **travis_ci:** converted node versions as string ([25ee6fc](https://github.com/karma-runner/karma/commit/25ee6fc))
+* filter browser logging by level of LOG ([89a7a1c](https://github.com/karma-runner/karma/commit/89a7a1c)), closes [#2228](https://github.com/karma-runner/karma/issues/2228)
+* **updater:** Fix time unit on screen display from 'ms' to 'seconds'. ([f39dd04](https://github.com/karma-runner/karma/commit/f39dd04))
+* a missed argument in a debug message ([#3009](https://github.com/karma-runner/karma/issues/3009)) ([af8c6e4](https://github.com/karma-runner/karma/commit/af8c6e4))
+* Add crossorigin attribute to script HTML tags ([5690ffe](https://github.com/karma-runner/karma/commit/5690ffe))
+* add emscripten memory image as binary suffix ([f6b2b56](https://github.com/karma-runner/karma/commit/f6b2b56))
+* call .resume to prevent browser output streams filling up ([107cd02](https://github.com/karma-runner/karma/commit/107cd02))
+* catch exceptions from SourceMapConsumer ([5d42e64](https://github.com/karma-runner/karma/commit/5d42e64))
+* Change timing on test ([0cb6204](https://github.com/karma-runner/karma/commit/0cb6204))
+* ignore jsVersion configuration property in Firefox 59+  ([2694d54](https://github.com/karma-runner/karma/commit/2694d54)), closes [#2957](https://github.com/karma-runner/karma/issues/2957)
+* make window.parent.karma available in debugged context ([3e7eaeb](https://github.com/karma-runner/karma/commit/3e7eaeb))
+* Merge config child nodes on config.set() ([65b688a](https://github.com/karma-runner/karma/commit/65b688a)), closes [karma-runner/grunt-karma#165](https://github.com/karma-runner/grunt-karma/issues/165) [karma-runner/grunt-karma#166](https://github.com/karma-runner/grunt-karma/issues/166)
+* Remove inadvertently added dependency to mock-fs ([ad5f6b5](https://github.com/karma-runner/karma/commit/ad5f6b5))
+* remove support of jsVersion configuration property ([#3002](https://github.com/karma-runner/karma/issues/3002)) ([2bb4e36](https://github.com/karma-runner/karma/commit/2bb4e36)), closes [#2911](https://github.com/karma-runner/karma/issues/2911)
+* restore backward compatibility for karma@0.13 ([648b357](https://github.com/karma-runner/karma/commit/648b357))
+* Safeguard IE against console.log ([0b5ff8f](https://github.com/karma-runner/karma/commit/0b5ff8f)), closes [#1209](https://github.com/karma-runner/karma/issues/1209)
+* Setting default value for config in runner and stopper ([414db89](https://github.com/karma-runner/karma/commit/414db89))
+* Switch all requires from fs to graceful-fs ([1e21aaa](https://github.com/karma-runner/karma/commit/1e21aaa))
+* upgrade http-proxy module for bug fixes ([09c75fe](https://github.com/karma-runner/karma/commit/09c75fe))
+* Upgrade socket.io to 1.4.5 ([2f51a9f](https://github.com/karma-runner/karma/commit/2f51a9f))
+* **UTs:** Correct proxy listeners expectation ([af9c84a](https://github.com/karma-runner/karma/commit/af9c84a))
+* **watcher:** Close file watchers on exit event ([7181025](https://github.com/karma-runner/karma/commit/7181025))
+* **watcher:** handle paths on Windows ([6164d86](https://github.com/karma-runner/karma/commit/6164d86))
+* **web-server:** Allow karma to run in project which path contains HTML URL encoded characters. Karma fails on Jenkins when it checks out branches containing '/' as it converts it to '%2F'. Fixes  errors seen on [#1751](https://github.com/karma-runner/karma/issues/1751), [#61](https://github.com/karma-runner/karma/issues/61). ([da1930f](https://github.com/karma-runner/karma/commit/da1930f))
+* Wrap url.parse to always return an object for query property ([72452e9](https://github.com/karma-runner/karma/commit/72452e9)), closes [#1182](https://github.com/karma-runner/karma/issues/1182)
+* **web-server:** cache static files ([eb5bd53](https://github.com/karma-runner/karma/commit/eb5bd53))
+* **web-server:** Correctly update filesPromise on files updated ([32eec8d](https://github.com/karma-runner/karma/commit/32eec8d))
+* **web-server:** Ensure `filesPromise` is always resolvable ([892fa89](https://github.com/karma-runner/karma/commit/892fa89)), closes [#1544](https://github.com/karma-runner/karma/issues/1544)
+* **web-server:** Restart disconnected browser in non-singleRun mode. ([f6587dc](https://github.com/karma-runner/karma/commit/f6587dc))
+* **web-server:** Update config on every request ([8ef475f](https://github.com/karma-runner/karma/commit/8ef475f)), closes [#1972](https://github.com/karma-runner/karma/issues/1972)
+
+
+### Code Refactoring
+
+* **context:** Future-proofed context.html and debug.html for modularity ([43f6a1a](https://github.com/karma-runner/karma/commit/43f6a1a)), closes [#1984](https://github.com/karma-runner/karma/issues/1984)
+
+
+### Features
+
+* Add `stopper` to the public API ([3d4fa00](https://github.com/karma-runner/karma/commit/3d4fa00))
+* add an option to run the tests by dynamically loading test scripts without iframe ([aa42c41](https://github.com/karma-runner/karma/commit/aa42c41))
+* Add engine support for iojs@3. ([eb1c8d2](https://github.com/karma-runner/karma/commit/eb1c8d2))
+* Add possibility to stop a karma server ([66ae80b](https://github.com/karma-runner/karma/commit/66ae80b))
+* add support for node 6 ([0b8dc2c](https://github.com/karma-runner/karma/commit/0b8dc2c))
+* add support for node@7 ([eb407ab](https://github.com/karma-runner/karma/commit/eb407ab)), closes [#2559](https://github.com/karma-runner/karma/issues/2559)
+* adding support for before middleware ([51b4206](https://github.com/karma-runner/karma/commit/51b4206))
+* Allow custom browser names ([60ba85f](https://github.com/karma-runner/karma/commit/60ba85f))
+* allow frameworks to add preprocessors ([f6f5eec](https://github.com/karma-runner/karma/commit/f6f5eec))
+* Allow frameworks to inject middleware ([d972f3d](https://github.com/karma-runner/karma/commit/d972f3d))
+* better string representation of errors ([c9e1ca9](https://github.com/karma-runner/karma/commit/c9e1ca9))
+* deprecate helper._ ([5c6b151](https://github.com/karma-runner/karma/commit/5c6b151)), closes [#1812](https://github.com/karma-runner/karma/issues/1812)
+* Do not fail on empty test suite ([8004763](https://github.com/karma-runner/karma/commit/8004763)), closes [#926](https://github.com/karma-runner/karma/issues/926)
+* drop core-js and babel where possible ([60dfc5c](https://github.com/karma-runner/karma/commit/60dfc5c))
+* Fail on launcher-, reporter-, plugin-, or preprocessor-load errors. ([fca930e](https://github.com/karma-runner/karma/commit/fca930e)), closes [#855](https://github.com/karma-runner/karma/issues/855)
+* serve ePub as binary files ([82ed0c6](https://github.com/karma-runner/karma/commit/82ed0c6))
+* **api:** add constants to the public api ([ee10977](https://github.com/karma-runner/karma/commit/ee10977)), closes [#2361](https://github.com/karma-runner/karma/issues/2361)
+* **api:** expose `config.parseConfig` on the public api ([7d2c1ae](https://github.com/karma-runner/karma/commit/7d2c1ae))
+* **browser:** add browser_info event ([09ac7d7](https://github.com/karma-runner/karma/commit/09ac7d7)), closes [#2192](https://github.com/karma-runner/karma/issues/2192)
+* **browser:** Emit a browser error when a disconnect occurs. ([e36ba6c](https://github.com/karma-runner/karma/commit/e36ba6c))
+* **ci:** disable testing of node versions below 4 ([ec92ea9](https://github.com/karma-runner/karma/commit/ec92ea9))
+* **cli:** Add .config/karma.conf.js to the default lookup path ([49bf1aa](https://github.com/karma-runner/karma/commit/49bf1aa)), closes [#1387](https://github.com/karma-runner/karma/issues/1387)
+* **cli:** Better CLI args validation ([73d31c2](https://github.com/karma-runner/karma/commit/73d31c2)), closes [#603](https://github.com/karma-runner/karma/issues/603)
+* **cli:** Warn on commands with underscores. ([0801a7f](https://github.com/karma-runner/karma/commit/0801a7f))
+* **client:** capture confirm & prompt  ([3a618b3](https://github.com/karma-runner/karma/commit/3a618b3)), closes [#694](https://github.com/karma-runner/karma/issues/694)
+* **client:** log global error stack trace  ([523d608](https://github.com/karma-runner/karma/commit/523d608)), closes [#2812](https://github.com/karma-runner/karma/issues/2812)
+* **config:** Add `forceJSONP` option ([8627d67](https://github.com/karma-runner/karma/commit/8627d67))
+* **config:** Add a clearContext config to prevent clearing of context. ([5fc8ee7](https://github.com/karma-runner/karma/commit/5fc8ee7))
+* **config:** Add configuration for adding javascript version. ([0239c75](https://github.com/karma-runner/karma/commit/0239c75)), closes [#1719](https://github.com/karma-runner/karma/issues/1719)
+* **config:** add nocache option for file patterns ([6ef7e7b](https://github.com/karma-runner/karma/commit/6ef7e7b))
+* **config:** add restartOnFileChange option ([1082f35](https://github.com/karma-runner/karma/commit/1082f35))
+* **config:** add support for TypeScript ([6445310](https://github.com/karma-runner/karma/commit/6445310))
+* **config:** allow config to be a default export ([9976dce](https://github.com/karma-runner/karma/commit/9976dce))
+* **config:** Allow custom context and debug files, with feature test and some specs. ([225c0e5](https://github.com/karma-runner/karma/commit/225c0e5))
+* **config:** allow to use newer versions of CoffeeScript ([c1fcf42](https://github.com/karma-runner/karma/commit/c1fcf42))
+* **config:** mime config option support ([d562383](https://github.com/karma-runner/karma/commit/d562383)), closes [#1735](https://github.com/karma-runner/karma/issues/1735)
+* **config:** Pass CLI arguments to `karma.config.js`. ([70cf903](https://github.com/karma-runner/karma/commit/70cf903)), closes [#1561](https://github.com/karma-runner/karma/issues/1561)
+* **config:** remove polling usage ([b0f41c7](https://github.com/karma-runner/karma/commit/b0f41c7)), closes [#2669](https://github.com/karma-runner/karma/issues/2669)
+* **deps:** add support for node@8 ([ea32194](https://github.com/karma-runner/karma/commit/ea32194)), closes [#2754](https://github.com/karma-runner/karma/issues/2754)
+* **deps:** add support for node@8 ([7feaee3](https://github.com/karma-runner/karma/commit/7feaee3)), closes [#2754](https://github.com/karma-runner/karma/issues/2754)
+* **deps:** update socket.io to `1.7.4` to avoid issue with `ws@1.1.2` ([264442b](https://github.com/karma-runner/karma/commit/264442b)), closes [#2593](https://github.com/karma-runner/karma/issues/2593)
+* **file-list:** Upgrade bluebird to v.3 ([f5c252f](https://github.com/karma-runner/karma/commit/f5c252f))
+* **file-list:** Use glob.sync for better speed ([1b65cde](https://github.com/karma-runner/karma/commit/1b65cde))
+* **grunt:** run check_clean before starting release. ([#2978](https://github.com/karma-runner/karma/issues/2978)) ([a3ff6c8](https://github.com/karma-runner/karma/commit/a3ff6c8))
+* **init:** install coffee-script automatically ([e876db6](https://github.com/karma-runner/karma/commit/e876db6)), closes [#1152](https://github.com/karma-runner/karma/issues/1152)
+* **launcher:** Add concurrency limit ([1741deb](https://github.com/karma-runner/karma/commit/1741deb)), closes [#1465](https://github.com/karma-runner/karma/issues/1465)
+* **launcher:** Enable specification of retry-limit ([cc5547c](https://github.com/karma-runner/karma/commit/cc5547c)), closes [#1126](https://github.com/karma-runner/karma/issues/1126)
+* **launcher:** output stderr for failing launchers ([7d33398](https://github.com/karma-runner/karma/commit/7d33398))
+* **launcher:** trim whitespace in browser name ([334f9fb](https://github.com/karma-runner/karma/commit/334f9fb))
+* **launcher:** trim whitespace in browser name ([871d46f](https://github.com/karma-runner/karma/commit/871d46f))
+* **logger:** Add date/time stamp to log output ([4a59443](https://github.com/karma-runner/karma/commit/4a59443))
+* **logger:** Add date/time stamp to log output ([a4b5cdd](https://github.com/karma-runner/karma/commit/a4b5cdd))
+* **logging:** Add colors and log-level options to run-command ([9d4e234](https://github.com/karma-runner/karma/commit/9d4e234)), closes [#1067](https://github.com/karma-runner/karma/issues/1067)
+* **logging:** Add colors and log-level options to run-command ([2d29165](https://github.com/karma-runner/karma/commit/2d29165)), closes [#1067](https://github.com/karma-runner/karma/issues/1067)
+* **logging:** Add logging-setup function ([d14bd62](https://github.com/karma-runner/karma/commit/d14bd62))
+* **logging:** Send color option to server ([486c4f3](https://github.com/karma-runner/karma/commit/486c4f3)), closes [#1067](https://github.com/karma-runner/karma/issues/1067)
+* **logging:** Send color option to server ([287d0db](https://github.com/karma-runner/karma/commit/287d0db)), closes [#1067](https://github.com/karma-runner/karma/issues/1067)
+* **middleware:** added manual file type option ([0330cd1](https://github.com/karma-runner/karma/commit/0330cd1)), closes [#2824](https://github.com/karma-runner/karma/issues/2824)
+* **preprocessor:** add 'mp3' and 'ogg' as binary formats to avoid media corruption in the browser. ([65a0767](https://github.com/karma-runner/karma/commit/65a0767))
+* **preprocessor:** Capital letters in binary files extenstions ([1688689](https://github.com/karma-runner/karma/commit/1688689)), closes [#1508](https://github.com/karma-runner/karma/issues/1508)
+* **preprocessor:** Instantiate preprocessors early to avoid race conditions ([8a9c8c7](https://github.com/karma-runner/karma/commit/8a9c8c7))
+* **preprocessors:** if a file matches multiple preprocessor patterns, intelligently merge the list of preprocessors, deduping and trying to preserve the order ([59642a6](https://github.com/karma-runner/karma/commit/59642a6))
+* **proxy:** add proxy events to config  ([f5d99fb](https://github.com/karma-runner/karma/commit/f5d99fb))
+* **proxy:** Allow proxies configuration to be an object ([ad94356](https://github.com/karma-runner/karma/commit/ad94356))
+* **proxy:** Allow to configure changeOrigin option of http-proxy ([ae05ea4](https://github.com/karma-runner/karma/commit/ae05ea4)), closes [#1729](https://github.com/karma-runner/karma/issues/1729)
+* **reporter:** add config formatError function  ([98a4fbf](https://github.com/karma-runner/karma/commit/98a4fbf)), closes [#2119](https://github.com/karma-runner/karma/issues/2119)
+* **reporter:** cache SourceMapConsumer ([fe6ed7e](https://github.com/karma-runner/karma/commit/fe6ed7e))
+* **reporter:** improve source map handling and reporting. ([cf0be47](https://github.com/karma-runner/karma/commit/cf0be47))
+* **reporter:** Replace way-too-big memoizee with a trivial solution. ([58340b1](https://github.com/karma-runner/karma/commit/58340b1))
+* **reporter:** Replace way-too-big memoizee with a trivial solution. ([d926fe3](https://github.com/karma-runner/karma/commit/d926fe3))
+* **reporters:** Look for color-reporter ([fd9262d](https://github.com/karma-runner/karma/commit/fd9262d))
+* **runner:** Buffer stdout and stderr for output when errors occur ([460d423](https://github.com/karma-runner/karma/commit/460d423)), closes [karma-runner/karma#2663](https://github.com/karma-runner/karma/issues/2663)
+* **runner:** provide error code on 'ECONNREFUSED' callback ([439bddb](https://github.com/karma-runner/karma/commit/439bddb))
+* **runner:** serve context in JSON format for JS-only environments ([189feff](https://github.com/karma-runner/karma/commit/189feff))
+* **runner:** Use favicon in static runner pages ([6cded4f](https://github.com/karma-runner/karma/commit/6cded4f))
+* **server:** add 'listening' event with port number ([82cd0df](https://github.com/karma-runner/karma/commit/82cd0df))
+* **server:** add listen address option so that IPv6 and loopback interfaces can be used ([8e5bee6](https://github.com/karma-runner/karma/commit/8e5bee6)), closes [#2477](https://github.com/karma-runner/karma/issues/2477)
+* **server:** Add public api to force a file list refresh. ([b3c462a](https://github.com/karma-runner/karma/commit/b3c462a))
+* **server:** improve public api ([82cbbad](https://github.com/karma-runner/karma/commit/82cbbad)), closes [#1037](https://github.com/karma-runner/karma/issues/1037) [#1482](https://github.com/karma-runner/karma/issues/1482) [#1467](https://github.com/karma-runner/karma/issues/1467)
+* **static:** Support media queries ([94e7b50](https://github.com/karma-runner/karma/commit/94e7b50))
+* **stopper:** Enable programically detached server ([f10fd81](https://github.com/karma-runner/karma/commit/f10fd81))
+* **watcher:** Allow using braces in watcher ([e046379](https://github.com/karma-runner/karma/commit/e046379)), closes [#1249](https://github.com/karma-runner/karma/issues/1249)
+* **watcher:** Debounce autoWatchBatchDelay ([2f8c049](https://github.com/karma-runner/karma/commit/2f8c049)), closes [#2331](https://github.com/karma-runner/karma/issues/2331)
+* **web-server:** add support for custom headers in files served ([4301bea](https://github.com/karma-runner/karma/commit/4301bea))
+* **web-server:** allow injection of custom middleware. ([2e963c3](https://github.com/karma-runner/karma/commit/2e963c3)), closes [#1612](https://github.com/karma-runner/karma/issues/1612)
+* update of supported node versions ([e79463b](https://github.com/karma-runner/karma/commit/e79463b))
+* upgrade dependencies to their latest versions ([08242a0](https://github.com/karma-runner/karma/commit/08242a0))
+* **web-server:** allow overriding of default http module ([1e7514d](https://github.com/karma-runner/karma/commit/1e7514d)), closes [#2424](https://github.com/karma-runner/karma/issues/2424)
+* **web-server:** Allow Range headers in web server. ([a567b6f](https://github.com/karma-runner/karma/commit/a567b6f)), closes [#2140](https://github.com/karma-runner/karma/issues/2140)
+* **web-server:** Allow running on https ([1696c78](https://github.com/karma-runner/karma/commit/1696c78))
+* Upgrade to socket.io 1.3 ([603872c](https://github.com/karma-runner/karma/commit/603872c)), closes [#1257](https://github.com/karma-runner/karma/issues/1257) [#1258](https://github.com/karma-runner/karma/issues/1258) [#1220](https://github.com/karma-runner/karma/issues/1220)
+* upstreamProxy config option to deal with proxies that adjust the base path, etc ([55755e4](https://github.com/karma-runner/karma/commit/55755e4))
+* **web-server:** Serve all files under urlRoot ([1319b32](https://github.com/karma-runner/karma/commit/1319b32))
+* **web-server:** Use isbinaryfile for binary file detection ([f938a8e](https://github.com/karma-runner/karma/commit/f938a8e)), closes [#1070](https://github.com/karma-runner/karma/issues/1070)
+
+
+### Reverts
+
+* "Merge pull request [#1791](https://github.com/karma-runner/karma/issues/1791) from budde377/feature-adding-no-colors-to-run-command" ([96ebdc4](https://github.com/karma-runner/karma/commit/96ebdc4)), closes [#1894](https://github.com/karma-runner/karma/issues/1894) [#1895](https://github.com/karma-runner/karma/issues/1895)
+
+
+### BREAKING CHANGES
+
+* **context:** Our `context.html` and `debug.html` structures have changed to lean on `context.js` and `debug.js`.
+* **server:** The public api interface has changed to a constructor form. To upgrade
+change
+
+```javascript
+var server = require(‘karma’).server
+server.start(config, done)
+```
+
+to
+
+```javascript
+var Server = require(‘karma’).Server
+var server = new Server(config, done)
+server.start()
+```
+
+
+
 <a name="2.0.2"></a>
 ## [2.0.2](https://github.com/karma-runner/karma/compare/v2.0.1...v2.0.2) (2018-04-19)
 
diff --git a/package.json b/package.json
index eac5fdd60..00347a84d 100644
--- a/package.json
+++ b/package.json
@@ -458,7 +458,7 @@
   "engines": {
     "node": ">= 4"
   },
-  "version": "2.0.2",
+  "version": "2.0.3",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --ext js --ignore-pattern *.tpl.js",