Skip to content

Commit

Permalink
remove promises polyfill, update zlib-asm
Browse files Browse the repository at this point in the history
  • Loading branch information
ukyo committed Nov 17, 2015
1 parent 2e29ae9 commit 32ee6fb
Show file tree
Hide file tree
Showing 5 changed files with 220 additions and 214 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "vendor/zlib-asm"]
path = vendor/zlib-asm
url = git@github.com:ukyo/zlib-asm.git
9 changes: 3 additions & 6 deletions Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,8 @@ module.exports = (grunt) ->
"""
footer: '}).call(this);'
src: [
'node_modules/es6-promise/dist/promise-1.0.0.min.js'
'_jsziptools.js'
'vendor/zlib-asm/zlib.js'
'node_modules/zlib-asm/zlib.js'
'_emscriptenBackend.js'
]
dest: 'jsziptools.js'
Expand All @@ -63,7 +62,6 @@ module.exports = (grunt) ->
# launch_in_dev: ['Chrome', 'Firefox']
dev:
src: [
'node_modules/es6-promise/dist/promise-1.0.0.js'
'src/jsziptools.js'
'src/utils.js'
'src/algorithms/adler32.js'
Expand All @@ -86,7 +84,7 @@ module.exports = (grunt) ->
'src/gz.decompress.js'
'src/zip.pack.js'
'src/zip.unpack.js'
'vendor/zlib-asm/zlib.js'
'node_modules/zlib-asm/zlib.js'
'src/zlibBackend/emscriptenBackend.js'
'test/test.js'
]
Expand All @@ -99,7 +97,6 @@ module.exports = (grunt) ->
worker:
dev:
src: [
'node_modules/es6-promise/dist/promise-1.0.0.js'
'src/jsziptools.js'
'src/utils.js'
'src/algorithms/adler32.js'
Expand All @@ -122,7 +119,7 @@ module.exports = (grunt) ->
'src/gz.decompress.js'
'src/zip.pack.js'
'src/zip.unpack.js'
'vendor/zlib-asm/zlib.js'
'node_modules/zlib-asm/zlib.js'
'src/zlibBackend/emscriptenBackend.js'
'test/workerBody.js'
]
Expand Down
411 changes: 212 additions & 199 deletions jsziptools.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jsziptools",
"version": "2.4.4",
"version": "2.4.5",
"description": "It's a utility of zlib, gzip and zip format binary data.",
"main": "jsziptools.js",
"directories": {
Expand All @@ -25,14 +25,14 @@
"url": "https://github.com/ukyo/jsziptools/issues"
},
"devDependencies": {
"grunt-contrib-uglify": "~0.2.7",
"grunt": "~0.4.2",
"grunt-contrib-concat": "~0.3.0",
"grunt-contrib-clean": "~0.5.0",
"grunt-contrib-testem": "~0.5.14"
"grunt-contrib-concat": "~0.3.0",
"grunt-contrib-testem": "~0.5.14",
"grunt-contrib-uglify": "~0.2.7",
"zlib-asm": "^0.3.0"
},
"dependencies": {
"es6-promise": "^1.0.0",
"zlibjs": "^0.2.0"
}
}
1 change: 0 additions & 1 deletion vendor/zlib-asm
Submodule zlib-asm deleted from 4624d1

0 comments on commit 32ee6fb

Please sign in to comment.