1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deps: backport 4ca695819 from npm upstream

Browse Source 
Original commit message:

    minizlib@1.0.4

    Fixes Node 9 compatibility.

    Credit: @isaacs

PR-URL: https://github.com/nodejs/node/pull/16509
Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
This commit is contained in:
Myles Borins 2017-10-26 22:44:44 -04:00
parent ace4fe566f
commit 9f33a248b3
No known key found for this signature in database
GPG Key ID: 933B01F40B5CA946
2 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
deps/npm/node_modules/tar/node_modules/minizlib/index.js generated vendored
View File

@ -52,6 +52,7 @@ const _offset = Symbol('offset')
const _level = Symbol('level') const _level = Symbol('level')
const _strategy = Symbol('strategy') const _strategy = Symbol('strategy')
const _ended = Symbol('ended') const _ended = Symbol('ended')
const _writeState = Symbol('writeState')
class Zlib extends MiniPass { class Zlib extends MiniPass {
constructor (opts, mode) { constructor (opts, mode) {
@ -127,11 +128,27 @@ class Zlib extends MiniPass {
var strategy = typeof opts.strategy === 'number' ? opts.strategy var strategy = typeof opts.strategy === 'number' ? opts.strategy
: constants.Z_DEFAULT_STRATEGY : constants.Z_DEFAULT_STRATEGY
this[_handle].init(opts.windowBits || constants.Z_DEFAULT_WINDOWBITS, this[_writeState] = new Uint32Array(2);
level, const window = opts.windowBits || constants.Z_DEFAULT_WINDOWBITS
opts.memLevel || constants.Z_DEFAULT_MEMLEVEL, const memLevel = opts.memLevel || constants.Z_DEFAULT_MEMLEVEL
strategy,
opts.dictionary) // API changed in node v9
/* istanbul ignore next */
if (/^v[0-8]\./.test(process.version)) {
this[_handle].init(window,
level,
memLevel,
strategy,
opts.dictionary)
} else {
this[_handle].init(window,
level,
memLevel,
strategy,
this[_writeState],
() => {},
opts.dictionary)
}
this[_buffer] = Buffer.allocUnsafe(this[_chunkSize]) this[_buffer] = Buffer.allocUnsafe(this[_chunkSize])
this[_offset] = 0 this[_offset] = 0
@ -234,11 +251,15 @@ class Zlib extends MiniPass {
this[_offset], //out_off this[_offset], //out_off
availOutBefore // out_len availOutBefore // out_len
) )
if (this[_hadError]) if (this[_hadError])
break break
let availInAfter = res[0] // API changed in v9
let availOutAfter = res[1] /* istanbul ignore next */
let availInAfter = res ? res[0] : this[_writeState][1]
/* istanbul ignore next */
let availOutAfter = res ? res[1] : this[_writeState][0]
const have = availOutBefore - availOutAfter const have = availOutBefore - availOutAfter
assert(have >= 0, 'have should not go down') assert(have >= 0, 'have should not go down')

28
deps/npm/node_modules/tar/node_modules/minizlib/package.json generated vendored
View File

@ -1,27 +1,27 @@
{ {
"_from": "minizlib@^1.0.3", "_from": "minizlib@1.0.4",
"_id": "minizlib@1.0.3", "_id": "minizlib@1.0.4",
"_inBundle": false, "_inBundle": false,
"_integrity": "sha1-1cGr93vhVGGZUuJTM27Mq5sqMvU=", "_integrity": "sha512-sN4U9tIJtBRwKbwgFh9qJfrPIQ/GGTRr1MGqkgOeMTLy8/lM0FcWU//FqlnZ3Vb7gJ+Mxh3FOg1EklibdajbaQ==",
"_location": "/tar/minizlib", "_location": "/tar/minizlib",
"_phantomChildren": {}, "_phantomChildren": {},
"_requested": { "_requested": {
"type": "range", "type": "version",
"registry": true, "registry": true,
"raw": "minizlib@^1.0.3", "raw": "minizlib@1.0.4",
"name": "minizlib", "name": "minizlib",
"escapedName": "minizlib", "escapedName": "minizlib",
"rawSpec": "^1.0.3", "rawSpec": "1.0.4",
"saveSpec": null, "saveSpec": null,
"fetchSpec": "^1.0.3" "fetchSpec": "1.0.4"
}, },
"_requiredBy": [ "_requiredBy": [
"/tar" "/tar"
], ],
"_resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.0.3.tgz", "_resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.0.4.tgz",
"_shasum": "d5c1abf77be154619952e253336eccab9b2a32f5", "_shasum": "8ebb51dd8bbe40b0126b5633dbb36b284a2f523c",
"_spec": "minizlib@^1.0.3", "_spec": "minizlib@1.0.4",
"_where": "/Users/rebecca/code/npm/node_modules/tar", "_where": "/Users/rebecca/code/npm",
"author": { "author": {
"name": "Isaac Z. Schlueter", "name": "Isaac Z. Schlueter",
"email": "i@izs.me", "email": "i@izs.me",
@ -32,12 +32,12 @@
}, },
"bundleDependencies": false, "bundleDependencies": false,
"dependencies": { "dependencies": {
"minipass": "^2.0.0" "minipass": "^2.2.1"
}, },
"deprecated": false, "deprecated": false,
"description": "A small fast zlib stream built on [minipass](http://npm.im/minipass) and Node.js's zlib binding.", "description": "A small fast zlib stream built on [minipass](http://npm.im/minipass) and Node.js's zlib binding.",
"devDependencies": { "devDependencies": {
"tap": "^10.3.0" "tap": "^10.7.2"
}, },
"files": [ "files": [
"index.js", "index.js",
@ -67,5 +67,5 @@
"preversion": "npm test", "preversion": "npm test",
"test": "tap test/*.js --100 -J" "test": "tap test/*.js --100 -J"
}, },
"version": "1.0.3" "version": "1.0.4"
} }