diff options
| author | Rich Trott <rtrott@gmail.com> | 2017-08-16 07:00:34 -0700 |
|---|---|---|
| committer | Myles Borins <mylesborins@google.com> | 2017-09-05 12:49:53 -0400 |
| commit | c5adb5f0083d47317fb6cf1dbd9b6873738e01f7 (patch) | |
| tree | 7c51778b607f8f7c7b7cbb0750d88a19ab149a09 /tools/eslint/node_modules/iconv-lite/lib/streams.js | |
| parent | 688e5ed6fd9aee2ecab576282dfd131db0a4711e (diff) | |
| download | node-new-c5adb5f0083d47317fb6cf1dbd9b6873738e01f7.tar.gz | |
tools: update ESLint to 4.2.0
ESLint 4.2.0 contains a fix for a bug that is blocking us from moving to
the non-legacy stricter indentation linting. Update to 4.2.0 to remove
the blocking issue.
Backport-PR-URL: https://github.com/nodejs/node/pull/14859
PR-URL: https://github.com/nodejs/node/pull/14155
Ref: https://github.com/eslint/eslint/issues/8882
Ref: https://github.com/eslint/eslint/pull/8885
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Diffstat (limited to 'tools/eslint/node_modules/iconv-lite/lib/streams.js')
| -rw-r--r-- | tools/eslint/node_modules/iconv-lite/lib/streams.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/eslint/node_modules/iconv-lite/lib/streams.js b/tools/eslint/node_modules/iconv-lite/lib/streams.js index bb4dbdaf4a..4409552958 100644 --- a/tools/eslint/node_modules/iconv-lite/lib/streams.js +++ b/tools/eslint/node_modules/iconv-lite/lib/streams.js @@ -6,7 +6,7 @@ var Buffer = require("buffer").Buffer, // == Exports ================================================================== module.exports = function(iconv) { - + // Additional Public API. iconv.encodeStream = function encodeStream(encoding, options) { return new IconvLiteEncoderStream(iconv.getEncoder(encoding, options), options); @@ -101,7 +101,7 @@ IconvLiteDecoderStream.prototype._transform = function(chunk, encoding, done) { IconvLiteDecoderStream.prototype._flush = function(done) { try { var res = this.conv.end(); - if (res && res.length) this.push(res, this.encoding); + if (res && res.length) this.push(res, this.encoding); done(); } catch (e) { @@ -118,3 +118,4 @@ IconvLiteDecoderStream.prototype.collect = function(cb) { }); return this; } + |