chore: update deps (#572)

achingbrain · hugomrdias · web-flow · commit e8853dde51c5 · 2020-12-04T16:28:46.000Z
Co-authored-by: Hugo Dias &lt;hugomrdias@gmail.com&gt;
diff --git a/.aegir.js b/.aegir.js
@@ -13,7 +13,7 @@ const server = createServer(undefined,
       ipfsBin: require('go-ipfs').path()
     },
     js: {
-      ipfsBin: require.resolve('ipfs/src/cli/bin.js')
+      ipfsBin: require.resolve('ipfs/src/cli.js')
     }
   }
 )
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,66 @@
+name: ci
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - run: yarn
+    - run: yarn lint
+    - run: yarn build
+    - run: yarn aegir dep-check
+    - uses: ipfs/aegir/actions/bundle-size@master
+      name: size
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+  test-node:
+    needs: check
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [windows-latest, ubuntu-latest, macos-latest]
+        node: [12, 14]
+      fail-fast: true
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node }}
+      - run: yarn
+      - run: npx nyc --reporter=lcov aegir test -t node --bail --timeout 60000
+      - uses: codecov/codecov-action@v1
+  test-chrome:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: yarn
+      - run: npx aegir test -t browser -t webworker --timeout 10000
+  test-firefox:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: yarn
+      - run: npx aegir test -t browser -t webworker --timeout 10000 -- --browsers FirefoxHeadless
+  test-electron-main:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: yarn
+      - run: npx xvfb-maybe aegir test -t electron-main --bail --timeout 10000
+  test-electron-renderer:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: yarn
+      - run: npx xvfb-maybe aegir test -t electron-renderer --bail --timeout 10000
diff --git a/.travis.yml b/.travis.yml
diff --git a/examples/id/id.js b/examples/id/id.js
@@ -15,7 +15,7 @@ async function run () {
 
   const nodeJs = await createController({
     type: 'js',
-    ipfsBin: require.resolve('ipfs/src/cli/bin.js'),
+    ipfsBin: require.resolve('ipfs/src/cli.js'),
     ipfsHttpModule: require('ipfs-http-client')
   })
   console.log('alice')
diff --git a/package.json b/package.json
@@ -53,9 +53,9 @@
     "@hapi/boom": "^9.1.0",
     "@hapi/hapi": "^20.0.0",
     "debug": "^4.1.1",
-    "execa": "^4.0.0",
+    "execa": "^5.0.0",
     "fs-extra": "^9.0.0",
-    "ipfs-utils": "^4.0.0",
+    "ipfs-utils": "^5.0.1",
     "joi": "^17.2.1",
     "merge-options": "^3.0.1",
     "multiaddr": "^8.0.0",
@@ -64,12 +64,12 @@
     "temp-write": "^4.0.0"
   },
   "devDependencies": {
-    "aegir": "^28.0.2",
+    "aegir": "^29.2.2",
     "benchmark": "^2.1.4",
     "go-ipfs": "^0.7.0",
     "husky": "^4.2.5",
-    "ipfs": "^0.50.2",
-    "ipfs-http-client": "^47.0.1",
+    "ipfs": "0.52.2",
+    "ipfs-http-client": "48.1.2",
     "ipfs-unixfs": "^2.0.3",
     "lint-staged": "^10.1.6"
   },
diff --git a/test/controller.spec.js b/test/controller.spec.js
@@ -54,7 +54,7 @@ describe('Controller API', function () {
     ipfsModule: require('ipfs')
   }, {
     js: {
-      ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli/bin.js')
+      ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli.js')
     },
     go: {
       ipfsBin: isNode ? require('go-ipfs').path() : undefined
diff --git a/test/create.spec.js b/test/create.spec.js
@@ -16,7 +16,7 @@ describe('`createController` should return the correct class', () => {
       disposable: false,
       ipfsModule: require('ipfs'),
       ipfsHttpModule: require('ipfs-http-client'),
-      ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli/bin.js')
+      ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli.js')
     })
 
     if (!isNode) {
@@ -51,7 +51,7 @@ describe('`createController` should return the correct class', () => {
       disposable: false,
       ipfsModule: require('ipfs'),
       ipfsHttpModule: require('ipfs-http-client'),
-      ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli/bin.js')
+      ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli.js')
     })
 
     expect(f).to.be.instanceOf(Client)
@@ -67,7 +67,7 @@ const types = [{
   type: 'js',
   test: true,
   ipfsModule: require('ipfs'),
-  ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli/bin.js')
+  ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli.js')
 }, {
   ...defaultOps,
   ipfsBin: isNode ? require('go-ipfs').path() : undefined,
@@ -84,7 +84,7 @@ const types = [{
   test: true,
   remote: true,
   ipfsModule: require('ipfs'),
-  ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli/bin.js')
+  ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli.js')
 }, {
   ...defaultOps,
   ipfsBin: isNode ? require('go-ipfs').path() : undefined,
diff --git a/test/factory.spec.js b/test/factory.spec.js
@@ -16,7 +16,7 @@ const types = [{
   type: 'js',
   test: true,
   ipfsModule: require('ipfs'),
-  ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli/bin.js')
+  ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli.js')
 }, {
   ...defaultOps,
   ipfsBin: isNode ? require('go-ipfs').path() : undefined,
@@ -33,7 +33,7 @@ const types = [{
   remote: true,
   test: true,
   ipfsModule: require('ipfs'),
-  ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli/bin.js')
+  ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli.js')
 }, {
   ...defaultOps,
   ipfsBin: isNode ? require('go-ipfs').path() : undefined,
@@ -90,7 +90,7 @@ describe('`Factory spawn()` ', function () {
           remote: opts.remote,
           ipfsModule: require('ipfs'),
           ipfsHttpModule: require('ipfs-http-client'),
-          ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli/bin.js')
+          ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli.js')
         })
         expect(ctl).to.exist()
         expect(ctl.opts.test).to.be.true()
diff --git a/test/node.routes.js b/test/node.routes.js
@@ -16,7 +16,7 @@ describe('routes', () => {
       return createFactory({
         ipfsModule: require('ipfs'),
         ipfsHttpModule: require('ipfs-http-client'),
-        ipfsBin: require.resolve('ipfs/src/cli/bin.js')
+        ipfsBin: require.resolve('ipfs/src/cli.js')
       })
     })
   })
diff --git a/test/node.utils.js b/test/node.utils.js
@@ -24,7 +24,7 @@ describe('utils node version', function () {
         test: true,
         ipfsModule: require('ipfs'),
         ipfsHttpModule: require('ipfs-http-client'),
-        ipfsBin: require.resolve('ipfs/src/cli/bin.js')
+        ipfsBin: require.resolve('ipfs/src/cli.js')
       })
       expect(checkForRunningApi(node.path)).to.be.contain('/ip4/127.0.0.1/tcp/')
       await node.stop()
@@ -42,7 +42,7 @@ describe('utils node version', function () {
       test: true,
       ipfsModule: require('ipfs'),
       ipfsHttpModule: require('ipfs-http-client'),
-      ipfsBin: require.resolve('ipfs/src/cli/bin.js')
+      ipfsBin: require.resolve('ipfs/src/cli.js')
     })
     const dir = await f.tmpDir()
     const node = await f.spawn({
@@ -64,7 +64,7 @@ describe('utils node version', function () {
         test: true,
         ipfsModule: require('ipfs'),
         ipfsHttpModule: require('ipfs-http-client'),
-        ipfsBin: require.resolve('ipfs/src/cli/bin.js')
+        ipfsBin: require.resolve('ipfs/src/cli.js')
       })
       expect(await repoExists(node.path)).to.be.true()
       await node.stop()

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ const server = createServer(undefined,`
`13`	`13`	`ipfsBin: require('go-ipfs').path()`
`14`	`14`	`},`
`15`	`15`	`js: {`
`16`		`- ipfsBin: require.resolve('ipfs/src/cli/bin.js')`
	`16`	`+ ipfsBin: require.resolve('ipfs/src/cli.js')`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	`)`