prepare for merge

Author: dignifiedquire

.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 language: node_js
 node_js:
   - 6
-  - 7
+  - 8
 
 before_install:
   - "export DISPLAY=:99.0"

README.md

@@ -1,13 +1,7 @@
-# browserify-zlib-next
+# browserify-zlib
 
-> This is a fork of https://github.com/devongovett/browserify-zlib.
-> There is an [open pull request](https://github.com/devongovett/browserify-zlib/pull/18) to get these changes merged back in.
-
-[![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://ipn.io)
-[![](https://img.shields.io/badge/project-IPFS-blue.svg?style=flat-square)](http://ipfs.io/)
-[![](https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs)
-[![Travis CI](https://travis-ci.org/ipfs/browserify-zlib-next.svg?branch=master)](https://travis-ci.org/ipfs/browserify-zlib-next)
-[![Dependency Status](https://david-dm.org/ipfs/browserify-zlib-next.svg?style=flat-square)](https://david-dm.org/ipfs/browserify-zlib-next) [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard)
+[![Travis CI](https://travis-ci.org/devongovett/browserify-zlib.svg?branch=master)](https://travis-ci.org/devongovett/browserify-zlib)
+[![Dependency Status](https://david-dm.org/devongovett/browserify-zlib.svg?style=flat-square)](https://david-dm.org/devongovett/browserify-zlib) [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard)
 
 ## Description
 

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "browserify-zlib-next",
-  "version": "1.0.1",
+  "name": "browserify-zlib",
+  "version": "0.1.4",
   "description": "Full zlib module for the browser",
   "keywords": [
     "zlib",
@@ -11,29 +11,29 @@
     "test": "test"
   },
   "dependencies": {
-    "pako": "~1.0.4"
+    "pako": "~1.0.5"
   },
   "devDependencies": {
     "assert": "^1.4.1",
-    "babel-cli": "^6.18.0",
-    "babel-plugin-transform-es2015-arrow-functions": "^6.8.0",
-    "babel-plugin-transform-es2015-block-scoping": "^6.21.0",
-    "babel-plugin-transform-es2015-template-literals": "^6.8.0",
+    "babel-cli": "^6.24.1",
+    "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
+    "babel-plugin-transform-es2015-block-scoping": "^6.24.1",
+    "babel-plugin-transform-es2015-template-literals": "^6.22.0",
     "babelify": "^7.3.0",
     "brfs": "^1.4.3",
-    "browserify": "^13.3.0",
+    "browserify": "^14.4.0",
     "exec-glob": "^1.2.2",
-    "glob": "^7.1.1",
-    "karma": "^1.4.0",
-    "karma-chrome-launcher": "^2.0.0",
-    "karma-firefox-launcher": "^1.0.0",
+    "glob": "^7.1.2",
+    "karma": "^1.7.0",
+    "karma-chrome-launcher": "^2.1.1",
+    "karma-firefox-launcher": "^1.0.1",
     "karma-mocha": "^1.3.0",
     "karma-mocha-own-reporter": "^1.1.2",
-    "karma-phantomjs-launcher": "^1.0.2",
-    "mocha": "^3.2.0",
+    "karma-phantomjs-launcher": "^1.0.4",
+    "mocha": "^3.4.2",
     "phantomjs-prebuilt": "^2.1.14",
-    "standard": "^8.6.0",
-    "watchify": "^3.8.0"
+    "standard": "^10.0.2",
+    "watchify": "^3.9.0"
   },
   "scripts": {
     "build": "babel src --out-dir lib",
@@ -52,13 +52,13 @@
     ]
   },
   "author": "Devon Govett <[email protected]>",
-  "homepage": "https://github.com/ipfs/browserify-zlib-next",
+  "homepage": "https://github.com/devongovett/browserify-zlib",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/ipfs/browserify-zlib-next.git"
+    "url": "git+https://github.com/devongovett/browserify-zlib.git"
   },
   "bugs": {
-    "url": "https://github.com/ipfs/browserify-zlib-next/issues"
+    "url": "https://github.com/devongovett/browserify-zlib/issues"
   }
 }

src/binding.js

@@ -102,7 +102,7 @@ Zlib.prototype._write = function (async, flush, input, in_off, in_len, out, out_
   }
 
   if (input == null) {
-    input = new Buffer(0)
+    input = Buffer.alloc(0)
     in_len = 0
     in_off = 0
   }