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

Commit 49f7880

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 7e33d82 commit 49f7880

File tree

78 files changed

+487
-489
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+487
-489
lines changed

Diff for: .github/workflows/bundlesize.yml

+3-16
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,20 @@ on:
77
name: Bundlesize
88
jobs:
99
check:
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-latest # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md
1111
strategy:
1212
matrix:
13-
node-version: [14.x]
1413
project:
1514
- packages/ipfs-core-utils
1615
- packages/ipfs-core
1716
- packages/ipfs-http-client
1817
- packages/ipfs
19-
- packages/ipfs-message-port-protocol
2018
- packages/ipfs-message-port-client
2119
steps:
2220
- uses: actions/checkout@v2
23-
- name: Use Node.js ${{ matrix.node-version }}
24-
uses: actions/setup-node@v1
25-
with:
26-
node-version: ${{ matrix.node-version }}
27-
- name: Restore dependencies
28-
id: cache-modules
29-
uses: actions/checkout@v2
30-
with:
31-
path: node_modules
32-
key: ${{ matrix.node-version }}-${{ runner.OS }}-build-${{ hashFiles('package.json') }}
33-
- name: Install dependencies
34-
run: npm install
21+
- run: npm install
3522
- name: Bundlesize ${{ matrix.project }}
36-
uses: ipfs/aegir/actions/bundle-size@v29.0.0
23+
uses: ipfs/aegir/actions/bundle-size@v31.0.4
3724
with:
3825
project: ${{ matrix.project }}
3926
github_token: ${{ secrets.GITHUB_TOKEN }}

Diff for: .github/workflows/typecheck.yml

-6
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ jobs:
2727
uses: actions/setup-node@v1
2828
with:
2929
node-version: ${{ matrix.node-version }}
30-
- name: Restore dependencies
31-
id: cache-modules
32-
uses: actions/checkout@v2
33-
with:
34-
path: node_modules
35-
key: ${{ matrix.node-version }}-${{ runner.OS }}-build-${{ hashFiles('package.json') }}
3630
- name: Install dependencies
3731
run: npm install
3832
- name: Typecheck ${{ matrix.project }}

Diff for: .travis.yml

+41-24
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
language: node_js
2+
dist: bionic
23

34
services:
45
- xvfb
@@ -31,25 +32,41 @@ env:
3132
addons:
3233
apt:
3334
packages:
34-
# Fixes error while loading shared libraries: libgconf-2.so.4: cannot open shared object file: No such file or directory
35-
# https://github.com/electron/electron/issues/1518
36-
- libgconf-2-4
37-
# Ensure chrome is the latest version
38-
# https://stackoverflow.com/questions/57903415/travis-ci-chrome-62-instead-of-77
39-
- dpkg
35+
# These are required to run webkit
36+
- libwoff1
37+
- libopus0
38+
- libwebp6
39+
- libwebpdemux2
40+
- libenchant1c2a
41+
- libgudev-1.0-0
42+
- libsecret-1-0
43+
- libhyphen0
44+
- libgdk-pixbuf2.0-0
45+
- libegl1
46+
- libgles2
47+
- libevent-2.1-6
48+
- libnotify4
49+
- libxslt1.1
50+
- libvpx5
51+
# gstreamer and plugins to support video playback in WebKit.
52+
- gstreamer1.0-gl
53+
- gstreamer1.0-plugins-base
54+
- gstreamer1.0-plugins-good
55+
- gstreamer1.0-plugins-bad
56+
# This is required to run chromium
57+
- libgbm1
4058
chrome: stable
41-
firefox: latest
4259

4360
before_install:
4461
# prevents windows error: npm ERR! ... git-sh-setup: file not found
4562
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PATH=/c/PROGRA~1/Git/usr/bin:/c/PROGRA~1/Git/mingw64/libexec/git-core:$PATH ; fi
4663
# only run jobs in packages that have changed since master in PR builds
4764
- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then export RUN_SINCE='--since master' ; fi
4865
# modules with pre-built binaries may not have deployed versions for bleeding-edge node so this lets us fall back to building from source
49-
- npm install -g node-pre-gyp
66+
- npm install -g @mapbox/node-pre-gyp
5067

5168
script:
52-
- npm run test:node -- $RUN_SINCE -- -- --timeout 10000 --bail
69+
- npm run test:node -- $RUN_SINCE -- -- --timeout 10000 --bail -- --exit # TODO remove --exit https://mochajs.org/#-exit
5370

5471
jobs:
5572
allow_failures:
@@ -91,12 +108,12 @@ jobs:
91108
- stage: test
92109
name: firefox
93110
script:
94-
- npm run test:browser -- $RUN_SINCE -- -- --bail --browsers FirefoxHeadless
111+
- npm run test:browser -- $RUN_SINCE -- -- --bail -- --browser firefox
95112

96113
- stage: test
97114
name: firefox webworker
98115
script:
99-
- npm run test:webworker -- $RUN_SINCE -- -- --bail --browsers FirefoxHeadless --timeout 60000
116+
- npm run test:webworker -- $RUN_SINCE -- -- --bail --timeout 60000 -- --browser firefox
100117

101118
- stage: test
102119
name: electron-main
@@ -131,7 +148,7 @@ jobs:
131148
- stage: test
132149
name: js-ipfs interface tests - node
133150
script:
134-
- npm run test:interface:core -- $RUN_SINCE -- -- --bail -t node
151+
- npm run test:interface:core -- $RUN_SINCE -- -- --bail -t node -- --exit # TODO remove --exit https://mochajs.org/#-exit
135152

136153
- stage: test
137154
name: js-ipfs interface tests - chrome
@@ -146,12 +163,12 @@ jobs:
146163
- stage: test
147164
name: js-ipfs interface tests - firefox
148165
script:
149-
- npm run test:interface:core -- $RUN_SINCE -- -- --bail -t browser --browsers FirefoxHeadless
166+
- npm run test:interface:core -- $RUN_SINCE -- -- --bail -t browser -- --browser firefox
150167

151168
- stage: test
152169
name: js-ipfs interface tests - firefox webworker
153170
script:
154-
- npm run test:interface:core -- $RUN_SINCE -- -- --bail -t webworker --browsers FirefoxHeadless --timeout 60000
171+
- npm run test:interface:core -- $RUN_SINCE -- -- --bail -t webworker --timeout 60000 -- --browser firefox
155172

156173
- stage: test
157174
name: js-ipfs interface tests - electron main
@@ -166,7 +183,7 @@ jobs:
166183
- stage: test
167184
name: js-ipfs interface tests - ipfs-client - node
168185
script:
169-
- npm run test:interface:client -- $RUN_SINCE -- -- --bail -t node
186+
- npm run test:interface:client -- $RUN_SINCE -- -- --bail -t node -- --exit # TODO remove --exit https://mochajs.org/#-exit
170187

171188
- stage: test
172189
name: js-ipfs interface tests - ipfs-client - chrome
@@ -181,12 +198,12 @@ jobs:
181198
- stage: test
182199
name: js-ipfs interface tests - ipfs-client - firefox
183200
script:
184-
- npm run test:interface:client -- $RUN_SINCE -- -- --bail -t browser --browsers FirefoxHeadless
201+
- npm run test:interface:client -- $RUN_SINCE -- -- --bail -t browser -- --browser firefox
185202

186203
- stage: test
187204
name: js-ipfs interface tests - ipfs-client - firefox webworker
188205
script:
189-
- npm run test:interface:client -- $RUN_SINCE -- -- --bail -t webworker --browsers FirefoxHeadless --timeout 60000
206+
- npm run test:interface:client -- $RUN_SINCE -- -- --bail -t webworker --timeout 60000 -- --browser firefox
190207

191208
- stage: test
192209
name: js-ipfs interface tests - ipfs-client - electron main
@@ -201,7 +218,7 @@ jobs:
201218
- stage: test
202219
name: http-api-client interface tests vs go-ipfs - node
203220
script:
204-
- npm run test:interface:http-go -- $RUN_SINCE -- -- --bail -t node
221+
- npm run test:interface:http-go -- $RUN_SINCE -- -- --bail -t node -- --exit # TODO remove --exit https://mochajs.org/#-exit
205222

206223
- stage: test
207224
name: http-api-client interface tests vs go-ipfs - chrome
@@ -216,17 +233,17 @@ jobs:
216233
- stage: test
217234
name: http-api-client interface tests vs go-ipfs - firefox
218235
script:
219-
- npm run test:interface:http-go -- $RUN_SINCE -- -- --bail -t browser --browsers FirefoxHeadless
236+
- npm run test:interface:http-go -- $RUN_SINCE -- -- --bail -t browser -- --browser firefox
220237

221238
- stage: test
222239
name: http-api-client interface tests vs go-ipfs - firefox webworker
223240
script:
224-
- npm run test:interface:http-go -- $RUN_SINCE -- -- --bail -t webworker --browsers FirefoxHeadless --timeout 60000
241+
- npm run test:interface:http-go -- $RUN_SINCE -- -- --bail -t webworker --timeout 60000 -- --browser firefox
225242

226243
- stage: test
227244
name: http-api-client interface tests vs js-ipfs - node
228245
script:
229-
- npm run test:interface:http-js -- $RUN_SINCE -- -- --bail -t node
246+
- npm run test:interface:http-js -- $RUN_SINCE -- -- --bail -t node -- --exit # TODO remove --exit https://mochajs.org/#-exit
230247

231248
- stage: test
232249
name: http-api-client interface tests vs js-ipfs - chrome
@@ -241,12 +258,12 @@ jobs:
241258
- stage: test
242259
name: http-api-client interface tests vs js-ipfs - firefox
243260
script:
244-
- npm run test:interface:http-js -- $RUN_SINCE -- -- --bail -t browser --browsers FirefoxHeadless
261+
- npm run test:interface:http-js -- $RUN_SINCE -- -- --bail -t browser --browser firefox
245262

246263
- stage: test
247264
name: http-api-client interface tests vs js-ipfs - firefox webworker
248265
script:
249-
- npm run test:interface:http-js -- $RUN_SINCE -- -- --bail -t webworker --browsers FirefoxHeadless --timeout 60000
266+
- npm run test:interface:http-js -- $RUN_SINCE -- -- --bail -t webworker --timeout 60000 -- --browser firefox
250267

251268
- stage: test
252269
name: http-api-client interface tests vs js-ipfs - electron main
@@ -266,7 +283,7 @@ jobs:
266283
- stage: test
267284
name: ipfs-message-port-client interface tests - firefox
268285
script:
269-
- npm run test:interface:message-port-client -- $RUN_SINCE -- -- --bail -t browser --browsers FirefoxHeadless
286+
- npm run test:interface:message-port-client -- $RUN_SINCE -- -- --bail -t browser -- --browser firefox
270287

271288
- stage: test
272289
name: examples

Diff for: examples/browser-browserify/package.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,10 @@
1616
"devDependencies": {
1717
"browserify": "^16.2.3",
1818
"concat-stream": "^2.0.0",
19-
"execa": "^4.0.3",
19+
"execa": "^5.0.0",
2020
"http-server": "^0.12.3",
2121
"ipfs": "^0.54.2",
2222
"rimraf": "^3.0.2",
2323
"test-ipfs-example": "^3.0.0"
24-
},
25-
"browser": {
26-
"ipfs": "ipfs/dist/index.min.js"
2724
}
2825
}

Diff for: examples/browser-exchange-files/package.json

+3-6
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,16 @@
1212
"license": "MIT",
1313
"devDependencies": {
1414
"browserify": "^16.2.3",
15-
"execa": "^4.0.3",
15+
"execa": "^5.0.0",
1616
"http-server": "^0.12.3",
1717
"ipfs-http-client": "^49.0.2",
18-
"uint8arrays": "^2.0.5"
18+
"uint8arrays": "^2.1.3"
1919
},
2020
"dependencies": {
2121
"ipfs": "^0.54.2",
2222
"it-all": "^1.0.4",
23-
"libp2p-websockets": "^0.15.0",
23+
"libp2p-websockets": "^0.15.1",
2424
"rimraf": "^3.0.2",
2525
"test-ipfs-example": "^3.0.0"
26-
},
27-
"browser": {
28-
"ipfs": "ipfs/dist/index.min.js"
2926
}
3027
}

Diff for: examples/browser-ipns-publish/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
"ipns": "^0.8.0",
2020
"it-last": "^1.0.4",
2121
"p-retry": "^4.2.0",
22-
"uint8arrays": "^2.0.5"
22+
"uint8arrays": "^2.1.3"
2323
},
2424
"browserslist": [
2525
"last 2 versions and not dead and > 2%"
2626
],
2727
"devDependencies": {
2828
"delay": "^4.4.0",
29-
"execa": "^4.0.3",
29+
"execa": "^5.0.0",
3030
"ipfsd-ctl": "^7.2.0",
31-
"go-ipfs": "0.8.0-rc2",
31+
"go-ipfs": "0.8.0",
3232
"parcel-bundler": "^1.12.4",
3333
"path": "^0.12.7",
3434
"test-ipfs-example": "^3.0.0"

Diff for: examples/browser-parceljs/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
"ipfs": "^0.54.2"
2222
},
2323
"devDependencies": {
24-
"@babel/cli": "^7.1.5",
25-
"@babel/core": "^7.2.2",
26-
"@babel/preset-env": "^7.3.1",
24+
"@babel/cli": "7.13.0",
25+
"@babel/core": "7.13.0",
26+
"@babel/preset-env": "7.13.0",
2727
"babel-plugin-syntax-async-functions": "^6.13.0",
2828
"babel-plugin-transform-regenerator": "^6.26.0",
2929
"babel-polyfill": "^6.26.0",

Diff for: examples/browser-service-worker/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
"license": "MIT",
1313
"keywords": [],
1414
"devDependencies": {
15-
"@babel/core": "^7.2.2",
16-
"@babel/preset-env": "^7.3.1",
17-
"babel-loader": "^8.0.5",
15+
"@babel/core": "7.13.0",
16+
"@babel/preset-env": "7.13.0",
17+
"babel-loader": "^8.2.2",
1818
"copy-webpack-plugin": "^5.0.4",
1919
"test-ipfs-example": "^3.0.0",
2020
"webpack": "5.4.0",

Diff for: examples/browser-service-worker/test.js

-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ module.exports = {
88
.url(process.env.IPFS_EXAMPLE_TEST_URL)
99
.waitForElementVisible('body')
1010

11-
1211
browser.expect.element('body').text.to.contain('Load content by adding IPFS path to the URL')
1312
browser.expect.element('a').text.to.contain('/ipfs/bafy')
1413

@@ -19,8 +18,6 @@ module.exports = {
1918
.waitForElementVisible('body')
2019
.waitForElementVisible('iframe')
2120

22-
23-
2421
browser.element('css selector', 'iframe', frame => {
2522
browser.frame({ ELEMENT: frame.value.ELEMENT }, () => {
2623
browser.waitForElementPresent('body')

Diff for: examples/browser-service-worker/webpack.config.js

+12-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const webpack = require('webpack')
55
const CopyWebpackPlugin = require('copy-webpack-plugin')
66

77
module.exports = {
8-
mode: "development",
8+
mode: 'development',
99
devtool: 'source-map',
1010
entry: './src/main.js',
1111
output: {
@@ -28,15 +28,24 @@ module.exports = {
2828
use: {
2929
loader: 'babel-loader',
3030
options: {
31-
presets: ['@babel/preset-env']
31+
presets: [
32+
[
33+
'@babel/preset-env',
34+
{
35+
targets: {
36+
esmodules: true
37+
}
38+
}
39+
]
40+
]
3241
}
3342
}
3443
}
3544
]
3645
},
3746
resolve: {
3847
fallback: {
39-
"stream": require.resolve("stream-browserify")
48+
stream: require.resolve('stream-browserify')
4049
}
4150
},
4251
plugins: [

Diff for: examples/browser-sharing-node-across-tabs/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
"license": "MIT",
1313
"keywords": [],
1414
"devDependencies": {
15-
"@babel/core": "^7.2.2",
16-
"@babel/preset-env": "^7.3.1",
17-
"babel-loader": "^8.0.5",
15+
"@babel/core": "7.13.0",
16+
"@babel/preset-env": "7.13.0",
17+
"babel-loader": "^8.2.2",
1818
"copy-webpack-plugin": "^5.0.4",
1919
"rimraf": "^3.0.2",
2020
"test-ipfs-example": "^3.0.0",

0 commit comments

Comments
 (0)