From 02402c7d18b04f8302aeb58cb960f8f87ebe64ed Mon Sep 17 00:00:00 2001 From: Irakli Gozalishvili Date: Fri, 11 Dec 2020 11:46:19 -0800 Subject: [PATCH 01/13] trigger ci From 0da18507f51a58fdd785bfd95764a5f96cbcfc7e Mon Sep 17 00:00:00 2001 From: Irakli Gozalishvili Date: Fri, 11 Dec 2020 12:16:05 -0800 Subject: [PATCH 02/13] chore: change cid dep to use git pull --- packages/interface-ipfs-core/package.json | 2 +- packages/ipfs-cli/package.json | 2 +- packages/ipfs-core-utils/package.json | 2 +- packages/ipfs-core/package.json | 2 +- packages/ipfs-http-client/package.json | 2 +- packages/ipfs-http-gateway/package.json | 2 +- packages/ipfs-http-server/package.json | 2 +- packages/ipfs-message-port-protocol/package.json | 2 +- packages/ipfs-message-port-server/package.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/interface-ipfs-core/package.json b/packages/interface-ipfs-core/package.json index ec0df71dc6..7c3e7ad590 100644 --- a/packages/interface-ipfs-core/package.json +++ b/packages/interface-ipfs-core/package.json @@ -34,7 +34,7 @@ "chai": "^4.2.0", "chai-as-promised": "^7.1.1", "chai-subset": "^1.6.0", - "cids": "^1.0.0", + "cids": "git://github.com/multiformats/js-cid#multicodec-210", "delay": "^4.4.0", "dirty-chai": "^2.0.1", "err-code": "^2.0.3", diff --git a/packages/ipfs-cli/package.json b/packages/ipfs-cli/package.json index 5a07a23034..12c3a8cec5 100644 --- a/packages/ipfs-cli/package.json +++ b/packages/ipfs-cli/package.json @@ -32,7 +32,7 @@ "bignumber.js": "^9.0.0", "byteman": "^1.3.5", "cid-tool": "^1.0.0", - "cids": "^1.0.0", + "cids": "git://github.com/multiformats/js-cid#multicodec-210", "debug": "^4.1.1", "err-code": "^2.0.3", "execa": "^5.0.0", diff --git a/packages/ipfs-core-utils/package.json b/packages/ipfs-core-utils/package.json index db583a2ca9..d338d8b20a 100644 --- a/packages/ipfs-core-utils/package.json +++ b/packages/ipfs-core-utils/package.json @@ -41,7 +41,7 @@ "any-signal": "^2.0.0", "blob-to-it": "^1.0.1", "browser-readablestream-to-it": "^1.0.1", - "cids": "^1.0.0", + "cids": "git://github.com/multiformats/js-cid#multicodec-210", "err-code": "^2.0.3", "ipfs-utils": "^5.0.0", "it-all": "^1.0.4", diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json index a4269322a5..c012edaebd 100644 --- a/packages/ipfs-core/package.json +++ b/packages/ipfs-core/package.json @@ -57,7 +57,7 @@ "array-shuffle": "^1.0.1", "bignumber.js": "^9.0.0", "cbor": "^5.1.0", - "cids": "^1.0.0", + "cids": "git://github.com/multiformats/js-cid#multicodec-210", "class-is": "^1.1.0", "dag-cbor-links": "^2.0.0", "datastore-core": "^2.0.0", diff --git a/packages/ipfs-http-client/package.json b/packages/ipfs-http-client/package.json index 315abda5e0..dd4ada6634 100644 --- a/packages/ipfs-http-client/package.json +++ b/packages/ipfs-http-client/package.json @@ -52,7 +52,7 @@ "dependencies": { "any-signal": "^2.0.0", "bignumber.js": "^9.0.0", - "cids": "^1.0.0", + "cids": "git://github.com/multiformats/js-cid#multicodec-210", "debug": "^4.1.1", "form-data": "^3.0.0", "ipfs-core-utils": "^0.5.3", diff --git a/packages/ipfs-http-gateway/package.json b/packages/ipfs-http-gateway/package.json index d5add58cc9..a52439751a 100644 --- a/packages/ipfs-http-gateway/package.json +++ b/packages/ipfs-http-gateway/package.json @@ -32,7 +32,7 @@ "@hapi/ammo": "^5.0.1", "@hapi/boom": "^9.1.0", "@hapi/hapi": "^20.0.0", - "cids": "^1.0.0", + "cids": "git://github.com/multiformats/js-cid#multicodec-210", "debug": "^4.1.1", "hapi-pino": "^8.3.0", "ipfs-core-utils": "^0.5.3", diff --git a/packages/ipfs-http-server/package.json b/packages/ipfs-http-server/package.json index 23c1f2a4d5..ba88d14bc9 100644 --- a/packages/ipfs-http-server/package.json +++ b/packages/ipfs-http-server/package.json @@ -32,7 +32,7 @@ "@hapi/boom": "^9.1.0", "@hapi/content": "^5.0.2", "@hapi/hapi": "^20.0.0", - "cids": "^1.0.0", + "cids": "git://github.com/multiformats/js-cid#multicodec-210", "debug": "^4.1.1", "dlv": "^1.1.3", "err-code": "^2.0.3", diff --git a/packages/ipfs-message-port-protocol/package.json b/packages/ipfs-message-port-protocol/package.json index 4ca7dafd92..2ee6ec8527 100644 --- a/packages/ipfs-message-port-protocol/package.json +++ b/packages/ipfs-message-port-protocol/package.json @@ -42,7 +42,7 @@ "dep-check": "aegir dep-check -i typescript -i rimraf" }, "dependencies": { - "cids": "^1.0.0", + "cids": "git://github.com/multiformats/js-cid#multicodec-210", "ipld-block": "^0.11.0" }, "devDependencies": { diff --git a/packages/ipfs-message-port-server/package.json b/packages/ipfs-message-port-server/package.json index 90cb15a2ee..84dbd33625 100644 --- a/packages/ipfs-message-port-server/package.json +++ b/packages/ipfs-message-port-server/package.json @@ -50,7 +50,7 @@ "devDependencies": { "@types/it-all": "^1.0.0", "aegir": "^29.2.2", - "cids": "^1.0.0", + "cids": "git://github.com/multiformats/js-cid#multicodec-210", "ipfs-utils": "^5.0.0", "rimraf": "^3.0.2", "typescript": "4.0.x" From 58134d5806f33ed1d0f8ef4a86b832c94512b5e5 Mon Sep 17 00:00:00 2001 From: Irakli Gozalishvili Date: Fri, 11 Dec 2020 13:02:44 -0800 Subject: [PATCH 03/13] Revert "chore: change cid dep to use git pull" This reverts commit 0da18507f51a58fdd785bfd95764a5f96cbcfc7e. --- packages/interface-ipfs-core/package.json | 2 +- packages/ipfs-cli/package.json | 2 +- packages/ipfs-core-utils/package.json | 2 +- packages/ipfs-core/package.json | 2 +- packages/ipfs-http-client/package.json | 2 +- packages/ipfs-http-gateway/package.json | 2 +- packages/ipfs-http-server/package.json | 2 +- packages/ipfs-message-port-protocol/package.json | 2 +- packages/ipfs-message-port-server/package.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/interface-ipfs-core/package.json b/packages/interface-ipfs-core/package.json index 7c3e7ad590..ec0df71dc6 100644 --- a/packages/interface-ipfs-core/package.json +++ b/packages/interface-ipfs-core/package.json @@ -34,7 +34,7 @@ "chai": "^4.2.0", "chai-as-promised": "^7.1.1", "chai-subset": "^1.6.0", - "cids": "git://github.com/multiformats/js-cid#multicodec-210", + "cids": "^1.0.0", "delay": "^4.4.0", "dirty-chai": "^2.0.1", "err-code": "^2.0.3", diff --git a/packages/ipfs-cli/package.json b/packages/ipfs-cli/package.json index 12c3a8cec5..5a07a23034 100644 --- a/packages/ipfs-cli/package.json +++ b/packages/ipfs-cli/package.json @@ -32,7 +32,7 @@ "bignumber.js": "^9.0.0", "byteman": "^1.3.5", "cid-tool": "^1.0.0", - "cids": "git://github.com/multiformats/js-cid#multicodec-210", + "cids": "^1.0.0", "debug": "^4.1.1", "err-code": "^2.0.3", "execa": "^5.0.0", diff --git a/packages/ipfs-core-utils/package.json b/packages/ipfs-core-utils/package.json index d338d8b20a..db583a2ca9 100644 --- a/packages/ipfs-core-utils/package.json +++ b/packages/ipfs-core-utils/package.json @@ -41,7 +41,7 @@ "any-signal": "^2.0.0", "blob-to-it": "^1.0.1", "browser-readablestream-to-it": "^1.0.1", - "cids": "git://github.com/multiformats/js-cid#multicodec-210", + "cids": "^1.0.0", "err-code": "^2.0.3", "ipfs-utils": "^5.0.0", "it-all": "^1.0.4", diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json index c012edaebd..a4269322a5 100644 --- a/packages/ipfs-core/package.json +++ b/packages/ipfs-core/package.json @@ -57,7 +57,7 @@ "array-shuffle": "^1.0.1", "bignumber.js": "^9.0.0", "cbor": "^5.1.0", - "cids": "git://github.com/multiformats/js-cid#multicodec-210", + "cids": "^1.0.0", "class-is": "^1.1.0", "dag-cbor-links": "^2.0.0", "datastore-core": "^2.0.0", diff --git a/packages/ipfs-http-client/package.json b/packages/ipfs-http-client/package.json index dd4ada6634..315abda5e0 100644 --- a/packages/ipfs-http-client/package.json +++ b/packages/ipfs-http-client/package.json @@ -52,7 +52,7 @@ "dependencies": { "any-signal": "^2.0.0", "bignumber.js": "^9.0.0", - "cids": "git://github.com/multiformats/js-cid#multicodec-210", + "cids": "^1.0.0", "debug": "^4.1.1", "form-data": "^3.0.0", "ipfs-core-utils": "^0.5.3", diff --git a/packages/ipfs-http-gateway/package.json b/packages/ipfs-http-gateway/package.json index a52439751a..d5add58cc9 100644 --- a/packages/ipfs-http-gateway/package.json +++ b/packages/ipfs-http-gateway/package.json @@ -32,7 +32,7 @@ "@hapi/ammo": "^5.0.1", "@hapi/boom": "^9.1.0", "@hapi/hapi": "^20.0.0", - "cids": "git://github.com/multiformats/js-cid#multicodec-210", + "cids": "^1.0.0", "debug": "^4.1.1", "hapi-pino": "^8.3.0", "ipfs-core-utils": "^0.5.3", diff --git a/packages/ipfs-http-server/package.json b/packages/ipfs-http-server/package.json index ba88d14bc9..23c1f2a4d5 100644 --- a/packages/ipfs-http-server/package.json +++ b/packages/ipfs-http-server/package.json @@ -32,7 +32,7 @@ "@hapi/boom": "^9.1.0", "@hapi/content": "^5.0.2", "@hapi/hapi": "^20.0.0", - "cids": "git://github.com/multiformats/js-cid#multicodec-210", + "cids": "^1.0.0", "debug": "^4.1.1", "dlv": "^1.1.3", "err-code": "^2.0.3", diff --git a/packages/ipfs-message-port-protocol/package.json b/packages/ipfs-message-port-protocol/package.json index 2ee6ec8527..4ca7dafd92 100644 --- a/packages/ipfs-message-port-protocol/package.json +++ b/packages/ipfs-message-port-protocol/package.json @@ -42,7 +42,7 @@ "dep-check": "aegir dep-check -i typescript -i rimraf" }, "dependencies": { - "cids": "git://github.com/multiformats/js-cid#multicodec-210", + "cids": "^1.0.0", "ipld-block": "^0.11.0" }, "devDependencies": { diff --git a/packages/ipfs-message-port-server/package.json b/packages/ipfs-message-port-server/package.json index 84dbd33625..90cb15a2ee 100644 --- a/packages/ipfs-message-port-server/package.json +++ b/packages/ipfs-message-port-server/package.json @@ -50,7 +50,7 @@ "devDependencies": { "@types/it-all": "^1.0.0", "aegir": "^29.2.2", - "cids": "git://github.com/multiformats/js-cid#multicodec-210", + "cids": "^1.0.0", "ipfs-utils": "^5.0.0", "rimraf": "^3.0.2", "typescript": "4.0.x" From 01a75cd178c6a08d844e9c5f483b7bf30321f666 Mon Sep 17 00:00:00 2001 From: Irakli Gozalishvili Date: Fri, 11 Dec 2020 13:14:19 -0800 Subject: [PATCH 04/13] fix: regression introduced by new cid & multicodec --- packages/ipfs-http-client/src/lib/ipld-formats.js | 3 ++- packages/ipfs-http-server/src/api/resources/block.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/ipfs-http-client/src/lib/ipld-formats.js b/packages/ipfs-http-client/src/lib/ipld-formats.js index 1ef4c4e8c6..7348b8505a 100644 --- a/packages/ipfs-http-client/src/lib/ipld-formats.js +++ b/packages/ipfs-http-client/src/lib/ipld-formats.js @@ -36,10 +36,11 @@ module.exports = ({ formats = [], loadFormat = noop } = {}) => { /** * Attempts to load an IPLD format for the passed CID * - * @param {string} codec - The code to load the format for + * @param {import('multicodec').CodecName} codec - The code to load the format for * @returns {Promise} - An IPLD format */ const loadResolver = async (codec) => { + // @ts-ignore - codec is a string and not a CodecName const number = multicodec.getNumber(codec) const format = configuredFormats[number] || await loadFormat(codec) diff --git a/packages/ipfs-http-server/src/api/resources/block.js b/packages/ipfs-http-server/src/api/resources/block.js index 5d8d9c65fa..523066c72f 100644 --- a/packages/ipfs-http-server/src/api/resources/block.js +++ b/packages/ipfs-http-server/src/api/resources/block.js @@ -1,7 +1,7 @@ 'use strict' const multihash = require('multihashing-async').multihash -const codecs = require('multicodec/src/base-table.json') +const { baseTable: codecs } = require('multicodec/src/base-table.js') const multipart = require('../../utils/multipart-request-parser') const Joi = require('../../utils/joi') const Boom = require('@hapi/boom') From 446da304a6a49e7843f4c9b3a322b3ca0a2e9e64 Mon Sep 17 00:00:00 2001 From: Irakli Gozalishvili Date: Mon, 14 Dec 2020 22:58:02 -0800 Subject: [PATCH 05/13] Revert "chore: fixed cid and multicodec versions (#3445)" This reverts commit eceb0d4fc313f8b8c763f508c0fab25eaa91c10a. --- examples/custom-ipld-formats/package.json | 2 +- packages/interface-ipfs-core/package.json | 2 +- packages/ipfs-cli/package.json | 2 +- packages/ipfs-core-utils/package.json | 2 +- packages/ipfs-core/.aegir.js | 2 +- packages/ipfs-core/package.json | 4 ++-- packages/ipfs-http-client/package.json | 4 ++-- packages/ipfs-http-gateway/package.json | 2 +- packages/ipfs-http-server/package.json | 2 +- packages/ipfs-message-port-protocol/package.json | 2 +- packages/ipfs-message-port-server/package.json | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/examples/custom-ipld-formats/package.json b/examples/custom-ipld-formats/package.json index 44caaf8fbc..1eff93f731 100644 --- a/examples/custom-ipld-formats/package.json +++ b/examples/custom-ipld-formats/package.json @@ -11,7 +11,7 @@ "test-ipfs-example": "^2.0.3" }, "dependencies": { - "cids": "1.0.2", + "cids": "^1.0.0", "ipfs-cli": "^0.1.0", "ipfs-core": "^0.2.1", "ipfs-http-client": "^48.1.1", diff --git a/packages/interface-ipfs-core/package.json b/packages/interface-ipfs-core/package.json index 22deac5b3c..ec0df71dc6 100644 --- a/packages/interface-ipfs-core/package.json +++ b/packages/interface-ipfs-core/package.json @@ -34,7 +34,7 @@ "chai": "^4.2.0", "chai-as-promised": "^7.1.1", "chai-subset": "^1.6.0", - "cids": "1.0.2", + "cids": "^1.0.0", "delay": "^4.4.0", "dirty-chai": "^2.0.1", "err-code": "^2.0.3", diff --git a/packages/ipfs-cli/package.json b/packages/ipfs-cli/package.json index 2939d078b4..5a07a23034 100644 --- a/packages/ipfs-cli/package.json +++ b/packages/ipfs-cli/package.json @@ -32,7 +32,7 @@ "bignumber.js": "^9.0.0", "byteman": "^1.3.5", "cid-tool": "^1.0.0", - "cids": "1.0.2", + "cids": "^1.0.0", "debug": "^4.1.1", "err-code": "^2.0.3", "execa": "^5.0.0", diff --git a/packages/ipfs-core-utils/package.json b/packages/ipfs-core-utils/package.json index 57e2aa3361..db583a2ca9 100644 --- a/packages/ipfs-core-utils/package.json +++ b/packages/ipfs-core-utils/package.json @@ -41,7 +41,7 @@ "any-signal": "^2.0.0", "blob-to-it": "^1.0.1", "browser-readablestream-to-it": "^1.0.1", - "cids": "1.0.2", + "cids": "^1.0.0", "err-code": "^2.0.3", "ipfs-utils": "^5.0.0", "it-all": "^1.0.4", diff --git a/packages/ipfs-core/.aegir.js b/packages/ipfs-core/.aegir.js index 5b46973aa3..a11af408f4 100644 --- a/packages/ipfs-core/.aegir.js +++ b/packages/ipfs-core/.aegir.js @@ -8,7 +8,7 @@ let preloadNode = MockPreloadNode.createNode() let ipfsdServer module.exports = { - bundlesize: { maxSize: '550kB' }, + bundlesize: { maxSize: '524kB' }, karma: { files: [{ pattern: 'node_modules/interface-ipfs-core/test/fixtures/**/*', diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json index 4266514814..a4269322a5 100644 --- a/packages/ipfs-core/package.json +++ b/packages/ipfs-core/package.json @@ -57,7 +57,7 @@ "array-shuffle": "^1.0.1", "bignumber.js": "^9.0.0", "cbor": "^5.1.0", - "cids": "1.0.2", + "cids": "^1.0.0", "class-is": "^1.1.0", "dag-cbor-links": "^2.0.0", "datastore-core": "^2.0.0", @@ -107,7 +107,7 @@ "multiaddr": "^8.0.0", "multiaddr-to-uri": "^6.0.0", "multibase": "^3.0.0", - "multicodec": "2.0.4", + "multicodec": "^2.0.1", "multihashing-async": "^2.0.1", "native-abort-controller": "~0.0.3", "p-queue": "^6.6.1", diff --git a/packages/ipfs-http-client/package.json b/packages/ipfs-http-client/package.json index 7bc9f9a1dc..315abda5e0 100644 --- a/packages/ipfs-http-client/package.json +++ b/packages/ipfs-http-client/package.json @@ -52,7 +52,7 @@ "dependencies": { "any-signal": "^2.0.0", "bignumber.js": "^9.0.0", - "cids": "1.0.2", + "cids": "^1.0.0", "debug": "^4.1.1", "form-data": "^3.0.0", "ipfs-core-utils": "^0.5.3", @@ -68,7 +68,7 @@ "merge-options": "^2.0.0", "multiaddr": "^8.0.0", "multibase": "^3.0.0", - "multicodec": "2.0.4", + "multicodec": "^2.0.1", "multihashes": "^3.0.1", "nanoid": "^3.1.12", "native-abort-controller": "~0.0.3", diff --git a/packages/ipfs-http-gateway/package.json b/packages/ipfs-http-gateway/package.json index bd12d8d24f..d5add58cc9 100644 --- a/packages/ipfs-http-gateway/package.json +++ b/packages/ipfs-http-gateway/package.json @@ -32,7 +32,7 @@ "@hapi/ammo": "^5.0.1", "@hapi/boom": "^9.1.0", "@hapi/hapi": "^20.0.0", - "cids": "1.0.2", + "cids": "^1.0.0", "debug": "^4.1.1", "hapi-pino": "^8.3.0", "ipfs-core-utils": "^0.5.3", diff --git a/packages/ipfs-http-server/package.json b/packages/ipfs-http-server/package.json index 25d2aae78b..23c1f2a4d5 100644 --- a/packages/ipfs-http-server/package.json +++ b/packages/ipfs-http-server/package.json @@ -32,7 +32,7 @@ "@hapi/boom": "^9.1.0", "@hapi/content": "^5.0.2", "@hapi/hapi": "^20.0.0", - "cids": "1.0.2", + "cids": "^1.0.0", "debug": "^4.1.1", "dlv": "^1.1.3", "err-code": "^2.0.3", diff --git a/packages/ipfs-message-port-protocol/package.json b/packages/ipfs-message-port-protocol/package.json index e413fc3cf2..4ca7dafd92 100644 --- a/packages/ipfs-message-port-protocol/package.json +++ b/packages/ipfs-message-port-protocol/package.json @@ -42,7 +42,7 @@ "dep-check": "aegir dep-check -i typescript -i rimraf" }, "dependencies": { - "cids": "1.0.2", + "cids": "^1.0.0", "ipld-block": "^0.11.0" }, "devDependencies": { diff --git a/packages/ipfs-message-port-server/package.json b/packages/ipfs-message-port-server/package.json index 80b0628369..90cb15a2ee 100644 --- a/packages/ipfs-message-port-server/package.json +++ b/packages/ipfs-message-port-server/package.json @@ -50,7 +50,7 @@ "devDependencies": { "@types/it-all": "^1.0.0", "aegir": "^29.2.2", - "cids": "1.0.2", + "cids": "^1.0.0", "ipfs-utils": "^5.0.0", "rimraf": "^3.0.2", "typescript": "4.0.x" From 2d3268f539b296660b0e74197b09a12051cdb013 Mon Sep 17 00:00:00 2001 From: Irakli Gozalishvili Date: Tue, 15 Dec 2020 00:20:41 -0800 Subject: [PATCH 06/13] chore: fix remaning type missmatches --- packages/ipfs-cli/src/utils.js | 2 +- packages/ipfs-core-utils/src/cid.js | 2 +- packages/ipfs-core/src/components/resolve.js | 2 +- packages/ipfs-http-client/src/dag/put.js | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/ipfs-cli/src/utils.js b/packages/ipfs-cli/src/utils.js index 82f54a477c..0bb6320956 100644 --- a/packages/ipfs-cli/src/utils.js +++ b/packages/ipfs-cli/src/utils.js @@ -252,7 +252,7 @@ const escapeControlCharacters = (str) => { * CID properties * * @param {object} obj - all keys/values in this object will be have control characters stripped - * @param {string} cidBase - any encountered CIDs will be stringified using this base + * @param {import('cids').BaseNameOrCode} cidBase - any encountered CIDs will be stringified using this base * @returns {object} */ const makeEntriesPrintable = (obj, cidBase = 'base58btc') => { diff --git a/packages/ipfs-core-utils/src/cid.js b/packages/ipfs-core-utils/src/cid.js index b0578d375c..e9a3b6baef 100644 --- a/packages/ipfs-core-utils/src/cid.js +++ b/packages/ipfs-core-utils/src/cid.js @@ -12,7 +12,7 @@ const CID = require('cids') * * @param {CID|Uint8Array|string} input - The CID to encode * @param {Object} [options] - Optional options - * @param {string} [options.base] - Name of multibase codec to encode the CID with + * @param {import('cids').BaseNameOrCode} [options.base] - Name of multibase codec to encode the CID with * @param {boolean} [options.upgrade] - Automatically upgrade v0 CIDs to v1 when * necessary. Default: true. * @returns {string} - CID in string representation diff --git a/packages/ipfs-core/src/components/resolve.js b/packages/ipfs-core/src/components/resolve.js index 3336e4d7cf..9c6b0b3ef7 100644 --- a/packages/ipfs-core/src/components/resolve.js +++ b/packages/ipfs-core/src/components/resolve.js @@ -100,7 +100,7 @@ module.exports = ({ ipld, name }) => { * * @typedef {Object} ResolveSettings * @property {boolean} [recursive=true] - Resolve until result is an IPFS name. - * @property {string} [cidBase='base58btc'] - Multibase codec name the CID in the resolved path will be encoded with. + * @property {import('cids').BaseNameOrCode} [cidBase='base58btc'] - Multibase codec name the CID in the resolved path will be encoded with. * * @typedef {import('.').AbortOptions} AbortOptions */ diff --git a/packages/ipfs-http-client/src/dag/put.js b/packages/ipfs-http-client/src/dag/put.js index 1f58b32278..c06e43f625 100644 --- a/packages/ipfs-http-client/src/dag/put.js +++ b/packages/ipfs-http-client/src/dag/put.js @@ -28,6 +28,7 @@ module.exports = configure((api, opts) => { const cid = new CID(options.cid) encodingOptions = { ...options, + // @ts-expect-error - https://github.com/multiformats/js-cid/pull/138 format: multicodec.getName(cid.code), hashAlg: multihash.decode(cid.multihash).name } From a51a6e5dc4397e843c4e7ef5ade0c5878724d393 Mon Sep 17 00:00:00 2001 From: Irakli Gozalishvili Date: Tue, 15 Dec 2020 01:38:13 -0800 Subject: [PATCH 07/13] fix: regressions in examples --- examples/custom-ipld-formats/daemon-node.js | 2 +- examples/custom-ipld-formats/in-process-node.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/custom-ipld-formats/daemon-node.js b/examples/custom-ipld-formats/daemon-node.js index 939e6cd410..ef32b9131e 100644 --- a/examples/custom-ipld-formats/daemon-node.js +++ b/examples/custom-ipld-formats/daemon-node.js @@ -5,7 +5,7 @@ const codecName = 'dag-test' const codecNumber = 392091 -const baseTable = require('multicodec/src/base-table.json') +const { baseTable } = require('multicodec/src/base-table') baseTable[codecName] = codecNumber // now require modules as usual diff --git a/examples/custom-ipld-formats/in-process-node.js b/examples/custom-ipld-formats/in-process-node.js index 9fa19214ff..2e64229bcb 100644 --- a/examples/custom-ipld-formats/in-process-node.js +++ b/examples/custom-ipld-formats/in-process-node.js @@ -5,7 +5,7 @@ const codecName = 'dag-test' const codecNumber = 392091 -const baseTable = require('multicodec/src/base-table.json') +const { baseTable } = require('multicodec/src/base-table') baseTable[codecName] = codecNumber // now require modules as usual From 58d5d0c44cba97d02e7b5d982486a9b4db118c47 Mon Sep 17 00:00:00 2001 From: Irakli Gozalishvili Date: Tue, 15 Dec 2020 01:40:17 -0800 Subject: [PATCH 08/13] chore: revert bundle size --- packages/ipfs-core/.aegir.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ipfs-core/.aegir.js b/packages/ipfs-core/.aegir.js index a11af408f4..5b46973aa3 100644 --- a/packages/ipfs-core/.aegir.js +++ b/packages/ipfs-core/.aegir.js @@ -8,7 +8,7 @@ let preloadNode = MockPreloadNode.createNode() let ipfsdServer module.exports = { - bundlesize: { maxSize: '524kB' }, + bundlesize: { maxSize: '550kB' }, karma: { files: [{ pattern: 'node_modules/interface-ipfs-core/test/fixtures/**/*', From f032cbd98303638feb58d077e696ca6e24c77a3b Mon Sep 17 00:00:00 2001 From: achingbrain Date: Tue, 15 Dec 2020 13:31:37 +0000 Subject: [PATCH 09/13] chore: fix failing test --- examples/custom-ipld-formats/daemon-node.js | 8 ++++++-- examples/custom-ipld-formats/in-process-node.js | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/examples/custom-ipld-formats/daemon-node.js b/examples/custom-ipld-formats/daemon-node.js index ef32b9131e..3a21a69db5 100644 --- a/examples/custom-ipld-formats/daemon-node.js +++ b/examples/custom-ipld-formats/daemon-node.js @@ -5,8 +5,12 @@ const codecName = 'dag-test' const codecNumber = 392091 -const { baseTable } = require('multicodec/src/base-table') -baseTable[codecName] = codecNumber +const table = require('multicodec/src/base-table') +// @ts-ignore +table.baseTable = { + ...table.baseTable, + [codecName]: codecNumber +} // now require modules as usual const IPFSDaemon = require('ipfs-cli/src/daemon') diff --git a/examples/custom-ipld-formats/in-process-node.js b/examples/custom-ipld-formats/in-process-node.js index 2e64229bcb..3bfcee48e2 100644 --- a/examples/custom-ipld-formats/in-process-node.js +++ b/examples/custom-ipld-formats/in-process-node.js @@ -5,8 +5,12 @@ const codecName = 'dag-test' const codecNumber = 392091 -const { baseTable } = require('multicodec/src/base-table') -baseTable[codecName] = codecNumber +const table = require('multicodec/src/base-table') +// @ts-ignore +table.baseTable = { + ...table.baseTable, + [codecName]: codecNumber +} // now require modules as usual const IPFS = require('ipfs-core') From 8b185ae9d470257c4626ec2a7ef17e42d24eb372 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Tue, 15 Dec 2020 13:45:48 +0000 Subject: [PATCH 10/13] chore: update require --- packages/ipfs-http-server/src/api/resources/block.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ipfs-http-server/src/api/resources/block.js b/packages/ipfs-http-server/src/api/resources/block.js index 523066c72f..d3288587d1 100644 --- a/packages/ipfs-http-server/src/api/resources/block.js +++ b/packages/ipfs-http-server/src/api/resources/block.js @@ -1,7 +1,7 @@ 'use strict' const multihash = require('multihashing-async').multihash -const { baseTable: codecs } = require('multicodec/src/base-table.js') +const { baseTable: codecs } = require('multicodec/src/base-table') const multipart = require('../../utils/multipart-request-parser') const Joi = require('../../utils/joi') const Boom = require('@hapi/boom') From f5a37a658fe3bfb1c9be353d1e1b6c7d19418d7e Mon Sep 17 00:00:00 2001 From: achingbrain Date: Tue, 15 Dec 2020 14:56:00 +0000 Subject: [PATCH 11/13] chore: update deps --- examples/custom-ipld-formats/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/custom-ipld-formats/package.json b/examples/custom-ipld-formats/package.json index 1eff93f731..5ee26180ff 100644 --- a/examples/custom-ipld-formats/package.json +++ b/examples/custom-ipld-formats/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "cids": "^1.0.0", - "ipfs-cli": "^0.1.0", - "ipfs-core": "^0.2.1", - "ipfs-http-client": "^48.1.1", + "ipfs-cli": "^0.2.2", + "ipfs-core": "^0.3.0", + "ipfs-http-client": "^48.1.2", "multicodec": "^2.0.1", "multihashing-async": "^2.0.1", "uint8arrays": "^1.1.0" From b568e26cc9975f23384a1d2d26b4440e515b04a5 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Tue, 15 Dec 2020 16:52:27 +0000 Subject: [PATCH 12/13] chore: use daemon class instead of cli which does not have it any more --- examples/custom-ipld-formats/daemon-node.js | 2 +- examples/custom-ipld-formats/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/custom-ipld-formats/daemon-node.js b/examples/custom-ipld-formats/daemon-node.js index 3a21a69db5..fae244020f 100644 --- a/examples/custom-ipld-formats/daemon-node.js +++ b/examples/custom-ipld-formats/daemon-node.js @@ -13,7 +13,7 @@ table.baseTable = { } // now require modules as usual -const IPFSDaemon = require('ipfs-cli/src/daemon') +const IPFSDaemon = require('ipfs-daemon') const multihashing = require('multihashing-async') const multihash = multihashing.multihash const multicodec = require('multicodec') diff --git a/examples/custom-ipld-formats/package.json b/examples/custom-ipld-formats/package.json index 5ee26180ff..3e4b5f3c01 100644 --- a/examples/custom-ipld-formats/package.json +++ b/examples/custom-ipld-formats/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "cids": "^1.0.0", - "ipfs-cli": "^0.2.2", + "ipfs-daemon": "^0.3.1", "ipfs-core": "^0.3.0", "ipfs-http-client": "^48.1.2", "multicodec": "^2.0.1", From a699b9d5f5518af83a0392c896e5ba0e20dbcb1a Mon Sep 17 00:00:00 2001 From: achingbrain Date: Tue, 15 Dec 2020 21:12:13 +0000 Subject: [PATCH 13/13] chore: align versions and remove ts-ignore --- 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 | 4 ++-- examples/browser-http-client-upload-file/package.json | 4 ++-- examples/browser-ipns-publish/package.json | 4 ++-- 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 +- examples/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 | 4 ++-- examples/custom-ipfs-repo/package.json | 2 +- examples/custom-libp2p/package.json | 2 +- examples/explore-ethereum-blockchain/package.json | 4 ++-- examples/http-client-browser-pubsub/package.json | 4 ++-- examples/http-client-bundle-webpack/package.json | 4 ++-- examples/http-client-name-api/package.json | 2 +- examples/ipfs-101/package.json | 2 +- examples/run-in-electron/package.json | 2 +- examples/running-multiple-nodes/package.json | 2 +- examples/traverse-ipld-graphs/package.json | 2 +- examples/types-use-ipfs-from-ts/package.json | 2 +- examples/types-use-ipfs-from-ts/src/main.ts | 1 - examples/types-use-ipfs-from-typed-js/package.json | 2 +- examples/types-use-ipfs-from-typed-js/src/main.js | 1 - 30 files changed, 35 insertions(+), 37 deletions(-) diff --git a/examples/browser-add-readable-stream/package.json b/examples/browser-add-readable-stream/package.json index a4a9e16ec7..b7ad55a006 100644 --- a/examples/browser-add-readable-stream/package.json +++ b/examples/browser-add-readable-stream/package.json @@ -12,7 +12,7 @@ "keywords": [], "license": "MIT", "devDependencies": { - "ipfs": "^0.52.1", + "ipfs": "^0.52.2", "test-ipfs-example": "^2.0.3" } } diff --git a/examples/browser-browserify/package.json b/examples/browser-browserify/package.json index 7992059dd0..44891ed73b 100644 --- a/examples/browser-browserify/package.json +++ b/examples/browser-browserify/package.json @@ -18,7 +18,7 @@ "concat-stream": "^2.0.0", "execa": "^4.0.3", "http-server": "^0.12.3", - "ipfs": "^0.52.1", + "ipfs": "^0.52.2", "rimraf": "^3.0.2", "test-ipfs-example": "^2.0.3" }, diff --git a/examples/browser-create-react-app/package.json b/examples/browser-create-react-app/package.json index 6e58c264e3..e89e9ff04a 100644 --- a/examples/browser-create-react-app/package.json +++ b/examples/browser-create-react-app/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "dot-prop": "^5.0.0", - "ipfs": "^0.52.1", + "ipfs": "^0.52.2", "ipfs-css": "^0.13.1", "react": "^16.8.6", "react-dom": "^16.8.6", diff --git a/examples/browser-exchange-files/package.json b/examples/browser-exchange-files/package.json index 4a4effe818..0f2458792d 100644 --- a/examples/browser-exchange-files/package.json +++ b/examples/browser-exchange-files/package.json @@ -14,11 +14,11 @@ "browserify": "^16.2.3", "execa": "^4.0.3", "http-server": "^0.12.3", - "ipfs-http-client": "^48.1.1", + "ipfs-http-client": "^48.1.2", "uint8arrays": "^1.1.0" }, "dependencies": { - "ipfs": "^0.52.1", + "ipfs": "^0.52.2", "it-all": "^1.0.4", "rimraf": "^3.0.2", "test-ipfs-example": "^2.0.3" diff --git a/examples/browser-http-client-upload-file/package.json b/examples/browser-http-client-upload-file/package.json index 1fb5fb6596..8b7bfc666b 100644 --- a/examples/browser-http-client-upload-file/package.json +++ b/examples/browser-http-client-upload-file/package.json @@ -15,10 +15,10 @@ ], "license": "MIT", "dependencies": { - "ipfs-http-client": "^48.1.1" + "ipfs-http-client": "^48.1.2" }, "devDependencies": { - "ipfs": "^0.52.1", + "ipfs": "^0.52.2", "parcel-bundler": "^1.12.4", "react": "^16.8.6", "react-dom": "^16.8.6", diff --git a/examples/browser-ipns-publish/package.json b/examples/browser-ipns-publish/package.json index fbdc1f0029..417b7edb8a 100644 --- a/examples/browser-ipns-publish/package.json +++ b/examples/browser-ipns-publish/package.json @@ -13,8 +13,8 @@ "license": "MIT", "dependencies": { "human-crypto-keys": "^0.1.4", - "ipfs": "^0.52.1", - "ipfs-http-client": "^48.1.1", + "ipfs": "^0.52.2", + "ipfs-http-client": "^48.1.2", "ipfs-utils": "^5.0.0", "ipns": "^0.8.0", "it-last": "^1.0.4", diff --git a/examples/browser-mfs/package.json b/examples/browser-mfs/package.json index d8b32d1bd3..77db2343af 100644 --- a/examples/browser-mfs/package.json +++ b/examples/browser-mfs/package.json @@ -22,7 +22,7 @@ "webpack-cli": "^3.3.11" }, "dependencies": { - "ipfs": "^0.52.1", + "ipfs": "^0.52.2", "mime-sniffer": "~0.0.3" } } diff --git a/examples/browser-parceljs/package.json b/examples/browser-parceljs/package.json index 5161e96a86..dabbcd22f5 100644 --- a/examples/browser-parceljs/package.json +++ b/examples/browser-parceljs/package.json @@ -18,7 +18,7 @@ "author": "", "license": "ISC", "dependencies": { - "ipfs": "^0.52.1" + "ipfs": "^0.52.2" }, "devDependencies": { "@babel/cli": "^7.1.5", diff --git a/examples/browser-readablestream/package.json b/examples/browser-readablestream/package.json index a7f383f4d1..9499461604 100644 --- a/examples/browser-readablestream/package.json +++ b/examples/browser-readablestream/package.json @@ -21,7 +21,7 @@ "webpack": "^4.43.0" }, "dependencies": { - "ipfs": "^0.52.1", + "ipfs": "^0.52.2", "it-to-stream": "^0.1.2", "videostream": "^3.2.0" } diff --git a/examples/browser-script-tag/package.json b/examples/browser-script-tag/package.json index 4947cff63b..f55711d7dc 100644 --- a/examples/browser-script-tag/package.json +++ b/examples/browser-script-tag/package.json @@ -16,6 +16,6 @@ "test-ipfs-example": "^2.0.3" }, "dependencies": { - "ipfs": "^0.52.1" + "ipfs": "^0.52.2" } } diff --git a/examples/browser-service-worker/package.json b/examples/browser-service-worker/package.json index 4e13489bca..9c7075b426 100644 --- a/examples/browser-service-worker/package.json +++ b/examples/browser-service-worker/package.json @@ -22,7 +22,7 @@ "webpack-dev-server": "3.11.0" }, "dependencies": { - "ipfs": "^0.51.0", + "ipfs": "^0.52.0", "ipfs-message-port-client": "^0.3.0", "ipfs-message-port-protocol": "^0.3.0", "ipfs-message-port-server": "^0.3.0", diff --git a/examples/browser-sharing-node-across-tabs/package.json b/examples/browser-sharing-node-across-tabs/package.json index 6fefe8a2c9..7b3ccc9ae8 100644 --- a/examples/browser-sharing-node-across-tabs/package.json +++ b/examples/browser-sharing-node-across-tabs/package.json @@ -24,7 +24,7 @@ "worker-plugin": "4.0.3" }, "dependencies": { - "ipfs": "^0.52.1", + "ipfs": "^0.52.2", "ipfs-message-port-client": "^0.4.1", "ipfs-message-port-server": "^0.4.1" }, diff --git a/examples/browser-video-streaming/package.json b/examples/browser-video-streaming/package.json index 2444a67cba..3eab9b4f46 100644 --- a/examples/browser-video-streaming/package.json +++ b/examples/browser-video-streaming/package.json @@ -16,6 +16,6 @@ "test-ipfs-example": "^2.0.3" }, "dependencies": { - "ipfs": "^0.52.1" + "ipfs": "^0.52.2" } } diff --git a/examples/browser-vue/package.json b/examples/browser-vue/package.json index bd1d36a34b..b23680976a 100644 --- a/examples/browser-vue/package.json +++ b/examples/browser-vue/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "core-js": "^3.6.4", - "ipfs": "^0.52.1", + "ipfs": "^0.52.2", "vue": "^2.6.11" }, "devDependencies": { diff --git a/examples/browser-webpack/package.json b/examples/browser-webpack/package.json index 3615ac770e..a879e62c8d 100644 --- a/examples/browser-webpack/package.json +++ b/examples/browser-webpack/package.json @@ -27,7 +27,7 @@ "webpack-dev-server": "^3.11.0" }, "dependencies": { - "ipfs": "^0.52.1" + "ipfs": "^0.52.2" }, "browserslist": [ ">1%", diff --git a/examples/circuit-relaying/package.json b/examples/circuit-relaying/package.json index 2ae2071b99..3a7a55bc05 100644 --- a/examples/circuit-relaying/package.json +++ b/examples/circuit-relaying/package.json @@ -15,14 +15,14 @@ "license": "MIT", "dependencies": { "delay": "^4.4.0", - "ipfs": "^0.52.1", + "ipfs": "^0.52.2", "ipfs-pubsub-room": "^2.0.1", "uint8arrays": "^1.1.0" }, "devDependencies": { "execa": "^4.0.3", "ipfs-css": "^0.13.1", - "ipfs-http-client": "^48.1.1", + "ipfs-http-client": "^48.1.2", "parcel-bundler": "^1.12.4", "rimraf": "^3.0.2", "tachyons": "^4.11.1", diff --git a/examples/custom-ipfs-repo/package.json b/examples/custom-ipfs-repo/package.json index 8cfc596ef9..da2f9c0dc8 100644 --- a/examples/custom-ipfs-repo/package.json +++ b/examples/custom-ipfs-repo/package.json @@ -11,7 +11,7 @@ "license": "MIT", "dependencies": { "datastore-fs": "^2.0.0", - "ipfs": "^0.52.1", + "ipfs": "^0.52.2", "ipfs-repo": "^7.0.0", "it-all": "^1.0.4" }, diff --git a/examples/custom-libp2p/package.json b/examples/custom-libp2p/package.json index 8b18ac2411..0988f32889 100644 --- a/examples/custom-libp2p/package.json +++ b/examples/custom-libp2p/package.json @@ -10,7 +10,7 @@ }, "license": "MIT", "dependencies": { - "ipfs": "^0.52.1", + "ipfs": "^0.52.2", "libp2p": "^0.29.3", "libp2p-bootstrap": "^0.12.1", "libp2p-kad-dht": "^0.20.1", diff --git a/examples/explore-ethereum-blockchain/package.json b/examples/explore-ethereum-blockchain/package.json index 097783c2f0..0d4ec63e96 100644 --- a/examples/explore-ethereum-blockchain/package.json +++ b/examples/explore-ethereum-blockchain/package.json @@ -10,8 +10,8 @@ "keywords": [], "license": "MIT", "devDependencies": { - "ipfs": "^0.52.1", - "ipfs-http-client": "^48.1.1", + "ipfs": "^0.52.2", + "ipfs-http-client": "^48.1.2", "ipfsd-ctl": "^7.1.1", "ipld-ethereum": "^5.0.1", "test-ipfs-example": "^2.0.3" diff --git a/examples/http-client-browser-pubsub/package.json b/examples/http-client-browser-pubsub/package.json index 36b9c8b1fd..a2620020c3 100644 --- a/examples/http-client-browser-pubsub/package.json +++ b/examples/http-client-browser-pubsub/package.json @@ -12,7 +12,7 @@ "author": "Alan Shaw", "license": "MIT", "dependencies": { - "ipfs-http-client": "^48.1.1" + "ipfs-http-client": "^48.1.2" }, "browserslist": [ "last 2 versions and not dead and > 2%" @@ -20,7 +20,7 @@ "devDependencies": { "execa": "^4.0.3", "go-ipfs": "^0.7.0", - "ipfs": "^0.52.1", + "ipfs": "^0.52.2", "ipfsd-ctl": "^7.1.1", "parcel-bundler": "^1.12.4", "test-ipfs-example": "^2.0.3" diff --git a/examples/http-client-bundle-webpack/package.json b/examples/http-client-bundle-webpack/package.json index 6d9b00b922..92fd387d19 100644 --- a/examples/http-client-bundle-webpack/package.json +++ b/examples/http-client-bundle-webpack/package.json @@ -13,7 +13,7 @@ "license": "MIT", "keywords": [], "dependencies": { - "ipfs-http-client": "^48.1.1", + "ipfs-http-client": "^48.1.2", "react": "^16.8.6", "react-dom": "^16.8.6" }, @@ -24,7 +24,7 @@ "babel-loader": "^8.0.5", "copy-webpack-plugin": "^5.0.4", "execa": "^4.0.3", - "ipfs": "^0.52.1", + "ipfs": "^0.52.2", "ipfsd-ctl": "^7.1.1", "react-hot-loader": "^4.12.21", "rimraf": "^3.0.2", diff --git a/examples/http-client-name-api/package.json b/examples/http-client-name-api/package.json index 90e0c1ab0c..f7e7bf9df2 100644 --- a/examples/http-client-name-api/package.json +++ b/examples/http-client-name-api/package.json @@ -13,7 +13,7 @@ "author": "Tara Vancil ", "license": "MIT", "dependencies": { - "ipfs-http-client": "^48.1.1" + "ipfs-http-client": "^48.1.2" }, "devDependencies": { "execa": "^4.0.3", diff --git a/examples/ipfs-101/package.json b/examples/ipfs-101/package.json index 3367d34bc9..6e0685d1a6 100644 --- a/examples/ipfs-101/package.json +++ b/examples/ipfs-101/package.json @@ -10,7 +10,7 @@ "author": "David Dias ", "license": "MIT", "dependencies": { - "ipfs": "^0.52.1", + "ipfs": "^0.52.2", "it-all": "^1.0.4", "uint8arrays": "^1.1.0" }, diff --git a/examples/run-in-electron/package.json b/examples/run-in-electron/package.json index 07121a55d2..25599fc1a4 100644 --- a/examples/run-in-electron/package.json +++ b/examples/run-in-electron/package.json @@ -18,7 +18,7 @@ "devDependencies": { "electron": "^6.0.0", "electron-rebuild": "^1.8.4", - "ipfs": "^0.52.1", + "ipfs": "^0.52.2", "test-ipfs-example": "^2.0.3" }, "greenkeeper": { diff --git a/examples/running-multiple-nodes/package.json b/examples/running-multiple-nodes/package.json index 17b5806d42..930970cd19 100644 --- a/examples/running-multiple-nodes/package.json +++ b/examples/running-multiple-nodes/package.json @@ -13,6 +13,6 @@ "test-ipfs-example": "^2.0.3" }, "dependencies": { - "ipfs": "^0.52.1" + "ipfs": "^0.52.2" } } diff --git a/examples/traverse-ipld-graphs/package.json b/examples/traverse-ipld-graphs/package.json index 18a028d849..27747ba097 100644 --- a/examples/traverse-ipld-graphs/package.json +++ b/examples/traverse-ipld-graphs/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "cids": "^1.0.0", - "ipfs": "^0.52.1", + "ipfs": "^0.52.2", "ipld-block": "^0.11.0", "ipld-dag-pb": "^0.20.0", "ipld-git": "^0.6.1", diff --git a/examples/types-use-ipfs-from-ts/package.json b/examples/types-use-ipfs-from-ts/package.json index f36edbd714..621c28d90c 100644 --- a/examples/types-use-ipfs-from-ts/package.json +++ b/examples/types-use-ipfs-from-ts/package.json @@ -2,7 +2,7 @@ "name": "example-types-use-ipfs-from-ts", "private": true, "dependencies": { - "ipfs": "^0.52.1" + "ipfs": "^0.52.2" }, "devDependencies": { "typescript": "4.0.x" diff --git a/examples/types-use-ipfs-from-ts/src/main.ts b/examples/types-use-ipfs-from-ts/src/main.ts index a6763cade9..29e1741602 100644 --- a/examples/types-use-ipfs-from-ts/src/main.ts +++ b/examples/types-use-ipfs-from-ts/src/main.ts @@ -14,7 +14,6 @@ export default async function main() { console.log('Added file:', file.path, file.cid.toString()) try { - // @ts-expect-error CID has no toUpperCase method file.cid.toUpperCase() } catch (error) { diff --git a/examples/types-use-ipfs-from-typed-js/package.json b/examples/types-use-ipfs-from-typed-js/package.json index c5912b4e55..c49141ca16 100644 --- a/examples/types-use-ipfs-from-typed-js/package.json +++ b/examples/types-use-ipfs-from-typed-js/package.json @@ -2,7 +2,7 @@ "name": "example-types-use-ipfs-from-typed-js", "private": true, "dependencies": { - "ipfs": "^0.52.1" + "ipfs": "^0.52.2" }, "devDependencies": { "typescript": "4.0.x" diff --git a/examples/types-use-ipfs-from-typed-js/src/main.js b/examples/types-use-ipfs-from-typed-js/src/main.js index 0ff2166786..5e24546705 100644 --- a/examples/types-use-ipfs-from-typed-js/src/main.js +++ b/examples/types-use-ipfs-from-typed-js/src/main.js @@ -17,7 +17,6 @@ async function main () { console.log('Added file:', file.path, file.cid.toString()) try { - // @ts-expect-error CID has no toUpperCase method file.cid.toUpperCase() } catch(error) {