Merge remote-tracking branch 'origin/master' into next

koajs · Sep 9, 2017 · a2d6544 · a2d6544
2 parents 867d86c + d7d53f3
commit a2d6544
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -3,10 +3,9 @@
 const compressible = require('compressible')
 const toArray = require('stream-to-array')
 const isJSON = require('koa-is-json')
-const Bluebird = require('bluebird')
 const bytes = require('bytes')
 
-const compress = Bluebird.promisify(require('zlib').gzip)
+const compress = require('util.promisify')(require('zlib').gzip)
 
 // methods we cache
 const methods = {

diff --git a/package.json b/package.json
@@ -6,18 +6,18 @@
     "tag": "next"
   },
   "dependencies": {
-    "bluebird": "^3.1.1",
     "bytes": "^2.1.0",
     "compressible": "^2.0.0",
     "koa-is-json": "^1.0.0",
-    "stream-to-array": "^2.0.0"
+    "stream-to-array": "^2.0.0",
+    "util.promisify": "^1.0.0"
   },
   "devDependencies": {
     "istanbul": "^1.1.0-alpha.1",
     "koa": "^2.0.0",
     "lru-cache": "^4.0.0",
     "mocha": "^3.1.2",
-    "standard": "^8.6.0",
+    "standard": "^9.0.0",
     "supertest": "^1.1.0"
   },
   "engines": {