From c53437572da0e1fd3f24c463347504ac2b8c49eb Mon Sep 17 00:00:00 2001
From: Volker Mische <volker.mische@gmail.com>
Date: Mon, 29 Oct 2018 17:38:30 +0100
Subject: [PATCH 1/5] chore: remove ipld formats re-export (#872)
Prior to this change the `ipld-dag-cbor` and `ipld-dag-pb` modules
are re-exported so that can be accessed within the Browser bundle.
Those modules normally don't need to be used directly, they are
kind of implementation details of IPLD. Hence remove them.
BREAKING CHANGE: remove `types.dagCBOR` and `types.dagPB` from public API
If you need the `ipld-dag-cbor` or `ipld-dag-pb` module in the Browser,
you need to bundle them yourself.
---
src/types.js | 4 ----
test/types.spec.js | 6 +-----
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/types.js b/src/types.js
index a6ae650c4..39c80c50b 100644
--- a/src/types.js
+++ b/src/types.js
@@ -1,8 +1,6 @@
'use strict'
const CID = require('cids')
-const dagCBOR = require('ipld-dag-cbor')
-const dagPB = require('ipld-dag-pb')
const multiaddr = require('multiaddr')
const multibase = require('multibase')
const multihash = require('multihashes')
@@ -12,8 +10,6 @@ const PeerInfo = require('peer-info')
module.exports = () => ({
Buffer: Buffer,
CID: CID,
- dagPB: dagPB,
- dagCBOR: dagCBOR,
multiaddr: multiaddr,
multibase: multibase,
multihash: multihash,
diff --git a/test/types.spec.js b/test/types.spec.js
index 49b68a5ef..b27adf6da 100644
--- a/test/types.spec.js
+++ b/test/types.spec.js
@@ -3,8 +3,6 @@
const PeerId = require('peer-id')
const PeerInfo = require('peer-info')
-const dagCBOR = require('ipld-dag-cbor')
-const dagPB = require('ipld-dag-pb')
const multiaddr = require('multiaddr')
const multibase = require('multibase')
const multihash = require('multihashes')
@@ -47,9 +45,7 @@ describe('.types', function () {
multiaddr: multiaddr,
multibase: multibase,
multihash: multihash,
- CID: CID,
- dagPB: dagPB,
- dagCBOR: dagCBOR
+ CID: CID
})
})
})
From 0652ac0e21f2ab80bd9e9f7333730e413b35cbeb Mon Sep 17 00:00:00 2001
From: Volker Mische <volker.mische@gmail.com>
Date: Thu, 25 Oct 2018 16:25:06 +0200
Subject: [PATCH 2/5] chore: update to ipld-dag-cbor 0.13
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
No further changes are needed as js-ipfs-api is getting the raw blocks
from IPFS and does the whole parsing client-sided in JavaScript.
BREAKING CHANGE: dag-cbor nodes now represent links as CID objects
The API for [dag-cbor](https://github.com/ipld/js-ipld-dag-cbor) changed.
Links are no longer represented as JSON objects (`{"/": "base-encoded-cid"}`,
but as [CID objects](https://github.com/ipld/js-cid). `ipfs.dag.get()` and
now always return links as CID objects. `ipfs.dag.put()` also expects links
to be represented as CID objects. The old-style JSON objects representation
is still supported, but deprecated.
Prior to this change:
```js
const cid = new CID('QmXed8RihWcWFXRRmfSRG9yFjEbXNxu1bDwgCFAN8Dxcq5')
// Link as JSON object representation
const putCid = await ipfs.dag.put({link: {'/': cid.toBaseEncodedString()}})
const result = await ipfs.dag.get(putCid)
console.log(result.value)
```
Output:
```js
{ link:
{ '/':
<Buffer 12 20 8a…> } }
```
Now:
```js
const cid = new CID('QmXed8RihWcWFXRRmfSRG9yFjEbXNxu1bDwgCFAN8Dxcq5')
// Link as CID object
const putCid = await ipfs.dag.put({link: cid})
const result = await ipfs.dag.get(putCid)
console.log(result.value)
```
Output:
```js
{ link:
CID {
codec: 'dag-pb',
version: 0,
multihash:
<Buffer 12 20 8a…> } }
```
See https://github.com/ipld/ipld/issues/44 for more information on why this
change was made.
---
package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 0f3637d56..6a214ca42 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
"glob": "^7.1.2",
"ipfs-block": "~0.7.1",
"ipfs-unixfs": "~0.1.15",
- "ipld-dag-cbor": "~0.12.1",
+ "ipld-dag-cbor": "~0.13.0",
"ipld-dag-pb": "~0.14.6",
"is-ipfs": "~0.4.2",
"is-pull-stream": "0.0.0",
@@ -82,7 +82,7 @@
"eslint-plugin-react": "^7.10.0",
"go-ipfs-dep": "~0.4.17",
"gulp": "^3.9.1",
- "interface-ipfs-core": "~0.80.0",
+ "interface-ipfs-core": "~0.81.0",
"ipfsd-ctl": "~0.39.0",
"pull-stream": "^3.6.8",
"socket.io": "^2.1.1",
From 0c19d6b681967c99381a82a20d0f3de5f1554fc7 Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Tue, 30 Oct 2018 12:01:38 +0000
Subject: [PATCH 3/5] chore: update deps
---
package.json | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/package.json b/package.json
index 6a214ca42..7971e3c5d 100644
--- a/package.json
+++ b/package.json
@@ -27,43 +27,43 @@
},
"dependencies": {
"async": "^2.6.1",
- "big.js": "^5.1.2",
- "bl": "^2.0.1",
+ "big.js": "^5.2.2",
+ "bl": "^2.1.2",
"bs58": "^4.0.1",
- "cids": "~0.5.3",
+ "cids": "~0.5.5",
"concat-stream": "^1.6.2",
- "debug": "^3.1.0",
- "detect-node": "^2.0.3",
+ "debug": "^4.1.0",
+ "detect-node": "^2.0.4",
"flatmap": "0.0.3",
- "glob": "^7.1.2",
- "ipfs-block": "~0.7.1",
- "ipfs-unixfs": "~0.1.15",
+ "glob": "^7.1.3",
+ "ipfs-block": "~0.8.0",
+ "ipfs-unixfs": "~0.1.16",
"ipld-dag-cbor": "~0.13.0",
- "ipld-dag-pb": "~0.14.6",
- "is-ipfs": "~0.4.2",
+ "ipld-dag-pb": "~0.14.11",
+ "is-ipfs": "~0.4.7",
"is-pull-stream": "0.0.0",
"is-stream": "^1.1.0",
- "libp2p-crypto": "~0.13.0",
+ "libp2p-crypto": "~0.14.0",
"lodash": "^4.17.11",
"lru-cache": "^4.1.3",
"multiaddr": "^5.0.0",
- "multibase": "~0.4.0",
- "multihashes": "~0.4.13",
+ "multibase": "~0.5.0",
+ "multihashes": "~0.4.14",
"ndjson": "^1.5.0",
"once": "^1.4.0",
- "peer-id": "~0.11.0",
+ "peer-id": "~0.12.0",
"peer-info": "~0.14.1",
"promisify-es6": "^1.0.3",
- "pull-defer": "~0.2.2",
+ "pull-defer": "~0.2.3",
"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",
+ "readable-stream": "^3.0.6",
"stream-http": "^3.0.0",
"stream-to-pull-stream": "^1.7.2",
"streamifier": "~0.1.1",
- "tar-stream": "^1.6.1"
+ "tar-stream": "^1.6.2"
},
"engines": {
"node": ">=8.0.0",
@@ -74,17 +74,17 @@
"url": "https://github.com/ipfs/js-ipfs-api"
},
"devDependencies": {
- "aegir": "^15.1.0",
+ "aegir": "^17.0.1",
"browser-process-platform": "~0.1.1",
- "chai": "^4.1.2",
+ "chai": "^4.2.0",
"cross-env": "^5.2.0",
"dirty-chai": "^2.0.1",
- "eslint-plugin-react": "^7.10.0",
+ "eslint-plugin-react": "^7.11.1",
"go-ipfs-dep": "~0.4.17",
"gulp": "^3.9.1",
"interface-ipfs-core": "~0.81.0",
- "ipfsd-ctl": "~0.39.0",
- "pull-stream": "^3.6.8",
+ "ipfsd-ctl": "~0.39.5",
+ "pull-stream": "^3.6.9",
"socket.io": "^2.1.1",
"socket.io-client": "^2.1.1",
"stream-equal": "^1.1.1"
From 19ada1622a4e7dde7d169407aaa7856632525b2a Mon Sep 17 00:00:00 2001
From: Hugo Dias <hugomrdias@gmail.com>
Date: Fri, 26 Oct 2018 10:38:19 +0100
Subject: [PATCH 4/5] fix: remove unused deps
---
package.json | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 7971e3c5d..ba64c82f6 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,8 @@
"release-minor": "aegir release --type minor ",
"release-major": "aegir release --type major ",
"coverage": "aegir coverage --timeout 100000",
- "coverage-publish": "aegir coverage --provider coveralls --timeout 100000"
+ "coverage-publish": "aegir coverage --provider coveralls --timeout 100000",
+ "dep-check": "npx dependency-check package.json './test/**/*.js' './src/**/*.js'"
},
"dependencies": {
"async": "^2.6.1",
@@ -76,6 +77,7 @@
"devDependencies": {
"aegir": "^17.0.1",
"browser-process-platform": "~0.1.1",
+<<<<<<< HEAD
"chai": "^4.2.0",
"cross-env": "^5.2.0",
"dirty-chai": "^2.0.1",
@@ -88,6 +90,13 @@
"socket.io": "^2.1.1",
"socket.io-client": "^2.1.1",
"stream-equal": "^1.1.1"
+=======
+ "chai": "^4.1.2",
+ "dirty-chai": "^2.0.1",
+ "interface-ipfs-core": "~0.80.0",
+ "ipfsd-ctl": "~0.39.0",
+ "pull-stream": "^3.6.8"
+>>>>>>> fix: remove unused deps
},
"keywords": [
"ipfs"
From 7b89061ae087b90d39f522221ac2d98bbe04206d Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Tue, 30 Oct 2018 12:14:31 +0000
Subject: [PATCH 5/5] chore: remove socket.io, not used anymore
---
package.json | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/package.json b/package.json
index ba64c82f6..8801476c4 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,6 @@
"devDependencies": {
"aegir": "^17.0.1",
"browser-process-platform": "~0.1.1",
-<<<<<<< HEAD
"chai": "^4.2.0",
"cross-env": "^5.2.0",
"dirty-chai": "^2.0.1",
@@ -87,16 +86,7 @@
"interface-ipfs-core": "~0.81.0",
"ipfsd-ctl": "~0.39.5",
"pull-stream": "^3.6.9",
- "socket.io": "^2.1.1",
- "socket.io-client": "^2.1.1",
"stream-equal": "^1.1.1"
-=======
- "chai": "^4.1.2",
- "dirty-chai": "^2.0.1",
- "interface-ipfs-core": "~0.80.0",
- "ipfsd-ctl": "~0.39.0",
- "pull-stream": "^3.6.8"
->>>>>>> fix: remove unused deps
},
"keywords": [
"ipfs"