From bd89dfcafc5263b80eb9b79834caf9661b1265e8 Mon Sep 17 00:00:00 2001
From: jongleberry <me@jongleberry.com>
Date: Mon, 6 Nov 2017 14:23:34 +0000
Subject: [PATCH] 2.4.1

---
 History.md   | 16 +++++++++++++---
 package.json | 35 +++++++++++++++++++++++------------
 2 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/History.md b/History.md
index 50a7e0f..0ffa253 100644
--- a/History.md
+++ b/History.md
@@ -1,7 +1,15 @@
 
+
+2.4.1 / 2017-11-06
+==================
+
+ * fix bad merge w/ 2.4.0
+
 2.4.0 / 2017-11-06
 ==================
 
+UNPUBLISHED
+
  * update `package.engines.node` to be more strict
  * update `fresh@^0.5.2`
  * fix: `inspect()` no longer crashes `context`
@@ -12,9 +20,11 @@
 ==================
 
  * fix: use `Buffer.from()`
- * update: `koa-compose@4`
- * added: setters for `request.header=` and `request.headers=`
- * added: use node 7+ WHATWG parser for hostname
+ * test on node 7 & 8
+ * add `package-lock.json` to `.gitignore`
+ * run `lint --fix`
+ * add `request.header` in addition to `request.headers`
+ * add IPv6 hostname support
 
 2.2.0 / 2017-03-14
 ==================
diff --git a/package.json b/package.json
index 83bded0..61c5949 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,14 @@
 {
   "name": "koa",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Koa web app framework",
   "main": "lib/application.js",
   "scripts": {
-    "test": "make test"
+    "test": "jest",
+    "test-cov": "npm run test -- --coverage",
+    "lint": "eslint benchmarks lib test",
+    "bench": "make -C benchmarks",
+    "authors": "git log --format='%aN <%aE>' | sort -u > AUTHORS"
   },
   "repository": "koajs/koa",
   "keywords": [
@@ -28,11 +32,11 @@
     "destroy": "^1.0.3",
     "error-inject": "~1.0.0",
     "escape-html": "~1.0.1",
-    "fresh": "^0.5.0",
+    "fresh": "^0.5.2",
     "http-assert": "^1.1.0",
     "http-errors": "^1.2.8",
     "is-generator-function": "^1.0.3",
-    "koa-compose": "^3.0.0",
+    "koa-compose": "^4.0.0",
     "koa-convert": "^1.2.0",
     "koa-is-json": "^1.0.0",
     "mime-types": "^2.0.7",
@@ -47,20 +51,27 @@
     "babel-eslint": "^7.1.1",
     "eslint": "^3.17.1",
     "eslint-config-standard": "^7.0.1",
-    "eslint-plugin-babel": "^4.1.1",
     "eslint-plugin-promise": "^3.5.0",
     "eslint-plugin-standard": "^2.1.1",
     "istanbul": "^0.4.0",
-    "mocha": "^3.2.0",
-    "should": "^6.0.3",
-    "should-http": "0.0.3",
-    "supertest": "^3.0.0",
-    "test-console": "^0.7.1"
+    "jest": "^20.0.0",
+    "supertest": "^3.0.0"
   },
   "engines": {
-    "node": ">= 6.0.0"
+    "node": "^4.8.4 || ^6.10.1 || ^7.10.1 || >= 8.1.4"
   },
   "files": [
     "lib"
-  ]
+  ],
+  "jest": {
+    "testMatch": [
+      "**/test/!(helpers)/*.js"
+    ],
+    "coverageReporters": [
+      "text-summary",
+      "lcov"
+    ],
+    "bail": true,
+    "testEnvironment": "node"
+  }
 }