Skip to content

Commit c316cb6

Browse files
achingbrainachingbrain
authored
chore: update deps (#694)
* chore: update deps * chore: update ipfs paths * chore: remove redundant code * chore: fix up browsers * chore: fix up browsers * chore: fix up browsers
1 parent abc1cfb commit c316cb6

File tree

9 files changed

+28
-31
lines changed

9 files changed

+28
-31
lines changed

‎.aegir.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module.exports = {
2828
ipfsBin: require('go-ipfs').path()
2929
},
3030
js: {
31-
ipfsBin: require.resolve('ipfs/src/cli.js')
31+
ipfsBin: require('ipfs').path()
3232
}
3333
}
3434
)

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ const factory = Ctl.createFactory(
8888
},
8989
{ // overrides per type
9090
js: {
91-
ipfsBin: 'path/js/ipfs/bin'
91+
ipfsBin: require('ipfs').path()
9292
},
9393
go: {
94-
ipfsBin: 'path/go/ipfs/bin'
94+
ipfsBin: require('go-ipfs').path()
9595
}
9696
}
9797
)
@@ -119,10 +119,10 @@ const server = Ctl.createServer(port, {
119119
},
120120
{
121121
js: {
122-
ipfsBin: 'path/js/ipfs/bin'
122+
ipfsBin: require('ipfs').path()
123123
},
124124
go: {
125-
ipfsBin: 'path/go/ipfs/bin'
125+
ipfsBin: require('go-ipfs').path()
126126
},
127127
})
128128
const factory = Ctl.createFactory({

‎examples/id/id.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ async function run () {
1515

1616
const nodeJs = await createController({
1717
type: 'js',
18-
ipfsBin: require.resolve('ipfs/src/cli.js'),
18+
ipfsBin: require('ipfs').path(),
1919
ipfsHttpModule: require('ipfs-http-client')
2020
})
2121
console.log('alice')

‎package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"@hapi/hapi": "^20.0.0",
4545
"debug": "^4.1.1",
4646
"execa": "^5.0.0",
47-
"ipfs-utils": "^8.1.4",
47+
"ipfs-utils": "^9.0.1",
4848
"joi": "^17.2.1",
4949
"merge-options": "^3.0.1",
5050
"multiaddr": "^10.0.0",
@@ -54,13 +54,13 @@
5454
},
5555
"devDependencies": {
5656
"@types/hapi__hapi": "^20.0.9",
57-
"aegir": "^34.1.0",
57+
"aegir": "^35.1.1",
5858
"go-ipfs": "^0.9.1",
59-
"ipfs": "^0.56.1",
60-
"ipfs-core-types": "^0.6.1",
61-
"ipfs-client": "^0.5.1",
62-
"ipfs-http-client": "^51.0.1",
63-
"ipfs-unixfs": "^5.0.0",
59+
"ipfs": "^0.59.0",
60+
"ipfs-client": "^0.7.0",
61+
"ipfs-core-types": "^0.8.0",
62+
"ipfs-http-client": "^53.0.0",
63+
"ipfs-unixfs": "^6.0.6",
6464
"it-last": "^1.0.5",
6565
"util": "^0.12.4"
6666
},

‎test/controller.spec.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ const merge = require('merge-options')
66
const { createFactory, createController } = require('../src')
77
const { repoExists } = require('../src/utils')
88
const { isBrowser, isWebWorker, isNode } = require('ipfs-utils/src/env')
9-
const pathJoin = require('ipfs-utils/src/path-join')
109
const waitFor = require('p-wait-for')
1110

1211
/**
@@ -59,7 +58,7 @@ describe('Controller API', function () {
5958
ipfsModule: require('ipfs')
6059
}, {
6160
js: {
62-
ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli.js')
61+
ipfsBin: isNode ? require('ipfs').path() : undefined
6362
},
6463
go: {
6564
// @ts-ignore no types - TODO: remove when https://github.com/ipfs/npm-go-ipfs/pull/41 is released

‎test/create.spec.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
const { expect } = require('aegir/utils/chai')
55
const { isNode, isBrowser, isWebWorker } = require('ipfs-utils/src/env')
6-
const pathJoin = require('ipfs-utils/src/path-join')
76
const { createFactory, createController, createServer } = require('../src')
87
const Client = require('../src/ipfsd-client')
98
const Daemon = require('../src/ipfsd-daemon')
@@ -20,7 +19,7 @@ describe('`createController` should return the correct class', () => {
2019
disposable: false,
2120
ipfsModule: require('ipfs'),
2221
ipfsHttpModule: require('ipfs-http-client'),
23-
ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli.js')
22+
ipfsBin: isNode ? require('ipfs').path() : undefined
2423
})
2524

2625
if (!isNode) {
@@ -56,7 +55,7 @@ describe('`createController` should return the correct class', () => {
5655
disposable: false,
5756
ipfsModule: require('ipfs'),
5857
ipfsHttpModule: require('ipfs-http-client'),
59-
ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli.js')
58+
ipfsBin: isNode ? require('ipfs').path() : undefined
6059
})
6160

6261
expect(f).to.be.instanceOf(Client)
@@ -90,7 +89,7 @@ describe('`createController` should return the correct class', () => {
9089
return require('ipfs-http-client').create(opts)
9190
}
9291
},
93-
ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli/bin.js')
92+
ipfsBin: isNode ? require('ipfs').path() : undefined
9493
})
9594

9695
expect(clientCreated).to.be.true()
@@ -125,7 +124,7 @@ describe('`createController` should return the correct class', () => {
125124
return require('ipfs-http-client').create(opts)
126125
}
127126
},
128-
ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli/bin.js')
127+
ipfsBin: isNode ? require('ipfs').path() : undefined
129128
})
130129

131130
expect(f).to.be.instanceOf(Client)
@@ -144,7 +143,7 @@ const types = [{
144143
type: 'js',
145144
test: true,
146145
ipfsModule: require('ipfs'),
147-
ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli.js')
146+
ipfsBin: isNode ? require('ipfs').path() : undefined
148147
}, {
149148
...defaultOps,
150149
// @ts-ignore no types - TODO: remove when https://github.com/ipfs/npm-go-ipfs/pull/41 is released
@@ -162,7 +161,7 @@ const types = [{
162161
test: true,
163162
remote: true,
164163
ipfsModule: require('ipfs'),
165-
ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli.js')
164+
ipfsBin: isNode ? require('ipfs').path() : undefined
166165
}, {
167166
...defaultOps,
168167
// @ts-ignore no types - TODO: remove when https://github.com/ipfs/npm-go-ipfs/pull/41 is released

‎test/factory.spec.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
const { expect } = require('aegir/utils/chai')
55
const { isNode } = require('ipfs-utils/src/env')
6-
const pathJoin = require('ipfs-utils/src/path-join')
76
const { createFactory } = require('../src')
87
const { UnixFS } = require('ipfs-unixfs')
98
const last = require('it-last')
@@ -24,7 +23,7 @@ const types = [{
2423
type: 'js',
2524
test: true,
2625
ipfsModule: require('ipfs'),
27-
ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli.js')
26+
ipfsBin: isNode ? require('ipfs').path() : undefined
2827
}, {
2928
...defaultOps,
3029
// @ts-ignore no types - TODO: remove when https://github.com/ipfs/npm-go-ipfs/pull/41 is released
@@ -42,7 +41,7 @@ const types = [{
4241
remote: true,
4342
test: true,
4443
ipfsModule: require('ipfs'),
45-
ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli.js')
44+
ipfsBin: isNode ? require('ipfs').path() : undefined
4645
}, {
4746
...defaultOps,
4847
// @ts-ignore no types - TODO: remove when https://github.com/ipfs/npm-go-ipfs/pull/41 is released
@@ -91,7 +90,7 @@ describe('`Factory spawn()` ', function () {
9190
}
9291
})
9392

94-
describe('should return ctl for tests when factory inititalized with test === true', () => {
93+
describe('should return ctl for tests when factory initialized with test === true', () => {
9594
for (const opts of types) {
9695
it(`type: ${opts.type} remote: ${Boolean(opts.remote)}`, async () => {
9796
const factory = await createFactory({ test: true })
@@ -100,7 +99,7 @@ describe('`Factory spawn()` ', function () {
10099
remote: opts.remote,
101100
ipfsModule: require('ipfs'),
102101
ipfsHttpModule: require('ipfs-http-client'),
103-
ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli.js')
102+
ipfsBin: isNode ? require('ipfs').path() : undefined
104103
})
105104
expect(ctl).to.exist()
106105
expect(ctl.opts.test).to.be.true()

‎test/node.routes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ describe('routes', function () {
2424
return createFactory({
2525
ipfsModule: require('ipfs'),
2626
ipfsHttpModule: require('ipfs-http-client'),
27-
ipfsBin: require.resolve('ipfs/src/cli.js')
27+
ipfsBin: require('ipfs').path()
2828
})
2929
})
3030
})

‎test/node.utils.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ describe('utils node version', function () {
2626
test: true,
2727
ipfsModule: require('ipfs'),
2828
ipfsHttpModule: require('ipfs-http-client'),
29-
ipfsBin: require.resolve('ipfs/src/cli.js')
29+
ipfsBin: require('ipfs').path()
3030
})
3131
expect(checkForRunningApi(node.path)).to.be.contain('/ip4/127.0.0.1/tcp/')
3232
await node.stop()
@@ -45,7 +45,7 @@ describe('utils node version', function () {
4545
test: true,
4646
ipfsModule: require('ipfs'),
4747
ipfsHttpModule: require('ipfs-http-client'),
48-
ipfsBin: require.resolve('ipfs/src/cli.js')
48+
ipfsBin: require('ipfs').path()
4949
})
5050
const dir = await f.tmpDir()
5151
const node = await f.spawn({
@@ -67,7 +67,7 @@ describe('utils node version', function () {
6767
test: true,
6868
ipfsModule: require('ipfs'),
6969
ipfsHttpModule: require('ipfs-http-client'),
70-
ipfsBin: require.resolve('ipfs/src/cli.js')
70+
ipfsBin: require('ipfs').path()
7171
})
7272
expect(await repoExists(node.path)).to.be.true()
7373
await node.stop()

0 commit comments

Comments
 (0)