From 59b57fbb8f42adb018a36c00c6caaffed4aa210b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Aug 2023 11:09:34 +0000 Subject: [PATCH 1/3] deps: bump helia from 1.3.12 to 2.0.1 Bumps [helia](https://github.com/ipfs/helia) from 1.3.12 to 2.0.1. - [Release notes](https://github.com/ipfs/helia/releases) - [Changelog](https://github.com/ipfs/helia/blob/main/CHANGELOG.md) - [Commits](https://github.com/ipfs/helia/compare/helia-v1.3.12...helia-v2.0.1) --- updated-dependencies: - dependency-name: helia dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- packages/interop/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/interop/package.json b/packages/interop/package.json index c41403c..85cea8d 100644 --- a/packages/interop/package.json +++ b/packages/interop/package.json @@ -45,7 +45,7 @@ "dependencies": { "@helia/routing-v1-http-api-client": "^1.0.0", "@helia/routing-v1-http-api-server": "^1.0.0", - "helia": "^1.2.0" + "helia": "^2.0.1" }, "devDependencies": { "@helia/interface": "^1.1.1", From 5379b6933610e88980a7b93bc84757c2a0db4615 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Thu, 14 Sep 2023 13:20:23 +0100 Subject: [PATCH 2/3] chore: update linting and imports --- packages/client/package.json | 11 +++++------ packages/client/src/client.ts | 6 +++--- packages/client/src/index.ts | 4 ++-- packages/interop/package.json | 10 +++++----- packages/interop/test/fixtures/create-helia.ts | 2 +- packages/interop/test/index.spec.ts | 2 +- packages/server/package.json | 11 +++++------ .../server/src/routes/routing/v1/providers/get.ts | 2 +- packages/server/test/index.spec.ts | 2 +- 9 files changed, 24 insertions(+), 26 deletions(-) diff --git a/packages/client/package.json b/packages/client/package.json index 5ae6a4a..74dc79d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -129,21 +129,20 @@ "release": "aegir release" }, "dependencies": { - "@libp2p/interface-peer-info": "^1.0.10", - "@libp2p/interfaces": "^3.3.2", - "@libp2p/logger": "^2.1.0", - "@libp2p/peer-id": "^2.0.3", + "@libp2p/interface": "^0.1.2", + "@libp2p/logger": "^3.0.2", + "@libp2p/peer-id": "^3.0.2", "@multiformats/multiaddr": "^12.1.3", "any-signal": "^4.1.1", "browser-readablestream-to-it": "^2.0.3", "it-all": "^3.0.2", "iterable-ndjson": "^1.1.0", - "multiformats": "^11.0.2", + "multiformats": "^12.1.1", "p-defer": "^4.0.0", "p-queue": "^7.3.4" }, "devDependencies": { - "@libp2p/peer-id-factory": "^2.0.3", + "@libp2p/peer-id-factory": "^3.0.3", "aegir": "^40.0.8", "body-parser": "^1.20.2" } diff --git a/packages/client/src/client.ts b/packages/client/src/client.ts index e634227..6a3c7a9 100644 --- a/packages/client/src/client.ts +++ b/packages/client/src/client.ts @@ -1,4 +1,4 @@ -import { CodeError } from '@libp2p/interfaces/errors' +import { CodeError } from '@libp2p/interface/errors' import { logger } from '@libp2p/logger' import { peerIdFromString } from '@libp2p/peer-id' import { multiaddr } from '@multiformats/multiaddr' @@ -9,8 +9,8 @@ import ndjson from 'iterable-ndjson' import defer from 'p-defer' import PQueue from 'p-queue' import type { RoutingV1HttpApiClient, RoutingV1HttpApiClientInit } from './index.js' -import type { PeerInfo } from '@libp2p/interface-peer-info' -import type { AbortOptions } from '@libp2p/interfaces' +import type { AbortOptions } from '@libp2p/interface' +import type { PeerInfo } from '@libp2p/interface/peer-info' import type { Multiaddr } from '@multiformats/multiaddr' import type { CID } from 'multiformats' diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts index 9290419..6a77595 100644 --- a/packages/client/src/index.ts +++ b/packages/client/src/index.ts @@ -18,8 +18,8 @@ */ import { DefaultRoutingV1HttpApiClient } from './client.js' -import type { PeerInfo } from '@libp2p/interface-peer-info' -import type { AbortOptions } from '@libp2p/interfaces' +import type { AbortOptions } from '@libp2p/interface' +import type { PeerInfo } from '@libp2p/interface/peer-info' import type { CID } from 'multiformats/cid' export interface RoutingV1HttpApiClientInit { diff --git a/packages/interop/package.json b/packages/interop/package.json index 85cea8d..f811c21 100644 --- a/packages/interop/package.json +++ b/packages/interop/package.json @@ -48,13 +48,13 @@ "helia": "^2.0.1" }, "devDependencies": { - "@helia/interface": "^1.1.1", - "@libp2p/interface-libp2p": "^3.2.0", - "@libp2p/kad-dht": "^9.3.6", + "@helia/interface": "^2.0.0", + "@libp2p/interface": "^0.1.2", + "@libp2p/kad-dht": "^10.0.6", "aegir": "^40.0.8", "fastify": "^4.17.0", - "libp2p": "^0.45.4", - "multiformats": "^11.0.2" + "libp2p": "^0.46.10", + "multiformats": "^12.1.1" }, "private": true } diff --git a/packages/interop/test/fixtures/create-helia.ts b/packages/interop/test/fixtures/create-helia.ts index 17e5991..88e322b 100644 --- a/packages/interop/test/fixtures/create-helia.ts +++ b/packages/interop/test/fixtures/create-helia.ts @@ -2,7 +2,7 @@ import { kadDHT } from '@libp2p/kad-dht' import { createHelia as createNode, type HeliaInit } from 'helia' import { identifyService } from 'libp2p/identify' import type { Helia } from '@helia/interface' -import type { Libp2p } from '@libp2p/interface-libp2p' +import type { Libp2p } from '@libp2p/interface' import type { KadDHT } from '@libp2p/kad-dht' export async function createHelia (init?: Partial): Promise>> { diff --git a/packages/interop/test/index.spec.ts b/packages/interop/test/index.spec.ts index 08ce4ba..9000fbb 100644 --- a/packages/interop/test/index.spec.ts +++ b/packages/interop/test/index.spec.ts @@ -9,7 +9,7 @@ import { sha256 } from 'multiformats/hashes/sha2' import { createHelia } from './fixtures/create-helia.js' import type { Helia } from '@helia/interface' import type { RoutingV1HttpApiClient } from '@helia/routing-v1-http-api-client' -import type { Libp2p } from '@libp2p/interface-libp2p' +import type { Libp2p } from '@libp2p/interface' import type { KadDHT } from '@libp2p/kad-dht' import type { FastifyInstance } from 'fastify' diff --git a/packages/server/package.json b/packages/server/package.json index 5b0095d..a38bdf4 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -150,18 +150,17 @@ }, "dependencies": { "@fastify/cors": "^8.3.0", - "@helia/interface": "^1.1.1", - "@libp2p/interfaces": "^3.3.2", + "@helia/interface": "^2.0.0", + "@libp2p/interface": "^0.1.2", "fastify": "^4.17.0", - "multiformats": "^11.0.2" + "multiformats": "^12.1.1" }, "devDependencies": { - "@libp2p/interface-peer-info": "^1.0.10", - "@libp2p/peer-id-factory": "^2.0.3", + "@libp2p/peer-id-factory": "^3.0.3", "@multiformats/multiaddr": "^12.1.3", "@types/sinon": "^10.0.15", "aegir": "^40.0.8", - "sinon": "^15.1.0", + "sinon": "^16.0.0", "sinon-ts": "^1.0.0" } } diff --git a/packages/server/src/routes/routing/v1/providers/get.ts b/packages/server/src/routes/routing/v1/providers/get.ts index 0fac7b4..4d9e6f3 100644 --- a/packages/server/src/routes/routing/v1/providers/get.ts +++ b/packages/server/src/routes/routing/v1/providers/get.ts @@ -1,7 +1,7 @@ import { PassThrough } from 'node:stream' import { CID } from 'multiformats/cid' import type { Helia } from '@helia/interface' -import type { AbortOptions } from '@libp2p/interfaces' +import type { AbortOptions } from '@libp2p/interface' import type { FastifyInstance } from 'fastify' interface Params { diff --git a/packages/server/test/index.spec.ts b/packages/server/test/index.spec.ts index 57056ae..652eb13 100644 --- a/packages/server/test/index.spec.ts +++ b/packages/server/test/index.spec.ts @@ -6,7 +6,7 @@ import { expect } from 'aegir/chai' import { stubInterface } from 'sinon-ts' import { createRoutingV1HttpApiServer } from '../src/index.js' import type { Helia } from '@helia/interface' -import type { PeerInfo } from '@libp2p/interface-peer-info' +import type { PeerInfo } from '@libp2p/interface/peer-info' import type { FastifyInstance } from 'fastify' import type { StubbedInstance } from 'sinon-ts' From bdfe4ba2b52effbc76d215fbabd909b43ceb1b97 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Thu, 14 Sep 2023 13:21:38 +0100 Subject: [PATCH 3/3] chore: fix docs --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f105263..0d5f91f 100644 --- a/package.json +++ b/package.json @@ -29,8 +29,8 @@ "generate": "aegir run generate", "build": "aegir run build", "lint": "aegir run lint", - "docs": "NODE_OPTIONS=--max_old_space_size=4096 aegir docs -- --exclude packages/interop", - "docs:no-publish": "npm run docs -- --publish false", + "docs": "NODE_OPTIONS=--max_old_space_size=8192 aegir docs -- --exclude packages/interop", + "docs:no-publish": "NODE_OPTIONS=--max_old_space_size=8192 aegir docs --publish false -- --exclude packages/interop", "dep-check": "aegir run dep-check", "release": "npm run docs:no-publish && aegir run release && npm run docs -- --exclude packages/interop" },