Skip to content

Commit

Permalink
Merge pull request #272 from laktak/compress
Browse files Browse the repository at this point in the history
Compression Support
  • Loading branch information
Tankred Hase committed Dec 9, 2014
2 parents 5184d45 + da650e2 commit bed3930
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 1,301 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ build/
.DS_Store
node_modules/
npm*
src/compression/
test/lib/
dist/
openpgp.store/
Expand Down
10 changes: 8 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,12 @@ module.exports = function(grunt) {
cwd: 'node_modules/',
src: ['mocha/mocha.css', 'mocha/mocha.js', 'chai/chai.js'],
dest: 'test/lib/'
},
zlib: {
expand: true,
cwd: 'node_modules/zlibjs/bin/',
src: ['rawdeflate.min.js','rawinflate.min.js','zlib.min.js'],
dest: 'src/compression/'
}
},
clean: ['dist/'],
Expand Down Expand Up @@ -145,7 +151,7 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-connect');

grunt.registerTask('default', 'Build OpenPGP.js', function() {
grunt.task.run(['clean', 'browserify', 'replace', 'uglify', 'npm_pack']);
grunt.task.run(['clean', 'copy:zlib', 'browserify', 'replace', 'uglify', 'npm_pack']);
//TODO jshint is not run because of too many discovered issues, once these are addressed it should autorun
grunt.log.ok('Before Submitting a Pull Request please also run `grunt jshint`.');
});
Expand Down Expand Up @@ -182,5 +188,5 @@ module.exports = function(grunt) {
});

// Test/Dev tasks
grunt.registerTask('test', ['copy', 'mochaTest', 'mocha_phantomjs']);
grunt.registerTask('test', ['copy:npm', 'mochaTest', 'mocha_phantomjs']);
};
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
},
"dependencies": {
"es6-promise": "^1.0.0",
"node-localstorage": "~0.3.4"
"node-localstorage": "~0.3.4",
"zlibjs": "^0.2.0"
},
"repository": {
"type": "git",
Expand Down

0 comments on commit bed3930

Please sign in to comment.