Skip to content
This repository has been archived by the owner on Feb 12, 2024. It is now read-only.

deps!: update to [email protected] #4151

Merged
merged 32 commits into from
Aug 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
2c6cad6
feat: update to [email protected]
achingbrain Jun 29, 2022
cb468e4
chore: fix node types
achingbrain Jun 29, 2022
7cce5b4
chore: update metrics endpoint
achingbrain Jul 5, 2022
877b40b
chore: fix unit tests
achingbrain Aug 14, 2022
e08d037
chore: ignre interfaces dep
achingbrain Aug 15, 2022
f7d2c3d
chore: formatting
achingbrain Aug 15, 2022
478c939
chore: remove redunant code
achingbrain Aug 15, 2022
eec9cdf
chore: fix libp2p version
achingbrain Aug 15, 2022
5dc35c2
chore: deps
achingbrain Aug 15, 2022
18c8e05
chore: deps
achingbrain Aug 15, 2022
574e10a
chore: deps
achingbrain Aug 15, 2022
cbba70c
chore: deps
achingbrain Aug 15, 2022
5dd3858
chore: browsers are slow
achingbrain Aug 15, 2022
4c96843
chore: increase streams
achingbrain Aug 15, 2022
55d6864
chore: update bitswap
achingbrain Aug 15, 2022
6cf3bc5
chore: update deps
achingbrain Aug 17, 2022
ed9a571
chore: small change
achingbrain Aug 17, 2022
ac6a6d3
chore: small change
achingbrain Aug 17, 2022
c83f82f
chore: small change
achingbrain Aug 17, 2022
95d28b0
chore: small change
achingbrain Aug 17, 2022
477341d
chore: small change
achingbrain Aug 17, 2022
2213af8
chore: small change
achingbrain Aug 17, 2022
e2630ad
chore: small change
achingbrain Aug 17, 2022
c9cf8b8
chore: small change
achingbrain Aug 17, 2022
0997538
chore: deps
achingbrain Aug 17, 2022
82bb800
chore: deps again
achingbrain Aug 17, 2022
8268746
chore: deps
achingbrain Aug 17, 2022
fe498ea
chore: update project config
achingbrain Aug 17, 2022
7239eb0
chore: update config
achingbrain Aug 17, 2022
191a594
Merge remote-tracking branch 'origin/master' into feat/update-libp2p-…
achingbrain Aug 17, 2022
fe98678
chore: fix config
achingbrain Aug 17, 2022
75dd0e2
chore: update libp2p version
achingbrain Aug 17, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@ updates:
directory: "/"
schedule:
interval: daily
time: "11:00"
time: "10:00"
open-pull-requests-limit: 10
commit-message:
prefix: "deps"
prefix-development: "deps(dev)"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ tsconfig-types.aegir.json

# Coverage directory used by tools like istanbul
coverage
.coverage
.nyc_output
tests_output
cache
Expand Down
4 changes: 4 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
This project is dual licensed under MIT and Apache-2.0.

MIT: https://www.opensource.org/licenses/mit
Apache-2.0: https://www.apache.org/licenses/license-2.0
2 changes: 1 addition & 1 deletion LICENSE-MIT
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE.
4 changes: 2 additions & 2 deletions docs/MIGRATION-TO-ASYNC-AWAIT.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const peerId = PeerId.createFromB58String(peerIdStr)
You can get hold of the `PeerId` class using npm or in a script tag:

```js
import { PeerId } from '@libp2p/interfaces/peer-id'
import { PeerId } from '@libp2p/interface-peer-id'
const peerId = PeerId.createFromB58String(peerIdStr)
```

Expand Down Expand Up @@ -128,7 +128,7 @@ You can get hold of the `PeerInfo` class using npm or in a script tag:

```js
const PeerInfo = require('peer-info')
import { PeerId } from '@libp2p/interfaces/peer-id'
import { PeerId } from '@libp2p/interface-peer-id'
const peerInfo = new PeerInfo(PeerId.createFromB58String(info.id))
info.addrs.forEach(addr => peerInfo.multiaddrs.add(addr))
```
Expand Down
2 changes: 1 addition & 1 deletion docs/MODULE.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Instead of a boolean, you may provide an object with custom initialization optio
- `privateKey` (string/PeerId) A pre-generated private key to use. Can be either a base64 string or a [PeerId](https://github.com/libp2p/js-peer-id) instance. **NOTE: This overrides `bits`.**
```js
// Generating a Peer ID:
import { PeerId } from '@libp2p/interfaces/peer-id'
import { PeerId } from '@libp2p/interface-peer-id'
// Generates a new Peer ID, complete with public/private keypair
// See https://github.com/libp2p/js-peer-id
const peerId = await PeerId.create({ bits: 2048 })
Expand Down
4 changes: 1 addition & 3 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"version": "independent",
"packages": [
"packages/*"
],
"useWorkspaces": true,
"command": {
"bootstrap": {
"hoist": true
Expand Down
275 changes: 20 additions & 255 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@
"name": "js-ipfs",
"version": "1.0.0",
"description": "JavaScript implementation of the IPFS specification",
"license": "Apache-2.0 OR MIT",
"homepage": "https://github.com/ipfs/js-ipfs#readme",
"repository": {
"type": "git",
"url": "git+https://github.com/ipfs/js-ipfs.git"
},
"bugs": {
"url": "https://github.com/ipfs/js-ipfs/issues"
},
"engines": {
"node": ">=16.0.0",
"npm": ">=7.0.0"
},
"private": true,
"scripts": {
"link": "lerna link",
"reset": "lerna run clean && rimraf packages/*/node_modules node_modules package-lock.json packages/*/package-lock.json",
Expand Down Expand Up @@ -44,268 +58,19 @@
"docker:rc:push-next": "docker push ipfs/js-ipfs:next",
"docker:rc:push-rc": "docker push ipfs/js-ipfs:v`npm show ipfs@next version -q`"
},
"eslintConfig": {
"extends": "ipfs",
"ignorePatterns": [
"!.aegir.js"
]
},
"devDependencies": {
"lerna": "^4.0.0",
"lerna": "^5.0.0",
"node-fetch": "npm:@achingbrain/node-fetch@^2.6.4",
"npm-run-all": "^4.1.5",
"rimraf": "^3.0.2"
},
"repository": {
"type": "git",
"url": "git+https://github.com/ipfs/js-ipfs.git"
"eslintConfig": {
"extends": "ipfs",
"ignorePatterns": [
"!.aegir.js"
]
},
"private": true,
"workspaces": [
"packages/*"
],
"engines": {
"npm": ">=7.0.0"
},
"contributors": [
"David Dias <[email protected]>",
"achingbrain <[email protected]>",
"Alan Shaw <[email protected]>",
"Friedel Ziegelmayer <[email protected]>",
"Juan Batiz-Benet <[email protected]>",
"Vasco Santos <[email protected]>",
"Hugo Dias <[email protected]>",
"Henrique Dias <[email protected]>",
"Volker Mische <[email protected]>",
"ᴠɪᴄᴛᴏʀ ʙᴊᴇʟᴋʜᴏʟᴍ <[email protected]>",
"Marcin Rataj <[email protected]>",
"Stephen Whitmore <[email protected]>",
"Jacob Heun <[email protected]>",
"Francisco Baio Dias <[email protected]>",
"Matt Bell <[email protected]>",
"Richard Schneider <[email protected]>",
"Pedro Teixeira <[email protected]>",
"Travis Person <[email protected]>",
"Kristoffer Ström <[email protected]>",
"Dmitriy Ryajov <[email protected]>",
"Irakli Gozalishvili <[email protected]>",
"Oli Evans <[email protected]>",
"nginnever <[email protected]>",
"Richard Littauer <[email protected]>",
"dirkmc <[email protected]>",
"Diogo Silva <[email protected]>",
"Pedro Santos <[email protected]>",
"Connor Keenan <[email protected]>",
"kumavis <[email protected]>",
"Harlan T Wood <[email protected]>",
"Nitin Patel <[email protected]>",
"Pascal Precht <[email protected]>",
"Andrew Nesbitt <[email protected]>",
"Hector Sanjuan <[email protected]>",
"Maciej Krüger <[email protected]>",
"Michael Garvin <[email protected]>",
"Steven Allen <[email protected]>",
"Michael Muré <[email protected]>",
"Łukasz Magiera <[email protected]>",
"João Antunes <[email protected]>",
"Enrico Marino <[email protected]>",
"Teri Chadbourne <[email protected]>",
"Christian Couder <[email protected]>",
"Rob Brackett <[email protected]>",
"Prabhakar Poudel <[email protected]>",
"Mithgol <[email protected]>",
"Haad <[email protected]>",
"Jonathan <[email protected]>",
"Xmader <[email protected]>",
"Sangwon Hong <[email protected]>",
"Joonas Koivunen <[email protected]>",
"Gavin McDermott <[email protected]>",
"Mikeal Rogers <[email protected]>",
"Dzmitry Das <[email protected]>",
"Rod Vagg <[email protected]>",
"Andrew de Andrade <[email protected]>",
"Matt Ober <[email protected]>",
"Максим Ильин <[email protected]>",
"Ryan Bell <[email protected]>",
"Alex Mingoia <[email protected]>",
"RasmusErik Voel Jensen <[email protected]>",
"Marius Darila <[email protected]>",
"Yahya <[email protected]>",
"anders <[email protected]>",
"bluelovers <[email protected]>",
"Paulo Rodrigues <[email protected]>",
"haad <[email protected]>",
"Jeromy <[email protected]>",
"0xflotus <[email protected]>",
"Andrey <[email protected]>",
"André Cruz <[email protected]>",
"Antonio Tenorio-Fornés <[email protected]>",
"Dan Ordille <[email protected]>",
"Dan Shields <[email protected]>",
"David Gilbertson <[email protected]>",
"Doug A <[email protected]>",
"Georgios Rassias <[email protected]>",
"Gorka Ludlow <[email protected]>",
"Jeff Downie <[email protected]>",
"Jim Pick <[email protected]>",
"Jonybang <[email protected]>",
"Kevin Simper <[email protected]>",
"Kevin Wang <[email protected]>",
"Ludwig <[email protected]>",
"Mark Robert Henderson <[email protected]>",
"Maxime Lathuilière <[email protected]>",
"Molly <[email protected]>",
"Nuno Nogueira <[email protected]>",
"Portia Burton <[email protected]>",
"Raoul Millais <[email protected]>",
"Sid Harder <[email protected]>",
"Vu Tien Khang <[email protected]>",
"reasv <[email protected]>",
"samuli <[email protected]>",
"shunkin <[email protected]>",
"tcme <[email protected]>",
"seungwon-kang <[email protected]>",
"Arpit Agarwal <[email protected]>",
"Jason Papakostas <[email protected]>",
"Ilya Kreymer <[email protected]>",
"Julien Malard <[email protected]>",
"phillmac <[email protected]>",
"Holodisc <[email protected]>",
"Lars Gierth <[email protected]>",
"priecint <[email protected]>",
"Lukas Drgon <[email protected]>",
"Heo Sangmin <[email protected]>",
"Manuel Spagnolo <[email protected]>",
"Henry Rodrick <[email protected]>",
"Marcus Bernales <[email protected]>",
"Harsh Vakharia <[email protected]>",
"Alen Siljak <[email protected]>",
"Mat Kelly <[email protected]>",
"Haoliang Yu <[email protected]>",
"Hannah Howard <[email protected]>",
"Matt Zumwalt <[email protected]>",
"robbsolter <[email protected]>",
"Michael Bradley <[email protected]>",
"Guilherme Pacheco <[email protected]>",
"Gregory Oakes <[email protected]>",
"Michelle Lee <[email protected]>",
"Grant Herman <[email protected]>",
"Mitar <[email protected]>",
"Gopalakrishna Palem <[email protected]>",
"Mohamed Abdulaziz <[email protected]>",
"ron litzenberger <[email protected]>",
"Mounish Sai <[email protected]>",
"My9Bot <[email protected]>",
"Nate Foss <[email protected]>",
"Adin Schmahmann <[email protected]>",
"Nick Poulden <[email protected]>",
"Nicolás Santángelo <[email protected]>",
"Giuseppe Bertone <[email protected]>",
"sarthak khandelwal <[email protected]>",
"Níckolas Goline <[email protected]>",
"Giles <[email protected]>",
"Olivério Sousa <[email protected]>",
"Orie Steele <[email protected]>",
"Oskar Nyberg <[email protected]>",
"Padmashree Jha <[email protected]>",
"George Shammas <[email protected]>",
"Pau Ramon Revilla <[email protected]>",
"Paul Cowgill <[email protected]>",
"Gabriel Garrido Calvo <[email protected]>",
"Filip Š <[email protected]>",
"Fil <[email protected]>",
"Pete Thomas <[email protected]>",
"Philipp Krüger <[email protected]>",
"Felix Yan <[email protected]>",
"Qmstream <[email protected]>",
"Adam Uhlíř <[email protected]>",
"Faheel Ahmad <[email protected]>",
"Revat Arora <[email protected]>",
"Donatas Stundys <[email protected]>",
"Dominic Della Valle <[email protected]>",
"Rod Keys <[email protected]>",
"Dmitry Nikulin <[email protected]>",
"Roman Khafizianov <[email protected]>",
"Dietrich Ayala <[email protected]>",
"Davide Icardi <[email protected]>",
"Sergey Ukustov <[email protected]>",
"swedneck <[email protected]>",
"SidHarder <[email protected]>",
"A_A <[email protected]>",
"David da Silva <[email protected]>",
"Steven Vandevelde <[email protected]>",
"Subin Siby <[email protected]>",
"TJKoury <[email protected]>",
"Tapasweni Pathak <[email protected]>",
"Tara Vancil <[email protected]>",
"Tejas Kumthekar <[email protected]>",
"Terence Pae <[email protected]>",
"David Braun <[email protected]>",
"Thiago Delgado <[email protected]>",
"Thorsten Zoerner <[email protected]>",
"Timothé <[email protected]>",
"David <[email protected]>",
"Danny <[email protected]>",
"thattommyhall <[email protected]>",
"Uroš Jurglič <[email protected]>",
"Daniela Borges Matos de Carvalho <[email protected]>",
"Daniel J. O'Quinn <[email protected]>",
"Victor Bjelkholm <[email protected]>",
"Daniel Constantin <[email protected]>",
"Vincent Martin <[email protected]>",
"Daniel Buchner <[email protected]>",
"Alex North <[email protected]>",
"Vutsal Singhal <[email protected]>",
"Xiao Liang <[email protected]>",
"Dafeng <[email protected]>",
"Connor White <[email protected]>",
"Yole <[email protected]>",
"Yusef Napora <[email protected]>",
"Zhiyuan Lin <[email protected]>",
"Clemo <[email protected]>",
"Christian Paul <[email protected]>",
"arjunraghurama <[email protected]>",
"bitspill <[email protected]>",
"Chirag Shinde <[email protected]>",
"datafatmunger <[email protected]>",
"Chance Hudson <[email protected]>",
"Caio Gondim <[email protected]>",
"CSDUMMI <[email protected]>",
"CHEVALAY JOSSELIN <[email protected]>",
"Bruno Zell <[email protected]>",
"dmitriy ryajov <[email protected]>",
"elsehow <[email protected]>",
"ethers <[email protected]>",
"Bruno Barbieri <[email protected]>",
"Brian Vander Schaaf <[email protected]>",
"Brandon <[email protected]>",
"Bernard Mordan <[email protected]>",
"hapsody <[email protected]>",
"imestin <[email protected]>",
"isan_rivkin <[email protected]>",
"javaskript <[email protected]>",
"Ayush Mahajan <[email protected]>",
"jonahweissman <[email protected]>",
"kevingzhang <[email protected]>",
"klueq <[email protected]>",
"James Halliday <[email protected]>",
"Jason Carver <[email protected]>",
"Jeeyong Um <[email protected]>",
"leekt216 <[email protected]>",
"nature hacker <[email protected]>",
"Jessica Schilling <[email protected]>",
"Arkadiy Kukarkin <[email protected]>",
"Joe Turgeon <[email protected]>",
"Joel Gustafson <[email protected]>",
"Johannes Wikner <[email protected]>",
"John Kane <[email protected]>",
"Johnny <[email protected]>",
"Jon Schlinkert <[email protected]>",
"Jade Meskill <[email protected]>",
"Jonathan Commins <[email protected]>",
"noah the goodra <[email protected]>",
"Jacob Karlsson <[email protected]>",
"Jorropo <[email protected]>",
"João Santos <[email protected]>"
]
}
23 changes: 3 additions & 20 deletions packages/interface-ipfs-core/LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,4 @@
The MIT License (MIT)
This project is dual licensed under MIT and Apache-2.0.

Copyright (c) 2018 Protocol Labs, Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
MIT: https://www.opensource.org/licenses/mit
Apache-2.0: https://www.apache.org/licenses/license-2.0
5 changes: 5 additions & 0 deletions packages/interface-ipfs-core/LICENSE-APACHE
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
Loading