fix: remove more stuff

Author: hugomrdias

package.json

@@ -42,7 +42,7 @@
     "glob": "^7.1.3",
     "ipfs-block": "~0.8.0",
     "ipfs-unixfs": "~0.1.16",
-    "ipld-dag-cbor": "~0.13.0",
+    "ipld-dag-cbor": "hugomrdias/js-ipld-dag-cbor#feat/reduce-bundle-size",
     "ipld-dag-pb": "~0.15.0",
     "is-ipfs": "~0.4.7",
     "is-pull-stream": "0.0.0",

src/files-regular/get-pull-stream.js

@@ -3,7 +3,8 @@
 const cleanCID = require('../utils/clean-cid')
 const TarStreamToObjects = require('../utils/tar-stream-to-objects')
 const v = require('is-ipfs')
-const pull = require('pull-stream')
+const pull = require('pull-stream/pull')
+const map = require('pull-stream/throughs/map')
 const toPull = require('stream-to-pull-stream')
 const deferred = require('pull-defer')
 
@@ -30,7 +31,7 @@ module.exports = (send) => {
       p.resolve(
         pull(
           toPull.source(stream),
-          pull.map(file => {
+          map(file => {
             const { path, content } = file
             return content ? { path, content: toPull.source(content) } : file
           })

src/files-regular/ls-pull-stream.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const moduleConfig = require('../utils/module-config')
-const pull = require('pull-stream')
+const values = require('pull-stream/sources/values')
 const deferred = require('pull-defer')
 const IsIpfs = require('is-ipfs')
 const cleanCID = require('../utils/clean-cid')
@@ -54,7 +54,7 @@ module.exports = (arg) => {
         type: typeOf(link)
       }))
 
-      p.resolve(pull.values(result))
+      p.resolve(values(result))
     })
 
     return p

src/stats/bw-pull-stream.js

@@ -1,7 +1,8 @@
 'use strict'
 
 const toPull = require('stream-to-pull-stream')
-const pull = require('pull-stream')
+const map = require('pull-stream/throughs/map')
+const pull = require('pull-stream/pull')
 const transformChunk = require('./bw-util')
 const deferred = require('pull-defer')
 
@@ -21,7 +22,7 @@ module.exports = (send) => {
 
       p.resolve(pull(
         toPull.source(stream),
-        pull.map(transformChunk)
+        map(transformChunk)
       ))
     })
 

test/files-mfs.spec.js

@@ -9,7 +9,9 @@ chai.use(dirtyChai)
 const loadFixture = require('aegir/fixtures')
 const mh = require('multihashes')
 const CID = require('cids')
-const pull = require('pull-stream')
+const values = require('pull-stream/sources/values')
+const pull = require('pull-stream/pull')
+const collect = require('pull-stream/sinks/collect')
 
 const ipfsClient = require('../src')
 const f = require('./utils/factory')
@@ -280,9 +282,9 @@ describe('.files (the MFS API part)', function () {
     const expectedCid = 'QmRf22bZar3WKmojipms22PkXH1MZGmvsqzQtuSvQE3uhm'
 
     pull(
-      pull.values([{ content: pull.values([Buffer.from('test')]) }]),
+      values([{ content: values([Buffer.from('test')]) }]),
       ipfs.addPullStream(),
-      pull.collect((err, res) => {
+      collect((err, res) => {
         expect(err).to.not.exist()
 
         expect(res).to.have.length(1)
@@ -295,7 +297,7 @@ describe('.files (the MFS API part)', function () {
   it('.add with pull stream (callback)', (done) => {
     const expectedCid = 'QmRf22bZar3WKmojipms22PkXH1MZGmvsqzQtuSvQE3uhm'
 
-    ipfs.add(pull.values([Buffer.from('test')]), (err, res) => {
+    ipfs.add(values([Buffer.from('test')]), (err, res) => {
       expect(err).to.not.exist()
 
       expect(res).to.have.length(1)
@@ -307,7 +309,7 @@ describe('.files (the MFS API part)', function () {
   it('.add with pull stream (promise)', () => {
     const expectedCid = 'QmRf22bZar3WKmojipms22PkXH1MZGmvsqzQtuSvQE3uhm'
 
-    return ipfs.add(pull.values([Buffer.from('test')]))
+    return ipfs.add(values([Buffer.from('test')]))
       .then((res) => {
         expect(res).to.have.length(1)
         expect(res[0]).to.deep.equal({ path: expectedCid, hash: expectedCid, size: 12 })
@@ -317,7 +319,7 @@ describe('.files (the MFS API part)', function () {
   it('.add with array of objects with pull stream content', () => {
     const expectedCid = 'QmRf22bZar3WKmojipms22PkXH1MZGmvsqzQtuSvQE3uhm'
 
-    return ipfs.add([{ content: pull.values([Buffer.from('test')]) }])
+    return ipfs.add([{ content: values([Buffer.from('test')]) }])
       .then((res) => {
         expect(res).to.have.length(1)
         expect(res[0]).to.eql({ path: expectedCid, hash: expectedCid, size: 12 })

test/ping.spec.js

@@ -3,7 +3,7 @@
 
 const chai = require('chai')
 const dirtyChai = require('dirty-chai')
-const pull = require('pull-stream')
+const pull = require('pull-stream/pull')
 const collect = require('pull-stream/sinks/collect')
 const expect = chai.expect
 chai.use(dirtyChai)