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

Commit

Permalink
Merge remote-tracking branch 'origin/master' into chore/run-electron-…
Browse files Browse the repository at this point in the history
…on-linux
  • Loading branch information
achingbrain committed Sep 11, 2020
2 parents 1c55a7e + 494949a commit 41fcb93
Show file tree
Hide file tree
Showing 35 changed files with 75 additions and 44 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ stages:

node_js:
- 'lts/*'
# blocked by https://github.com/hapijs/hapi/issues/4149
# - 'node'
- 'node'

os:
- linux
Expand Down
2 changes: 1 addition & 1 deletion docs/core-api/FILES.md
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ const files = [{
content: 'ABC'
}]

for await (const result of ipfs.addAll(content)) {
for await (const result of ipfs.addAll(files)) {
console.log(result)
}

Expand Down
2 changes: 1 addition & 1 deletion examples/browser-add-readable-stream/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"keywords": [],
"license": "MIT",
"devDependencies": {
"ipfs": "^0.50.0",
"ipfs": "^0.50.1",
"test-ipfs-example": "^2.0.3"
}
}
2 changes: 1 addition & 1 deletion examples/browser-browserify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"concat-stream": "^2.0.0",
"execa": "^4.0.0",
"http-server": "^0.12.3",
"ipfs": "^0.50.0",
"ipfs": "^0.50.1",
"test-ipfs-example": "^2.0.3"
},
"browser": {
Expand Down
2 changes: 1 addition & 1 deletion examples/browser-create-react-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"dependencies": {
"dot-prop": "^5.0.0",
"ipfs": "^0.50.0",
"ipfs": "^0.50.1",
"ipfs-css": "^0.13.1",
"react": "^16.8.6",
"react-dom": "^16.8.6",
Expand Down
4 changes: 2 additions & 2 deletions examples/browser-exchange-files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
"browserify": "^16.2.3",
"execa": "^4.0.0",
"http-server": "^0.12.3",
"ipfs-http-client": "^46.1.0",
"ipfs-http-client": "^47.0.0",
"uint8arrays": "^1.1.0"
},
"dependencies": {
"ipfs": "^0.50.0",
"ipfs": "^0.50.1",
"it-all": "^1.0.1",
"test-ipfs-example": "^2.0.3"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/browser-http-client-upload-file/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
],
"license": "MIT",
"dependencies": {
"ipfs-http-client": "^46.1.0"
"ipfs-http-client": "^47.0.0"
},
"devDependencies": {
"ipfs": "^0.50.0",
"ipfs": "^0.50.1",
"parcel-bundler": "^1.12.4",
"react": "^16.8.6",
"react-dom": "^16.8.6",
Expand Down
4 changes: 2 additions & 2 deletions examples/browser-ipns-publish/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"license": "MIT",
"dependencies": {
"human-crypto-keys": "^0.1.4",
"ipfs": "^0.50.0",
"ipfs-http-client": "^46.1.0",
"ipfs": "^0.50.1",
"ipfs-http-client": "^47.0.0",
"ipfs-utils": "^3.0.0",
"ipns": "^0.8.0",
"it-last": "^1.0.2",
Expand Down
2 changes: 1 addition & 1 deletion examples/browser-mfs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"webpack-cli": "^3.3.11"
},
"dependencies": {
"ipfs": "^0.50.0",
"ipfs": "^0.50.1",
"mime-sniffer": "~0.0.3"
}
}
2 changes: 1 addition & 1 deletion examples/browser-parceljs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"ipfs": "^0.50.0"
"ipfs": "^0.50.1"
},
"devDependencies": {
"@babel/cli": "^7.1.5",
Expand Down
2 changes: 1 addition & 1 deletion examples/browser-readablestream/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"webpack": "^4.43.0"
},
"dependencies": {
"ipfs": "^0.50.0",
"ipfs": "^0.50.1",
"it-to-stream": "^0.1.1",
"videostream": "^3.2.0"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/browser-script-tag/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
"test-ipfs-example": "^2.0.3"
},
"dependencies": {
"ipfs": "^0.50.0"
"ipfs": "^0.50.1"
}
}
2 changes: 1 addition & 1 deletion examples/browser-sharing-node-across-tabs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"worker-plugin": "4.0.3"
},
"dependencies": {
"ipfs": "^0.50.0",
"ipfs": "^0.50.1",
"ipfs-message-port-client": "^0.2.0",
"ipfs-message-port-server": "^0.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/browser-video-streaming/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
"test-ipfs-example": "^2.0.3"
},
"dependencies": {
"ipfs": "^0.50.0"
"ipfs": "^0.50.1"
}
}
2 changes: 1 addition & 1 deletion examples/browser-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"core-js": "^3.6.4",
"ipfs": "^0.50.0",
"ipfs": "^0.50.1",
"vue": "^2.6.11"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/browser-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"webpack-dev-server": "^3.11.0"
},
"dependencies": {
"ipfs": "^0.50.0"
"ipfs": "^0.50.1"
},
"browserslist": [
">1%",
Expand Down
4 changes: 2 additions & 2 deletions examples/circuit-relaying/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
"license": "MIT",
"dependencies": {
"delay": "^4.3.0",
"ipfs": "^0.50.0",
"ipfs": "^0.50.1",
"ipfs-pubsub-room": "^2.0.1",
"uint8arrays": "^1.1.0"
},
"devDependencies": {
"execa": "^4.0.0",
"ipfs-css": "^0.13.1",
"ipfs-http-client": "^46.1.0",
"ipfs-http-client": "^47.0.0",
"parcel-bundler": "^1.12.4",
"tachyons": "^4.11.1",
"test-ipfs-example": "^2.0.3"
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-ipfs-repo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"license": "MIT",
"dependencies": {
"datastore-fs": "^2.0.0",
"ipfs": "^0.50.0",
"ipfs": "^0.50.1",
"ipfs-repo": "^6.0.3",
"it-all": "^1.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-libp2p/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"license": "MIT",
"dependencies": {
"ipfs": "^0.50.0",
"ipfs": "^0.50.1",
"libp2p": "^0.29.0",
"libp2p-bootstrap": "^0.12.0",
"libp2p-kad-dht": "^0.20.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/explore-ethereum-blockchain/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"keywords": [],
"license": "MIT",
"devDependencies": {
"ipfs": "^0.50.0",
"ipfs-http-client": "^46.1.0",
"ipfs": "^0.50.1",
"ipfs-http-client": "^47.0.0",
"ipfsd-ctl": "^7.0.0",
"test-ipfs-example": "^2.0.3"
}
Expand Down
4 changes: 2 additions & 2 deletions examples/http-client-browser-pubsub/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
"author": "Alan Shaw",
"license": "MIT",
"dependencies": {
"ipfs-http-client": "^46.1.0"
"ipfs-http-client": "^47.0.0"
},
"browserslist": [
"last 2 versions and not dead and > 2%"
],
"devDependencies": {
"execa": "^4.0.0",
"go-ipfs": "^0.7.0-rc2",
"ipfs": "^0.50.0",
"ipfs": "^0.50.1",
"ipfsd-ctl": "^7.0.0",
"parcel-bundler": "^1.12.4",
"test-ipfs-example": "^2.0.3"
Expand Down
4 changes: 2 additions & 2 deletions examples/http-client-bundle-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"license": "MIT",
"keywords": [],
"dependencies": {
"ipfs-http-client": "^46.1.0",
"ipfs-http-client": "^47.0.0",
"react": "^16.8.6",
"react-dom": "^16.8.6"
},
Expand All @@ -24,7 +24,7 @@
"babel-loader": "^8.0.5",
"copy-webpack-plugin": "^5.0.4",
"execa": "^4.0.0",
"ipfs": "^0.50.0",
"ipfs": "^0.50.1",
"ipfsd-ctl": "^7.0.0",
"react-hot-loader": "^4.12.21",
"test-ipfs-example": "^2.0.3",
Expand Down
2 changes: 1 addition & 1 deletion examples/http-client-name-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"author": "Tara Vancil <tbvanc@gmail.com>",
"license": "MIT",
"dependencies": {
"ipfs-http-client": "^46.1.0"
"ipfs-http-client": "^47.0.0"
},
"devDependencies": {
"execa": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/ipfs-101/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"author": "David Dias <daviddias@ipfs.io>",
"license": "MIT",
"dependencies": {
"ipfs": "^0.50.0",
"ipfs": "^0.50.1",
"it-all": "^1.0.1",
"uint8arrays": "^1.1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/run-in-electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"devDependencies": {
"electron": "^6.0.0",
"electron-rebuild": "^1.8.4",
"ipfs": "^0.50.0",
"ipfs": "^0.50.1",
"test-ipfs-example": "^2.0.3"
},
"greenkeeper": {
Expand Down
2 changes: 1 addition & 1 deletion examples/running-multiple-nodes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"test-ipfs-example": "^2.0.3"
},
"dependencies": {
"ipfs": "^0.50.0"
"ipfs": "^0.50.1"
}
}
2 changes: 1 addition & 1 deletion examples/traverse-ipld-graphs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"dependencies": {
"cids": "^1.0.0",
"ipfs": "^0.50.0",
"ipfs": "^0.50.1",
"ipld-block": "^0.10.0",
"ipld-dag-pb": "^0.20.0",
"multihashing-async": "^2.0.1"
Expand Down
8 changes: 8 additions & 0 deletions packages/ipfs-http-client/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [47.0.1](https://github.com/ipfs/js-ipfs/compare/ipfs-http-client@47.0.0...ipfs-http-client@47.0.1) (2020-09-09)

**Note:** Version bump only for package ipfs-http-client





## [46.1.1](https://github.com/ipfs/js-ipfs/compare/ipfs-http-client@46.1.0...ipfs-http-client@46.1.1) (2020-09-04)

**Note:** Version bump only for package ipfs-http-client
Expand Down
2 changes: 1 addition & 1 deletion packages/ipfs-http-client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ipfs-http-client",
"version": "46.1.1",
"version": "47.0.1",
"description": "A client library for the IPFS HTTP API",
"keywords": [
"ipfs"
Expand Down
8 changes: 8 additions & 0 deletions packages/ipfs-message-port-client/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.2.2](https://github.com/ipfs/js-ipfs/compare/ipfs-message-port-client@0.2.1...ipfs-message-port-client@0.2.2) (2020-09-09)

**Note:** Version bump only for package ipfs-message-port-client





## [0.2.1](https://github.com/ipfs/js-ipfs/compare/ipfs-message-port-client@0.2.0...ipfs-message-port-client@0.2.1) (2020-09-04)

**Note:** Version bump only for package ipfs-message-port-client
Expand Down
6 changes: 3 additions & 3 deletions packages/ipfs-message-port-client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ipfs-message-port-client",
"version": "0.2.1",
"version": "0.2.2",
"description": "IPFS client library for accessing IPFS node over message port",
"keywords": [
"ipfs",
Expand Down Expand Up @@ -41,9 +41,9 @@
"aegir": "^26.0.0",
"cross-env": "^7.0.0",
"interface-ipfs-core": "^0.140.0",
"ipfs": "^0.50.1",
"ipfs": "^0.50.2",
"ipfs-message-port-protocol": "^0.2.0",
"ipfs-message-port-server": "^0.2.1",
"ipfs-message-port-server": "^0.2.2",
"ipld-dag-pb": "^0.20.0"
},
"engines": {
Expand Down
8 changes: 8 additions & 0 deletions packages/ipfs-message-port-server/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.2.2](https://github.com/ipfs/js-ipfs/compare/ipfs-message-port-server@0.2.1...ipfs-message-port-server@0.2.2) (2020-09-09)

**Note:** Version bump only for package ipfs-message-port-server





## [0.2.1](https://github.com/ipfs/js-ipfs/compare/ipfs-message-port-server@0.2.0...ipfs-message-port-server@0.2.1) (2020-09-04)

**Note:** Version bump only for package ipfs-message-port-server
Expand Down
4 changes: 2 additions & 2 deletions packages/ipfs-message-port-server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ipfs-message-port-server",
"version": "0.2.1",
"version": "0.2.2",
"description": "IPFS server library for exposing IPFS node over message port",
"keywords": [
"ipfs",
Expand Down Expand Up @@ -42,7 +42,7 @@
"aegir": "^26.0.0",
"cross-env": "^7.0.0",
"interface-ipfs-core": "^0.140.0",
"ipfs": "^0.50.1",
"ipfs": "^0.50.2",
"ipfs-message-port-protocol": "^0.2.0"
},
"engines": {
Expand Down
8 changes: 8 additions & 0 deletions packages/ipfs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.50.2](https://github.com/ipfs/js-ipfs/compare/ipfs@0.50.1...ipfs@0.50.2) (2020-09-09)

**Note:** Version bump only for package ipfs





## [0.50.1](https://github.com/ipfs/js-ipfs/compare/ipfs@0.50.0...ipfs@0.50.1) (2020-09-04)

**Note:** Version bump only for package ipfs
Expand Down
Loading

0 comments on commit 41fcb93

Please sign in to comment.