From e3a5b07ebb52e0e01c46c54323408a852fc88a35 Mon Sep 17 00:00:00 2001 From: Michael Garvin Date: Tue, 27 Mar 2018 16:15:02 -0700 Subject: [PATCH 1/3] feat: add awareness of wrapWithDirectory option to utils/send-files-stream --- src/utils/send-files-stream.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/utils/send-files-stream.js b/src/utils/send-files-stream.js index e6379c205..ba69030eb 100644 --- a/src/utils/send-files-stream.js +++ b/src/utils/send-files-stream.js @@ -79,6 +79,7 @@ module.exports = (send, path) => { qs['raw-leaves'] = propOrProp(options, 'raw-leaves', 'rawLeaves') qs['only-hash'] = propOrProp(options, 'only-hash', 'onlyHash') qs.hash = propOrProp(options, 'hash', 'hashAlg') + qs['wrap-with-directory'] = propOrProp(options, 'wrap-with-directory', 'wrapWithDirectory') const args = { path: path, From e6594b1598bb3043f62101ded70f0c9924221b6d Mon Sep 17 00:00:00 2001 From: David Dias Date: Tue, 3 Apr 2018 07:18:51 +0100 Subject: [PATCH 2/3] chore: update interface-ipfs-core --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 63cfe8cbb..21aee0793 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "go-ipfs-dep": "^0.4.14", "gulp": "^3.9.1", "hapi": "^17.2.3", - "interface-ipfs-core": "~0.58.0", + "interface-ipfs-core": "~0.59.0", "ipfs": "~0.28.2", "ipfsd-ctl": "~0.31.0", "pre-commit": "^1.2.2", From 23f1fc26c50da1724fc1af0d86c1e4d1f77f86cb Mon Sep 17 00:00:00 2001 From: David Dias Date: Thu, 5 Apr 2018 16:21:52 +0100 Subject: [PATCH 3/3] chore: update deps --- package.json | 14 +++++++------- src/utils/send-files-stream.js | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 21aee0793..0bbfe0148 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "is-stream": "^1.1.0", "libp2p-crypto": "^0.12.1", "lru-cache": "^4.1.2", - "multiaddr": "^3.1.0", + "multiaddr": "^4.0.0", "multibase": "^0.4.0", "multihashes": "~0.4.13", "ndjson": "^1.5.0", @@ -53,7 +53,7 @@ "pull-pushable": "^2.2.0", "pump": "^3.0.0", "qs": "^6.5.1", - "readable-stream": "^2.3.5", + "readable-stream": "^2.3.6", "stream-http": "^2.8.1", "stream-to-pull-stream": "^1.7.2", "streamifier": "^0.1.1", @@ -76,14 +76,14 @@ "eslint-plugin-react": "^7.7.0", "go-ipfs-dep": "^0.4.14", "gulp": "^3.9.1", - "hapi": "^17.2.3", - "interface-ipfs-core": "~0.59.0", + "hapi": "^17.3.1", + "interface-ipfs-core": "~0.60.1", "ipfs": "~0.28.2", "ipfsd-ctl": "~0.31.0", "pre-commit": "^1.2.2", - "pull-stream": "^3.6.2", - "socket.io": "^2.0.4", - "socket.io-client": "^2.0.4", + "pull-stream": "^3.6.7", + "socket.io": "^2.1.0", + "socket.io-client": "^2.1.0", "stream-equal": "^1.1.1" }, "pre-commit": [ diff --git a/src/utils/send-files-stream.js b/src/utils/send-files-stream.js index ba69030eb..46a57e383 100644 --- a/src/utils/send-files-stream.js +++ b/src/utils/send-files-stream.js @@ -78,8 +78,8 @@ module.exports = (send, path) => { qs['cid-version'] = propOrProp(options, 'cid-version', 'cidVersion') qs['raw-leaves'] = propOrProp(options, 'raw-leaves', 'rawLeaves') qs['only-hash'] = propOrProp(options, 'only-hash', 'onlyHash') - qs.hash = propOrProp(options, 'hash', 'hashAlg') qs['wrap-with-directory'] = propOrProp(options, 'wrap-with-directory', 'wrapWithDirectory') + qs.hash = propOrProp(options, 'hash', 'hashAlg') const args = { path: path,