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

Commit

Permalink
chore: merge master into feat/pin-remote
Browse files Browse the repository at this point in the history
  • Loading branch information
Gozala committed Jan 26, 2021
2 parents 3d90b4e + 899d529 commit 277ae23
Show file tree
Hide file tree
Showing 63 changed files with 283 additions and 91 deletions.
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.53.0",
"ipfs": "^0.53.2",
"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.3",
"http-server": "^0.12.3",
"ipfs": "^0.53.0",
"ipfs": "^0.53.2",
"rimraf": "^3.0.2",
"test-ipfs-example": "^2.0.3"
},
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.53.0",
"ipfs": "^0.53.2",
"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.3",
"http-server": "^0.12.3",
"ipfs-http-client": "^48.2.0",
"ipfs-http-client": "^48.2.2",
"uint8arrays": "^1.1.0"
},
"dependencies": {
"ipfs": "^0.53.0",
"ipfs": "^0.53.2",
"it-all": "^1.0.4",
"libp2p-websockets": "^0.15.0",
"rimraf": "^3.0.2",
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": "^48.2.0"
"ipfs-http-client": "^48.2.2"
},
"devDependencies": {
"ipfs": "^0.53.0",
"ipfs": "^0.53.2",
"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.53.0",
"ipfs-http-client": "^48.2.0",
"ipfs": "^0.53.2",
"ipfs-http-client": "^48.2.2",
"ipfs-utils": "^5.0.0",
"ipns": "^0.8.0",
"it-last": "^1.0.4",
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 @@ -22,7 +22,7 @@
"webpack-cli": "^3.3.11"
},
"dependencies": {
"ipfs": "^0.53.0",
"ipfs": "^0.53.2",
"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.53.0"
"ipfs": "^0.53.2"
},
"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 @@ -21,7 +21,7 @@
"webpack": "^4.43.0"
},
"dependencies": {
"ipfs": "^0.53.0",
"ipfs": "^0.53.2",
"it-to-stream": "^0.1.2",
"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.53.0"
"ipfs": "^0.53.2"
}
}
4 changes: 2 additions & 2 deletions examples/browser-service-worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"webpack-dev-server": "3.11.0"
},
"dependencies": {
"ipfs": "^0.53.0",
"ipfs-message-port-client": "^0.4.4",
"ipfs": "^0.53.2",
"ipfs-message-port-client": "^0.4.6",
"ipfs-message-port-protocol": "^0.5.0",
"ipfs-message-port-server": "^0.5.0",
"process": "0.11.10"
Expand Down
4 changes: 2 additions & 2 deletions examples/browser-sharing-node-across-tabs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"worker-plugin": "4.0.3"
},
"dependencies": {
"ipfs": "^0.53.0",
"ipfs-message-port-client": "^0.4.4",
"ipfs": "^0.53.2",
"ipfs-message-port-client": "^0.4.6",
"ipfs-message-port-server": "^0.5.0"
},
"browserslist": [
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.53.0"
"ipfs": "^0.53.2"
}
}
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.53.0",
"ipfs": "^0.53.2",
"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 @@ -27,7 +27,7 @@
"webpack-dev-server": "^3.11.0"
},
"dependencies": {
"ipfs": "^0.53.0"
"ipfs": "^0.53.2"
},
"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,15 +15,15 @@
"license": "MIT",
"dependencies": {
"delay": "^4.4.0",
"ipfs": "^0.53.0",
"ipfs": "^0.53.2",
"ipfs-pubsub-room": "^2.0.1",
"libp2p-websockets": "^0.15.0",
"uint8arrays": "^1.1.0"
},
"devDependencies": {
"execa": "^4.0.3",
"ipfs-css": "^0.13.1",
"ipfs-http-client": "^48.2.0",
"ipfs-http-client": "^48.2.2",
"parcel-bundler": "^1.12.4",
"rimraf": "^3.0.2",
"tachyons": "^4.11.1",
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.53.0",
"ipfs": "^0.53.2",
"ipfs-repo": "^7.0.0",
"it-all": "^1.0.4"
},
Expand Down
6 changes: 3 additions & 3 deletions examples/custom-ipld-formats/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
},
"dependencies": {
"cids": "^1.1.5",
"ipfs-daemon": "^0.4.0",
"ipfs-core": "^0.4.0",
"ipfs-http-client": "^48.2.0",
"ipfs-daemon": "^0.4.2",
"ipfs-core": "^0.4.2",
"ipfs-http-client": "^48.2.2",
"multicodec": "^2.0.1",
"multihashing-async": "^2.0.1",
"uint8arrays": "^1.1.0"
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.53.0",
"ipfs": "^0.53.2",
"libp2p": "^0.29.3",
"libp2p-bootstrap": "^0.12.1",
"libp2p-kad-dht": "^0.20.1",
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.53.0",
"ipfs-http-client": "^48.2.0",
"ipfs": "^0.53.2",
"ipfs-http-client": "^48.2.2",
"ipfsd-ctl": "^7.2.0",
"ipld-ethereum": "^5.0.1",
"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": "^48.2.0"
"ipfs-http-client": "^48.2.2"
},
"browserslist": [
"last 2 versions and not dead and > 2%"
],
"devDependencies": {
"execa": "^4.0.3",
"go-ipfs": "0.8.0-rc1",
"ipfs": "^0.53.0",
"ipfs": "^0.53.2",
"ipfsd-ctl": "^7.2.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": "^48.2.0",
"ipfs-http-client": "^48.2.2",
"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.3",
"ipfs": "^0.53.0",
"ipfs": "^0.53.2",
"ipfsd-ctl": "^7.2.0",
"react-hot-loader": "^4.12.21",
"rimraf": "^3.0.2",
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": "^48.2.0"
"ipfs-http-client": "^48.2.2"
},
"devDependencies": {
"execa": "^4.0.3",
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.53.0",
"ipfs": "^0.53.2",
"it-all": "^1.0.4",
"uint8arrays": "^1.1.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/ipfs-client-add-files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"test": "test-ipfs-example"
},
"dependencies": {
"ipfs-client": "^0.2.0"
"ipfs-client": "^0.2.2"
},
"devDependencies": {
"execa": "^4.0.3",
"ipfs": "^0.53.0",
"ipfs": "^0.53.2",
"ipfsd-ctl": "^7.2.0",
"parcel-bundler": "^1.12.4",
"rimraf": "^3.0.2",
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.53.0",
"ipfs": "^0.53.2",
"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.53.0"
"ipfs": "^0.53.2"
}
}
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.1.5",
"ipfs": "^0.53.0",
"ipfs": "^0.53.2",
"ipld-block": "^0.11.0",
"ipld-dag-pb": "^0.20.0",
"ipld-git": "^0.6.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/types-use-ipfs-from-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "example-types-use-ipfs-from-ts",
"private": true,
"dependencies": {
"ipfs": "^0.53.0"
"ipfs": "^0.53.2"
},
"devDependencies": {
"typescript": "4.0.x"
Expand Down
2 changes: 1 addition & 1 deletion examples/types-use-ipfs-from-typed-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "example-types-use-ipfs-from-typed-js",
"private": true,
"dependencies": {
"ipfs": "^0.53.0"
"ipfs": "^0.53.2"
},
"devDependencies": {
"typescript": "4.0.x"
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"release:post:remove-hoisted-modules": "json -I -f ./lerna.json -e \"delete this.command.bootstrap.nohoist\"",
"release:post:remove-examples": "json -I -f ./lerna.json -e \"this.packages = this.packages.filter(p => !p.includes('examples'))\"",
"release:post:revert-ignore-changes-to-lerna-config": "git update-index --no-assume-unchanged ./lerna.json",
"release:post:update-example-dependencies": "node scripts/update-example-deps.js && git add examples && git commit -m 'chore: updated example dependencies' && git push",
"release:rc": "run-s release:pre:* release:canary release:post:*",
"release:canary": "lerna publish --canary --preid rc --dist-tag next --force-publish --yes",
"docker:rc": "run-s docker:rc:*",
Expand Down Expand Up @@ -73,7 +74,7 @@
"Friedel Ziegelmayer <dignifiedquire@gmail.com>",
"Juan Batiz-Benet <juan@benet.ai>",
"Hugo Dias <hugomrdias@gmail.com>",
"Vasco Santos <vasco.santos@ua.pt>",
"Vasco Santos <vasco.santos@moxy.studio>",
"Henrique Dias <hacdias@gmail.com>",
"Volker Mische <volker.mische@gmail.com>",
"ᴠɪᴄᴛᴏʀ ʙᴊᴇʟᴋʜᴏʟᴍ <victorbjelkholm@gmail.com>",
Expand All @@ -88,9 +89,9 @@
"Kristoffer Ström <kristoffer@rymdkoloni.se>",
"Dmitriy Ryajov <dryajov@gmail.com>",
"nginnever <ginneversource@gmail.com>",
"Irakli Gozalishvili <contact@gozala.io>",
"Richard Littauer <richard.littauer@gmail.com>",
"Oli Evans <oli@tableflip.io>",
"Irakli Gozalishvili <contact@gozala.io>",
"dirkmc <dirkmdev@gmail.com>",
"Diogo Silva <fsdiogo@gmail.com>",
"Connor Keenan <ckeenan89@gmail.com>",
Expand Down
8 changes: 8 additions & 0 deletions packages/ipfs-cli/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.3.2](https://github.com/ipfs/js-ipfs/compare/ipfs-cli@0.3.1...ipfs-cli@0.3.2) (2021-01-22)

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





## [0.3.1](https://github.com/ipfs/js-ipfs/compare/ipfs-cli@0.3.0...ipfs-cli@0.3.1) (2021-01-20)

**Note:** Version bump only for package ipfs-cli
Expand Down
10 changes: 5 additions & 5 deletions packages/ipfs-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ipfs-cli",
"version": "0.3.1",
"version": "0.3.2",
"description": "JavaScript implementation of the IPFS specification",
"keywords": [
"IPFS"
Expand Down Expand Up @@ -37,10 +37,10 @@
"err-code": "^2.0.3",
"execa": "^5.0.0",
"get-folder-size": "^2.0.1",
"ipfs-core": "^0.4.1",
"ipfs-core-utils": "^0.6.0",
"ipfs-daemon": "^0.4.1",
"ipfs-http-client": "^48.2.1",
"ipfs-core": "^0.4.2",
"ipfs-core-utils": "^0.6.1",
"ipfs-daemon": "^0.4.2",
"ipfs-http-client": "^48.2.2",
"ipfs-repo": "^7.0.0",
"ipfs-utils": "^5.0.0",
"ipld-dag-cbor": "^0.17.0",
Expand Down
Loading

0 comments on commit 277ae23

Please sign in to comment.