From 0e8bfb56a9691b559a2ecc641987531263e71aeb Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Wed, 28 Jul 2021 20:00:32 +0100 Subject: [PATCH 01/10] chore: update uint8arrays --- examples/browser-exchange-files/package.json | 2 +- examples/browser-exchange-files/public/app.js | 4 ++-- examples/browser-ipns-publish/index.js | 4 ++-- examples/browser-ipns-publish/package.json | 2 +- examples/circuit-relaying/package.json | 2 +- examples/circuit-relaying/src/helpers.js | 6 +++--- examples/custom-ipld-formats/daemon-node.js | 4 ++-- examples/custom-ipld-formats/in-process-node.js | 4 ++-- examples/custom-ipld-formats/package.json | 2 +- examples/ipfs-101/1.js | 6 +++--- examples/ipfs-101/package.json | 2 +- examples/test-ipfs-example/package.json | 2 +- examples/test-ipfs-example/utils.js | 2 +- packages/interface-ipfs-core/package.json | 2 +- packages/interface-ipfs-core/src/add-all.js | 2 +- packages/interface-ipfs-core/src/add.js | 2 +- packages/interface-ipfs-core/src/bitswap/transfer.js | 2 +- packages/interface-ipfs-core/src/block/get.js | 2 +- packages/interface-ipfs-core/src/block/put.js | 2 +- packages/interface-ipfs-core/src/block/rm.js | 2 +- packages/interface-ipfs-core/src/block/stat.js | 2 +- packages/interface-ipfs-core/src/cat.js | 6 +++--- packages/interface-ipfs-core/src/config/set.js | 2 +- packages/interface-ipfs-core/src/dag/export.js | 2 +- packages/interface-ipfs-core/src/dag/get.js | 2 +- packages/interface-ipfs-core/src/dag/import.js | 2 +- packages/interface-ipfs-core/src/dag/put.js | 2 +- packages/interface-ipfs-core/src/dag/resolve.js | 2 +- packages/interface-ipfs-core/src/dht/get.js | 4 ++-- packages/interface-ipfs-core/src/dht/provide.js | 2 +- packages/interface-ipfs-core/src/dht/utils.js | 2 +- packages/interface-ipfs-core/src/files/chmod.js | 2 +- packages/interface-ipfs-core/src/files/cp.js | 4 ++-- packages/interface-ipfs-core/src/files/ls.js | 2 +- packages/interface-ipfs-core/src/files/mv.js | 4 ++-- packages/interface-ipfs-core/src/files/read.js | 2 +- packages/interface-ipfs-core/src/files/stat.js | 2 +- packages/interface-ipfs-core/src/files/touch.js | 4 ++-- packages/interface-ipfs-core/src/files/write.js | 4 ++-- packages/interface-ipfs-core/src/get.js | 6 +++--- packages/interface-ipfs-core/src/miscellaneous/resolve.js | 2 +- packages/interface-ipfs-core/src/name-pubsub/pubsub.js | 4 ++-- packages/interface-ipfs-core/src/name/publish.js | 2 +- packages/interface-ipfs-core/src/name/resolve.js | 2 +- packages/interface-ipfs-core/src/name/utils.js | 4 ++-- packages/interface-ipfs-core/src/object/data.js | 2 +- packages/interface-ipfs-core/src/object/get.js | 2 +- packages/interface-ipfs-core/src/object/links.js | 2 +- packages/interface-ipfs-core/src/object/patch/add-link.js | 2 +- .../interface-ipfs-core/src/object/patch/append-data.js | 2 +- packages/interface-ipfs-core/src/object/patch/rm-link.js | 2 +- packages/interface-ipfs-core/src/object/patch/set-data.js | 2 +- packages/interface-ipfs-core/src/object/put.js | 2 +- packages/interface-ipfs-core/src/object/stat.js | 2 +- packages/interface-ipfs-core/src/pin/add.js | 2 +- packages/interface-ipfs-core/src/pin/utils.js | 4 ++-- packages/interface-ipfs-core/src/pubsub/publish.js | 2 +- packages/interface-ipfs-core/src/pubsub/subscribe.js | 4 ++-- packages/interface-ipfs-core/src/refs-local.js | 2 +- packages/interface-ipfs-core/src/repo/gc.js | 2 +- .../interface-ipfs-core/src/utils/blockstore-adapter.js | 2 +- packages/interface-ipfs-core/src/utils/index.js | 4 ++-- packages/ipfs-cli/package.json | 3 ++- packages/ipfs-cli/src/commands/block/get.js | 2 +- packages/ipfs-cli/src/commands/dag/get.js | 2 +- packages/ipfs-cli/src/commands/dht/get.js | 2 +- packages/ipfs-cli/src/commands/dht/put.js | 2 +- packages/ipfs-cli/src/commands/object/get.js | 2 +- packages/ipfs-cli/src/commands/object/put.js | 8 ++++---- packages/ipfs-cli/src/commands/refs-local.js | 2 +- packages/ipfs-cli/src/utils.js | 2 +- packages/ipfs-core-utils/package.json | 2 +- .../src/files/normalise-input/normalise-content.js | 2 +- packages/ipfs-core/package.json | 2 +- .../src/components/files/utils/to-async-iterator.js | 2 +- packages/ipfs-core/src/components/id.js | 2 +- packages/ipfs-core/src/components/index.js | 2 +- packages/ipfs-core/src/components/ipns.js | 2 +- packages/ipfs-core/src/components/name/publish.js | 4 ++-- packages/ipfs-core/src/components/name/resolve.js | 2 +- .../ipfs-core/src/components/object/patch/append-data.js | 2 +- packages/ipfs-core/src/components/storage.js | 4 ++-- packages/ipfs-core/src/ipns/index.js | 2 +- packages/ipfs-core/src/ipns/publisher.js | 4 ++-- packages/ipfs-core/src/ipns/resolver.js | 2 +- packages/ipfs-core/src/ipns/routing/pubsub-datastore.js | 4 ++-- packages/ipfs-core/src/ipns/routing/utils.js | 2 +- packages/ipfs-grpc-server/package.json | 2 +- packages/ipfs-grpc-server/test/add.spec.js | 2 +- packages/ipfs-http-client/package.json | 2 +- packages/ipfs-http-client/src/config/replace.js | 2 +- packages/ipfs-http-client/src/dht/get.js | 4 ++-- packages/ipfs-http-client/src/object/get.js | 2 +- packages/ipfs-http-client/src/pubsub/subscribe.js | 4 ++-- packages/ipfs-http-client/test/dag.spec.js | 2 +- packages/ipfs-http-client/test/files.spec.js | 2 +- packages/ipfs-http-client/test/log.spec.js | 2 +- packages/ipfs-http-client/test/node/custom-headers.js | 2 +- packages/ipfs-http-client/test/node/request-api.js | 2 +- packages/ipfs-http-client/test/pubsub.spec.js | 2 +- packages/ipfs-http-gateway/package.json | 2 +- packages/ipfs-http-gateway/src/resources/gateway.js | 2 +- packages/ipfs-http-gateway/test/routes.spec.js | 2 +- packages/ipfs-http-server/package.json | 2 +- packages/ipfs-http-server/src/api/resources/dag.js | 2 +- packages/ipfs-http-server/src/api/resources/object.js | 4 ++-- packages/ipfs-http-server/src/api/resources/pubsub.js | 4 ++-- .../src/utils/multipart-request-parser.js | 4 ++-- packages/ipfs-http-server/test/inject/mfs/read.js | 2 +- packages/ipfs-http-server/test/inject/object.js | 4 ++-- packages/ipfs-message-port-protocol/package.json | 2 +- packages/ipfs-message-port-protocol/test/block.browser.js | 2 +- packages/ipfs-message-port-protocol/test/core.browser.js | 2 +- packages/ipfs-message-port-protocol/test/dag.browser.js | 2 +- packages/ipfs-message-port-protocol/test/dag.spec.js | 2 +- 115 files changed, 151 insertions(+), 150 deletions(-) diff --git a/examples/browser-exchange-files/package.json b/examples/browser-exchange-files/package.json index 5069a512b6..a3f886d5a9 100644 --- a/examples/browser-exchange-files/package.json +++ b/examples/browser-exchange-files/package.json @@ -15,7 +15,7 @@ "execa": "^5.0.0", "http-server": "^0.12.3", "ipfs-http-client": "^52.0.1", - "uint8arrays": "^2.1.6" + "uint8arrays": "^3.0.0" }, "dependencies": { "ipfs": "^0.58.1", diff --git a/examples/browser-exchange-files/public/app.js b/examples/browser-exchange-files/public/app.js index 3a19e3a4f6..b1cd950e40 100644 --- a/examples/browser-exchange-files/public/app.js +++ b/examples/browser-exchange-files/public/app.js @@ -7,8 +7,8 @@ const filters = require('libp2p-websockets/src/filters') const transportKey = WS.prototype[Symbol.toStringTag] const all = require('it-all') -const uint8ArrayConcat = require('uint8arrays/concat') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { concat: uint8ArrayConcat } = require('vascosantos/uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('vascosantos/uint8arrays/from-string') // Node const $nodeId = document.querySelector('.node-id') diff --git a/examples/browser-ipns-publish/index.js b/examples/browser-ipns-publish/index.js index 52f730da94..3dc5216169 100644 --- a/examples/browser-ipns-publish/index.js +++ b/examples/browser-ipns-publish/index.js @@ -6,8 +6,8 @@ const IPFS = require("ipfs"); const pRetry = require("p-retry"); const last = require("it-last"); const cryptoKeys = require("human-crypto-keys"); // { getKeyPairFromSeed } -const uint8ArrayToString = require('uint8arrays/to-string') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { sha256 } = require('multiformats/hashes/sha2') const WS = require('libp2p-websockets') diff --git a/examples/browser-ipns-publish/package.json b/examples/browser-ipns-publish/package.json index 6e0b1a8105..ac64e6387d 100644 --- a/examples/browser-ipns-publish/package.json +++ b/examples/browser-ipns-publish/package.json @@ -20,7 +20,7 @@ "ipns": "^0.13.3", "it-last": "^1.0.4", "p-retry": "^4.2.0", - "uint8arrays": "^2.1.6" + "@vascosantos/uint8arrays": "^3.0.2" }, "browserslist": [ "last 2 versions and not dead and > 2%" diff --git a/examples/circuit-relaying/package.json b/examples/circuit-relaying/package.json index c370368d98..636de6c3b3 100644 --- a/examples/circuit-relaying/package.json +++ b/examples/circuit-relaying/package.json @@ -18,7 +18,7 @@ "ipfs": "^0.58.1", "ipfs-pubsub-room": "^2.0.1", "libp2p-websockets": "^0.16.1", - "uint8arrays": "^2.1.6" + "@vascosantos/uint8arrays": "^3.0.2" }, "devDependencies": { "execa": "^5.0.0", diff --git a/examples/circuit-relaying/src/helpers.js b/examples/circuit-relaying/src/helpers.js index 705ed2eca8..ff49e0c5a9 100644 --- a/examples/circuit-relaying/src/helpers.js +++ b/examples/circuit-relaying/src/helpers.js @@ -1,7 +1,7 @@ /* eslint-disable no-console */ 'use strict' -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const Room = require('ipfs-pubsub-room') const $message = document.querySelector('#message') @@ -34,9 +34,9 @@ module.exports = (ipfs, peersSet) => { // send and receive messages room.on('message', (message) => { - console.log('got message from ' + message.from + ': ' + uint8ArrayToString(message.data)) + console.log('got message from ' + message.from + ': ' + { toString: uint8ArrayToString }(message.data)) const node = document.createElement('li') - node.innerText = `${message.from.substr(-4)}: ${uint8ArrayToString(message.data)}` + node.innerText = `${message.from.substr(-4)}: ${{ toString: uint8ArrayToString }(message.data)}` $msgs.appendChild(node) }) diff --git a/examples/custom-ipld-formats/daemon-node.js b/examples/custom-ipld-formats/daemon-node.js index c50b50cb74..eb94af2523 100644 --- a/examples/custom-ipld-formats/daemon-node.js +++ b/examples/custom-ipld-formats/daemon-node.js @@ -1,7 +1,7 @@ const IPFSDaemon = require('ipfs-daemon') const ipfsHttpClient = require('ipfs-http-client') -const uint8ArrayToString = require('uint8arrays/to-string') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') async function main () { // see https://github.com/multiformats/js-multiformats#multicodec-encoders--decoders--codecs for the interface definition diff --git a/examples/custom-ipld-formats/in-process-node.js b/examples/custom-ipld-formats/in-process-node.js index 06f3153a62..3009dd2c61 100644 --- a/examples/custom-ipld-formats/in-process-node.js +++ b/examples/custom-ipld-formats/in-process-node.js @@ -1,8 +1,8 @@ 'use strict' const IPFS = require('ipfs-core') -const uint8ArrayToString = require('uint8arrays/to-string') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') async function main () { // see https://github.com/multiformats/js-multiformats#multicodec-encoders--decoders--codecs for the interface definition diff --git a/examples/custom-ipld-formats/package.json b/examples/custom-ipld-formats/package.json index 4179bdb377..c506bfa126 100644 --- a/examples/custom-ipld-formats/package.json +++ b/examples/custom-ipld-formats/package.json @@ -16,6 +16,6 @@ "ipfs-core": "^0.10.3", "ipfs-http-client": "^52.0.1", "multiformats": "^9.4.1", - "uint8arrays": "^2.1.6" + "@vascosantos/uint8arrays": "^3.0.2" } } diff --git a/examples/ipfs-101/1.js b/examples/ipfs-101/1.js index 1850df48ab..dcd4504479 100644 --- a/examples/ipfs-101/1.js +++ b/examples/ipfs-101/1.js @@ -2,9 +2,9 @@ const IPFS = require('ipfs') const all = require('it-all') -const uint8ArrayConcat = require('uint8arrays/concat') -const uint8ArrayFromString = require('uint8arrays/from-string') -const uint8ArrayToString = require('uint8arrays/to-string') +const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') async function main () { const node = await IPFS.create() diff --git a/examples/ipfs-101/package.json b/examples/ipfs-101/package.json index 09bd4989c4..91f5f27b12 100644 --- a/examples/ipfs-101/package.json +++ b/examples/ipfs-101/package.json @@ -12,7 +12,7 @@ "dependencies": { "ipfs": "^0.58.1", "it-all": "^1.0.4", - "uint8arrays": "^2.1.6" + "@vascosantos/uint8arrays": "^3.0.2" }, "devDependencies": { "test-ipfs-example": "^3.0.0" diff --git a/examples/test-ipfs-example/package.json b/examples/test-ipfs-example/package.json index d1cd293400..a32732b148 100644 --- a/examples/test-ipfs-example/package.json +++ b/examples/test-ipfs-example/package.json @@ -12,7 +12,7 @@ "fs-extra": "^9.0.1", "http-server": "^0.12.3", "nightwatch": "^1.2.4", - "uint8arrays": "^2.1.6", + "@vascosantos/uint8arrays": "^3.0.2", "which": "^2.0.1" } } diff --git a/examples/test-ipfs-example/utils.js b/examples/test-ipfs-example/utils.js index 489da88397..0e3d583749 100644 --- a/examples/test-ipfs-example/utils.js +++ b/examples/test-ipfs-example/utils.js @@ -4,7 +4,7 @@ const fs = require('fs-extra') const path = require('path') const execa = require('execa') const which = require('which') -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') async function startServer(dir) { async function serveFrom(appDir) { diff --git a/packages/interface-ipfs-core/package.json b/packages/interface-ipfs-core/package.json index e0fa46448b..4f9c01d8bf 100644 --- a/packages/interface-ipfs-core/package.json +++ b/packages/interface-ipfs-core/package.json @@ -78,7 +78,7 @@ "peer-id": "^0.15.1", "readable-stream": "^3.4.0", "sinon": "^11.1.1", - "uint8arrays": "^2.1.6" + "uint8arrays": "^3.0.0-rc.1" }, "contributors": [ "Alan Shaw ", diff --git a/packages/interface-ipfs-core/src/add-all.js b/packages/interface-ipfs-core/src/add-all.js index a992f89d69..e79ea30fe5 100644 --- a/packages/interface-ipfs-core/src/add-all.js +++ b/packages/interface-ipfs-core/src/add-all.js @@ -13,7 +13,7 @@ const { supportsFileReader } = require('ipfs-utils/src/supports') const globSource = require('ipfs-utils/src/files/glob-source') const { isNode } = require('ipfs-utils/src/env') const { getDescribe, getIt, expect } = require('./utils/mocha') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const bufferStream = require('it-buffer-stream') const raw = require('multiformats/codecs/raw') const dagPb = require('@ipld/dag-pb') diff --git a/packages/interface-ipfs-core/src/add.js b/packages/interface-ipfs-core/src/add.js index 8d94ded8ff..7cc50be8af 100644 --- a/packages/interface-ipfs-core/src/add.js +++ b/packages/interface-ipfs-core/src/add.js @@ -9,7 +9,7 @@ const { isNode } = require('ipfs-utils/src/env') const { getDescribe, getIt, expect } = require('./utils/mocha') const echoUrl = (/** @type {string} */ text) => `${process.env.ECHO_SERVER}/download?data=${encodeURIComponent(text)}` const redirectUrl = (/** @type {string} */ url) => `${process.env.ECHO_SERVER}/redirect?to=${encodeURI(url)}` -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const last = require('it-last') const raw = require('multiformats/codecs/raw') const dagPb = require('@ipld/dag-pb') diff --git a/packages/interface-ipfs-core/src/bitswap/transfer.js b/packages/interface-ipfs-core/src/bitswap/transfer.js index 761a664cc8..a872eb14a8 100644 --- a/packages/interface-ipfs-core/src/bitswap/transfer.js +++ b/packages/interface-ipfs-core/src/bitswap/transfer.js @@ -6,7 +6,7 @@ const { isWebWorker } = require('ipfs-utils/src/env') const { randomBytes } = require('iso-random-stream') const concat = require('it-concat') const { nanoid } = require('nanoid') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const pmap = require('p-map') const getIpfsOptions = require('../utils/ipfs-options-websockets-filter-all') diff --git a/packages/interface-ipfs-core/src/block/get.js b/packages/interface-ipfs-core/src/block/get.js index fdb61150f2..22a11ea641 100644 --- a/packages/interface-ipfs-core/src/block/get.js +++ b/packages/interface-ipfs-core/src/block/get.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { identity } = require('multiformats/hashes/identity') const { CID } = require('multiformats/cid') const { getDescribe, getIt, expect } = require('../utils/mocha') diff --git a/packages/interface-ipfs-core/src/block/put.js b/packages/interface-ipfs-core/src/block/put.js index e1767b4671..03e75bd77e 100644 --- a/packages/interface-ipfs-core/src/block/put.js +++ b/packages/interface-ipfs-core/src/block/put.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { base58btc } = require('multiformats/bases/base58') const { CID } = require('multiformats/cid') const { getDescribe, getIt, expect } = require('../utils/mocha') diff --git a/packages/interface-ipfs-core/src/block/rm.js b/packages/interface-ipfs-core/src/block/rm.js index 73671c944b..e5af8f9b72 100644 --- a/packages/interface-ipfs-core/src/block/rm.js +++ b/packages/interface-ipfs-core/src/block/rm.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { getDescribe, getIt, expect } = require('../utils/mocha') const { nanoid } = require('nanoid') const all = require('it-all') diff --git a/packages/interface-ipfs-core/src/block/stat.js b/packages/interface-ipfs-core/src/block/stat.js index 01494308ae..5fc284bf85 100644 --- a/packages/interface-ipfs-core/src/block/stat.js +++ b/packages/interface-ipfs-core/src/block/stat.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { CID } = require('multiformats/cid') const { getDescribe, getIt, expect } = require('../utils/mocha') const testTimeout = require('../utils/test-timeout') diff --git a/packages/interface-ipfs-core/src/cat.js b/packages/interface-ipfs-core/src/cat.js index b5b0880b8f..329cb7b6d4 100644 --- a/packages/interface-ipfs-core/src/cat.js +++ b/packages/interface-ipfs-core/src/cat.js @@ -1,9 +1,9 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') -const uint8ArrayToString = require('uint8arrays/to-string') -const uint8ArrayConcat = require('uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') const { fixtures } = require('./utils') const { CID } = require('multiformats/cid') const all = require('it-all') diff --git a/packages/interface-ipfs-core/src/config/set.js b/packages/interface-ipfs-core/src/config/set.js index 03ad0ba9f4..c2fb1cba4e 100644 --- a/packages/interface-ipfs-core/src/config/set.js +++ b/packages/interface-ipfs-core/src/config/set.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { getDescribe, getIt, expect } = require('../utils/mocha') /** diff --git a/packages/interface-ipfs-core/src/dag/export.js b/packages/interface-ipfs-core/src/dag/export.js index 7a701f4d0a..14dbd8cc55 100644 --- a/packages/interface-ipfs-core/src/dag/export.js +++ b/packages/interface-ipfs-core/src/dag/export.js @@ -4,7 +4,7 @@ const all = require('it-all') const { getDescribe, getIt, expect } = require('../utils/mocha') const { CarReader } = require('@ipld/car') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const dagPb = require('@ipld/dag-pb') const dagCbor = require('@ipld/dag-cbor') const loadFixture = require('aegir/utils/fixtures') diff --git a/packages/interface-ipfs-core/src/dag/get.js b/packages/interface-ipfs-core/src/dag/get.js index 248aa4f992..f777c1945c 100644 --- a/packages/interface-ipfs-core/src/dag/get.js +++ b/packages/interface-ipfs-core/src/dag/get.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const dagPB = require('@ipld/dag-pb') const dagCBOR = require('@ipld/dag-cbor') const { importer } = require('ipfs-unixfs-importer') diff --git a/packages/interface-ipfs-core/src/dag/import.js b/packages/interface-ipfs-core/src/dag/import.js index 1187d17c01..a999076acf 100644 --- a/packages/interface-ipfs-core/src/dag/import.js +++ b/packages/interface-ipfs-core/src/dag/import.js @@ -8,7 +8,7 @@ const { sha256 } = require('multiformats/hashes/sha2') const { getDescribe, getIt, expect } = require('../utils/mocha') const { CarWriter, CarReader } = require('@ipld/car') const raw = require('multiformats/codecs/raw') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const loadFixture = require('aegir/utils/fixtures') /** diff --git a/packages/interface-ipfs-core/src/dag/put.js b/packages/interface-ipfs-core/src/dag/put.js index da8c819024..0d54269a08 100644 --- a/packages/interface-ipfs-core/src/dag/put.js +++ b/packages/interface-ipfs-core/src/dag/put.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const dagCbor = require('@ipld/dag-cbor') const { CID } = require('multiformats/cid') const { sha256, sha512 } = require('multiformats/hashes/sha2') diff --git a/packages/interface-ipfs-core/src/dag/resolve.js b/packages/interface-ipfs-core/src/dag/resolve.js index 89af36306e..9eb3b83244 100644 --- a/packages/interface-ipfs-core/src/dag/resolve.js +++ b/packages/interface-ipfs-core/src/dag/resolve.js @@ -4,7 +4,7 @@ const dagPB = require('@ipld/dag-pb') const { getDescribe, getIt, expect } = require('../utils/mocha') const testTimeout = require('../utils/test-timeout') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') /** * @typedef {import('ipfsd-ctl').Factory} Factory diff --git a/packages/interface-ipfs-core/src/dht/get.js b/packages/interface-ipfs-core/src/dht/get.js index 6489a9c263..7f6b3a4a9f 100644 --- a/packages/interface-ipfs-core/src/dht/get.js +++ b/packages/interface-ipfs-core/src/dht/get.js @@ -3,8 +3,8 @@ const { getDescribe, getIt, expect } = require('../utils/mocha') const testTimeout = require('../utils/test-timeout') -const uint8ArrayToString = require('uint8arrays/to-string') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayToString } = require('uint8arrays/from-string') +const { toString: uint8ArrayFromString } = require('uint8arrays/to-string') /** * @typedef {import('ipfsd-ctl').Factory} Factory diff --git a/packages/interface-ipfs-core/src/dht/provide.js b/packages/interface-ipfs-core/src/dht/provide.js index 72373d2fb4..aa818356f8 100644 --- a/packages/interface-ipfs-core/src/dht/provide.js +++ b/packages/interface-ipfs-core/src/dht/provide.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { CID } = require('multiformats/cid') const all = require('it-all') const { getDescribe, getIt, expect } = require('../utils/mocha') diff --git a/packages/interface-ipfs-core/src/dht/utils.js b/packages/interface-ipfs-core/src/dht/utils.js index 2f2339da8f..03434851cd 100644 --- a/packages/interface-ipfs-core/src/dht/utils.js +++ b/packages/interface-ipfs-core/src/dht/utils.js @@ -1,6 +1,6 @@ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { CID } = require('multiformats/cid') const { sha256 } = require('multiformats/hashes/sha2') diff --git a/packages/interface-ipfs-core/src/files/chmod.js b/packages/interface-ipfs-core/src/files/chmod.js index f52e8dec59..45e6ce83aa 100644 --- a/packages/interface-ipfs-core/src/files/chmod.js +++ b/packages/interface-ipfs-core/src/files/chmod.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { nanoid } = require('nanoid') const { getDescribe, getIt, expect } = require('../utils/mocha') const isShardAtPath = require('../utils/is-shard-at-path') diff --git a/packages/interface-ipfs-core/src/files/cp.js b/packages/interface-ipfs-core/src/files/cp.js index 8ef63feaa4..f010f2b51c 100644 --- a/packages/interface-ipfs-core/src/files/cp.js +++ b/packages/interface-ipfs-core/src/files/cp.js @@ -1,8 +1,8 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') -const uint8ArrayConcat = require('uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') const { nanoid } = require('nanoid') const all = require('it-all') const { fixtures } = require('../utils') diff --git a/packages/interface-ipfs-core/src/files/ls.js b/packages/interface-ipfs-core/src/files/ls.js index cc7a64a84c..b3a6a37f3d 100644 --- a/packages/interface-ipfs-core/src/files/ls.js +++ b/packages/interface-ipfs-core/src/files/ls.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { getDescribe, getIt, expect } = require('../utils/mocha') const { CID } = require('multiformats/cid') const createShardedDirectory = require('../utils/create-sharded-directory') diff --git a/packages/interface-ipfs-core/src/files/mv.js b/packages/interface-ipfs-core/src/files/mv.js index cf60afecc1..6520ddc987 100644 --- a/packages/interface-ipfs-core/src/files/mv.js +++ b/packages/interface-ipfs-core/src/files/mv.js @@ -1,8 +1,8 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') -const uint8ArrayConcat = require('uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') const { getDescribe, getIt, expect } = require('../utils/mocha') const createShardedDirectory = require('../utils/create-sharded-directory') const { randomBytes } = require('iso-random-stream') diff --git a/packages/interface-ipfs-core/src/files/read.js b/packages/interface-ipfs-core/src/files/read.js index 9c1a8c8b90..f5c4df3506 100644 --- a/packages/interface-ipfs-core/src/files/read.js +++ b/packages/interface-ipfs-core/src/files/read.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayConcat = require('uint8arrays/concat') +const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') const drain = require('it-drain') const all = require('it-all') const { fixtures } = require('../utils') diff --git a/packages/interface-ipfs-core/src/files/stat.js b/packages/interface-ipfs-core/src/files/stat.js index 327624fa1d..89b8c0fdf0 100644 --- a/packages/interface-ipfs-core/src/files/stat.js +++ b/packages/interface-ipfs-core/src/files/stat.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { nanoid } = require('nanoid') const { fixtures } = require('../utils') const { getDescribe, getIt, expect } = require('../utils/mocha') diff --git a/packages/interface-ipfs-core/src/files/touch.js b/packages/interface-ipfs-core/src/files/touch.js index 816a733949..10c3e0d556 100644 --- a/packages/interface-ipfs-core/src/files/touch.js +++ b/packages/interface-ipfs-core/src/files/touch.js @@ -1,8 +1,8 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') -const uint8ArrayConcat = require('uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') const { nanoid } = require('nanoid') const { getDescribe, getIt, expect } = require('../utils/mocha') const delay = require('delay') diff --git a/packages/interface-ipfs-core/src/files/write.js b/packages/interface-ipfs-core/src/files/write.js index fd31c9a200..b3bf71965a 100644 --- a/packages/interface-ipfs-core/src/files/write.js +++ b/packages/interface-ipfs-core/src/files/write.js @@ -1,8 +1,8 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') -const uint8ArrayConcat = require('uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') const { nanoid } = require('nanoid') const { getDescribe, getIt, expect } = require('../utils/mocha') const { isNode } = require('ipfs-utils/src/env') diff --git a/packages/interface-ipfs-core/src/get.js b/packages/interface-ipfs-core/src/get.js index 678d020597..3ba9b5844f 100644 --- a/packages/interface-ipfs-core/src/get.js +++ b/packages/interface-ipfs-core/src/get.js @@ -1,9 +1,9 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') -const uint8ArrayToString = require('uint8arrays/to-string') -const uint8ArrayConcat = require('uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') const { fixtures } = require('./utils') const { CID } = require('multiformats/cid') const all = require('it-all') diff --git a/packages/interface-ipfs-core/src/miscellaneous/resolve.js b/packages/interface-ipfs-core/src/miscellaneous/resolve.js index ce4368fa09..1f586de6f0 100644 --- a/packages/interface-ipfs-core/src/miscellaneous/resolve.js +++ b/packages/interface-ipfs-core/src/miscellaneous/resolve.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const isIpfs = require('is-ipfs') const { nanoid } = require('nanoid') const { base64url } = require('multiformats/bases/base64') diff --git a/packages/interface-ipfs-core/src/name-pubsub/pubsub.js b/packages/interface-ipfs-core/src/name-pubsub/pubsub.js index e4395bd444..549e53a297 100644 --- a/packages/interface-ipfs-core/src/name-pubsub/pubsub.js +++ b/packages/interface-ipfs-core/src/name-pubsub/pubsub.js @@ -8,8 +8,8 @@ const ipns = require('ipns') const delay = require('delay') const last = require('it-last') const waitFor = require('../utils/wait-for') -const uint8ArrayToString = require('uint8arrays/to-string') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const namespace = '/record/' const ipfsRef = '/ipfs/QmPFVLPmp9zv5Z5KUqLhe2EivAGccQW2r7M7jhVJGLZoZU' diff --git a/packages/interface-ipfs-core/src/name/publish.js b/packages/interface-ipfs-core/src/name/publish.js index a87ab3c7e7..b36d20ec54 100644 --- a/packages/interface-ipfs-core/src/name/publish.js +++ b/packages/interface-ipfs-core/src/name/publish.js @@ -2,7 +2,7 @@ 'use strict' const { nanoid } = require('nanoid') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { fixture } = require('./utils') const { getDescribe, getIt, expect } = require('../utils/mocha') const last = require('it-last') diff --git a/packages/interface-ipfs-core/src/name/resolve.js b/packages/interface-ipfs-core/src/name/resolve.js index e459894851..49d5551b99 100644 --- a/packages/interface-ipfs-core/src/name/resolve.js +++ b/packages/interface-ipfs-core/src/name/resolve.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { getDescribe, getIt, expect } = require('../utils/mocha') const delay = require('delay') const PeerId = require('peer-id') diff --git a/packages/interface-ipfs-core/src/name/utils.js b/packages/interface-ipfs-core/src/name/utils.js index 046065657d..347180c9b8 100644 --- a/packages/interface-ipfs-core/src/name/utils.js +++ b/packages/interface-ipfs-core/src/name/utils.js @@ -1,8 +1,8 @@ 'use strict' -const fromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') exports.fixture = Object.freeze({ cid: 'Qma4hjFTnCasJ8PVp3mZbZK5g2vGDT4LByLJ7m8ciyRFZP', - data: fromString('Plz add me!\n') + data: uint8ArrayFromString('Plz add me!\n') }) diff --git a/packages/interface-ipfs-core/src/object/data.js b/packages/interface-ipfs-core/src/object/data.js index 6036a4f065..fd4d503154 100644 --- a/packages/interface-ipfs-core/src/object/data.js +++ b/packages/interface-ipfs-core/src/object/data.js @@ -3,7 +3,7 @@ const { nanoid } = require('nanoid') const { getDescribe, getIt, expect } = require('../utils/mocha') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') /** * @typedef {import('ipfsd-ctl').Factory} Factory diff --git a/packages/interface-ipfs-core/src/object/get.js b/packages/interface-ipfs-core/src/object/get.js index 9e23b06072..a67d5640d8 100644 --- a/packages/interface-ipfs-core/src/object/get.js +++ b/packages/interface-ipfs-core/src/object/get.js @@ -6,7 +6,7 @@ const { nanoid } = require('nanoid') const { getDescribe, getIt, expect } = require('../utils/mocha') const { UnixFS } = require('ipfs-unixfs') const { randomBytes } = require('iso-random-stream') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { CID } = require('multiformats/cid') const { sha256 } = require('multiformats/hashes/sha2') diff --git a/packages/interface-ipfs-core/src/object/links.js b/packages/interface-ipfs-core/src/object/links.js index 313fcf7e8b..37cc4dcd5e 100644 --- a/packages/interface-ipfs-core/src/object/links.js +++ b/packages/interface-ipfs-core/src/object/links.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const dagPB = require('@ipld/dag-pb') const { nanoid } = require('nanoid') const { CID } = require('multiformats/cid') diff --git a/packages/interface-ipfs-core/src/object/patch/add-link.js b/packages/interface-ipfs-core/src/object/patch/add-link.js index 8f162ca63f..3a288f8683 100644 --- a/packages/interface-ipfs-core/src/object/patch/add-link.js +++ b/packages/interface-ipfs-core/src/object/patch/add-link.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const dagPB = require('@ipld/dag-pb') const { CID } = require('multiformats/cid') const { sha256 } = require('multiformats/hashes/sha2') diff --git a/packages/interface-ipfs-core/src/object/patch/append-data.js b/packages/interface-ipfs-core/src/object/patch/append-data.js index 4626de1604..d84a28f438 100644 --- a/packages/interface-ipfs-core/src/object/patch/append-data.js +++ b/packages/interface-ipfs-core/src/object/patch/append-data.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { getDescribe, getIt, expect } = require('../../utils/mocha') /** diff --git a/packages/interface-ipfs-core/src/object/patch/rm-link.js b/packages/interface-ipfs-core/src/object/patch/rm-link.js index e5e384f06d..95129ea1a4 100644 --- a/packages/interface-ipfs-core/src/object/patch/rm-link.js +++ b/packages/interface-ipfs-core/src/object/patch/rm-link.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const dagPB = require('@ipld/dag-pb') const { CID } = require('multiformats/cid') const { sha256 } = require('multiformats/hashes/sha2') diff --git a/packages/interface-ipfs-core/src/object/patch/set-data.js b/packages/interface-ipfs-core/src/object/patch/set-data.js index fa61057b8a..5aa4af437c 100644 --- a/packages/interface-ipfs-core/src/object/patch/set-data.js +++ b/packages/interface-ipfs-core/src/object/patch/set-data.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { getDescribe, getIt, expect } = require('../../utils/mocha') /** diff --git a/packages/interface-ipfs-core/src/object/put.js b/packages/interface-ipfs-core/src/object/put.js index 095a395295..454411592e 100644 --- a/packages/interface-ipfs-core/src/object/put.js +++ b/packages/interface-ipfs-core/src/object/put.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const dagPB = require('@ipld/dag-pb') const { nanoid } = require('nanoid') const { CID } = require('multiformats/cid') diff --git a/packages/interface-ipfs-core/src/object/stat.js b/packages/interface-ipfs-core/src/object/stat.js index 2f6bca03cd..06b055be48 100644 --- a/packages/interface-ipfs-core/src/object/stat.js +++ b/packages/interface-ipfs-core/src/object/stat.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const dagPB = require('@ipld/dag-pb') const { nanoid } = require('nanoid') const { CID } = require('multiformats/cid') diff --git a/packages/interface-ipfs-core/src/pin/add.js b/packages/interface-ipfs-core/src/pin/add.js index a7608abf08..322d502d49 100644 --- a/packages/interface-ipfs-core/src/pin/add.js +++ b/packages/interface-ipfs-core/src/pin/add.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { fixtures, clearPins, expectPinned, expectNotPinned, pinTypes } = require('./utils') const { getDescribe, getIt, expect } = require('../utils/mocha') const all = require('it-all') diff --git a/packages/interface-ipfs-core/src/pin/utils.js b/packages/interface-ipfs-core/src/pin/utils.js index 524a704944..69788bb17f 100644 --- a/packages/interface-ipfs-core/src/pin/utils.js +++ b/packages/interface-ipfs-core/src/pin/utils.js @@ -4,7 +4,7 @@ const { expect } = require('../utils/mocha') const loadFixture = require('aegir/utils/fixtures') const { CID } = require('multiformats/cid') const drain = require('it-drain') -const fromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const first = require('it-first') const pinTypes = { @@ -29,7 +29,7 @@ const fixtures = Object.freeze({ })]) }), files: Object.freeze([Object.freeze({ - data: fromString('Plz add me!\n'), + data: uint8ArrayFromString('Plz add me!\n'), cid: CID.parse('Qma4hjFTnCasJ8PVp3mZbZK5g2vGDT4LByLJ7m8ciyRFZP') }), Object.freeze({ data: loadFixture('test/fixtures/test-folder/files/hello.txt', 'interface-ipfs-core'), diff --git a/packages/interface-ipfs-core/src/pubsub/publish.js b/packages/interface-ipfs-core/src/pubsub/publish.js index 7f947d5827..7344cb20dd 100644 --- a/packages/interface-ipfs-core/src/pubsub/publish.js +++ b/packages/interface-ipfs-core/src/pubsub/publish.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { nanoid } = require('nanoid') const { getTopic } = require('./utils') const { getDescribe, getIt, expect } = require('../utils/mocha') diff --git a/packages/interface-ipfs-core/src/pubsub/subscribe.js b/packages/interface-ipfs-core/src/pubsub/subscribe.js index 25f1598772..7816e0f642 100644 --- a/packages/interface-ipfs-core/src/pubsub/subscribe.js +++ b/packages/interface-ipfs-core/src/pubsub/subscribe.js @@ -1,8 +1,8 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') -const uint8ArrayToString = require('uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const { nanoid } = require('nanoid') const pushable = require('it-pushable') const all = require('it-all') diff --git a/packages/interface-ipfs-core/src/refs-local.js b/packages/interface-ipfs-core/src/refs-local.js index e139b55888..5c2d5cf23d 100644 --- a/packages/interface-ipfs-core/src/refs-local.js +++ b/packages/interface-ipfs-core/src/refs-local.js @@ -7,7 +7,7 @@ const all = require('it-all') const { importer } = require('ipfs-unixfs-importer') const drain = require('it-drain') const { CID } = require('multiformats/cid') -const uint8ArrayEquals = require('uint8arrays/equals') +const { equals: uint8ArrayEquals } = require('@vascosantos/uint8arrays/equals') const blockstore = require('./utils/blockstore-adapter') /** diff --git a/packages/interface-ipfs-core/src/repo/gc.js b/packages/interface-ipfs-core/src/repo/gc.js index 5de59c6121..699071f3bf 100644 --- a/packages/interface-ipfs-core/src/repo/gc.js +++ b/packages/interface-ipfs-core/src/repo/gc.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { getDescribe, getIt, expect } = require('../utils/mocha') const all = require('it-all') const drain = require('it-drain') diff --git a/packages/interface-ipfs-core/src/utils/blockstore-adapter.js b/packages/interface-ipfs-core/src/utils/blockstore-adapter.js index 8cbd2c8bb6..e5b7cd2e61 100644 --- a/packages/interface-ipfs-core/src/utils/blockstore-adapter.js +++ b/packages/interface-ipfs-core/src/utils/blockstore-adapter.js @@ -5,7 +5,7 @@ const raw = require('multiformats/codecs/raw') const dagPb = require('@ipld/dag-pb') const dagCbor = require('@ipld/dag-cbor') const { sha256 } = require('multiformats/hashes/sha2') -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') /** * @type {Record} diff --git a/packages/interface-ipfs-core/src/utils/index.js b/packages/interface-ipfs-core/src/utils/index.js index 82bbc89736..f1cbb03b87 100644 --- a/packages/interface-ipfs-core/src/utils/index.js +++ b/packages/interface-ipfs-core/src/utils/index.js @@ -1,7 +1,7 @@ 'use strict' const { CID } = require('multiformats/cid') -const fromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const loadFixture = require('aegir/utils/fixtures') const ONE_MEG = Math.pow(2, 20) @@ -21,7 +21,7 @@ exports.fixtures = Object.freeze({ }), smallFile: Object.freeze({ cid: CID.parse('Qma4hjFTnCasJ8PVp3mZbZK5g2vGDT4LByLJ7m8ciyRFZP'), - data: fromString('Plz add me!\n') + data: uint8ArrayFromString('Plz add me!\n') }), bigFile: Object.freeze({ cid: CID.parse('QmcKEs7mbxbGPPc2zo77E6CPwgaSbY4SmD2MFh16AqaR9e'), diff --git a/packages/ipfs-cli/package.json b/packages/ipfs-cli/package.json index e9889c76d7..c492270aa0 100644 --- a/packages/ipfs-cli/package.json +++ b/packages/ipfs-cli/package.json @@ -62,7 +62,8 @@ "pretty-bytes": "^5.4.1", "progress": "^2.0.3", "stream-to-it": "^0.2.2", - "uint8arrays": "^2.1.6", + "streaming-iterables": "^6.0.0", + "uint8arrays": "^3.0.0-rc.1", "yargs": "^16.0.3" }, "devDependencies": { diff --git a/packages/ipfs-cli/src/commands/block/get.js b/packages/ipfs-cli/src/commands/block/get.js index fe84a8543a..225b909947 100644 --- a/packages/ipfs-cli/src/commands/block/get.js +++ b/packages/ipfs-cli/src/commands/block/get.js @@ -1,7 +1,7 @@ 'use strict' const { default: parseDuration } = require('parse-duration') -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const { coerceCID } = require('../../utils') module.exports = { diff --git a/packages/ipfs-cli/src/commands/dag/get.js b/packages/ipfs-cli/src/commands/dag/get.js index c0a5375974..08b664fe2e 100644 --- a/packages/ipfs-cli/src/commands/dag/get.js +++ b/packages/ipfs-cli/src/commands/dag/get.js @@ -2,7 +2,7 @@ const { default: parseDuration } = require('parse-duration') const toCidAndPath = require('ipfs-core-utils/src/to-cid-and-path') -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const { stripControlCharacters, makeEntriesPrintable, diff --git a/packages/ipfs-cli/src/commands/dht/get.js b/packages/ipfs-cli/src/commands/dht/get.js index 5f20acff10..2549064e17 100644 --- a/packages/ipfs-cli/src/commands/dht/get.js +++ b/packages/ipfs-cli/src/commands/dht/get.js @@ -2,7 +2,7 @@ const { default: parseDuration } = require('parse-duration') const { coerceCID } = require('../../utils') -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') module.exports = { command: 'get ', diff --git a/packages/ipfs-cli/src/commands/dht/put.js b/packages/ipfs-cli/src/commands/dht/put.js index f877536362..4b5ab42654 100644 --- a/packages/ipfs-cli/src/commands/dht/put.js +++ b/packages/ipfs-cli/src/commands/dht/put.js @@ -1,7 +1,7 @@ 'use strict' const { default: parseDuration } = require('parse-duration') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') module.exports = { command: 'put ', diff --git a/packages/ipfs-cli/src/commands/object/get.js b/packages/ipfs-cli/src/commands/object/get.js index 5902c5e2f9..7fb714f5c1 100644 --- a/packages/ipfs-cli/src/commands/object/get.js +++ b/packages/ipfs-cli/src/commands/object/get.js @@ -2,7 +2,7 @@ const dagPB = require('@ipld/dag-pb') const { default: parseDuration } = require('parse-duration') -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const { stripControlCharacters, coerceCID diff --git a/packages/ipfs-cli/src/commands/object/put.js b/packages/ipfs-cli/src/commands/object/put.js index a9016dbbb0..16fc25bdc1 100644 --- a/packages/ipfs-cli/src/commands/object/put.js +++ b/packages/ipfs-cli/src/commands/object/put.js @@ -3,8 +3,8 @@ const concat = require('it-concat') const dagPB = require('@ipld/dag-pb') const { default: parseDuration } = require('parse-duration') -const uint8arrayToString = require('uint8arrays/to-string') -const uint8arrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') module.exports = { command: 'put [data]', @@ -40,7 +40,7 @@ module.exports = { let buf if (data) { - buf = uint8arrayFromString(data) + buf = uint8ArrayFromString(data) } else { buf = (await concat(getStdin(), { type: 'buffer' })).slice() } @@ -50,7 +50,7 @@ module.exports = { if (inputEnc === 'protobuf') { node = dagPB.decode(buf) } else { - node = JSON.parse(uint8arrayToString(buf)) + node = JSON.parse(uint8ArrayToString(buf)) } const base = await ipfs.bases.getBase(cidBase) diff --git a/packages/ipfs-cli/src/commands/refs-local.js b/packages/ipfs-cli/src/commands/refs-local.js index 4eb75a209a..2a7717f96d 100644 --- a/packages/ipfs-cli/src/commands/refs-local.js +++ b/packages/ipfs-cli/src/commands/refs-local.js @@ -1,6 +1,6 @@ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { default: parseDuration } = require('parse-duration') const { base32 } = require('multiformats/bases/base32') diff --git a/packages/ipfs-cli/src/utils.js b/packages/ipfs-cli/src/utils.js index 5887314aa0..1ffd5372ee 100644 --- a/packages/ipfs-cli/src/utils.js +++ b/packages/ipfs-cli/src/utils.js @@ -10,7 +10,7 @@ const byteman = require('byteman') const IPFS = require('ipfs-core') const { CID } = require('multiformats/cid') const { Multiaddr } = require('multiaddr') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const getRepoPath = () => { return process.env.IPFS_PATH || path.join(os.homedir(), '/.jsipfs') diff --git a/packages/ipfs-core-utils/package.json b/packages/ipfs-core-utils/package.json index 080f9d61da..2537e481f2 100644 --- a/packages/ipfs-core-utils/package.json +++ b/packages/ipfs-core-utils/package.json @@ -56,7 +56,7 @@ "multiformats": "^9.4.1", "parse-duration": "^1.0.0", "timeout-abort-controller": "^1.1.1", - "uint8arrays": "^2.1.6" + "@vascosantos/uint8arrays": "^3.0.2" }, "devDependencies": { "@web-std/file": "^1.1.2", diff --git a/packages/ipfs-core-utils/src/files/normalise-input/normalise-content.js b/packages/ipfs-core-utils/src/files/normalise-input/normalise-content.js index a959547474..4b68f3b272 100644 --- a/packages/ipfs-core-utils/src/files/normalise-input/normalise-content.js +++ b/packages/ipfs-core-utils/src/files/normalise-input/normalise-content.js @@ -1,7 +1,7 @@ 'use strict' const errCode = require('err-code') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const browserStreamToIt = require('browser-readablestream-to-it') const blobToIt = require('blob-to-it') const itPeekable = require('it-peekable') diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json index dcd7a5065f..cb13796ec3 100644 --- a/packages/ipfs-core/package.json +++ b/packages/ipfs-core/package.json @@ -125,7 +125,7 @@ "parse-duration": "^1.0.0", "peer-id": "^0.15.1", "streaming-iterables": "^6.0.0", - "uint8arrays": "^2.1.6" + "@vascosantos/uint8arrays": "^3.0.2" }, "devDependencies": { "@types/dlv": "^1.1.2", diff --git a/packages/ipfs-core/src/components/files/utils/to-async-iterator.js b/packages/ipfs-core/src/components/files/utils/to-async-iterator.js index 93acfbcf26..dee7c12f58 100644 --- a/packages/ipfs-core/src/components/files/utils/to-async-iterator.js +++ b/packages/ipfs-core/src/components/files/utils/to-async-iterator.js @@ -5,7 +5,7 @@ const log = require('debug')('ipfs:mfs:utils:to-async-iterator') const { MFS_MAX_CHUNK_SIZE } = require('../../../utils') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') /** * @param {*} content diff --git a/packages/ipfs-core/src/components/id.js b/packages/ipfs-core/src/components/id.js index 0cfbf49ee0..787e4caf8b 100644 --- a/packages/ipfs-core/src/components/id.js +++ b/packages/ipfs-core/src/components/id.js @@ -3,7 +3,7 @@ const pkgversion = require('../../package.json').version const { Multiaddr } = require('multiaddr') const withTimeoutOption = require('ipfs-core-utils/src/with-timeout-option') -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const PeerId = require('peer-id') const { NotStartedError } = require('../errors') diff --git a/packages/ipfs-core/src/components/index.js b/packages/ipfs-core/src/components/index.js index a6e053ade5..0c3cac2457 100644 --- a/packages/ipfs-core/src/components/index.js +++ b/packages/ipfs-core/src/components/index.js @@ -12,7 +12,7 @@ const { bases, hashes, codecs } = require('multiformats/basics') const initAssets = require('../runtime/init-assets-nodejs') const { AlreadyInitializedError } = require('../errors') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const createStartAPI = require('./start') const createStopAPI = require('./stop') diff --git a/packages/ipfs-core/src/components/ipns.js b/packages/ipfs-core/src/components/ipns.js index a5b70eadc9..f25315120c 100644 --- a/packages/ipfs-core/src/components/ipns.js +++ b/packages/ipfs-core/src/components/ipns.js @@ -88,7 +88,7 @@ class IPNSAPI { } const routing = routingConfig({ libp2p, repo, peerId, options: this.options }) - // @ts-ignore routing is a TieredDatastore which wants keys to be Keys, IPNS needs keys to be Uint8Arrays + // @ts-ignore routing is a TieredDatastore which wants keys to be Keys, IPNS needs keys to be uint8arrays const ipns = new IPNS(routing, repo.datastore, peerId, keychain, this.options) await ipns.republisher.start() this.online = ipns diff --git a/packages/ipfs-core/src/components/name/publish.js b/packages/ipfs-core/src/components/name/publish.js index c26d58d29a..1438a08113 100644 --- a/packages/ipfs-core/src/components/name/publish.js +++ b/packages/ipfs-core/src/components/name/publish.js @@ -4,8 +4,8 @@ const debug = require('debug') const { default: parseDuration } = require('parse-duration') const crypto = require('libp2p-crypto') const errcode = require('err-code') -const uint8ArrayFromString = require('uint8arrays/from-string') -const uint8ArrayToString = require('uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const log = Object.assign(debug('ipfs:name:publish'), { error: debug('ipfs:name:publish:error') diff --git a/packages/ipfs-core/src/components/name/resolve.js b/packages/ipfs-core/src/components/name/resolve.js index 7a665a21e7..71bf354f20 100644 --- a/packages/ipfs-core/src/components/name/resolve.js +++ b/packages/ipfs-core/src/components/name/resolve.js @@ -7,7 +7,7 @@ const { CID } = require('multiformats/cid') const PeerId = require('peer-id') // @ts-ignore no types const isDomain = require('is-domain-name') -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const log = Object.assign(debug('ipfs:name:resolve'), { error: debug('ipfs:name:resolve:error') diff --git a/packages/ipfs-core/src/components/object/patch/append-data.js b/packages/ipfs-core/src/components/object/patch/append-data.js index b9096e600e..62a31b582b 100644 --- a/packages/ipfs-core/src/components/object/patch/append-data.js +++ b/packages/ipfs-core/src/components/object/patch/append-data.js @@ -1,7 +1,7 @@ 'use strict' const withTimeoutOption = require('ipfs-core-utils/src/with-timeout-option') -const uint8ArrayConcat = require('uint8arrays/concat') +const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') /** * @param {Object} config diff --git a/packages/ipfs-core/src/components/storage.js b/packages/ipfs-core/src/components/storage.js index b70f47dd6d..748eeaa0e0 100644 --- a/packages/ipfs-core/src/components/storage.js +++ b/packages/ipfs-core/src/components/storage.js @@ -4,8 +4,8 @@ const log = require('debug')('ipfs:components:peer:storage') const createRepo = require('../runtime/repo-nodejs') const getDefaultConfig = require('../runtime/config-nodejs') const { ERR_REPO_NOT_INITIALIZED } = require('ipfs-repo').errors -const uint8ArrayFromString = require('uint8arrays/from-string') -const uint8ArrayToString = require('uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const PeerId = require('peer-id') const mergeOptions = require('merge-options').bind({ ignoreUndefined: true }) const configService = require('./config') diff --git a/packages/ipfs-core/src/ipns/index.js b/packages/ipfs-core/src/ipns/index.js index e95a666afb..f0d698f3bf 100644 --- a/packages/ipfs-core/src/ipns/index.js +++ b/packages/ipfs-core/src/ipns/index.js @@ -12,7 +12,7 @@ const IpnsRepublisher = require('./republisher') const IpnsResolver = require('./resolver') const TLRU = require('../utils/tlru') const defaultRecordTtl = 60 * 1000 -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') /** * @typedef {import('libp2p-crypto').PrivateKey} PrivateKey diff --git a/packages/ipfs-core/src/ipns/publisher.js b/packages/ipfs-core/src/ipns/publisher.js index 06704632f8..4befac88ee 100644 --- a/packages/ipfs-core/src/ipns/publisher.js +++ b/packages/ipfs-core/src/ipns/publisher.js @@ -7,8 +7,8 @@ const debug = require('debug') const log = Object.assign(debug('ipfs:ipns:publisher'), { error: debug('ipfs:ipns:publisher:error') }) -const uint8ArrayToString = require('uint8arrays/to-string') -const uint8ArrayEquals = require('uint8arrays/equals') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { equals: uint8ArrayEquals } = require('@vascosantos/uint8arrays/equals') const ipns = require('ipns') diff --git a/packages/ipfs-core/src/ipns/resolver.js b/packages/ipfs-core/src/ipns/resolver.js index c40764393e..7bfbd4ef9f 100644 --- a/packages/ipfs-core/src/ipns/resolver.js +++ b/packages/ipfs-core/src/ipns/resolver.js @@ -7,7 +7,7 @@ const debug = require('debug') const log = Object.assign(debug('ipfs:ipns:resolver'), { error: debug('ipfs:ipns:resolver:error') }) -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const { Errors } = require('interface-datastore') const ERR_NOT_FOUND = Errors.notFoundError().code diff --git a/packages/ipfs-core/src/ipns/routing/pubsub-datastore.js b/packages/ipfs-core/src/ipns/routing/pubsub-datastore.js index 90ecb90b45..2fc3ff4f4f 100644 --- a/packages/ipfs-core/src/ipns/routing/pubsub-datastore.js +++ b/packages/ipfs-core/src/ipns/routing/pubsub-datastore.js @@ -3,8 +3,8 @@ const ipns = require('ipns') const { base58btc } = require('multiformats/bases/base58') const PubsubDatastore = require('datastore-pubsub') -const uint8ArrayToString = require('uint8arrays/to-string') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const errcode = require('err-code') const debug = require('debug') diff --git a/packages/ipfs-core/src/ipns/routing/utils.js b/packages/ipfs-core/src/ipns/routing/utils.js index e3af891327..6d5626ed4b 100644 --- a/packages/ipfs-core/src/ipns/routing/utils.js +++ b/packages/ipfs-core/src/ipns/routing/utils.js @@ -1,7 +1,7 @@ 'use strict' const ipns = require('ipns') -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') module.exports = { /** diff --git a/packages/ipfs-grpc-server/package.json b/packages/ipfs-grpc-server/package.json index 27ee07edb9..f15da0ea2d 100644 --- a/packages/ipfs-grpc-server/package.json +++ b/packages/ipfs-grpc-server/package.json @@ -54,6 +54,6 @@ "it-drain": "^1.0.3", "rimraf": "^3.0.2", "sinon": "^11.1.1", - "uint8arrays": "^2.1.6" + "@vascosantos/uint8arrays": "^3.0.2" } } diff --git a/packages/ipfs-grpc-server/test/add.spec.js b/packages/ipfs-grpc-server/test/add.spec.js index 5262a62118..a148320e05 100644 --- a/packages/ipfs-grpc-server/test/add.spec.js +++ b/packages/ipfs-grpc-server/test/add.spec.js @@ -4,7 +4,7 @@ const sinon = require('sinon') const server = require('./utils/server') const { expect } = require('aegir/utils/chai') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const all = require('it-all') const drain = require('it-drain') diff --git a/packages/ipfs-http-client/package.json b/packages/ipfs-http-client/package.json index a95eeab886..2adac085e2 100644 --- a/packages/ipfs-http-client/package.json +++ b/packages/ipfs-http-client/package.json @@ -64,7 +64,7 @@ "native-abort-controller": "^1.0.3", "parse-duration": "^1.0.0", "stream-to-it": "^0.2.2", - "uint8arrays": "^2.1.6" + "@vascosantos/uint8arrays": "^3.0.2" }, "devDependencies": { "aegir": "^34.0.2", diff --git a/packages/ipfs-http-client/src/config/replace.js b/packages/ipfs-http-client/src/config/replace.js index 9fc3a0aa97..84670472c3 100644 --- a/packages/ipfs-http-client/src/config/replace.js +++ b/packages/ipfs-http-client/src/config/replace.js @@ -1,6 +1,6 @@ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const multipartRequest = require('../lib/multipart-request') const configure = require('../lib/configure') const toUrlSearchParams = require('../lib/to-url-search-params') diff --git a/packages/ipfs-http-client/src/dht/get.js b/packages/ipfs-http-client/src/dht/get.js index 581dd70bd4..6469bf4888 100644 --- a/packages/ipfs-http-client/src/dht/get.js +++ b/packages/ipfs-http-client/src/dht/get.js @@ -3,8 +3,8 @@ const configure = require('../lib/configure') const toUrlSearchParams = require('../lib/to-url-search-params') const { Value } = require('./response-types') -const uint8ArrayToString = require('uint8arrays/to-string') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') /** * @typedef {import('../types').HTTPClientExtraOptions} HTTPClientExtraOptions diff --git a/packages/ipfs-http-client/src/object/get.js b/packages/ipfs-http-client/src/object/get.js index 562aaad264..9b051aa5b5 100644 --- a/packages/ipfs-http-client/src/object/get.js +++ b/packages/ipfs-http-client/src/object/get.js @@ -3,7 +3,7 @@ const { CID } = require('multiformats/cid') const configure = require('../lib/configure') const toUrlSearchParams = require('../lib/to-url-search-params') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') /** * @typedef {import('../types').HTTPClientExtraOptions} HTTPClientExtraOptions diff --git a/packages/ipfs-http-client/src/pubsub/subscribe.js b/packages/ipfs-http-client/src/pubsub/subscribe.js index cbd3ab86c2..810db8cb48 100644 --- a/packages/ipfs-http-client/src/pubsub/subscribe.js +++ b/packages/ipfs-http-client/src/pubsub/subscribe.js @@ -1,7 +1,7 @@ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') -const uint8ArrayToString = require('uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const log = require('debug')('ipfs-http-client:pubsub:subscribe') const configure = require('../lib/configure') const toUrlSearchParams = require('../lib/to-url-search-params') diff --git a/packages/ipfs-http-client/test/dag.spec.js b/packages/ipfs-http-client/test/dag.spec.js index 40ba0fceea..274d89e26f 100644 --- a/packages/ipfs-http-client/test/dag.spec.js +++ b/packages/ipfs-http-client/test/dag.spec.js @@ -3,7 +3,7 @@ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { expect } = require('aegir/utils/chai') const dagPb = require('@ipld/dag-pb') const dagCbor = require('@ipld/dag-cbor') diff --git a/packages/ipfs-http-client/test/files.spec.js b/packages/ipfs-http-client/test/files.spec.js index 2f4056f30d..f0eb9696f5 100644 --- a/packages/ipfs-http-client/test/files.spec.js +++ b/packages/ipfs-http-client/test/files.spec.js @@ -2,7 +2,7 @@ 'use strict' -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { expect } = require('aegir/utils/chai') const f = require('./utils/factory')() const dagPb = require('@ipld/dag-pb') diff --git a/packages/ipfs-http-client/test/log.spec.js b/packages/ipfs-http-client/test/log.spec.js index c23e884537..1066b7a33c 100644 --- a/packages/ipfs-http-client/test/log.spec.js +++ b/packages/ipfs-http-client/test/log.spec.js @@ -3,7 +3,7 @@ 'use strict' const { expect } = require('aegir/utils/chai') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const f = require('./utils/factory')() const first = require('it-first') diff --git a/packages/ipfs-http-client/test/node/custom-headers.js b/packages/ipfs-http-client/test/node/custom-headers.js index 61676899f1..3ce91380e8 100644 --- a/packages/ipfs-http-client/test/node/custom-headers.js +++ b/packages/ipfs-http-client/test/node/custom-headers.js @@ -4,7 +4,7 @@ const { isNode } = require('ipfs-utils/src/env') const { expect } = require('aegir/utils/chai') const ipfsClient = require('../../src').create -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') function startServer (fn) { let headersResolve diff --git a/packages/ipfs-http-client/test/node/request-api.js b/packages/ipfs-http-client/test/node/request-api.js index 81cad266b3..dfb9db7ff4 100644 --- a/packages/ipfs-http-client/test/node/request-api.js +++ b/packages/ipfs-http-client/test/node/request-api.js @@ -2,7 +2,7 @@ 'use strict' const { expect } = require('aegir/utils/chai') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const ipfsClient = require('../../src').create describe('\'deal with HTTP weirdness\' tests', () => { diff --git a/packages/ipfs-http-client/test/pubsub.spec.js b/packages/ipfs-http-client/test/pubsub.spec.js index cadc2ad234..286b500ceb 100644 --- a/packages/ipfs-http-client/test/pubsub.spec.js +++ b/packages/ipfs-http-client/test/pubsub.spec.js @@ -3,7 +3,7 @@ const { expect } = require('aegir/utils/chai') const { AbortController } = require('native-abort-controller') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const defer = require('p-defer') const f = require('./utils/factory')() diff --git a/packages/ipfs-http-gateway/package.json b/packages/ipfs-http-gateway/package.json index df6f73f5d9..fa8a40d195 100644 --- a/packages/ipfs-http-gateway/package.json +++ b/packages/ipfs-http-gateway/package.json @@ -53,7 +53,7 @@ "it-to-stream": "^1.0.0", "joi": "^17.2.1", "multiformats": "^9.4.1", - "uint8arrays": "^2.1.6", + "@vascosantos/uint8arrays": "^3.0.2", "uri-to-multiaddr": "^6.0.0" }, "devDependencies": { diff --git a/packages/ipfs-http-gateway/src/resources/gateway.js b/packages/ipfs-http-gateway/src/resources/gateway.js index f56f32492f..41e8fab9d3 100644 --- a/packages/ipfs-http-gateway/src/resources/gateway.js +++ b/packages/ipfs-http-gateway/src/resources/gateway.js @@ -1,7 +1,7 @@ 'use strict' const debug = require('debug') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const Boom = require('@hapi/boom') const Ammo = require('@hapi/ammo') // HTTP Range processing utilities const last = require('it-last') diff --git a/packages/ipfs-http-gateway/test/routes.spec.js b/packages/ipfs-http-gateway/test/routes.spec.js index 3b02002be4..12c5f03d11 100644 --- a/packages/ipfs-http-gateway/test/routes.spec.js +++ b/packages/ipfs-http-gateway/test/routes.spec.js @@ -3,7 +3,7 @@ 'use strict' const { expect } = require('aegir/utils/chai') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const FileType = require('file-type') const { CID } = require('multiformats/cid') const { base32 } = require('multiformats/bases/base32') diff --git a/packages/ipfs-http-server/package.json b/packages/ipfs-http-server/package.json index 61d83117ce..7d4c6aea84 100644 --- a/packages/ipfs-http-server/package.json +++ b/packages/ipfs-http-server/package.json @@ -61,7 +61,7 @@ "native-abort-controller": "^1.0.3", "parse-duration": "^1.0.0", "stream-to-it": "^0.2.2", - "uint8arrays": "^2.1.6", + "@vascosantos/uint8arrays": "^3.0.2", "uri-to-multiaddr": "^6.0.0" }, "devDependencies": { diff --git a/packages/ipfs-http-server/src/api/resources/dag.js b/packages/ipfs-http-server/src/api/resources/dag.js index 351e1bae4e..4b998949ea 100644 --- a/packages/ipfs-http-server/src/api/resources/dag.js +++ b/packages/ipfs-http-server/src/api/resources/dag.js @@ -6,7 +6,7 @@ const Joi = require('../../utils/joi') const Boom = require('@hapi/boom') const all = require('it-all') const { pipe } = require('it-pipe') -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') /** * @param {undefined | Uint8Array | Record} obj diff --git a/packages/ipfs-http-server/src/api/resources/object.js b/packages/ipfs-http-server/src/api/resources/object.js index 74f5e4f3ae..7ca3d59007 100644 --- a/packages/ipfs-http-server/src/api/resources/object.js +++ b/packages/ipfs-http-server/src/api/resources/object.js @@ -5,8 +5,8 @@ const all = require('it-all') const dagPB = require('@ipld/dag-pb') const Joi = require('../../utils/joi') const Boom = require('@hapi/boom') -const uint8ArrayToString = require('uint8arrays/to-string') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const debug = require('debug') const log = Object.assign(debug('ipfs:http-api:object'), { error: debug('ipfs:http-api:object:error') diff --git a/packages/ipfs-http-server/src/api/resources/pubsub.js b/packages/ipfs-http-server/src/api/resources/pubsub.js index a7bec9ae20..e11377504d 100644 --- a/packages/ipfs-http-server/src/api/resources/pubsub.js +++ b/packages/ipfs-http-server/src/api/resources/pubsub.js @@ -4,8 +4,8 @@ const Joi = require('../../utils/joi') const all = require('it-all') const multipart = require('../../utils/multipart-request-parser') const Boom = require('@hapi/boom') -const uint8ArrayToString = require('uint8arrays/to-string') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const streamResponse = require('../../utils/stream-response') const pushable = require('it-pushable') diff --git a/packages/ipfs-http-server/src/utils/multipart-request-parser.js b/packages/ipfs-http-server/src/utils/multipart-request-parser.js index e9e349a654..f9ca224631 100644 --- a/packages/ipfs-http-server/src/utils/multipart-request-parser.js +++ b/packages/ipfs-http-server/src/utils/multipart-request-parser.js @@ -3,8 +3,8 @@ // @ts-ignore no types const Content = require('@hapi/content') const multipart = require('it-multipart') -const uint8ArrayConcat = require('uint8arrays/concat') -const uint8ArrayToString = require('uint8arrays/to-string') +const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const qs = require('querystring') const drain = require('it-drain') diff --git a/packages/ipfs-http-server/test/inject/mfs/read.js b/packages/ipfs-http-server/test/inject/mfs/read.js index 154852edf0..c31fcc4105 100644 --- a/packages/ipfs-http-server/test/inject/mfs/read.js +++ b/packages/ipfs-http-server/test/inject/mfs/read.js @@ -3,7 +3,7 @@ const { expect } = require('aegir/utils/chai') const http = require('../../utils/http') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const sinon = require('sinon') const testHttpMethod = require('../../utils/test-http-method') const { AbortSignal } = require('native-abort-controller') diff --git a/packages/ipfs-http-server/test/inject/object.js b/packages/ipfs-http-server/test/inject/object.js index 7a43f107ed..782132e9f5 100644 --- a/packages/ipfs-http-server/test/inject/object.js +++ b/packages/ipfs-http-server/test/inject/object.js @@ -12,8 +12,8 @@ const sinon = require('sinon') const { CID } = require('multiformats/cid') const { UnixFS } = require('ipfs-unixfs') const { AbortSignal } = require('native-abort-controller') -const uint8ArrayToString = require('uint8arrays/to-string') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const { base58btc } = require('multiformats/bases/base58') const { base64, base64pad } = require('multiformats/bases/base64') diff --git a/packages/ipfs-message-port-protocol/package.json b/packages/ipfs-message-port-protocol/package.json index 227f9997cc..6a1cc38d89 100644 --- a/packages/ipfs-message-port-protocol/package.json +++ b/packages/ipfs-message-port-protocol/package.json @@ -52,7 +52,7 @@ "devDependencies": { "aegir": "^34.0.2", "rimraf": "^3.0.2", - "uint8arrays": "^2.1.6" + "@vascosantos/uint8arrays": "^3.0.2" }, "engines": { "node": ">=14.0.0", diff --git a/packages/ipfs-message-port-protocol/test/block.browser.js b/packages/ipfs-message-port-protocol/test/block.browser.js index fed473bf22..b6ba4a49fd 100644 --- a/packages/ipfs-message-port-protocol/test/block.browser.js +++ b/packages/ipfs-message-port-protocol/test/block.browser.js @@ -5,7 +5,7 @@ const { encodeBlock } = require('../src/block') const { ipc } = require('./util') const { expect } = require('aegir/utils/chai') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') describe('block (browser)', function () { this.timeout(10 * 1000) diff --git a/packages/ipfs-message-port-protocol/test/core.browser.js b/packages/ipfs-message-port-protocol/test/core.browser.js index f22e60f5c1..8cb5594a12 100644 --- a/packages/ipfs-message-port-protocol/test/core.browser.js +++ b/packages/ipfs-message-port-protocol/test/core.browser.js @@ -10,7 +10,7 @@ const { } = require('../src/core') const { ipc } = require('./util') const { expect } = require('aegir/utils/chai') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') describe('core', function () { this.timeout(10 * 1000) diff --git a/packages/ipfs-message-port-protocol/test/dag.browser.js b/packages/ipfs-message-port-protocol/test/dag.browser.js index 39af286b66..b4a7f781ec 100644 --- a/packages/ipfs-message-port-protocol/test/dag.browser.js +++ b/packages/ipfs-message-port-protocol/test/dag.browser.js @@ -6,7 +6,7 @@ const { CID } = require('multiformats/cid') const { encodeNode, decodeNode } = require('../src/dag') const { ipc } = require('./util') const { expect } = require('aegir/utils/chai') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') describe('dag (browser)', function () { this.timeout(10 * 1000) diff --git a/packages/ipfs-message-port-protocol/test/dag.spec.js b/packages/ipfs-message-port-protocol/test/dag.spec.js index 0cbc368d0a..d9d5fe5343 100644 --- a/packages/ipfs-message-port-protocol/test/dag.spec.js +++ b/packages/ipfs-message-port-protocol/test/dag.spec.js @@ -5,7 +5,7 @@ const { CID } = require('multiformats/cid') const { encodeNode } = require('../src/dag') const { expect } = require('aegir/utils/chai') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') describe('dag', function () { this.timeout(10 * 1000) From 9875a5118c8bd5e4fe672c1e49f0a688654a1929 Mon Sep 17 00:00:00 2001 From: Alex Potsides Date: Thu, 29 Jul 2021 10:16:33 +0100 Subject: [PATCH 02/10] chore: fix up --- examples/browser-exchange-files/public/app.js | 4 ++-- examples/circuit-relaying/src/helpers.js | 4 ++-- packages/ipfs-core/src/components/ipns.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/browser-exchange-files/public/app.js b/examples/browser-exchange-files/public/app.js index b1cd950e40..8508ac464f 100644 --- a/examples/browser-exchange-files/public/app.js +++ b/examples/browser-exchange-files/public/app.js @@ -7,8 +7,8 @@ const filters = require('libp2p-websockets/src/filters') const transportKey = WS.prototype[Symbol.toStringTag] const all = require('it-all') -const { concat: uint8ArrayConcat } = require('vascosantos/uint8arrays/concat') -const { fromString: uint8ArrayFromString } = require('vascosantos/uint8arrays/from-string') +const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') // Node const $nodeId = document.querySelector('.node-id') diff --git a/examples/circuit-relaying/src/helpers.js b/examples/circuit-relaying/src/helpers.js index ff49e0c5a9..f47556c64b 100644 --- a/examples/circuit-relaying/src/helpers.js +++ b/examples/circuit-relaying/src/helpers.js @@ -34,9 +34,9 @@ module.exports = (ipfs, peersSet) => { // send and receive messages room.on('message', (message) => { - console.log('got message from ' + message.from + ': ' + { toString: uint8ArrayToString }(message.data)) + console.log('got message from ' + message.from + ': ' + uint8ArrayToString(message.data)) const node = document.createElement('li') - node.innerText = `${message.from.substr(-4)}: ${{ toString: uint8ArrayToString }(message.data)}` + node.innerText = `${message.from.substr(-4)}: ${uint8ArrayToString(message.data)}` $msgs.appendChild(node) }) diff --git a/packages/ipfs-core/src/components/ipns.js b/packages/ipfs-core/src/components/ipns.js index f25315120c..a5b70eadc9 100644 --- a/packages/ipfs-core/src/components/ipns.js +++ b/packages/ipfs-core/src/components/ipns.js @@ -88,7 +88,7 @@ class IPNSAPI { } const routing = routingConfig({ libp2p, repo, peerId, options: this.options }) - // @ts-ignore routing is a TieredDatastore which wants keys to be Keys, IPNS needs keys to be uint8arrays + // @ts-ignore routing is a TieredDatastore which wants keys to be Keys, IPNS needs keys to be Uint8Arrays const ipns = new IPNS(routing, repo.datastore, peerId, keychain, this.options) await ipns.republisher.start() this.online = ipns From 0e8593a246e7158d10f07196831623a86cd97bb6 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Thu, 29 Jul 2021 10:24:39 +0100 Subject: [PATCH 03/10] chore: replace final few instances --- examples/browser-parceljs/public/index.js | 4 ++-- examples/browser-webpack/src/components/app.js | 4 ++-- examples/custom-ipfs-repo/custom-lock.js | 2 +- examples/custom-ipfs-repo/index.js | 4 ++-- examples/custom-libp2p/test.js | 2 +- examples/http-client-browser-pubsub/index.js | 2 +- examples/traverse-ipld-graphs/eth.js | 2 +- examples/traverse-ipld-graphs/get-path-accross-formats.js | 2 +- examples/traverse-ipld-graphs/git.js | 2 +- packages/ipfs-cli/test/add.js | 2 +- packages/ipfs-cli/test/block.js | 2 +- packages/ipfs-cli/test/cat.js | 2 +- packages/ipfs-cli/test/cid.js | 2 +- packages/ipfs-cli/test/dag.js | 4 ++-- packages/ipfs-cli/test/dht.js | 4 ++-- packages/ipfs-cli/test/general.js | 2 +- packages/ipfs-cli/test/get.js | 2 +- packages/ipfs-cli/test/object.js | 2 +- packages/ipfs-cli/test/pubsub.js | 2 +- packages/ipfs-cli/test/refs-local.js | 2 +- packages/ipfs-cli/test/utils/cli.js | 2 +- packages/ipfs-core-utils/test/files/normalise-input.spec.js | 2 +- packages/ipfs-core/test/create-node.spec.js | 2 +- packages/ipfs-core/test/ipld.spec.js | 4 ++-- packages/ipfs-core/test/mfs-preload.spec.js | 2 +- packages/ipfs-core/test/name.spec.js | 2 +- packages/ipfs-core/test/preload.spec.js | 2 +- packages/ipfs-core/test/pubsub.spec.js | 2 +- 28 files changed, 34 insertions(+), 34 deletions(-) diff --git a/examples/browser-parceljs/public/index.js b/examples/browser-parceljs/public/index.js index b75b54e601..116026df74 100644 --- a/examples/browser-parceljs/public/index.js +++ b/examples/browser-parceljs/public/index.js @@ -1,6 +1,6 @@ import IPFS from 'ipfs' -import uint8ArrayConcat from 'uint8arrays/concat' -import uint8ArrayToString from 'uint8arrays/to-string' +import uint8ArrayConcat from '@vascosantos/uint8arrays/concat' +import uint8ArrayToString from '@vascosantos/uint8arrays/to-string' document.addEventListener('DOMContentLoaded', async () => { // IPFS node setup diff --git a/examples/browser-webpack/src/components/app.js b/examples/browser-webpack/src/components/app.js index f6b7ad4e91..460f28553f 100644 --- a/examples/browser-webpack/src/components/app.js +++ b/examples/browser-webpack/src/components/app.js @@ -2,8 +2,8 @@ const React = require('react') const IPFS = require('ipfs') -const uint8ArrayConcat = require('uint8arrays/concat') -const uint8ArrayToString = require('uint8arrays/to-string') +const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const stringToUse = 'hello world from webpacked IPFS' diff --git a/examples/custom-ipfs-repo/custom-lock.js b/examples/custom-ipfs-repo/custom-lock.js index a8b36dbdac..3d16242790 100644 --- a/examples/custom-ipfs-repo/custom-lock.js +++ b/examples/custom-ipfs-repo/custom-lock.js @@ -1,7 +1,7 @@ 'use strict' const PATH = require('path') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') /** * Uses an object in an S3 bucket as a lock to signal that an IPFS repo is in use. diff --git a/examples/custom-ipfs-repo/index.js b/examples/custom-ipfs-repo/index.js index d4343da3fa..bcd5dff35e 100644 --- a/examples/custom-ipfs-repo/index.js +++ b/examples/custom-ipfs-repo/index.js @@ -8,8 +8,8 @@ const { } } = require('ipfs-repo') const all = require('it-all') -const uint8ArrayFromString = require('uint8arrays/from-string') -const uint8ArrayConcat = require('uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') const DatastoreFS = require('datastore-fs') const BlockstoreDatastoreAdapter = require('blockstore-datastore-adapter') diff --git a/examples/custom-libp2p/test.js b/examples/custom-libp2p/test.js index 2b0da8dacf..887c57a066 100644 --- a/examples/custom-libp2p/test.js +++ b/examples/custom-libp2p/test.js @@ -7,7 +7,7 @@ const TCP = require('libp2p-tcp') const MPLEX = require('libp2p-mplex') const { NOISE } = require('@chainsafe/libp2p-noise') const PeerId = require('peer-id') -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') async function test () { let output = '' diff --git a/examples/http-client-browser-pubsub/index.js b/examples/http-client-browser-pubsub/index.js index 64867e7289..eecf96c622 100644 --- a/examples/http-client-browser-pubsub/index.js +++ b/examples/http-client-browser-pubsub/index.js @@ -2,7 +2,7 @@ const { create: IpfsHttpClient } = require('ipfs-http-client') const { sleep, Logger, onEnterPress, catchAndLog } = require('./util') -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') async function main () { const apiUrlInput = document.getElementById('api-url') diff --git a/examples/traverse-ipld-graphs/eth.js b/examples/traverse-ipld-graphs/eth.js index b35de98b13..703cbeb6ac 100644 --- a/examples/traverse-ipld-graphs/eth.js +++ b/examples/traverse-ipld-graphs/eth.js @@ -4,7 +4,7 @@ const createNode = require('./create-node') const path = require('path') const { CID } = require('multiformats/cid') const fs = require('fs').promises -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const { convert } = require('ipld-format-to-blockcodec') const { keccak256 } = require('@multiformats/sha3') diff --git a/examples/traverse-ipld-graphs/get-path-accross-formats.js b/examples/traverse-ipld-graphs/get-path-accross-formats.js index e7fc23df36..73611abf51 100644 --- a/examples/traverse-ipld-graphs/get-path-accross-formats.js +++ b/examples/traverse-ipld-graphs/get-path-accross-formats.js @@ -1,7 +1,7 @@ 'use strict' const createNode = require('./create-node') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') async function main () { const ipfs = await createNode() diff --git a/examples/traverse-ipld-graphs/git.js b/examples/traverse-ipld-graphs/git.js index f14b6be11a..770a93ff66 100644 --- a/examples/traverse-ipld-graphs/git.js +++ b/examples/traverse-ipld-graphs/git.js @@ -5,7 +5,7 @@ const path = require('path') const { CID } = require('multiformats/cid') const MultihashDigest = require('multiformats/hashes/digest') const fs = require('fs').promises -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const { convert } = require('ipld-format-to-blockcodec') const crypto = require('crypto') diff --git a/packages/ipfs-cli/test/add.js b/packages/ipfs-cli/test/add.js index 11bf3ab949..5926e936d1 100644 --- a/packages/ipfs-cli/test/add.js +++ b/packages/ipfs-cli/test/add.js @@ -8,7 +8,7 @@ const { base64 } = require('multiformats/bases/base64') const first = require('it-first') const cli = require('./utils/cli') const sinon = require('sinon') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const matchIterable = require('./utils/match-iterable') // TODO: Test against all algorithms Object.keys(mh.names) diff --git a/packages/ipfs-cli/test/block.js b/packages/ipfs-cli/test/block.js index 015b9b670b..4e81d25324 100644 --- a/packages/ipfs-cli/test/block.js +++ b/packages/ipfs-cli/test/block.js @@ -7,7 +7,7 @@ const { base58btc } = require('multiformats/bases/base58') const { base64 } = require('multiformats/bases/base64') const cli = require('./utils/cli') const sinon = require('sinon') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') describe('block', () => { const cid = CID.parse('QmZjTnYw2TFhn9Nn7tjmPSoTBoY7YRkwPzwSrSbabY24Kp') diff --git a/packages/ipfs-cli/test/cat.js b/packages/ipfs-cli/test/cat.js index 67692c3107..95b7b36ab6 100644 --- a/packages/ipfs-cli/test/cat.js +++ b/packages/ipfs-cli/test/cat.js @@ -5,7 +5,7 @@ const { expect } = require('aegir/utils/chai') const { CID } = require('multiformats/cid') const cli = require('./utils/cli') const sinon = require('sinon') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const defaultOptions = { offset: undefined, diff --git a/packages/ipfs-cli/test/cid.js b/packages/ipfs-cli/test/cid.js index b3ce784d33..2fb0a7e988 100644 --- a/packages/ipfs-cli/test/cid.js +++ b/packages/ipfs-cli/test/cid.js @@ -9,7 +9,7 @@ const { base58btc } = require('multiformats/bases/base58') const raw = require('multiformats/codecs/raw') const { sha256 } = require('multiformats/hashes/sha2') const dagPb = require('@ipld/dag-pb') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') describe('cid', () => { let ipfs diff --git a/packages/ipfs-cli/test/dag.js b/packages/ipfs-cli/test/dag.js index 8b5f0855aa..afecf1510e 100644 --- a/packages/ipfs-cli/test/dag.js +++ b/packages/ipfs-cli/test/dag.js @@ -10,8 +10,8 @@ const { CID } = require('multiformats/cid') const raw = require('multiformats/codecs/raw') const { base58btc } = require('multiformats/bases/base58') const { base64 } = require('multiformats/bases/base64') -const uint8ArrayFromString = require('uint8arrays/from-string') -const uint8ArrayToString = require('uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const matchIterable = require('./utils/match-iterable') describe('dag', () => { diff --git a/packages/ipfs-cli/test/dht.js b/packages/ipfs-cli/test/dht.js index 08641e92b3..3db3d47292 100644 --- a/packages/ipfs-cli/test/dht.js +++ b/packages/ipfs-cli/test/dht.js @@ -5,8 +5,8 @@ const { expect } = require('aegir/utils/chai') const cli = require('./utils/cli') const sinon = require('sinon') -const uint8ArrayFromString = require('uint8arrays/from-string') -const uint8ArrayToString = require('uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const { CID } = require('multiformats/cid') describe('dht', () => { diff --git a/packages/ipfs-cli/test/general.js b/packages/ipfs-cli/test/general.js index 1101786feb..884a1444ac 100644 --- a/packages/ipfs-cli/test/general.js +++ b/packages/ipfs-cli/test/general.js @@ -14,7 +14,7 @@ const clean = require('./utils/clean') const { isWindows } = require('./utils/platforms') const cli = require('./utils/cli') const sinon = require('sinon') -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') describe.skip('general cli options', () => { let ipfs diff --git a/packages/ipfs-cli/test/get.js b/packages/ipfs-cli/test/get.js index 0eff974b39..5d6e0f93ca 100644 --- a/packages/ipfs-cli/test/get.js +++ b/packages/ipfs-cli/test/get.js @@ -8,7 +8,7 @@ const clean = require('./utils/clean') const { CID } = require('multiformats/cid') const cli = require('./utils/cli') const sinon = require('sinon') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { pack } = require('it-tar') const { pipe } = require('it-pipe') const { gzip, inflate } = require('pako') diff --git a/packages/ipfs-cli/test/object.js b/packages/ipfs-cli/test/object.js index 25f0c9483c..e1ddd5d35e 100644 --- a/packages/ipfs-cli/test/object.js +++ b/packages/ipfs-cli/test/object.js @@ -6,7 +6,7 @@ const fs = require('fs') const cli = require('./utils/cli') const sinon = require('sinon') const { CID } = require('multiformats/cid') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { base58btc } = require('multiformats/bases/base58') const { base64 } = require('multiformats/bases/base64') const dagPb = require('@ipld/dag-pb') diff --git a/packages/ipfs-cli/test/pubsub.js b/packages/ipfs-cli/test/pubsub.js index 83d51078e2..e3c483bb42 100644 --- a/packages/ipfs-cli/test/pubsub.js +++ b/packages/ipfs-cli/test/pubsub.js @@ -4,7 +4,7 @@ const { expect } = require('aegir/utils/chai') const cli = require('./utils/cli') const sinon = require('sinon') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') describe('pubsub', () => { let ipfs diff --git a/packages/ipfs-cli/test/refs-local.js b/packages/ipfs-cli/test/refs-local.js index b392effed8..fd35b47514 100644 --- a/packages/ipfs-cli/test/refs-local.js +++ b/packages/ipfs-cli/test/refs-local.js @@ -5,7 +5,7 @@ const { expect } = require('aegir/utils/chai') const cli = require('./utils/cli') const sinon = require('sinon') const { base32 } = require('multiformats/bases/base32') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const defaultOptions = { timeout: undefined diff --git a/packages/ipfs-cli/test/utils/cli.js b/packages/ipfs-cli/test/utils/cli.js index 89119888ed..3939ed1647 100644 --- a/packages/ipfs-cli/test/utils/cli.js +++ b/packages/ipfs-cli/test/utils/cli.js @@ -2,7 +2,7 @@ const { parseArgsStringToArgv } = require('string-argv') const cli = require('../../src') -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const output = () => { const output = [] diff --git a/packages/ipfs-core-utils/test/files/normalise-input.spec.js b/packages/ipfs-core-utils/test/files/normalise-input.spec.js index d4fc9686c5..01015daf42 100644 --- a/packages/ipfs-core-utils/test/files/normalise-input.spec.js +++ b/packages/ipfs-core-utils/test/files/normalise-input.spec.js @@ -4,7 +4,7 @@ const { expect } = require('aegir/utils/chai') const blobToIt = require('blob-to-it') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const all = require('it-all') const { File } = require('@web-std/file') const { Blob, ReadableStream } = globalThis diff --git a/packages/ipfs-core/test/create-node.spec.js b/packages/ipfs-core/test/create-node.spec.js index 567573791f..a549f833f3 100644 --- a/packages/ipfs-core/test/create-node.spec.js +++ b/packages/ipfs-core/test/create-node.spec.js @@ -10,7 +10,7 @@ const PeerId = require('peer-id') const { keys: { supportedKeys } } = require('libp2p-crypto') const IPFS = require('../src') const defer = require('p-defer') -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') const createTempRepo = require('./utils/create-repo') describe('create node', function () { diff --git a/packages/ipfs-core/test/ipld.spec.js b/packages/ipfs-core/test/ipld.spec.js index 7f4ed9b81f..05b1c89ea8 100644 --- a/packages/ipfs-core/test/ipld.spec.js +++ b/packages/ipfs-core/test/ipld.spec.js @@ -3,8 +3,8 @@ const { expect } = require('aegir/utils/chai') const createNode = require('./utils/create-node') -const uint8ArrayToString = require('uint8arrays/to-string') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const Digest = require('multiformats/hashes/digest') describe('ipld', function () { diff --git a/packages/ipfs-core/test/mfs-preload.spec.js b/packages/ipfs-core/test/mfs-preload.spec.js index 1254d80c06..d669e69ab0 100644 --- a/packages/ipfs-core/test/mfs-preload.spec.js +++ b/packages/ipfs-core/test/mfs-preload.spec.js @@ -5,7 +5,7 @@ const { expect } = require('aegir/utils/chai') const delay = require('delay') const { sha256 } = require('multiformats/hashes/sha2') const { nanoid } = require('nanoid') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { CID } = require('multiformats/cid') const waitFor = require('./utils/wait-for') const mfsPreload = require('../src/mfs-preload') diff --git a/packages/ipfs-core/test/name.spec.js b/packages/ipfs-core/test/name.spec.js index 4455a9223b..269ee7d9d5 100644 --- a/packages/ipfs-core/test/name.spec.js +++ b/packages/ipfs-core/test/name.spec.js @@ -13,7 +13,7 @@ const IpnsRepublisher = require('../src/ipns/republisher') const IpnsResolver = require('../src/ipns/resolver') const OfflineDatastore = require('../src/ipns/routing/offline-datastore') const PubsubDatastore = require('../src/ipns/routing/pubsub-datastore') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const ipfsRef = '/ipfs/QmPFVLPmp9zv5Z5KUqLhe2EivAGccQW2r7M7jhVJGLZoZU' diff --git a/packages/ipfs-core/test/preload.spec.js b/packages/ipfs-core/test/preload.spec.js index 87e368fefe..34297feeba 100644 --- a/packages/ipfs-core/test/preload.spec.js +++ b/packages/ipfs-core/test/preload.spec.js @@ -2,7 +2,7 @@ 'use strict' const { nanoid } = require('nanoid') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { expect } = require('aegir/utils/chai') const all = require('it-all') const MockPreloadNode = require('./utils/mock-preload-node-utils') diff --git a/packages/ipfs-core/test/pubsub.spec.js b/packages/ipfs-core/test/pubsub.spec.js index 4e2e4e193d..bb5081ea23 100644 --- a/packages/ipfs-core/test/pubsub.spec.js +++ b/packages/ipfs-core/test/pubsub.spec.js @@ -3,7 +3,7 @@ 'use strict' const { nanoid } = require('nanoid') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') const { expect } = require('aegir/utils/chai') const createNode = require('./utils/create-node') From 368cf0f35c379c9b6a9278e8db01bdbe4133cffd Mon Sep 17 00:00:00 2001 From: achingbrain Date: Thu, 29 Jul 2021 16:47:28 +0100 Subject: [PATCH 04/10] chore: fix import --- examples/browser-parceljs/public/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/browser-parceljs/public/index.js b/examples/browser-parceljs/public/index.js index 116026df74..0d3cbc4c4c 100644 --- a/examples/browser-parceljs/public/index.js +++ b/examples/browser-parceljs/public/index.js @@ -1,6 +1,6 @@ import IPFS from 'ipfs' -import uint8ArrayConcat from '@vascosantos/uint8arrays/concat' -import uint8ArrayToString from '@vascosantos/uint8arrays/to-string' +import { concat as uint8ArrayConcat } from '@vascosantos/uint8arrays/concat' +import { toString as uint8ArrayToString } from '@vascosantos/uint8arrays/to-string' document.addEventListener('DOMContentLoaded', async () => { // IPFS node setup From ea531e9ce7de18a15af93acf185b075805576a8c Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Mon, 16 Aug 2021 15:54:24 +0200 Subject: [PATCH 05/10] chore: revert uint8arrays fork --- examples/browser-exchange-files/public/app.js | 4 ++-- examples/browser-ipns-publish/index.js | 4 ++-- examples/browser-ipns-publish/package.json | 2 +- examples/browser-parceljs/public/index.js | 4 ++-- examples/browser-webpack/src/components/app.js | 4 ++-- examples/circuit-relaying/package.json | 2 +- examples/circuit-relaying/src/helpers.js | 2 +- examples/custom-ipfs-repo/custom-lock.js | 2 +- examples/custom-ipfs-repo/index.js | 4 ++-- examples/custom-ipld-formats/daemon-node.js | 4 ++-- examples/custom-ipld-formats/in-process-node.js | 4 ++-- examples/custom-ipld-formats/package.json | 2 +- examples/custom-libp2p/test.js | 2 +- examples/http-client-browser-pubsub/index.js | 2 +- examples/ipfs-101/1.js | 6 +++--- examples/ipfs-101/package.json | 2 +- examples/test-ipfs-example/package.json | 2 +- examples/test-ipfs-example/utils.js | 2 +- examples/traverse-ipld-graphs/eth.js | 2 +- examples/traverse-ipld-graphs/get-path-accross-formats.js | 2 +- examples/traverse-ipld-graphs/git.js | 2 +- packages/interface-ipfs-core/package.json | 2 +- packages/interface-ipfs-core/src/add-all.js | 2 +- packages/interface-ipfs-core/src/bitswap/transfer.js | 2 +- packages/interface-ipfs-core/src/block/get.js | 2 +- packages/interface-ipfs-core/src/block/put.js | 2 +- packages/interface-ipfs-core/src/block/rm.js | 2 +- packages/interface-ipfs-core/src/block/stat.js | 2 +- packages/interface-ipfs-core/src/cat.js | 6 +++--- packages/interface-ipfs-core/src/config/set.js | 2 +- packages/interface-ipfs-core/src/dag/export.js | 2 +- packages/interface-ipfs-core/src/dag/get.js | 2 +- packages/interface-ipfs-core/src/dag/import.js | 2 +- packages/interface-ipfs-core/src/dag/put.js | 2 +- packages/interface-ipfs-core/src/dag/resolve.js | 2 +- packages/interface-ipfs-core/src/dht/disabled.js | 2 +- packages/interface-ipfs-core/src/dht/get.js | 4 ++-- packages/interface-ipfs-core/src/dht/provide.js | 2 +- packages/interface-ipfs-core/src/dht/put.js | 2 +- packages/interface-ipfs-core/src/dht/utils.js | 2 +- packages/interface-ipfs-core/src/files/chmod.js | 2 +- packages/interface-ipfs-core/src/files/cp.js | 4 ++-- packages/interface-ipfs-core/src/files/ls.js | 2 +- packages/interface-ipfs-core/src/files/mv.js | 4 ++-- packages/interface-ipfs-core/src/files/read.js | 2 +- packages/interface-ipfs-core/src/files/stat.js | 2 +- packages/interface-ipfs-core/src/files/touch.js | 4 ++-- packages/interface-ipfs-core/src/files/write.js | 4 ++-- packages/interface-ipfs-core/src/get.js | 6 +++--- packages/interface-ipfs-core/src/miscellaneous/resolve.js | 2 +- packages/interface-ipfs-core/src/name-pubsub/pubsub.js | 4 ++-- packages/interface-ipfs-core/src/name/publish.js | 2 +- packages/interface-ipfs-core/src/name/resolve.js | 2 +- packages/interface-ipfs-core/src/name/utils.js | 2 +- packages/interface-ipfs-core/src/object/data.js | 2 +- packages/interface-ipfs-core/src/object/get.js | 2 +- packages/interface-ipfs-core/src/object/links.js | 2 +- packages/interface-ipfs-core/src/object/patch/add-link.js | 2 +- .../interface-ipfs-core/src/object/patch/append-data.js | 2 +- packages/interface-ipfs-core/src/object/patch/rm-link.js | 2 +- packages/interface-ipfs-core/src/object/patch/set-data.js | 2 +- packages/interface-ipfs-core/src/object/put.js | 2 +- packages/interface-ipfs-core/src/object/stat.js | 2 +- packages/interface-ipfs-core/src/pin/add.js | 2 +- packages/interface-ipfs-core/src/pubsub/publish.js | 2 +- packages/interface-ipfs-core/src/pubsub/subscribe.js | 4 ++-- packages/interface-ipfs-core/src/refs-local.js | 2 +- packages/interface-ipfs-core/src/repo/gc.js | 2 +- .../interface-ipfs-core/src/utils/blockstore-adapter.js | 2 +- packages/interface-ipfs-core/src/utils/index.js | 2 +- packages/ipfs-cli/src/commands/block/get.js | 2 +- packages/ipfs-cli/src/commands/dag/get.js | 2 +- packages/ipfs-cli/src/commands/dht/get.js | 2 +- packages/ipfs-cli/src/commands/dht/put.js | 2 +- packages/ipfs-cli/src/commands/object/get.js | 2 +- packages/ipfs-cli/src/commands/object/put.js | 4 ++-- packages/ipfs-cli/src/commands/refs-local.js | 2 +- packages/ipfs-cli/src/utils.js | 2 +- packages/ipfs-cli/test/add.js | 2 +- packages/ipfs-cli/test/block.js | 2 +- packages/ipfs-cli/test/cat.js | 2 +- packages/ipfs-cli/test/cid.js | 2 +- packages/ipfs-cli/test/dag.js | 4 ++-- packages/ipfs-cli/test/dht.js | 4 ++-- packages/ipfs-cli/test/general.js | 2 +- packages/ipfs-cli/test/object.js | 2 +- packages/ipfs-cli/test/pubsub.js | 2 +- packages/ipfs-cli/test/refs-local.js | 2 +- packages/ipfs-cli/test/utils/cli.js | 2 +- packages/ipfs-core-utils/package.json | 2 +- .../src/files/normalise-input/normalise-content.js | 2 +- packages/ipfs-core-utils/test/files/normalise-input.spec.js | 2 +- packages/ipfs-core/package.json | 2 +- .../src/components/files/utils/to-async-iterator.js | 2 +- packages/ipfs-core/src/components/id.js | 2 +- packages/ipfs-core/src/components/index.js | 2 +- packages/ipfs-core/src/components/name/publish.js | 4 ++-- packages/ipfs-core/src/components/name/resolve.js | 2 +- .../ipfs-core/src/components/object/patch/append-data.js | 2 +- packages/ipfs-core/src/components/storage.js | 4 ++-- packages/ipfs-core/src/ipns/index.js | 2 +- packages/ipfs-core/src/ipns/publisher.js | 4 ++-- packages/ipfs-core/src/ipns/resolver.js | 2 +- packages/ipfs-core/src/ipns/routing/pubsub-datastore.js | 4 ++-- packages/ipfs-core/src/ipns/routing/utils.js | 2 +- packages/ipfs-core/test/create-node.spec.js | 2 +- packages/ipfs-core/test/mfs-preload.spec.js | 2 +- packages/ipfs-core/test/name.spec.js | 2 +- packages/ipfs-core/test/preload.spec.js | 2 +- packages/ipfs-core/test/pubsub.spec.js | 2 +- packages/ipfs-grpc-server/package.json | 2 +- packages/ipfs-grpc-server/test/add.spec.js | 2 +- packages/ipfs-http-client/package.json | 2 +- packages/ipfs-http-client/src/config/replace.js | 2 +- packages/ipfs-http-client/src/dht/get.js | 4 ++-- packages/ipfs-http-client/src/dht/put.js | 2 +- packages/ipfs-http-client/src/object/get.js | 2 +- packages/ipfs-http-client/src/pubsub/subscribe.js | 4 ++-- packages/ipfs-http-client/test/dag.spec.js | 2 +- packages/ipfs-http-client/test/files.spec.js | 2 +- packages/ipfs-http-client/test/log.spec.js | 2 +- packages/ipfs-http-client/test/node/custom-headers.js | 2 +- packages/ipfs-http-client/test/node/request-api.js | 2 +- packages/ipfs-http-client/test/pubsub.spec.js | 2 +- packages/ipfs-http-gateway/package.json | 2 +- packages/ipfs-http-gateway/src/resources/gateway.js | 2 +- packages/ipfs-http-gateway/test/routes.spec.js | 2 +- packages/ipfs-http-server/package.json | 2 +- packages/ipfs-http-server/src/api/resources/dag.js | 2 +- packages/ipfs-http-server/src/api/resources/object.js | 4 ++-- packages/ipfs-http-server/src/api/resources/pubsub.js | 4 ++-- .../ipfs-http-server/src/utils/multipart-request-parser.js | 4 ++-- packages/ipfs-http-server/test/inject/mfs/read.js | 2 +- packages/ipfs-http-server/test/inject/object.js | 4 ++-- packages/ipfs-message-port-protocol/package.json | 2 +- packages/ipfs-message-port-protocol/test/block.browser.js | 2 +- packages/ipfs-message-port-protocol/test/core.browser.js | 2 +- packages/ipfs-message-port-protocol/test/dag.browser.js | 2 +- packages/ipfs-message-port-protocol/test/dag.spec.js | 2 +- 139 files changed, 172 insertions(+), 172 deletions(-) diff --git a/examples/browser-exchange-files/public/app.js b/examples/browser-exchange-files/public/app.js index 8508ac464f..7d6c911542 100644 --- a/examples/browser-exchange-files/public/app.js +++ b/examples/browser-exchange-files/public/app.js @@ -7,8 +7,8 @@ const filters = require('libp2p-websockets/src/filters') const transportKey = WS.prototype[Symbol.toStringTag] const all = require('it-all') -const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { concat: uint8ArrayConcat } = require('uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') // Node const $nodeId = document.querySelector('.node-id') diff --git a/examples/browser-ipns-publish/index.js b/examples/browser-ipns-publish/index.js index 3dc5216169..0195192e2d 100644 --- a/examples/browser-ipns-publish/index.js +++ b/examples/browser-ipns-publish/index.js @@ -6,8 +6,8 @@ const IPFS = require("ipfs"); const pRetry = require("p-retry"); const last = require("it-last"); const cryptoKeys = require("human-crypto-keys"); // { getKeyPairFromSeed } -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { sha256 } = require('multiformats/hashes/sha2') const WS = require('libp2p-websockets') diff --git a/examples/browser-ipns-publish/package.json b/examples/browser-ipns-publish/package.json index ac64e6387d..ca310c862c 100644 --- a/examples/browser-ipns-publish/package.json +++ b/examples/browser-ipns-publish/package.json @@ -20,7 +20,7 @@ "ipns": "^0.13.3", "it-last": "^1.0.4", "p-retry": "^4.2.0", - "@vascosantos/uint8arrays": "^3.0.2" + "uint8arrays": "^3.0.0-rc.1" }, "browserslist": [ "last 2 versions and not dead and > 2%" diff --git a/examples/browser-parceljs/public/index.js b/examples/browser-parceljs/public/index.js index 0d3cbc4c4c..bebd15f598 100644 --- a/examples/browser-parceljs/public/index.js +++ b/examples/browser-parceljs/public/index.js @@ -1,6 +1,6 @@ import IPFS from 'ipfs' -import { concat as uint8ArrayConcat } from '@vascosantos/uint8arrays/concat' -import { toString as uint8ArrayToString } from '@vascosantos/uint8arrays/to-string' +import { concat as uint8ArrayConcat } from 'uint8arrays/concat' +import { toString as uint8ArrayToString } from 'uint8arrays/to-string' document.addEventListener('DOMContentLoaded', async () => { // IPFS node setup diff --git a/examples/browser-webpack/src/components/app.js b/examples/browser-webpack/src/components/app.js index 460f28553f..9964eb3e29 100644 --- a/examples/browser-webpack/src/components/app.js +++ b/examples/browser-webpack/src/components/app.js @@ -2,8 +2,8 @@ const React = require('react') const IPFS = require('ipfs') -const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { concat: uint8ArrayConcat } = require('uint8arrays/concat') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const stringToUse = 'hello world from webpacked IPFS' diff --git a/examples/circuit-relaying/package.json b/examples/circuit-relaying/package.json index 636de6c3b3..b4fb4ca52d 100644 --- a/examples/circuit-relaying/package.json +++ b/examples/circuit-relaying/package.json @@ -18,7 +18,7 @@ "ipfs": "^0.58.1", "ipfs-pubsub-room": "^2.0.1", "libp2p-websockets": "^0.16.1", - "@vascosantos/uint8arrays": "^3.0.2" + "uint8arrays": "^3.0.0-rc.1" }, "devDependencies": { "execa": "^5.0.0", diff --git a/examples/circuit-relaying/src/helpers.js b/examples/circuit-relaying/src/helpers.js index f47556c64b..c3881cc656 100644 --- a/examples/circuit-relaying/src/helpers.js +++ b/examples/circuit-relaying/src/helpers.js @@ -1,7 +1,7 @@ /* eslint-disable no-console */ 'use strict' -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const Room = require('ipfs-pubsub-room') const $message = document.querySelector('#message') diff --git a/examples/custom-ipfs-repo/custom-lock.js b/examples/custom-ipfs-repo/custom-lock.js index 3d16242790..d02f7f21ae 100644 --- a/examples/custom-ipfs-repo/custom-lock.js +++ b/examples/custom-ipfs-repo/custom-lock.js @@ -1,7 +1,7 @@ 'use strict' const PATH = require('path') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') /** * Uses an object in an S3 bucket as a lock to signal that an IPFS repo is in use. diff --git a/examples/custom-ipfs-repo/index.js b/examples/custom-ipfs-repo/index.js index bcd5dff35e..ec8a2f061f 100644 --- a/examples/custom-ipfs-repo/index.js +++ b/examples/custom-ipfs-repo/index.js @@ -8,8 +8,8 @@ const { } } = require('ipfs-repo') const all = require('it-all') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { concat: uint8ArrayConcat } = require('uint8arrays/concat') const DatastoreFS = require('datastore-fs') const BlockstoreDatastoreAdapter = require('blockstore-datastore-adapter') diff --git a/examples/custom-ipld-formats/daemon-node.js b/examples/custom-ipld-formats/daemon-node.js index eb94af2523..7d3ff82d2a 100644 --- a/examples/custom-ipld-formats/daemon-node.js +++ b/examples/custom-ipld-formats/daemon-node.js @@ -1,7 +1,7 @@ const IPFSDaemon = require('ipfs-daemon') const ipfsHttpClient = require('ipfs-http-client') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') async function main () { // see https://github.com/multiformats/js-multiformats#multicodec-encoders--decoders--codecs for the interface definition diff --git a/examples/custom-ipld-formats/in-process-node.js b/examples/custom-ipld-formats/in-process-node.js index 3009dd2c61..41eb7ada27 100644 --- a/examples/custom-ipld-formats/in-process-node.js +++ b/examples/custom-ipld-formats/in-process-node.js @@ -1,8 +1,8 @@ 'use strict' const IPFS = require('ipfs-core') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') async function main () { // see https://github.com/multiformats/js-multiformats#multicodec-encoders--decoders--codecs for the interface definition diff --git a/examples/custom-ipld-formats/package.json b/examples/custom-ipld-formats/package.json index c506bfa126..92082893c1 100644 --- a/examples/custom-ipld-formats/package.json +++ b/examples/custom-ipld-formats/package.json @@ -16,6 +16,6 @@ "ipfs-core": "^0.10.3", "ipfs-http-client": "^52.0.1", "multiformats": "^9.4.1", - "@vascosantos/uint8arrays": "^3.0.2" + "uint8arrays": "^3.0.0-rc.1" } } diff --git a/examples/custom-libp2p/test.js b/examples/custom-libp2p/test.js index 887c57a066..da98b42c75 100644 --- a/examples/custom-libp2p/test.js +++ b/examples/custom-libp2p/test.js @@ -7,7 +7,7 @@ const TCP = require('libp2p-tcp') const MPLEX = require('libp2p-mplex') const { NOISE } = require('@chainsafe/libp2p-noise') const PeerId = require('peer-id') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') async function test () { let output = '' diff --git a/examples/http-client-browser-pubsub/index.js b/examples/http-client-browser-pubsub/index.js index eecf96c622..3e3a36c876 100644 --- a/examples/http-client-browser-pubsub/index.js +++ b/examples/http-client-browser-pubsub/index.js @@ -2,7 +2,7 @@ const { create: IpfsHttpClient } = require('ipfs-http-client') const { sleep, Logger, onEnterPress, catchAndLog } = require('./util') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') async function main () { const apiUrlInput = document.getElementById('api-url') diff --git a/examples/ipfs-101/1.js b/examples/ipfs-101/1.js index dcd4504479..78f62cab3e 100644 --- a/examples/ipfs-101/1.js +++ b/examples/ipfs-101/1.js @@ -2,9 +2,9 @@ const IPFS = require('ipfs') const all = require('it-all') -const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { concat: uint8ArrayConcat } = require('uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') async function main () { const node = await IPFS.create() diff --git a/examples/ipfs-101/package.json b/examples/ipfs-101/package.json index 91f5f27b12..8dd104bb4b 100644 --- a/examples/ipfs-101/package.json +++ b/examples/ipfs-101/package.json @@ -12,7 +12,7 @@ "dependencies": { "ipfs": "^0.58.1", "it-all": "^1.0.4", - "@vascosantos/uint8arrays": "^3.0.2" + "uint8arrays": "^3.0.0-rc.1" }, "devDependencies": { "test-ipfs-example": "^3.0.0" diff --git a/examples/test-ipfs-example/package.json b/examples/test-ipfs-example/package.json index a32732b148..b61acbf291 100644 --- a/examples/test-ipfs-example/package.json +++ b/examples/test-ipfs-example/package.json @@ -12,7 +12,7 @@ "fs-extra": "^9.0.1", "http-server": "^0.12.3", "nightwatch": "^1.2.4", - "@vascosantos/uint8arrays": "^3.0.2", + "uint8arrays": "^3.0.0-rc.1", "which": "^2.0.1" } } diff --git a/examples/test-ipfs-example/utils.js b/examples/test-ipfs-example/utils.js index 0e3d583749..c17b638f7c 100644 --- a/examples/test-ipfs-example/utils.js +++ b/examples/test-ipfs-example/utils.js @@ -4,7 +4,7 @@ const fs = require('fs-extra') const path = require('path') const execa = require('execa') const which = require('which') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') async function startServer(dir) { async function serveFrom(appDir) { diff --git a/examples/traverse-ipld-graphs/eth.js b/examples/traverse-ipld-graphs/eth.js index 703cbeb6ac..8f3dbb617c 100644 --- a/examples/traverse-ipld-graphs/eth.js +++ b/examples/traverse-ipld-graphs/eth.js @@ -4,7 +4,7 @@ const createNode = require('./create-node') const path = require('path') const { CID } = require('multiformats/cid') const fs = require('fs').promises -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const { convert } = require('ipld-format-to-blockcodec') const { keccak256 } = require('@multiformats/sha3') diff --git a/examples/traverse-ipld-graphs/get-path-accross-formats.js b/examples/traverse-ipld-graphs/get-path-accross-formats.js index 73611abf51..9070bb004f 100644 --- a/examples/traverse-ipld-graphs/get-path-accross-formats.js +++ b/examples/traverse-ipld-graphs/get-path-accross-formats.js @@ -1,7 +1,7 @@ 'use strict' const createNode = require('./create-node') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') async function main () { const ipfs = await createNode() diff --git a/examples/traverse-ipld-graphs/git.js b/examples/traverse-ipld-graphs/git.js index 770a93ff66..ff0f764719 100644 --- a/examples/traverse-ipld-graphs/git.js +++ b/examples/traverse-ipld-graphs/git.js @@ -5,7 +5,7 @@ const path = require('path') const { CID } = require('multiformats/cid') const MultihashDigest = require('multiformats/hashes/digest') const fs = require('fs').promises -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const { convert } = require('ipld-format-to-blockcodec') const crypto = require('crypto') diff --git a/packages/interface-ipfs-core/package.json b/packages/interface-ipfs-core/package.json index 4f9c01d8bf..5d71a1aaa3 100644 --- a/packages/interface-ipfs-core/package.json +++ b/packages/interface-ipfs-core/package.json @@ -69,7 +69,7 @@ "libp2p-crypto": "^0.19.6", "libp2p-websockets": "^0.16.1", "multiaddr": "^10.0.0", - "multiformats": "^9.4.1", + "multiformats": "^9.4.5", "nanoid": "^3.1.12", "native-abort-controller": "^1.0.3", "p-map": "^4.0.0", diff --git a/packages/interface-ipfs-core/src/add-all.js b/packages/interface-ipfs-core/src/add-all.js index e79ea30fe5..48cba70ee1 100644 --- a/packages/interface-ipfs-core/src/add-all.js +++ b/packages/interface-ipfs-core/src/add-all.js @@ -13,7 +13,7 @@ const { supportsFileReader } = require('ipfs-utils/src/supports') const globSource = require('ipfs-utils/src/files/glob-source') const { isNode } = require('ipfs-utils/src/env') const { getDescribe, getIt, expect } = require('./utils/mocha') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const bufferStream = require('it-buffer-stream') const raw = require('multiformats/codecs/raw') const dagPb = require('@ipld/dag-pb') diff --git a/packages/interface-ipfs-core/src/bitswap/transfer.js b/packages/interface-ipfs-core/src/bitswap/transfer.js index a872eb14a8..944c81003c 100644 --- a/packages/interface-ipfs-core/src/bitswap/transfer.js +++ b/packages/interface-ipfs-core/src/bitswap/transfer.js @@ -6,7 +6,7 @@ const { isWebWorker } = require('ipfs-utils/src/env') const { randomBytes } = require('iso-random-stream') const concat = require('it-concat') const { nanoid } = require('nanoid') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const pmap = require('p-map') const getIpfsOptions = require('../utils/ipfs-options-websockets-filter-all') diff --git a/packages/interface-ipfs-core/src/block/get.js b/packages/interface-ipfs-core/src/block/get.js index 22a11ea641..3acb2f1007 100644 --- a/packages/interface-ipfs-core/src/block/get.js +++ b/packages/interface-ipfs-core/src/block/get.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { identity } = require('multiformats/hashes/identity') const { CID } = require('multiformats/cid') const { getDescribe, getIt, expect } = require('../utils/mocha') diff --git a/packages/interface-ipfs-core/src/block/put.js b/packages/interface-ipfs-core/src/block/put.js index 03e75bd77e..f8a755c19b 100644 --- a/packages/interface-ipfs-core/src/block/put.js +++ b/packages/interface-ipfs-core/src/block/put.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { base58btc } = require('multiformats/bases/base58') const { CID } = require('multiformats/cid') const { getDescribe, getIt, expect } = require('../utils/mocha') diff --git a/packages/interface-ipfs-core/src/block/rm.js b/packages/interface-ipfs-core/src/block/rm.js index e5af8f9b72..fb8ebbfceb 100644 --- a/packages/interface-ipfs-core/src/block/rm.js +++ b/packages/interface-ipfs-core/src/block/rm.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { getDescribe, getIt, expect } = require('../utils/mocha') const { nanoid } = require('nanoid') const all = require('it-all') diff --git a/packages/interface-ipfs-core/src/block/stat.js b/packages/interface-ipfs-core/src/block/stat.js index 5fc284bf85..ad4b4f552a 100644 --- a/packages/interface-ipfs-core/src/block/stat.js +++ b/packages/interface-ipfs-core/src/block/stat.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { CID } = require('multiformats/cid') const { getDescribe, getIt, expect } = require('../utils/mocha') const testTimeout = require('../utils/test-timeout') diff --git a/packages/interface-ipfs-core/src/cat.js b/packages/interface-ipfs-core/src/cat.js index 329cb7b6d4..586e10ba01 100644 --- a/packages/interface-ipfs-core/src/cat.js +++ b/packages/interface-ipfs-core/src/cat.js @@ -1,9 +1,9 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') -const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') +const { concat: uint8ArrayConcat } = require('uint8arrays/concat') const { fixtures } = require('./utils') const { CID } = require('multiformats/cid') const all = require('it-all') diff --git a/packages/interface-ipfs-core/src/config/set.js b/packages/interface-ipfs-core/src/config/set.js index c2fb1cba4e..f3dc51ca00 100644 --- a/packages/interface-ipfs-core/src/config/set.js +++ b/packages/interface-ipfs-core/src/config/set.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { getDescribe, getIt, expect } = require('../utils/mocha') /** diff --git a/packages/interface-ipfs-core/src/dag/export.js b/packages/interface-ipfs-core/src/dag/export.js index 14dbd8cc55..4daad685d4 100644 --- a/packages/interface-ipfs-core/src/dag/export.js +++ b/packages/interface-ipfs-core/src/dag/export.js @@ -4,7 +4,7 @@ const all = require('it-all') const { getDescribe, getIt, expect } = require('../utils/mocha') const { CarReader } = require('@ipld/car') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const dagPb = require('@ipld/dag-pb') const dagCbor = require('@ipld/dag-cbor') const loadFixture = require('aegir/utils/fixtures') diff --git a/packages/interface-ipfs-core/src/dag/get.js b/packages/interface-ipfs-core/src/dag/get.js index f777c1945c..9c9731f70f 100644 --- a/packages/interface-ipfs-core/src/dag/get.js +++ b/packages/interface-ipfs-core/src/dag/get.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const dagPB = require('@ipld/dag-pb') const dagCBOR = require('@ipld/dag-cbor') const { importer } = require('ipfs-unixfs-importer') diff --git a/packages/interface-ipfs-core/src/dag/import.js b/packages/interface-ipfs-core/src/dag/import.js index a999076acf..b1abbede61 100644 --- a/packages/interface-ipfs-core/src/dag/import.js +++ b/packages/interface-ipfs-core/src/dag/import.js @@ -8,7 +8,7 @@ const { sha256 } = require('multiformats/hashes/sha2') const { getDescribe, getIt, expect } = require('../utils/mocha') const { CarWriter, CarReader } = require('@ipld/car') const raw = require('multiformats/codecs/raw') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const loadFixture = require('aegir/utils/fixtures') /** diff --git a/packages/interface-ipfs-core/src/dag/put.js b/packages/interface-ipfs-core/src/dag/put.js index 0d54269a08..8e825dc98d 100644 --- a/packages/interface-ipfs-core/src/dag/put.js +++ b/packages/interface-ipfs-core/src/dag/put.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const dagCbor = require('@ipld/dag-cbor') const { CID } = require('multiformats/cid') const { sha256, sha512 } = require('multiformats/hashes/sha2') diff --git a/packages/interface-ipfs-core/src/dag/resolve.js b/packages/interface-ipfs-core/src/dag/resolve.js index 9eb3b83244..e823c8386e 100644 --- a/packages/interface-ipfs-core/src/dag/resolve.js +++ b/packages/interface-ipfs-core/src/dag/resolve.js @@ -4,7 +4,7 @@ const dagPB = require('@ipld/dag-pb') const { getDescribe, getIt, expect } = require('../utils/mocha') const testTimeout = require('../utils/test-timeout') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') /** * @typedef {import('ipfsd-ctl').Factory} Factory diff --git a/packages/interface-ipfs-core/src/dht/disabled.js b/packages/interface-ipfs-core/src/dht/disabled.js index 06c461553c..06d1838a5c 100644 --- a/packages/interface-ipfs-core/src/dht/disabled.js +++ b/packages/interface-ipfs-core/src/dht/disabled.js @@ -2,7 +2,7 @@ 'use strict' const { getDescribe, getIt, expect } = require('../utils/mocha') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') /** * @typedef {import('ipfsd-ctl').Factory} Factory diff --git a/packages/interface-ipfs-core/src/dht/get.js b/packages/interface-ipfs-core/src/dht/get.js index 7f6b3a4a9f..aa14a90337 100644 --- a/packages/interface-ipfs-core/src/dht/get.js +++ b/packages/interface-ipfs-core/src/dht/get.js @@ -3,8 +3,8 @@ const { getDescribe, getIt, expect } = require('../utils/mocha') const testTimeout = require('../utils/test-timeout') -const { fromString: uint8ArrayToString } = require('uint8arrays/from-string') -const { toString: uint8ArrayFromString } = require('uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') /** * @typedef {import('ipfsd-ctl').Factory} Factory diff --git a/packages/interface-ipfs-core/src/dht/provide.js b/packages/interface-ipfs-core/src/dht/provide.js index aa818356f8..4cb2bfaf66 100644 --- a/packages/interface-ipfs-core/src/dht/provide.js +++ b/packages/interface-ipfs-core/src/dht/provide.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { CID } = require('multiformats/cid') const all = require('it-all') const { getDescribe, getIt, expect } = require('../utils/mocha') diff --git a/packages/interface-ipfs-core/src/dht/put.js b/packages/interface-ipfs-core/src/dht/put.js index 4120ed0120..016e49f04b 100644 --- a/packages/interface-ipfs-core/src/dht/put.js +++ b/packages/interface-ipfs-core/src/dht/put.js @@ -3,7 +3,7 @@ const { getDescribe, getIt, expect } = require('../utils/mocha') const all = require('it-all') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') /** * @typedef {import('ipfsd-ctl').Factory} Factory diff --git a/packages/interface-ipfs-core/src/dht/utils.js b/packages/interface-ipfs-core/src/dht/utils.js index 03434851cd..f397e7ca89 100644 --- a/packages/interface-ipfs-core/src/dht/utils.js +++ b/packages/interface-ipfs-core/src/dht/utils.js @@ -1,6 +1,6 @@ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { CID } = require('multiformats/cid') const { sha256 } = require('multiformats/hashes/sha2') diff --git a/packages/interface-ipfs-core/src/files/chmod.js b/packages/interface-ipfs-core/src/files/chmod.js index 45e6ce83aa..3d71aec542 100644 --- a/packages/interface-ipfs-core/src/files/chmod.js +++ b/packages/interface-ipfs-core/src/files/chmod.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { nanoid } = require('nanoid') const { getDescribe, getIt, expect } = require('../utils/mocha') const isShardAtPath = require('../utils/is-shard-at-path') diff --git a/packages/interface-ipfs-core/src/files/cp.js b/packages/interface-ipfs-core/src/files/cp.js index f010f2b51c..a4bd5c77b2 100644 --- a/packages/interface-ipfs-core/src/files/cp.js +++ b/packages/interface-ipfs-core/src/files/cp.js @@ -1,8 +1,8 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { concat: uint8ArrayConcat } = require('uint8arrays/concat') const { nanoid } = require('nanoid') const all = require('it-all') const { fixtures } = require('../utils') diff --git a/packages/interface-ipfs-core/src/files/ls.js b/packages/interface-ipfs-core/src/files/ls.js index b3a6a37f3d..d6993701d8 100644 --- a/packages/interface-ipfs-core/src/files/ls.js +++ b/packages/interface-ipfs-core/src/files/ls.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { getDescribe, getIt, expect } = require('../utils/mocha') const { CID } = require('multiformats/cid') const createShardedDirectory = require('../utils/create-sharded-directory') diff --git a/packages/interface-ipfs-core/src/files/mv.js b/packages/interface-ipfs-core/src/files/mv.js index 6520ddc987..0e78f27c18 100644 --- a/packages/interface-ipfs-core/src/files/mv.js +++ b/packages/interface-ipfs-core/src/files/mv.js @@ -1,8 +1,8 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { concat: uint8ArrayConcat } = require('uint8arrays/concat') const { getDescribe, getIt, expect } = require('../utils/mocha') const createShardedDirectory = require('../utils/create-sharded-directory') const { randomBytes } = require('iso-random-stream') diff --git a/packages/interface-ipfs-core/src/files/read.js b/packages/interface-ipfs-core/src/files/read.js index f5c4df3506..d40c323306 100644 --- a/packages/interface-ipfs-core/src/files/read.js +++ b/packages/interface-ipfs-core/src/files/read.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') +const { concat: uint8ArrayConcat } = require('uint8arrays/concat') const drain = require('it-drain') const all = require('it-all') const { fixtures } = require('../utils') diff --git a/packages/interface-ipfs-core/src/files/stat.js b/packages/interface-ipfs-core/src/files/stat.js index 89b8c0fdf0..9b8fe8c5b5 100644 --- a/packages/interface-ipfs-core/src/files/stat.js +++ b/packages/interface-ipfs-core/src/files/stat.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { nanoid } = require('nanoid') const { fixtures } = require('../utils') const { getDescribe, getIt, expect } = require('../utils/mocha') diff --git a/packages/interface-ipfs-core/src/files/touch.js b/packages/interface-ipfs-core/src/files/touch.js index 10c3e0d556..219700a82f 100644 --- a/packages/interface-ipfs-core/src/files/touch.js +++ b/packages/interface-ipfs-core/src/files/touch.js @@ -1,8 +1,8 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { concat: uint8ArrayConcat } = require('uint8arrays/concat') const { nanoid } = require('nanoid') const { getDescribe, getIt, expect } = require('../utils/mocha') const delay = require('delay') diff --git a/packages/interface-ipfs-core/src/files/write.js b/packages/interface-ipfs-core/src/files/write.js index b3bf71965a..90222949ee 100644 --- a/packages/interface-ipfs-core/src/files/write.js +++ b/packages/interface-ipfs-core/src/files/write.js @@ -1,8 +1,8 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { concat: uint8ArrayConcat } = require('uint8arrays/concat') const { nanoid } = require('nanoid') const { getDescribe, getIt, expect } = require('../utils/mocha') const { isNode } = require('ipfs-utils/src/env') diff --git a/packages/interface-ipfs-core/src/get.js b/packages/interface-ipfs-core/src/get.js index 3ba9b5844f..53aa8b3593 100644 --- a/packages/interface-ipfs-core/src/get.js +++ b/packages/interface-ipfs-core/src/get.js @@ -1,9 +1,9 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') -const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') +const { concat: uint8ArrayConcat } = require('uint8arrays/concat') const { fixtures } = require('./utils') const { CID } = require('multiformats/cid') const all = require('it-all') diff --git a/packages/interface-ipfs-core/src/miscellaneous/resolve.js b/packages/interface-ipfs-core/src/miscellaneous/resolve.js index 1f586de6f0..cb05c49931 100644 --- a/packages/interface-ipfs-core/src/miscellaneous/resolve.js +++ b/packages/interface-ipfs-core/src/miscellaneous/resolve.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const isIpfs = require('is-ipfs') const { nanoid } = require('nanoid') const { base64url } = require('multiformats/bases/base64') diff --git a/packages/interface-ipfs-core/src/name-pubsub/pubsub.js b/packages/interface-ipfs-core/src/name-pubsub/pubsub.js index 549e53a297..0416d82ba3 100644 --- a/packages/interface-ipfs-core/src/name-pubsub/pubsub.js +++ b/packages/interface-ipfs-core/src/name-pubsub/pubsub.js @@ -8,8 +8,8 @@ const ipns = require('ipns') const delay = require('delay') const last = require('it-last') const waitFor = require('../utils/wait-for') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const namespace = '/record/' const ipfsRef = '/ipfs/QmPFVLPmp9zv5Z5KUqLhe2EivAGccQW2r7M7jhVJGLZoZU' diff --git a/packages/interface-ipfs-core/src/name/publish.js b/packages/interface-ipfs-core/src/name/publish.js index b36d20ec54..27b808b038 100644 --- a/packages/interface-ipfs-core/src/name/publish.js +++ b/packages/interface-ipfs-core/src/name/publish.js @@ -2,7 +2,7 @@ 'use strict' const { nanoid } = require('nanoid') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { fixture } = require('./utils') const { getDescribe, getIt, expect } = require('../utils/mocha') const last = require('it-last') diff --git a/packages/interface-ipfs-core/src/name/resolve.js b/packages/interface-ipfs-core/src/name/resolve.js index 49d5551b99..309c1aa09b 100644 --- a/packages/interface-ipfs-core/src/name/resolve.js +++ b/packages/interface-ipfs-core/src/name/resolve.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { getDescribe, getIt, expect } = require('../utils/mocha') const delay = require('delay') const PeerId = require('peer-id') diff --git a/packages/interface-ipfs-core/src/name/utils.js b/packages/interface-ipfs-core/src/name/utils.js index 347180c9b8..3e1cd3b827 100644 --- a/packages/interface-ipfs-core/src/name/utils.js +++ b/packages/interface-ipfs-core/src/name/utils.js @@ -1,6 +1,6 @@ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') exports.fixture = Object.freeze({ cid: 'Qma4hjFTnCasJ8PVp3mZbZK5g2vGDT4LByLJ7m8ciyRFZP', diff --git a/packages/interface-ipfs-core/src/object/data.js b/packages/interface-ipfs-core/src/object/data.js index fd4d503154..02896a6f96 100644 --- a/packages/interface-ipfs-core/src/object/data.js +++ b/packages/interface-ipfs-core/src/object/data.js @@ -3,7 +3,7 @@ const { nanoid } = require('nanoid') const { getDescribe, getIt, expect } = require('../utils/mocha') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') /** * @typedef {import('ipfsd-ctl').Factory} Factory diff --git a/packages/interface-ipfs-core/src/object/get.js b/packages/interface-ipfs-core/src/object/get.js index a67d5640d8..fd5249854d 100644 --- a/packages/interface-ipfs-core/src/object/get.js +++ b/packages/interface-ipfs-core/src/object/get.js @@ -6,7 +6,7 @@ const { nanoid } = require('nanoid') const { getDescribe, getIt, expect } = require('../utils/mocha') const { UnixFS } = require('ipfs-unixfs') const { randomBytes } = require('iso-random-stream') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { CID } = require('multiformats/cid') const { sha256 } = require('multiformats/hashes/sha2') diff --git a/packages/interface-ipfs-core/src/object/links.js b/packages/interface-ipfs-core/src/object/links.js index 37cc4dcd5e..e628dcd5e7 100644 --- a/packages/interface-ipfs-core/src/object/links.js +++ b/packages/interface-ipfs-core/src/object/links.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const dagPB = require('@ipld/dag-pb') const { nanoid } = require('nanoid') const { CID } = require('multiformats/cid') diff --git a/packages/interface-ipfs-core/src/object/patch/add-link.js b/packages/interface-ipfs-core/src/object/patch/add-link.js index 3a288f8683..43dcea36b3 100644 --- a/packages/interface-ipfs-core/src/object/patch/add-link.js +++ b/packages/interface-ipfs-core/src/object/patch/add-link.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const dagPB = require('@ipld/dag-pb') const { CID } = require('multiformats/cid') const { sha256 } = require('multiformats/hashes/sha2') diff --git a/packages/interface-ipfs-core/src/object/patch/append-data.js b/packages/interface-ipfs-core/src/object/patch/append-data.js index d84a28f438..752018ce11 100644 --- a/packages/interface-ipfs-core/src/object/patch/append-data.js +++ b/packages/interface-ipfs-core/src/object/patch/append-data.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { getDescribe, getIt, expect } = require('../../utils/mocha') /** diff --git a/packages/interface-ipfs-core/src/object/patch/rm-link.js b/packages/interface-ipfs-core/src/object/patch/rm-link.js index 95129ea1a4..e0e8ee8559 100644 --- a/packages/interface-ipfs-core/src/object/patch/rm-link.js +++ b/packages/interface-ipfs-core/src/object/patch/rm-link.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const dagPB = require('@ipld/dag-pb') const { CID } = require('multiformats/cid') const { sha256 } = require('multiformats/hashes/sha2') diff --git a/packages/interface-ipfs-core/src/object/patch/set-data.js b/packages/interface-ipfs-core/src/object/patch/set-data.js index 5aa4af437c..0003d4a0f6 100644 --- a/packages/interface-ipfs-core/src/object/patch/set-data.js +++ b/packages/interface-ipfs-core/src/object/patch/set-data.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { getDescribe, getIt, expect } = require('../../utils/mocha') /** diff --git a/packages/interface-ipfs-core/src/object/put.js b/packages/interface-ipfs-core/src/object/put.js index 454411592e..9f413c2aa8 100644 --- a/packages/interface-ipfs-core/src/object/put.js +++ b/packages/interface-ipfs-core/src/object/put.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const dagPB = require('@ipld/dag-pb') const { nanoid } = require('nanoid') const { CID } = require('multiformats/cid') diff --git a/packages/interface-ipfs-core/src/object/stat.js b/packages/interface-ipfs-core/src/object/stat.js index 06b055be48..0aa59a773d 100644 --- a/packages/interface-ipfs-core/src/object/stat.js +++ b/packages/interface-ipfs-core/src/object/stat.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const dagPB = require('@ipld/dag-pb') const { nanoid } = require('nanoid') const { CID } = require('multiformats/cid') diff --git a/packages/interface-ipfs-core/src/pin/add.js b/packages/interface-ipfs-core/src/pin/add.js index 322d502d49..6a2a1be521 100644 --- a/packages/interface-ipfs-core/src/pin/add.js +++ b/packages/interface-ipfs-core/src/pin/add.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { fixtures, clearPins, expectPinned, expectNotPinned, pinTypes } = require('./utils') const { getDescribe, getIt, expect } = require('../utils/mocha') const all = require('it-all') diff --git a/packages/interface-ipfs-core/src/pubsub/publish.js b/packages/interface-ipfs-core/src/pubsub/publish.js index 7344cb20dd..d68f285d71 100644 --- a/packages/interface-ipfs-core/src/pubsub/publish.js +++ b/packages/interface-ipfs-core/src/pubsub/publish.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { nanoid } = require('nanoid') const { getTopic } = require('./utils') const { getDescribe, getIt, expect } = require('../utils/mocha') diff --git a/packages/interface-ipfs-core/src/pubsub/subscribe.js b/packages/interface-ipfs-core/src/pubsub/subscribe.js index 7816e0f642..f390e867a2 100644 --- a/packages/interface-ipfs-core/src/pubsub/subscribe.js +++ b/packages/interface-ipfs-core/src/pubsub/subscribe.js @@ -1,8 +1,8 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const { nanoid } = require('nanoid') const pushable = require('it-pushable') const all = require('it-all') diff --git a/packages/interface-ipfs-core/src/refs-local.js b/packages/interface-ipfs-core/src/refs-local.js index 5c2d5cf23d..b1869eb58e 100644 --- a/packages/interface-ipfs-core/src/refs-local.js +++ b/packages/interface-ipfs-core/src/refs-local.js @@ -7,7 +7,7 @@ const all = require('it-all') const { importer } = require('ipfs-unixfs-importer') const drain = require('it-drain') const { CID } = require('multiformats/cid') -const { equals: uint8ArrayEquals } = require('@vascosantos/uint8arrays/equals') +const { equals: uint8ArrayEquals } = require('uint8arrays/equals') const blockstore = require('./utils/blockstore-adapter') /** diff --git a/packages/interface-ipfs-core/src/repo/gc.js b/packages/interface-ipfs-core/src/repo/gc.js index 699071f3bf..b947682703 100644 --- a/packages/interface-ipfs-core/src/repo/gc.js +++ b/packages/interface-ipfs-core/src/repo/gc.js @@ -1,7 +1,7 @@ /* eslint-env mocha */ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { getDescribe, getIt, expect } = require('../utils/mocha') const all = require('it-all') const drain = require('it-drain') diff --git a/packages/interface-ipfs-core/src/utils/blockstore-adapter.js b/packages/interface-ipfs-core/src/utils/blockstore-adapter.js index e5b7cd2e61..27f8c65243 100644 --- a/packages/interface-ipfs-core/src/utils/blockstore-adapter.js +++ b/packages/interface-ipfs-core/src/utils/blockstore-adapter.js @@ -5,7 +5,7 @@ const raw = require('multiformats/codecs/raw') const dagPb = require('@ipld/dag-pb') const dagCbor = require('@ipld/dag-cbor') const { sha256 } = require('multiformats/hashes/sha2') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') /** * @type {Record} diff --git a/packages/interface-ipfs-core/src/utils/index.js b/packages/interface-ipfs-core/src/utils/index.js index f1cbb03b87..1a1e6d0dff 100644 --- a/packages/interface-ipfs-core/src/utils/index.js +++ b/packages/interface-ipfs-core/src/utils/index.js @@ -1,7 +1,7 @@ 'use strict' const { CID } = require('multiformats/cid') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const loadFixture = require('aegir/utils/fixtures') const ONE_MEG = Math.pow(2, 20) diff --git a/packages/ipfs-cli/src/commands/block/get.js b/packages/ipfs-cli/src/commands/block/get.js index 225b909947..9bb97a2ef9 100644 --- a/packages/ipfs-cli/src/commands/block/get.js +++ b/packages/ipfs-cli/src/commands/block/get.js @@ -1,7 +1,7 @@ 'use strict' const { default: parseDuration } = require('parse-duration') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const { coerceCID } = require('../../utils') module.exports = { diff --git a/packages/ipfs-cli/src/commands/dag/get.js b/packages/ipfs-cli/src/commands/dag/get.js index 08b664fe2e..02f812875e 100644 --- a/packages/ipfs-cli/src/commands/dag/get.js +++ b/packages/ipfs-cli/src/commands/dag/get.js @@ -2,7 +2,7 @@ const { default: parseDuration } = require('parse-duration') const toCidAndPath = require('ipfs-core-utils/src/to-cid-and-path') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const { stripControlCharacters, makeEntriesPrintable, diff --git a/packages/ipfs-cli/src/commands/dht/get.js b/packages/ipfs-cli/src/commands/dht/get.js index 2549064e17..d1c3e87476 100644 --- a/packages/ipfs-cli/src/commands/dht/get.js +++ b/packages/ipfs-cli/src/commands/dht/get.js @@ -2,7 +2,7 @@ const { default: parseDuration } = require('parse-duration') const { coerceCID } = require('../../utils') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') module.exports = { command: 'get ', diff --git a/packages/ipfs-cli/src/commands/dht/put.js b/packages/ipfs-cli/src/commands/dht/put.js index 4b5ab42654..fefdccfb5e 100644 --- a/packages/ipfs-cli/src/commands/dht/put.js +++ b/packages/ipfs-cli/src/commands/dht/put.js @@ -1,7 +1,7 @@ 'use strict' const { default: parseDuration } = require('parse-duration') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') module.exports = { command: 'put ', diff --git a/packages/ipfs-cli/src/commands/object/get.js b/packages/ipfs-cli/src/commands/object/get.js index 7fb714f5c1..4b6aac8c9d 100644 --- a/packages/ipfs-cli/src/commands/object/get.js +++ b/packages/ipfs-cli/src/commands/object/get.js @@ -2,7 +2,7 @@ const dagPB = require('@ipld/dag-pb') const { default: parseDuration } = require('parse-duration') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const { stripControlCharacters, coerceCID diff --git a/packages/ipfs-cli/src/commands/object/put.js b/packages/ipfs-cli/src/commands/object/put.js index 16fc25bdc1..1c99b42fb9 100644 --- a/packages/ipfs-cli/src/commands/object/put.js +++ b/packages/ipfs-cli/src/commands/object/put.js @@ -3,8 +3,8 @@ const concat = require('it-concat') const dagPB = require('@ipld/dag-pb') const { default: parseDuration } = require('parse-duration') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') module.exports = { command: 'put [data]', diff --git a/packages/ipfs-cli/src/commands/refs-local.js b/packages/ipfs-cli/src/commands/refs-local.js index 2a7717f96d..03ba07de96 100644 --- a/packages/ipfs-cli/src/commands/refs-local.js +++ b/packages/ipfs-cli/src/commands/refs-local.js @@ -1,6 +1,6 @@ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { default: parseDuration } = require('parse-duration') const { base32 } = require('multiformats/bases/base32') diff --git a/packages/ipfs-cli/src/utils.js b/packages/ipfs-cli/src/utils.js index 1ffd5372ee..95010673b4 100644 --- a/packages/ipfs-cli/src/utils.js +++ b/packages/ipfs-cli/src/utils.js @@ -10,7 +10,7 @@ const byteman = require('byteman') const IPFS = require('ipfs-core') const { CID } = require('multiformats/cid') const { Multiaddr } = require('multiaddr') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const getRepoPath = () => { return process.env.IPFS_PATH || path.join(os.homedir(), '/.jsipfs') diff --git a/packages/ipfs-cli/test/add.js b/packages/ipfs-cli/test/add.js index 5926e936d1..b6883ae19b 100644 --- a/packages/ipfs-cli/test/add.js +++ b/packages/ipfs-cli/test/add.js @@ -8,7 +8,7 @@ const { base64 } = require('multiformats/bases/base64') const first = require('it-first') const cli = require('./utils/cli') const sinon = require('sinon') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const matchIterable = require('./utils/match-iterable') // TODO: Test against all algorithms Object.keys(mh.names) diff --git a/packages/ipfs-cli/test/block.js b/packages/ipfs-cli/test/block.js index 4e81d25324..21ee37e4e8 100644 --- a/packages/ipfs-cli/test/block.js +++ b/packages/ipfs-cli/test/block.js @@ -7,7 +7,7 @@ const { base58btc } = require('multiformats/bases/base58') const { base64 } = require('multiformats/bases/base64') const cli = require('./utils/cli') const sinon = require('sinon') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') describe('block', () => { const cid = CID.parse('QmZjTnYw2TFhn9Nn7tjmPSoTBoY7YRkwPzwSrSbabY24Kp') diff --git a/packages/ipfs-cli/test/cat.js b/packages/ipfs-cli/test/cat.js index 95b7b36ab6..8ac056b7ff 100644 --- a/packages/ipfs-cli/test/cat.js +++ b/packages/ipfs-cli/test/cat.js @@ -5,7 +5,7 @@ const { expect } = require('aegir/utils/chai') const { CID } = require('multiformats/cid') const cli = require('./utils/cli') const sinon = require('sinon') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const defaultOptions = { offset: undefined, diff --git a/packages/ipfs-cli/test/cid.js b/packages/ipfs-cli/test/cid.js index 2fb0a7e988..f7f1a83df4 100644 --- a/packages/ipfs-cli/test/cid.js +++ b/packages/ipfs-cli/test/cid.js @@ -9,7 +9,7 @@ const { base58btc } = require('multiformats/bases/base58') const raw = require('multiformats/codecs/raw') const { sha256 } = require('multiformats/hashes/sha2') const dagPb = require('@ipld/dag-pb') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') describe('cid', () => { let ipfs diff --git a/packages/ipfs-cli/test/dag.js b/packages/ipfs-cli/test/dag.js index afecf1510e..8fc6f828e6 100644 --- a/packages/ipfs-cli/test/dag.js +++ b/packages/ipfs-cli/test/dag.js @@ -10,8 +10,8 @@ const { CID } = require('multiformats/cid') const raw = require('multiformats/codecs/raw') const { base58btc } = require('multiformats/bases/base58') const { base64 } = require('multiformats/bases/base64') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const matchIterable = require('./utils/match-iterable') describe('dag', () => { diff --git a/packages/ipfs-cli/test/dht.js b/packages/ipfs-cli/test/dht.js index 3db3d47292..283870572d 100644 --- a/packages/ipfs-cli/test/dht.js +++ b/packages/ipfs-cli/test/dht.js @@ -5,8 +5,8 @@ const { expect } = require('aegir/utils/chai') const cli = require('./utils/cli') const sinon = require('sinon') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const { CID } = require('multiformats/cid') describe('dht', () => { diff --git a/packages/ipfs-cli/test/general.js b/packages/ipfs-cli/test/general.js index 884a1444ac..eea865c970 100644 --- a/packages/ipfs-cli/test/general.js +++ b/packages/ipfs-cli/test/general.js @@ -14,7 +14,7 @@ const clean = require('./utils/clean') const { isWindows } = require('./utils/platforms') const cli = require('./utils/cli') const sinon = require('sinon') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') describe.skip('general cli options', () => { let ipfs diff --git a/packages/ipfs-cli/test/object.js b/packages/ipfs-cli/test/object.js index e1ddd5d35e..a92c195fe2 100644 --- a/packages/ipfs-cli/test/object.js +++ b/packages/ipfs-cli/test/object.js @@ -6,7 +6,7 @@ const fs = require('fs') const cli = require('./utils/cli') const sinon = require('sinon') const { CID } = require('multiformats/cid') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { base58btc } = require('multiformats/bases/base58') const { base64 } = require('multiformats/bases/base64') const dagPb = require('@ipld/dag-pb') diff --git a/packages/ipfs-cli/test/pubsub.js b/packages/ipfs-cli/test/pubsub.js index e3c483bb42..a682045909 100644 --- a/packages/ipfs-cli/test/pubsub.js +++ b/packages/ipfs-cli/test/pubsub.js @@ -4,7 +4,7 @@ const { expect } = require('aegir/utils/chai') const cli = require('./utils/cli') const sinon = require('sinon') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') describe('pubsub', () => { let ipfs diff --git a/packages/ipfs-cli/test/refs-local.js b/packages/ipfs-cli/test/refs-local.js index fd35b47514..6d23a141a4 100644 --- a/packages/ipfs-cli/test/refs-local.js +++ b/packages/ipfs-cli/test/refs-local.js @@ -5,7 +5,7 @@ const { expect } = require('aegir/utils/chai') const cli = require('./utils/cli') const sinon = require('sinon') const { base32 } = require('multiformats/bases/base32') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const defaultOptions = { timeout: undefined diff --git a/packages/ipfs-cli/test/utils/cli.js b/packages/ipfs-cli/test/utils/cli.js index 3939ed1647..a5d1bb9253 100644 --- a/packages/ipfs-cli/test/utils/cli.js +++ b/packages/ipfs-cli/test/utils/cli.js @@ -2,7 +2,7 @@ const { parseArgsStringToArgv } = require('string-argv') const cli = require('../../src') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const output = () => { const output = [] diff --git a/packages/ipfs-core-utils/package.json b/packages/ipfs-core-utils/package.json index 2537e481f2..1cc3617eb4 100644 --- a/packages/ipfs-core-utils/package.json +++ b/packages/ipfs-core-utils/package.json @@ -56,7 +56,7 @@ "multiformats": "^9.4.1", "parse-duration": "^1.0.0", "timeout-abort-controller": "^1.1.1", - "@vascosantos/uint8arrays": "^3.0.2" + "uint8arrays": "^3.0.0-rc.1" }, "devDependencies": { "@web-std/file": "^1.1.2", diff --git a/packages/ipfs-core-utils/src/files/normalise-input/normalise-content.js b/packages/ipfs-core-utils/src/files/normalise-input/normalise-content.js index 4b68f3b272..b8a191eb4a 100644 --- a/packages/ipfs-core-utils/src/files/normalise-input/normalise-content.js +++ b/packages/ipfs-core-utils/src/files/normalise-input/normalise-content.js @@ -1,7 +1,7 @@ 'use strict' const errCode = require('err-code') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const browserStreamToIt = require('browser-readablestream-to-it') const blobToIt = require('blob-to-it') const itPeekable = require('it-peekable') diff --git a/packages/ipfs-core-utils/test/files/normalise-input.spec.js b/packages/ipfs-core-utils/test/files/normalise-input.spec.js index 01015daf42..baf116155e 100644 --- a/packages/ipfs-core-utils/test/files/normalise-input.spec.js +++ b/packages/ipfs-core-utils/test/files/normalise-input.spec.js @@ -4,7 +4,7 @@ const { expect } = require('aegir/utils/chai') const blobToIt = require('blob-to-it') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const all = require('it-all') const { File } = require('@web-std/file') const { Blob, ReadableStream } = globalThis diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json index cb13796ec3..c52de44123 100644 --- a/packages/ipfs-core/package.json +++ b/packages/ipfs-core/package.json @@ -125,7 +125,7 @@ "parse-duration": "^1.0.0", "peer-id": "^0.15.1", "streaming-iterables": "^6.0.0", - "@vascosantos/uint8arrays": "^3.0.2" + "uint8arrays": "^3.0.0-rc.1" }, "devDependencies": { "@types/dlv": "^1.1.2", diff --git a/packages/ipfs-core/src/components/files/utils/to-async-iterator.js b/packages/ipfs-core/src/components/files/utils/to-async-iterator.js index dee7c12f58..674ff1c9bd 100644 --- a/packages/ipfs-core/src/components/files/utils/to-async-iterator.js +++ b/packages/ipfs-core/src/components/files/utils/to-async-iterator.js @@ -5,7 +5,7 @@ const log = require('debug')('ipfs:mfs:utils:to-async-iterator') const { MFS_MAX_CHUNK_SIZE } = require('../../../utils') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') /** * @param {*} content diff --git a/packages/ipfs-core/src/components/id.js b/packages/ipfs-core/src/components/id.js index 787e4caf8b..cef890b694 100644 --- a/packages/ipfs-core/src/components/id.js +++ b/packages/ipfs-core/src/components/id.js @@ -3,7 +3,7 @@ const pkgversion = require('../../package.json').version const { Multiaddr } = require('multiaddr') const withTimeoutOption = require('ipfs-core-utils/src/with-timeout-option') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const PeerId = require('peer-id') const { NotStartedError } = require('../errors') diff --git a/packages/ipfs-core/src/components/index.js b/packages/ipfs-core/src/components/index.js index 0c3cac2457..707513c500 100644 --- a/packages/ipfs-core/src/components/index.js +++ b/packages/ipfs-core/src/components/index.js @@ -12,7 +12,7 @@ const { bases, hashes, codecs } = require('multiformats/basics') const initAssets = require('../runtime/init-assets-nodejs') const { AlreadyInitializedError } = require('../errors') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const createStartAPI = require('./start') const createStopAPI = require('./stop') diff --git a/packages/ipfs-core/src/components/name/publish.js b/packages/ipfs-core/src/components/name/publish.js index 1438a08113..4a7dd4aa8c 100644 --- a/packages/ipfs-core/src/components/name/publish.js +++ b/packages/ipfs-core/src/components/name/publish.js @@ -4,8 +4,8 @@ const debug = require('debug') const { default: parseDuration } = require('parse-duration') const crypto = require('libp2p-crypto') const errcode = require('err-code') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const log = Object.assign(debug('ipfs:name:publish'), { error: debug('ipfs:name:publish:error') diff --git a/packages/ipfs-core/src/components/name/resolve.js b/packages/ipfs-core/src/components/name/resolve.js index 71bf354f20..fd92e2e68c 100644 --- a/packages/ipfs-core/src/components/name/resolve.js +++ b/packages/ipfs-core/src/components/name/resolve.js @@ -7,7 +7,7 @@ const { CID } = require('multiformats/cid') const PeerId = require('peer-id') // @ts-ignore no types const isDomain = require('is-domain-name') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const log = Object.assign(debug('ipfs:name:resolve'), { error: debug('ipfs:name:resolve:error') diff --git a/packages/ipfs-core/src/components/object/patch/append-data.js b/packages/ipfs-core/src/components/object/patch/append-data.js index 62a31b582b..db67eea7cb 100644 --- a/packages/ipfs-core/src/components/object/patch/append-data.js +++ b/packages/ipfs-core/src/components/object/patch/append-data.js @@ -1,7 +1,7 @@ 'use strict' const withTimeoutOption = require('ipfs-core-utils/src/with-timeout-option') -const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') +const { concat: uint8ArrayConcat } = require('uint8arrays/concat') /** * @param {Object} config diff --git a/packages/ipfs-core/src/components/storage.js b/packages/ipfs-core/src/components/storage.js index 748eeaa0e0..cce7ebe471 100644 --- a/packages/ipfs-core/src/components/storage.js +++ b/packages/ipfs-core/src/components/storage.js @@ -4,8 +4,8 @@ const log = require('debug')('ipfs:components:peer:storage') const createRepo = require('../runtime/repo-nodejs') const getDefaultConfig = require('../runtime/config-nodejs') const { ERR_REPO_NOT_INITIALIZED } = require('ipfs-repo').errors -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const PeerId = require('peer-id') const mergeOptions = require('merge-options').bind({ ignoreUndefined: true }) const configService = require('./config') diff --git a/packages/ipfs-core/src/ipns/index.js b/packages/ipfs-core/src/ipns/index.js index f0d698f3bf..c7b1dea30b 100644 --- a/packages/ipfs-core/src/ipns/index.js +++ b/packages/ipfs-core/src/ipns/index.js @@ -12,7 +12,7 @@ const IpnsRepublisher = require('./republisher') const IpnsResolver = require('./resolver') const TLRU = require('../utils/tlru') const defaultRecordTtl = 60 * 1000 -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') /** * @typedef {import('libp2p-crypto').PrivateKey} PrivateKey diff --git a/packages/ipfs-core/src/ipns/publisher.js b/packages/ipfs-core/src/ipns/publisher.js index 4befac88ee..482324b07d 100644 --- a/packages/ipfs-core/src/ipns/publisher.js +++ b/packages/ipfs-core/src/ipns/publisher.js @@ -7,8 +7,8 @@ const debug = require('debug') const log = Object.assign(debug('ipfs:ipns:publisher'), { error: debug('ipfs:ipns:publisher:error') }) -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') -const { equals: uint8ArrayEquals } = require('@vascosantos/uint8arrays/equals') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') +const { equals: uint8ArrayEquals } = require('uint8arrays/equals') const ipns = require('ipns') diff --git a/packages/ipfs-core/src/ipns/resolver.js b/packages/ipfs-core/src/ipns/resolver.js index 7bfbd4ef9f..764550cac9 100644 --- a/packages/ipfs-core/src/ipns/resolver.js +++ b/packages/ipfs-core/src/ipns/resolver.js @@ -7,7 +7,7 @@ const debug = require('debug') const log = Object.assign(debug('ipfs:ipns:resolver'), { error: debug('ipfs:ipns:resolver:error') }) -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const { Errors } = require('interface-datastore') const ERR_NOT_FOUND = Errors.notFoundError().code diff --git a/packages/ipfs-core/src/ipns/routing/pubsub-datastore.js b/packages/ipfs-core/src/ipns/routing/pubsub-datastore.js index 2fc3ff4f4f..2fb9ec2f75 100644 --- a/packages/ipfs-core/src/ipns/routing/pubsub-datastore.js +++ b/packages/ipfs-core/src/ipns/routing/pubsub-datastore.js @@ -3,8 +3,8 @@ const ipns = require('ipns') const { base58btc } = require('multiformats/bases/base58') const PubsubDatastore = require('datastore-pubsub') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const errcode = require('err-code') const debug = require('debug') diff --git a/packages/ipfs-core/src/ipns/routing/utils.js b/packages/ipfs-core/src/ipns/routing/utils.js index 6d5626ed4b..b178c37320 100644 --- a/packages/ipfs-core/src/ipns/routing/utils.js +++ b/packages/ipfs-core/src/ipns/routing/utils.js @@ -1,7 +1,7 @@ 'use strict' const ipns = require('ipns') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') module.exports = { /** diff --git a/packages/ipfs-core/test/create-node.spec.js b/packages/ipfs-core/test/create-node.spec.js index a549f833f3..3c65d95f97 100644 --- a/packages/ipfs-core/test/create-node.spec.js +++ b/packages/ipfs-core/test/create-node.spec.js @@ -10,7 +10,7 @@ const PeerId = require('peer-id') const { keys: { supportedKeys } } = require('libp2p-crypto') const IPFS = require('../src') const defer = require('p-defer') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const createTempRepo = require('./utils/create-repo') describe('create node', function () { diff --git a/packages/ipfs-core/test/mfs-preload.spec.js b/packages/ipfs-core/test/mfs-preload.spec.js index d669e69ab0..2b38000694 100644 --- a/packages/ipfs-core/test/mfs-preload.spec.js +++ b/packages/ipfs-core/test/mfs-preload.spec.js @@ -5,7 +5,7 @@ const { expect } = require('aegir/utils/chai') const delay = require('delay') const { sha256 } = require('multiformats/hashes/sha2') const { nanoid } = require('nanoid') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { CID } = require('multiformats/cid') const waitFor = require('./utils/wait-for') const mfsPreload = require('../src/mfs-preload') diff --git a/packages/ipfs-core/test/name.spec.js b/packages/ipfs-core/test/name.spec.js index 269ee7d9d5..1ff5d2551a 100644 --- a/packages/ipfs-core/test/name.spec.js +++ b/packages/ipfs-core/test/name.spec.js @@ -13,7 +13,7 @@ const IpnsRepublisher = require('../src/ipns/republisher') const IpnsResolver = require('../src/ipns/resolver') const OfflineDatastore = require('../src/ipns/routing/offline-datastore') const PubsubDatastore = require('../src/ipns/routing/pubsub-datastore') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const ipfsRef = '/ipfs/QmPFVLPmp9zv5Z5KUqLhe2EivAGccQW2r7M7jhVJGLZoZU' diff --git a/packages/ipfs-core/test/preload.spec.js b/packages/ipfs-core/test/preload.spec.js index 34297feeba..00898a3ec2 100644 --- a/packages/ipfs-core/test/preload.spec.js +++ b/packages/ipfs-core/test/preload.spec.js @@ -2,7 +2,7 @@ 'use strict' const { nanoid } = require('nanoid') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { expect } = require('aegir/utils/chai') const all = require('it-all') const MockPreloadNode = require('./utils/mock-preload-node-utils') diff --git a/packages/ipfs-core/test/pubsub.spec.js b/packages/ipfs-core/test/pubsub.spec.js index bb5081ea23..2e3849f775 100644 --- a/packages/ipfs-core/test/pubsub.spec.js +++ b/packages/ipfs-core/test/pubsub.spec.js @@ -3,7 +3,7 @@ 'use strict' const { nanoid } = require('nanoid') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { expect } = require('aegir/utils/chai') const createNode = require('./utils/create-node') diff --git a/packages/ipfs-grpc-server/package.json b/packages/ipfs-grpc-server/package.json index f15da0ea2d..a10a77ffea 100644 --- a/packages/ipfs-grpc-server/package.json +++ b/packages/ipfs-grpc-server/package.json @@ -54,6 +54,6 @@ "it-drain": "^1.0.3", "rimraf": "^3.0.2", "sinon": "^11.1.1", - "@vascosantos/uint8arrays": "^3.0.2" + "uint8arrays": "^3.0.0-rc.1" } } diff --git a/packages/ipfs-grpc-server/test/add.spec.js b/packages/ipfs-grpc-server/test/add.spec.js index a148320e05..aeb7346b8c 100644 --- a/packages/ipfs-grpc-server/test/add.spec.js +++ b/packages/ipfs-grpc-server/test/add.spec.js @@ -4,7 +4,7 @@ const sinon = require('sinon') const server = require('./utils/server') const { expect } = require('aegir/utils/chai') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const all = require('it-all') const drain = require('it-drain') diff --git a/packages/ipfs-http-client/package.json b/packages/ipfs-http-client/package.json index 2adac085e2..b6598f8391 100644 --- a/packages/ipfs-http-client/package.json +++ b/packages/ipfs-http-client/package.json @@ -64,7 +64,7 @@ "native-abort-controller": "^1.0.3", "parse-duration": "^1.0.0", "stream-to-it": "^0.2.2", - "@vascosantos/uint8arrays": "^3.0.2" + "uint8arrays": "^3.0.0-rc.1" }, "devDependencies": { "aegir": "^34.0.2", diff --git a/packages/ipfs-http-client/src/config/replace.js b/packages/ipfs-http-client/src/config/replace.js index 84670472c3..47a2df40f0 100644 --- a/packages/ipfs-http-client/src/config/replace.js +++ b/packages/ipfs-http-client/src/config/replace.js @@ -1,6 +1,6 @@ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const multipartRequest = require('../lib/multipart-request') const configure = require('../lib/configure') const toUrlSearchParams = require('../lib/to-url-search-params') diff --git a/packages/ipfs-http-client/src/dht/get.js b/packages/ipfs-http-client/src/dht/get.js index 6469bf4888..44bb6b9129 100644 --- a/packages/ipfs-http-client/src/dht/get.js +++ b/packages/ipfs-http-client/src/dht/get.js @@ -3,8 +3,8 @@ const configure = require('../lib/configure') const toUrlSearchParams = require('../lib/to-url-search-params') const { Value } = require('./response-types') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') /** * @typedef {import('../types').HTTPClientExtraOptions} HTTPClientExtraOptions diff --git a/packages/ipfs-http-client/src/dht/put.js b/packages/ipfs-http-client/src/dht/put.js index 6b86b96f8a..d53c853aaa 100644 --- a/packages/ipfs-http-client/src/dht/put.js +++ b/packages/ipfs-http-client/src/dht/put.js @@ -7,7 +7,7 @@ const toUrlSearchParams = require('../lib/to-url-search-params') const multipartRequest = require('../lib/multipart-request') const abortSignal = require('../lib/abort-signal') const { AbortController } = require('native-abort-controller') -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') /** * @typedef {import('../types').HTTPClientExtraOptions} HTTPClientExtraOptions diff --git a/packages/ipfs-http-client/src/object/get.js b/packages/ipfs-http-client/src/object/get.js index 9b051aa5b5..4d35149b8b 100644 --- a/packages/ipfs-http-client/src/object/get.js +++ b/packages/ipfs-http-client/src/object/get.js @@ -3,7 +3,7 @@ const { CID } = require('multiformats/cid') const configure = require('../lib/configure') const toUrlSearchParams = require('../lib/to-url-search-params') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') /** * @typedef {import('../types').HTTPClientExtraOptions} HTTPClientExtraOptions diff --git a/packages/ipfs-http-client/src/pubsub/subscribe.js b/packages/ipfs-http-client/src/pubsub/subscribe.js index 810db8cb48..df34623fde 100644 --- a/packages/ipfs-http-client/src/pubsub/subscribe.js +++ b/packages/ipfs-http-client/src/pubsub/subscribe.js @@ -1,7 +1,7 @@ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const log = require('debug')('ipfs-http-client:pubsub:subscribe') const configure = require('../lib/configure') const toUrlSearchParams = require('../lib/to-url-search-params') diff --git a/packages/ipfs-http-client/test/dag.spec.js b/packages/ipfs-http-client/test/dag.spec.js index 274d89e26f..e1823d9f9e 100644 --- a/packages/ipfs-http-client/test/dag.spec.js +++ b/packages/ipfs-http-client/test/dag.spec.js @@ -3,7 +3,7 @@ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { expect } = require('aegir/utils/chai') const dagPb = require('@ipld/dag-pb') const dagCbor = require('@ipld/dag-cbor') diff --git a/packages/ipfs-http-client/test/files.spec.js b/packages/ipfs-http-client/test/files.spec.js index f0eb9696f5..fb902ed99a 100644 --- a/packages/ipfs-http-client/test/files.spec.js +++ b/packages/ipfs-http-client/test/files.spec.js @@ -2,7 +2,7 @@ 'use strict' -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { expect } = require('aegir/utils/chai') const f = require('./utils/factory')() const dagPb = require('@ipld/dag-pb') diff --git a/packages/ipfs-http-client/test/log.spec.js b/packages/ipfs-http-client/test/log.spec.js index 1066b7a33c..afc24d7bc7 100644 --- a/packages/ipfs-http-client/test/log.spec.js +++ b/packages/ipfs-http-client/test/log.spec.js @@ -3,7 +3,7 @@ 'use strict' const { expect } = require('aegir/utils/chai') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const f = require('./utils/factory')() const first = require('it-first') diff --git a/packages/ipfs-http-client/test/node/custom-headers.js b/packages/ipfs-http-client/test/node/custom-headers.js index 3ce91380e8..15d68967f7 100644 --- a/packages/ipfs-http-client/test/node/custom-headers.js +++ b/packages/ipfs-http-client/test/node/custom-headers.js @@ -4,7 +4,7 @@ const { isNode } = require('ipfs-utils/src/env') const { expect } = require('aegir/utils/chai') const ipfsClient = require('../../src').create -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') function startServer (fn) { let headersResolve diff --git a/packages/ipfs-http-client/test/node/request-api.js b/packages/ipfs-http-client/test/node/request-api.js index dfb9db7ff4..073c9b3a9e 100644 --- a/packages/ipfs-http-client/test/node/request-api.js +++ b/packages/ipfs-http-client/test/node/request-api.js @@ -2,7 +2,7 @@ 'use strict' const { expect } = require('aegir/utils/chai') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const ipfsClient = require('../../src').create describe('\'deal with HTTP weirdness\' tests', () => { diff --git a/packages/ipfs-http-client/test/pubsub.spec.js b/packages/ipfs-http-client/test/pubsub.spec.js index 286b500ceb..6fa771691b 100644 --- a/packages/ipfs-http-client/test/pubsub.spec.js +++ b/packages/ipfs-http-client/test/pubsub.spec.js @@ -3,7 +3,7 @@ const { expect } = require('aegir/utils/chai') const { AbortController } = require('native-abort-controller') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const defer = require('p-defer') const f = require('./utils/factory')() diff --git a/packages/ipfs-http-gateway/package.json b/packages/ipfs-http-gateway/package.json index fa8a40d195..744c367919 100644 --- a/packages/ipfs-http-gateway/package.json +++ b/packages/ipfs-http-gateway/package.json @@ -53,7 +53,7 @@ "it-to-stream": "^1.0.0", "joi": "^17.2.1", "multiformats": "^9.4.1", - "@vascosantos/uint8arrays": "^3.0.2", + "uint8arrays": "^3.0.0-rc.1", "uri-to-multiaddr": "^6.0.0" }, "devDependencies": { diff --git a/packages/ipfs-http-gateway/src/resources/gateway.js b/packages/ipfs-http-gateway/src/resources/gateway.js index 41e8fab9d3..2c6460f06c 100644 --- a/packages/ipfs-http-gateway/src/resources/gateway.js +++ b/packages/ipfs-http-gateway/src/resources/gateway.js @@ -1,7 +1,7 @@ 'use strict' const debug = require('debug') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const Boom = require('@hapi/boom') const Ammo = require('@hapi/ammo') // HTTP Range processing utilities const last = require('it-last') diff --git a/packages/ipfs-http-gateway/test/routes.spec.js b/packages/ipfs-http-gateway/test/routes.spec.js index 12c5f03d11..c51507299b 100644 --- a/packages/ipfs-http-gateway/test/routes.spec.js +++ b/packages/ipfs-http-gateway/test/routes.spec.js @@ -3,7 +3,7 @@ 'use strict' const { expect } = require('aegir/utils/chai') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const FileType = require('file-type') const { CID } = require('multiformats/cid') const { base32 } = require('multiformats/bases/base32') diff --git a/packages/ipfs-http-server/package.json b/packages/ipfs-http-server/package.json index 7d4c6aea84..44be94fb0f 100644 --- a/packages/ipfs-http-server/package.json +++ b/packages/ipfs-http-server/package.json @@ -61,7 +61,7 @@ "native-abort-controller": "^1.0.3", "parse-duration": "^1.0.0", "stream-to-it": "^0.2.2", - "@vascosantos/uint8arrays": "^3.0.2", + "uint8arrays": "^3.0.0-rc.1", "uri-to-multiaddr": "^6.0.0" }, "devDependencies": { diff --git a/packages/ipfs-http-server/src/api/resources/dag.js b/packages/ipfs-http-server/src/api/resources/dag.js index 4b998949ea..1e3feef0bc 100644 --- a/packages/ipfs-http-server/src/api/resources/dag.js +++ b/packages/ipfs-http-server/src/api/resources/dag.js @@ -6,7 +6,7 @@ const Joi = require('../../utils/joi') const Boom = require('@hapi/boom') const all = require('it-all') const { pipe } = require('it-pipe') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') /** * @param {undefined | Uint8Array | Record} obj diff --git a/packages/ipfs-http-server/src/api/resources/object.js b/packages/ipfs-http-server/src/api/resources/object.js index 7ca3d59007..8fd690b255 100644 --- a/packages/ipfs-http-server/src/api/resources/object.js +++ b/packages/ipfs-http-server/src/api/resources/object.js @@ -5,8 +5,8 @@ const all = require('it-all') const dagPB = require('@ipld/dag-pb') const Joi = require('../../utils/joi') const Boom = require('@hapi/boom') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const debug = require('debug') const log = Object.assign(debug('ipfs:http-api:object'), { error: debug('ipfs:http-api:object:error') diff --git a/packages/ipfs-http-server/src/api/resources/pubsub.js b/packages/ipfs-http-server/src/api/resources/pubsub.js index e11377504d..b77c69de2f 100644 --- a/packages/ipfs-http-server/src/api/resources/pubsub.js +++ b/packages/ipfs-http-server/src/api/resources/pubsub.js @@ -4,8 +4,8 @@ const Joi = require('../../utils/joi') const all = require('it-all') const multipart = require('../../utils/multipart-request-parser') const Boom = require('@hapi/boom') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const streamResponse = require('../../utils/stream-response') const pushable = require('it-pushable') diff --git a/packages/ipfs-http-server/src/utils/multipart-request-parser.js b/packages/ipfs-http-server/src/utils/multipart-request-parser.js index f9ca224631..a910723b30 100644 --- a/packages/ipfs-http-server/src/utils/multipart-request-parser.js +++ b/packages/ipfs-http-server/src/utils/multipart-request-parser.js @@ -3,8 +3,8 @@ // @ts-ignore no types const Content = require('@hapi/content') const multipart = require('it-multipart') -const { concat: uint8ArrayConcat } = require('@vascosantos/uint8arrays/concat') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { concat: uint8ArrayConcat } = require('uint8arrays/concat') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const qs = require('querystring') const drain = require('it-drain') diff --git a/packages/ipfs-http-server/test/inject/mfs/read.js b/packages/ipfs-http-server/test/inject/mfs/read.js index c31fcc4105..58b2414a76 100644 --- a/packages/ipfs-http-server/test/inject/mfs/read.js +++ b/packages/ipfs-http-server/test/inject/mfs/read.js @@ -3,7 +3,7 @@ const { expect } = require('aegir/utils/chai') const http = require('../../utils/http') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const sinon = require('sinon') const testHttpMethod = require('../../utils/test-http-method') const { AbortSignal } = require('native-abort-controller') diff --git a/packages/ipfs-http-server/test/inject/object.js b/packages/ipfs-http-server/test/inject/object.js index 782132e9f5..0b064ed840 100644 --- a/packages/ipfs-http-server/test/inject/object.js +++ b/packages/ipfs-http-server/test/inject/object.js @@ -12,8 +12,8 @@ const sinon = require('sinon') const { CID } = require('multiformats/cid') const { UnixFS } = require('ipfs-unixfs') const { AbortSignal } = require('native-abort-controller') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') -const { toString: uint8ArrayToString } = require('@vascosantos/uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const { base58btc } = require('multiformats/bases/base58') const { base64, base64pad } = require('multiformats/bases/base64') diff --git a/packages/ipfs-message-port-protocol/package.json b/packages/ipfs-message-port-protocol/package.json index 6a1cc38d89..b12fbc82e8 100644 --- a/packages/ipfs-message-port-protocol/package.json +++ b/packages/ipfs-message-port-protocol/package.json @@ -52,7 +52,7 @@ "devDependencies": { "aegir": "^34.0.2", "rimraf": "^3.0.2", - "@vascosantos/uint8arrays": "^3.0.2" + "uint8arrays": "^3.0.0-rc.1" }, "engines": { "node": ">=14.0.0", diff --git a/packages/ipfs-message-port-protocol/test/block.browser.js b/packages/ipfs-message-port-protocol/test/block.browser.js index b6ba4a49fd..dad77dd567 100644 --- a/packages/ipfs-message-port-protocol/test/block.browser.js +++ b/packages/ipfs-message-port-protocol/test/block.browser.js @@ -5,7 +5,7 @@ const { encodeBlock } = require('../src/block') const { ipc } = require('./util') const { expect } = require('aegir/utils/chai') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') describe('block (browser)', function () { this.timeout(10 * 1000) diff --git a/packages/ipfs-message-port-protocol/test/core.browser.js b/packages/ipfs-message-port-protocol/test/core.browser.js index 8cb5594a12..565b65820a 100644 --- a/packages/ipfs-message-port-protocol/test/core.browser.js +++ b/packages/ipfs-message-port-protocol/test/core.browser.js @@ -10,7 +10,7 @@ const { } = require('../src/core') const { ipc } = require('./util') const { expect } = require('aegir/utils/chai') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') describe('core', function () { this.timeout(10 * 1000) diff --git a/packages/ipfs-message-port-protocol/test/dag.browser.js b/packages/ipfs-message-port-protocol/test/dag.browser.js index b4a7f781ec..d7c6f7a8c7 100644 --- a/packages/ipfs-message-port-protocol/test/dag.browser.js +++ b/packages/ipfs-message-port-protocol/test/dag.browser.js @@ -6,7 +6,7 @@ const { CID } = require('multiformats/cid') const { encodeNode, decodeNode } = require('../src/dag') const { ipc } = require('./util') const { expect } = require('aegir/utils/chai') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') describe('dag (browser)', function () { this.timeout(10 * 1000) diff --git a/packages/ipfs-message-port-protocol/test/dag.spec.js b/packages/ipfs-message-port-protocol/test/dag.spec.js index d9d5fe5343..4b8250b611 100644 --- a/packages/ipfs-message-port-protocol/test/dag.spec.js +++ b/packages/ipfs-message-port-protocol/test/dag.spec.js @@ -5,7 +5,7 @@ const { CID } = require('multiformats/cid') const { encodeNode } = require('../src/dag') const { expect } = require('aegir/utils/chai') -const { fromString: uint8ArrayFromString } = require('@vascosantos/uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') describe('dag', function () { this.timeout(10 * 1000) From aac6cd12a203ff635f81c329c7103f578210d965 Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Mon, 16 Aug 2021 18:48:56 +0200 Subject: [PATCH 06/10] chore: remove streamming iterables unused dep --- packages/interface-ipfs-core/package.json | 2 +- packages/ipfs-cli/package.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/interface-ipfs-core/package.json b/packages/interface-ipfs-core/package.json index 5d71a1aaa3..4f9c01d8bf 100644 --- a/packages/interface-ipfs-core/package.json +++ b/packages/interface-ipfs-core/package.json @@ -69,7 +69,7 @@ "libp2p-crypto": "^0.19.6", "libp2p-websockets": "^0.16.1", "multiaddr": "^10.0.0", - "multiformats": "^9.4.5", + "multiformats": "^9.4.1", "nanoid": "^3.1.12", "native-abort-controller": "^1.0.3", "p-map": "^4.0.0", diff --git a/packages/ipfs-cli/package.json b/packages/ipfs-cli/package.json index c492270aa0..00a8820607 100644 --- a/packages/ipfs-cli/package.json +++ b/packages/ipfs-cli/package.json @@ -62,7 +62,6 @@ "pretty-bytes": "^5.4.1", "progress": "^2.0.3", "stream-to-it": "^0.2.2", - "streaming-iterables": "^6.0.0", "uint8arrays": "^3.0.0-rc.1", "yargs": "^16.0.3" }, From 1112eeeb6fdabd74f7ffdcf65d5cd3b33f1f1a59 Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Tue, 17 Aug 2021 10:24:56 +0200 Subject: [PATCH 07/10] chore: use final uint8arrays --- examples/browser-ipns-publish/package.json | 2 +- examples/circuit-relaying/package.json | 2 +- examples/custom-ipld-formats/package.json | 2 +- examples/ipfs-101/package.json | 2 +- examples/test-ipfs-example/package.json | 2 +- packages/interface-ipfs-core/package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/browser-ipns-publish/package.json b/examples/browser-ipns-publish/package.json index ca310c862c..1ed1dd98b7 100644 --- a/examples/browser-ipns-publish/package.json +++ b/examples/browser-ipns-publish/package.json @@ -20,7 +20,7 @@ "ipns": "^0.13.3", "it-last": "^1.0.4", "p-retry": "^4.2.0", - "uint8arrays": "^3.0.0-rc.1" + "uint8arrays": "^3.0.0" }, "browserslist": [ "last 2 versions and not dead and > 2%" diff --git a/examples/circuit-relaying/package.json b/examples/circuit-relaying/package.json index b4fb4ca52d..9be2ea7f0d 100644 --- a/examples/circuit-relaying/package.json +++ b/examples/circuit-relaying/package.json @@ -18,7 +18,7 @@ "ipfs": "^0.58.1", "ipfs-pubsub-room": "^2.0.1", "libp2p-websockets": "^0.16.1", - "uint8arrays": "^3.0.0-rc.1" + "uint8arrays": "^3.0.0" }, "devDependencies": { "execa": "^5.0.0", diff --git a/examples/custom-ipld-formats/package.json b/examples/custom-ipld-formats/package.json index 92082893c1..00f0f0e922 100644 --- a/examples/custom-ipld-formats/package.json +++ b/examples/custom-ipld-formats/package.json @@ -16,6 +16,6 @@ "ipfs-core": "^0.10.3", "ipfs-http-client": "^52.0.1", "multiformats": "^9.4.1", - "uint8arrays": "^3.0.0-rc.1" + "uint8arrays": "^3.0.0" } } diff --git a/examples/ipfs-101/package.json b/examples/ipfs-101/package.json index 8dd104bb4b..39d4722bfe 100644 --- a/examples/ipfs-101/package.json +++ b/examples/ipfs-101/package.json @@ -12,7 +12,7 @@ "dependencies": { "ipfs": "^0.58.1", "it-all": "^1.0.4", - "uint8arrays": "^3.0.0-rc.1" + "uint8arrays": "^3.0.0" }, "devDependencies": { "test-ipfs-example": "^3.0.0" diff --git a/examples/test-ipfs-example/package.json b/examples/test-ipfs-example/package.json index b61acbf291..b5a7efab45 100644 --- a/examples/test-ipfs-example/package.json +++ b/examples/test-ipfs-example/package.json @@ -12,7 +12,7 @@ "fs-extra": "^9.0.1", "http-server": "^0.12.3", "nightwatch": "^1.2.4", - "uint8arrays": "^3.0.0-rc.1", + "uint8arrays": "^3.0.0", "which": "^2.0.1" } } diff --git a/packages/interface-ipfs-core/package.json b/packages/interface-ipfs-core/package.json index 4f9c01d8bf..86c346d9c9 100644 --- a/packages/interface-ipfs-core/package.json +++ b/packages/interface-ipfs-core/package.json @@ -78,7 +78,7 @@ "peer-id": "^0.15.1", "readable-stream": "^3.4.0", "sinon": "^11.1.1", - "uint8arrays": "^3.0.0-rc.1" + "uint8arrays": "^3.0.0" }, "contributors": [ "Alan Shaw ", From fb749a7fcc4d02ad8f0a302efcf3d136757e3a00 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Fri, 20 Aug 2021 14:50:24 +0100 Subject: [PATCH 08/10] chore: remove rc from dep version --- packages/ipfs-cli/package.json | 2 +- packages/ipfs-core-utils/package.json | 2 +- packages/ipfs-core/package.json | 2 +- packages/ipfs-grpc-server/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 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/ipfs-cli/package.json b/packages/ipfs-cli/package.json index 00a8820607..e9dda97487 100644 --- a/packages/ipfs-cli/package.json +++ b/packages/ipfs-cli/package.json @@ -62,7 +62,7 @@ "pretty-bytes": "^5.4.1", "progress": "^2.0.3", "stream-to-it": "^0.2.2", - "uint8arrays": "^3.0.0-rc.1", + "uint8arrays": "^3.0.0", "yargs": "^16.0.3" }, "devDependencies": { diff --git a/packages/ipfs-core-utils/package.json b/packages/ipfs-core-utils/package.json index 1cc3617eb4..812a69499e 100644 --- a/packages/ipfs-core-utils/package.json +++ b/packages/ipfs-core-utils/package.json @@ -56,7 +56,7 @@ "multiformats": "^9.4.1", "parse-duration": "^1.0.0", "timeout-abort-controller": "^1.1.1", - "uint8arrays": "^3.0.0-rc.1" + "uint8arrays": "^3.0.0" }, "devDependencies": { "@web-std/file": "^1.1.2", diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json index c52de44123..731cf800f0 100644 --- a/packages/ipfs-core/package.json +++ b/packages/ipfs-core/package.json @@ -125,7 +125,7 @@ "parse-duration": "^1.0.0", "peer-id": "^0.15.1", "streaming-iterables": "^6.0.0", - "uint8arrays": "^3.0.0-rc.1" + "uint8arrays": "^3.0.0" }, "devDependencies": { "@types/dlv": "^1.1.2", diff --git a/packages/ipfs-grpc-server/package.json b/packages/ipfs-grpc-server/package.json index a10a77ffea..b3a7e71915 100644 --- a/packages/ipfs-grpc-server/package.json +++ b/packages/ipfs-grpc-server/package.json @@ -54,6 +54,6 @@ "it-drain": "^1.0.3", "rimraf": "^3.0.2", "sinon": "^11.1.1", - "uint8arrays": "^3.0.0-rc.1" + "uint8arrays": "^3.0.0" } } diff --git a/packages/ipfs-http-client/package.json b/packages/ipfs-http-client/package.json index b6598f8391..e4ff3e616f 100644 --- a/packages/ipfs-http-client/package.json +++ b/packages/ipfs-http-client/package.json @@ -64,7 +64,7 @@ "native-abort-controller": "^1.0.3", "parse-duration": "^1.0.0", "stream-to-it": "^0.2.2", - "uint8arrays": "^3.0.0-rc.1" + "uint8arrays": "^3.0.0" }, "devDependencies": { "aegir": "^34.0.2", diff --git a/packages/ipfs-http-gateway/package.json b/packages/ipfs-http-gateway/package.json index 744c367919..77f8043f7c 100644 --- a/packages/ipfs-http-gateway/package.json +++ b/packages/ipfs-http-gateway/package.json @@ -53,7 +53,7 @@ "it-to-stream": "^1.0.0", "joi": "^17.2.1", "multiformats": "^9.4.1", - "uint8arrays": "^3.0.0-rc.1", + "uint8arrays": "^3.0.0", "uri-to-multiaddr": "^6.0.0" }, "devDependencies": { diff --git a/packages/ipfs-http-server/package.json b/packages/ipfs-http-server/package.json index 44be94fb0f..92c91c3429 100644 --- a/packages/ipfs-http-server/package.json +++ b/packages/ipfs-http-server/package.json @@ -61,7 +61,7 @@ "native-abort-controller": "^1.0.3", "parse-duration": "^1.0.0", "stream-to-it": "^0.2.2", - "uint8arrays": "^3.0.0-rc.1", + "uint8arrays": "^3.0.0", "uri-to-multiaddr": "^6.0.0" }, "devDependencies": { diff --git a/packages/ipfs-message-port-protocol/package.json b/packages/ipfs-message-port-protocol/package.json index b12fbc82e8..4b7218bea4 100644 --- a/packages/ipfs-message-port-protocol/package.json +++ b/packages/ipfs-message-port-protocol/package.json @@ -52,7 +52,7 @@ "devDependencies": { "aegir": "^34.0.2", "rimraf": "^3.0.2", - "uint8arrays": "^3.0.0-rc.1" + "uint8arrays": "^3.0.0" }, "engines": { "node": ">=14.0.0", From 72518bfcea69445105e383605954a7e891857cfb Mon Sep 17 00:00:00 2001 From: achingbrain Date: Tue, 24 Aug 2021 14:52:04 +0100 Subject: [PATCH 09/10] chore: update version of ipfs-repo --- packages/ipfs-cli/package.json | 2 +- packages/ipfs-core/package.json | 4 ++-- .../ipfs-core/src/components/files/utils/update-mfs-root.js | 2 +- .../ipfs-core/src/components/files/utils/with-mfs-root.js | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/ipfs-cli/package.json b/packages/ipfs-cli/package.json index e9dda97487..d2d67e2a69 100644 --- a/packages/ipfs-cli/package.json +++ b/packages/ipfs-cli/package.json @@ -42,7 +42,7 @@ "ipfs-core-utils": "^0.10.1", "ipfs-daemon": "^0.9.3", "ipfs-http-client": "^52.0.1", - "ipfs-repo": "^11.0.1", + "ipfs-repo": "^12.0.0", "ipfs-utils": "^8.1.4", "it-all": "^1.0.4", "it-concat": "^2.0.0", diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json index 2dfc2179ea..446c598854 100644 --- a/packages/ipfs-core/package.json +++ b/packages/ipfs-core/package.json @@ -79,7 +79,7 @@ "ipfs-core-types": "^0.7.0", "ipfs-core-utils": "^0.10.1", "ipfs-http-client": "^52.0.1", - "ipfs-repo": "^11.0.1", + "ipfs-repo": "^12.0.0", "ipfs-unixfs": "^6.0.3", "ipfs-unixfs-exporter": "^7.0.3", "ipfs-unixfs-importer": "^9.0.3", @@ -106,7 +106,7 @@ "libp2p-delegated-content-routing": "^0.11.0", "libp2p-delegated-peer-routing": "^0.10.0", "libp2p-floodsub": "^0.27.0", - "libp2p-gossipsub": "^0.11.0", + "libp2p-gossipsub": "^0.11.1", "libp2p-kad-dht": "^0.23.1", "libp2p-mdns": "^0.17.0", "libp2p-mplex": "^0.10.2", diff --git a/packages/ipfs-core/src/components/files/utils/update-mfs-root.js b/packages/ipfs-core/src/components/files/utils/update-mfs-root.js index 1b3b649ecf..47ba7e8abc 100644 --- a/packages/ipfs-core/src/components/files/utils/update-mfs-root.js +++ b/packages/ipfs-core/src/components/files/utils/update-mfs-root.js @@ -22,7 +22,7 @@ const updateMfsRoot = async (context, cid, options) => { log(`New MFS root will be ${cid}`) - await context.repo.root.put(MFS_ROOT_KEY, cid.bytes) + await context.repo.datastore.put(MFS_ROOT_KEY, cid.bytes) return cid } diff --git a/packages/ipfs-core/src/components/files/utils/with-mfs-root.js b/packages/ipfs-core/src/components/files/utils/with-mfs-root.js index 6b77c84d60..f9b66146de 100644 --- a/packages/ipfs-core/src/components/files/utils/with-mfs-root.js +++ b/packages/ipfs-core/src/components/files/utils/with-mfs-root.js @@ -25,13 +25,13 @@ const loadMfsRoot = async (context, options) => { } // Open the repo if it's been closed - await context.repo.root.open() + await context.repo.datastore.open() // Load the MFS root CID let cid try { - const buf = await context.repo.root.get(MFS_ROOT_KEY) + const buf = await context.repo.datastore.get(MFS_ROOT_KEY) cid = CID.decode(buf) } catch (err) { @@ -52,7 +52,7 @@ const loadMfsRoot = async (context, options) => { throw errCode(new Error('Request aborted'), 'ERR_ABORTED', { name: 'Aborted' }) } - await context.repo.root.put(MFS_ROOT_KEY, cid.bytes) + await context.repo.datastore.put(MFS_ROOT_KEY, cid.bytes) } log(`Loaded MFS root /ipfs/${cid}`) From ab5a5cfdc691e2a6073922722f61f7a559be6633 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Tue, 24 Aug 2021 18:18:20 +0100 Subject: [PATCH 10/10] chore: updated versions --- examples/custom-ipfs-repo/package.json | 2 +- examples/custom-libp2p/package.json | 6 +++--- packages/interface-ipfs-core/package.json | 2 +- packages/ipfs-cli/package.json | 2 +- packages/ipfs-core/package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/custom-ipfs-repo/package.json b/examples/custom-ipfs-repo/package.json index d70d4829d7..13e9b5d378 100644 --- a/examples/custom-ipfs-repo/package.json +++ b/examples/custom-ipfs-repo/package.json @@ -15,7 +15,7 @@ "blockstore-datastore-adapter": "^1.0.0", "datastore-fs": "^5.0.2", "ipfs": "^0.58.1", - "ipfs-repo": "^11.0.1", + "ipfs-repo": "^12.0.0", "it-all": "^1.0.4", "multiformats": "^9.4.1" }, diff --git a/examples/custom-libp2p/package.json b/examples/custom-libp2p/package.json index 8a59c01751..e552d9da1b 100644 --- a/examples/custom-libp2p/package.json +++ b/examples/custom-libp2p/package.json @@ -13,11 +13,11 @@ "@chainsafe/libp2p-noise": "^4.0.0", "ipfs": "^0.58.1", "libp2p": "^0.32.0", - "libp2p-bootstrap": "^0.12.3", + "libp2p-bootstrap": "^0.13.0", "libp2p-kad-dht": "^0.23.1", - "libp2p-mdns": "^0.16.0", + "libp2p-mdns": "^0.17.0", "libp2p-mplex": "^0.10.2", - "libp2p-tcp": "^0.15.4" + "libp2p-tcp": "^0.17.1" }, "devDependencies": { "execa": "^5.0.0", diff --git a/packages/interface-ipfs-core/package.json b/packages/interface-ipfs-core/package.json index 3a18fefacf..819cf5f138 100644 --- a/packages/interface-ipfs-core/package.json +++ b/packages/interface-ipfs-core/package.json @@ -66,7 +66,7 @@ "it-pushable": "^1.4.2", "it-tar": "^4.0.0", "it-to-buffer": "^2.0.0", - "libp2p-crypto": "^0.19.6", + "libp2p-crypto": "^0.19.7", "libp2p-websockets": "^0.16.1", "multiaddr": "^10.0.0", "multiformats": "^9.4.1", diff --git a/packages/ipfs-cli/package.json b/packages/ipfs-cli/package.json index d2d67e2a69..c56744cddb 100644 --- a/packages/ipfs-cli/package.json +++ b/packages/ipfs-cli/package.json @@ -53,7 +53,7 @@ "it-split": "^0.0.1", "it-tar": "^4.0.0", "jsondiffpatch": "^0.4.1", - "libp2p-crypto": "^0.19.6", + "libp2p-crypto": "^0.19.7", "mafmt": "^10.0.0", "multiaddr": "^10.0.0", "multiaddr-to-uri": "^8.0.0", diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json index 446c598854..5245ac2510 100644 --- a/packages/ipfs-core/package.json +++ b/packages/ipfs-core/package.json @@ -102,7 +102,7 @@ "just-safe-set": "^2.2.1", "libp2p": "^0.32.0", "libp2p-bootstrap": "^0.13.0", - "libp2p-crypto": "^0.19.6", + "libp2p-crypto": "^0.19.7", "libp2p-delegated-content-routing": "^0.11.0", "libp2p-delegated-peer-routing": "^0.10.0", "libp2p-floodsub": "^0.27.0",