diff --git a/package.json b/package.json index f34c41d..a34dcec 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "docs:no-publish": "aegir docs --publish false" }, "devDependencies": { - "aegir": "^45.0.1", + "aegir": "^46.0.0", "npm-run-all": "^4.1.5", "patch-package": "^8.0.0", "rimraf": "^6.0.1" diff --git a/packages/client/package.json b/packages/client/package.json index 104d7e1..167a645 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -155,7 +155,7 @@ }, "devDependencies": { "@libp2p/crypto": "^5.0.1", - "aegir": "^45.0.1", + "aegir": "^46.0.0", "body-parser": "^1.20.3", "it-all": "^3.0.6", "wherearewe": "^2.0.1" diff --git a/packages/client/src/client.ts b/packages/client/src/client.ts index 682fc0d..763a186 100644 --- a/packages/client/src/client.ts +++ b/packages/client/src/client.ts @@ -4,7 +4,7 @@ import { peerIdFromString } from '@libp2p/peer-id' import { multiaddr } from '@multiformats/multiaddr' import { anySignal } from 'any-signal' import toIt from 'browser-readablestream-to-it' -import { unmarshalIPNSRecord, type IPNSRecord, marshalIPNSRecord, multihashToIPNSRoutingKey } from 'ipns' +import { unmarshalIPNSRecord, marshalIPNSRecord, multihashToIPNSRoutingKey } from 'ipns' import { ipnsValidator } from 'ipns/validator' import { parse as ndjson } from 'it-ndjson' import defer from 'p-defer' @@ -14,6 +14,7 @@ import { DelegatedRoutingV1HttpApiClientContentRouting, DelegatedRoutingV1HttpAp import type { DelegatedRoutingV1HttpApiClient, DelegatedRoutingV1HttpApiClientInit, GetProvidersOptions, GetPeersOptions, GetIPNSOptions, PeerRecord } from './index.js' import type { ContentRouting, PeerRouting, AbortOptions, PeerId } from '@libp2p/interface' import type { Multiaddr } from '@multiformats/multiaddr' +import type { IPNSRecord } from 'ipns' import type { CID } from 'multiformats' const log = logger('delegated-routing-v1-http-api-client') diff --git a/packages/client/src/routings.ts b/packages/client/src/routings.ts index 1770ea7..b80540f 100644 --- a/packages/client/src/routings.ts +++ b/packages/client/src/routings.ts @@ -1,4 +1,4 @@ -import { type ContentRouting, type PeerRouting, type AbortOptions, type PeerId, type PeerInfo, NotFoundError } from '@libp2p/interface' +import { NotFoundError } from '@libp2p/interface' import { marshalIPNSRecord, multihashFromIPNSRoutingKey, unmarshalIPNSRecord } from 'ipns' import first from 'it-first' import map from 'it-map' @@ -6,6 +6,7 @@ import { CID } from 'multiformats/cid' import { equals as uint8ArrayEquals } from 'uint8arrays/equals' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import type { DelegatedRoutingV1HttpApiClient } from './index.js' +import type { ContentRouting, PeerRouting, AbortOptions, PeerId, PeerInfo } from '@libp2p/interface' const IPNS_PREFIX = uint8ArrayFromString('/ipns/') diff --git a/packages/client/test/index.spec.ts b/packages/client/test/index.spec.ts index cae1397..27bd5ce 100644 --- a/packages/client/test/index.spec.ts +++ b/packages/client/test/index.spec.ts @@ -8,8 +8,9 @@ import { expect } from 'aegir/chai' import { createIPNSRecord, marshalIPNSRecord } from 'ipns' import all from 'it-all' import { CID } from 'multiformats/cid' -import { createDelegatedRoutingV1HttpApiClient, type DelegatedRoutingV1HttpApiClient } from '../src/index.js' +import { createDelegatedRoutingV1HttpApiClient } from '../src/index.js' import { itBrowser } from './fixtures/it.js' +import type { DelegatedRoutingV1HttpApiClient } from '../src/index.js' if (process.env.ECHO_SERVER == null) { throw new Error('Echo server not configured correctly') diff --git a/packages/client/test/routings.spec.ts b/packages/client/test/routings.spec.ts index 4821e30..1cedfc6 100644 --- a/packages/client/test/routings.spec.ts +++ b/packages/client/test/routings.spec.ts @@ -10,7 +10,8 @@ import all from 'it-all' import { CID } from 'multiformats/cid' import { concat as uint8ArrayConcat } from 'uint8arrays/concat' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { createDelegatedRoutingV1HttpApiClient, type DelegatedRoutingV1HttpApiClient } from '../src/index.js' +import { createDelegatedRoutingV1HttpApiClient } from '../src/index.js' +import type { DelegatedRoutingV1HttpApiClient } from '../src/index.js' import type { PeerRouting, ContentRouting } from '@libp2p/interface' const serverUrl = process.env.ECHO_SERVER diff --git a/packages/interop/package.json b/packages/interop/package.json index 3948ea8..39f8667 100644 --- a/packages/interop/package.json +++ b/packages/interop/package.json @@ -123,7 +123,7 @@ "@libp2p/identify": "^3.0.1", "@libp2p/interface": "^2.0.1", "@libp2p/kad-dht": "^14.0.1", - "aegir": "^45.0.1", + "aegir": "^46.0.0", "fastify": "^5.0.0", "helia": "^5.1.0", "ipns": "^10.0.0", diff --git a/packages/interop/test/fixtures/create-helia.ts b/packages/interop/test/fixtures/create-helia.ts index 7a4460c..04d9bc2 100644 --- a/packages/interop/test/fixtures/create-helia.ts +++ b/packages/interop/test/fixtures/create-helia.ts @@ -1,9 +1,11 @@ import { identify } from '@libp2p/identify' -import { kadDHT, removePublicAddressesMapper, type KadDHT } from '@libp2p/kad-dht' -import { createHelia as createNode, type HeliaInit, type HeliaLibp2p } from 'helia' +import { kadDHT, removePublicAddressesMapper } from '@libp2p/kad-dht' +import { createHelia as createNode } from 'helia' import { ipnsSelector } from 'ipns/selector' import { ipnsValidator } from 'ipns/validator' import type { Libp2p } from '@libp2p/interface' +import type { KadDHT } from '@libp2p/kad-dht' +import type { HeliaInit, HeliaLibp2p } from 'helia' export async function createHelia (init?: Partial): Promise>> { const helia = await createNode({ diff --git a/packages/server/package.json b/packages/server/package.json index da0b131..0763acb 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -167,7 +167,7 @@ "@libp2p/crypto": "^5.0.1", "@multiformats/multiaddr": "^12.3.1", "@types/sinon": "^17.0.3", - "aegir": "^45.0.1", + "aegir": "^46.0.0", "sinon": "^19.0.2", "sinon-ts": "^2.0.0" } diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index 54fcddc..af62f03 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -52,12 +52,10 @@ */ import cors from '@fastify/cors' -import fastify, { - type FastifyListenOptions, - type FastifyInstance -} from 'fastify' +import fastify from 'fastify' import routes from './routes/index.js' import type { Helia } from '@helia/interface' +import type { FastifyListenOptions, FastifyInstance } from 'fastify' export interface ServerInit { fastify?: FastifyInstance