From 9d4ed8c61cc6de0214047b2be8d0d2e250d83a3c Mon Sep 17 00:00:00 2001 From: kirrg001 Date: Tue, 31 Oct 2017 12:11:59 +0100 Subject: [PATCH] Replaced extract-zip-fork by extract-zip no issue - we had to fork the original repository at one point, because of slow maintenance - maintenance is back now - https://github.com/maxogden/extract-zip/pull/52 was merged and released --- core/server/data/importer/index.js | 2 +- core/test/unit/utils/zip-folder_spec.js | 2 +- package.json | 2 +- yarn.lock | 30 +++++++++++-------------- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/core/server/data/importer/index.js b/core/server/data/importer/index.js index d181599990..4c18f822e6 100644 --- a/core/server/data/importer/index.js +++ b/core/server/data/importer/index.js @@ -7,7 +7,7 @@ var _ = require('lodash'), os = require('os'), glob = require('glob'), uuid = require('uuid'), - extract = require('extract-zip-fork'), + extract = require('extract-zip'), errors = require('../../errors'), logging = require('../../logging'), ImageHandler = require('./handlers/image'), diff --git a/core/test/unit/utils/zip-folder_spec.js b/core/test/unit/utils/zip-folder_spec.js index 1fa6805a27..2a2e055988 100644 --- a/core/test/unit/utils/zip-folder_spec.js +++ b/core/test/unit/utils/zip-folder_spec.js @@ -1,7 +1,7 @@ var should = require('should'), // jshint ignore:line path = require('path'), fs = require('fs-extra'), - extract = require('extract-zip-fork'), + extract = require('extract-zip'), utils = require('../../../server/utils'); describe('Utils: zip-folder', function () { diff --git a/package.json b/package.json index 8e5f8e0df6..82adb22c4c 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "express": "4.16.2", "express-brute": "1.0.1", "express-hbs": "1.0.4", - "extract-zip-fork": "1.5.1", + "extract-zip": "1.6.6", "fs-extra": "3.0.1", "ghost-gql": "0.0.8", "ghost-ignition": "2.8.16", diff --git a/yarn.lock b/yarn.lock index 1daf405d9d..8c669f25ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -790,14 +790,6 @@ concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" -concat-stream@1.5.0, concat-stream@^1.4.1, concat-stream@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.0.tgz#53f7d43c51c5e43f81c8fdd03321c631be68d611" - dependencies: - inherits "~2.0.1" - readable-stream "~2.0.0" - typedarray "~0.0.5" - concat-stream@1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" @@ -806,6 +798,14 @@ concat-stream@1.6.0: readable-stream "^2.2.2" typedarray "^0.0.6" +concat-stream@^1.4.1, concat-stream@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.0.tgz#53f7d43c51c5e43f81c8fdd03321c631be68d611" + dependencies: + inherits "~2.0.1" + readable-stream "~2.0.0" + typedarray "~0.0.5" + config-chain@~1.1.5: version "1.1.11" resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2" @@ -1030,10 +1030,6 @@ dateformat@~1.0.12: get-stdin "^4.0.1" meow "^3.3.0" -debug@0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39" - debug@2.2.0, debug@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da" @@ -1493,12 +1489,12 @@ extglob@^0.3.1: dependencies: is-extglob "^1.0.0" -extract-zip-fork@1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/extract-zip-fork/-/extract-zip-fork-1.5.1.tgz#f28d9409c1ec90256deb5875cb80ae2f9b292a7b" +extract-zip@1.6.6: + version "1.6.6" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.6.tgz#1290ede8d20d0872b429fd3f351ca128ec5ef85c" dependencies: - concat-stream "1.5.0" - debug "0.7.4" + concat-stream "1.6.0" + debug "2.6.9" mkdirp "0.5.0" yauzl "2.4.1"