Merge branch 'master' into runkit-example-endpoint

.eslintrc.yml

@@ -1,16 +1 @@
-# Support ES2016 features
-parser: babel-eslint
-
-extends: standard
-
-rules:
-  arrow-parens: [2, as-needed]
-  eqeqeq: 0
-  no-return-assign: 0 # fails for arrow functions
-  no-var: 2
-  semi: [2, always]
-  space-before-function-paren: [2, never]
-  yoda: 0
-  arrow-spacing: 2
-  dot-location: [2, "property"]
-  prefer-arrow-callback: 2
+extends: koa

.gitignore

@@ -2,4 +2,3 @@ node_modules
 test.js
 coverage
 npm-debug.log
-package-lock.json

.mailmap

@@ -0,0 +1 @@
+Michał Gołębiowski-Owczarek <m.goleb@gmail.com>

.npmrc

@@ -0,0 +1 @@
+package-lock=false

.travis.yml

@@ -3,6 +3,8 @@ language: node_js
 node_js:
   - 7
   - 8
+  - 9
+  - 10
 cache:
   directories:
     - wrk/bin

AUTHORS

@@ -1,79 +1,176 @@
-TJ Holowaychuk <tj@vision-media.ca>
-Jonathan Ong <jonathanrichardong@gmail.com>
-dead_horse <dead_horse@qq.com>
-Tejas Manohar <me@tejas.io>
-Yiyu He <dead_horse@qq.com>
-fengmk2 <fengmk2@gmail.com>
-Julian Gruber <julian@juliangruber.com>
-Jonathan Ong <me@jongleberry.com>
-fengmk2 <m@fengmk2.com>
-Rui Marinho <rpm@seegno.com>
-jongleberry <jonathanong@users.noreply.github.com>
-pana <pana.wang@outlook.com>
+小菜 <xtx1130@gmail.com>
+Aaron Heckmann <aaron.heckmann+github@gmail.com>
+Adam L <skyros@gmail.com>
+Adam Lau <skyros@gmail.com>
+Aesop Wolf <aesopwolf@users.noreply.github.com>
+AlexeyKhristov <AlexeyKhristov@users.noreply.github.com>
+Alexsey <agat00@gmail.com>
+Amit Portnoy <amit.portnoy@gmail.com>
+Anton Harniakou <anton.harniakou@gmail.com>
+Arjun <arjun453@gmail.com>
+Asiel Leal <lealceldeiro@gmail.com>
+Avindra Goolcharan <aavindraa@gmail.com>
+Bartol Karuza <bartol.k@gmail.com>
+Ben Reinhart <breinhart@groupon.com>
+Bernie Stern <bernzs@gmail.com>
+Bryan Bess <squarejaw@bsbess.com>
+C.T. Lin <chentsulin@gmail.com>
+Chiahao Lin <purepennons@users.noreply.github.com>
+Chris Tarquini <chris@ilsken.com>
+Christoffer Hallas <hallas@users.noreply.github.com>
+Clark Du <clark.duxin@gmail.com>
+Darren Cauthon <darren@cauthon.com>
+Debjeet Biswas <debjeet@vxtindia.com>
+Dmitry Mazuro <dmitry.mazuro@icloud.com>
+Douglas Christopher Wilson <doug@somethingdoug.com>
+Eivind Fjeldstad <eivind.fjeldstad@gmail.com>
+Equim <sayaka@ekyu.moe>
+Fangdun Cai <fundon@users.noreply.github.com>
+Felix Becker <felix.b@outlook.com>
+Filip Skokan <panva.ip@gmail.com>
+Francisco Presencia <franciscop@users.noreply.github.com>
+George Chung <Gerhut@GMail.com>
+Gilles De Mey <gilles.de.mey@gmail.com>
+Grand <sungg12138@163.com>
+Guilherme Pacheco <guilherme.f.pacheco@hotmail.com>
+HanHor Wu <hanhor.wu@gmail.com>
+Hartley Melamed <hartley@melamed.biz>
+Hrvoje Šimić <hrvoje@twobucks.co>
+Hugh Kennedy <hughskennedy@gmail.com>
 Ian Storm Taylor <ian@ianstormtaylor.com>
-PatrickJS <github@gdi2290.com>
-Sonny Piers <sonny@fastmail.net>
-alsotang <alsotang@gmail.com>
+Ilkka Oksanen <iao@iki.fi>
+Ivan Kleshnin <ivan@paqmind.com>
+Ivan Lyons <iliyang.cn@gmail.com>
+Jacob Bass <jacob@jacobbass.net>
+JamesWang <likegun94@gmail.com>
+Jan Buschtöns <buschtoens@gmail.com>
+Jan Carlo Viray <virayjancarlo@yahoo.com>
+Jason Macgowan <jason.macgowan@icloud.com>
+Jed Schmidt <where@jed.is>
+Jeff Moore <jeff@procata.com>
+Jesus Rodriguez <foxandxss@gmail.com>
 Jesús Rodríguez Rodríguez <Foxandxss@gmail.com>
-Bryan Bess <squarejaw@bsbess.com>
-Robert Sköld <robert@publicclass.se>
-yoshuawuyts <i@yoshuawuyts.com>
+Jingwei "John" Liu <liujingwei@gmail.com>
 Johan Bergström <bugs@bergstroem.nu>
+Jonas Zhang <106856363@qq.com>
+Jonathan Ong <jonathanrichardong@gmail.com>
+Jonathan Ong <me@jongleberry.com>
+Joseph Lin <josephlin55555@gmail.com>
+Julian Gruber <julian@juliangruber.com>
+Kareem Kwong <kareem.kwong@gmail.com>
 Karl Böhlmark <karl.bohlmark@gmail.com>
 Kenneth Ormandy <kenneth@chloi.io>
 Kim Joar Bekkelund <kjbekkelund@gmail.com>
+Kwyn Alice Meagher <kwyn.meagher@gmail.com>
 Kyle Suss <susskyle@gmail.com>
+Lee Bousfield <ljbousfield@gmail.com>
+Louis DeScioli <louis.descioli@gmail.com>
+Luke Bousfield <math.master.champion@gmail.com>
+Malcolm <noinkling@users.noreply.github.com>
+Marceli.no <me@marceli.no>
+Mars Wong <marswong618@gmail.com>
+Martin Iwanowski <martin@iwanowski.se>
+Martin Iwanowski <me@fl0w.io>
+Martin fl0w Iwanowski <martin@iwanowski.se>
 Matheus Azzi <matheuslazzi@gmail.com>
 Mathieu Gallé-Tessonneau <mathieu.galletessonneau@gmail.com>
 Matthew Chase Whittemore <matthew@socialtables.com>
 Matthew King <mking@users.noreply.github.com>
 Matthew Mueller <mattmuelle@gmail.com>
+Mengdi Gao <gaomdev@gmail.com>
 Michaël Zasso <mic.besace@gmail.com>
+Michał Gołębiowski-Owczarek <m.goleb@gmail.com>
 Nathan Rajlich <nathan@tootallnate.net>
 New Now Nohow <empty@cqdr.es>
+Nick McCurdy <nick@nickmccurdy.com>
+Nicolae Vartolomei <nvartolomei@gmail.com>
+PatrickJS <github@gdi2290.com>
+Paul Anderson <thesamuraipanda@gmail.com>
+Pedro Pablo Aste Kompen <wachunei@gmail.com>
 Peeyush Kushwaha <peeyush.p97@gmail.com>
 Phillip Alexander <git@phillipalexander.io>
+PlasmaPower <ljbousfield@gmail.com>
+Prayag Verma <prayag.verma@gmail.com>
 Qiming zhao <chemzqm@gmail.com>
+Remek Ambroziak <remek.ambroziak@gmail.com>
+Riceball LEE <snowyu.lee@gmail.com>
+Richard Marmorstein <twitchard@users.noreply.github.com>
+Rico Sta. Cruz <rstacruz@users.noreply.github.com>
+Robert Sköld <robert@publicclass.se>
+Robin Pokorný <me@robinpokorny.com>
+Ruben Bridgewater <ruben@bridgewater.de>
+Rui Marinho <rpm@seegno.com>
+Rui Marinho <ruipmarinho@gmail.com>
 Ryunosuke SATO <tricknotes.rs@gmail.com>
+Saad Quadri <saad@saadq.com>
+Santiago Sotomayor <sansoto2003@yahoo.com.ar>
+Sergei Osipov <hcz@users.noreply.github.com>
+Shaun Warman <shaunwarman1@gmail.com>
+Shawn Cheung <958033967@qq.com>
+Shawn Sit <xueqingxiao@gmail.com>
+Slobodan Stojanovic <slobodan@cloudhorizon.com>
+Sonny Piers <sonny@fastmail.net>
 Sterling Williams <sterlingw@qualtrics.com>
+Stéphane Bisinger <stephane.bisinger@protonmail.com>
+TJ Holowaychuk <tj@apex.sh>
+TJ Holowaychuk <tj@vision-media.ca>
+Taehwan, No <taehwanno.dev@gmail.com>
+Tejas Manohar <me@tejas.io>
 Teoman Soygul <teo@soygul.com>
+Thiago Lagden <lagden@gmail.com>
 Tiago Ribeiro <tlr@seegno.com>
 Tim Schaub <tim.schaub@gmail.com>
+Todor Stoychev <pretodor@gmail.com>
+Tomas Ruud <tomasruud@users.noreply.github.com>
 Travis Jeffery <tj@travisjeffery.com>
+Usman Hussain <usmandap@gmail.com>
 Veselin Todorov <veselin@veselin.bg>
+Wang Dàpéng <wonderfuly@gmail.com>
+Xavier Damman <xdamman@gmail.com>
+Xiang Gao <geekplux@qq.com>
+Yanick Rochon <yanick.rochon@gmail.com>
 Yazhong Liu <l900422@vip.qq.com>
 Yazhong Liu <yorkiefixer@gmail.com>
+Yiyu He <dead-horse@users.noreply.github.com>
+Yiyu He <dead_horse@qq.com>
 Yoshua Wuyts <yoshuawuyts@gmail.com>
+Yu Qi <iyuq@outlook.com>
+Yu Qi <njuyuqi@gmail.com>
+Zack Tanner <zacktanner@gmail.com>
+alsotang <alsotang@gmail.com>
+bananaappletw <bananaappletw@gmail.com>
 bhanuc <bhanuc@iitk.ac.in>
+blaz <blaz@menems.net>
+broucz <broucapierre@gmail.com>
+d3v <cr1s@users.noreply.github.com>
+dead-horse <dead_horse@qq.com>
+dead_horse <dead_horse@qq.com>
+designgrill <anshul@designgrill.com>
+fengmk2 <fengmk2@gmail.com>
+fengmk2 <m@fengmk2.com>
+frank <frankxin93@hotmail.com>
 fundon <cfddream@gmail.com>
 gyson <eilian.yunsong@gmail.com>
 haoxin <coderhaoxin@outlook.com>
+haoxin <haoxins@icloud.com>
+iamchenxin <iamchenxin@gmail.com>
+initial-wu <initial-wu@outlook.com>
 jeromew <jerome.wagner@m4x.org>
+joehecn <leanbrown@live.cn>
+jongleberry <jonathanong@users.noreply.github.com>
+jongleberry <me@jongleberry.com>
 llambda <xxgsoftware@gmail.com>
 mako-taco <jake.y.scott@gmail.com>
 mdemo <mds@xue.bi>
 nicoder <nicolas.dermine@gmail.com>
+nswbmw <gxqzk@126.com>
+pana <pana.wang@outlook.com>
+qingming <358242939@qq.com>
+song <xiongsongsong@outlook.com>
 superchink <superchink@gmail.com>
 tmilewski <tmilewski@gmail.com>
+yoshuawuyts <i@yoshuawuyts.com>
 yosssi <yoshida.keiji.84@gmail.com>
-Aaron Heckmann <aaron.heckmann+github@gmail.com>
 zensh <admin@zensh.com>
-Adam L <skyros@gmail.com>
-AlexeyKhristov <AlexeyKhristov@users.noreply.github.com>
-Ben Reinhart <breinhart@groupon.com>
-C.T. Lin <chentsulin@gmail.com>
-Chris Tarquini <chris@ilsken.com>
-Christoffer Hallas <hallas@users.noreply.github.com>
-Darren Cauthon <darren@cauthon.com>
-Debjeet Biswas <debjeet@vxtindia.com>
-Dmitry Mazuro <dmitry.mazuro@icloud.com>
-Douglas Christopher Wilson <doug@somethingdoug.com>
-Eivind Fjeldstad <eivind.fjeldstad@gmail.com>
-Guilherme Pacheco <guilherme.f.pacheco@hotmail.com>
-HanHor Wu <hanhor.wu@gmail.com>
-Hugh Kennedy <hughskennedy@gmail.com>
-Jan Buschtöns <buschtoens@gmail.com>
-Jan Carlo Viray <virayjancarlo@yahoo.com>
-Jed Schmidt <where@jed.is>
-Jesus Rodriguez <foxandxss@gmail.com>
-Jingwei "John" Liu <liujingwei@gmail.com>
+ziyunfei <446240525@qq.com>
+石发磊 <sshsfl@yeah.net>

History.md

@@ -1,7 +1,68 @@
 
+2.5.2 / 2018-07-12
+==================
+
+  * deps: upgrade all dependencies
+  * perf: avoid stringify when set header (#1220)
+  * perf: cache content type's result (#1218)
+  * perf: lazy init cookies and ip when first time use it (#1216)
+  * chore: fix comment & approve cov (#1214)
+  * docs: fix grammar
+  * test&cov: add test case (#1211)
+  * Lazily initialize `request.accept` and delegate `context.accept` (#1209)
+  * fix: use non deprecated custom inspect (#1198)
+  * Simplify processes in the getter `request.protocol` (#1203)
+  * docs: better demonstrate middleware flow (#1195)
+  * fix: Throw a TypeError instead of a AssertionError (#1199)
+  * chore: mistake in a comment (#1201)
+  * chore: use this.res.socket insteadof this.ctx.req.socket (#1177)
+  * chore: Using "listenerCount" instead of "listeners" (#1184)
+
+2.5.1 / 2018-04-27
+==================
+
+  * test: node v10 on travis (#1182)
+  * fix tests: remove unnecessary assert doesNotThrow and api calls (#1170)
+  * use this.response insteadof this.ctx.response (#1163)
+  * deps: remove istanbul (#1151)
+  * Update guide.md (#1150)
+
+2.5.0 / 2018-02-11
+==================
+
+  * feat: ignore set header/status when header sent (#1137)
+  * run coverage using --runInBand (#1141)
+  * [Update] license year to 2018 (#1130)
+  * docs: small grammatical fix in api docs index (#1111)
+  * docs: fixed typo (#1112)
+  * docs: capitalize K in word koa (#1126)
+  * Error handling: on non-error throw try to stringify if error is an object (#1113)
+  * Use eslint-config-koa (#1105)
+  * Update mgol's name in AUTHORS, add .mailmap (#1100)
+  * Avoid generating package locks instead of ignoring them (#1108)
+  * chore: update copyright year to 2017 (#1095)
+
+
+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`
+ * fix: gated `res.statusMessage` for HTTP/2
+ * added: `app.handleRequest()` is exposed
+
 2.3.0 / 2017-06-20
 ==================
 
+ * fix: use `Buffer.from()`
  * test on node 7 & 8
  * add `package-lock.json` to `.gitignore`
  * run `lint --fix`

LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2016 Koa contributors
+Copyright (c) 2018 Koa contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

Readme.md

@@ -1,4 +1,4 @@
-<img src="https://dl.dropboxusercontent.com/u/6396913/koa/logo.png" alt="koa middleware framework for nodejs" width="255px" />
+<img src="/docs/logo.png" alt="Koa middleware framework for nodejs"/>
 
   [![gitter][gitter-image]][gitter-url]
   [![NPM version][npm-image]][npm-url]
@@ -22,7 +22,7 @@ Koa requires __node v7.6.0__ or higher for ES2015 and async function support.
 $ npm install koa
 ```
 
-## Hello koa
+## Hello Koa
 
 ```js
 const Koa = require('koa');
@@ -38,8 +38,8 @@ app.listen(3000);
 
 ## Getting started
 
- - [Kick-Off-Koa](https://github.com/koajs/kick-off-koa) - An intro to koa via a set of self-guided workshops.
- - [Workshop](https://github.com/koajs/workshop) - A workshop to learn the basics of koa, Express' spiritual successor.
+ - [Kick-Off-Koa](https://github.com/koajs/kick-off-koa) - An intro to Koa via a set of self-guided workshops.
+ - [Workshop](https://github.com/koajs/workshop) - A workshop to learn the basics of Koa, Express' spiritual successor.
  - [Introduction Screencast](http://knowthen.com/episode-3-koajs-quickstart-guide/) - An introduction to installing and getting started with Koa
 
 
@@ -195,7 +195,7 @@ the general Koa guide.
 ## Running tests
 
 ```
-$ make test
+$ npm test
 ```
 
 ## Authors
@@ -211,7 +211,8 @@ See [AUTHORS](AUTHORS).
  - [G+ Community](https://plus.google.com/communities/101845768320796750641)
  - [Reddit Community](https://www.reddit.com/r/koajs)
  - [Mailing list](https://groups.google.com/forum/#!forum/koajs)
- - [中文文档](https://github.com/guo-yu/koa-guide)
+ - [中文文档 v1.x](https://github.com/guo-yu/koa-guide)
+ - [中文文档 v2.x](https://github.com/demopark/koa-docs-Zh-CN)
  - __[#koajs]__ on freenode
 
 ## Job Board