From 7b3c0b4b73472a18f7ca0d81fcf6a0f80dd60841 Mon Sep 17 00:00:00 2001 From: Ziggy Jonsson Date: Sun, 14 Apr 2024 13:58:15 -0400 Subject: [PATCH] Remove-polyfills (#301) --- .gitignore | 3 ++- lib/Buffer.js | 12 ------------ lib/BufferStream.js | 5 ----- lib/Decrypt.js | 4 ---- lib/NoopStream.js | 5 ----- lib/Open/directory.js | 1 - lib/Open/index.js | 4 ---- lib/Open/unzip.js | 5 ----- lib/PullStream.js | 5 ----- lib/parse.js | 5 ----- lib/parseOne.js | 4 ---- package.json | 8 ++------ unzip.js | 6 ------ 13 files changed, 4 insertions(+), 63 deletions(-) delete mode 100644 lib/Buffer.js diff --git a/.gitignore b/.gitignore index cac261b..ed57018 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ /test.js /.nyc_output/ /coverage/ -.tap/ \ No newline at end of file +.tap/ +package-lock.json \ No newline at end of file diff --git a/lib/Buffer.js b/lib/Buffer.js deleted file mode 100644 index 8c53253..0000000 --- a/lib/Buffer.js +++ /dev/null @@ -1,12 +0,0 @@ -var Buffer = require('buffer').Buffer; - -// Backwards compatibility for node versions < 8 -if (Buffer.from === undefined) { - Buffer.from = function (a, b, c) { - return new Buffer(a, b, c) - }; - - Buffer.alloc = Buffer.from; -} - -module.exports = Buffer; \ No newline at end of file diff --git a/lib/BufferStream.js b/lib/BufferStream.js index 2fd703d..ab2e7f6 100644 --- a/lib/BufferStream.js +++ b/lib/BufferStream.js @@ -1,10 +1,5 @@ var Promise = require('bluebird'); var Stream = require('stream'); -var Buffer = require('./Buffer'); - -// Backwards compatibility for node versions < 8 -if (!Stream.Writable || !Stream.Writable.prototype.destroy) - Stream = require('readable-stream'); module.exports = function(entry) { return new Promise(function(resolve,reject) { diff --git a/lib/Decrypt.js b/lib/Decrypt.js index 94430ca..d775072 100644 --- a/lib/Decrypt.js +++ b/lib/Decrypt.js @@ -1,10 +1,6 @@ var bigInt = require('big-integer'); var Stream = require('stream'); -// Backwards compatibility for node versions < 8 -if (!Stream.Writable || !Stream.Writable.prototype.destroy) - Stream = require('readable-stream'); - var table; function generateTable() { diff --git a/lib/NoopStream.js b/lib/NoopStream.js index febeb53..021a229 100644 --- a/lib/NoopStream.js +++ b/lib/NoopStream.js @@ -1,10 +1,5 @@ var Stream = require('stream'); var util = require('util'); - -// Backwards compatibility for node versions < 8 -if (!Stream.Writable || !Stream.Writable.prototype.destroy) - Stream = require('readable-stream'); - function NoopStream() { if (!(this instanceof NoopStream)) { return new NoopStream(); diff --git a/lib/Open/directory.js b/lib/Open/directory.js index 5d411c7..d095185 100644 --- a/lib/Open/directory.js +++ b/lib/Open/directory.js @@ -3,7 +3,6 @@ var unzip = require('./unzip'); var Promise = require('bluebird'); var BufferStream = require('../BufferStream'); var parseExtraField = require('../parseExtraField'); -var Buffer = require('../Buffer'); var path = require('path'); var Writer = require('fstream').Writer; var parseDateTime = require('../parseDateTime'); diff --git a/lib/Open/index.js b/lib/Open/index.js index fd89746..98c7901 100644 --- a/lib/Open/index.js +++ b/lib/Open/index.js @@ -3,10 +3,6 @@ var Promise = require('bluebird'); var directory = require('./directory'); var Stream = require('stream'); -// Backwards compatibility for node versions < 8 -if (!Stream.Writable || !Stream.Writable.prototype.destroy) - Stream = require('readable-stream'); - module.exports = { buffer: function(buffer, options) { var source = { diff --git a/lib/Open/unzip.js b/lib/Open/unzip.js index 8721478..81204f0 100644 --- a/lib/Open/unzip.js +++ b/lib/Open/unzip.js @@ -4,14 +4,9 @@ var PullStream = require('../PullStream'); var Stream = require('stream'); var zlib = require('zlib'); var parseExtraField = require('../parseExtraField'); -var Buffer = require('../Buffer'); var parseDateTime = require('../parseDateTime'); var parseBuffer = require('../parseBuffer'); -// Backwards compatibility for node versions < 8 -if (!Stream.Writable || !Stream.Writable.prototype.destroy) - Stream = require('readable-stream'); - module.exports = function unzip(source,offset,_password, directoryVars) { var file = PullStream(), entry = Stream.PassThrough(); diff --git a/lib/PullStream.js b/lib/PullStream.js index bbeeb86..1b2c90b 100644 --- a/lib/PullStream.js +++ b/lib/PullStream.js @@ -1,13 +1,8 @@ var Stream = require('stream'); var Promise = require('bluebird'); var util = require('util'); -var Buffer = require('./Buffer'); var strFunction = 'function'; -// Backwards compatibility for node versions < 8 -if (!Stream.Writable || !Stream.Writable.prototype.destroy) - Stream = require('readable-stream'); - function PullStream() { if (!(this instanceof PullStream)) return new PullStream(); diff --git a/lib/parse.js b/lib/parse.js index faac40f..d4aa304 100644 --- a/lib/parse.js +++ b/lib/parse.js @@ -6,14 +6,9 @@ var PullStream = require('./PullStream'); var NoopStream = require('./NoopStream'); var BufferStream = require('./BufferStream'); var parseExtraField = require('./parseExtraField'); -var Buffer = require('./Buffer'); var parseDateTime = require('./parseDateTime'); var parseBuffer = require('./parseBuffer'); -// Backwards compatibility for node versions < 8 -if (!Stream.Writable || !Stream.Writable.prototype.destroy) - Stream = require('readable-stream'); - var endDirectorySignature = Buffer.alloc(4); endDirectorySignature.writeUInt32LE(0x06054b50, 0); diff --git a/lib/parseOne.js b/lib/parseOne.js index 4fdbfac..8954c5b 100644 --- a/lib/parseOne.js +++ b/lib/parseOne.js @@ -3,10 +3,6 @@ var Parse = require('./parse'); var duplexer2 = require('duplexer2'); var BufferStream = require('./BufferStream'); -// Backwards compatibility for node versions < 8 -if (!Stream.Writable || !Stream.Writable.prototype.destroy) - Stream = require('readable-stream'); - function parseOne(match,opts) { var inStream = Stream.PassThrough({objectMode:true}); var outStream = Stream.PassThrough(); diff --git a/package.json b/package.json index c44aca3..6e10256 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "unzipper", - "version": "0.10.14", + "version": "0.11.1", "description": "Unzip cross-platform streaming API ", "author": "Evan Oxfeld ", "contributors": [ @@ -25,13 +25,9 @@ "dependencies": { "big-integer": "^1.6.17", "bluebird": "~3.4.1", - "buffer-indexof-polyfill": "~1.0.0", "duplexer2": "~0.1.4", "fstream": "^1.0.12", - "graceful-fs": "^4.2.2", - "listenercount": "~1.0.1", - "readable-stream": "~2.3.6", - "setimmediate": "~1.0.4" + "graceful-fs": "^4.2.2" }, "devDependencies": { "aws-sdk": "^2.77.0", diff --git a/unzip.js b/unzip.js index 07a8d81..fb9acde 100644 --- a/unzip.js +++ b/unzip.js @@ -1,10 +1,4 @@ 'use strict'; -// Polyfills for node 0.8 -require('listenercount'); -require('buffer-indexof-polyfill'); -require('setimmediate'); - - exports.Parse = require('./lib/parse'); exports.ParseOne = require('./lib/parseOne'); exports.Extract = require('./lib/extract');