.editorconfig

@@ -0,0 +1,16 @@
+# editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab

.eslintrc.yml

@@ -0,0 +1,22 @@
+# Support ES2016 features
+parser: babel-eslint
+
+extends: standard
+
+plugins: [
+  "babel"
+]
+
+rules:
+  arrow-parens: 0
+  babel/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

.travis.yml

@@ -1,10 +1,15 @@
 language: node_js
 node_js:
-  - "0.12"
-  - "1"
-  - "2"
-  - "3"
   - "4"
-sudo: false
-script: "make test-travis"
-after_script: "npm install coveralls@2 && cat ./coverage/lcov.info | coveralls"
+  - "5"
+before_script:
+  - sudo apt-get install build-essential libssl-dev git
+  - git clone https://github.com/wg/wrk.git
+  - cd wrk && make && sudo cp wrk /usr/local/bin && cd ..
+script:
+  - make lint
+  - make test-travis
+  - make bench
+after_script:
+  - npm install codecov
+  - ./node_modules/.bin/codecov

AUTHORS

@@ -1,21 +1,23 @@
 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>
-Rui Marinho <rpm@seegno.com>
 Jonathan Ong <me@jongleberry.com>
+fengmk2 <m@fengmk2.com>
+Rui Marinho <rpm@seegno.com>
 jongleberry <jonathanong@users.noreply.github.com>
-Ian Storm Taylor <ian@ianstormtaylor.com>
 pana <pana.wang@outlook.com>
-alsotang <alsotang@gmail.com>
+Ian Storm Taylor <ian@ianstormtaylor.com>
 PatrickJS <github@gdi2290.com>
-yoshuawuyts <i@yoshuawuyts.com>
-Jesús Rodríguez Rodríguez <Foxandxss@gmail.com>
 Sonny Piers <sonny@fastmail.net>
-Jesus Rodriguez <foxandxss@gmail.com>
-Jingwei "John" Liu <liujingwei@gmail.com>
+alsotang <alsotang@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>
 Johan Bergström <bugs@bergstroem.nu>
 Karl Böhlmark <karl.bohlmark@gmail.com>
 Kenneth Ormandy <kenneth@chloi.io>
@@ -28,33 +30,38 @@ Matthew King <mking@users.noreply.github.com>
 Matthew Mueller <mattmuelle@gmail.com>
 Michaël Zasso <mic.besace@gmail.com>
 Nathan Rajlich <nathan@tootallnate.net>
-Aaron Heckmann <aaron.heckmann+github@gmail.com>
+New Now Nohow <empty@cqdr.es>
 Peeyush Kushwaha <peeyush.p97@gmail.com>
 Phillip Alexander <git@phillipalexander.io>
 Qiming zhao <chemzqm@gmail.com>
-Robert Sköld <robert@publicclass.se>
 Ryunosuke SATO <tricknotes.rs@gmail.com>
+Sterling Williams <sterlingw@qualtrics.com>
 Teoman Soygul <teo@soygul.com>
 Tiago Ribeiro <tlr@seegno.com>
 Tim Schaub <tim.schaub@gmail.com>
+Travis Jeffery <tj@travisjeffery.com>
 Veselin Todorov <veselin@veselin.bg>
 Yazhong Liu <l900422@vip.qq.com>
 Yazhong Liu <yorkiefixer@gmail.com>
 Yoshua Wuyts <yoshuawuyts@gmail.com>
 bhanuc <bhanuc@iitk.ac.in>
-fengmk2 <m@fengmk2.com>
 fundon <cfddream@gmail.com>
+gyson <eilian.yunsong@gmail.com>
 haoxin <coderhaoxin@outlook.com>
 jeromew <jerome.wagner@m4x.org>
+llambda <xxgsoftware@gmail.com>
 mako-taco <jake.y.scott@gmail.com>
+mdemo <mds@xue.bi>
 nicoder <nicolas.dermine@gmail.com>
 superchink <superchink@gmail.com>
 tmilewski <tmilewski@gmail.com>
 yosssi <yoshida.keiji.84@gmail.com>
+Aaron Heckmann <aaron.heckmann+github@gmail.com>
 zensh <admin@zensh.com>
-New Now Nohow <empty@cqdr.es>
 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>
@@ -68,3 +75,5 @@ 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>

CODE_OF_CONDUCT.md

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at tj@tjholowaychuk.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

History.md

@@ -1,3 +1,57 @@
+
+2.0.0 / 2016-03-23
+==================
+
+ * merge v1.1.2 and v1.2.0 changes
+ * include `koa-convert` so that generator functions still work
+   * NOTE: generator functions are deprecated in v2 and will be removed in v3
+ * improve linting
+ * improve docs
+
+1.2.0 / 2016-03-03
+==================
+
+  * add support for `err.headers` in `ctx.onerror()`
+    - see: https://github.com/koajs/koa/pull/668
+    - note: you should set these headers in your custom error handlers as well
+    - docs: https://github.com/koajs/koa/blob/master/docs/error-handling.md
+  * fix `cookies`' detection of http/https
+    - see: https://github.com/koajs/koa/pull/614
+  * deprecate `app.experimental = true`. Koa v2 does not use this signature.
+  * add a code of conduct
+  * test against the latest version of node
+  * add a lot of docs
+
+1.1.2 / 2015-11-05
+==================
+
+  * ensure parseurl always working as expected
+  * fix Application.inspect() – missing .proxy value.
+
+2.0.0-alpha.3 / 2015-11-05
+==================
+
+  * ensure parseurl always working as expected. #586
+  * fix Application.inspect() – missing .proxy value. Closes #563
+
+2.0.0-alpha.2 / 2015-10-27
+==================
+
+ * remove `co` and generator support completely
+ * improved documentation
+ * more refactoring into ES6
+
+2.0.0-alpha.1 / 2015-10-22
+==================
+
+ * change the middleware signature to `async (ctx, next) => await next()`
+ * drop node < 4 support and rewrite the codebase in ES6
+
+1.1.1 / 2015-10-22
+==================
+
+ * do not send a content-type when the type is unknown #536
+
 1.1.0 / 2015-10-11
 ==================
 

LICENSE

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

Makefile

@@ -1,43 +1,34 @@
 SRC = lib/*.js
 
-include node_modules/make-lint/index.mk
-
-BIN = iojs
-
-ifeq ($(findstring io.js, $(shell which node)),)
-	BIN = node
-endif
-
-ifeq (node, $(BIN))
-	FLAGS = --harmony
-endif
-
 REQUIRED = --require should --require should-http
 
-TESTS = test/application \
+TESTS = test/application/* \
 	test/context/* \
 	test/request/* \
 	test/response/* \
-	test/experimental/index.js
+	test/babel/index.js
+
+lint:
+	@./node_modules/.bin/eslint benchmarks lib test
 
 test:
-	@NODE_ENV=test $(BIN) $(FLAGS) \
+	@NODE_ENV=test node \
 		./node_modules/.bin/_mocha \
 		$(REQUIRED) \
 		$(TESTS) \
 		--bail
 
 test-cov:
-	@NODE_ENV=test $(BIN) $(FLAGS) \
+	@NODE_ENV=test node \
 		./node_modules/.bin/istanbul cover \
 		./node_modules/.bin/_mocha \
 		-- -u exports \
 		$(REQUIRED) \
 		$(TESTS) \
 		--bail
 
-test-travis:
-	@NODE_ENV=test $(BIN) $(FLAGS) \
+test-travis: lint
+	@NODE_ENV=test node \
 		./node_modules/.bin/istanbul cover \
 		./node_modules/.bin/_mocha \
 		--report lcovonly \
@@ -49,4 +40,4 @@ test-travis:
 bench:
 	@$(MAKE) -C benchmarks
 
-.PHONY: test bench
+.PHONY: lint test bench