Skip to content

Commit 0c0e715

Browse files
Merge pull request #1 from ipfs/update
Latest pako & dictionary support
2 parents 49bcb75 + d35b22d commit 0c0e715

34 files changed

+1796
-1371
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
node_modules/
1+
node_modules
22
.DS_Store
3+
4+
*.log

.travis.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
11
language: node_js
22
node_js:
3-
- "0.10"
3+
- 4
4+
- 5
5+
- stable
6+
7+
before_install:
8+
- "export DISPLAY=:99.0"
9+
- "sh -e /etc/init.d/xvfb start"
10+
11+
addons:
12+
firefox: "latest"
13+
14+
script:
15+
- npm run lint
16+
- npm test

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ Emulates Node's [zlib](http://nodejs.org/api/zlib.html) module for [Browserify](
44
using [pako](https://github.com/nodeca/pako). It uses the actual Node source code and passes the Node zlib tests
55
by emulating the C++ binding that actually calls zlib.
66

7-
[![browser support](https://ci.testling.com/devongovett/browserify-zlib.png)
8-
](https://ci.testling.com/devongovett/browserify-zlib)
9-
107
[![node tests](https://travis-ci.org/devongovett/browserify-zlib.svg)
118
](https://travis-ci.org/devongovett/browserify-zlib)
129

@@ -15,7 +12,6 @@ by emulating the C++ binding that actually calls zlib.
1512
The following options/methods are not supported because pako does not support them yet.
1613

1714
* The `params` method
18-
* The `dictionary` option
1915

2016
## License
2117

karma.conf.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
module.exports = function (karma) {
2+
karma.set({
3+
frameworks: ['browserify', 'mocha'],
4+
files: ['test/**/test-*.js'],
5+
preprocessors: {
6+
'test/**/test-*.js': ['browserify']
7+
},
8+
browserify: {
9+
debug: true,
10+
transform: ['brfs']
11+
},
12+
reporters: ['mocha-own'],
13+
mochaOwnReporter: {
14+
reporter: 'spec'
15+
},
16+
browsers: process.env.TRAVIS ? ['Firefox', 'PhantomJS'] : ['Chrome', 'PhantomJS']
17+
})
18+
}

package.json

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,30 @@
22
"name": "browserify-zlib",
33
"version": "0.1.4",
44
"description": "Full zlib module for browserify",
5-
"keywords": ["zlib", "browserify"],
6-
"main": "index.js",
5+
"keywords": [
6+
"zlib",
7+
"browserify"
8+
],
9+
"main": "src/index.js",
710
"directories": {
811
"test": "test"
912
},
1013
"dependencies": {
11-
"pako": "~0.2.0"
14+
"pako": "~1.0.1"
1215
},
1316
"devDependencies": {
14-
"tape": "^2.12.3",
15-
"brfs": "^1.0.1"
17+
"brfs": "^1.0.1",
18+
"karma": "^0.13.22",
19+
"karma-browserify": "^5.0.3",
20+
"karma-chrome-launcher": "^0.2.3",
21+
"karma-firefox-launcher": "^0.1.7",
22+
"karma-mocha": "^0.2.2",
23+
"karma-mocha-own-reporter": "^1.1.2",
24+
"karma-phantomjs-launcher": "^1.0.0",
25+
"mocha": "^2.4.5",
26+
"phantomjs-prebuilt": "^2.1.7",
27+
"standard": "^6.0.8",
28+
"watchify": "^3.7.0"
1629
},
1730
"testling": {
1831
"files": "test/*.js",
@@ -28,9 +41,11 @@
2841
]
2942
},
3043
"scripts": {
31-
"test": "node_modules/tape/bin/tape test/*.js"
44+
"lint": "standard",
45+
"test": "npm run test:node && npm run test:browser",
46+
"test:browser": "karma start --single-run=true karma.conf.js",
47+
"test:node": "mocha test/test-*"
3248
},
33-
"main": "src/index.js",
3449
"author": "Devon Govett <[email protected]>",
3550
"license": "MIT",
3651
"repository": {

0 commit comments

Comments
 (0)