Skip to content

Commit

Permalink
fix: pin.ls ignored opts when hash was present
Browse files Browse the repository at this point in the history
Solves problem described in
#360 (comment)
by applying fix for ipfs-api from
ipfs-inactive/js-ipfs-http-client#875

Closes #360
  • Loading branch information
lidel committed Oct 26, 2018
1 parent b7606ae commit 3dce143
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"file-type": "9.0.0",
"filesize": "3.6.1",
"ipfs": "0.31.7",
"ipfs-api": "24.0.2",
"ipfs-api": "https://github.com/ipfs/js-ipfs-api/tarball/14f3006d746ee05b2072e01cb5943a4229a07738/js-ipfs-api.tar.gz",
"ipfs-css": "0.11.0",
"ipfs-http-response": "0.2.0",
"ipfs-postmsg-proxy": "3.1.1",
Expand Down
49 changes: 46 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6030,7 +6030,7 @@ [email protected]:
resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=

ipfs-api@24.0.2, ipfs-api@^24.0.0:
ipfs-api@^24.0.0:
version "24.0.2"
resolved "https://registry.yarnpkg.com/ipfs-api/-/ipfs-api-24.0.2.tgz#c245ce859f40fde0bf24f7fbe829f048f08c8279"
integrity sha512-3uxSZ+KNlQql3HO//gfR2Q+MTrfcmkLPlGP9Ewv28Ri+IEUZ3oawo9JahWCEGvXrnJmpRpD9Ko8dYHQZTq+3bA==
Expand Down Expand Up @@ -6072,6 +6072,49 @@ [email protected], ipfs-api@^24.0.0:
streamifier "~0.1.1"
tar-stream "^1.6.1"

"ipfs-api@https://github.com/ipfs/js-ipfs-api/tarball/14f3006d746ee05b2072e01cb5943a4229a07738/js-ipfs-api.tar.gz":
version "25.0.0"
resolved "https://github.com/ipfs/js-ipfs-api/tarball/14f3006d746ee05b2072e01cb5943a4229a07738/js-ipfs-api.tar.gz#69ff767c3ee73a1f35e8c6ed0c44237981bb38e1"
dependencies:
async "^2.6.1"
big.js "^5.1.2"
bl "^2.0.1"
bs58 "^4.0.1"
cids "~0.5.3"
concat-stream "^1.6.2"
debug "^3.1.0"
detect-node "^2.0.3"
flatmap "0.0.3"
glob "^7.1.2"
ipfs-block "~0.7.1"
ipfs-unixfs "~0.1.15"
ipld-dag-cbor "~0.12.1"
ipld-dag-pb "~0.14.6"
is-ipfs "~0.4.2"
is-pull-stream "0.0.0"
is-stream "^1.1.0"
libp2p-crypto "~0.13.0"
lodash "^4.17.11"
lru-cache "^4.1.3"
multiaddr "^5.0.0"
multibase "~0.4.0"
multihashes "~0.4.13"
ndjson "^1.5.0"
once "^1.4.0"
peer-id "~0.11.0"
peer-info "~0.14.1"
promisify-es6 "^1.0.3"
pull-defer "~0.2.2"
pull-pushable "^2.2.0"
pull-stream-to-stream "^1.3.4"
pump "^3.0.0"
qs "^6.5.2"
readable-stream "^2.3.6"
stream-http "^3.0.0"
stream-to-pull-stream "^1.7.2"
streamifier "~0.1.1"
tar-stream "^1.6.1"

ipfs-bitswap@~0.20.3:
version "0.20.3"
resolved "https://registry.yarnpkg.com/ipfs-bitswap/-/ipfs-bitswap-0.20.3.tgz#eb7f5e959da9d0e841a5aaef725fddea186a4e51"
Expand Down Expand Up @@ -8152,7 +8195,7 @@ lodash@=3.10.1:
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=

lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.3, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.6.1, lodash@^4.8.0, lodash@~4.17.2:
lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.3, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.6.1, lodash@^4.8.0, lodash@~4.17.2:
version "4.17.11"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
Expand Down Expand Up @@ -12311,7 +12354,7 @@ stream-each@^1.1.0:
end-of-stream "^1.1.0"
stream-shift "^1.0.0"

[email protected], stream-http@^2.7.2, stream-http@^2.8.3:
[email protected], stream-http@^2.7.2, stream-http@^2.8.3, stream-http@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-3.0.0.tgz#bd6d3c52610098699e25eb2dfcd188e30e0d12e4"
integrity sha512-JELJfd+btL9GHtxU3+XXhg9NLYrKFnhybfvRuDghtyVkOFydz3PKNT1df07AMr88qW03WHF+FSV0PySpXignCA==
Expand Down

0 comments on commit 3dce143

Please sign in to comment.