diff --git a/examples/running-multiple-nodes/test.js b/examples/running-multiple-nodes/test.js
index e8666d2b9f..28788d04ea 100644
--- a/examples/running-multiple-nodes/test.js
+++ b/examples/running-multiple-nodes/test.js
@@ -5,7 +5,7 @@ const IPFS = require('ipfs')
 const execa = require('execa')
 const os = require('os')
 const path = require('path')
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const {
   waitForOutput
 } = require('test-ipfs-example/utils')
diff --git a/packages/interface-ipfs-core/package.json b/packages/interface-ipfs-core/package.json
index 837c0ee3cd..f297ce30ce 100644
--- a/packages/interface-ipfs-core/package.json
+++ b/packages/interface-ipfs-core/package.json
@@ -33,7 +33,7 @@
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "chai-subset": "^1.6.0",
-    "cids": "^0.7.3",
+    "cids": "^0.8.0",
     "delay": "^4.3.0",
     "dirty-chai": "^2.0.1",
     "ipfs-block": "^0.8.1",
@@ -48,16 +48,16 @@
     "it-last": "^1.0.1",
     "it-pushable": "^1.3.1",
     "multiaddr": "^7.2.1",
-    "multibase": "^0.6.0",
+    "multibase": "^0.7.0",
     "multihashes": "^0.4.14",
     "multihashing-async": "^0.8.0",
-    "nanoid": "^2.1.11",
+    "nanoid": "^3.0.2",
     "peer-id": "^0.13.5",
     "readable-stream": "^3.4.0",
     "temp-write": "^4.0.0"
   },
   "devDependencies": {
-    "aegir": "21.3.0",
+    "aegir": "21.4.5",
     "ipfsd-ctl": "^3.0.0"
   },
   "contributors": [
diff --git a/packages/interface-ipfs-core/src/block/rm.js b/packages/interface-ipfs-core/src/block/rm.js
index 7d2f486dbf..f37bafc4bc 100644
--- a/packages/interface-ipfs-core/src/block/rm.js
+++ b/packages/interface-ipfs-core/src/block/rm.js
@@ -2,7 +2,7 @@
 'use strict'
 
 const { getDescribe, getIt, expect } = require('../utils/mocha')
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const all = require('it-all')
 
 /** @typedef { import("ipfsd-ctl/src/factory") } Factory */
diff --git a/packages/interface-ipfs-core/src/dht/get.js b/packages/interface-ipfs-core/src/dht/get.js
index 7fc977a4b7..9110678c9b 100644
--- a/packages/interface-ipfs-core/src/dht/get.js
+++ b/packages/interface-ipfs-core/src/dht/get.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 
 /** @typedef { import("ipfsd-ctl/src/factory") } Factory */
diff --git a/packages/interface-ipfs-core/src/files/chmod.js b/packages/interface-ipfs-core/src/files/chmod.js
index 6d57189d2d..2b63848a60 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 nanoid = require('nanoid')
+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 cd96783421..d01c74983c 100644
--- a/packages/interface-ipfs-core/src/files/cp.js
+++ b/packages/interface-ipfs-core/src/files/cp.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const all = require('it-all')
 const concat = require('it-concat')
 const { fixtures } = require('../utils')
diff --git a/packages/interface-ipfs-core/src/files/flush.js b/packages/interface-ipfs-core/src/files/flush.js
index f2b111596c..04a4546deb 100644
--- a/packages/interface-ipfs-core/src/files/flush.js
+++ b/packages/interface-ipfs-core/src/files/flush.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 
 /** @typedef { import("ipfsd-ctl/src/factory") } Factory */
diff --git a/packages/interface-ipfs-core/src/files/mkdir.js b/packages/interface-ipfs-core/src/files/mkdir.js
index 5f21161125..15f8b3c6b4 100644
--- a/packages/interface-ipfs-core/src/files/mkdir.js
+++ b/packages/interface-ipfs-core/src/files/mkdir.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 const multihash = require('multihashes')
 const createShardedDirectory = require('../utils/create-sharded-directory')
diff --git a/packages/interface-ipfs-core/src/files/rm.js b/packages/interface-ipfs-core/src/files/rm.js
index d49423e32f..debe1467f6 100644
--- a/packages/interface-ipfs-core/src/files/rm.js
+++ b/packages/interface-ipfs-core/src/files/rm.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 const createShardedDirectory = require('../utils/create-sharded-directory')
 const createTwoShards = require('../utils/create-two-shards')
diff --git a/packages/interface-ipfs-core/src/files/stat.js b/packages/interface-ipfs-core/src/files/stat.js
index 3a1908c35d..d948f4d7be 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 nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const all = require('it-all')
 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 6d5fb9c743..e59e5a7fad 100644
--- a/packages/interface-ipfs-core/src/files/touch.js
+++ b/packages/interface-ipfs-core/src/files/touch.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 const delay = require('delay')
 const concat = require('it-concat')
diff --git a/packages/interface-ipfs-core/src/files/write.js b/packages/interface-ipfs-core/src/files/write.js
index e8484ecedc..8455683c16 100644
--- a/packages/interface-ipfs-core/src/files/write.js
+++ b/packages/interface-ipfs-core/src/files/write.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 const { isNode } = require('ipfs-utils/src/env')
 const multihash = require('multihashes')
diff --git a/packages/interface-ipfs-core/src/key/export.js b/packages/interface-ipfs-core/src/key/export.js
index d650686261..467b4459e0 100644
--- a/packages/interface-ipfs-core/src/key/export.js
+++ b/packages/interface-ipfs-core/src/key/export.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 
 /** @typedef { import("ipfsd-ctl/src/factory") } Factory */
diff --git a/packages/interface-ipfs-core/src/key/gen.js b/packages/interface-ipfs-core/src/key/gen.js
index f53410ac0b..d3241b1382 100644
--- a/packages/interface-ipfs-core/src/key/gen.js
+++ b/packages/interface-ipfs-core/src/key/gen.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 
 /** @typedef { import("ipfsd-ctl/src/factory") } Factory */
diff --git a/packages/interface-ipfs-core/src/key/import.js b/packages/interface-ipfs-core/src/key/import.js
index 816f68a69a..1faa262a8d 100644
--- a/packages/interface-ipfs-core/src/key/import.js
+++ b/packages/interface-ipfs-core/src/key/import.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 
 /** @typedef { import("ipfsd-ctl/src/factory") } Factory */
diff --git a/packages/interface-ipfs-core/src/key/list.js b/packages/interface-ipfs-core/src/key/list.js
index 7ea5283fe3..a965b80c5a 100644
--- a/packages/interface-ipfs-core/src/key/list.js
+++ b/packages/interface-ipfs-core/src/key/list.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 
 /** @typedef { import("ipfsd-ctl/src/factory") } Factory */
diff --git a/packages/interface-ipfs-core/src/key/rename.js b/packages/interface-ipfs-core/src/key/rename.js
index de49554f72..9eafa9d622 100644
--- a/packages/interface-ipfs-core/src/key/rename.js
+++ b/packages/interface-ipfs-core/src/key/rename.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 
 /** @typedef { import("ipfsd-ctl/src/factory") } Factory */
diff --git a/packages/interface-ipfs-core/src/key/rm.js b/packages/interface-ipfs-core/src/key/rm.js
index 02233f31c2..df8f7ed143 100644
--- a/packages/interface-ipfs-core/src/key/rm.js
+++ b/packages/interface-ipfs-core/src/key/rm.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 
 /** @typedef { import("ipfsd-ctl/src/factory") } Factory */
diff --git a/packages/interface-ipfs-core/src/miscellaneous/resolve.js b/packages/interface-ipfs-core/src/miscellaneous/resolve.js
index ab916ee2cc..143ced7171 100644
--- a/packages/interface-ipfs-core/src/miscellaneous/resolve.js
+++ b/packages/interface-ipfs-core/src/miscellaneous/resolve.js
@@ -3,7 +3,7 @@
 
 const isIpfs = require('is-ipfs')
 const loadFixture = require('aegir/fixtures')
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const multibase = require('multibase')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 const all = require('it-all')
diff --git a/packages/interface-ipfs-core/src/name/publish.js b/packages/interface-ipfs-core/src/name/publish.js
index 375ca94eb6..ffa41c4537 100644
--- a/packages/interface-ipfs-core/src/name/publish.js
+++ b/packages/interface-ipfs-core/src/name/publish.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 
 const { fixture } = require('./utils')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
diff --git a/packages/interface-ipfs-core/src/object/data.js b/packages/interface-ipfs-core/src/object/data.js
index 3141c458e4..b61c1dc3db 100644
--- a/packages/interface-ipfs-core/src/object/data.js
+++ b/packages/interface-ipfs-core/src/object/data.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 
 /** @typedef { import("ipfsd-ctl/src/factory") } Factory */
diff --git a/packages/interface-ipfs-core/src/object/get.js b/packages/interface-ipfs-core/src/object/get.js
index 548aa221ed..bfd6b69a9b 100644
--- a/packages/interface-ipfs-core/src/object/get.js
+++ b/packages/interface-ipfs-core/src/object/get.js
@@ -3,7 +3,7 @@
 
 const dagPB = require('ipld-dag-pb')
 const DAGNode = dagPB.DAGNode
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 const UnixFs = require('ipfs-unixfs')
 const randomBytes = require('iso-random-stream/src/random')
diff --git a/packages/interface-ipfs-core/src/object/links.js b/packages/interface-ipfs-core/src/object/links.js
index 814753ac45..3776113a37 100644
--- a/packages/interface-ipfs-core/src/object/links.js
+++ b/packages/interface-ipfs-core/src/object/links.js
@@ -3,7 +3,7 @@
 
 const dagPB = require('ipld-dag-pb')
 const DAGNode = dagPB.DAGNode
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 const { asDAGLink } = require('./utils')
 const all = require('it-all')
diff --git a/packages/interface-ipfs-core/src/object/put.js b/packages/interface-ipfs-core/src/object/put.js
index 61c736dd76..2952897d6b 100644
--- a/packages/interface-ipfs-core/src/object/put.js
+++ b/packages/interface-ipfs-core/src/object/put.js
@@ -3,7 +3,7 @@
 
 const dagPB = require('ipld-dag-pb')
 const DAGNode = dagPB.DAGNode
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 const { asDAGLink } = require('./utils')
 
diff --git a/packages/interface-ipfs-core/src/pubsub/publish.js b/packages/interface-ipfs-core/src/pubsub/publish.js
index 0ab8c5da51..90feeac3ce 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 nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { getTopic } = require('./utils')
 const { getDescribe, getIt } = require('../utils/mocha')
 
diff --git a/packages/interface-ipfs-core/src/pubsub/utils.js b/packages/interface-ipfs-core/src/pubsub/utils.js
index 7c75fec5b0..a9c52fc8e8 100644
--- a/packages/interface-ipfs-core/src/pubsub/utils.js
+++ b/packages/interface-ipfs-core/src/pubsub/utils.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const delay = require('delay')
 
 async function waitForPeers (ipfs, topic, peersToWait, waitForMs) {
diff --git a/packages/ipfs-core-utils/.aegir.js b/packages/ipfs-core-utils/.aegir.js
index f897dd2a40..5e1ac8074a 100644
--- a/packages/ipfs-core-utils/.aegir.js
+++ b/packages/ipfs-core-utils/.aegir.js
@@ -50,11 +50,9 @@ let echo
 module.exports = {
   hooks: {
     pre: async () => {
-      console.info('starting echo server')
       echo = await echoServer()
     },
     post: async () => {
-      console.info('stopping echo server')
       await echo.stop()
     }
   }
diff --git a/packages/ipfs-core-utils/package.json b/packages/ipfs-core-utils/package.json
index d9a547edab..43811510f9 100644
--- a/packages/ipfs-core-utils/package.json
+++ b/packages/ipfs-core-utils/package.json
@@ -33,7 +33,7 @@
     "ipfs-utils": "^1.0.0"
   },
   "devDependencies": {
-    "aegir": "21.3.0",
+    "aegir": "21.4.5",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "delay": "^4.3.0",
diff --git a/packages/ipfs-http-client/package.json b/packages/ipfs-http-client/package.json
index 847efa7730..2bcacb7cab 100644
--- a/packages/ipfs-http-client/package.json
+++ b/packages/ipfs-http-client/package.json
@@ -42,7 +42,7 @@
     "bignumber.js": "^9.0.0",
     "bs58": "^4.0.1",
     "buffer": "^5.4.2",
-    "cids": "^0.7.3",
+    "cids": "^0.8.0",
     "debug": "^4.1.0",
     "form-data": "^3.0.0",
     "ipfs-block": "^0.8.1",
@@ -58,16 +58,16 @@
     "merge-options": "^2.0.0",
     "multiaddr": "^7.2.1",
     "multiaddr-to-uri": "^5.1.0",
-    "multibase": "^0.6.0",
+    "multibase": "^0.7.0",
     "multicodec": "^1.0.0",
     "multihashes": "^0.4.14",
-    "nanoid": "^2.1.11",
+    "nanoid": "^3.0.2",
     "node-fetch": "^2.6.0",
     "parse-duration": "^0.1.2",
     "stream-to-it": "^0.2.0"
   },
   "devDependencies": {
-    "aegir": "21.3.0",
+    "aegir": "21.4.5",
     "browser-process-platform": "^0.1.1",
     "cross-env": "^7.0.0",
     "go-ipfs-dep": "0.4.23-3",
@@ -76,7 +76,7 @@
     "it-all": "^1.0.1",
     "it-concat": "^1.0.0",
     "it-pipe": "^1.1.0",
-    "nock": "^11.7.2"
+    "nock": "^12.0.3"
   },
   "engines": {
     "node": ">=10.3.0",
diff --git a/packages/ipfs-http-client/src/lib/multipart-request.js b/packages/ipfs-http-client/src/lib/multipart-request.js
index cf18388552..f5441fce97 100644
--- a/packages/ipfs-http-client/src/lib/multipart-request.js
+++ b/packages/ipfs-http-client/src/lib/multipart-request.js
@@ -2,7 +2,7 @@
 
 const normaliseInput = require('ipfs-core-utils/src/files/normalise-input')
 const toStream = require('./to-stream')
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const modeToString = require('../lib/mode-to-string')
 const mtimeToObject = require('../lib/mtime-to-object')
 
diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json
index 94b8aa2f2c..94dc51e5b8 100644
--- a/packages/ipfs/package.json
+++ b/packages/ipfs/package.json
@@ -80,7 +80,7 @@
     "bs58": "^4.0.1",
     "byteman": "^1.3.5",
     "cid-tool": "^0.4.0",
-    "cids": "^0.7.3",
+    "cids": "^0.8.0",
     "class-is": "^1.1.0",
     "dag-cbor-links": "^1.3.2",
     "datastore-core": "^0.7.0",
@@ -89,7 +89,7 @@
     "debug": "^4.1.0",
     "dlv": "^1.1.3",
     "err-code": "^2.0.0",
-    "file-type": "^12.0.1",
+    "file-type": "^14.1.4",
     "fnv1a": "^1.0.1",
     "get-folder-size": "^2.0.0",
     "hamt-sharding": "^1.0.0",
@@ -102,10 +102,10 @@
     "ipfs-core-utils": "~0.0.0",
     "ipfs-http-client": "^42.0.0",
     "ipfs-http-response": "^0.5.0",
-    "ipfs-repo": "^0.30.1",
+    "ipfs-repo": "^1.0.0",
     "ipfs-unixfs": "^1.0.0",
     "ipfs-unixfs-exporter": "^1.0.1",
-    "ipfs-unixfs-importer": "^1.0.1",
+    "ipfs-unixfs-importer": "^1.0.2",
     "ipfs-utils": "^1.0.0",
     "ipld": "^0.25.0",
     "ipld-bitcoin": "^0.3.0",
@@ -129,7 +129,7 @@
     "it-tar": "^1.2.1",
     "it-to-stream": "^0.1.1",
     "iterable-ndjson": "^1.1.0",
-    "jsondiffpatch": "^0.3.11",
+    "jsondiffpatch": "^0.4.1",
     "just-safe-set": "^2.1.0",
     "libp2p": "^0.27.2",
     "libp2p-bootstrap": "^0.10.3",
@@ -152,7 +152,7 @@
     "mortice": "^2.0.0",
     "multiaddr": "^7.2.1",
     "multiaddr-to-uri": "^5.1.0",
-    "multibase": "^0.6.0",
+    "multibase": "^0.7.0",
     "multicodec": "^1.0.0",
     "multihashes": "^0.4.14",
     "multihashing-async": "^0.8.0",
@@ -176,12 +176,12 @@
     "yargs-promise": "^1.1.0"
   },
   "devDependencies": {
-    "aegir": "21.3.0",
+    "aegir": "21.4.5",
     "base64url": "^3.0.1",
     "clear-module": "^4.0.0",
     "cross-env": "^7.0.0",
     "delay": "^4.3.0",
-    "execa": "^3.2.0",
+    "execa": "^4.0.0",
     "form-data": "^3.0.0",
     "go-ipfs-dep": "0.4.23-3",
     "interface-ipfs-core": "^0.132.0",
@@ -189,19 +189,19 @@
     "ipfsd-ctl": "^3.0.0",
     "iso-random-stream": "^1.1.1",
     "it-first": "^1.0.1",
-    "nanoid": "^2.1.11",
+    "nanoid": "^3.0.2",
     "ncp": "^2.0.0",
     "p-event": "^4.1.0",
-    "p-map": "^3.0.0",
+    "p-map": "^4.0.0",
     "qs": "^6.5.2",
     "rimraf": "^3.0.0",
-    "sinon": "^8.0.4",
+    "sinon": "^9.0.1",
     "stream-to-promise": "^2.2.0",
     "string-argv": "^0.3.1",
     "temp-write": "^4.0.0"
   },
   "optionalDependencies": {
-    "prom-client": "^11.5.3",
+    "prom-client": "^12.0.0",
     "prometheus-gc-stats": "^0.6.0"
   },
   "engines": {
diff --git a/packages/ipfs/test/cli/daemon.js b/packages/ipfs/test/cli/daemon.js
index 4ef68f4378..ad59f82b27 100644
--- a/packages/ipfs/test/cli/daemon.js
+++ b/packages/ipfs/test/cli/daemon.js
@@ -7,7 +7,7 @@ const ipfsCmd = require('../utils/ipfs-exec')
 const { isWindows } = require('../utils/platforms')
 const os = require('os')
 const path = require('path')
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const fs = require('fs')
 const tempWrite = require('temp-write')
 const pkg = require('../../package.json')
diff --git a/packages/ipfs/test/cli/general.js b/packages/ipfs/test/cli/general.js
index f475fed85c..f12588ab48 100644
--- a/packages/ipfs/test/cli/general.js
+++ b/packages/ipfs/test/cli/general.js
@@ -4,7 +4,7 @@
 const os = require('os')
 const fs = require('fs').promises
 const path = require('path')
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const { repoVersion } = require('ipfs-repo')
 const { promisify } = require('util')
diff --git a/packages/ipfs/test/cli/init.js b/packages/ipfs/test/cli/init.js
index 32fba29736..b17aa8be80 100644
--- a/packages/ipfs/test/cli/init.js
+++ b/packages/ipfs/test/cli/init.js
@@ -5,7 +5,7 @@ const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const path = require('path')
 const fs = require('fs')
 const clean = require('../utils/clean')
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const ipfsExec = require('../utils/ipfs-exec')
 const os = require('os')
 const tempWrite = require('temp-write')
diff --git a/packages/ipfs/test/core/bitswap.spec.js b/packages/ipfs/test/core/bitswap.spec.js
index 9d40b17473..502e4b3cce 100644
--- a/packages/ipfs/test/core/bitswap.spec.js
+++ b/packages/ipfs/test/core/bitswap.spec.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const pmap = require('p-map')
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const Block = require('ipfs-block')
diff --git a/packages/ipfs/test/core/block.spec.js b/packages/ipfs/test/core/block.spec.js
index dd971b0c85..e51dd063ff 100644
--- a/packages/ipfs/test/core/block.spec.js
+++ b/packages/ipfs/test/core/block.spec.js
@@ -3,7 +3,7 @@
 'use strict'
 
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const all = require('it-all')
 const factory = require('../utils/factory')
 
diff --git a/packages/ipfs/test/core/create-node.spec.js b/packages/ipfs/test/core/create-node.spec.js
index 2e3681a468..1c50d79ad3 100644
--- a/packages/ipfs/test/core/create-node.spec.js
+++ b/packages/ipfs/test/core/create-node.spec.js
@@ -6,7 +6,7 @@ const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const sinon = require('sinon')
 const os = require('os')
 const path = require('path')
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { isNode } = require('ipfs-utils/src/env')
 const IPFS = require('../../src/core')
 
diff --git a/packages/ipfs/test/core/files.spec.js b/packages/ipfs/test/core/files.spec.js
index ba72b90466..02363ceddc 100644
--- a/packages/ipfs/test/core/files.spec.js
+++ b/packages/ipfs/test/core/files.spec.js
@@ -3,7 +3,7 @@
 'use strict'
 
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const all = require('it-all')
 const factory = require('../utils/factory')
 
diff --git a/packages/ipfs/test/core/init.spec.js b/packages/ipfs/test/core/init.spec.js
index 72ce000c09..ad767a5eae 100644
--- a/packages/ipfs/test/core/init.spec.js
+++ b/packages/ipfs/test/core/init.spec.js
@@ -4,7 +4,7 @@
 
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const { isNode } = require('ipfs-utils/src/env')
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const IPFS = require('../../src/core')
 
 const privateKey = 'CAASqAkwggSkAgEAAoIBAQChVmiObYo6pkKrMSd3OzW1cTL+RDmX1rkETYGKWV9TPXMNgElFTYoYHqT9QZomj5RI8iUmHccjzqr4J0mV+E0NpvHHOLlmDZ82lAw2Zx7saUkeQWvC0S9Z0o3aTx2sSubZV53rSomkZgQH4fYTs4RERejV4ltzLFdzQQBwWrBvlagpPHUCxKDUCnE5oIzdbD26ltWViPBWr7TfotzC8Lyi/tceqCpHMUJGMbsVgypnlgpey07MBvs71dVh5LcRen/ztsQO6Yju4D3QgWoyD0SIUdJFvBzEwL9bSiA3QjUc/fkGd7EcdN5bebYOqAi4ZIiAMLp3i4+B8Tzq/acull43AgMBAAECggEBAIDgZE75o4SsEO9tKWht7L5OeXxxBUyMImkUfJkGQUZd/MzZIC5y/Q+9UvBW+gs5gCsw+onTGaM50Iq/32Ej4nE4XURVxIuH8BmJ86N1hlc010qK2cjajqeCsPulXT+m6XbOLYCpnv+q2idt0cL1EH/1FEPeOEztK8ION4qIdw36SoykfTx/RqtkKHtS01AwN82EOPbWk7huyQT5R5MsCZmRJXBFkpNtiL+8619BH2aVlghHO4NouF9wQjdz/ysVuyYg+3rX2cpGjuHDTZ6hVQiJD1lF6D+dua7UPyHYAG2iRQiKZmCjitt9ywzPxiRaYF/aZ02FEMWckZulR09axskCgYEAzjl6ER8WwxYHn4tHse+CrIIF2z5cscdrh7KSwd3Rse9hIIBDJ/0KkvoYd1IcWrS8ywLrRfSLIjEU9u7IN1m+IRVWJ61fXNqOHm9clAu6qNhCN6W2+JfxDkUygTwmsq0v3huO+qkiMQz+a4nAXJe8Utd36ywgPhVGxFa/7x1v1N0CgYEAyEdiYRFf1aQZcO7+B2FH+tkGJsB30VIBhcpG9EukuQUUulLHhScc/KRj+EFAACLdkTqlVI0xVYIWaaCXwoQCWKixjZ5mYPC+bBLgn4IoDS6XTdHtR7Vn3UUvGTKsM0/z4e8/0eSzGNCHoYez9IoBlPNic0sQuST4jzgS2RYnFCMCgYASWSzSLyjwTJp7CIJlg4Dl5l+tBRxsOOkJVssV8q2AnmLO6HqRKUNylkvs+eJJ88DEc0sJm1txvFo4KkCoJBT1jpduyk8szMlOTew3w99kvHEP0G+6KJKrCV8X/okW5q/WnC8ZgEjpglV0rfnugxWfbUpfIzrvKydzuqAzHzRfBQKBgQDANtKSeoxRjEbmfljLWHAure8bbgkQmfXgI7xpZdfXwqqcECpw/pLxXgycDHOSLeQcJ/7Y4RGCEXHVOk2sX+mokW6mjmmPjD4VlyCBtfcef6KzC1EBS3c9g9KqCln+fTOBmY7UsPu6SxiAzK7HeVP/Un8gS+Dm8DalrZlZQ8uJpQKBgF6mL/Xo/XUOiz2jAD18l8Y6s49bA9H2CoLpBGTV1LfY5yTFxRy4R3qnX/IzsKy567sbtkEFKJxplc/RzCQfrgbdj7k26SbKtHR3yERaFGRYq8UeAHeYC1/N19LF5BMQL4y5R4PJ1SFPeJCL/wXiMqs1maTqvKqtc4bbegNdwlxn'
diff --git a/packages/ipfs/test/core/key-exchange.spec.js b/packages/ipfs/test/core/key-exchange.spec.js
index 55c40d7e93..16a54704cb 100644
--- a/packages/ipfs/test/core/key-exchange.spec.js
+++ b/packages/ipfs/test/core/key-exchange.spec.js
@@ -3,7 +3,7 @@
 'use strict'
 
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const factory = require('../utils/factory')
 
 describe('key exchange', function () {
diff --git a/packages/ipfs/test/core/mfs-preload.spec.js b/packages/ipfs/test/core/mfs-preload.spec.js
index 4c9cf068c6..a2c5e5316f 100644
--- a/packages/ipfs/test/core/mfs-preload.spec.js
+++ b/packages/ipfs/test/core/mfs-preload.spec.js
@@ -4,7 +4,7 @@
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const delay = require('delay')
 const multihashing = require('multihashing-async')
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { Buffer } = require('buffer')
 const CID = require('cids')
 const waitFor = require('../utils/wait-for')
diff --git a/packages/ipfs/test/core/name-pubsub.js b/packages/ipfs/test/core/name-pubsub.js
index 46059ecd1f..8d92e14f8f 100644
--- a/packages/ipfs/test/core/name-pubsub.js
+++ b/packages/ipfs/test/core/name-pubsub.js
@@ -2,7 +2,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const base64url = require('base64url')
 const { fromB58String } = require('multihashes')
diff --git a/packages/ipfs/test/core/name.spec.js b/packages/ipfs/test/core/name.spec.js
index 76218472bb..54de05edb8 100644
--- a/packages/ipfs/test/core/name.spec.js
+++ b/packages/ipfs/test/core/name.spec.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const sinon = require('sinon')
 const delay = require('delay')
diff --git a/packages/ipfs/test/core/object.spec.js b/packages/ipfs/test/core/object.spec.js
index 153245d73d..de6835fe78 100644
--- a/packages/ipfs/test/core/object.spec.js
+++ b/packages/ipfs/test/core/object.spec.js
@@ -3,7 +3,7 @@
 'use strict'
 
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const factory = require('../utils/factory')
 
 describe('object', function () {
diff --git a/packages/ipfs/test/core/preload.spec.js b/packages/ipfs/test/core/preload.spec.js
index e60e6ed529..d77eb22f7b 100644
--- a/packages/ipfs/test/core/preload.spec.js
+++ b/packages/ipfs/test/core/preload.spec.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const all = require('it-all')
 const MockPreloadNode = require('../utils/mock-preload-node')
diff --git a/packages/ipfs/test/core/pubsub.spec.js b/packages/ipfs/test/core/pubsub.spec.js
index 7895156413..acd277fdf8 100644
--- a/packages/ipfs/test/core/pubsub.spec.js
+++ b/packages/ipfs/test/core/pubsub.spec.js
@@ -2,7 +2,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const IPFS = require('../../src')
 const createTempRepo = require('../utils/create-repo-nodejs')
diff --git a/packages/ipfs/test/gateway/index.js b/packages/ipfs/test/gateway/index.js
index d302c3823e..cd67caf186 100644
--- a/packages/ipfs/test/gateway/index.js
+++ b/packages/ipfs/test/gateway/index.js
@@ -7,8 +7,8 @@ const Daemon = require('../../src/cli/daemon')
 const loadFixture = require('aegir/fixtures')
 const os = require('os')
 const path = require('path')
-const nanoid = require('nanoid')
-const fileType = require('file-type')
+const { nanoid } = require('nanoid')
+const FileType = require('file-type')
 const CID = require('cids')
 const all = require('it-all')
 
@@ -442,7 +442,7 @@ describe('HTTP Gateway', function () {
     expect(res.headers.etag).to.equal('"Qmd286K6pohQcTKYqnS1YhWrCiS4gz7Xi34sdwMe9USZ7u"')
     expect(res.headers.suborigin).to.equal('ipfs000bafybeidsg6t7ici2osxjkukisd5inixiunqdpq2q5jy4a2ruzdf6ewsqk4')
 
-    const fileSignature = fileType(res.rawPayload)
+    const fileSignature = await FileType.fromBuffer(res.rawPayload)
     expect(fileSignature.mime).to.equal('image/jpeg')
     expect(fileSignature.ext).to.equal('jpg')
   })
@@ -619,7 +619,7 @@ describe('HTTP Gateway', function () {
     expect(res.headers.etag).to.equal('"Qmd286K6pohQcTKYqnS1YhWrCiS4gz7Xi34sdwMe9USZ7u"')
     expect(res.headers.suborigin).to.equal(`ipns000${new CID(id).toV1().toBaseEncodedString('base32')}`)
 
-    const fileSignature = fileType(res.rawPayload)
+    const fileSignature = await FileType.fromBuffer(res.rawPayload)
     expect(fileSignature.mime).to.equal('image/jpeg')
     expect(fileSignature.ext).to.equal('jpg')
   })
diff --git a/packages/ipfs/test/http-api/inject/dag.js b/packages/ipfs/test/http-api/inject/dag.js
index ed282f7deb..c76b458465 100644
--- a/packages/ipfs/test/http-api/inject/dag.js
+++ b/packages/ipfs/test/http-api/inject/dag.js
@@ -2,7 +2,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const DAGNode = require('ipld-dag-pb').DAGNode
 const Readable = require('stream').Readable
diff --git a/packages/ipfs/test/http-api/routes.js b/packages/ipfs/test/http-api/routes.js
index 1409753a03..f952815ff8 100644
--- a/packages/ipfs/test/http-api/routes.js
+++ b/packages/ipfs/test/http-api/routes.js
@@ -2,7 +2,7 @@
 'use strict'
 
 const fs = require('fs')
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const Daemon = require('../../src/cli/daemon')
 const { promisify } = require('util')
 const ncp = promisify(require('ncp').ncp)
diff --git a/packages/ipfs/test/utils/create-repo-browser.js b/packages/ipfs/test/utils/create-repo-browser.js
index 34d324e6e1..2cd496feb9 100644
--- a/packages/ipfs/test/utils/create-repo-browser.js
+++ b/packages/ipfs/test/utils/create-repo-browser.js
@@ -2,7 +2,7 @@
 'use strict'
 
 const IPFSRepo = require('ipfs-repo')
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 
 const idb = self.indexedDB ||
   self.mozIndexedDB ||
diff --git a/packages/ipfs/test/utils/create-repo-nodejs.js b/packages/ipfs/test/utils/create-repo-nodejs.js
index 81591e2819..6af4063769 100644
--- a/packages/ipfs/test/utils/create-repo-nodejs.js
+++ b/packages/ipfs/test/utils/create-repo-nodejs.js
@@ -4,7 +4,7 @@ const IPFSRepo = require('ipfs-repo')
 const clean = require('./clean')
 const os = require('os')
 const path = require('path')
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 
 module.exports = function createTempRepo (repoPath) {
   repoPath = repoPath || path.join(os.tmpdir(), '/ipfs-test-' + nanoid())