chore: update aegir and multiformats (#3949)

achingbrain · web-flow · commit 484d2559cfe1 · 2021-11-24T09:31:02.000Z
Pulls in new ipjs which stubs files that require the node version of modules. Fixes #3938
diff --git a/packages/interface-ipfs-core/package.json b/packages/interface-ipfs-core/package.json
@@ -67,7 +67,7 @@
     "@types/pako": "^1.0.2",
     "@types/readable-stream": "^2.3.11",
     "abort-controller": "^3.0.0",
-    "aegir": "^35.1.1",
+    "aegir": "^36.0.1",
     "blockstore-core": "^1.0.2",
     "copyfiles": "^2.4.1",
     "delay": "^5.0.0",
@@ -93,7 +93,7 @@
     "libp2p-crypto": "^0.19.7",
     "libp2p-websockets": "^0.16.2",
     "multiaddr": "^10.0.0",
-    "multiformats": "^9.4.1",
+    "multiformats": "^9.4.13",
     "nanoid": "^3.1.23",
     "native-abort-controller": "^1.0.3",
     "p-map": "^4.0.0",
diff --git a/packages/ipfs-cli/package.json b/packages/ipfs-cli/package.json
@@ -86,7 +86,7 @@
     "mafmt": "^10.0.0",
     "multiaddr": "^10.0.0",
     "multiaddr-to-uri": "^8.0.0",
-    "multiformats": "^9.4.1",
+    "multiformats": "^9.4.13",
     "parse-duration": "^1.0.0",
     "pretty-bytes": "^5.4.1",
     "progress": "^2.0.3",
@@ -98,7 +98,7 @@
     "@types/ncp": "^2.0.5",
     "@types/progress": "^2.0.3",
     "@types/yargs": "^16.0.0",
-    "aegir": "^35.1.1",
+    "aegir": "^36.0.1",
     "it-to-buffer": "^2.0.0",
     "nanoid": "^3.1.23",
     "ncp": "^2.0.0",
diff --git a/packages/ipfs-cli/src/commands/swarm/addrs.js b/packages/ipfs-cli/src/commands/swarm/addrs.js
@@ -37,7 +37,7 @@ export default {
         let res
         try {
           res = addr.decapsulate('ipfs').toString()
-        } catch (_) {
+        } catch (/** @type {any} */ _) {
           // peer addresses dont need to have /ipfs/ as we know their peerId
           // and can encapsulate on dial.
           res = addr.toString()
diff --git a/packages/ipfs-client/package.json b/packages/ipfs-client/package.json
@@ -46,7 +46,7 @@
     "merge-options": "^3.0.4"
   },
   "devDependencies": {
-    "aegir": "^35.1.1",
+    "aegir": "^36.0.1",
     "rimraf": "^3.0.2"
   }
 }
diff --git a/packages/ipfs-core-config/package.json b/packages/ipfs-core-config/package.json
@@ -105,7 +105,7 @@
     "uint8arrays": "^3.0.0"
   },
   "devDependencies": {
-    "aegir": "^35.1.1",
+    "aegir": "^36.0.1",
     "ipfs-core-utils": "^0.12.1",
     "rimraf": "^3.0.2"
   }
diff --git a/packages/ipfs-core-types/package.json b/packages/ipfs-core-types/package.json
@@ -46,10 +46,10 @@
   "dependencies": {
     "interface-datastore": "^6.0.2",
     "multiaddr": "^10.0.0",
-    "multiformats": "^9.4.1"
+    "multiformats": "^9.4.13"
   },
   "devDependencies": {
-    "aegir": "^35.1.1",
+    "aegir": "^36.0.1",
     "copyfiles": "^2.4.1",
     "rimraf": "^3.0.2"
   },
diff --git a/packages/ipfs-core-utils/package.json b/packages/ipfs-core-utils/package.json
@@ -127,15 +127,15 @@
     "merge-options": "^3.0.4",
     "multiaddr": "^10.0.0",
     "multiaddr-to-uri": "^8.0.0",
-    "multiformats": "^9.4.1",
+    "multiformats": "^9.4.13",
     "nanoid": "^3.1.23",
     "parse-duration": "^1.0.0",
     "timeout-abort-controller": "^1.1.1",
     "uint8arrays": "^3.0.0"
   },
   "devDependencies": {
     "@web-std/file": "^1.1.2",
-    "aegir": "^35.1.1",
+    "aegir": "^36.0.1",
     "rimraf": "^3.0.2"
   }
 }
diff --git a/packages/ipfs-core-utils/src/multipart-request.node.js b/packages/ipfs-core-utils/src/multipart-request.node.js
@@ -71,7 +71,7 @@ export async function multipartRequest (source, abortController, headers = {}, b
 
         index++
       }
-    } catch (err) {
+    } catch (/** @type {any} */ err) {
       log(err)
       // workaround for https://github.com/node-fetch/node-fetch/issues/753
       abortController.abort()
diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json
@@ -121,7 +121,7 @@
     "mortice": "^2.0.0",
     "multiaddr": "^10.0.0",
     "multiaddr-to-uri": "^8.0.0",
-    "multiformats": "^9.4.1",
+    "multiformats": "^9.4.13",
     "native-abort-controller": "^1.0.3",
     "pako": "^1.0.2",
     "parse-duration": "^1.0.0",
@@ -133,7 +133,7 @@
     "@types/dlv": "^1.1.2",
     "@types/pako": "^1.0.2",
     "@types/rimraf": "^3.0.1",
-    "aegir": "^35.1.1",
+    "aegir": "^36.0.1",
     "delay": "^5.0.0",
     "go-ipfs": "0.9.1",
     "interface-blockstore-tests": "^2.0.1",
diff --git a/packages/ipfs-core/src/components/dag/export.js b/packages/ipfs-core/src/components/dag/export.js
@@ -60,7 +60,7 @@ export function createExport ({ repo, preload, codecs }) {
           writer,
           codecs)
         writer.close()
-      } catch (e) {
+      } catch (/** @type {any} */ e) {
         err = e
       }
     })()
diff --git a/packages/ipfs-core/src/components/object/links.js b/packages/ipfs-core/src/components/object/links.js
@@ -25,7 +25,7 @@ function findLinks (node, links = []) {
           Hash: CID.parse(val)
         })
         continue
-      } catch (_) {
+      } catch (/** @type {any} */ _) {
         // not a CID
       }
     }
diff --git a/packages/ipfs-core/src/ipns/routing/pubsub-datastore.js b/packages/ipfs-core/src/ipns/routing/pubsub-datastore.js
@@ -53,7 +53,7 @@ export class IpnsPubsubDatastore {
     try {
       // @ts-ignore datastores take Key keys, this one takes Uint8Array keys
       res = await this._pubsubDs.get(key)
-    } catch (e) {
+    } catch (/** @type {any} */ e) {
       err = e
     }
 
diff --git a/packages/ipfs-core/src/utils/service.js b/packages/ipfs-core/src/utils/service.js
@@ -128,7 +128,7 @@ export class Service {
       // and try again. That way
       case 'starting': {
         // We do not want to error stop if start failed.
-        try { await state.ready } catch (_) {}
+        try { await state.ready } catch (/** @type {any} */ _) {}
         return await Service.stop(service)
       }
       // if service is stopping we just await for it to complete.
diff --git a/packages/ipfs-core/src/version.js b/packages/ipfs-core/src/version.js
@@ -1,4 +1,4 @@
 
 export const ipfsCore = '0.12.1'
-export const commit = 'fdc148b5c08c0be49eef77a18259d5baa895e3f9'
+export const commit = ''
 export const interfaceIpfsCore = '^0.152.1'
diff --git a/packages/ipfs-daemon/package.json b/packages/ipfs-daemon/package.json
@@ -56,7 +56,7 @@
     "libp2p-webrtc-star": "^0.24.0"
   },
   "devDependencies": {
-    "aegir": "^35.1.1",
+    "aegir": "^36.0.1",
     "node-fetch": "npm:@achingbrain/node-fetch@^2.6.4",
     "ws": "^7.3.1"
   },
diff --git a/packages/ipfs-grpc-client/package.json b/packages/ipfs-grpc-client/package.json
@@ -61,14 +61,14 @@
     "it-first": "^1.0.4",
     "it-pushable": "^1.4.2",
     "multiaddr": "^10.0.0",
-    "multiformats": "^9.4.1",
+    "multiformats": "^9.4.13",
     "p-defer": "^3.0.0",
     "protobufjs": "^6.10.2",
     "wherearewe": "^1.0.0",
     "ws": "^7.3.1"
   },
   "devDependencies": {
-    "aegir": "^35.1.1",
+    "aegir": "^36.0.1",
     "it-all": "^1.0.4",
     "rimraf": "^3.0.2",
     "sinon": "^11.1.1"
diff --git a/packages/ipfs-grpc-protocol/package.json b/packages/ipfs-grpc-protocol/package.json
@@ -40,7 +40,7 @@
     "lint": "aegir ts -p check && aegir lint"
   },
   "devDependencies": {
-    "aegir": "^35.1.1",
+    "aegir": "^36.0.1",
     "mkdirp": "^1.0.4",
     "protobufjs": "^6.10.2",
     "rimraf": "^3.0.2"
diff --git a/packages/ipfs-grpc-server/package.json b/packages/ipfs-grpc-server/package.json
@@ -61,7 +61,7 @@
   },
   "devDependencies": {
     "@types/ws": "^7.4.0",
-    "aegir": "^35.1.1",
+    "aegir": "^36.0.1",
     "ipfs-core": "^0.12.1",
     "it-all": "^1.0.4",
     "it-drain": "^1.0.3",
diff --git a/packages/ipfs-http-client/package.json b/packages/ipfs-http-client/package.json
@@ -67,14 +67,14 @@
     "it-last": "^1.0.4",
     "merge-options": "^3.0.4",
     "multiaddr": "^10.0.0",
-    "multiformats": "^9.4.1",
+    "multiformats": "^9.4.13",
     "native-abort-controller": "^1.0.3",
     "parse-duration": "^1.0.0",
     "stream-to-it": "^0.2.2",
     "uint8arrays": "^3.0.0"
   },
   "devDependencies": {
-    "aegir": "^35.1.1",
+    "aegir": "^36.0.1",
     "delay": "^5.0.0",
     "go-ipfs": "0.9.1",
     "ipfsd-ctl": "^10.0.4",
diff --git a/packages/ipfs-http-client/test/log.spec.js b/packages/ipfs-http-client/test/log.spec.js
@@ -22,7 +22,7 @@ describe('.log', function () {
     const i = setInterval(async () => {
       try {
         await ipfs.add(uint8ArrayFromString('just adding some data to generate logs'))
-      } catch (_) {
+      } catch (/** @type {any} */ _) {
         // this can error if the test has finished and we're shutting down the node
       }
     }, 1000)
diff --git a/packages/ipfs-http-gateway/package.json b/packages/ipfs-http-gateway/package.json
@@ -69,14 +69,14 @@
     "it-last": "^1.0.4",
     "it-to-stream": "^1.0.0",
     "joi": "^17.2.1",
-    "multiformats": "^9.4.1",
+    "multiformats": "^9.4.13",
     "uint8arrays": "^3.0.0",
     "uri-to-multiaddr": "^6.0.0"
   },
   "devDependencies": {
     "@types/hapi-pino": "^8.0.1",
     "@types/hapi__hapi": "^20.0.5",
-    "aegir": "^35.1.1",
+    "aegir": "^36.0.1",
     "file-type": "^16.0.0",
     "rimraf": "^3.0.2",
     "sinon": "^11.1.1"
diff --git a/packages/ipfs-http-response/package.json b/packages/ipfs-http-response/package.json
@@ -74,7 +74,7 @@
   },
   "devDependencies": {
     "@types/ejs": "^3.1.0",
-    "aegir": "^35.1.1",
+    "aegir": "^36.0.1",
     "get-stream": "^6.0.0",
     "global": "^4.4.0",
     "ipfs-core": "^0.12.1",
diff --git a/packages/ipfs-http-response/src/index.js b/packages/ipfs-http-response/src/index.js
@@ -90,7 +90,7 @@ export async function getResponse (ipfsNode, ipfsPath) {
     } catch (/** @type {any} */ err) {
       return new Response(err.toString(), getHeader(500, 'Error fetching the file'))
     }
-  } catch (error) {
+  } catch (/** @type {any} */ error) {
     log(error)
     return handleResolveError(ipfsNode, ipfsPath, error)
   }
diff --git a/packages/ipfs-http-server/package.json b/packages/ipfs-http-server/package.json
@@ -72,7 +72,7 @@
     "joi": "^17.2.1",
     "just-safe-set": "^2.2.1",
     "multiaddr": "^10.0.0",
-    "multiformats": "^9.4.1",
+    "multiformats": "^9.4.13",
     "native-abort-controller": "^1.0.3",
     "parse-duration": "^1.0.0",
     "stream-to-it": "^0.2.2",
@@ -82,7 +82,7 @@
   "devDependencies": {
     "@types/hapi-pino": "^8.0.1",
     "@types/hapi__hapi": "^20.0.5",
-    "aegir": "^35.1.1",
+    "aegir": "^36.0.1",
     "form-data": "^4.0.0",
     "ipfs-http-client": "^54.0.1",
     "iso-random-stream": "^2.0.0",
diff --git a/packages/ipfs-http-server/src/version.js b/packages/ipfs-http-server/src/version.js
@@ -1,2 +1,2 @@
 
-export const ipfsHttpClient = '^54.0.0'
+export const ipfsHttpClient = '^54.0.1'
diff --git a/packages/ipfs-message-port-client/package.json b/packages/ipfs-message-port-client/package.json
@@ -51,10 +51,10 @@
     "ipfs-message-port-protocol": "^0.10.3",
     "ipfs-unixfs": "^6.0.3",
     "it-peekable": "^1.0.2",
-    "multiformats": "^9.4.1"
+    "multiformats": "^9.4.13"
   },
   "devDependencies": {
-    "aegir": "^35.1.1",
+    "aegir": "^36.0.1",
     "interface-ipfs-core": "^0.152.1",
     "ipfs-core": "^0.12.1",
     "ipfs-message-port-server": "^0.10.3",
diff --git a/packages/ipfs-message-port-protocol/package.json b/packages/ipfs-message-port-protocol/package.json
@@ -74,10 +74,10 @@
   },
   "dependencies": {
     "ipfs-core-types": "^0.8.3",
-    "multiformats": "^9.4.1"
+    "multiformats": "^9.4.13"
   },
   "devDependencies": {
-    "aegir": "^35.1.1",
+    "aegir": "^36.0.1",
     "rimraf": "^3.0.2",
     "uint8arrays": "^3.0.0"
   },
diff --git a/packages/ipfs-message-port-server/package.json b/packages/ipfs-message-port-server/package.json
@@ -70,10 +70,10 @@
     "ipfs-core-types": "^0.8.3",
     "ipfs-message-port-protocol": "^0.10.3",
     "it-all": "^1.0.4",
-    "multiformats": "^9.4.1"
+    "multiformats": "^9.4.13"
   },
   "devDependencies": {
-    "aegir": "^35.1.1",
+    "aegir": "^36.0.1",
     "rimraf": "^3.0.2"
   },
   "engines": {
diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json
@@ -79,7 +79,7 @@
   "devDependencies": {
     "@types/semver": "^7.3.4",
     "@types/update-notifier": "^5.0.0",
-    "aegir": "^35.1.1",
+    "aegir": "^36.0.1",
     "assert": "^2.0.0",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.0",

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@`
`46`	`46`	`"merge-options": "^3.0.4"`
`47`	`47`	`},`
`48`	`48`	`"devDependencies": {`
`49`		`- "aegir": "^35.1.1",`
	`49`	`+ "aegir": "^36.0.1",`
`50`	`50`	`"rimraf": "^3.0.2"`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@`
`105`	`105`	`"uint8arrays": "^3.0.0"`
`106`	`106`	`},`
`107`	`107`	`"devDependencies": {`
`108`		`- "aegir": "^35.1.1",`
	`108`	`+ "aegir": "^36.0.1",`
`109`	`109`	`"ipfs-core-utils": "^0.12.1",`
`110`	`110`	`"rimraf": "^3.0.2"`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ export async function multipartRequest (source, abortController, headers = {}, b`
`71`	`71`
`72`	`72`	`index++`
`73`	`73`	`}`
`74`		`- } catch (err) {`
	`74`	`+ } catch (/** @type {any} */ err) {`
`75`	`75`	`log(err)`
`76`	`76`	`// workaround for https://github.com/node-fetch/node-fetch/issues/753`
`77`	`77`	`abortController.abort()`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ export function createExport ({ repo, preload, codecs }) {`
`60`	`60`	`writer,`
`61`	`61`	`codecs)`
`62`	`62`	`writer.close()`
`63`		`- } catch (e) {`
	`63`	`+ } catch (/** @type {any} */ e) {`
`64`	`64`	`err = e`
`65`	`65`	`}`
`66`	`66`	`})()`