Skip to content

Commit b9db560

Browse files
fix: update to new aegir (#3528)
- update aegir - fix some linting - enable multiple test runs at the same time (all servers now try to find free ports) Co-authored-by: achingbrain <alex@achingbrain.net>
1 parent bf59df6 commit b9db560

File tree

4 files changed

+36
-30
lines changed

4 files changed

+36
-30
lines changed

.aegir.js

+26-17
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,35 @@
11
'use strict'
22

33
const { createServer } = require('ipfsd-ctl')
4+
const getPort = require('aegir/utils/get-port')
45

5-
const server = createServer({
6-
host: '127.0.0.1',
7-
port: 48372
8-
}, {
9-
type: 'go',
10-
ipfsHttpModule: require('./'),
11-
ipfsBin: require('go-ipfs').path()
12-
})
13-
6+
/** @type {import('aegir').PartialOptions} */
147
module.exports = {
15-
bundlesize: { maxSize: '83kB' },
16-
hooks: {
17-
browser: {
18-
pre: async () => {
19-
await server.start()
20-
},
21-
post: async () => {
22-
await server.stop()
8+
build: {
9+
bundlesizeMax: '110kB'
10+
},
11+
test: {
12+
async before (options) {
13+
const port = await getPort()
14+
const server = createServer({
15+
host: '127.0.0.1',
16+
port: port
17+
}, {
18+
type: 'go',
19+
ipfsHttpModule: require('./'),
20+
ipfsBin: require('go-ipfs').path()
21+
})
22+
23+
await server.start()
24+
return {
25+
server,
26+
env: {
27+
IPFSD_SERVER: `http://${server.host}:${server.port}`
28+
}
2329
}
30+
},
31+
async after (options, before) {
32+
await before.server.stop()
2433
}
2534
}
2635
}

.eslintrc

-3
This file was deleted.

package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
"url": "git+https://github.com/ipfs/js-ipfs.git"
3636
},
3737
"scripts": {
38-
"prepublishOnly": "aegir build",
38+
"prepare": "aegir build --no-bundle",
39+
"build": "aegir build",
3940
"test": "aegir test",
4041
"test:node": "aegir test -t node",
4142
"test:browser": "aegir test -t browser",
@@ -45,15 +46,14 @@
4546
"test:chrome": "aegir test -t browser -t webworker -- --browsers ChromeHeadless",
4647
"test:firefox": "aegir test -t browser -t webworker -- --browsers FirefoxHeadless",
4748
"lint": "aegir lint",
48-
"prepare": "aegir build --no-bundle",
4949
"coverage": "npx nyc -r html npm run test:node -- --bail",
5050
"clean": "rimraf ./dist",
5151
"dep-check": "aegir dep-check -i ipfs-core -i rimraf -i ipfs-core-types -i abort-controller"
5252
},
5353
"dependencies": {
5454
"abort-controller": "^3.0.0",
5555
"any-signal": "^2.1.2",
56-
"bignumber.js": "^9.0.0",
56+
"bignumber.js": "^9.0.1",
5757
"cids": "^1.1.5",
5858
"debug": "^4.1.1",
5959
"form-data": "^3.0.0",
@@ -70,19 +70,19 @@
7070
"it-to-stream": "^0.1.2",
7171
"merge-options": "^3.0.4",
7272
"multiaddr": "^8.0.0",
73-
"multibase": "^3.0.0",
74-
"multicodec": "^2.0.1",
75-
"multihashes": "^3.0.1",
73+
"multibase": "^4.0.2",
74+
"multicodec": "^3.0.1",
75+
"multihashes": "^4.0.2",
7676
"nanoid": "^3.1.12",
7777
"native-abort-controller": "^1.0.3",
7878
"parse-duration": "^0.4.4",
7979
"stream-to-it": "^0.2.2",
80-
"uint8arrays": "^2.0.5"
80+
"uint8arrays": "^2.1.3"
8181
},
8282
"devDependencies": {
83-
"aegir": "^30.3.0",
83+
"aegir": "^31.0.0",
8484
"delay": "^4.4.0",
85-
"go-ipfs": "0.8.0-rc2",
85+
"go-ipfs": "0.8.0",
8686
"ipfs-core": "^0.5.2",
8787
"ipfsd-ctl": "^7.2.0",
8888
"it-all": "^1.0.4",

test/utils/factory.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const commonOptions = {
88
test: true,
99
type: 'go',
1010
ipfsHttpModule: require('../../src'),
11-
endpoint: 'http://localhost:48372'
11+
endpoint: process.env.IPFSD_SERVER
1212
}
1313

1414
const commonOverrides = {

0 commit comments

Comments
 (0)