Skip to content

Commit 5414412

Browse files
authored
fix: remove node globals (#52)
1 parent b0217cc commit 5414412

25 files changed

+47
-25
lines changed

packages/ipfs-unixfs-exporter/package.json

+7-6
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,24 @@
3636
"homepage": "https://github.com/ipfs/js-ipfs-unixfs#readme",
3737
"devDependencies": {
3838
"abort-controller": "^3.0.0",
39-
"aegir": "^21.3.0",
40-
"async-iterator-all": "^1.0.0",
41-
"async-iterator-buffer-stream": "^1.0.0",
42-
"async-iterator-first": "^1.0.0",
39+
"aegir": "^21.9.0",
4340
"chai": "^4.2.0",
4441
"chai-as-promised": "^7.1.1",
4542
"detect-node": "^2.0.4",
4643
"dirty-chai": "^2.0.1",
4744
"ipfs-unixfs-importer": "^2.0.0",
48-
"ipld": "^0.25.0",
45+
"ipld": "^0.26.1",
4946
"ipld-dag-pb": "^0.18.0",
50-
"ipld-in-memory": "^3.0.0",
47+
"ipld-in-memory": "^4.0.0",
48+
"it-all": "^1.0.1",
49+
"it-buffer-stream": "^1.0.2",
50+
"it-first": "^1.0.1",
5151
"multicodec": "^1.0.0",
5252
"nyc": "^15.0.0",
5353
"sinon": "^9.0.1"
5454
},
5555
"dependencies": {
56+
"buffer": "^5.6.0",
5657
"cids": "^0.8.0",
5758
"err-code": "^2.0.0",
5859
"hamt-sharding": "^1.0.0",

packages/ipfs-unixfs-exporter/src/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict'
22

3+
const { Buffer } = require('buffer')
34
const errCode = require('err-code')
45
const CID = require('cids')
56
const resolve = require('./resolvers')

packages/ipfs-unixfs-exporter/src/resolvers/unixfs-v1/content/file.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict'
22

3+
const { Buffer } = require('buffer')
34
const extractDataFromBlock = require('../../../utils/extract-data-from-block')
45
const validateOffsetAndLength = require('../../../utils/validate-offset-and-length')
56
const UnixFS = require('ipfs-unixfs')

packages/ipfs-unixfs-exporter/src/utils/extract-data-from-block.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
'use strict'
2+
const { Buffer } = require('buffer')
23

34
module.exports = function extractDataFromBlock (block, blockStart, requestedStart, requestedEnd) {
45
const blockLength = block.length

packages/ipfs-unixfs-exporter/src/utils/find-cid-in-shard.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict'
22

3+
const { Buffer } = require('buffer')
34
const Bucket = require('hamt-sharding/src/bucket')
45
const multihashing = require('multihashing-async')
56

packages/ipfs-unixfs-exporter/test/exporter-sharded.spec.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4+
const { Buffer } = require('buffer')
45
const chai = require('chai')
56
chai.use(require('dirty-chai'))
67
const expect = chai.expect
@@ -9,9 +10,9 @@ const inMemory = require('ipld-in-memory')
910
const UnixFS = require('ipfs-unixfs')
1011
const mh = require('multihashing-async').multihash
1112
const mc = require('multicodec')
12-
const all = require('async-iterator-all')
13+
const all = require('it-all')
1314
const last = require('it-last')
14-
const randomBytes = require('async-iterator-buffer-stream')
15+
const randomBytes = require('it-buffer-stream')
1516
const exporter = require('../src')
1617
const importer = require('ipfs-unixfs-importer')
1718
const {

packages/ipfs-unixfs-exporter/test/exporter-subtree.spec.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
/* eslint-env mocha */
22
'use strict'
33

4+
const { Buffer } = require('buffer')
45
const chai = require('chai')
56
chai.use(require('dirty-chai'))
67
const expect = chai.expect
78
const IPLD = require('ipld')
89
const inMemory = require('ipld-in-memory')
910
const importer = require('ipfs-unixfs-importer')
1011
const mc = require('multicodec')
11-
const all = require('async-iterator-all')
12+
const all = require('it-all')
1213
const last = require('it-last')
13-
const randomBytes = require('async-iterator-buffer-stream')
1414
const blockApi = require('./helpers/block')
15+
const randomBytes = require('it-buffer-stream')
1516

1617
const ONE_MEG = Math.pow(1024, 2)
1718

packages/ipfs-unixfs-exporter/test/exporter.spec.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4+
const { Buffer } = require('buffer')
45
const chai = require('chai')
56
chai.use(require('dirty-chai'))
67
chai.use(require('chai-as-promised'))
@@ -17,10 +18,10 @@ const mh = require('multihashing-async').multihash
1718
const mc = require('multicodec')
1819
const exporter = require('../src')
1920
const importer = require('ipfs-unixfs-importer')
20-
const all = require('async-iterator-all')
21+
const all = require('it-all')
2122
const last = require('it-last')
22-
const first = require('async-iterator-first')
23-
const randomBytes = require('async-iterator-buffer-stream')
23+
const first = require('it-first')
24+
const randomBytes = require('it-buffer-stream')
2425
const AbortController = require('abort-controller')
2526
const blockApi = require('./helpers/block')
2627

packages/ipfs-unixfs-exporter/test/helpers/create-shard.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict'
22

3+
const { Buffer } = require('buffer')
34
const importer = require('ipfs-unixfs-importer')
45

56
const SHARD_SPLIT_THRESHOLD = 10

packages/ipfs-unixfs-importer/package.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,24 @@
3535
},
3636
"homepage": "https://github.com/ipfs/js-ipfs-unixfs#readme",
3737
"devDependencies": {
38-
"aegir": "^21.3.0",
38+
"aegir": "^21.9.0",
3939
"chai": "^4.2.0",
4040
"cids": "^0.8.0",
41-
"deep-extend": "^0.6.0",
4241
"detect-node": "^2.0.4",
4342
"dirty-chai": "^2.0.1",
4443
"ipfs-unixfs-exporter": "^2.0.0",
45-
"ipld": "^0.25.0",
46-
"ipld-in-memory": "^3.0.0",
47-
"it-buffer-stream": "^1.0.0",
44+
"ipld": "^0.26.1",
45+
"ipld-in-memory": "^4.0.0",
46+
"it-buffer-stream": "^1.0.2",
4847
"it-last": "^1.0.1",
48+
"merge-options": "^2.0.0",
4949
"multicodec": "^1.0.0",
5050
"nyc": "^15.0.0",
5151
"sinon": "^9.0.1"
5252
},
5353
"dependencies": {
5454
"bl": "^4.0.0",
55+
"buffer": "^5.6.0",
5556
"err-code": "^2.0.0",
5657
"hamt-sharding": "^1.0.0",
5758
"ipfs-unixfs": "^1.0.1",

packages/ipfs-unixfs-importer/src/dag-builder/validate-chunks.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use strict'
22

33
const errCode = require('err-code')
4+
const { Buffer } = require('buffer')
45

56
// make sure the content only emits buffer-a-likes
67
async function * validateChunks (source) {

packages/ipfs-unixfs-importer/src/dir-sharded.js

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const {
44
DAGLink,
55
DAGNode
66
} = require('ipld-dag-pb')
7+
const { Buffer } = require('buffer')
78
const UnixFS = require('ipfs-unixfs')
89
const multihashing = require('multihashing-async')
910
const Dir = require('./dir')

packages/ipfs-unixfs-importer/test/benchmark.spec.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4+
const { Buffer } = require('buffer')
45
const importer = require('../src')
56

67
const IPLD = require('ipld')

packages/ipfs-unixfs-importer/test/builder-dir-sharding.spec.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4+
const { Buffer } = require('buffer')
45
const importer = require('../src')
56
const exporter = require('ipfs-unixfs-exporter')
67

packages/ipfs-unixfs-importer/test/builder-only-hash.spec.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4+
const { Buffer } = require('buffer')
45
const chai = require('chai')
56
chai.use(require('dirty-chai'))
67
const expect = chai.expect

packages/ipfs-unixfs-importer/test/builder.spec.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4+
const { Buffer } = require('buffer')
45
const chai = require('chai')
56
chai.use(require('dirty-chai'))
67
const expect = chai.expect

packages/ipfs-unixfs-importer/test/chunker-custom.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
'use strict'
33

44
const importer = require('../src')
5-
5+
const { Buffer } = require('buffer')
66
const chai = require('chai')
77
chai.use(require('dirty-chai'))
88
const expect = chai.expect

packages/ipfs-unixfs-importer/test/chunker-fixed-size.spec.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4+
const { Buffer } = require('buffer')
45
const chunker = require('../src/chunker/fixed-size')
56
const chai = require('chai')
67
chai.use(require('dirty-chai'))

packages/ipfs-unixfs-importer/test/chunker-rabin.spec.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4+
const { Buffer } = require('buffer')
45
const chunker = require('../src/chunker/rabin')
56
const chai = require('chai')
67
chai.use(require('dirty-chai'))

packages/ipfs-unixfs-importer/test/helpers/collect-leaf-cids.js

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
'use strict'
22

3+
const { Buffer } = require('buffer')
4+
35
module.exports = function (cid, ipld) {
46
async function * traverse (cid) {
57
const node = await ipld.get(cid)

packages/ipfs-unixfs-importer/test/helpers/finite-pseudorandom-byte-stream.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
2+
const { Buffer } = require('buffer')
33
const REPEATABLE_CHUNK_SIZE = 300000
44

55
module.exports = function * (maxSize, seed) {

packages/ipfs-unixfs-importer/test/helpers/random-byte-stream.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict'
22

3+
const { Buffer } = require('buffer')
34
module.exports = function * randomByteStream (seed) {
45
while (true) {
56
const r = Math.floor(random(seed) * 256)

packages/ipfs-unixfs-importer/test/import-export-nested-dir.spec.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4+
const { Buffer } = require('buffer')
45
const chai = require('chai')
56
chai.use(require('dirty-chai'))
67
const expect = chai.expect

packages/ipfs-unixfs-importer/test/importer.spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
const importer = require('../src')
55
const exporter = require('ipfs-unixfs-exporter')
6-
7-
const extend = require('deep-extend')
6+
const { Buffer } = require('buffer')
7+
const extend = require('merge-options')
88
const chai = require('chai')
99
chai.use(require('dirty-chai'))
1010
const expect = chai.expect
@@ -287,7 +287,7 @@ strategies.forEach((strategy) => {
287287
})
288288
}, strategyOverrides[strategy])
289289

290-
const expected = extend({}, defaultResults, strategies[strategy])
290+
const expected = extend({}, defaultResults)
291291

292292
const expectFiles = (actualFiles, expectedFiles) => {
293293
expect(actualFiles.length).to.equal(expectedFiles.length)

packages/ipfs-unixfs/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
},
3636
"homepage": "https://github.com/ipfs/js-ipfs-unixfs#readme",
3737
"devDependencies": {
38-
"aegir": "^21.3.0",
38+
"aegir": "^21.9.0",
3939
"chai": "^4.2.0",
4040
"dirty-chai": "^2.0.1",
4141
"nyc": "^15.0.0"
4242
},
4343
"dependencies": {
4444
"err-code": "^2.0.0",
45-
"protons": "^1.1.0"
45+
"protons": "^1.0.2"
4646
}
4747
}

0 commit comments

Comments
 (0)