From 7c9401f9487bad5b57175618908c83eff1109ca7 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Tue, 28 Sep 2021 12:08:43 +0100 Subject: [PATCH 1/2] chore: update deps Reduce dep duplication by updating versions --- packages/interface-ipfs-core/package.json | 6 +++--- packages/ipfs-cli/package.json | 4 ++-- packages/ipfs-client/package.json | 2 +- packages/ipfs-core-config/package.json | 8 ++++---- packages/ipfs-core-types/package.json | 2 +- packages/ipfs-core-utils/package.json | 4 ++-- packages/ipfs-core/package.json | 6 +++--- packages/ipfs-daemon/package.json | 6 +++--- packages/ipfs-grpc-client/package.json | 2 +- packages/ipfs-grpc-protocol/package.json | 2 +- packages/ipfs-grpc-server/package.json | 2 +- packages/ipfs-http-client/package.json | 6 +++--- packages/ipfs-http-gateway/package.json | 2 +- packages/ipfs-http-response/package.json | 10 +++++----- packages/ipfs-http-server/package.json | 2 +- packages/ipfs-message-port-client/package.json | 2 +- packages/ipfs-message-port-protocol/package.json | 2 +- packages/ipfs-message-port-server/package.json | 2 +- packages/ipfs/package.json | 10 +++++----- 19 files changed, 40 insertions(+), 40 deletions(-) diff --git a/packages/interface-ipfs-core/package.json b/packages/interface-ipfs-core/package.json index 21c00a54d0..de70c7798d 100644 --- 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.0", + "aegir": "^35.1.1", "blockstore-core": "^1.0.2", "copyfiles": "^2.4.1", "delay": "^5.0.0", @@ -75,7 +75,7 @@ "ipfs-core-types": "^0.8.0", "ipfs-unixfs": "^6.0.3", "ipfs-unixfs-importer": "^9.0.3", - "ipfs-utils": "^9.0.1", + "ipfs-utils": "^9.0.2", "ipns": "^0.15.0", "is-ipfs": "^6.0.1", "iso-random-stream": "^2.0.0", @@ -91,7 +91,7 @@ "it-tar": "^4.0.0", "it-to-buffer": "^2.0.0", "libp2p-crypto": "^0.19.7", - "libp2p-websockets": "^0.16.1", + "libp2p-websockets": "^0.16.2", "multiaddr": "^10.0.0", "multiformats": "^9.4.1", "nanoid": "^3.1.23", diff --git a/packages/ipfs-cli/package.json b/packages/ipfs-cli/package.json index 12d4b1b21f..9015ab9166 100644 --- a/packages/ipfs-cli/package.json +++ b/packages/ipfs-cli/package.json @@ -71,7 +71,7 @@ "ipfs-daemon": "^0.10.0", "ipfs-http-client": "^53.0.0", "ipfs-repo": "^13.0.4", - "ipfs-utils": "^9.0.1", + "ipfs-utils": "^9.0.2", "it-all": "^1.0.4", "it-concat": "^2.0.0", "it-first": "^1.0.4", @@ -98,7 +98,7 @@ "@types/ncp": "^2.0.5", "@types/progress": "^2.0.3", "@types/yargs": "^16.0.0", - "aegir": "^35.1.0", + "aegir": "^35.1.1", "it-to-buffer": "^2.0.0", "nanoid": "^3.1.23", "ncp": "^2.0.0", diff --git a/packages/ipfs-client/package.json b/packages/ipfs-client/package.json index 1863771111..e4eb4439f5 100644 --- 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.0", + "aegir": "^35.1.1", "rimraf": "^3.0.2" } } diff --git a/packages/ipfs-core-config/package.json b/packages/ipfs-core-config/package.json index 1b101f6072..4230024c42 100644 --- a/packages/ipfs-core-config/package.json +++ b/packages/ipfs-core-config/package.json @@ -88,7 +88,7 @@ "err-code": "^3.0.1", "hashlru": "^2.3.0", "ipfs-repo": "^13.0.4", - "ipfs-utils": "^9.0.1", + "ipfs-utils": "^9.0.2", "ipns": "^0.15.0", "is-ipfs": "^6.0.1", "it-all": "^1.0.4", @@ -99,13 +99,13 @@ "libp2p-mdns": "^0.17.0", "libp2p-mplex": "^0.10.2", "libp2p-tcp": "^0.17.1", - "libp2p-webrtc-star": "^0.23.0", - "libp2p-websockets": "^0.16.1", + "libp2p-webrtc-star": "^0.24.0", + "libp2p-websockets": "^0.16.2", "p-queue": "^6.6.1", "uint8arrays": "^3.0.0" }, "devDependencies": { - "aegir": "^35.1.0", + "aegir": "^35.1.1", "ipfs-core-utils": "^0.11.0", "rimraf": "^3.0.2" } diff --git a/packages/ipfs-core-types/package.json b/packages/ipfs-core-types/package.json index 882a303794..793cd61f69 100644 --- a/packages/ipfs-core-types/package.json +++ b/packages/ipfs-core-types/package.json @@ -49,7 +49,7 @@ "multiformats": "^9.4.1" }, "devDependencies": { - "aegir": "^35.1.0", + "aegir": "^35.1.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 index 62b41e08a5..bc03d87d00 100644 --- a/packages/ipfs-core-utils/package.json +++ b/packages/ipfs-core-utils/package.json @@ -113,7 +113,7 @@ "err-code": "^3.0.1", "ipfs-core-types": "^0.8.0", "ipfs-unixfs": "^6.0.3", - "ipfs-utils": "^9.0.1", + "ipfs-utils": "^9.0.2", "it-all": "^1.0.4", "it-map": "^1.0.4", "it-peekable": "^1.0.2", @@ -129,7 +129,7 @@ }, "devDependencies": { "@web-std/file": "^1.1.2", - "aegir": "^35.1.0", + "aegir": "^35.1.1", "rimraf": "^3.0.2" } } diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json index a0e72fc6bb..acd52d3193 100644 --- a/packages/ipfs-core/package.json +++ b/packages/ipfs-core/package.json @@ -92,7 +92,7 @@ "ipfs-unixfs": "^6.0.3", "ipfs-unixfs-exporter": "^7.0.3", "ipfs-unixfs-importer": "^9.0.3", - "ipfs-utils": "^9.0.1", + "ipfs-utils": "^9.0.2", "ipns": "^0.15.0", "is-domain-name": "^1.0.1", "is-ipfs": "^6.0.1", @@ -133,12 +133,12 @@ "@types/dlv": "^1.1.2", "@types/pako": "^1.0.2", "@types/rimraf": "^3.0.1", - "aegir": "^35.1.0", + "aegir": "^35.1.1", "delay": "^5.0.0", "go-ipfs": "0.9.1", "interface-blockstore-tests": "^2.0.1", "interface-ipfs-core": "^0.151.0", - "ipfsd-ctl": "^10.0.3", + "ipfsd-ctl": "^10.0.4", "iso-url": "^1.0.0", "libp2p-gossipsub": "^0.11.1", "nanoid": "^3.1.23", diff --git a/packages/ipfs-daemon/package.json b/packages/ipfs-daemon/package.json index 93a32323a1..e72f702291 100644 --- a/packages/ipfs-daemon/package.json +++ b/packages/ipfs-daemon/package.json @@ -50,13 +50,13 @@ "ipfs-grpc-server": "^0.7.0", "ipfs-http-gateway": "^0.7.0", "ipfs-http-server": "^0.8.0", - "ipfs-utils": "^9.0.1", + "ipfs-utils": "^9.0.2", "just-safe-set": "^2.2.1", "libp2p": "^0.33.0", - "libp2p-webrtc-star": "^0.23.0" + "libp2p-webrtc-star": "^0.24.0" }, "devDependencies": { - "aegir": "^35.1.0", + "aegir": "^35.1.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 index bb72376aa9..51cf221e72 100644 --- a/packages/ipfs-grpc-client/package.json +++ b/packages/ipfs-grpc-client/package.json @@ -68,7 +68,7 @@ "ws": "^7.3.1" }, "devDependencies": { - "aegir": "^35.1.0", + "aegir": "^35.1.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 index 943e0afbf6..a283d987e4 100644 --- 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.0", + "aegir": "^35.1.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 index 863fcadf86..c923951916 100644 --- 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.0", + "aegir": "^35.1.1", "ipfs-core": "^0.11.0", "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 index e0225515d6..d333436eb7 100644 --- a/packages/ipfs-http-client/package.json +++ b/packages/ipfs-http-client/package.json @@ -62,7 +62,7 @@ "err-code": "^3.0.1", "ipfs-core-types": "^0.8.0", "ipfs-core-utils": "^0.11.0", - "ipfs-utils": "^9.0.1", + "ipfs-utils": "^9.0.2", "it-first": "^1.0.6", "it-last": "^1.0.4", "merge-options": "^3.0.4", @@ -74,10 +74,10 @@ "uint8arrays": "^3.0.0" }, "devDependencies": { - "aegir": "^35.1.0", + "aegir": "^35.1.1", "delay": "^5.0.0", "go-ipfs": "0.9.1", - "ipfsd-ctl": "^10.0.3", + "ipfsd-ctl": "^10.0.4", "it-all": "^1.0.4", "it-first": "^1.0.4", "nock": "^13.0.2", diff --git a/packages/ipfs-http-gateway/package.json b/packages/ipfs-http-gateway/package.json index 62ba8250e5..e77e50eeb8 100644 --- a/packages/ipfs-http-gateway/package.json +++ b/packages/ipfs-http-gateway/package.json @@ -76,7 +76,7 @@ "devDependencies": { "@types/hapi-pino": "^8.0.1", "@types/hapi__hapi": "^20.0.5", - "aegir": "^35.1.0", + "aegir": "^35.1.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 index b84e41c51b..a357e766a2 100644 --- a/packages/ipfs-http-response/package.json +++ b/packages/ipfs-http-response/package.json @@ -71,16 +71,16 @@ "it-reader": "^3.0.0", "it-to-stream": "^1.0.0", "mime-types": "^2.1.30", - "multiformats": "^9.2.0", + "multiformats": "^9.4.1", "p-try-each": "^1.0.1" }, "devDependencies": { "@types/ejs": "^3.1.0", - "aegir": "^35.0.3", + "aegir": "^35.1.1", "get-stream": "^6.0.0", - "ipfs-core": "^0.10.5", - "ipfsd-ctl": "^10.0.1", - "it-all": "^1.0.5", + "ipfs-core": "^0.11.0", + "ipfsd-ctl": "^10.0.4", + "it-all": "^1.0.4", "path": "^0.12.7", "uint8arrays": "^3.0.0", "util": "^0.12.3" diff --git a/packages/ipfs-http-server/package.json b/packages/ipfs-http-server/package.json index bdc68cf573..295ee53c0a 100644 --- a/packages/ipfs-http-server/package.json +++ b/packages/ipfs-http-server/package.json @@ -82,7 +82,7 @@ "devDependencies": { "@types/hapi-pino": "^8.0.1", "@types/hapi__hapi": "^20.0.5", - "aegir": "^35.1.0", + "aegir": "^35.1.1", "form-data": "^4.0.0", "ipfs-http-client": "^53.0.0", "iso-random-stream": "^2.0.0", diff --git a/packages/ipfs-message-port-client/package.json b/packages/ipfs-message-port-client/package.json index c062bfb548..97b7d33742 100644 --- a/packages/ipfs-message-port-client/package.json +++ b/packages/ipfs-message-port-client/package.json @@ -52,7 +52,7 @@ "multiformats": "^9.4.1" }, "devDependencies": { - "aegir": "^35.1.0", + "aegir": "^35.1.1", "interface-ipfs-core": "^0.151.0", "ipfs-core": "^0.11.0", "ipfs-message-port-server": "^0.10.0", diff --git a/packages/ipfs-message-port-protocol/package.json b/packages/ipfs-message-port-protocol/package.json index 24e8be09c2..6eb950f261 100644 --- a/packages/ipfs-message-port-protocol/package.json +++ b/packages/ipfs-message-port-protocol/package.json @@ -77,7 +77,7 @@ "multiformats": "^9.4.1" }, "devDependencies": { - "aegir": "^35.1.0", + "aegir": "^35.1.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 index cac40131e7..e3caee31ea 100644 --- a/packages/ipfs-message-port-server/package.json +++ b/packages/ipfs-message-port-server/package.json @@ -73,7 +73,7 @@ "multiformats": "^9.4.1" }, "devDependencies": { - "aegir": "^35.1.0", + "aegir": "^35.1.1", "rimraf": "^3.0.2" }, "engines": { diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json index 8f3770ea52..ae311d995e 100644 --- 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.0", + "aegir": "^35.1.1", "assert": "^2.0.0", "copyfiles": "^2.4.1", "cross-env": "^7.0.0", @@ -89,11 +89,11 @@ "ipfs-client": "^0.7.0", "ipfs-core-types": "^0.8.0", "ipfs-http-client": "^53.0.0", - "ipfs-interop": "^7.0.0", - "ipfs-utils": "^9.0.1", - "ipfsd-ctl": "^10.0.3", + "ipfs-interop": "^7.0.1", + "ipfs-utils": "^9.0.2", + "ipfsd-ctl": "^10.0.4", "iso-url": "^1.0.0", - "libp2p-webrtc-star": "^0.23.0", + "libp2p-webrtc-star": "^0.24.0", "merge-options": "^3.0.4", "mock-ipfs-pinning-service": "^0.1.2", "npm-run-all": "^4.1.5", From 7d94403dbc09a1c66aef58d28bc34aaf25f755cd Mon Sep 17 00:00:00 2001 From: achingbrain Date: Tue, 28 Sep 2021 12:34:37 +0100 Subject: [PATCH 2/2] chore: add sig serv dep --- packages/ipfs-core/src/version.js | 4 ++-- packages/ipfs-http-server/src/version.js | 2 +- packages/ipfs/.aegir.cjs | 2 +- packages/ipfs/package.json | 2 +- packages/ipfs/src/package.js | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/ipfs-core/src/version.js b/packages/ipfs-core/src/version.js index 62821f0305..b28eab778b 100644 --- a/packages/ipfs-core/src/version.js +++ b/packages/ipfs-core/src/version.js @@ -1,4 +1,4 @@ -export const ipfsCore = '0.10.8' +export const ipfsCore = '0.11.0' export const commit = '' -export const interfaceIpfsCore = '^0.150.4' +export const interfaceIpfsCore = '^0.151.0' diff --git a/packages/ipfs-http-server/src/version.js b/packages/ipfs-http-server/src/version.js index 720832aa3d..83b92fdd3f 100644 --- a/packages/ipfs-http-server/src/version.js +++ b/packages/ipfs-http-server/src/version.js @@ -1,2 +1,2 @@ -export const ipfsHttpClient = '^52.0.5' +export const ipfsHttpClient = '^53.0.0' diff --git a/packages/ipfs/.aegir.cjs b/packages/ipfs/.aegir.cjs index 638e6b29d9..c6cb492d46 100644 --- a/packages/ipfs/.aegir.cjs +++ b/packages/ipfs/.aegir.cjs @@ -3,7 +3,7 @@ const getPort = require('aegir/utils/get-port') const { createServer } = require('ipfsd-ctl') const EchoServer = require('aegir/utils/echo-server') -const webRTCStarSigServer = require('libp2p-webrtc-star/src/sig-server') +const webRTCStarSigServer = require('libp2p-webrtc-star-signalling-server') const path = require('path') /** @type {import('aegir').Options["build"]["config"]} */ diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json index ae311d995e..252846fecd 100644 --- a/packages/ipfs/package.json +++ b/packages/ipfs/package.json @@ -93,7 +93,7 @@ "ipfs-utils": "^9.0.2", "ipfsd-ctl": "^10.0.4", "iso-url": "^1.0.0", - "libp2p-webrtc-star": "^0.24.0", + "libp2p-webrtc-star-signalling-server": "^0.1.0", "merge-options": "^3.0.4", "mock-ipfs-pinning-service": "^0.1.2", "npm-run-all": "^4.1.5", diff --git a/packages/ipfs/src/package.js b/packages/ipfs/src/package.js index 9a3d68dda5..6f97ffa204 100644 --- a/packages/ipfs/src/package.js +++ b/packages/ipfs/src/package.js @@ -1,4 +1,4 @@ export const name = 'ipfs' -export const version = '0.58.6' +export const version = '0.59.0' export const node = '>=14.0.0'