Skip to content
This repository was archived by the owner on Feb 12, 2024. It is now read-only.

Commit e3da1e5

Browse files
hugomrdiashugomrdias
committed
fix: use aegir echo server and remove webpack resolve alias
1 parent da01b87 commit e3da1e5

File tree

2 files changed

+34
-40
lines changed

2 files changed

+34
-40
lines changed

‎packages/ipfs/.aegir.js‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
const { createServer } = require('ipfsd-ctl')
44
const MockPreloadNode = require('./test/utils/mock-preload-node')
5-
const EchoServer = require('interface-ipfs-core/src/utils/echo-http-server')
5+
const EchoServer = require('aegir/utils/echo-server')
66
const webRTCStarSigServer = require('libp2p-webrtc-star/src/sig-server')
77
const path = require('path')
8-
const webpack = require('webpack')
98

109
let preloadNode
11-
let echoServer
10+
let echoServer = new EchoServer()
1211

1312
// the second signalling server is needed for the inferface test 'should list peers only once even if they have multiple addresses'
1413
let sigServerA
@@ -17,17 +16,6 @@ let ipfsdServer
1716

1817
module.exports = {
1918
bundlesize: { maxSize: '601kB' },
20-
webpack: {
21-
resolve: {
22-
mainFields: ['browser', 'main'],
23-
aliasFields: ['browser', 'browser-all-ipld-formats'],
24-
},
25-
...(process.env.NODE_ENV === 'test' ? {
26-
plugins: [
27-
new webpack.EnvironmentPlugin(['DEBUG', 'ECHO_SERVER_PORT'])
28-
]
29-
} : {})
30-
},
3119
karma: {
3220
files: [{
3321
pattern: 'node_modules/interface-ipfs-core/test/fixtures/**/*',
@@ -41,10 +29,14 @@ module.exports = {
4129
node: {
4230
pre: async () => {
4331
preloadNode = MockPreloadNode.createNode()
44-
echoServer = EchoServer.createServer()
4532

4633
await preloadNode.start(),
4734
await echoServer.start()
35+
return {
36+
env: {
37+
ECHO_SERVER: `http://${echoServer.host}:${echoServer.port}`
38+
}
39+
}
4840
},
4941
post: async () => {
5042
await preloadNode.stop(),
@@ -54,7 +46,6 @@ module.exports = {
5446
browser: {
5547
pre: async () => {
5648
preloadNode = MockPreloadNode.createNode()
57-
echoServer = EchoServer.createServer()
5849

5950
await preloadNode.start()
6051
await echoServer.start()
@@ -90,6 +81,12 @@ module.exports = {
9081
ipfsBin: require('go-ipfs-dep').path()
9182
}
9283
}).start()
84+
85+
return {
86+
env: {
87+
ECHO_SERVER: `http://${echoServer.host}:${echoServer.port}`
88+
}
89+
}
9390
},
9491
post: async () => {
9592
await ipfsdServer.stop()

‎packages/ipfs/package.json‎

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
"./test/utils/create-repo-nodejs.js": "./test/utils/create-repo-browser.js",
2727
"ipfs-utils/src/files/glob-source": false
2828
},
29-
"browser-all-ipld-formats": {
30-
"./src/core/runtime/ipld-browser.js": "./src/core/runtime/ipld-browser-all.js"
31-
},
3229
"bin": {
3330
"jsipfs": "src/cli/bin.js"
3431
},
@@ -39,21 +36,21 @@
3936
"scripts": {
4037
"lint": "aegir lint",
4138
"build": "aegir build",
42-
"test": "cross-env ECHO_SERVER_PORT=37480 aegir test",
43-
"test:node": "cross-env ECHO_SERVER_PORT=37481 aegir test -t node",
44-
"test:browser": "cross-env ECHO_SERVER_PORT=37482 aegir test -t browser",
45-
"test:browser:http": "cross-env ECHO_SERVER_PORT=37489 aegir test -t browser -f test/http-api/index.js",
46-
"test:webworker": "cross-env ECHO_SERVER_PORT=37483 aegir test -t webworker",
47-
"test:electron": "cross-env ECHO_SERVER_PORT=37484 aegir test -t electron-main -t electron-renderer",
48-
"test:electron-main": "cross-env ECHO_SERVER_PORT=37485 aegir test -t electron-main",
49-
"test:electron-renderer": "cross-env ECHO_SERVER_PORT=37486 aegir test -t electron-renderer",
50-
"test:cli": "cross-env ECHO_SERVER_PORT=37487 aegir test -t node -f test/cli/index.js",
51-
"test:node:core": "cross-env ECHO_SERVER_PORT=37488 aegir test -t node -f test/core/**/*.js",
52-
"test:node:http": "cross-env ECHO_SERVER_PORT=37489 aegir test -t node -f test/http-api/index.js",
53-
"test:node:gateway": "cross-env ECHO_SERVER_PORT=37490 aegir test -t node -f test/gateway/index.js",
54-
"test:interface": "cross-env ECHO_SERVER_PORT=37491 aegir test -f test/core/interface.spec.js",
55-
"test:interface:http": "cross-env ECHO_SERVER_PORT=37489 aegir test -f test/http-api/interface.js",
56-
"test:bootstrapers": "cross-env ECHO_SERVER_PORT=37492 IPFS_TEST=bootstrapers aegir test -t browser -f test/bootstrapers.js",
39+
"test": "aegir test",
40+
"test:node": "aegir test -t node",
41+
"test:browser": "aegir test -t browser",
42+
"test:browser:http": "aegir test -t browser -f test/http-api/index.js",
43+
"test:webworker": "aegir test -t webworker",
44+
"test:electron": "aegir test -t electron-main -t electron-renderer",
45+
"test:electron-main": "aegir test -t electron-main",
46+
"test:electron-renderer": "aegir test -t electron-renderer",
47+
"test:cli": "aegir test -t node -f test/cli/index.js",
48+
"test:node:core": "aegir test -t node -f test/core/**/*.js",
49+
"test:node:http": "aegir test -t node -f test/http-api/index.js",
50+
"test:node:gateway": "aegir test -t node -f test/gateway/index.js",
51+
"test:interface": "aegir test -f test/core/interface.spec.js",
52+
"test:interface:http": "aegir test -f test/http-api/interface.js",
53+
"test:bootstrapers": "IPFS_TEST=bootstrapers aegir test -t browser -f test/bootstrapers.js",
5754
"test:interop": "cross-env IPFS_JS_EXEC=$PWD/src/cli/bin.js IPFS_JS_MODULE=$PWD IPFS_REUSEPORT=false ipfs-interop",
5855
"test:interop:node": "cross-env IPFS_JS_EXEC=$PWD/src/cli/bin.js IPFS_JS_MODULE=$PWD IPFS_REUSEPORT=false ipfs-interop -- -t node",
5956
"test:interop:browser": "cross-env IPFS_JS_EXEC=$PWD/src/cli/bin.js IPFS_JS_MODULE=$PWD IPFS_REUSEPORT=false ipfs-interop -- -t browser",
@@ -84,7 +81,7 @@
8481
"class-is": "^1.1.0",
8582
"dag-cbor-links": "^1.3.3",
8683
"datastore-core": "^1.0.0",
87-
"datastore-level": "ipfs/js-datastore-level#chore/update-deps",
84+
"datastore-level": "^1.0.0",
8885
"datastore-pubsub": "^0.3.1",
8986
"debug": "^4.1.0",
9087
"dlv": "^1.1.3",
@@ -96,7 +93,7 @@
9693
"hapi-pino": "^6.1.0",
9794
"hashlru": "^2.3.0",
9895
"interface-datastore": "^0.8.3",
99-
"ipfs-bitswap": "ipfs/js-ipfs-bitswap#fix/really-remove-node-globals",
96+
"ipfs-bitswap": "^0.29.1",
10097
"ipfs-block-service": "^0.16.0",
10198
"ipfs-core-utils": "^0.2.0",
10299
"ipfs-http-client": "^44.0.0",
@@ -106,7 +103,7 @@
106103
"ipfs-unixfs-exporter": "^2.0.1",
107104
"ipfs-unixfs-importer": "^2.0.1",
108105
"ipfs-utils": "^2.2.0",
109-
"ipld": "^0.26.1",
106+
"ipld": "^0.26.2",
110107
"ipld-bitcoin": "^0.3.0",
111108
"ipld-block": "^0.9.1",
112109
"ipld-dag-cbor": "^0.15.2",
@@ -139,14 +136,14 @@
139136
"libp2p-delegated-peer-routing": "^0.4.2",
140137
"libp2p-floodsub": "^0.20.0",
141138
"libp2p-gossipsub": "^0.3.0",
142-
"libp2p-kad-dht": "^0.18.6",
139+
"libp2p-kad-dht": "^0.18.7",
143140
"libp2p-keychain": "^0.6.0",
144141
"libp2p-mdns": "^0.13.1",
145142
"libp2p-mplex": "^0.9.3",
146-
"libp2p-record": "libp2p/js-libp2p-record#fix/remove-buffer",
143+
"libp2p-record": "^0.7.3",
147144
"libp2p-secio": "^0.12.2",
148145
"libp2p-tcp": "^0.14.3",
149-
"libp2p-webrtc-star": "^0.17.9",
146+
"libp2p-webrtc-star": "^0.17.10",
150147
"libp2p-websockets": "^0.13.3",
151148
"mafmt": "^7.0.0",
152149
"merge-options": "^2.0.0",

0 commit comments

Comments
 (0)