From 6f81461fc318bcaef0c833600bb7155b46760d91 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 12 Mar 2018 15:15:05 +0100 Subject: [PATCH 01/15] Add offset to buffer call --- lib/archivers/zip/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/archivers/zip/util.js b/lib/archivers/zip/util.js index 2b16c148..8d7987f1 100644 --- a/lib/archivers/zip/util.js +++ b/lib/archivers/zip/util.js @@ -36,7 +36,7 @@ util.dosToDate = function(dos) { }; util.fromDosTime = function(buf) { - return util.dosToDate(buf.readUInt32LE()); + return util.dosToDate(buf.readUInt32LE(0)); }; util.getEightBytes = function(v) { From 65497a18d0e8cdb40f6742c10f05243842700074 Mon Sep 17 00:00:00 2001 From: Chris Talkington Date: Wed, 23 May 2018 23:49:46 -0500 Subject: [PATCH 02/15] Update appveyor.yml --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e30e8f28..d9b29c97 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,6 @@ environment: matrix: + - nodejs_version: '10' - nodejs_version: '8' - nodejs_version: '6' - nodejs_version: '4' @@ -20,4 +21,4 @@ clone_depth: 1 test_script: - node --version - npm --version - - npm test \ No newline at end of file + - npm test From 976965cc69daf6bdd6eff45cd229d7d2f5694d63 Mon Sep 17 00:00:00 2001 From: Chris Talkington Date: Wed, 23 May 2018 23:50:17 -0500 Subject: [PATCH 03/15] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 84082dba..87b15de2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,11 @@ sudo: false language: node_js node_js: + - 10 - 8 - 6 - 4 - '0.12' - '0.10' matrix: - fast_finish: true \ No newline at end of file + fast_finish: true From a4570138eed5775633b806db2e43d1e057ad0b4e Mon Sep 17 00:00:00 2001 From: Chris Talkington Date: Fri, 8 Jun 2018 22:14:00 -0500 Subject: [PATCH 04/15] Update appveyor.yml --- appveyor.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d9b29c97..14d0ecf9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,12 +4,10 @@ environment: - nodejs_version: '8' - nodejs_version: '6' - nodejs_version: '4' - - nodejs_version: '0.12' - - nodejs_version: '0.10' install: - ps: Install-Product node $env:nodejs_version - set CI=true - - IF %nodejs_version% LSS 4 npm -g install npm@2 + - IF %nodejs_version% LSS 6 npm -g install npm@3 - set PATH=%APPDATA%\npm;%PATH% - npm install matrix: From 8540f94abf0d2a28cbf3784d21cb6bd1c33c307c Mon Sep 17 00:00:00 2001 From: Chris Talkington Date: Fri, 8 Jun 2018 22:14:50 -0500 Subject: [PATCH 05/15] Update package.json --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 3c42a46a..3d20ce9e 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "lib" ], "engines": { - "node": ">= 0.10.0" + "node": ">= 4" }, "scripts": { "test": "mocha --reporter dot" @@ -32,8 +32,8 @@ "readable-stream": "^2.0.0" }, "devDependencies": { - "chai": "^3.4.0", - "mocha": "^3.2.0", + "chai": "^4.0.0", + "mocha": "^5.0.0", "rimraf": "^2.4.3", "mkdirp": "^0.5.0" }, @@ -45,4 +45,4 @@ "publishConfig": { "registry": "https://registry.npmjs.org/" } -} \ No newline at end of file +} From f975390bc96d0c789f47d684e491a55e1a672458 Mon Sep 17 00:00:00 2001 From: Chris Talkington Date: Fri, 8 Jun 2018 22:15:41 -0500 Subject: [PATCH 06/15] Update .travis.yml --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 87b15de2..55324505 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,5 @@ node_js: - 8 - 6 - 4 - - '0.12' - - '0.10' matrix: fast_finish: true From 699ca27c8316b1a28e45a01aee3a4954b182ff75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rouven=20We=C3=9Fling?= Date: Sun, 3 Mar 2019 01:29:32 +0100 Subject: [PATCH 07/15] Bump normalize-path to version 3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3d20ce9e..4a77a956 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "dependencies": { "buffer-crc32": "^0.2.1", "crc32-stream": "^2.0.0", - "normalize-path": "^2.0.0", + "normalize-path": "^3.0.0", "readable-stream": "^2.0.0" }, "devDependencies": { From e052c2a381f8b4d63dd8f91272310d1a51d8971e Mon Sep 17 00:00:00 2001 From: Chris Talkington Date: Fri, 19 Jul 2019 17:58:57 -0500 Subject: [PATCH 08/15] update deps. --- package-lock.json | 106 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 4 +- 2 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 00000000..223ec70c --- /dev/null +++ b/package-lock.json @@ -0,0 +1,106 @@ +{ + "name": "compress-commons", + "version": "1.2.2", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "base64-js": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz", + "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==" + }, + "buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz", + "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==", + "requires": { + "base64-js": "1.3.0", + "ieee754": "1.1.13" + } + }, + "buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=" + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "crc": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz", + "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==", + "requires": { + "buffer": "5.2.1" + } + }, + "crc32-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz", + "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=", + "requires": { + "crc": "3.8.0", + "readable-stream": "2.3.6" + } + }, + "ieee754": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + }, + "process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "5.1.2" + } + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + } + } +} diff --git a/package.json b/package.json index 4a77a956..71875212 100644 --- a/package.json +++ b/package.json @@ -26,10 +26,10 @@ "test": "mocha --reporter dot" }, "dependencies": { - "buffer-crc32": "^0.2.1", + "buffer-crc32": "^0.2.13", "crc32-stream": "^2.0.0", "normalize-path": "^3.0.0", - "readable-stream": "^2.0.0" + "readable-stream": "^2.3.6" }, "devDependencies": { "chai": "^4.0.0", From 6a369a238316a9adf55308cda3ea8b74f7630f1b Mon Sep 17 00:00:00 2001 From: Chris Talkington Date: Fri, 19 Jul 2019 18:07:16 -0500 Subject: [PATCH 09/15] update package-lock --- package-lock.json | 260 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 260 insertions(+) diff --git a/package-lock.json b/package-lock.json index 223ec70c..8fa8bc95 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,11 +4,39 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "assertion-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, "base64-js": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz", "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==" }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true + }, "buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz", @@ -23,6 +51,38 @@ "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=" }, + "chai": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz", + "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==", + "dev": true, + "requires": { + "assertion-error": "1.1.0", + "check-error": "1.0.2", + "deep-eql": "3.0.1", + "get-func-name": "2.0.0", + "pathval": "1.1.0", + "type-detect": "4.0.8" + } + }, + "check-error": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", + "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", + "dev": true + }, + "commander": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -45,11 +105,95 @@ "readable-stream": "2.3.6" } }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "deep-eql": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", + "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "dev": true, + "requires": { + "type-detect": "4.0.8" + } + }, + "diff": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "get-func-name": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", + "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", + "dev": true + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.4", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "he": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", + "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", + "dev": true + }, "ieee754": { "version": "1.1.13", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", @@ -60,11 +204,81 @@ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "requires": { + "brace-expansion": "1.1.11" + } + }, + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, + "mocha": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz", + "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==", + "dev": true, + "requires": { + "browser-stdout": "1.3.1", + "commander": "2.15.1", + "debug": "3.1.0", + "diff": "3.5.0", + "escape-string-regexp": "1.0.5", + "glob": "7.1.2", + "growl": "1.10.5", + "he": "1.1.1", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "supports-color": "5.4.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + }, + "pathval": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", + "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=", + "dev": true + }, "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -84,6 +298,31 @@ "util-deprecate": "1.0.2" } }, + "rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "dev": true, + "requires": { + "glob": "7.1.4" + }, + "dependencies": { + "glob": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.4", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + } + } + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -97,10 +336,31 @@ "safe-buffer": "5.1.2" } }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + }, + "type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true + }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true } } } From f6eedad83a5f9d36f5f66fb2b79a75afdad91391 Mon Sep 17 00:00:00 2001 From: Chris Talkington Date: Fri, 19 Jul 2019 18:12:18 -0500 Subject: [PATCH 10/15] follow node LTS, remove support < 6. --- .travis.yml | 1 - appveyor.yml | 2 -- package.json | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 55324505..0bcda364 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,5 @@ node_js: - 10 - 8 - 6 - - 4 matrix: fast_finish: true diff --git a/appveyor.yml b/appveyor.yml index 14d0ecf9..6bf3a798 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,11 +3,9 @@ environment: - nodejs_version: '10' - nodejs_version: '8' - nodejs_version: '6' - - nodejs_version: '4' install: - ps: Install-Product node $env:nodejs_version - set CI=true - - IF %nodejs_version% LSS 6 npm -g install npm@3 - set PATH=%APPDATA%\npm;%PATH% - npm install matrix: diff --git a/package.json b/package.json index 71875212..27bf4c04 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "lib" ], "engines": { - "node": ">= 4" + "node": ">= 6" }, "scripts": { "test": "mocha --reporter dot" From a30ed8a500e95273e84ff863031ae6aa6b75859f Mon Sep 17 00:00:00 2001 From: Chris Talkington Date: Fri, 19 Jul 2019 18:15:29 -0500 Subject: [PATCH 11/15] test node 12. --- .travis.yml | 1 + appveyor.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0bcda364..8c200384 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ sudo: false language: node_js node_js: + - 12 - 10 - 8 - 6 diff --git a/appveyor.yml b/appveyor.yml index 6bf3a798..a0040d01 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,6 @@ environment: matrix: + - nodejs_version: '12' - nodejs_version: '10' - nodejs_version: '8' - nodejs_version: '6' From b0d4e6b938d722927f040b3fcb7e51f977b1746f Mon Sep 17 00:00:00 2001 From: Chris Talkington Date: Fri, 19 Jul 2019 18:21:07 -0500 Subject: [PATCH 12/15] buffer alloc. closes #35 --- lib/archivers/zip/constants.js | 6 +++--- lib/archivers/zip/util.js | 6 +++--- lib/archivers/zip/zip-archive-output-stream.js | 6 +++--- lib/util/index.js | 4 ++-- test/helpers/index.js | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/archivers/zip/constants.js b/lib/archivers/zip/constants.js index f2bea819..7392fe30 100644 --- a/lib/archivers/zip/constants.js +++ b/lib/archivers/zip/constants.js @@ -8,14 +8,14 @@ module.exports = { WORD: 4, DWORD: 8, - EMPTY: new Buffer(0), + EMPTY: Buffer.alloc(0), SHORT: 2, SHORT_MASK: 0xffff, SHORT_SHIFT: 16, - SHORT_ZERO: new Buffer(Array(2)), + SHORT_ZERO: Buffer.alloc(Array(2)), LONG: 4, - LONG_ZERO: new Buffer(Array(4)), + LONG_ZERO: Buffer.alloc(Array(4)), MIN_VERSION_INITIAL: 10, MIN_VERSION_DATA_DESCRIPTOR: 20, diff --git a/lib/archivers/zip/util.js b/lib/archivers/zip/util.js index 8d7987f1..22055ae5 100644 --- a/lib/archivers/zip/util.js +++ b/lib/archivers/zip/util.js @@ -40,7 +40,7 @@ util.fromDosTime = function(buf) { }; util.getEightBytes = function(v) { - var buf = new Buffer(8); + var buf = Buffer.alloc(8); buf.writeUInt32LE(v % 0x0100000000, 0); buf.writeUInt32LE((v / 0x0100000000) | 0, 4); @@ -48,7 +48,7 @@ util.getEightBytes = function(v) { }; util.getShortBytes = function(v) { - var buf = new Buffer(2); + var buf = Buffer.alloc(2); buf.writeUInt16LE((v & 0xFFFF) >>> 0, 0); return buf; @@ -59,7 +59,7 @@ util.getShortBytesValue = function(buf, offset) { }; util.getLongBytes = function(v) { - var buf = new Buffer(4); + var buf = Buffer.alloc(4); buf.writeUInt32LE((v & 0xFFFFFFFF) >>> 0, 0); return buf; diff --git a/lib/archivers/zip/zip-archive-output-stream.js b/lib/archivers/zip/zip-archive-output-stream.js index 91d0ff22..d4550c7c 100644 --- a/lib/archivers/zip/zip-archive-output-stream.js +++ b/lib/archivers/zip/zip-archive-output-stream.js @@ -313,8 +313,8 @@ ZipArchiveOutputStream.prototype._writeCentralFileHeader = function(ae) { var extra = ae.getCentralDirectoryExtra(); if (gpb.usesUTF8ForNames()) { - name = new Buffer(name); - comment = new Buffer(comment); + name = Buffer.alloc(name); + comment = Buffer.alloc(comment); } // name length @@ -381,7 +381,7 @@ ZipArchiveOutputStream.prototype._writeLocalFileHeader = function(ae) { } if (gpb.usesUTF8ForNames()) { - name = new Buffer(name); + name = Buffer.alloc(name); } ae._offsets.file = this.offset; diff --git a/lib/util/index.js b/lib/util/index.js index 67cd1f18..ea8da443 100644 --- a/lib/util/index.js +++ b/lib/util/index.js @@ -16,9 +16,9 @@ util.isStream = function(source) { util.normalizeInputSource = function(source) { if (source === null) { - return new Buffer(0); + return Buffer.alloc(0); } else if (typeof source === 'string') { - return new Buffer(source); + return Buffer.alloc(source); } else if (util.isStream(source) && !source._readableState) { var normalized = new PassThrough(); source.pipe(normalized); diff --git a/test/helpers/index.js b/test/helpers/index.js index 10c1e766..c4eb5514 100644 --- a/test/helpers/index.js +++ b/test/helpers/index.js @@ -7,7 +7,7 @@ var Readable = require('readable-stream').Readable; var Writable = require('readable-stream').Writable; function binaryBuffer(n) { - var buffer = new Buffer(n); + var buffer = Buffer.alloc(n); for (var i = 0; i < n; i++) { buffer.writeUInt8(i&255, i); @@ -21,7 +21,7 @@ module.exports.binaryBuffer = binaryBuffer; function BinaryStream(size, options) { Readable.call(this, options); - var buf = new Buffer(size); + var buf = Buffer.alloc(size); for (var i = 0; i < size; i++) { buf.writeUInt8(i&255, i); From d9384eb192b9f316b17810c99168ce24e4d22826 Mon Sep 17 00:00:00 2001 From: Chris Talkington Date: Fri, 19 Jul 2019 18:23:27 -0500 Subject: [PATCH 13/15] buffer alloc. --- lib/archivers/zip/constants.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/archivers/zip/constants.js b/lib/archivers/zip/constants.js index 7392fe30..c30b3250 100644 --- a/lib/archivers/zip/constants.js +++ b/lib/archivers/zip/constants.js @@ -13,9 +13,9 @@ module.exports = { SHORT: 2, SHORT_MASK: 0xffff, SHORT_SHIFT: 16, - SHORT_ZERO: Buffer.alloc(Array(2)), + SHORT_ZERO: Buffer.from(Array(2)), LONG: 4, - LONG_ZERO: Buffer.alloc(Array(4)), + LONG_ZERO: Buffer.from(Array(4)), MIN_VERSION_INITIAL: 10, MIN_VERSION_DATA_DESCRIPTOR: 20, From 8d0eb1849048f44156bd295c4d85f7c8e5544b46 Mon Sep 17 00:00:00 2001 From: Chris Talkington Date: Fri, 19 Jul 2019 18:27:01 -0500 Subject: [PATCH 14/15] buffer alloc. --- lib/archivers/zip/zip-archive-output-stream.js | 6 +++--- lib/util/index.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/archivers/zip/zip-archive-output-stream.js b/lib/archivers/zip/zip-archive-output-stream.js index d4550c7c..7425c397 100644 --- a/lib/archivers/zip/zip-archive-output-stream.js +++ b/lib/archivers/zip/zip-archive-output-stream.js @@ -313,8 +313,8 @@ ZipArchiveOutputStream.prototype._writeCentralFileHeader = function(ae) { var extra = ae.getCentralDirectoryExtra(); if (gpb.usesUTF8ForNames()) { - name = Buffer.alloc(name); - comment = Buffer.alloc(comment); + name = Buffer.from(name); + comment = Buffer.from(comment); } // name length @@ -381,7 +381,7 @@ ZipArchiveOutputStream.prototype._writeLocalFileHeader = function(ae) { } if (gpb.usesUTF8ForNames()) { - name = Buffer.alloc(name); + name = Buffer.from(name); } ae._offsets.file = this.offset; diff --git a/lib/util/index.js b/lib/util/index.js index ea8da443..20a67833 100644 --- a/lib/util/index.js +++ b/lib/util/index.js @@ -18,7 +18,7 @@ util.normalizeInputSource = function(source) { if (source === null) { return Buffer.alloc(0); } else if (typeof source === 'string') { - return Buffer.alloc(source); + return Buffer.from(source); } else if (util.isStream(source) && !source._readableState) { var normalized = new PassThrough(); source.pipe(normalized); From 5bfff1e3fb4c4eadc5425039a74df8734fdba8c4 Mon Sep 17 00:00:00 2001 From: Chris Talkington Date: Fri, 19 Jul 2019 18:30:31 -0500 Subject: [PATCH 15/15] bump version for release. --- CHANGELOG.md | 12 ++++++++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..48bce8ea --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,12 @@ +## Changelog + +**2.0.0** — _July 19, 2019_ — [Diff](https://github.com/archiverjs/node-compress-commons/compare/1.2.2...2.0.0) + +- breaking: follow node LTS, remove support for versions under 6. +- test: now targeting node v10 and v12 +- fix: update Buffer calls to alloc/from +- fix: Add offset to buffer call (#31) +- other: update normalize-path@3 (#34) +- other: update dependencies + +[Release Archive](https://github.com/archiverjs/node-compress-commons/releases) diff --git a/package-lock.json b/package-lock.json index 8fa8bc95..6f702adb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "compress-commons", - "version": "1.2.2", + "version": "2.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 27bf4c04..f8ab30ad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "compress-commons", - "version": "1.2.2", + "version": "2.0.0", "description": "a library that defines a common interface for working with archive formats within node", "homepage": "https://github.com/archiverjs/node-compress-commons", "author": {