From dcb411b4aa0d065beffde83b7222e024917ee2a9 Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Thu, 4 Feb 2021 19:52:49 +0000
Subject: [PATCH 1/4] fix: ts types after multihashing-async release
The new types in multihashing-async are unsurprisingly stricter than
using no types at all.
fixes #3527
---
packages/ipfs-core/src/components/block/put.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/packages/ipfs-core/src/components/block/put.js b/packages/ipfs-core/src/components/block/put.js
index 9d3aab45c1..4c65a0da55 100644
--- a/packages/ipfs-core/src/components/block/put.js
+++ b/packages/ipfs-core/src/components/block/put.js
@@ -82,7 +82,7 @@ module.exports = ({ blockService, pin, gcLock, preload }) => {
cidVersion = options.version
}
- const multihash = await multihashing(block, mhtype)
+ const multihash = await multihashing(bytes, mhtype)
const cid = new CID(cidVersion, format, multihash)
block = new Block(bytes, cid)
@@ -120,7 +120,7 @@ module.exports = ({ blockService, pin, gcLock, preload }) => {
* @typedef {Object} PutOptions
* @property {CID} [cid] - A CID to store the block under (default: `undefined`)
* @property {string} [format='dag-pb'] - The codec to use to create the CID (default: `'dag-pb'`)
- * @property {string} [mhtype='sha2-256'] - The hashing algorithm to use to create the CID (default: `'sha2-256'`)
+ * @property {import('multihashes').HashName} [mhtype='sha2-256'] - The hashing algorithm to use to create the CID (default: `'sha2-256'`)
* @property {number} [mhlen]
* @property {CIDVersion} [version=0] - The version to use to create the CID (default: `0`)
* @property {boolean} [pin=false] - If true, pin added blocks recursively (default: `false`)
From 86a5bc0c74752b121987700745e654aeacded2a1 Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Fri, 5 Feb 2021 08:35:38 +0000
Subject: [PATCH 2/4] chore; y u no run examples
---
.travis.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 9d601fa7a6..4c3cd50f91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -273,6 +273,8 @@ jobs:
script:
# Travis lets scripts continue even if previous steps fail so need to use &&: https://github.com/travis-ci/travis-ci/issues/1066
- npm run configure-examples &&
+ cat lerna.json &&
+ npx lerna ls &&
npm run test -- --scope=example* --concurrency=1
- stage: release-rc
From 0b38b79b550a84574e6727f27f0740a823d4011c Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Fri, 5 Feb 2021 10:29:35 +0000
Subject: [PATCH 3/4] chore: remove pre
---
.travis.yml | 2 --
package.json | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 4c3cd50f91..9d601fa7a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -273,8 +273,6 @@ jobs:
script:
# Travis lets scripts continue even if previous steps fail so need to use &&: https://github.com/travis-ci/travis-ci/issues/1066
- npm run configure-examples &&
- cat lerna.json &&
- npx lerna ls &&
npm run test -- --scope=example* --concurrency=1
- stage: release-rc
diff --git a/package.json b/package.json
index 920c19234b..56deda257e 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
"lint": "lerna run lint",
"dep-check": "lerna run dep-check",
"configure-examples": "run-s configure-examples:* release:pre:reinstall release:pre:bundle",
- "configure-examples:pre:add-examples": "json -I -f ./lerna.json -e \"this.packages.push('examples/*'); this.packages = [...new Set(this.packages)]\"",
+ "configure-examples:add-examples": "json -I -f ./lerna.json -e \"this.packages.push('examples/*'); this.packages = [...new Set(this.packages)]\"",
"configure-examples:add-hoisted-modules": "json -I -f ./lerna.json -e \"this.command.bootstrap.nohoist = ['ipfs-css', 'tachyons']; this.command.bootstrap.nohoist = [...new Set(this.command.bootstrap.nohoist)]\"",
"release": "run-s release:pre:* release:publish docker:release release:post:*",
"release:pre:non-dirty-repo": "git diff --quiet",
From 7d73dd331b03be3c3fac52b08662cae523526b02 Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Fri, 5 Feb 2021 11:18:45 +0000
Subject: [PATCH 4/4] chore: update test runner in examples
---
examples/browser-add-readable-stream/package.json | 2 +-
examples/browser-browserify/package.json | 2 +-
examples/browser-create-react-app/package.json | 2 +-
examples/browser-exchange-files/package.json | 2 +-
examples/browser-http-client-upload-file/package.json | 2 +-
examples/browser-ipns-publish/package.json | 2 +-
examples/browser-mfs/package.json | 2 +-
examples/browser-parceljs/package.json | 2 +-
examples/browser-readablestream/package.json | 2 +-
examples/browser-script-tag/package.json | 2 +-
examples/browser-service-worker/package.json | 2 +-
.../browser-sharing-node-across-tabs/package.json | 2 +-
examples/browser-video-streaming/package.json | 2 +-
examples/browser-vue/package.json | 2 +-
examples/browser-webpack/package.json | 2 +-
examples/circuit-relaying/package.json | 2 +-
examples/custom-ipfs-repo/package.json | 2 +-
examples/custom-ipld-formats/package.json | 2 +-
examples/custom-libp2p/package.json | 2 +-
examples/explore-ethereum-blockchain/package.json | 2 +-
examples/http-client-browser-pubsub/package.json | 2 +-
examples/http-client-bundle-webpack/package.json | 2 +-
examples/http-client-name-api/package.json | 2 +-
examples/ipfs-101/package.json | 2 +-
examples/ipfs-client-add-files/package.json | 2 +-
examples/run-in-electron/package.json | 2 +-
examples/running-multiple-nodes/package.json | 2 +-
examples/traverse-ipld-graphs/package.json | 2 +-
scripts/update-example-deps.js | 11 +++++++++++
29 files changed, 39 insertions(+), 28 deletions(-)
diff --git a/examples/browser-add-readable-stream/package.json b/examples/browser-add-readable-stream/package.json
index 4fdc762b58..12002a5957 100644
--- a/examples/browser-add-readable-stream/package.json
+++ b/examples/browser-add-readable-stream/package.json
@@ -13,6 +13,6 @@
"license": "MIT",
"devDependencies": {
"ipfs": "^0.54.1",
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
}
}
diff --git a/examples/browser-browserify/package.json b/examples/browser-browserify/package.json
index 25cf8624e4..666c09f69d 100644
--- a/examples/browser-browserify/package.json
+++ b/examples/browser-browserify/package.json
@@ -20,7 +20,7 @@
"http-server": "^0.12.3",
"ipfs": "^0.54.1",
"rimraf": "^3.0.2",
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
},
"browser": {
"ipfs": "ipfs/dist/index.min.js"
diff --git a/examples/browser-create-react-app/package.json b/examples/browser-create-react-app/package.json
index 774b00fd25..504e41f652 100644
--- a/examples/browser-create-react-app/package.json
+++ b/examples/browser-create-react-app/package.json
@@ -13,7 +13,7 @@
},
"devDependencies": {
"rimraf": "^3.0.2",
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
},
"scripts": {
"start": "react-scripts start",
diff --git a/examples/browser-exchange-files/package.json b/examples/browser-exchange-files/package.json
index 877f523deb..17c0881051 100644
--- a/examples/browser-exchange-files/package.json
+++ b/examples/browser-exchange-files/package.json
@@ -22,7 +22,7 @@
"it-all": "^1.0.4",
"libp2p-websockets": "^0.15.0",
"rimraf": "^3.0.2",
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
},
"browser": {
"ipfs": "ipfs/dist/index.min.js"
diff --git a/examples/browser-http-client-upload-file/package.json b/examples/browser-http-client-upload-file/package.json
index e98ea966bf..6ad76730a7 100644
--- a/examples/browser-http-client-upload-file/package.json
+++ b/examples/browser-http-client-upload-file/package.json
@@ -23,7 +23,7 @@
"react": "^16.8.6",
"react-dom": "^16.8.6",
"rimraf": "^3.0.2",
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
},
"browserslist": [
"last 2 versions and not dead and > 2%"
diff --git a/examples/browser-ipns-publish/package.json b/examples/browser-ipns-publish/package.json
index 2105f84711..de717d67ef 100644
--- a/examples/browser-ipns-publish/package.json
+++ b/examples/browser-ipns-publish/package.json
@@ -31,7 +31,7 @@
"go-ipfs": "0.8.0-rc2",
"parcel-bundler": "^1.12.4",
"path": "^0.12.7",
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
},
"repository": {
"type": "git",
diff --git a/examples/browser-mfs/package.json b/examples/browser-mfs/package.json
index 38b67a600a..5e1b07fc31 100644
--- a/examples/browser-mfs/package.json
+++ b/examples/browser-mfs/package.json
@@ -17,7 +17,7 @@
"http-server": "^0.12.3",
"rimraf": "^3.0.2",
"terser-webpack-plugin": "^1.2.1",
- "test-ipfs-example": "^2.0.3",
+ "test-ipfs-example": "^3.0.0",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.11"
},
diff --git a/examples/browser-parceljs/package.json b/examples/browser-parceljs/package.json
index e1089a62d5..31c1184f5b 100644
--- a/examples/browser-parceljs/package.json
+++ b/examples/browser-parceljs/package.json
@@ -30,6 +30,6 @@
"parcel-bundler": "^1.12.4",
"rimraf": "^3.0.2",
"standard": "^13.1.0",
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
}
}
diff --git a/examples/browser-readablestream/package.json b/examples/browser-readablestream/package.json
index 8c1ba0c0d5..fe9fe8b3af 100644
--- a/examples/browser-readablestream/package.json
+++ b/examples/browser-readablestream/package.json
@@ -17,7 +17,7 @@
"http-server": "^0.12.3",
"rimraf": "^3.0.2",
"terser-webpack-plugin": "^1.2.1",
- "test-ipfs-example": "^2.0.3",
+ "test-ipfs-example": "^3.0.0",
"webpack": "^4.43.0"
},
"dependencies": {
diff --git a/examples/browser-script-tag/package.json b/examples/browser-script-tag/package.json
index 6527b15877..400138cdad 100644
--- a/examples/browser-script-tag/package.json
+++ b/examples/browser-script-tag/package.json
@@ -13,7 +13,7 @@
"license": "MIT",
"devDependencies": {
"http-server": "^0.12.3",
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
},
"dependencies": {
"ipfs": "^0.54.1"
diff --git a/examples/browser-service-worker/package.json b/examples/browser-service-worker/package.json
index 5f2ce5cf4f..e3983a45dd 100644
--- a/examples/browser-service-worker/package.json
+++ b/examples/browser-service-worker/package.json
@@ -16,7 +16,7 @@
"@babel/preset-env": "^7.3.1",
"babel-loader": "^8.0.5",
"copy-webpack-plugin": "^5.0.4",
- "test-ipfs-example": "^2.0.3",
+ "test-ipfs-example": "^3.0.0",
"webpack": "5.4.0",
"webpack-cli": "4.1.0",
"webpack-dev-server": "3.11.0"
diff --git a/examples/browser-sharing-node-across-tabs/package.json b/examples/browser-sharing-node-across-tabs/package.json
index cfe68e61ef..bd34d308a5 100644
--- a/examples/browser-sharing-node-across-tabs/package.json
+++ b/examples/browser-sharing-node-across-tabs/package.json
@@ -17,7 +17,7 @@
"babel-loader": "^8.0.5",
"copy-webpack-plugin": "^5.0.4",
"rimraf": "^3.0.2",
- "test-ipfs-example": "^2.0.3",
+ "test-ipfs-example": "^3.0.0",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.11",
"webpack-dev-server": "^3.11.0",
diff --git a/examples/browser-video-streaming/package.json b/examples/browser-video-streaming/package.json
index 98fb6ab6db..1651a4fdc8 100644
--- a/examples/browser-video-streaming/package.json
+++ b/examples/browser-video-streaming/package.json
@@ -13,7 +13,7 @@
"license": "MIT",
"devDependencies": {
"http-server": "^0.12.3",
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
},
"dependencies": {
"ipfs": "^0.54.1"
diff --git a/examples/browser-vue/package.json b/examples/browser-vue/package.json
index c650f827f2..4457e6a7ad 100644
--- a/examples/browser-vue/package.json
+++ b/examples/browser-vue/package.json
@@ -22,7 +22,7 @@
"eslint": "^6.8.0",
"eslint-plugin-vue": "^6.2.1",
"rimraf": "^3.0.2",
- "test-ipfs-example": "^2.0.3",
+ "test-ipfs-example": "^3.0.0",
"vue-template-compiler": "^2.6.11"
},
"eslintConfig": {
diff --git a/examples/browser-webpack/package.json b/examples/browser-webpack/package.json
index eb96d2dfc8..3eac746acc 100644
--- a/examples/browser-webpack/package.json
+++ b/examples/browser-webpack/package.json
@@ -23,7 +23,7 @@
"react-hot-loader": "^4.12.21",
"rimraf": "^3.0.2",
"stream-browserify": "^3.0.0",
- "test-ipfs-example": "^2.0.3",
+ "test-ipfs-example": "^3.0.0",
"webpack": "^5.18.0",
"webpack-cli": "^4.4.0",
"webpack-dev-server": "^3.11.0"
diff --git a/examples/circuit-relaying/package.json b/examples/circuit-relaying/package.json
index fac19cd196..09cb3c0515 100644
--- a/examples/circuit-relaying/package.json
+++ b/examples/circuit-relaying/package.json
@@ -27,7 +27,7 @@
"parcel-bundler": "^1.12.4",
"rimraf": "^3.0.2",
"tachyons": "^4.11.1",
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
},
"browserslist": [
">1%",
diff --git a/examples/custom-ipfs-repo/package.json b/examples/custom-ipfs-repo/package.json
index 12a3096953..c18aba018f 100644
--- a/examples/custom-ipfs-repo/package.json
+++ b/examples/custom-ipfs-repo/package.json
@@ -17,6 +17,6 @@
},
"devDependencies": {
"execa": "^4.0.3",
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
}
}
diff --git a/examples/custom-ipld-formats/package.json b/examples/custom-ipld-formats/package.json
index 471f6c8f77..d5fd6c8fe5 100644
--- a/examples/custom-ipld-formats/package.json
+++ b/examples/custom-ipld-formats/package.json
@@ -8,7 +8,7 @@
"license": "MIT",
"devDependencies": {
"execa": "^4.0.3",
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
},
"dependencies": {
"cids": "^1.1.5",
diff --git a/examples/custom-libp2p/package.json b/examples/custom-libp2p/package.json
index 4f132199e6..019c0c52a1 100644
--- a/examples/custom-libp2p/package.json
+++ b/examples/custom-libp2p/package.json
@@ -21,6 +21,6 @@
},
"devDependencies": {
"execa": "^4.0.3",
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
}
}
diff --git a/examples/explore-ethereum-blockchain/package.json b/examples/explore-ethereum-blockchain/package.json
index 46cc985b3a..b45ba84dfc 100644
--- a/examples/explore-ethereum-blockchain/package.json
+++ b/examples/explore-ethereum-blockchain/package.json
@@ -14,6 +14,6 @@
"ipfs-http-client": "^49.0.1",
"ipfsd-ctl": "^7.2.0",
"ipld-ethereum": "^5.0.1",
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
}
}
diff --git a/examples/http-client-browser-pubsub/package.json b/examples/http-client-browser-pubsub/package.json
index 6fdc367020..73c13fae68 100644
--- a/examples/http-client-browser-pubsub/package.json
+++ b/examples/http-client-browser-pubsub/package.json
@@ -23,6 +23,6 @@
"ipfs": "^0.54.1",
"ipfsd-ctl": "^7.2.0",
"parcel-bundler": "^1.12.4",
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
}
}
diff --git a/examples/http-client-bundle-webpack/package.json b/examples/http-client-bundle-webpack/package.json
index aa0956d089..5e5aad7073 100644
--- a/examples/http-client-bundle-webpack/package.json
+++ b/examples/http-client-bundle-webpack/package.json
@@ -28,7 +28,7 @@
"ipfsd-ctl": "^7.2.0",
"react-hot-loader": "^4.12.21",
"rimraf": "^3.0.2",
- "test-ipfs-example": "^2.0.3",
+ "test-ipfs-example": "^3.0.0",
"webpack": "^4.43.0",
"webpack-dev-server": "^3.11.0"
},
diff --git a/examples/http-client-name-api/package.json b/examples/http-client-name-api/package.json
index b3bd2ed1b2..5dd2c4f6c5 100644
--- a/examples/http-client-name-api/package.json
+++ b/examples/http-client-name-api/package.json
@@ -21,7 +21,7 @@
"ipfsd-ctl": "^7.2.0",
"parcel-bundler": "^1.12.4",
"rimraf": "^3.0.2",
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
},
"browserslist": [
"last 2 versions and not dead and > 2%"
diff --git a/examples/ipfs-101/package.json b/examples/ipfs-101/package.json
index 201d77d031..ca0c87f504 100644
--- a/examples/ipfs-101/package.json
+++ b/examples/ipfs-101/package.json
@@ -15,6 +15,6 @@
"uint8arrays": "^2.0.5"
},
"devDependencies": {
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
}
}
diff --git a/examples/ipfs-client-add-files/package.json b/examples/ipfs-client-add-files/package.json
index 05d3d009f1..d4bc618e4c 100644
--- a/examples/ipfs-client-add-files/package.json
+++ b/examples/ipfs-client-add-files/package.json
@@ -19,7 +19,7 @@
"ipfsd-ctl": "^7.2.0",
"parcel-bundler": "^1.12.4",
"rimraf": "^3.0.2",
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
},
"browserslist": [
"last 2 versions and not dead and > 2%"
diff --git a/examples/run-in-electron/package.json b/examples/run-in-electron/package.json
index cce0f5e826..f66d570813 100644
--- a/examples/run-in-electron/package.json
+++ b/examples/run-in-electron/package.json
@@ -19,7 +19,7 @@
"electron": "^11.2.1",
"electron-rebuild": "^2.3.4",
"ipfs": "^0.54.1",
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
},
"greenkeeper": {
"ignore": [
diff --git a/examples/running-multiple-nodes/package.json b/examples/running-multiple-nodes/package.json
index 8fb9cf1f60..ae01579937 100644
--- a/examples/running-multiple-nodes/package.json
+++ b/examples/running-multiple-nodes/package.json
@@ -10,7 +10,7 @@
"keywords": [],
"license": "MIT",
"devDependencies": {
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
},
"dependencies": {
"ipfs": "^0.54.1"
diff --git a/examples/traverse-ipld-graphs/package.json b/examples/traverse-ipld-graphs/package.json
index 7bc413c52b..f5002cb8c7 100644
--- a/examples/traverse-ipld-graphs/package.json
+++ b/examples/traverse-ipld-graphs/package.json
@@ -10,7 +10,7 @@
"keywords": [],
"license": "MIT",
"devDependencies": {
- "test-ipfs-example": "^2.0.3"
+ "test-ipfs-example": "^3.0.0"
},
"dependencies": {
"cids": "^1.1.5",
diff --git a/scripts/update-example-deps.js b/scripts/update-example-deps.js
index 77d616cafa..84822ed28a 100644
--- a/scripts/update-example-deps.js
+++ b/scripts/update-example-deps.js
@@ -29,6 +29,9 @@ async function main () {
console.info('Running on branch', branch)
+ // list all of the package.json files we may have just updated
+ const potentiallyUpdatedProjects = []
+
for (const dir of fs.readdirSync(PACKAGES_DIR)) {
const projectPkgPath = path.resolve(PACKAGES_DIR, dir, 'package.json')
@@ -36,9 +39,17 @@ async function main () {
continue
}
+ potentiallyUpdatedProjects.push(projectPkgPath)
+ }
+
+ // add the example test runner
+ potentiallyUpdatedProjects.push(path.resolve(EXAMPLES_DIR, 'test-ipfs-example', 'package.json'))
+
+ for (const projectPkgPath of potentiallyUpdatedProjects) {
const projectPkg = JSON.parse(fs.readFileSync(projectPkgPath, { encoding: 'utf8' }))
const projectDepVersion = `^${projectPkg.version}`
+ // look through all the example projects and update their deps
for (const dir of fs.readdirSync(EXAMPLES_DIR)) {
const examplePkgPath = path.resolve(EXAMPLES_DIR, dir, 'package.json')