diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 290ad02..0bc3b42 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,3 +6,6 @@ updates: interval: daily time: "10:00" open-pull-requests-limit: 10 + commit-message: + prefix: "deps" + prefix-development: "deps(dev)" diff --git a/README.md b/README.md index 9659a88..54884a9 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ - [Requirements](#requirements) - [Example](#example) - [License](#license) -- [Contribution](#contribution) +- [Contribute](#contribute) ## Install @@ -64,6 +64,6 @@ Licensed under either of - Apache 2.0, ([LICENSE-APACHE](LICENSE-APACHE) / ) - MIT ([LICENSE-MIT](LICENSE-MIT) / ) -## Contribution +## Contribute Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions. diff --git a/package.json b/package.json index bf6df47..360674d 100644 --- a/package.json +++ b/package.json @@ -62,15 +62,15 @@ "release": "patch" }, { - "type": "chore", + "type": "docs", "release": "patch" }, { - "type": "docs", + "type": "test", "release": "patch" }, { - "type": "test", + "type": "deps", "release": "patch" }, { @@ -100,7 +100,11 @@ }, { "type": "docs", - "section": "Trivial Changes" + "section": "Documentation" + }, + { + "type": "deps", + "section": "Dependencies" }, { "type": "test", @@ -136,7 +140,6 @@ "@libp2p/interface-peer-info": "^1.0.1", "@libp2p/interfaces": "^3.0.2", "@libp2p/logger": "^2.0.0", - "@multiformats/multiaddr": "^10.1.7", "any-signal": "^3.0.1", "err-code": "^3.0.1", "it-drain": "^1.0.5", @@ -145,14 +148,14 @@ }, "devDependencies": { "aegir": "^37.2.0", - "go-ipfs": "^0.13.0", - "ipfs-core-types": "^0.11.0", - "ipfs-http-client": "^57.0.1", - "ipfsd-ctl": "^11.0.0", + "go-ipfs": "^0.15.0", + "ipfs-core-types": "^0.12.0", + "ipfs-http-client": "^58.0.0", + "ipfsd-ctl": "^12.0.2", "it-all": "^1.0.6", "it-drain": "^1.0.5", "uint8arrays": "^3.0.0", - "wherearewe": "^1.0.0" + "wherearewe": "^2.0.1" }, "browser": { "go-ipfs": false diff --git a/src/index.ts b/src/index.ts index c79c6bf..e69c634 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,7 +2,6 @@ import { logger } from '@libp2p/logger' import drain from 'it-drain' import PQueue from 'p-queue' import defer from 'p-defer' -import { multiaddr } from '@multiformats/multiaddr' import errCode from 'err-code' import anySignal from 'any-signal' import type { IPFSHTTPClient, CID, HTTPClientExtraOptions } from 'ipfs-http-client' @@ -102,8 +101,7 @@ export class DelegatedContentRouting implements ContentRouting, Startable { const peerInfo: PeerInfo = { id: prov.id, protocols: [], - // @ts-expect-error ipfs-core-types need updating - multiaddrs: prov.multiaddrs.map(m => multiaddr(m.toString())) + multiaddrs: prov.multiaddrs } return peerInfo diff --git a/test/index.spec.ts b/test/index.spec.ts index f518d4d..0f8cd23 100644 --- a/test/index.spec.ts +++ b/test/index.spec.ts @@ -5,7 +5,7 @@ import { Controller, createFactory } from 'ipfsd-ctl' import { create, CID } from 'ipfs-http-client' import all from 'it-all' import drain from 'it-drain' -import { isNode } from 'wherearewe' +import { isElectronMain, isNode } from 'wherearewe' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { DelegatedContentRouting } from '../src/index.js' // @ts-expect-error no types @@ -18,7 +18,7 @@ import type { PeerInfo } from '@libp2p/interface-peer-info' const factory = createFactory({ type: 'go', ipfsHttpModule: { create }, - ipfsBin: isNode ? goIpfs.path() : undefined, + ipfsBin: isNode || isElectronMain ? goIpfs.path() : undefined, test: true, endpoint: 'http://localhost:57483' })