diff --git a/.github/workflows/bundlesize.yml b/.github/workflows/bundlesize.yml
index 2b77a02d5a..23ba944ad7 100644
--- a/.github/workflows/bundlesize.yml
+++ b/.github/workflows/bundlesize.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [14.x]
         project:
           - packages/ipfs-core-utils
           - packages/ipfs-core
diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
index 7ea91b157b..bc2eca3a32 100644
--- a/.github/workflows/typecheck.yml
+++ b/.github/workflows/typecheck.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [14.x]
         project:
           - packages/ipfs-core-utils
           - packages/ipfs-core
diff --git a/.travis.yml b/.travis.yml
index e18b74ad1e..9d601fa7a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,7 +63,6 @@ jobs:
     - name: external - sidetree
 
   include:
-    # manual install step, we do this to cache the installed files for subsequent steps
     - stage: test
       name: lint
       script:
@@ -272,9 +271,8 @@ jobs:
     - stage: test
       name: examples
       script:
-        # Travis lets scripts continue even if previous steps fail: https://github.com/travis-ci/travis-ci/issues/1066
-        - npm run build -- --scope={ipfs-core,ipfs,ipfs-http-client,ipfs-message-port-*} &&
-          npm run configure-examples &&
+        # Travis lets scripts continue even if previous steps fail so need to use &&: https://github.com/travis-ci/travis-ci/issues/1066
+        - npm run configure-examples &&
           npm run test -- --scope=example* --concurrency=1
 
     - stage: release-rc
diff --git a/examples/browser-exchange-files/package.json b/examples/browser-exchange-files/package.json
index 549fb7cca3..a80b09a39a 100644
--- a/examples/browser-exchange-files/package.json
+++ b/examples/browser-exchange-files/package.json
@@ -15,7 +15,7 @@
     "execa": "^4.0.3",
     "http-server": "^0.12.3",
     "ipfs-http-client": "^48.2.2",
-    "uint8arrays": "^1.1.0"
+    "uint8arrays": "^2.0.5"
   },
   "dependencies": {
     "ipfs": "^0.53.2",
diff --git a/examples/browser-ipns-publish/package.json b/examples/browser-ipns-publish/package.json
index 5964876fca..4e21872430 100644
--- a/examples/browser-ipns-publish/package.json
+++ b/examples/browser-ipns-publish/package.json
@@ -15,11 +15,11 @@
     "human-crypto-keys": "^0.1.4",
     "ipfs": "^0.53.2",
     "ipfs-http-client": "^48.2.2",
-    "ipfs-utils": "^5.0.0",
+    "ipfs-utils": "^6.0.0",
     "ipns": "^0.8.0",
     "it-last": "^1.0.4",
     "p-retry": "^4.2.0",
-    "uint8arrays": "^1.1.0"
+    "uint8arrays": "^2.0.5"
   },
   "browserslist": [
     "last 2 versions and not dead and > 2%"
diff --git a/examples/circuit-relaying/package.json b/examples/circuit-relaying/package.json
index a75c8f5950..2a288b96b9 100644
--- a/examples/circuit-relaying/package.json
+++ b/examples/circuit-relaying/package.json
@@ -18,7 +18,7 @@
     "ipfs": "^0.53.2",
     "ipfs-pubsub-room": "^2.0.1",
     "libp2p-websockets": "^0.15.0",
-    "uint8arrays": "^1.1.0"
+    "uint8arrays": "^2.0.5"
   },
   "devDependencies": {
     "execa": "^4.0.3",
diff --git a/examples/custom-ipfs-repo/package.json b/examples/custom-ipfs-repo/package.json
index 05f36072d4..e59f6e8222 100644
--- a/examples/custom-ipfs-repo/package.json
+++ b/examples/custom-ipfs-repo/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "datastore-fs": "^2.0.0",
     "ipfs": "^0.53.2",
-    "ipfs-repo": "^7.0.0",
+    "ipfs-repo": "^8.0.0",
     "it-all": "^1.0.4"
   },
   "devDependencies": {
diff --git a/examples/custom-ipld-formats/package.json b/examples/custom-ipld-formats/package.json
index a592b45e05..32da95edb9 100644
--- a/examples/custom-ipld-formats/package.json
+++ b/examples/custom-ipld-formats/package.json
@@ -17,6 +17,6 @@
     "ipfs-http-client": "^48.2.2",
     "multicodec": "^2.0.1",
     "multihashing-async": "^2.0.1",
-    "uint8arrays": "^1.1.0"
+    "uint8arrays": "^2.0.5"
   }
 }
diff --git a/examples/ipfs-101/package.json b/examples/ipfs-101/package.json
index 0e17798210..041bc7be08 100644
--- a/examples/ipfs-101/package.json
+++ b/examples/ipfs-101/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "ipfs": "^0.53.2",
     "it-all": "^1.0.4",
-    "uint8arrays": "^1.1.0"
+    "uint8arrays": "^2.0.5"
   },
   "devDependencies": {
     "test-ipfs-example": "^2.0.3"
diff --git a/examples/run-in-electron/package.json b/examples/run-in-electron/package.json
index ac4285f8d8..2ed49984ef 100644
--- a/examples/run-in-electron/package.json
+++ b/examples/run-in-electron/package.json
@@ -16,8 +16,8 @@
   "author": "David Dias <daviddias@ipfs.io>",
   "license": "MIT",
   "devDependencies": {
-    "electron": "^6.0.0",
-    "electron-rebuild": "^1.8.4",
+    "electron": "^11.2.1",
+    "electron-rebuild": "^2.3.4",
     "ipfs": "^0.53.2",
     "test-ipfs-example": "^2.0.3"
   },
diff --git a/examples/test-ipfs-example/package.json b/examples/test-ipfs-example/package.json
index a55564fcf7..bc2c230c67 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": "^1.1.0",
+    "uint8arrays": "^2.0.5",
     "which": "^2.0.1"
   }
 }
diff --git a/examples/types-use-ipfs-from-ts/package.json b/examples/types-use-ipfs-from-ts/package.json
index 135cf92baf..8adcf740e8 100644
--- a/examples/types-use-ipfs-from-ts/package.json
+++ b/examples/types-use-ipfs-from-ts/package.json
@@ -5,7 +5,7 @@
     "ipfs": "^0.53.2"
   },
   "devDependencies": {
-    "typescript": "4.0.x"
+    "typescript": "4.1.x"
   },
   "scripts": {
     "test": "tsc --noEmit"
diff --git a/examples/types-use-ipfs-from-typed-js/package.json b/examples/types-use-ipfs-from-typed-js/package.json
index f2202be3de..8a0f468943 100644
--- a/examples/types-use-ipfs-from-typed-js/package.json
+++ b/examples/types-use-ipfs-from-typed-js/package.json
@@ -5,7 +5,7 @@
     "ipfs": "^0.53.2"
   },
   "devDependencies": {
-    "typescript": "4.0.x"
+    "typescript": "4.1.x"
   },
   "scripts": {
     "test": "tsc --noEmit"
diff --git a/package.json b/package.json
index 9c6e169908..6c25d50c11 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "JavaScript implementation of the IPFS specification",
   "scripts": {
-    "postinstall": "lerna bootstrap && npm run build -- --scope=ipfs-grpc-protocol",
+    "postinstall": "lerna bootstrap",
     "link": "lerna link",
     "reset": "lerna run clean && rimraf packages/*/node_modules node_modules",
     "test": "lerna run test",
@@ -23,11 +23,10 @@
     "test:interface:message-port-client": "lerna run test:interface:message-port-client",
     "coverage": "lerna run coverage",
     "build": "lerna run build",
-    "build:types": "lerna run build:types",
     "clean": "lerna run clean",
     "lint": "lerna run lint",
     "dep-check": "lerna run dep-check",
-    "configure-examples": "run-s release:pre:add-examples release:pre:add-hoisted-modules release:pre:reinstall",
+    "configure-examples": "run-s release:pre:add-examples release:pre:add-hoisted-modules release:pre:reinstall && npm run build -- --scope={ipfs-core,ipfs,ipfs-http-client,ipfs-message-port-*}",
     "release": "run-s release:pre:* release:publish docker:release release:post:*",
     "release:pre:non-dirty-repo": "git diff --quiet",
     "release:pre:update-contributors": "aegir release --lint=false --test=false --bump=false --build=false --changelog=false --commit=false --tag=false --push=false --ghrelease=false --docs=false --publish=false",
diff --git a/packages/interface-ipfs-core/package.json b/packages/interface-ipfs-core/package.json
index bcb622e919..c78a0b8d2b 100644
--- a/packages/interface-ipfs-core/package.json
+++ b/packages/interface-ipfs-core/package.json
@@ -30,7 +30,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "aegir": "^29.2.2",
+    "aegir": "^30.3.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "chai-subset": "^1.6.0",
@@ -40,7 +40,7 @@
     "err-code": "^2.0.3",
     "ipfs-unixfs": "^2.0.3",
     "ipfs-unixfs-importer": "^5.0.0",
-    "ipfs-utils": "^5.0.0",
+    "ipfs-utils": "^6.0.0",
     "ipld-block": "^0.11.0",
     "ipld-dag-cbor": "^0.17.0",
     "ipld-dag-pb": "^0.20.0",
@@ -51,6 +51,7 @@
     "it-buffer-stream": "^1.0.5",
     "it-concat": "^1.0.1",
     "it-drain": "^1.0.3",
+    "it-first": "^1.0.4",
     "it-last": "^1.0.4",
     "it-map": "^1.0.4",
     "it-pushable": "^1.4.0",
@@ -64,7 +65,7 @@
     "p-map": "^4.0.0",
     "peer-id": "^0.14.1",
     "readable-stream": "^3.4.0",
-    "uint8arrays": "^1.1.0"
+    "uint8arrays": "^2.0.5"
   },
   "contributors": [
     "Alan Shaw <alan.shaw@protocol.ai>",
diff --git a/packages/interface-ipfs-core/src/add.js b/packages/interface-ipfs-core/src/add.js
index 19625a8331..4be482f5ac 100644
--- a/packages/interface-ipfs-core/src/add.js
+++ b/packages/interface-ipfs-core/src/add.js
@@ -346,7 +346,7 @@ module.exports = (common, options) => {
     })
 
     it('should not add from an invalid url', () => {
-      return expect(ipfs.add(urlSource('123http://invalid'))).to.eventually.be.rejected()
+      return expect(() => ipfs.add(urlSource('123http://invalid'))).to.throw()
     })
 
     it('should respect raw leaves when file is smaller than one block and no metadata is present', async () => {
diff --git a/packages/interface-ipfs-core/src/files/write.js b/packages/interface-ipfs-core/src/files/write.js
index 3c34ec6d9a..d35e0ed9d7 100644
--- a/packages/interface-ipfs-core/src/files/write.js
+++ b/packages/interface-ipfs-core/src/files/write.js
@@ -452,7 +452,7 @@ module.exports = (common, options) => {
 
       const actualBytes = uint8ArrayConcat(await all(ipfs.files.read(fileName)))
 
-      for (var i = 0; i < newDataStream.length; i++) {
+      for (let i = 0; i < newDataStream.length; i++) {
         if (newDataStream[i] !== actualBytes[i]) {
           if (initialStream[i] === actualBytes[i]) {
             throw new Error(`Bytes at index ${i} were not overwritten - expected ${newDataStream[i]} actual ${initialStream[i]}`)
diff --git a/packages/interface-ipfs-core/src/pin/utils.js b/packages/interface-ipfs-core/src/pin/utils.js
index faf17c706f..f774eff459 100644
--- a/packages/interface-ipfs-core/src/pin/utils.js
+++ b/packages/interface-ipfs-core/src/pin/utils.js
@@ -6,6 +6,7 @@ const CID = require('cids')
 const drain = require('it-drain')
 const map = require('it-map')
 const fromString = require('uint8arrays/from-string')
+const first = require('it-first')
 
 const pinTypes = {
   direct: 'direct',
@@ -93,10 +94,9 @@ const expectNotPinned = (ipfs, cid, type = pinTypes.all) => {
 
 async function isPinnedWithType (ipfs, cid, type) {
   try {
-    for await (const _ of ipfs.pin.ls({ paths: cid, type })) { // eslint-disable-line no-unused-vars
-      return true
-    }
-    return false
+    const res = await first(ipfs.pin.ls({ paths: cid, type }))
+
+    return Boolean(res)
   } catch (err) {
     return false
   }
diff --git a/packages/interface-ipfs-core/src/pubsub/subscribe.js b/packages/interface-ipfs-core/src/pubsub/subscribe.js
index 0e3f098e1a..7416a34809 100644
--- a/packages/interface-ipfs-core/src/pubsub/subscribe.js
+++ b/packages/interface-ipfs-core/src/pubsub/subscribe.js
@@ -12,6 +12,7 @@ const delay = require('delay')
 const AbortController = require('native-abort-controller')
 const { isWebWorker, isNode } = require('ipfs-utils/src/env')
 const getIpfsOptions = require('../utils/ipfs-options-websockets-filter-all')
+const first = require('it-first')
 
 /** @typedef { import("ipfsd-ctl/src/factory") } Factory */
 /**
@@ -68,14 +69,12 @@ module.exports = (common, options) => {
 
         await ipfs1.pubsub.publish(topic, uint8ArrayFromString('hi'))
 
-        for await (const msg of msgStream) {
-          expect(uint8ArrayToString(msg.data)).to.equal('hi')
-          expect(msg).to.have.property('seqno')
-          expect(msg.seqno).to.be.an.instanceof(Uint8Array)
-          expect(msg.topicIDs[0]).to.eq(topic)
-          expect(msg).to.have.property('from', ipfs1.peerId.id)
-          break
-        }
+        const msg = await first(msgStream)
+        expect(uint8ArrayToString(msg.data)).to.equal('hi')
+        expect(msg).to.have.property('seqno')
+        expect(msg.seqno).to.be.an.instanceof(Uint8Array)
+        expect(msg.topicIDs[0]).to.eq(topic)
+        expect(msg).to.have.property('from', ipfs1.peerId.id)
       })
 
       it('should subscribe to one topic with options', async () => {
diff --git a/packages/interface-ipfs-core/src/swarm/peers.js b/packages/interface-ipfs-core/src/swarm/peers.js
index ecb5c54aa7..3ce9a2b2a4 100644
--- a/packages/interface-ipfs-core/src/swarm/peers.js
+++ b/packages/interface-ipfs-core/src/swarm/peers.js
@@ -108,13 +108,15 @@ module.exports = (common, options) => {
 
     it('should list peers only once even if they have multiple addresses', async () => {
       // TODO: Change to port 0, needs: https://github.com/ipfs/interface-ipfs-core/issues/152
-      const config = getConfig(isBrowser && common.opts.type !== 'go' ? [
-        '/ip4/127.0.0.1/tcp/14578/ws/p2p-webrtc-star',
-        '/ip4/127.0.0.1/tcp/14579/ws/p2p-webrtc-star'
-      ] : [
-        '/ip4/127.0.0.1/tcp/26545/ws',
-        '/ip4/127.0.0.1/tcp/26546/ws'
-      ])
+      const config = getConfig(isBrowser && common.opts.type !== 'go'
+        ? [
+            '/ip4/127.0.0.1/tcp/14578/ws/p2p-webrtc-star',
+            '/ip4/127.0.0.1/tcp/14579/ws/p2p-webrtc-star'
+          ]
+        : [
+            '/ip4/127.0.0.1/tcp/26545/ws',
+            '/ip4/127.0.0.1/tcp/26546/ws'
+          ])
 
       const nodeA = (await common.spawn({ type: 'proc', ipfsOptions })).api
       const nodeB = (await common.spawn({
diff --git a/packages/ipfs-cli/package.json b/packages/ipfs-cli/package.json
index 8f4aed67a8..b32fee20ab 100644
--- a/packages/ipfs-cli/package.json
+++ b/packages/ipfs-cli/package.json
@@ -20,13 +20,12 @@
   },
   "scripts": {
     "lint": "aegir lint",
-    "build": "npm run build:types",
-    "build:types": "tsc --build",
+    "prepare": "aegir build --no-bundle",
     "test": "npm run test:node",
     "test:node": "aegir test -t node",
     "coverage": "nyc --reporter=text --reporter=lcov npm run test:node",
     "clean": "rimraf ./dist",
-    "dep-check": "aegir dep-check -i @types/yargs -i typescript -i cid-tool"
+    "dep-check": "aegir dep-check -i @types/yargs -i cid-tool"
   },
   "dependencies": {
     "bignumber.js": "^9.0.0",
@@ -41,8 +40,8 @@
     "ipfs-core-utils": "^0.6.1",
     "ipfs-daemon": "^0.4.2",
     "ipfs-http-client": "^48.2.2",
-    "ipfs-repo": "^7.0.0",
-    "ipfs-utils": "^5.0.0",
+    "ipfs-repo": "^8.0.0",
+    "ipfs-utils": "^6.0.0",
     "ipld-dag-cbor": "^0.17.0",
     "ipld-dag-pb": "^0.20.0",
     "it-all": "^1.0.4",
@@ -63,18 +62,17 @@
     "progress": "^2.0.3",
     "stream-to-it": "^0.2.2",
     "streaming-iterables": "^5.0.2",
-    "uint8arrays": "^1.1.0",
+    "uint8arrays": "^2.0.5",
     "yargs": "^16.0.3"
   },
   "devDependencies": {
-    "@types/yargs": "^15.0.9",
-    "aegir": "^29.2.2",
+    "@types/yargs": "^16.0.0",
+    "aegir": "^30.3.0",
     "nanoid": "^3.1.12",
     "ncp": "^2.0.0",
     "rimraf": "^3.0.2",
     "sinon": "^9.0.3",
     "string-argv": "^0.3.1",
-    "temp-write": "^4.0.0",
-    "typescript": "4.0.x"
+    "temp-write": "^4.0.0"
   }
 }
diff --git a/packages/ipfs-cli/src/commands/add.js b/packages/ipfs-cli/src/commands/add.js
index f3513fdf68..49de636cbf 100644
--- a/packages/ipfs-cli/src/commands/add.js
+++ b/packages/ipfs-cli/src/commands/add.js
@@ -14,7 +14,7 @@ const {
 } = require('../utils')
 const { cidToString } = require('ipfs-core-utils/src/cid')
 const globSource = require('ipfs-utils/src/files/glob-source')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 async function getTotalBytes (paths) {
   const sizes = await Promise.all(paths.map(p => getFolderSize(p)))
@@ -255,10 +255,10 @@ module.exports = {
         mtime
       })
       : {
-        content: getStdin(),
-        mode,
-        mtime
-      } // Pipe to ipfs.add tagging with mode and mtime
+          content: getStdin(),
+          mode,
+          mtime
+        } // Pipe to ipfs.add tagging with mode and mtime
 
     let finalCid
 
diff --git a/packages/ipfs-cli/src/commands/bitswap/stat.js b/packages/ipfs-cli/src/commands/bitswap/stat.js
index 93bca712aa..20e6b741ec 100644
--- a/packages/ipfs-cli/src/commands/bitswap/stat.js
+++ b/packages/ipfs-cli/src/commands/bitswap/stat.js
@@ -3,7 +3,7 @@
 const multibase = require('multibase')
 const { cidToString } = require('ipfs-core-utils/src/cid')
 const prettyBytes = require('pretty-bytes')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'stat',
diff --git a/packages/ipfs-cli/src/commands/bitswap/unwant.js b/packages/ipfs-cli/src/commands/bitswap/unwant.js
index 474cf6e206..129cedc91c 100644
--- a/packages/ipfs-cli/src/commands/bitswap/unwant.js
+++ b/packages/ipfs-cli/src/commands/bitswap/unwant.js
@@ -2,7 +2,7 @@
 
 const multibase = require('multibase')
 const { cidToString } = require('ipfs-core-utils/src/cid')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'unwant <key>',
diff --git a/packages/ipfs-cli/src/commands/bitswap/wantlist.js b/packages/ipfs-cli/src/commands/bitswap/wantlist.js
index 4e9c014a17..0bd73d73ca 100644
--- a/packages/ipfs-cli/src/commands/bitswap/wantlist.js
+++ b/packages/ipfs-cli/src/commands/bitswap/wantlist.js
@@ -2,7 +2,7 @@
 
 const multibase = require('multibase')
 const { cidToString } = require('ipfs-core-utils/src/cid')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'wantlist [peer]',
diff --git a/packages/ipfs-cli/src/commands/block/get.js b/packages/ipfs-cli/src/commands/block/get.js
index 70f5f664fd..a521ba83c8 100644
--- a/packages/ipfs-cli/src/commands/block/get.js
+++ b/packages/ipfs-cli/src/commands/block/get.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const uint8ArrayToString = require('uint8arrays/to-string')
 
 module.exports = {
diff --git a/packages/ipfs-cli/src/commands/block/put.js b/packages/ipfs-cli/src/commands/block/put.js
index fb2e0c656a..1fc6f9875f 100644
--- a/packages/ipfs-cli/src/commands/block/put.js
+++ b/packages/ipfs-cli/src/commands/block/put.js
@@ -4,7 +4,7 @@ const fs = require('fs')
 const multibase = require('multibase')
 const concat = require('it-concat')
 const { cidToString } = require('ipfs-core-utils/src/cid')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'put [block]',
diff --git a/packages/ipfs-cli/src/commands/block/rm.js b/packages/ipfs-cli/src/commands/block/rm.js
index 6f5f32ccb7..4fcd0867a1 100644
--- a/packages/ipfs-cli/src/commands/block/rm.js
+++ b/packages/ipfs-cli/src/commands/block/rm.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'rm <hash...>',
diff --git a/packages/ipfs-cli/src/commands/block/stat.js b/packages/ipfs-cli/src/commands/block/stat.js
index f1032023b4..75badcdc03 100644
--- a/packages/ipfs-cli/src/commands/block/stat.js
+++ b/packages/ipfs-cli/src/commands/block/stat.js
@@ -2,7 +2,7 @@
 
 const multibase = require('multibase')
 const { cidToString } = require('ipfs-core-utils/src/cid')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'stat <key>',
diff --git a/packages/ipfs-cli/src/commands/bootstrap/add.js b/packages/ipfs-cli/src/commands/bootstrap/add.js
index b43b45a298..eda65fca1f 100644
--- a/packages/ipfs-cli/src/commands/bootstrap/add.js
+++ b/packages/ipfs-cli/src/commands/bootstrap/add.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'add [<peer>]',
diff --git a/packages/ipfs-cli/src/commands/bootstrap/list.js b/packages/ipfs-cli/src/commands/bootstrap/list.js
index 6a5342e8dc..f4660867f3 100644
--- a/packages/ipfs-cli/src/commands/bootstrap/list.js
+++ b/packages/ipfs-cli/src/commands/bootstrap/list.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'list',
diff --git a/packages/ipfs-cli/src/commands/bootstrap/rm.js b/packages/ipfs-cli/src/commands/bootstrap/rm.js
index 0b3d59e3e8..72a691cc5b 100644
--- a/packages/ipfs-cli/src/commands/bootstrap/rm.js
+++ b/packages/ipfs-cli/src/commands/bootstrap/rm.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'rm [<peer>]',
diff --git a/packages/ipfs-cli/src/commands/cat.js b/packages/ipfs-cli/src/commands/cat.js
index 2465182ffb..03eb51d745 100644
--- a/packages/ipfs-cli/src/commands/cat.js
+++ b/packages/ipfs-cli/src/commands/cat.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'cat <ipfsPath>',
diff --git a/packages/ipfs-cli/src/commands/config.js b/packages/ipfs-cli/src/commands/config.js
index fc9514dad3..7d557dc450 100644
--- a/packages/ipfs-cli/src/commands/config.js
+++ b/packages/ipfs-cli/src/commands/config.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'config <key> [value]',
diff --git a/packages/ipfs-cli/src/commands/config/profile/apply.js b/packages/ipfs-cli/src/commands/config/profile/apply.js
index 38d6882a74..c90458af1b 100644
--- a/packages/ipfs-cli/src/commands/config/profile/apply.js
+++ b/packages/ipfs-cli/src/commands/config/profile/apply.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const JSONDiff = require('jsondiffpatch')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'apply <profile>',
diff --git a/packages/ipfs-cli/src/commands/config/profile/ls.js b/packages/ipfs-cli/src/commands/config/profile/ls.js
index 1ed768e99e..b5490f34fc 100644
--- a/packages/ipfs-cli/src/commands/config/profile/ls.js
+++ b/packages/ipfs-cli/src/commands/config/profile/ls.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'ls',
diff --git a/packages/ipfs-cli/src/commands/config/replace.js b/packages/ipfs-cli/src/commands/config/replace.js
index 4fd5ea956e..5e39099e92 100644
--- a/packages/ipfs-cli/src/commands/config/replace.js
+++ b/packages/ipfs-cli/src/commands/config/replace.js
@@ -2,7 +2,7 @@
 
 const path = require('path')
 const fs = require('fs')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'replace <file>',
@@ -20,7 +20,8 @@ module.exports = {
     const filePath = path.resolve(process.cwd(), file)
 
     const config = isDaemon
-      ? filePath : JSON.parse(fs.readFileSync(filePath, 'utf8'))
+      ? filePath
+      : JSON.parse(fs.readFileSync(filePath, 'utf8'))
 
     return ipfs.config.replace(config, {
       timeout
diff --git a/packages/ipfs-cli/src/commands/config/show.js b/packages/ipfs-cli/src/commands/config/show.js
index ef79a61741..4c9614ca4b 100644
--- a/packages/ipfs-cli/src/commands/config/show.js
+++ b/packages/ipfs-cli/src/commands/config/show.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'show',
diff --git a/packages/ipfs-cli/src/commands/dag/get.js b/packages/ipfs-cli/src/commands/dag/get.js
index 06a5fa6371..92f1cdf10b 100644
--- a/packages/ipfs-cli/src/commands/dag/get.js
+++ b/packages/ipfs-cli/src/commands/dag/get.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const toCidAndPath = require('ipfs-core-utils/src/to-cid-and-path')
 const uint8ArrayToString = require('uint8arrays/to-string')
 const { cidToString } = require('ipfs-core-utils/src/cid')
diff --git a/packages/ipfs-cli/src/commands/dag/put.js b/packages/ipfs-cli/src/commands/dag/put.js
index 1bcabfbd91..40aa9629e6 100644
--- a/packages/ipfs-cli/src/commands/dag/put.js
+++ b/packages/ipfs-cli/src/commands/dag/put.js
@@ -7,7 +7,7 @@ const dagPB = require('ipld-dag-pb')
 const concat = require('it-concat')
 const CID = require('cids')
 const { cidToString } = require('ipfs-core-utils/src/cid')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const uint8ArrayToString = require('uint8arrays/to-string')
 
 const inputDecoders = {
diff --git a/packages/ipfs-cli/src/commands/dag/resolve.js b/packages/ipfs-cli/src/commands/dag/resolve.js
index 5433893b85..2bec53ab52 100644
--- a/packages/ipfs-cli/src/commands/dag/resolve.js
+++ b/packages/ipfs-cli/src/commands/dag/resolve.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'resolve <ref>',
diff --git a/packages/ipfs-cli/src/commands/dht/find-peer.js b/packages/ipfs-cli/src/commands/dht/find-peer.js
index 6151e5b936..1aa6e8afd9 100644
--- a/packages/ipfs-cli/src/commands/dht/find-peer.js
+++ b/packages/ipfs-cli/src/commands/dht/find-peer.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'findpeer <peerId>',
diff --git a/packages/ipfs-cli/src/commands/dht/find-providers.js b/packages/ipfs-cli/src/commands/dht/find-providers.js
index 79ebce2b87..a51d8fa3f8 100644
--- a/packages/ipfs-cli/src/commands/dht/find-providers.js
+++ b/packages/ipfs-cli/src/commands/dht/find-providers.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'findprovs <key>',
diff --git a/packages/ipfs-cli/src/commands/dht/get.js b/packages/ipfs-cli/src/commands/dht/get.js
index 0fd90f3009..2e146f938b 100644
--- a/packages/ipfs-cli/src/commands/dht/get.js
+++ b/packages/ipfs-cli/src/commands/dht/get.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'get <key>',
diff --git a/packages/ipfs-cli/src/commands/dht/provide.js b/packages/ipfs-cli/src/commands/dht/provide.js
index 31d20dcd41..2a9314dfd7 100644
--- a/packages/ipfs-cli/src/commands/dht/provide.js
+++ b/packages/ipfs-cli/src/commands/dht/provide.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'provide <key>',
diff --git a/packages/ipfs-cli/src/commands/dht/put.js b/packages/ipfs-cli/src/commands/dht/put.js
index da3b2624e6..fb62c783c2 100644
--- a/packages/ipfs-cli/src/commands/dht/put.js
+++ b/packages/ipfs-cli/src/commands/dht/put.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'put <key> <value>',
diff --git a/packages/ipfs-cli/src/commands/dht/query.js b/packages/ipfs-cli/src/commands/dht/query.js
index a0cef2a411..6bc9c6ab26 100644
--- a/packages/ipfs-cli/src/commands/dht/query.js
+++ b/packages/ipfs-cli/src/commands/dht/query.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'query <peerId>',
diff --git a/packages/ipfs-cli/src/commands/dns.js b/packages/ipfs-cli/src/commands/dns.js
index 99461032a2..ac70670b0c 100644
--- a/packages/ipfs-cli/src/commands/dns.js
+++ b/packages/ipfs-cli/src/commands/dns.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const {
   stripControlCharacters
 } = require('../utils')
diff --git a/packages/ipfs-cli/src/commands/files/chmod.js b/packages/ipfs-cli/src/commands/files/chmod.js
index 6baddde91a..7cc3959c08 100644
--- a/packages/ipfs-cli/src/commands/files/chmod.js
+++ b/packages/ipfs-cli/src/commands/files/chmod.js
@@ -3,7 +3,7 @@
 const {
   asBoolean
 } = require('../../utils')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'chmod [mode] [path]',
diff --git a/packages/ipfs-cli/src/commands/files/cp.js b/packages/ipfs-cli/src/commands/files/cp.js
index 77c9a2f595..080ec0faef 100644
--- a/packages/ipfs-cli/src/commands/files/cp.js
+++ b/packages/ipfs-cli/src/commands/files/cp.js
@@ -3,7 +3,7 @@
 const {
   asBoolean
 } = require('../../utils')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'cp <source> <dest>',
diff --git a/packages/ipfs-cli/src/commands/files/flush.js b/packages/ipfs-cli/src/commands/files/flush.js
index 89915e9e35..856bd9eabe 100644
--- a/packages/ipfs-cli/src/commands/files/flush.js
+++ b/packages/ipfs-cli/src/commands/files/flush.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'flush [path]',
diff --git a/packages/ipfs-cli/src/commands/files/ls.js b/packages/ipfs-cli/src/commands/files/ls.js
index ea4a668bde..1c399c0a0a 100644
--- a/packages/ipfs-cli/src/commands/files/ls.js
+++ b/packages/ipfs-cli/src/commands/files/ls.js
@@ -6,7 +6,7 @@ const {
 } = require('../../utils')
 const formatMode = require('ipfs-core-utils/src/files/format-mode')
 const formatMtime = require('ipfs-core-utils/src/files/format-mtime')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'ls [path]',
diff --git a/packages/ipfs-cli/src/commands/files/mkdir.js b/packages/ipfs-cli/src/commands/files/mkdir.js
index def58ed781..3dcfa25c2f 100644
--- a/packages/ipfs-cli/src/commands/files/mkdir.js
+++ b/packages/ipfs-cli/src/commands/files/mkdir.js
@@ -7,7 +7,7 @@ const {
   coerceMtime,
   coerceMtimeNsecs
 } = require('../../utils')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'mkdir <path>',
diff --git a/packages/ipfs-cli/src/commands/files/mv.js b/packages/ipfs-cli/src/commands/files/mv.js
index 9f6fa2957d..c9134ad852 100644
--- a/packages/ipfs-cli/src/commands/files/mv.js
+++ b/packages/ipfs-cli/src/commands/files/mv.js
@@ -3,7 +3,7 @@
 const {
   asBoolean
 } = require('../../utils')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'mv <source> <dest>',
diff --git a/packages/ipfs-cli/src/commands/files/read.js b/packages/ipfs-cli/src/commands/files/read.js
index 7e44484a80..eff2776ab0 100644
--- a/packages/ipfs-cli/src/commands/files/read.js
+++ b/packages/ipfs-cli/src/commands/files/read.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'read <path>',
diff --git a/packages/ipfs-cli/src/commands/files/rm.js b/packages/ipfs-cli/src/commands/files/rm.js
index 6a13f51666..fee89655ec 100644
--- a/packages/ipfs-cli/src/commands/files/rm.js
+++ b/packages/ipfs-cli/src/commands/files/rm.js
@@ -3,7 +3,7 @@
 const {
   asBoolean
 } = require('../../utils')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'rm <path>',
diff --git a/packages/ipfs-cli/src/commands/files/stat.js b/packages/ipfs-cli/src/commands/files/stat.js
index 177d6c8a13..e1833882c3 100644
--- a/packages/ipfs-cli/src/commands/files/stat.js
+++ b/packages/ipfs-cli/src/commands/files/stat.js
@@ -5,7 +5,7 @@ const {
 } = require('../../utils')
 const formatMode = require('ipfs-core-utils/src/files/format-mode')
 const formatMtime = require('ipfs-core-utils/src/files/format-mtime')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'stat [path]',
diff --git a/packages/ipfs-cli/src/commands/files/touch.js b/packages/ipfs-cli/src/commands/files/touch.js
index 1ac5de6560..d311a7f4f4 100644
--- a/packages/ipfs-cli/src/commands/files/touch.js
+++ b/packages/ipfs-cli/src/commands/files/touch.js
@@ -6,7 +6,7 @@ const {
   coerceMtime,
   coerceMtimeNsecs
 } = require('../../utils')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'touch [path]',
diff --git a/packages/ipfs-cli/src/commands/files/write.js b/packages/ipfs-cli/src/commands/files/write.js
index 054c2126b1..7cca614770 100644
--- a/packages/ipfs-cli/src/commands/files/write.js
+++ b/packages/ipfs-cli/src/commands/files/write.js
@@ -7,7 +7,7 @@ const {
   coerceMtime,
   coerceMtimeNsecs
 } = require('../../utils')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'write <path>',
diff --git a/packages/ipfs-cli/src/commands/get.js b/packages/ipfs-cli/src/commands/get.js
index eca186aa2e..db703b19b6 100644
--- a/packages/ipfs-cli/src/commands/get.js
+++ b/packages/ipfs-cli/src/commands/get.js
@@ -5,7 +5,7 @@ const path = require('path')
 const toIterable = require('stream-to-it')
 const { pipe } = require('it-pipe')
 const { map } = require('streaming-iterables')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const {
   stripControlCharacters
 } = require('../utils')
diff --git a/packages/ipfs-cli/src/commands/id.js b/packages/ipfs-cli/src/commands/id.js
index b4868227a2..56cb71a638 100644
--- a/packages/ipfs-cli/src/commands/id.js
+++ b/packages/ipfs-cli/src/commands/id.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'id',
diff --git a/packages/ipfs-cli/src/commands/key/export.js b/packages/ipfs-cli/src/commands/key/export.js
index 1c43877318..203fba92cd 100644
--- a/packages/ipfs-cli/src/commands/key/export.js
+++ b/packages/ipfs-cli/src/commands/key/export.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const fs = require('fs')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'export <name>',
diff --git a/packages/ipfs-cli/src/commands/key/gen.js b/packages/ipfs-cli/src/commands/key/gen.js
index 6b43444563..f57ec66a88 100644
--- a/packages/ipfs-cli/src/commands/key/gen.js
+++ b/packages/ipfs-cli/src/commands/key/gen.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const {
   stripControlCharacters
 } = require('../../utils')
diff --git a/packages/ipfs-cli/src/commands/key/import.js b/packages/ipfs-cli/src/commands/key/import.js
index 7cbc6a0e21..f71a9a8903 100644
--- a/packages/ipfs-cli/src/commands/key/import.js
+++ b/packages/ipfs-cli/src/commands/key/import.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const fs = require('fs')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'import <name>',
diff --git a/packages/ipfs-cli/src/commands/key/list.js b/packages/ipfs-cli/src/commands/key/list.js
index 5a946d5932..e07e0ac615 100644
--- a/packages/ipfs-cli/src/commands/key/list.js
+++ b/packages/ipfs-cli/src/commands/key/list.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const {
   stripControlCharacters
 } = require('../../utils')
diff --git a/packages/ipfs-cli/src/commands/key/rename.js b/packages/ipfs-cli/src/commands/key/rename.js
index 11c293790f..4b3bc8bc0e 100644
--- a/packages/ipfs-cli/src/commands/key/rename.js
+++ b/packages/ipfs-cli/src/commands/key/rename.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const {
   stripControlCharacters
 } = require('../../utils')
diff --git a/packages/ipfs-cli/src/commands/key/rm.js b/packages/ipfs-cli/src/commands/key/rm.js
index 08d155e4d1..b9de77ae45 100644
--- a/packages/ipfs-cli/src/commands/key/rm.js
+++ b/packages/ipfs-cli/src/commands/key/rm.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const {
   stripControlCharacters
 } = require('../../utils')
diff --git a/packages/ipfs-cli/src/commands/ls.js b/packages/ipfs-cli/src/commands/ls.js
index ce0c661cbf..032bdbce41 100644
--- a/packages/ipfs-cli/src/commands/ls.js
+++ b/packages/ipfs-cli/src/commands/ls.js
@@ -5,7 +5,7 @@ const { rightpad, stripControlCharacters } = require('../utils')
 const { cidToString } = require('ipfs-core-utils/src/cid')
 const formatMode = require('ipfs-core-utils/src/files/format-mode')
 const formatMtime = require('ipfs-core-utils/src/files/format-mtime')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'ls <key>',
diff --git a/packages/ipfs-cli/src/commands/name/publish.js b/packages/ipfs-cli/src/commands/name/publish.js
index f163b3f7f6..4a1f377823 100644
--- a/packages/ipfs-cli/src/commands/name/publish.js
+++ b/packages/ipfs-cli/src/commands/name/publish.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const {
   stripControlCharacters
 } = require('../../utils')
diff --git a/packages/ipfs-cli/src/commands/name/pubsub/cancel.js b/packages/ipfs-cli/src/commands/name/pubsub/cancel.js
index fc874e7770..335e8beb51 100644
--- a/packages/ipfs-cli/src/commands/name/pubsub/cancel.js
+++ b/packages/ipfs-cli/src/commands/name/pubsub/cancel.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'cancel <name>',
diff --git a/packages/ipfs-cli/src/commands/name/pubsub/state.js b/packages/ipfs-cli/src/commands/name/pubsub/state.js
index 14d73a63ac..f864b42dc7 100644
--- a/packages/ipfs-cli/src/commands/name/pubsub/state.js
+++ b/packages/ipfs-cli/src/commands/name/pubsub/state.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'state',
diff --git a/packages/ipfs-cli/src/commands/name/pubsub/subs.js b/packages/ipfs-cli/src/commands/name/pubsub/subs.js
index 22ca105a48..60d05bf6e1 100644
--- a/packages/ipfs-cli/src/commands/name/pubsub/subs.js
+++ b/packages/ipfs-cli/src/commands/name/pubsub/subs.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const {
   stripControlCharacters
 } = require('../../../utils')
diff --git a/packages/ipfs-cli/src/commands/name/resolve.js b/packages/ipfs-cli/src/commands/name/resolve.js
index e0fc274865..797874a3b5 100644
--- a/packages/ipfs-cli/src/commands/name/resolve.js
+++ b/packages/ipfs-cli/src/commands/name/resolve.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'resolve [<name>]',
diff --git a/packages/ipfs-cli/src/commands/object/data.js b/packages/ipfs-cli/src/commands/object/data.js
index 48aee8038c..36a5da2715 100644
--- a/packages/ipfs-cli/src/commands/object/data.js
+++ b/packages/ipfs-cli/src/commands/object/data.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'data <key>',
diff --git a/packages/ipfs-cli/src/commands/object/get.js b/packages/ipfs-cli/src/commands/object/get.js
index e6c000517d..7ded234cdd 100644
--- a/packages/ipfs-cli/src/commands/object/get.js
+++ b/packages/ipfs-cli/src/commands/object/get.js
@@ -2,7 +2,7 @@
 
 const multibase = require('multibase')
 const { cidToString } = require('ipfs-core-utils/src/cid')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const uint8ArrayToString = require('uint8arrays/to-string')
 const {
   stripControlCharacters
diff --git a/packages/ipfs-cli/src/commands/object/links.js b/packages/ipfs-cli/src/commands/object/links.js
index ae86b852a2..c24e18d93e 100644
--- a/packages/ipfs-cli/src/commands/object/links.js
+++ b/packages/ipfs-cli/src/commands/object/links.js
@@ -2,7 +2,7 @@
 
 const multibase = require('multibase')
 const { cidToString } = require('ipfs-core-utils/src/cid')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const {
   stripControlCharacters
 } = require('../../utils')
diff --git a/packages/ipfs-cli/src/commands/object/new.js b/packages/ipfs-cli/src/commands/object/new.js
index 89c2833d11..2a10f093c9 100644
--- a/packages/ipfs-cli/src/commands/object/new.js
+++ b/packages/ipfs-cli/src/commands/object/new.js
@@ -2,7 +2,7 @@
 
 const multibase = require('multibase')
 const { cidToString } = require('ipfs-core-utils/src/cid')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'new [<template>]',
diff --git a/packages/ipfs-cli/src/commands/object/patch/add-link.js b/packages/ipfs-cli/src/commands/object/patch/add-link.js
index 588306f8e7..671fba8981 100644
--- a/packages/ipfs-cli/src/commands/object/patch/add-link.js
+++ b/packages/ipfs-cli/src/commands/object/patch/add-link.js
@@ -4,7 +4,7 @@ const dagPB = require('ipld-dag-pb')
 const DAGLink = dagPB.DAGLink
 const multibase = require('multibase')
 const { cidToString } = require('ipfs-core-utils/src/cid')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'add-link <root> <name> <ref>',
diff --git a/packages/ipfs-cli/src/commands/object/patch/append-data.js b/packages/ipfs-cli/src/commands/object/patch/append-data.js
index 377de73cc8..befb708c87 100644
--- a/packages/ipfs-cli/src/commands/object/patch/append-data.js
+++ b/packages/ipfs-cli/src/commands/object/patch/append-data.js
@@ -4,7 +4,7 @@ const concat = require('it-concat')
 const fs = require('fs')
 const multibase = require('multibase')
 const { cidToString } = require('ipfs-core-utils/src/cid')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'append-data <root> [data]',
diff --git a/packages/ipfs-cli/src/commands/object/patch/rm-link.js b/packages/ipfs-cli/src/commands/object/patch/rm-link.js
index 329a85d1eb..7c2d960532 100644
--- a/packages/ipfs-cli/src/commands/object/patch/rm-link.js
+++ b/packages/ipfs-cli/src/commands/object/patch/rm-link.js
@@ -2,7 +2,7 @@
 
 const multibase = require('multibase')
 const { cidToString } = require('ipfs-core-utils/src/cid')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'rm-link <root> <link>',
diff --git a/packages/ipfs-cli/src/commands/object/patch/set-data.js b/packages/ipfs-cli/src/commands/object/patch/set-data.js
index fa7c1d9390..41a7bf288f 100644
--- a/packages/ipfs-cli/src/commands/object/patch/set-data.js
+++ b/packages/ipfs-cli/src/commands/object/patch/set-data.js
@@ -4,7 +4,7 @@ const fs = require('fs')
 const concat = require('it-concat')
 const multibase = require('multibase')
 const { cidToString } = require('ipfs-core-utils/src/cid')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'set-data <root> [data]',
diff --git a/packages/ipfs-cli/src/commands/object/put.js b/packages/ipfs-cli/src/commands/object/put.js
index 25cdb00382..d64a79fc89 100644
--- a/packages/ipfs-cli/src/commands/object/put.js
+++ b/packages/ipfs-cli/src/commands/object/put.js
@@ -4,7 +4,7 @@ const fs = require('fs')
 const concat = require('it-concat')
 const multibase = require('multibase')
 const { cidToString } = require('ipfs-core-utils/src/cid')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'put [data]',
diff --git a/packages/ipfs-cli/src/commands/object/stat.js b/packages/ipfs-cli/src/commands/object/stat.js
index 9d11d00816..6d95612917 100644
--- a/packages/ipfs-cli/src/commands/object/stat.js
+++ b/packages/ipfs-cli/src/commands/object/stat.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'stat <key>',
diff --git a/packages/ipfs-cli/src/commands/pin/add.js b/packages/ipfs-cli/src/commands/pin/add.js
index cc99e2ef25..6a9a56ee68 100644
--- a/packages/ipfs-cli/src/commands/pin/add.js
+++ b/packages/ipfs-cli/src/commands/pin/add.js
@@ -2,7 +2,7 @@
 
 const multibase = require('multibase')
 const { cidToString } = require('ipfs-core-utils/src/cid')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'add <ipfsPath...>',
diff --git a/packages/ipfs-cli/src/commands/pin/ls.js b/packages/ipfs-cli/src/commands/pin/ls.js
index fe188155ef..897ab86d68 100644
--- a/packages/ipfs-cli/src/commands/pin/ls.js
+++ b/packages/ipfs-cli/src/commands/pin/ls.js
@@ -3,7 +3,7 @@
 const multibase = require('multibase')
 const all = require('it-all')
 const { cidToString } = require('ipfs-core-utils/src/cid')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const {
   makeEntriesPrintable
 } = require('../../utils')
diff --git a/packages/ipfs-cli/src/commands/pin/rm.js b/packages/ipfs-cli/src/commands/pin/rm.js
index 3f6f465a0a..9873ec6640 100644
--- a/packages/ipfs-cli/src/commands/pin/rm.js
+++ b/packages/ipfs-cli/src/commands/pin/rm.js
@@ -2,7 +2,7 @@
 
 const multibase = require('multibase')
 const { cidToString } = require('ipfs-core-utils/src/cid')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'rm <ipfsPath...>',
diff --git a/packages/ipfs-cli/src/commands/ping.js b/packages/ipfs-cli/src/commands/ping.js
index f2afbb82d5..540423939b 100644
--- a/packages/ipfs-cli/src/commands/ping.js
+++ b/packages/ipfs-cli/src/commands/ping.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'ping <peerId>',
diff --git a/packages/ipfs-cli/src/commands/pubsub/ls.js b/packages/ipfs-cli/src/commands/pubsub/ls.js
index 68c086324d..3e595fcd3b 100644
--- a/packages/ipfs-cli/src/commands/pubsub/ls.js
+++ b/packages/ipfs-cli/src/commands/pubsub/ls.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const {
   stripControlCharacters
 } = require('../../utils')
diff --git a/packages/ipfs-cli/src/commands/pubsub/peers.js b/packages/ipfs-cli/src/commands/pubsub/peers.js
index 68c5df68cb..807d9f93c6 100644
--- a/packages/ipfs-cli/src/commands/pubsub/peers.js
+++ b/packages/ipfs-cli/src/commands/pubsub/peers.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'peers <topic>',
diff --git a/packages/ipfs-cli/src/commands/pubsub/pub.js b/packages/ipfs-cli/src/commands/pubsub/pub.js
index 5234630551..c2663e954e 100644
--- a/packages/ipfs-cli/src/commands/pubsub/pub.js
+++ b/packages/ipfs-cli/src/commands/pubsub/pub.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const uint8ArrayFromString = require('uint8arrays/from-string')
 
 module.exports = {
diff --git a/packages/ipfs-cli/src/commands/pubsub/sub.js b/packages/ipfs-cli/src/commands/pubsub/sub.js
index cf879381f7..77074f9793 100644
--- a/packages/ipfs-cli/src/commands/pubsub/sub.js
+++ b/packages/ipfs-cli/src/commands/pubsub/sub.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'sub <topic>',
diff --git a/packages/ipfs-cli/src/commands/refs-local.js b/packages/ipfs-cli/src/commands/refs-local.js
index 5b3cc2ed8f..e20c0a3319 100644
--- a/packages/ipfs-cli/src/commands/refs-local.js
+++ b/packages/ipfs-cli/src/commands/refs-local.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const uint8ArrayFromString = require('uint8arrays/from-string')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const multibase = require('multibase')
 
 module.exports = {
diff --git a/packages/ipfs-cli/src/commands/refs.js b/packages/ipfs-cli/src/commands/refs.js
index a3a69401cb..e7a78dac54 100644
--- a/packages/ipfs-cli/src/commands/refs.js
+++ b/packages/ipfs-cli/src/commands/refs.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'refs <key> [keys..]',
diff --git a/packages/ipfs-cli/src/commands/repo/gc.js b/packages/ipfs-cli/src/commands/repo/gc.js
index 9494e7cd70..362a4a8279 100644
--- a/packages/ipfs-cli/src/commands/repo/gc.js
+++ b/packages/ipfs-cli/src/commands/repo/gc.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'gc',
diff --git a/packages/ipfs-cli/src/commands/repo/stat.js b/packages/ipfs-cli/src/commands/repo/stat.js
index cf8d723cf8..32a0e81f34 100644
--- a/packages/ipfs-cli/src/commands/repo/stat.js
+++ b/packages/ipfs-cli/src/commands/repo/stat.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const prettyBytes = require('pretty-bytes')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'stat',
diff --git a/packages/ipfs-cli/src/commands/repo/version.js b/packages/ipfs-cli/src/commands/repo/version.js
index a1459c1b61..8b0aa5bc1f 100644
--- a/packages/ipfs-cli/src/commands/repo/version.js
+++ b/packages/ipfs-cli/src/commands/repo/version.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'version',
diff --git a/packages/ipfs-cli/src/commands/resolve.js b/packages/ipfs-cli/src/commands/resolve.js
index f72b27ff30..89eac0f260 100644
--- a/packages/ipfs-cli/src/commands/resolve.js
+++ b/packages/ipfs-cli/src/commands/resolve.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const multibase = require('multibase')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const {
   stripControlCharacters
 } = require('../utils')
diff --git a/packages/ipfs-cli/src/commands/shutdown.js b/packages/ipfs-cli/src/commands/shutdown.js
index 6f293fbf79..2799bfe5e0 100644
--- a/packages/ipfs-cli/src/commands/shutdown.js
+++ b/packages/ipfs-cli/src/commands/shutdown.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'shutdown',
diff --git a/packages/ipfs-cli/src/commands/stats/bw.js b/packages/ipfs-cli/src/commands/stats/bw.js
index 751a10c898..208b65c312 100644
--- a/packages/ipfs-cli/src/commands/stats/bw.js
+++ b/packages/ipfs-cli/src/commands/stats/bw.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'bw',
diff --git a/packages/ipfs-cli/src/commands/swarm/addrs.js b/packages/ipfs-cli/src/commands/swarm/addrs.js
index fd55ebbfb6..d1e125656e 100644
--- a/packages/ipfs-cli/src/commands/swarm/addrs.js
+++ b/packages/ipfs-cli/src/commands/swarm/addrs.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'addrs',
@@ -25,7 +25,7 @@ module.exports = {
       const count = peer.addrs.length
       const peerAddrs = [`${peer.id} (${count})`]
 
-      peer.addrs.map((addr) => {
+      peer.addrs.forEach((addr) => {
         let res
         try {
           res = addr.decapsulate('ipfs').toString()
diff --git a/packages/ipfs-cli/src/commands/swarm/addrs/local.js b/packages/ipfs-cli/src/commands/swarm/addrs/local.js
index 1bcf1f807b..863c84b806 100644
--- a/packages/ipfs-cli/src/commands/swarm/addrs/local.js
+++ b/packages/ipfs-cli/src/commands/swarm/addrs/local.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'local',
diff --git a/packages/ipfs-cli/src/commands/swarm/connect.js b/packages/ipfs-cli/src/commands/swarm/connect.js
index b082b9333c..d13fa1ac73 100644
--- a/packages/ipfs-cli/src/commands/swarm/connect.js
+++ b/packages/ipfs-cli/src/commands/swarm/connect.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'connect <address>',
diff --git a/packages/ipfs-cli/src/commands/swarm/disconnect.js b/packages/ipfs-cli/src/commands/swarm/disconnect.js
index 1fb64e7b78..6fdeb65e26 100644
--- a/packages/ipfs-cli/src/commands/swarm/disconnect.js
+++ b/packages/ipfs-cli/src/commands/swarm/disconnect.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'disconnect <address>',
diff --git a/packages/ipfs-cli/src/commands/swarm/peers.js b/packages/ipfs-cli/src/commands/swarm/peers.js
index c41145fb2d..de1b868a10 100644
--- a/packages/ipfs-cli/src/commands/swarm/peers.js
+++ b/packages/ipfs-cli/src/commands/swarm/peers.js
@@ -2,7 +2,7 @@
 
 const mafmt = require('mafmt')
 const multiaddr = require('multiaddr')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'peers',
diff --git a/packages/ipfs-cli/src/commands/version.js b/packages/ipfs-cli/src/commands/version.js
index 41cc885140..65af2c8744 100644
--- a/packages/ipfs-cli/src/commands/version.js
+++ b/packages/ipfs-cli/src/commands/version.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const os = require('os')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 
 module.exports = {
   command: 'version',
diff --git a/packages/ipfs-cli/test/utils/ipfs-exec.js b/packages/ipfs-cli/test/utils/ipfs-exec.js
index 598c184437..247214e427 100644
--- a/packages/ipfs-cli/test/utils/ipfs-exec.js
+++ b/packages/ipfs-cli/test/utils/ipfs-exec.js
@@ -26,14 +26,14 @@ module.exports = (repoPath, opts) => {
   const exec = (args, options) => {
     const opts = Object.assign({}, config, options)
 
-    return execa.command(`${path.resolve(`${__dirname}/../../src/bin.js`)} ${args}`, opts)
+    return execa.command(`${path.resolve(__dirname, '../../src/bin.js')} ${args}`, opts)
   }
   const execRaw = (args, options) => {
     const opts = Object.assign({}, config, options, {
       encoding: null
     })
 
-    return execa.command(`${path.resolve(`${__dirname}/../../src/bin.js`)} ${args}`, opts)
+    return execa.command(`${path.resolve(__dirname, '../../src/bin.js')} ${args}`, opts)
   }
 
   const execute = (exec, args, options) => {
diff --git a/packages/ipfs-client/package.json b/packages/ipfs-client/package.json
index 76f2328598..6517633c8c 100644
--- a/packages/ipfs-client/package.json
+++ b/packages/ipfs-client/package.json
@@ -32,21 +32,18 @@
   "scripts": {
     "test": "aegir test",
     "lint": "aegir lint",
-    "build": "npm run build:js && npm run build:types",
-    "build:js": "aegir build",
-    "build:types": "tsc --build",
+    "prepare": "aegir build --no-bundle",
     "coverage": "npx nyc -r html npm run test:node -- --bail",
     "clean": "rimraf ./dist",
-    "dep-check": "aegir dep-check -i aegir -i typescript -i rimraf"
+    "dep-check": "aegir dep-check -i aegir -i rimraf"
   },
   "dependencies": {
     "ipfs-grpc-client": "^0.1.2",
     "ipfs-http-client": "^48.2.2",
-    "merge-options": "^2.0.0"
+    "merge-options": "^3.0.4"
   },
   "devDependencies": {
-    "aegir": "^29.2.2",
-    "rimraf": "^3.0.2",
-    "typescript": "4.0.x"
+    "aegir": "^30.3.0",
+    "rimraf": "^3.0.2"
   }
 }
diff --git a/packages/ipfs-core-types/package.json b/packages/ipfs-core-types/package.json
index fdd74d9598..46ba203687 100644
--- a/packages/ipfs-core-types/package.json
+++ b/packages/ipfs-core-types/package.json
@@ -33,8 +33,7 @@
     "peer-id": "^0.14.1"
   },
   "devDependencies": {
-    "aegir": "^29.2.2",
-    "typescript": "4.0.x"
+    "aegir": "^30.3.0"
   },
   "contributors": [
     "Irakli Gozalishvili <dev@gozala.io>"
diff --git a/packages/ipfs-core-types/src/bitswap.ts b/packages/ipfs-core-types/src/bitswap.ts
index 03600e7b83..a9c5474d54 100644
--- a/packages/ipfs-core-types/src/bitswap.ts
+++ b/packages/ipfs-core-types/src/bitswap.ts
@@ -9,54 +9,53 @@ import { StoreReader, StoreExporter, StoreImporter } from './store'
 export interface Bitswap extends
   StoreReader<CID, Block>,
   StoreExporter<CID, Block>,
-  StoreImporter<Block>
-{
+  StoreImporter<Block> {
 
   readonly peerId: PeerId
 
-  enableStats(): void
-  disableStats(): void
+  enableStats: () => void
+  disableStats: () => void
 
-  wantlistForPeer(peerId: PeerId, options?:AbortOptions): Map<string, WantListEntry>
-  ledgerForPeer(peerId: PeerId): Ledger
+  wantlistForPeer: (peerId: PeerId, options?: AbortOptions) => Map<string, WantListEntry>
+  ledgerForPeer: (peerId: PeerId) => Ledger
 
-  put(block: Block, options?: AbortOptions): Await<void>
+  put: (block: Block, options?: AbortOptions) => Await<void>
 
-  unwant(cids: Iterable<CID>, options?: AbortOptions): void
-  cancelWants(cids: Iterable<CID>): void
-  getWantlist(options?: AbortOptions): Iterable<[string, WantListEntry]>
-  peers(): PeerId[]
-  stat(): Stats
-  start(): void
-  stop(): void
+  unwant: (cids: Iterable<CID>, options?: AbortOptions) => void
+  cancelWants: (cids: Iterable<CID>) => void
+  getWantlist: (options?: AbortOptions) => Iterable<[string, WantListEntry]>
+  peers: () => PeerId[]
+  stat: () => Stats
+  start: () => void
+  stop: () => void
 }
 
 export interface Ledger {
-  sentBytes(n:number):void
-  receivedBytes(n:number):void
+  sentBytes: (n: number) => void
+  receivedBytes: (n: number) => void
 
-  wants(cid: CID, priority: number, wantType: WantType):void
-  cancelWant(cid: CID): void
-  wantlistContains(cid:CID): WantListEntry|void
+  wants: (cid: CID, priority: number, wantType: WantType) => void
+  cancelWant: (cid: CID) => void
+  wantlistContains: (cid: CID) => WantListEntry|undefined
 
-  debtRatio():number
+  debtRatio: () => number
 }
 
 export interface WantListEntry {
   readonly cid: CID
   priority: number
-  inc(): void
-  dec(): void
-  hasRefs(): boolean
-  equals(other: WantListEntry): boolean
+  inc: () => void
+  dec: () => void
+  hasRefs: () => boolean
+  equals: (other: WantListEntry) => boolean
 }
 
-export type WantList = {
+export interface WantList {
   entries: Entry[]
   full?: boolean
 }
 
-export type Entry = {
+export interface Entry {
   block: Uint8Array
   priority: number
   cancel: boolean
@@ -64,7 +63,7 @@ export type Entry = {
   sendDontHave?: boolean
 }
 
-export type BlockPresence = {
+export interface BlockPresence {
   cid: Uint8Array
   type: BlockPresenceType
 }
@@ -77,16 +76,16 @@ export type WantBlock = 0
 export type HaveBlock = 1
 export type WantType = WantBlock | HaveBlock
 
-export type BlockData = {
+export interface BlockData {
   prefix: Uint8Array
   data: Uint8Array
 }
 
 export interface Stats {
-  enable(): void
-  disable(): void
-  stop(): void
+  enable: () => void
+  disable: () => void
+  stop: () => void
   readonly snapshot: Record<string, BigInteger>
   readonly movingAverages: Record<string, Record<number, MovingAverage>>
-  push(counter: number, inc: number): void
+  push: (counter: number, inc: number) => void
 }
diff --git a/packages/ipfs-core-types/src/bitswap/moving-avarage.ts b/packages/ipfs-core-types/src/bitswap/moving-avarage.ts
index 99045ae3f8..8fe2db8431 100644
--- a/packages/ipfs-core-types/src/bitswap/moving-avarage.ts
+++ b/packages/ipfs-core-types/src/bitswap/moving-avarage.ts
@@ -1,9 +1,9 @@
 export interface MovingAverage {
-  variance(): number
-  movingAverage(): number
+  variance: () => number
+  movingAverage: () => number
 
-  deviation(): number
-  forecast(): number
+  deviation: () => number
+  forecast: () => number
 
-  push(time: number, value:number):void
+  push: (time: number, value: number) => void
 }
diff --git a/packages/ipfs-core-types/src/block-service.ts b/packages/ipfs-core-types/src/block-service.ts
index e547c30ed3..24e03149eb 100644
--- a/packages/ipfs-core-types/src/block-service.ts
+++ b/packages/ipfs-core-types/src/block-service.ts
@@ -7,17 +7,16 @@ export interface BlockService extends
   StoreReader<CID, Block>,
   StoreExporter<CID, Block>,
   StoreImporter<Block>,
-  StoreEraser<CID>
-{
-  setExchange(bitswap: Bitswap): void
+  StoreEraser<CID> {
+  setExchange: (bitswap: Bitswap) => void
 
-  unsetExchange(): void
-  hasExchange(): boolean
+  unsetExchange: () => void
+  hasExchange: () => boolean
 
   /**
    * Put a block to the underlying datastore.
    */
-  put(block: Block, options?:AbortOptions): Await<Block>
+  put: (block: Block, options?: AbortOptions) => Await<Block>
 }
 
 export interface Block {
diff --git a/packages/ipfs-core-types/src/datastore.ts b/packages/ipfs-core-types/src/datastore.ts
index 418eadccf5..06d332789a 100644
--- a/packages/ipfs-core-types/src/datastore.ts
+++ b/packages/ipfs-core-types/src/datastore.ts
@@ -3,8 +3,7 @@ export interface DataStore extends
   KeyValueStore<Key, Value, Entry>,
   StoreSelector<Entry>,
   StoreBatch<Key, Value>,
-  Resource
-{
+  Resource {
 }
 
 export interface Key {
@@ -19,7 +18,7 @@ export interface Key {
    * // 'JohnCleese'
    * ```
    */
-  name(): string
+  name: () => string
 
   /**
    * Returns the "type" of this key (value of last namespace).
@@ -32,12 +31,12 @@ export interface Key {
    * // 'Actor'
    * ```
    */
-  type(): string
+  type: () => string
 
   /**
    * Returns the `namespaces` making up this `Key`.
    */
-  namespaces(): string[]
+  namespaces: () => string[]
 
   /**
    * Returns the "base" namespace of this key.
@@ -49,7 +48,7 @@ export interface Key {
    * key.baseNamespace()
    * // 'Actor:JohnCleese'
    */
-  baseNamespace(): string
+  baseNamespace: () => string
 
   /**
    * Returns an "instance" of this type key (appends value to namespace).
@@ -62,7 +61,7 @@ export interface Key {
    * // '/Comedy/MontyPython/Actor:JohnCleese'
    * ```
    */
-  instance(): Key
+  instance: () => Key
 
   /**
    * Returns the "path" of this key (parent + type).
@@ -75,7 +74,7 @@ export interface Key {
    * // '/Comedy/MontyPython/Actor'
    * ```
    */
-  path(): Key
+  path: () => Key
 
   /**
    * Returns the `parent` Key of this Key.
@@ -88,7 +87,7 @@ export interface Key {
    * // "/Comedy/MontyPython"
    * ```
    */
-  parent(): Key
+  parent: () => Key
 
   /**
    * Returns the `child` Key of this Key.
@@ -103,12 +102,12 @@ export interface Key {
    * '/Comedy/MontyPython/Actor:JohnCleese'
    * ```
    */
-  child(key: Key): Key
+  child: (key: Key) => Key
 
   /**
    * Check if the given key is sorted lower than this.
    */
-  less(key: Key): boolean
+  less: (key: Key) => boolean
 
   /**
    * Returns whether this key is a prefix of `other`
@@ -123,7 +122,7 @@ export interface Key {
    * // true
    * ```
    */
-  isAncestorOf(other: Key): boolean
+  isAncestorOf: (other: Key) => boolean
 
   /**
    * Returns whether this key is a contains `other` as prefix.
@@ -136,12 +135,12 @@ export interface Key {
    * // true
    * ```
    */
-  isDecendantOf(other: Key): boolean
+  isDecendantOf: (other: Key) => boolean
 
   /**
    * Returns wether this key has only one namespace.
    */
-  isTopLevel(): boolean
+  isTopLevel: () => boolean
 
   /**
    * Returns the key with all parts in reversed order.
@@ -155,12 +154,12 @@ export interface Key {
    * new Key('/Comedy/MontyPython/Actor:JohnCleese').reverse()
    * ```
    */
-  reverse(): Key
+  reverse: () => Key
 
   /**
    * Concats one or more Keys into one new Key.
    */
-  concat(...keys: Key[]): Key
+  concat: (...keys: Key[]) => Key
 
   /**
    * Returns the array representation of this key.
@@ -173,13 +172,13 @@ export interface Key {
    * // ['Comedy', 'MontyPythong', 'Actor:JohnCleese']
    * ```
    */
-  list(): string[]
-  toString(): string
+  list: () => string[]
+  toString: () => string
 }
 
 export type Value = Uint8Array
 
 export interface Entry {
-  key: Key,
+  key: Key
   value: Value
 }
diff --git a/packages/ipfs-core-types/src/files.ts b/packages/ipfs-core-types/src/files.ts
index 7c7dd0af7b..e9f45c7d5b 100644
--- a/packages/ipfs-core-types/src/files.ts
+++ b/packages/ipfs-core-types/src/files.ts
@@ -15,7 +15,7 @@ export interface FileEntry <Content extends AsyncIterable<Uint8Array>|Blob> exte
 }
 
 export interface DirectoryEntry extends BaseEntry {
-  content?: void
+  content?: undefined
 }
 
 export type ImportSource =
@@ -34,7 +34,7 @@ export interface ToFile extends ToFileMetadata {
 
 export interface ToDirectory extends ToFileMetadata {
   path: string
-  content?: void
+  content?: undefined
 }
 
 export interface ToFileMetadata {
@@ -89,7 +89,7 @@ export interface File {
 }
 
 export interface Directory {
-  type: 'dir',
+  type: 'dir'
   cid: CID
   name: string
   /**
@@ -111,11 +111,11 @@ export interface BaseFile {
 }
 
 export interface InputFile extends BaseFile {
-  unixfs: void
+  unixfs: undefined
 }
 
 export interface UnixFSFile extends BaseFile {
-  content(): AsyncIterable<Uint8Array>
+  content: () => AsyncIterable<Uint8Array>
   unixfs: UnixFS
 }
 
@@ -158,8 +158,8 @@ interface UnixFS {
   readonly mode: Mode
   readonly mtime: MTime
 
-  fileSize(): number
-  content(): AsyncIterable<Uint8Array>
+  fileSize: () => number
+  content: () => AsyncIterable<Uint8Array>
 }
 
 /**
diff --git a/packages/ipfs-core-types/src/ipld.ts b/packages/ipfs-core-types/src/ipld.ts
index f31ae7c6bb..c15adceb82 100644
--- a/packages/ipfs-core-types/src/ipld.ts
+++ b/packages/ipfs-core-types/src/ipld.ts
@@ -7,17 +7,15 @@ import { ResolveResult, Format } from './ipld/format'
 export interface IPLD<T = any> extends
   StoreReader<CID, T>,
   StoreExporter<CID, T>,
-  StoreEraser<CID>
+  StoreEraser<CID> {
+  put: (value: T, format: FormatCode, options?: PutOptions & AbortOptions) => Await<CID>
+  putMany: (values: AwaitIterable<T>, format: FormatCode, options?: PutOptions) => AwaitIterable<CID>
 
-{
-  put(value:T, format:FormatCode, options?:PutOptions & AbortOptions):Await<CID>
-  putMany(values: AwaitIterable<T>, format: FormatCode, options?:PutOptions):AwaitIterable<CID>
+  resolve: (cid: CID, path: string, options?: AbortOptions) => AwaitIterable<ResolveResult<T>>
+  tree: (cid: CID, path?: string, options?: TreeOptions & AbortOptions) => AwaitIterable<string>
 
-  resolve(cid: CID, path: string, options?: AbortOptions): AwaitIterable<ResolveResult<T>>
-  tree(cid:CID, path?:string, options?:TreeOptions & AbortOptions):AwaitIterable<string>
-
-  addFormat(format:Format<T>):IPLD<T>
-  removeFormat(format:Format<T>):IPLD<T>
+  addFormat: (format: Format<T>) => IPLD<T>
+  removeFormat: (format: Format<T>) => IPLD<T>
 
   defaultOptions: Options
 }
@@ -29,13 +27,13 @@ export interface Options {
   blockService?: BlockService
   formats?: Record<string, Format>
 
-  loadFormat?: <T>(code:number|string) => Promise<Format<T>>
+  loadFormat?: <T>(code: number|string) => Promise<Format<T>>
 }
 
 export interface PutOptions {
-  hashAlg?: HashAlg,
-  cidVersion?: 0|1,
-  onlyHash?: boolean,
+  hashAlg?: HashAlg
+  cidVersion?: 0|1
+  onlyHash?: boolean
 
 }
 
diff --git a/packages/ipfs-core-types/src/ipld/format.ts b/packages/ipfs-core-types/src/ipld/format.ts
index 9613d3af70..6a459b8634 100644
--- a/packages/ipfs-core-types/src/ipld/format.ts
+++ b/packages/ipfs-core-types/src/ipld/format.ts
@@ -14,16 +14,16 @@ export interface Util<T> {
   /**
    * Serialize an IPLD Node into a binary blob.
    */
-  serialize(node:T):Uint8Array
+  serialize: (node: T) => Uint8Array
   /**
    * Deserialize a binary blob into an IPLD Node.
    */
-  deserialize(bytes: Uint8Array): T
+  deserialize: (bytes: Uint8Array) => T
 
   /**
    * Calculate the CID of the binary blob.
    */
-  cid(bytes:Uint8Array, options?:CIDOptions): Await<CID>
+  cid: (bytes: Uint8Array, options?: CIDOptions) => Await<CID>
 }
 
 export interface CIDOptions {
@@ -32,8 +32,8 @@ export interface CIDOptions {
 }
 
 export interface Resolver<T> {
-  resolve(bytes: Uint8Array, path: string): ResolveResult<T>
-  tree(byte: Uint8Array): string[]
+  resolve: (bytes: Uint8Array, path: string) => ResolveResult<T>
+  tree: (byte: Uint8Array) => string[]
 }
 
 export interface ResolveResult<T> {
diff --git a/packages/ipfs-core-types/src/pin/remote.ts b/packages/ipfs-core-types/src/pin/remote.ts
index c148a42fb3..7dde960720 100644
--- a/packages/ipfs-core-types/src/pin/remote.ts
+++ b/packages/ipfs-core-types/src/pin/remote.ts
@@ -12,25 +12,25 @@ export interface API {
   /**
    * Pin a content with a given CID to a remote pinning service.
    */
-  add(cid:CID, options:AddOptions & AbortOptions):Promise<Pin>
+  add: (cid: CID, options: AddOptions & AbortOptions) => Promise<Pin>
 
   /**
    * Returns a list of matching pins on the remote pinning service.
    */
-  ls(query: Query & AbortOptions): AsyncIterable<Pin>
+  ls: (query: Query & AbortOptions) => AsyncIterable<Pin>
 
   /**
    * Removes a single pin object matching query allowing it to be garbage
    * collected (if needed). Will error if multiple pins mtach provided
    * query. To remove all matches use `rmAll` instead.
    */
-  rm(query: Query & AbortOptions): Promise<void>
+  rm: (query: Query & AbortOptions) => Promise<void>
 
   /**
    * Removes all pin object that match given query allowing them to be garbage
    * collected if needed.
    */
-  rmAll(query: Query & AbortOptions): Promise<void>
+  rmAll: (query: Query & AbortOptions) => Promise<void>
 }
 
 export interface AddOptions extends RemoteServiceOptions {
diff --git a/packages/ipfs-core-types/src/pin/remote/service.ts b/packages/ipfs-core-types/src/pin/remote/service.ts
index 8885219bba..7368f14403 100644
--- a/packages/ipfs-core-types/src/pin/remote/service.ts
+++ b/packages/ipfs-core-types/src/pin/remote/service.ts
@@ -5,19 +5,18 @@ export interface API {
    * Registers remote pinning service with a given name. Errors if service
    * with the given name is already registered.
    */
-  add(name: string, credentials:Credentials & AbortOptions): Promise<void>
+  add: (name: string, credentials: Credentials & AbortOptions) => Promise<void>
 
   /**
    * Unregisteres remote pinning service with a given name. If service with such
    * name isn't registerede this is a noop.
    */
-  rm(name: string, options?:AbortOptions):Promise<void>
+  rm: (name: string, options?: AbortOptions) => Promise<void>
 
   /**
    * List registered remote pinning services.
    */
-  ls(options: { stat: true } & AbortOptions): Promise<RemotePinServiceWithStat[]>
-  ls(options?: AbortOptions):Promise<RemotePinService[]>
+  ls: ((options: { stat: true } & AbortOptions) => Promise<RemotePinServiceWithStat[]>) & ((options?: AbortOptions) => Promise<RemotePinService[]>)
 }
 
 export interface Credentials {
@@ -53,18 +52,18 @@ export interface RemotePinServiceWithStat extends RemotePinService {
 
 export type Stat = ValidStat | InvalidStat
 
-type ValidStat = {
+interface ValidStat {
   status: 'valid'
   pinCount: PinCount
 }
 
-type InvalidStat = {
+interface InvalidStat {
   status: 'invalid'
-  pinCount?: void
+  pinCount?: undefined
 }
-export type PinCount = {
-  queued: number,
-  pinning: number,
-  pinned: number,
+export interface PinCount {
+  queued: number
+  pinning: number
+  pinned: number
   failed: number
 }
diff --git a/packages/ipfs-core-types/src/repo.ts b/packages/ipfs-core-types/src/repo.ts
index 4bf544d0ec..ca208d5be1 100644
--- a/packages/ipfs-core-types/src/repo.ts
+++ b/packages/ipfs-core-types/src/repo.ts
@@ -15,22 +15,22 @@ export interface Repo<Config extends ToJSON = any> extends Resource {
   /**
    * Initializes necessary structures inside the repo
    */
-  init(config:Partial<Config>):Await<void>
+  init: (config: Partial<Config>) => Await<void>
 
   /**
    * Tells whether this repo exists or not.
    */
-  exists():Await<boolean>
+  exists: () => Await<boolean>
 
   /**
    * Tells whether the repo has been initialized.
    */
-  isInitialized():Await<boolean>
+  isInitialized: () => Await<boolean>
 
   /**
    * Gets the repo status.
    */
-  stat(options?:AbortOptions):Await<RepoStatus>
+  stat: (options?: AbortOptions) => Await<RepoStatus>
 
   root: KeyValueStore<Key|string|Uint8Array, Uint8Array, { key: Key, value: Uint8Array }>
 
@@ -59,19 +59,17 @@ interface BlockStore extends
   StoreLookup<CID>,
   StoreExporter<CID, Block>,
   StoreEraser<CID>,
-  StoreSelector<Block>
-{
-  put(block: Block): Await<Block>
+  StoreSelector<Block> {
+  put: (block: Block) => Await<Block>
 }
 
 export interface ConfigStore<Config extends ToJSON = any> extends
-  StoreReader<string, ToJSON>
-{
+  StoreReader<string, ToJSON> {
   /**
    * Set a config `value`, where `value` can be anything that is serializable
    * to JSON.
    */
-  set(key: string, value: ToJSON, options?:AbortOptions): Await<void>
+  set: (key: string, value: ToJSON, options?: AbortOptions) => Await<void>
 
   /**
    * Set the whole `config` which can be a any value that is serializable to
@@ -79,28 +77,26 @@ export interface ConfigStore<Config extends ToJSON = any> extends
    *
    * @param config
    */
-  replace(config: Config, options?: AbortOptions): Await<void>
+  replace: (config: Config, options?: AbortOptions) => Await<void>
 
   /**
    * Get the entire config value.
    */
-  getAll(options?:AbortOptions): Await<Config>
+  getAll: (options?: AbortOptions) => Await<Config>
 
   /**
    * Whether the config sub-repo exists.
    */
-  exists(): Await<boolean>
+  exists: () => Await<boolean>
 }
 
 export interface PinStore extends
   KeyValueStore<string, Uint8Array, { key: string, value: Uint8Array }>,
-  Object
-{
+  Object {
 }
 
 export interface KeyStore extends
   KeyValueStore<Key, Uint8Array, { key: Key, value: Uint8Array }>,
-  Object
-{
+  Object {
 
 }
diff --git a/packages/ipfs-core-types/src/root.ts b/packages/ipfs-core-types/src/root.ts
index e9a5055d32..5472b2bf89 100644
--- a/packages/ipfs-core-types/src/root.ts
+++ b/packages/ipfs-core-types/src/root.ts
@@ -4,14 +4,16 @@ import { ImportSource, IPFSEntry, ToEntry, UnixFSEntry } from './files'
 import CID, { CIDVersion } from 'cids'
 
 export interface RootAPI {
-  add(entry: ToEntry, options?: AddOptions): Promise<UnixFSEntry>
-  addAll(source: ImportSource, options?: AddAllOptions & AbortOptions): AsyncIterable<UnixFSEntry>
-  cat(ipfsPath: IPFSPath, options?: CatOptions): AsyncIterable<Uint8Array>
-  get(ipfsPath: IPFSPath, options?: GetOptions): AsyncIterable<IPFSEntry>
+  add: (entry: ToEntry, options?: AddOptions) => Promise<UnixFSEntry>
+  addAll: (source: ImportSource, options?: AddAllOptions & AbortOptions) => AsyncIterable<UnixFSEntry>
+  cat: (ipfsPath: IPFSPath, options?: CatOptions) => AsyncIterable<Uint8Array>
+  get: (ipfsPath: IPFSPath, options?: GetOptions) => AsyncIterable<IPFSEntry>
 
-  ls(ipfsPath: IPFSPath, options?: ListOptions): AsyncIterable<IPFSEntry>
+  ls: (ipfsPath: IPFSPath, options?: ListOptions) => AsyncIterable<IPFSEntry>
 }
 
+export interface AddProgressFn { (bytes: number, path: string): void }
+
 export interface AddOptions extends AbortOptions {
   /**
    * Chunking algorithm used to build ipfs DAGs. (defaults to 'size-262144')
@@ -43,7 +45,7 @@ export interface AddOptions extends AbortOptions {
    *
    * **Note** It will not be called for directory entries.
    */
-  progress?: (bytes: number, path: string) => void
+  progress?: AddProgressFn
 
   /**
    * If true, DAG leaves will contain raw file data and not be wrapped in a
@@ -99,7 +101,7 @@ export interface CatOptions extends AbortOptions, PreloadOptions {
 export interface GetOptions extends AbortOptions, PreloadOptions {}
 
 export interface ListOptions extends AbortOptions, PreloadOptions {
-  recursive?: boolean,
+  recursive?: boolean
   includeContent?: boolean
 }
 
diff --git a/packages/ipfs-core-types/src/store.ts b/packages/ipfs-core-types/src/store.ts
index 332c573062..8029e4f7bc 100644
--- a/packages/ipfs-core-types/src/store.ts
+++ b/packages/ipfs-core-types/src/store.ts
@@ -2,8 +2,8 @@
 import { Await, AwaitIterable, AbortOptions } from './basic'
 
 export interface ValueStore<T> {
-  get(options?:AbortOptions): Await<T>
-  set(value: T): Await<void>
+  get: (options?: AbortOptions) => Await<T>
+  set: (value: T) => Await<void>
 }
 
 export interface KeyValueStore<Key, Value, Entry> extends
@@ -22,64 +22,64 @@ export interface StoreReader<Key, Value> {
   /**
    * The key retrieve the value for.
    */
-  get(key: Key, options?: AbortOptions): Await<Value>
+  get: (key: Key, options?: AbortOptions) => Await<Value>
 }
 
 export interface StoreLookup<Key> {
   /**
    * Check for the existence of a given key
    */
-  has(key: Key, options?: AbortOptions): Await<boolean>
+  has: (key: Key, options?: AbortOptions) => Await<boolean>
 }
 
 export interface StoreExporter<Key, Value> {
   /**
    * Retrieve a stream of values stored under the given keys.
    */
-  getMany(keys: AwaitIterable<Key>, options?: AbortOptions): AwaitIterable<Value>
+  getMany: (keys: AwaitIterable<Key>, options?: AbortOptions) => AwaitIterable<Value>
 }
 
 export interface StoreSelector<Entry> {
   /**
    * Search the store for some values.
    */
-  query(query: Query<Entry>, options?: AbortOptions): AwaitIterable<Entry>
+  query: (query: Query<Entry>, options?: AbortOptions) => AwaitIterable<Entry>
 }
 
 export interface StoreWriter<Key, Value> {
   /**
    * Store a value with the given key.
    */
-  put(key: Key, value: Value, options?: AbortOptions): Await<void>
+  put: (key: Key, value: Value, options?: AbortOptions) => Await<void>
 }
 
 export interface StoreImporter<Entry> {
   /**
    * Store many key-value pairs.
    */
-  putMany(entries: AwaitIterable<Entry>, options?: AbortOptions): AwaitIterable<Entry>
+  putMany: (entries: AwaitIterable<Entry>, options?: AbortOptions) => AwaitIterable<Entry>
 }
 
 export interface StoreEraser<Key> {
   /**
    * Delete the content stored under the given key.
    */
-  delete(key: Key, options?: AbortOptions): Await<void>
+  delete: (key: Key, options?: AbortOptions) => Await<void>
   /**
    * Delete the content stored under the given keys.
    */
-  deleteMany(keys: AwaitIterable<Key>, options?: AbortOptions): AwaitIterable<Key>
+  deleteMany: (keys: AwaitIterable<Key>, options?: AbortOptions) => AwaitIterable<Key>
 
 }
 export interface StoreBatch<Key, Value> {
-  batch(): Batch<Key, Value>
+  batch: () => Batch<Key, Value>
 }
 
 export interface Batch<Key, Value> {
-  put(key: Key, value: Value): void
-  delete(key: Key): void
+  put: (key: Key, value: Value) => void
+  delete: (key: Key) => void
 
-  commit(options?: AbortOptions): Await<void>
+  commit: (options?: AbortOptions) => Await<void>
 }
 
 export interface Resource {
@@ -87,12 +87,12 @@ export interface Resource {
    * Opens the datastore, this is only needed if the store was closed before,
    * otherwise this is taken care of by the constructor.
    */
-  open(): Await<void>
+  open: () => Await<void>
   /**
    * Close the datastore, this should always be called to ensure resources
    * are cleaned up.
    */
-  close(): Await<void>
+  close: () => Await<void>
 }
 
 export interface Query<Entry, Options = any> {
diff --git a/packages/ipfs-core-utils/package.json b/packages/ipfs-core-utils/package.json
index d8dbf8ccfa..9098136949 100644
--- a/packages/ipfs-core-utils/package.json
+++ b/packages/ipfs-core-utils/package.json
@@ -30,11 +30,9 @@
     "test:electron-renderer": "aegir test -t electron-renderer",
     "test:node": "aegir test -t node",
     "lint": "aegir lint",
-    "build": "npm run build:js && npm run build:types",
-    "build:js": "aegir build",
-    "build:types": "tsc --build",
+    "prepare": "aegir build --no-bundle",
     "clean": "rimraf ./dist",
-    "dep-check": "aegir dep-check -i typescript -i rimraf -i ipfs-core-types"
+    "dep-check": "aegir dep-check -i rimraf -i ipfs-core-types"
   },
   "license": "MIT",
   "dependencies": {
@@ -44,7 +42,7 @@
     "cids": "^1.1.5",
     "err-code": "^2.0.3",
     "ipfs-core-types": "^0.2.1",
-    "ipfs-utils": "^5.0.0",
+    "ipfs-utils": "^6.0.0",
     "it-all": "^1.0.4",
     "it-map": "^1.0.4",
     "it-peekable": "^1.0.1",
@@ -52,11 +50,10 @@
     "multiaddr-to-uri": "^6.0.0",
     "parse-duration": "^0.4.4",
     "timeout-abort-controller": "^1.1.1",
-    "uint8arrays": "^1.1.0"
+    "uint8arrays": "^2.0.5"
   },
   "devDependencies": {
-    "aegir": "^29.2.2",
-    "rimraf": "^3.0.2",
-    "typescript": "4.0.x"
+    "aegir": "^30.3.0",
+    "rimraf": "^3.0.2"
   }
 }
diff --git a/packages/ipfs-core-utils/src/files/normalise-input/normalise-content.browser.js b/packages/ipfs-core-utils/src/files/normalise-input/normalise-content.browser.js
index dc5cb113a6..a2bdc54fea 100644
--- a/packages/ipfs-core-utils/src/files/normalise-input/normalise-content.browser.js
+++ b/packages/ipfs-core-utils/src/files/normalise-input/normalise-content.browser.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const errCode = require('err-code')
-const { Blob } = require('ipfs-utils/src/globalthis')
 const itPeekable = require('it-peekable')
 const browserStreamToIt = require('browser-readablestream-to-it')
 const all = require('it-all')
@@ -17,11 +16,16 @@ const {
  * @returns {Promise<Blob>}
  */
 async function toBlob (input) {
-  // Bytes | String
-  if (isBytes(input) || typeof input === 'string' || input instanceof String) {
+  // Bytes
+  if (isBytes(input)) {
     return new Blob([input])
   }
 
+  // String
+  if (typeof input === 'string' || input instanceof String) {
+    return new Blob([input.toString()])
+  }
+
   // Blob | File
   if (isBlob(input)) {
     return input
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 4a7a125147..db205d62c5 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
@@ -19,11 +19,16 @@ const {
  */
 async function * toAsyncIterable (input) {
   // Bytes | String
-  if (isBytes(input) || typeof input === 'string' || input instanceof String) {
+  if (isBytes(input)) {
     yield toBytes(input)
     return
   }
 
+  if (typeof input === 'string' || input instanceof String) {
+    yield toBytes(input.toString())
+    return
+  }
+
   // Blob
   if (isBlob(input)) {
     yield * blobToIt(input)
@@ -89,7 +94,7 @@ function toBytes (chunk) {
     return Uint8Array.from(chunk)
   }
 
-  return uint8ArrayFromString(chunk)
+  return uint8ArrayFromString(chunk.toString())
 }
 
 module.exports = toAsyncIterable
diff --git a/packages/ipfs-core-utils/src/files/normalise-input/normalise-input.js b/packages/ipfs-core-utils/src/files/normalise-input/normalise-input.js
index 6054808bfb..79365847d8 100644
--- a/packages/ipfs-core-utils/src/files/normalise-input/normalise-input.js
+++ b/packages/ipfs-core-utils/src/files/normalise-input/normalise-input.js
@@ -33,7 +33,7 @@ module.exports = async function * normaliseInput (input, normaliseContent) {
 
   // String
   if (typeof input === 'string' || input instanceof String) {
-    yield toFileObject(input, normaliseContent)
+    yield toFileObject(input.toString(), normaliseContent)
     return
   }
 
diff --git a/packages/ipfs-core-utils/src/files/normalise-input/utils.js b/packages/ipfs-core-utils/src/files/normalise-input/utils.js
index a7de4b186b..defceec5e8 100644
--- a/packages/ipfs-core-utils/src/files/normalise-input/utils.js
+++ b/packages/ipfs-core-utils/src/files/normalise-input/utils.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { Blob } = require('ipfs-utils/src/globalthis')
+const { Blob } = globalThis
 
 /**
  * @param {any} obj
diff --git a/packages/ipfs-core-utils/src/with-timeout-option.js b/packages/ipfs-core-utils/src/with-timeout-option.js
index 7e20556bfd..70e159263f 100644
--- a/packages/ipfs-core-utils/src/with-timeout-option.js
+++ b/packages/ipfs-core-utils/src/with-timeout-option.js
@@ -3,7 +3,7 @@
 
 const TimeoutController = require('timeout-abort-controller')
 const { anySignal } = require('any-signal')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const { TimeoutError } = require('./errors')
 
 /**
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 d073df1567..e052368f85 100644
--- a/packages/ipfs-core-utils/test/files/normalise-input.spec.js
+++ b/packages/ipfs-core-utils/test/files/normalise-input.spec.js
@@ -6,7 +6,7 @@ const { expect } = require('aegir/utils/chai')
 const blobToIt = require('blob-to-it')
 const uint8ArrayFromString = require('uint8arrays/from-string')
 const all = require('it-all')
-const { Blob, ReadableStream } = require('ipfs-utils/src/globalthis')
+const { Blob, ReadableStream } = globalThis
 const { isBrowser, isWebWorker, isElectronRenderer } = require('ipfs-utils/src/env')
 
 let normalise = require('../../src/files/normalise-input')
diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json
index 72532b5861..d2f6641401 100644
--- a/packages/ipfs-core/package.json
+++ b/packages/ipfs-core/package.json
@@ -39,9 +39,8 @@
   },
   "scripts": {
     "lint": "aegir lint",
-    "build": "npm run build:js && npm run build:types",
-    "build:js": "aegir build",
-    "build:types": "tsc --build",
+    "prepare": "aegir build --no-bundle",
+    "build": "aegir build",
     "test": "aegir test",
     "test:node": "aegir test -t node",
     "test:browser": "aegir test -t browser",
@@ -51,32 +50,32 @@
     "test:bootstrapers": "IPFS_TEST=bootstrapers aegir test -t browser -f test/bootstrapers.js",
     "coverage": "nyc --reporter=text --reporter=lcov npm run test:node",
     "clean": "rimraf ./dist",
-    "dep-check": "aegir dep-check -i typescript -i interface-ipfs-core -i ipfs-core-types"
+    "dep-check": "aegir dep-check -i interface-ipfs-core -i ipfs-core-types"
   },
   "dependencies": {
-    "array-shuffle": "^1.0.1",
+    "array-shuffle": "^2.0.0",
     "bignumber.js": "^9.0.0",
-    "cbor": "^5.1.0",
+    "cbor": "^6.0.1",
     "cids": "^1.1.5",
     "class-is": "^1.1.0",
     "dag-cbor-links": "^2.0.0",
-    "datastore-core": "^2.0.0",
+    "datastore-core": "^3.0.0",
     "datastore-pubsub": "^0.4.1",
     "debug": "^4.1.1",
     "dlv": "^1.1.3",
     "err-code": "^2.0.3",
     "hamt-sharding": "^1.0.0",
     "hashlru": "^2.3.0",
-    "interface-datastore": "^2.0.0",
+    "interface-datastore": "^3.0.3",
     "ipfs-bitswap": "^4.0.2",
     "ipfs-block-service": "^0.18.0",
     "ipfs-core-types": "^0.2.1",
     "ipfs-core-utils": "^0.6.1",
-    "ipfs-repo": "^7.0.0",
+    "ipfs-repo": "^8.0.0",
     "ipfs-unixfs": "^2.0.3",
     "ipfs-unixfs-exporter": "^3.0.4",
     "ipfs-unixfs-importer": "^5.0.0",
-    "ipfs-utils": "^5.0.0",
+    "ipfs-utils": "^6.0.0",
     "ipld": "^0.28.0",
     "ipld-block": "^0.11.0",
     "ipld-dag-cbor": "^0.17.0",
@@ -100,10 +99,10 @@
     "libp2p-noise": "^2.0.1",
     "libp2p-record": "^0.9.0",
     "libp2p-tcp": "^0.15.1",
-    "libp2p-webrtc-star": "^0.20.1",
+    "libp2p-webrtc-star": "^0.21.0",
     "libp2p-websockets": "^0.15.0",
     "mafmt": "^8.0.0",
-    "merge-options": "^2.0.0",
+    "merge-options": "^3.0.4",
     "mortice": "^2.0.0",
     "multiaddr": "^8.0.0",
     "multiaddr-to-uri": "^6.0.0",
@@ -115,10 +114,10 @@
     "parse-duration": "^0.4.4",
     "peer-id": "^0.14.1",
     "streaming-iterables": "^5.0.2",
-    "uint8arrays": "^1.1.0"
+    "uint8arrays": "^2.0.5"
   },
   "devDependencies": {
-    "aegir": "^29.2.2",
+    "aegir": "^30.3.0",
     "delay": "^4.4.0",
     "go-ipfs": "0.8.0-rc2",
     "interface-ipfs-core": "^0.143.1",
@@ -127,7 +126,6 @@
     "iso-url": "^1.0.0",
     "nanoid": "^3.1.12",
     "rimraf": "^3.0.2",
-    "sinon": "^9.0.3",
-    "typescript": "4.0.x"
+    "sinon": "^9.0.3"
   }
 }
diff --git a/packages/ipfs-core/src/components/bitswap/stat.js b/packages/ipfs-core/src/components/bitswap/stat.js
index 197855ded0..279c77a67a 100644
--- a/packages/ipfs-core/src/components/bitswap/stat.js
+++ b/packages/ipfs-core/src/components/bitswap/stat.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const Big = require('bignumber.js').default
+const { default: Big } = require('bignumber.js')
 const CID = require('cids')
 const withTimeoutOption = require('ipfs-core-utils/src/with-timeout-option')
 
diff --git a/packages/ipfs-core/src/components/bitswap/wantlist-for-peer.js b/packages/ipfs-core/src/components/bitswap/wantlist-for-peer.js
index c81920c85c..12d9958da0 100644
--- a/packages/ipfs-core/src/components/bitswap/wantlist-for-peer.js
+++ b/packages/ipfs-core/src/components/bitswap/wantlist-for-peer.js
@@ -36,7 +36,6 @@ module.exports = ({ network }) => {
 /**
  * @typedef {import('.').AbortOptions} AbortOptions
  * @typedef {import('.').CID} CID
- * @typedef {import('.').PeerId} PeerId
  */
 
 /**
diff --git a/packages/ipfs-core/src/components/dht.js b/packages/ipfs-core/src/components/dht.js
index f13ba3b8b7..73f3b91b4c 100644
--- a/packages/ipfs-core/src/components/dht.js
+++ b/packages/ipfs-core/src/components/dht.js
@@ -118,7 +118,7 @@ module.exports = ({ network, repo }) => {
       const { libp2p } = await use(network, options)
       cids = Array.isArray(cids) ? cids : [cids]
 
-      for (var i in cids) {
+      for (const i in cids) {
         if (typeof cids[i] === 'string') {
           try {
             cids[i] = new CID(cids[i])
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 2d5b5ff3da..e591bcd2c0 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
@@ -15,7 +15,7 @@ const toAsyncIterator = (content) => {
   if (typeof content === 'string' || content instanceof String) {
     log('Content was a string')
 
-    content = uint8ArrayFromString(content)
+    content = uint8ArrayFromString(content.toString())
   }
 
   if (content.length) {
diff --git a/packages/ipfs-core/src/components/ipns.js b/packages/ipfs-core/src/components/ipns.js
index ca305ea3a9..4c732f6df4 100644
--- a/packages/ipfs-core/src/components/ipns.js
+++ b/packages/ipfs-core/src/components/ipns.js
@@ -107,6 +107,4 @@ module.exports = IPNSAPI
  *
  * @typedef {Object} DHTConfig
  * @property {boolean} [enabled]
- *
- * @typedef {import('../ipns')} IPNS
  */
diff --git a/packages/ipfs-core/src/components/name/publish.js b/packages/ipfs-core/src/components/name/publish.js
index bade8a1eec..9328debdea 100644
--- a/packages/ipfs-core/src/components/name/publish.js
+++ b/packages/ipfs-core/src/components/name/publish.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const debug = require('debug')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const crypto = require('libp2p-crypto')
 const errcode = require('err-code')
 
diff --git a/packages/ipfs-core/src/components/object/get.js b/packages/ipfs-core/src/components/object/get.js
index 51a0b975f1..b294b3cec9 100644
--- a/packages/ipfs-core/src/components/object/get.js
+++ b/packages/ipfs-core/src/components/object/get.js
@@ -5,9 +5,13 @@ const errCode = require('err-code')
 const withTimeoutOption = require('ipfs-core-utils/src/with-timeout-option')
 const uint8ArrayFromString = require('uint8arrays/from-string')
 
+/**
+ * @typedef {import('multibase/src/types').BaseName} BaseName
+ */
+
 /**
  * @param {string|Uint8Array|CID} multihash
- * @param {string} [enc]
+ * @param {BaseName | 'utf8' | 'utf-8' | 'ascii' | 'base58'} [enc]
  * @returns {string|Uint8Array}
  */
 function normalizeMultihash (multihash, enc) {
@@ -68,7 +72,7 @@ module.exports = ({ ipld, preload }) => {
  * @typedef {Object} GetOptions
  * @property {boolean} [preload]
  * @property {number} [cidVersion]
- * @property {string} [enc]
+ * @property {BaseName | 'utf8' | 'utf-8' | 'ascii' | 'base58'} [enc]
  *
  * @typedef {import('.').AbortOptions} AbortOptions
  */
diff --git a/packages/ipfs-core/src/components/stats/bw.js b/packages/ipfs-core/src/components/stats/bw.js
index a418e0d688..1b6ecac384 100644
--- a/packages/ipfs-core/src/components/stats/bw.js
+++ b/packages/ipfs-core/src/components/stats/bw.js
@@ -1,7 +1,7 @@
 'use strict'
 
-const Big = require('bignumber.js').default
-const parseDuration = require('parse-duration').default
+const { default: Big } = require('bignumber.js')
+const { default: parseDuration } = require('parse-duration')
 const errCode = require('err-code')
 const withTimeoutOption = require('ipfs-core-utils/src/with-timeout-option')
 
diff --git a/packages/ipfs-core/src/runtime/preload-browser.js b/packages/ipfs-core/src/runtime/preload-browser.js
index 9d2e8a3997..5005982b62 100644
--- a/packages/ipfs-core/src/runtime/preload-browser.js
+++ b/packages/ipfs-core/src/runtime/preload-browser.js
@@ -18,6 +18,8 @@ module.exports = function preload (url, options = {}) {
 
   return httpQueue.add(async () => {
     const res = await HTTP.post(url, { signal: options.signal })
+
+    // @ts-ignore
     const reader = res.body.getReader()
 
     try {
diff --git a/packages/ipfs-core/src/runtime/preload-nodejs.js b/packages/ipfs-core/src/runtime/preload-nodejs.js
index 4f2ca985e5..0cf65212c8 100644
--- a/packages/ipfs-core/src/runtime/preload-nodejs.js
+++ b/packages/ipfs-core/src/runtime/preload-nodejs.js
@@ -12,6 +12,7 @@ module.exports = async function preload (url, options = {}) {
 
   const res = await HTTP.post(url, { signal: options.signal })
 
+  // @ts-ignore
   for await (const _ of res.body) { // eslint-disable-line no-unused-vars
     // Read to completion but do not cache
   }
diff --git a/packages/ipfs-core/test/create-node.spec.js b/packages/ipfs-core/test/create-node.spec.js
index c7c8abacc8..e54297e4b5 100644
--- a/packages/ipfs-core/test/create-node.spec.js
+++ b/packages/ipfs-core/test/create-node.spec.js
@@ -12,7 +12,6 @@ const IPFS = require('../')
 
 // This gets replaced by `create-repo-browser.js` in the browser
 const createTempRepo = require('./utils/create-repo-nodejs.js')
-const { console } = require('ipfs-utils/src/globalthis')
 
 describe('create node', function () {
   let tempRepo
@@ -229,9 +228,11 @@ describe('create node', function () {
           Addresses: {
             API: `/ip4/127.0.0.1/tcp/${5010 + _nodeNumber}`,
             Gateway: `/ip4/127.0.0.1/tcp/${9090 + _nodeNumber}`,
-            Swarm: isNode ? [
+            Swarm: isNode
+              ? [
               `/ip4/0.0.0.0/tcp/${4010 + _nodeNumber * 2}`
-            ] : []
+                ]
+              : []
           },
           Bootstrap: []
         },
diff --git a/packages/ipfs-daemon/package.json b/packages/ipfs-daemon/package.json
index 5f4f8141b3..adb10a4580 100644
--- a/packages/ipfs-daemon/package.json
+++ b/packages/ipfs-daemon/package.json
@@ -20,13 +20,12 @@
   },
   "scripts": {
     "lint": "aegir lint",
-    "build": "npm run build:types",
-    "build:types": "tsc --build",
+    "prepare": "aegir build --no-bundle",
     "test": "npm run test:node",
     "test:node": "aegir test -t node",
     "coverage": "nyc --reporter=text --reporter=lcov npm run test:node",
     "clean": "rimraf ./dist",
-    "dep-check": "aegir dep-check -i @types/yargs -i typescript"
+    "dep-check": "aegir dep-check -i @types/yargs"
   },
   "dependencies": {
     "debug": "^4.1.1",
@@ -36,18 +35,17 @@
     "ipfs-http-client": "^48.2.2",
     "ipfs-http-gateway": "^0.2.1",
     "ipfs-http-server": "^0.2.2",
-    "ipfs-utils": "^5.0.0",
+    "ipfs-utils": "^6.0.0",
     "just-safe-set": "^2.1.0",
     "libp2p": "^0.30.6",
-    "libp2p-delegated-content-routing": "^0.8.0",
+    "libp2p-delegated-content-routing": "^0.9.0",
     "libp2p-delegated-peer-routing": "^0.8.0",
-    "libp2p-webrtc-star": "^0.20.1",
+    "libp2p-webrtc-star": "^0.21.0",
     "multiaddr": "^8.0.0"
   },
   "devDependencies": {
-    "aegir": "^29.2.2",
+    "aegir": "^30.3.0",
     "node-fetch": "^2.6.1",
-    "typescript": "4.0.x",
     "ws": "^7.3.1"
   },
   "optionalDependencies": {
diff --git a/packages/ipfs-grpc-client/package.json b/packages/ipfs-grpc-client/package.json
index 0f8d455fc0..4afaec27be 100644
--- a/packages/ipfs-grpc-client/package.json
+++ b/packages/ipfs-grpc-client/package.json
@@ -32,12 +32,10 @@
   "scripts": {
     "test": "aegir test",
     "lint": "aegir lint",
-    "build": "npm run build:js && npm run build:types",
-    "build:js": "aegir build",
-    "build:types": "tsc --build",
+    "prepare": "aegir build --no-bundle",
     "coverage": "npx nyc -r html npm run test:node -- --bail",
     "clean": "rimraf ./dist",
-    "dep-check": "aegir dep-check -i aegir -i typescript -i rimraf -i ipfs-grpc-protocol"
+    "dep-check": "aegir dep-check -i aegir -i rimraf -i ipfs-grpc-protocol"
   },
   "dependencies": {
     "@improbable-eng/grpc-web": "^0.13.0",
@@ -55,11 +53,10 @@
     "ws": "^7.3.1"
   },
   "devDependencies": {
-    "aegir": "^29.2.2",
+    "aegir": "^30.3.0",
     "it-all": "^1.0.4",
     "rimraf": "^3.0.2",
-    "sinon": "^9.0.3",
-    "typescript": "4.0.x"
+    "sinon": "^9.0.3"
   },
   "eslintConfig": {
     "extends": "ipfs"
diff --git a/packages/ipfs-grpc-protocol/package.json b/packages/ipfs-grpc-protocol/package.json
index d6bbd6c8b8..eb257e7fd7 100644
--- a/packages/ipfs-grpc-protocol/package.json
+++ b/packages/ipfs-grpc-protocol/package.json
@@ -21,7 +21,7 @@
   "scripts": {
     "test": "echo 'No tests here'",
     "clean": "rimraf ./dist",
-    "build": "npm run clean && mkdirp ./dist && pbjs ./src/*.proto -t json -o ./dist/ipfs.json"
+    "prepare": "npm run clean && mkdirp ./dist && pbjs ./src/*.proto -t json -o ./dist/ipfs.json"
   },
   "devDependencies": {
     "mkdirp": "^1.0.4",
diff --git a/packages/ipfs-grpc-server/package.json b/packages/ipfs-grpc-server/package.json
index 69e81f851a..691c23f9c4 100644
--- a/packages/ipfs-grpc-server/package.json
+++ b/packages/ipfs-grpc-server/package.json
@@ -29,12 +29,11 @@
   },
   "scripts": {
     "lint": "aegir lint",
-    "build": "npm run build:types",
-    "build:types": "tsc --build",
+    "prepare": "aegir build --no-bundle",
     "test": "aegir test -t node",
     "coverage": "nyc --reporter=text --reporter=lcov npm run test:node",
     "clean": "rimraf ./dist",
-    "dep-check": "aegir dep-check -i ipfs-grpc-protocol -i typescript -i aegir -i ipfs-core -i rimraf"
+    "dep-check": "aegir dep-check -i ipfs-grpc-protocol -i aegir -i ipfs-core -i rimraf"
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.1.8",
@@ -51,13 +50,12 @@
     "ws": "^7.3.1"
   },
   "devDependencies": {
-    "aegir": "^29.2.2",
+    "aegir": "^30.3.0",
     "ipfs-core": "^0.4.2",
     "it-all": "^1.0.4",
     "it-drain": "^1.0.3",
     "rimraf": "^3.0.2",
     "sinon": "^9.0.3",
-    "typescript": "4.0.x",
-    "uint8arrays": "^1.1.0"
+    "uint8arrays": "^2.0.5"
   }
 }
diff --git a/packages/ipfs-grpc-server/src/utils/web-socket-server.js b/packages/ipfs-grpc-server/src/utils/web-socket-server.js
index 85415aef8b..bc4d8fa471 100644
--- a/packages/ipfs-grpc-server/src/utils/web-socket-server.js
+++ b/packages/ipfs-grpc-server/src/utils/web-socket-server.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { Server: WebSocketServer } = require('ws')
-const EventEmitter = require('events').EventEmitter
+const { EventEmitter } = require('events')
 const WebSocketMessageChannel = require('./web-socket-message-channel')
 const debug = require('debug')('ipfs:grpc-server:utils:web-socket-server')
 const coerce = require('coercer')
@@ -53,12 +53,18 @@ class Messages extends EventEmitter {
     wss.on('error', error => this.emit('error', error))
   }
 
+  /**
+   * @returns {Promise<void>}
+   */
   stop () {
     return new Promise((resolve) => {
       this._wss.close(() => resolve())
     })
   }
 
+  /**
+   * @returns {Promise<Messages>}
+   */
   ready () {
     return new Promise((resolve) => {
       this._wss.on('listening', () => {
diff --git a/packages/ipfs-http-client/package.json b/packages/ipfs-http-client/package.json
index b20586ac1e..a3454bdbc7 100644
--- a/packages/ipfs-http-client/package.json
+++ b/packages/ipfs-http-client/package.json
@@ -35,6 +35,7 @@
     "url": "git+https://github.com/ipfs/js-ipfs.git"
   },
   "scripts": {
+    "build": "aegir build",
     "test": "aegir test",
     "test:node": "aegir test -t node",
     "test:browser": "aegir test -t browser",
@@ -44,12 +45,10 @@
     "test:chrome": "aegir test -t browser -t webworker -- --browsers ChromeHeadless",
     "test:firefox": "aegir test -t browser -t webworker -- --browsers FirefoxHeadless",
     "lint": "aegir lint",
-    "build": "npm run build:js && npm run build:types",
-    "build:js": "aegir build",
-    "build:types": "tsc --build",
+    "prepare": "aegir build --no-bundle",
     "coverage": "npx nyc -r html npm run test:node -- --bail",
     "clean": "rimraf ./dist",
-    "dep-check": "aegir dep-check -i typescript -i ipfs-core -i rimraf -i ipfs-core-types"
+    "dep-check": "aegir dep-check -i ipfs-core -i rimraf -i ipfs-core-types"
   },
   "dependencies": {
     "any-signal": "^2.0.0",
@@ -59,7 +58,7 @@
     "form-data": "^3.0.0",
     "ipfs-core-types": "^0.2.1",
     "ipfs-core-utils": "^0.6.1",
-    "ipfs-utils": "^5.0.0",
+    "ipfs-utils": "^6.0.0",
     "ipld-block": "^0.11.0",
     "ipld-dag-cbor": "^0.17.0",
     "ipld-dag-pb": "^0.20.0",
@@ -68,7 +67,7 @@
     "it-map": "^1.0.4",
     "it-tar": "^1.2.2",
     "it-to-stream": "^0.1.2",
-    "merge-options": "^2.0.0",
+    "merge-options": "^3.0.4",
     "multiaddr": "^8.0.0",
     "multibase": "^3.0.0",
     "multicodec": "^2.0.1",
@@ -77,19 +76,19 @@
     "native-abort-controller": "~0.0.3",
     "parse-duration": "^0.4.4",
     "stream-to-it": "^0.2.2",
-    "uint8arrays": "^1.1.0"
+    "uint8arrays": "^2.0.5"
   },
   "devDependencies": {
-    "aegir": "^29.2.2",
+    "aegir": "^30.3.0",
     "delay": "^4.4.0",
     "go-ipfs": "0.8.0-rc2",
     "ipfs-core": "^0.4.2",
     "ipfsd-ctl": "^7.2.0",
     "it-all": "^1.0.4",
     "it-concat": "^1.0.1",
+    "it-first": "^1.0.4",
     "nock": "^13.0.2",
-    "rimraf": "^3.0.2",
-    "typescript": "4.0.x"
+    "rimraf": "^3.0.2"
   },
   "engines": {
     "node": ">=10.3.0",
diff --git a/packages/ipfs-http-client/src/add-all.js b/packages/ipfs-http-client/src/add-all.js
index 4689d10915..9dcfbfad7c 100644
--- a/packages/ipfs-http-client/src/add-all.js
+++ b/packages/ipfs-http-client/src/add-all.js
@@ -8,6 +8,11 @@ const toUrlSearchParams = require('./lib/to-url-search-params')
 const { anySignal } = require('any-signal')
 const AbortController = require('native-abort-controller')
 
+/**
+ * @typedef {import('ipfs-utils/src/types').ProgressFn} IPFSUtilsHttpUploadProgressFn
+ * @typedef {import('ipfs-core-types/src/root').AddProgressFn} IPFSCoreAddProgressFn
+ */
+
 module.exports = configure((api) => {
   /**
    * @type {import('.').Implements<typeof import('ipfs-core/src/components/add-all/index')>}
@@ -26,7 +31,7 @@ module.exports = configure((api) => {
     // in which case we disable progress updates to be written out.
     const [progressFn, onUploadProgress] = typeof options.progress === 'function'
       ? createProgressHandler(total, parts, options.progress)
-      : [null, null]
+      : [undefined, undefined]
 
     const res = await api.post('add', {
       searchParams: toUrlSearchParams({
@@ -60,10 +65,11 @@ module.exports = configure((api) => {
  *
  * @param {number} total
  * @param {{name:string, start:number, end:number}[]|null} parts
- * @param {(n:number, name:string) => void} progress
+ * @param {IPFSCoreAddProgressFn} progress
+ * @returns {[IPFSCoreAddProgressFn|undefined, IPFSUtilsHttpUploadProgressFn|undefined]}
  */
 const createProgressHandler = (total, parts, progress) =>
-  parts ? [null, createOnUploadPrgress(total, parts, progress)] : [progress, null]
+  parts ? [undefined, createOnUploadProgress(total, parts, progress)] : [progress, undefined]
 
 /**
  * Creates a progress handler that interpolates progress from upload progress
@@ -71,10 +77,10 @@ const createProgressHandler = (total, parts, progress) =>
  *
  * @param {number} size - actual content size
  * @param {{name:string, start:number, end:number}[]} parts
- * @param {(n:number, name:string) => void} progress
- * @returns {(event:{total:number, loaded: number}) => void}
+ * @param {IPFSCoreAddProgressFn} progress
+ * @returns {IPFSUtilsHttpUploadProgressFn}
  */
-const createOnUploadPrgress = (size, parts, progress) => {
+const createOnUploadProgress = (size, parts, progress) => {
   let index = 0
   const count = parts.length
   return ({ loaded, total }) => {
diff --git a/packages/ipfs-http-client/src/block/put.js b/packages/ipfs-http-client/src/block/put.js
index bf30422c74..a4f549da38 100644
--- a/packages/ipfs-http-client/src/block/put.js
+++ b/packages/ipfs-http-client/src/block/put.js
@@ -45,6 +45,7 @@ module.exports = configure(api => {
 
     let res
     try {
+      // @ts-ignore https://github.com/ipfs/js-ipfs-utils/issues/90
       const response = await api.post('block/put', {
         timeout: options.timeout,
         signal: signal,
diff --git a/packages/ipfs-http-client/src/config/replace.js b/packages/ipfs-http-client/src/config/replace.js
index cb00bbefbf..961d8b6ba7 100644
--- a/packages/ipfs-http-client/src/config/replace.js
+++ b/packages/ipfs-http-client/src/config/replace.js
@@ -16,6 +16,7 @@ module.exports = configure(api => {
     const controller = new AbortController()
     const signal = anySignal([controller.signal, options.signal])
 
+    // @ts-ignore https://github.com/ipfs/js-ipfs-utils/issues/90
     const res = await api.post('config/replace', {
       timeout: options.timeout,
       signal,
@@ -25,7 +26,7 @@ module.exports = configure(api => {
       )
     })
 
-    return res.text()
+    await res.text()
   }
 
   return replace
diff --git a/packages/ipfs-http-client/src/dag/put.js b/packages/ipfs-http-client/src/dag/put.js
index 1f58b32278..401313f052 100644
--- a/packages/ipfs-http-client/src/dag/put.js
+++ b/packages/ipfs-http-client/src/dag/put.js
@@ -50,6 +50,7 @@ module.exports = configure((api, opts) => {
     const controller = new AbortController()
     const signal = anySignal([controller.signal, settings.signal])
 
+    // @ts-ignore https://github.com/ipfs/js-ipfs-utils/issues/90
     const res = await api.post('dag/put', {
       timeout: settings.timeout,
       signal,
diff --git a/packages/ipfs-http-client/src/dht/put.js b/packages/ipfs-http-client/src/dht/put.js
index aeee8e0afd..ba8ac11ac0 100644
--- a/packages/ipfs-http-client/src/dht/put.js
+++ b/packages/ipfs-http-client/src/dht/put.js
@@ -17,6 +17,7 @@ module.exports = configure(api => {
     const controller = new AbortController()
     const signal = anySignal([controller.signal, options.signal])
 
+    // @ts-ignore https://github.com/ipfs/js-ipfs-utils/issues/90
     const res = await api.post('dht/put', {
       timeout: options.timeout,
       signal,
diff --git a/packages/ipfs-http-client/src/files/write.js b/packages/ipfs-http-client/src/files/write.js
index 329834c0f5..b67692643c 100644
--- a/packages/ipfs-http-client/src/files/write.js
+++ b/packages/ipfs-http-client/src/files/write.js
@@ -17,6 +17,7 @@ module.exports = configure(api => {
     const controller = new AbortController()
     const signal = anySignal([controller.signal, options.signal])
 
+    // @ts-ignore https://github.com/ipfs/js-ipfs-utils/issues/90
     const res = await api.post('files/write', {
       timeout: options.timeout,
       signal,
diff --git a/packages/ipfs-http-client/src/get-endpoint-config.js b/packages/ipfs-http-client/src/get-endpoint-config.js
index d0315e2af2..ed11b6418d 100644
--- a/packages/ipfs-http-client/src/get-endpoint-config.js
+++ b/packages/ipfs-http-client/src/get-endpoint-config.js
@@ -4,7 +4,7 @@ const configure = require('./lib/configure')
 
 module.exports = configure(api => {
   return () => {
-    const url = new URL(api.opts.base)
+    const url = new URL(api.opts.base || '')
     return {
       host: url.hostname,
       port: url.port,
diff --git a/packages/ipfs-http-client/src/interface.ts b/packages/ipfs-http-client/src/interface.ts
index 6258fbd835..d70df28957 100644
--- a/packages/ipfs-http-client/src/interface.ts
+++ b/packages/ipfs-http-client/src/interface.ts
@@ -13,46 +13,45 @@
  */
 // This is typed in TS file because otherwise TS unifies on the first parameter
 // regardless of number of parameters function has.
-export type APIWithExtraOptions<API extends (...args: any[]) => any, Extra> =
-  (...args: WithExtendedOptions<Parameters<API>, Extra>) => ReturnType<API>
+export interface APIWithExtraOptions<API extends (...args: any[]) => any, Extra> { (...args: WithExtendedOptions<Parameters<API>, Extra>): ReturnType<API> }
 
 type End = never[]
 type WithExtendedOptions<Params, Ext> = Params extends [...End]
   ? []
   // (options?: Options) -> (options?: Options & Ext)
   : Params extends [options?: infer Options, ...end: End]
-  ? [options?: Options & Ext]
+    ? [options?: Options & Ext]
   // (a: A1, options?: Options) -> (a1: A1, options?: Options & Ext)
-  : Params extends [a1: infer A1, options?: infer Options, ...end: End]
-  ? [a1: A1, options?: Options & Ext]
-  // (a1?: A1, options?: Options) -> (a1?: A1, options?: Options & Ext)
-  : Params extends [a1?: infer A1, options?: infer Options, ...end: End]
-  ? [a1?: A1, options?: Options & Ext]
-  // (a1: A1, a2: A2, options?: Options) -> (a1: A1, a2: A2 options?: Options & Ext)
-  : Params extends [a1: infer A1, a2: infer A2, options?: infer Options, ...end: End]
-  ? [a1: A1, a2: A2, options?: Options & Ext]
-  // (a1: A1, a2?: A2, options?: Options) -> (a1: A1, a2?: A2 options?: Options & Ext)
-  : Params extends [a1: infer A1, a2?: infer A2, options?: infer Options, ...end: End]
-  ? [a1: A1, a2?: A2, options?: Options & Ext]
-  // (a1: A1, a2?: A2, options?: Options) -> (a1: A1, a2?: A2 options?: Options & Ext)
-  : Params extends [a1?: infer A1, a2?: infer A2, options?: infer Options, ...end: End]
-  ? [a1?: A1, a2?: A2, options?: Options & Ext]
-  // (a1: A1, a2: A2, a3:A3 options?: Options) -> (a1: A1, a2: A2, a3:A3, options?: Options & Ext)
-  : Params extends [a1: infer A1, a2: infer A2, a3:infer A3, options?: infer Options, ...end: End]
-  ? [a1: A1, a2: A2, a3: A3, options?: Options & Ext]
-  // (a1: A1, a2: A2, a3?:A3 options?: Options) -> (a1: A1, a2: A2, a3?:A3, options?: Options & Ext)
-  : Params extends [a1: infer A1, a2:infer A2, a3?: infer A3, options?: infer Options, ...end: End]
-  ? [a1: A1, a2: A2, a3?: A3, options?: Options & Ext]
-  // (a1: A1, a2?: A2, a3?:A3 options?: Options) -> (a1: A1, a2?: A2, a3?:A3, options?: Options & Ext)
-  : Params extends [a1: infer A1, a2?: infer A2, a3?: infer A3, options?: infer Options, ...end: End]
-  ? [a1: A1, a2?: A2, a3?: A3, options?: Options & Ext]
-  // (a1?: A1, a2?: A2, a3?:A3 options?: Options) -> (a1?: A1, a2?: A2, a3?:A3, options?: Options & Ext)
-  : Params extends [a1?: infer A1, a2?: infer A2, a3?: infer A3, options?: infer Options, ...end: End]
-  ? [a1?: A1, a2?: A2, a3?: A3, options?: Options & Ext]
-  : never
+    : Params extends [a1: infer A1, options?: infer Options, ...end: End]
+      ? [a1: A1, options?: Options & Ext]
+    // (a1?: A1, options?: Options) -> (a1?: A1, options?: Options & Ext)
+      : Params extends [a1?: infer A1, options?: infer Options, ...end: End]
+        ? [a1?: A1, options?: Options & Ext]
+      // (a1: A1, a2: A2, options?: Options) -> (a1: A1, a2: A2 options?: Options & Ext)
+        : Params extends [a1: infer A1, a2: infer A2, options?: infer Options, ...end: End]
+          ? [a1: A1, a2: A2, options?: Options & Ext]
+        // (a1: A1, a2?: A2, options?: Options) -> (a1: A1, a2?: A2 options?: Options & Ext)
+          : Params extends [a1: infer A1, a2?: infer A2, options?: infer Options, ...end: End]
+            ? [a1: A1, a2?: A2, options?: Options & Ext]
+          // (a1: A1, a2?: A2, options?: Options) -> (a1: A1, a2?: A2 options?: Options & Ext)
+            : Params extends [a1?: infer A1, a2?: infer A2, options?: infer Options, ...end: End]
+              ? [a1?: A1, a2?: A2, options?: Options & Ext]
+            // (a1: A1, a2: A2, a3:A3 options?: Options) -> (a1: A1, a2: A2, a3:A3, options?: Options & Ext)
+              : Params extends [a1: infer A1, a2: infer A2, a3:infer A3, options?: infer Options, ...end: End]
+                ? [a1: A1, a2: A2, a3: A3, options?: Options & Ext]
+              // (a1: A1, a2: A2, a3?:A3 options?: Options) -> (a1: A1, a2: A2, a3?:A3, options?: Options & Ext)
+                : Params extends [a1: infer A1, a2:infer A2, a3?: infer A3, options?: infer Options, ...end: End]
+                  ? [a1: A1, a2: A2, a3?: A3, options?: Options & Ext]
+                // (a1: A1, a2?: A2, a3?:A3 options?: Options) -> (a1: A1, a2?: A2, a3?:A3, options?: Options & Ext)
+                  : Params extends [a1: infer A1, a2?: infer A2, a3?: infer A3, options?: infer Options, ...end: End]
+                    ? [a1: A1, a2?: A2, a3?: A3, options?: Options & Ext]
+                  // (a1?: A1, a2?: A2, a3?:A3 options?: Options) -> (a1?: A1, a2?: A2, a3?:A3, options?: Options & Ext)
+                    : Params extends [a1?: infer A1, a2?: infer A2, a3?: infer A3, options?: infer Options, ...end: End]
+                      ? [a1?: A1, a2?: A2, a3?: A3, options?: Options & Ext]
+                      : never
 
 export type APIMethodWithExtraOptions <
   API,
   Key extends keyof API,
   Extra
-  > = API[Key] extends (...args: any[]) => any ? APIWithExtraOptions<API[Key], Extra> : never
+> = API[Key] extends (...args: any[]) => any ? APIWithExtraOptions<API[Key], Extra> : never
diff --git a/packages/ipfs-http-client/src/lib/core.js b/packages/ipfs-http-client/src/lib/core.js
index 188576069a..3b8d2e315d 100644
--- a/packages/ipfs-http-client/src/lib/core.js
+++ b/packages/ipfs-http-client/src/lib/core.js
@@ -2,7 +2,7 @@
 /* eslint-env browser */
 const Multiaddr = require('multiaddr')
 const { isBrowser, isWebWorker, isNode } = require('ipfs-utils/src/env')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const log = require('debug')('ipfs-http-client:lib:error-handler')
 const HTTP = require('ipfs-utils/src/http')
 const merge = require('merge-options')
@@ -87,6 +87,7 @@ const errorHandler = async (response) => {
     msg = err.message
   }
 
+  /** @type {Error} */
   let error = new HTTP.HTTPError(response)
 
   // This is what go-ipfs returns where there's a timeout
@@ -160,7 +161,7 @@ class Client extends HTTP {
             out.append(kebabCase(key), value)
           }
 
-          // server timeouts are strings
+          // @ts-ignore server timeouts are strings
           if (key === 'timeout' && !isNaN(value)) {
             out.append(kebabCase(key), value)
           }
@@ -168,17 +169,26 @@ class Client extends HTTP {
 
         return out
       },
+      // @ts-ignore this can be a https agent or a http agent
       agent: opts.agent
     })
 
+    // @ts-ignore
     delete this.get
+    // @ts-ignore
     delete this.put
+    // @ts-ignore
     delete this.delete
+    // @ts-ignore
     delete this.options
 
     const fetch = this.fetch
 
     this.fetch = (resource, options = {}) => {
+      if (typeof resource === 'string' && !resource.startsWith('/')) {
+        resource = `${opts.url}/${resource}`
+      }
+
       return fetch.call(this, resource, merge(options, {
         method: 'POST'
       }))
diff --git a/packages/ipfs-http-client/src/lib/multipart-request.browser.js b/packages/ipfs-http-client/src/lib/multipart-request.browser.js
index 6c6ee87996..6e48cd80b7 100644
--- a/packages/ipfs-http-client/src/lib/multipart-request.browser.js
+++ b/packages/ipfs-http-client/src/lib/multipart-request.browser.js
@@ -4,7 +4,6 @@
 // version and fail.
 const normaliseInput = require('ipfs-core-utils/src/files/normalise-input/index.browser')
 const modeToString = require('./mode-to-string')
-const { File, FormData } = require('ipfs-utils/src/globalthis')
 
 async function multipartRequest (source = '', abortController, headers = {}) {
   const parts = []
diff --git a/packages/ipfs-http-client/src/object/data.js b/packages/ipfs-http-client/src/object/data.js
index 1987a3d391..dfc87e5bcc 100644
--- a/packages/ipfs-http-client/src/object/data.js
+++ b/packages/ipfs-http-client/src/object/data.js
@@ -17,6 +17,6 @@ module.exports = configure(api => {
     })
     const data = await res.arrayBuffer()
 
-    return new Uint8Array(data, data.byteOffset, data.byteLength)
+    return new Uint8Array(data, 0, data.byteLength)
   }
 })
diff --git a/packages/ipfs-http-client/src/object/patch/append-data.js b/packages/ipfs-http-client/src/object/patch/append-data.js
index e3e772a96f..6d71d8059f 100644
--- a/packages/ipfs-http-client/src/object/patch/append-data.js
+++ b/packages/ipfs-http-client/src/object/patch/append-data.js
@@ -13,6 +13,7 @@ module.exports = configure(api => {
     const controller = new AbortController()
     const signal = anySignal([controller.signal, options.signal])
 
+    // @ts-ignore https://github.com/ipfs/js-ipfs-utils/issues/90
     const res = await api.post('object/patch/append-data', {
       timeout: options.timeout,
       signal,
diff --git a/packages/ipfs-http-client/src/object/patch/set-data.js b/packages/ipfs-http-client/src/object/patch/set-data.js
index 207d8035f8..43eb55fa7b 100644
--- a/packages/ipfs-http-client/src/object/patch/set-data.js
+++ b/packages/ipfs-http-client/src/object/patch/set-data.js
@@ -13,6 +13,7 @@ module.exports = configure(api => {
     const controller = new AbortController()
     const signal = anySignal([controller.signal, options.signal])
 
+    // @ts-ignore https://github.com/ipfs/js-ipfs-utils/issues/90
     const { Hash } = await (await api.post('object/patch/set-data', {
       timeout: options.timeout,
       signal,
diff --git a/packages/ipfs-http-client/src/object/put.js b/packages/ipfs-http-client/src/object/put.js
index 65eff020c3..37d64f2bde 100644
--- a/packages/ipfs-http-client/src/object/put.js
+++ b/packages/ipfs-http-client/src/object/put.js
@@ -13,7 +13,6 @@ const uint8ArrayFromString = require('uint8arrays/from-string')
 module.exports = configure(api => {
   return async (obj, options = {}) => {
     let tmpObj = {
-      Data: null,
       Links: []
     }
 
@@ -52,6 +51,7 @@ module.exports = configure(api => {
     const controller = new AbortController()
     const signal = anySignal([controller.signal, options.signal])
 
+    // @ts-ignore https://github.com/ipfs/js-ipfs-utils/issues/90
     const res = await api.post('object/put', {
       timeout: options.timeout,
       signal,
diff --git a/packages/ipfs-http-client/src/pubsub/publish.js b/packages/ipfs-http-client/src/pubsub/publish.js
index 1a48f76e8c..93fd882c06 100644
--- a/packages/ipfs-http-client/src/pubsub/publish.js
+++ b/packages/ipfs-http-client/src/pubsub/publish.js
@@ -17,6 +17,7 @@ module.exports = configure(api => {
     const controller = new AbortController()
     const signal = anySignal([controller.signal, options.signal])
 
+    // @ts-ignore https://github.com/ipfs/js-ipfs-utils/issues/90
     const res = await api.post('pubsub/pub', {
       timeout: options.timeout,
       signal,
diff --git a/packages/ipfs-http-client/test/constructor.spec.js b/packages/ipfs-http-client/test/constructor.spec.js
index 004dcb2984..dc06022c4e 100644
--- a/packages/ipfs-http-client/test/constructor.spec.js
+++ b/packages/ipfs-http-client/test/constructor.spec.js
@@ -5,7 +5,6 @@ const multiaddr = require('multiaddr')
 const { expect } = require('aegir/utils/chai')
 const f = require('./utils/factory')()
 const ipfsClient = require('../src/index.js')
-const globalThis = require('ipfs-utils/src/globalthis')
 const { isBrowser } = require('ipfs-utils/src/env')
 
 describe('ipfs-http-client constructor tests', () => {
diff --git a/packages/ipfs-http-client/test/log.spec.js b/packages/ipfs-http-client/test/log.spec.js
index 814ff44887..c23e884537 100644
--- a/packages/ipfs-http-client/test/log.spec.js
+++ b/packages/ipfs-http-client/test/log.spec.js
@@ -5,6 +5,7 @@
 const { expect } = require('aegir/utils/chai')
 const uint8ArrayFromString = require('uint8arrays/from-string')
 const f = require('./utils/factory')()
+const first = require('it-first')
 
 describe('.log', function () {
   this.timeout(100 * 1000)
@@ -26,11 +27,10 @@ describe('.log', function () {
       }
     }, 1000)
 
-    for await (const message of ipfs.log.tail()) {
-      clearInterval(i)
-      expect(message).to.be.an('object')
-      break
-    }
+    const message = await first(ipfs.log.tail())
+
+    clearInterval(i)
+    expect(message).to.be.an('object')
   })
 
   it('.log.ls', async () => {
diff --git a/packages/ipfs-http-gateway/package.json b/packages/ipfs-http-gateway/package.json
index 0034451ac9..28c0439853 100644
--- a/packages/ipfs-http-gateway/package.json
+++ b/packages/ipfs-http-gateway/package.json
@@ -20,13 +20,12 @@
   },
   "scripts": {
     "lint": "aegir lint",
-    "build": "npm run build:types",
-    "build:types": "tsc --build",
+    "prepare": "aegir build --no-bundle",
     "test": "npm run test:node",
     "test:node": "aegir test -t node",
     "coverage": "nyc --reporter=text --reporter=lcov npm run test:node",
     "clean": "rimraf ./dist",
-    "dep-check": "aegir dep-check -i typescript -i rimraf"
+    "dep-check": "aegir dep-check -i rimraf"
   },
   "dependencies": {
     "@hapi/ammo": "^5.0.1",
@@ -42,14 +41,13 @@
     "it-to-stream": "^0.1.2",
     "joi": "^17.2.1",
     "multibase": "^3.0.0",
-    "uint8arrays": "^1.1.0",
+    "uint8arrays": "^2.0.5",
     "uri-to-multiaddr": "^4.0.0"
   },
   "devDependencies": {
-    "aegir": "^29.2.2",
+    "aegir": "^30.3.0",
     "file-type": "^16.0.0",
     "rimraf": "^3.0.2",
-    "sinon": "^9.0.3",
-    "typescript": "4.0.x"
+    "sinon": "^9.0.3"
   }
 }
diff --git a/packages/ipfs-http-server/package.json b/packages/ipfs-http-server/package.json
index 65d75fff04..5cc3b059a9 100644
--- a/packages/ipfs-http-server/package.json
+++ b/packages/ipfs-http-server/package.json
@@ -20,13 +20,12 @@
   },
   "scripts": {
     "lint": "aegir lint",
-    "build": "npm run build:types",
-    "build:types": "tsc --build",
+    "prepare": "aegir build --no-bundle",
     "test": "npm run test:node",
     "test:node": "aegir test -t node",
     "coverage": "nyc --reporter=text --reporter=lcov npm run test:node",
     "clean": "rimraf ./dist",
-    "dep-check": "aegir dep-check -i typescript -i ipfs-http-client -i rimraf"
+    "dep-check": "aegir dep-check -i ipfs-http-client -i rimraf"
   },
   "dependencies": {
     "@hapi/boom": "^9.1.0",
@@ -61,11 +60,11 @@
     "parse-duration": "^0.4.4",
     "stream-to-it": "^0.2.2",
     "streaming-iterables": "^5.0.2",
-    "uint8arrays": "^1.1.0",
+    "uint8arrays": "^2.0.5",
     "uri-to-multiaddr": "^4.0.0"
   },
   "devDependencies": {
-    "aegir": "^29.2.2",
+    "aegir": "^30.3.0",
     "form-data": "^3.0.0",
     "ipfs-http-client": "^48.2.2",
     "iso-random-stream": "^1.1.1",
@@ -73,8 +72,7 @@
     "qs": "^6.9.4",
     "rimraf": "^3.0.2",
     "sinon": "^9.0.3",
-    "stream-to-promise": "^3.0.0",
-    "typescript": "4.0.x"
+    "stream-to-promise": "^3.0.0"
   },
   "optionalDependencies": {
     "prom-client": "^12.0.0"
diff --git a/packages/ipfs-http-server/src/utils/joi.js b/packages/ipfs-http-server/src/utils/joi.js
index 80fb0347e0..346f1615a7 100644
--- a/packages/ipfs-http-server/src/utils/joi.js
+++ b/packages/ipfs-http-server/src/utils/joi.js
@@ -2,7 +2,7 @@
 
 const Joi = require('joi')
 const CID = require('cids')
-const parseDuration = require('parse-duration').default
+const { default: parseDuration } = require('parse-duration')
 const multiaddr = require('multiaddr')
 const multibase = require('multibase')
 const toCidAndPath = require('ipfs-core-utils/src/to-cid-and-path')
diff --git a/packages/ipfs-message-port-client/package.json b/packages/ipfs-message-port-client/package.json
index f9ee6927d1..b952aff94c 100644
--- a/packages/ipfs-message-port-client/package.json
+++ b/packages/ipfs-message-port-client/package.json
@@ -31,15 +31,12 @@
   },
   "scripts": {
     "test": "echo 'Only interface tests live here'",
-    "test:interface:message-port-client": "npm run build:test-worker && aegir test -t browser -f ./test/interface-message-port-client.js",
+    "test:interface:message-port-client": "npm run prepare && aegir test -t browser -f ./test/interface-message-port-client.js",
     "lint": "aegir lint",
-    "build:test-worker": "aegir build -- --config ./test/util/webpack.config.js",
-    "build": "npm run build:bundle && npm run build:types",
-    "build:bundle": "aegir build",
-    "build:types": "tsc --build",
+    "prepare": "aegir build --no-bundle && aegir build -- --config ./test/util/webpack.config.js",
     "coverage": "npx nyc -r html npm run test:node -- --bail",
     "clean": "rimraf ./dist",
-    "dep-check": "aegir dep-check -i typescript -i ipfs-core -i rimraf -i ipfs-core-types"
+    "dep-check": "aegir dep-check -i ipfs-core -i rimraf -i ipfs-core-types"
   },
   "dependencies": {
     "browser-readablestream-to-it": "^1.0.1",
@@ -47,19 +44,15 @@
     "ipfs-message-port-protocol": "^0.5.0"
   },
   "devDependencies": {
-    "aegir": "^29.2.2",
+    "aegir": "^30.3.0",
     "interface-ipfs-core": "^0.143.1",
     "ipfs": "^0.53.2",
     "ipfs-core": "^0.4.2",
     "ipfs-message-port-server": "^0.5.0",
-    "rimraf": "^3.0.2",
-    "typescript": "4.0.x"
+    "rimraf": "^3.0.2"
   },
   "engines": {
     "node": ">=10.3.0",
     "npm": ">=3.0.0"
-  },
-  "contributors": [
-    "Irakli Gozalishvili <dev@gozala.io>"
-  ]
+  }
 }
diff --git a/packages/ipfs-message-port-client/src/index.js b/packages/ipfs-message-port-client/src/index.js
index adfa0c8ae9..205298b822 100644
--- a/packages/ipfs-message-port-client/src/index.js
+++ b/packages/ipfs-message-port-client/src/index.js
@@ -8,8 +8,6 @@ const CoreClient = require('./core')
 const FilesClient = require('./files')
 
 /**
- * @typedef {import('./client').MessageTransport} MessageTransport
- *
  * @typedef {Object} ClientOptions
  * @property {MessagePort} port
  */
diff --git a/packages/ipfs-message-port-client/src/interface.ts b/packages/ipfs-message-port-client/src/interface.ts
index 6258fbd835..d70df28957 100644
--- a/packages/ipfs-message-port-client/src/interface.ts
+++ b/packages/ipfs-message-port-client/src/interface.ts
@@ -13,46 +13,45 @@
  */
 // This is typed in TS file because otherwise TS unifies on the first parameter
 // regardless of number of parameters function has.
-export type APIWithExtraOptions<API extends (...args: any[]) => any, Extra> =
-  (...args: WithExtendedOptions<Parameters<API>, Extra>) => ReturnType<API>
+export interface APIWithExtraOptions<API extends (...args: any[]) => any, Extra> { (...args: WithExtendedOptions<Parameters<API>, Extra>): ReturnType<API> }
 
 type End = never[]
 type WithExtendedOptions<Params, Ext> = Params extends [...End]
   ? []
   // (options?: Options) -> (options?: Options & Ext)
   : Params extends [options?: infer Options, ...end: End]
-  ? [options?: Options & Ext]
+    ? [options?: Options & Ext]
   // (a: A1, options?: Options) -> (a1: A1, options?: Options & Ext)
-  : Params extends [a1: infer A1, options?: infer Options, ...end: End]
-  ? [a1: A1, options?: Options & Ext]
-  // (a1?: A1, options?: Options) -> (a1?: A1, options?: Options & Ext)
-  : Params extends [a1?: infer A1, options?: infer Options, ...end: End]
-  ? [a1?: A1, options?: Options & Ext]
-  // (a1: A1, a2: A2, options?: Options) -> (a1: A1, a2: A2 options?: Options & Ext)
-  : Params extends [a1: infer A1, a2: infer A2, options?: infer Options, ...end: End]
-  ? [a1: A1, a2: A2, options?: Options & Ext]
-  // (a1: A1, a2?: A2, options?: Options) -> (a1: A1, a2?: A2 options?: Options & Ext)
-  : Params extends [a1: infer A1, a2?: infer A2, options?: infer Options, ...end: End]
-  ? [a1: A1, a2?: A2, options?: Options & Ext]
-  // (a1: A1, a2?: A2, options?: Options) -> (a1: A1, a2?: A2 options?: Options & Ext)
-  : Params extends [a1?: infer A1, a2?: infer A2, options?: infer Options, ...end: End]
-  ? [a1?: A1, a2?: A2, options?: Options & Ext]
-  // (a1: A1, a2: A2, a3:A3 options?: Options) -> (a1: A1, a2: A2, a3:A3, options?: Options & Ext)
-  : Params extends [a1: infer A1, a2: infer A2, a3:infer A3, options?: infer Options, ...end: End]
-  ? [a1: A1, a2: A2, a3: A3, options?: Options & Ext]
-  // (a1: A1, a2: A2, a3?:A3 options?: Options) -> (a1: A1, a2: A2, a3?:A3, options?: Options & Ext)
-  : Params extends [a1: infer A1, a2:infer A2, a3?: infer A3, options?: infer Options, ...end: End]
-  ? [a1: A1, a2: A2, a3?: A3, options?: Options & Ext]
-  // (a1: A1, a2?: A2, a3?:A3 options?: Options) -> (a1: A1, a2?: A2, a3?:A3, options?: Options & Ext)
-  : Params extends [a1: infer A1, a2?: infer A2, a3?: infer A3, options?: infer Options, ...end: End]
-  ? [a1: A1, a2?: A2, a3?: A3, options?: Options & Ext]
-  // (a1?: A1, a2?: A2, a3?:A3 options?: Options) -> (a1?: A1, a2?: A2, a3?:A3, options?: Options & Ext)
-  : Params extends [a1?: infer A1, a2?: infer A2, a3?: infer A3, options?: infer Options, ...end: End]
-  ? [a1?: A1, a2?: A2, a3?: A3, options?: Options & Ext]
-  : never
+    : Params extends [a1: infer A1, options?: infer Options, ...end: End]
+      ? [a1: A1, options?: Options & Ext]
+    // (a1?: A1, options?: Options) -> (a1?: A1, options?: Options & Ext)
+      : Params extends [a1?: infer A1, options?: infer Options, ...end: End]
+        ? [a1?: A1, options?: Options & Ext]
+      // (a1: A1, a2: A2, options?: Options) -> (a1: A1, a2: A2 options?: Options & Ext)
+        : Params extends [a1: infer A1, a2: infer A2, options?: infer Options, ...end: End]
+          ? [a1: A1, a2: A2, options?: Options & Ext]
+        // (a1: A1, a2?: A2, options?: Options) -> (a1: A1, a2?: A2 options?: Options & Ext)
+          : Params extends [a1: infer A1, a2?: infer A2, options?: infer Options, ...end: End]
+            ? [a1: A1, a2?: A2, options?: Options & Ext]
+          // (a1: A1, a2?: A2, options?: Options) -> (a1: A1, a2?: A2 options?: Options & Ext)
+            : Params extends [a1?: infer A1, a2?: infer A2, options?: infer Options, ...end: End]
+              ? [a1?: A1, a2?: A2, options?: Options & Ext]
+            // (a1: A1, a2: A2, a3:A3 options?: Options) -> (a1: A1, a2: A2, a3:A3, options?: Options & Ext)
+              : Params extends [a1: infer A1, a2: infer A2, a3:infer A3, options?: infer Options, ...end: End]
+                ? [a1: A1, a2: A2, a3: A3, options?: Options & Ext]
+              // (a1: A1, a2: A2, a3?:A3 options?: Options) -> (a1: A1, a2: A2, a3?:A3, options?: Options & Ext)
+                : Params extends [a1: infer A1, a2:infer A2, a3?: infer A3, options?: infer Options, ...end: End]
+                  ? [a1: A1, a2: A2, a3?: A3, options?: Options & Ext]
+                // (a1: A1, a2?: A2, a3?:A3 options?: Options) -> (a1: A1, a2?: A2, a3?:A3, options?: Options & Ext)
+                  : Params extends [a1: infer A1, a2?: infer A2, a3?: infer A3, options?: infer Options, ...end: End]
+                    ? [a1: A1, a2?: A2, a3?: A3, options?: Options & Ext]
+                  // (a1?: A1, a2?: A2, a3?:A3 options?: Options) -> (a1?: A1, a2?: A2, a3?:A3, options?: Options & Ext)
+                    : Params extends [a1?: infer A1, a2?: infer A2, a3?: infer A3, options?: infer Options, ...end: End]
+                      ? [a1?: A1, a2?: A2, a3?: A3, options?: Options & Ext]
+                      : never
 
 export type APIMethodWithExtraOptions <
   API,
   Key extends keyof API,
   Extra
-  > = API[Key] extends (...args: any[]) => any ? APIWithExtraOptions<API[Key], Extra> : never
+> = API[Key] extends (...args: any[]) => any ? APIWithExtraOptions<API[Key], Extra> : never
diff --git a/packages/ipfs-message-port-protocol/package.json b/packages/ipfs-message-port-protocol/package.json
index b2abb2dd32..9ce71ab175 100644
--- a/packages/ipfs-message-port-protocol/package.json
+++ b/packages/ipfs-message-port-protocol/package.json
@@ -34,28 +34,22 @@
     "test:chrome": "aegir test -t browser -t webworker -- --browsers ChromeHeadless",
     "test:firefox": "aegir test -t browser -t webworker -- --browsers FirefoxHeadless",
     "lint": "aegir lint",
-    "build": "npm run build:bundle && npm run build:types",
-    "build:bundle": "aegir build",
-    "build:types": "tsc --build",
+    "prepare": "aegir build --no-bundle",
     "coverage": "npx nyc -r html npm run test:node -- --bail",
     "clean": "rimraf ./dist",
-    "dep-check": "aegir dep-check -i typescript -i rimraf"
+    "dep-check": "aegir dep-check -i rimraf"
   },
   "dependencies": {
     "cids": "^1.1.5",
     "ipld-block": "^0.11.0"
   },
   "devDependencies": {
-    "aegir": "^29.2.2",
+    "aegir": "^30.3.0",
     "rimraf": "^3.0.2",
-    "typescript": "4.0.x",
-    "uint8arrays": "^1.1.0"
+    "uint8arrays": "^2.0.5"
   },
   "engines": {
     "node": ">=10.3.0",
     "npm": ">=3.0.0"
-  },
-  "contributors": [
-    "Irakli Gozalishvili <dev@gozala.io>"
-  ]
+  }
 }
diff --git a/packages/ipfs-message-port-protocol/src/data.ts b/packages/ipfs-message-port-protocol/src/data.ts
index 91b31b04e5..fd0beb8de6 100644
--- a/packages/ipfs-message-port-protocol/src/data.ts
+++ b/packages/ipfs-message-port-protocol/src/data.ts
@@ -1,5 +1,5 @@
-export type JSONObject = { [key: string]: JSONValue }
-export type JSONArray = Array<JSONValue>
+export interface JSONObject { [key: string]: JSONValue }
+export type JSONArray = JSONValue[]
 export type JSONValue =
   | null
   | boolean
@@ -8,15 +8,15 @@ export type JSONValue =
   | JSONArray
   | JSONObject
 
-export type Encoded<_Data, Representation> = Representation
+export type Encoded<_Data, Representation> = Representation // eslint-disable-line @typescript-eslint/no-unused-vars
 export type StringEncoded<T> = Encoded<T, string>
 
-export type UnixFSTime = {
+export interface UnixFSTime {
   secs: number
   nsecs: number
 }
 
-export type LooseUnixFSTime = {
+export interface LooseUnixFSTime {
   secs: number
   nsecs?: number
 }
@@ -29,9 +29,9 @@ export type HashAlg = string
 export type FileType = 'directory' | 'file'
 export type CIDVersion = 0 | 1
 
-export type Result<X, T> = { ok: true; value: T } | { ok: false; error: X }
+export type Result<X, T> = { ok: true, value: T } | { ok: false, error: X }
 
-export type EncodedError = {
+export interface EncodedError {
   message: string
   name: string
   stack: string
diff --git a/packages/ipfs-message-port-protocol/src/rpc.ts b/packages/ipfs-message-port-protocol/src/rpc.ts
index 51c9c045e8..6a1d571465 100644
--- a/packages/ipfs-message-port-protocol/src/rpc.ts
+++ b/packages/ipfs-message-port-protocol/src/rpc.ts
@@ -1,6 +1,6 @@
 export type Procedure<T> = T extends (arg: infer I) => infer O
   ? (query: I & QueryOptions) => Return<O>
-  : void
+  : undefined
 
 export type Remote<T extends Record<string, unknown>> = {
   [K in keyof T]: Procedure<T[K]>
@@ -10,21 +10,21 @@ type Return<T> = T extends Promise<infer U>
   ? Promise<U & TransferOptions>
   : Promise<T & TransferOptions>
 
-export type QueryOptions = {
+export interface QueryOptions {
   signal?: AbortSignal
   timeout?: number
   transfer?: Transferable[]
 }
 
-export type TransferOptions = {
+export interface TransferOptions {
   transfer?: Transferable[]
 }
 
 export type NonUndefined<A> = A extends undefined ? never : A
 
-export type ProcedureNames<T extends Record<string, unknown>> = {
+export type ProcedureNames<T extends Record<string, unknown>> = Array<{
   [K in keyof T]-?: NonUndefined<T[K]> extends Function ? K : never // eslint-disable-line @typescript-eslint/ban-types
-}[keyof T][]
+}[keyof T]>
 
 /**
  * Any method name of the associated with RPC service.
@@ -43,27 +43,27 @@ export type Inn<T extends Record<string, unknown>> = ServiceQuery<T>['input']
 export type Out<T extends Record<string, unknown>> = ServiceQuery<T>['result']
 
 export type RPCQuery<T extends Record<string, unknown>> = Pick<
-  ServiceQuery<T>,
-  'method' | 'namespace' | 'input' | 'timeout' | 'signal'
+ServiceQuery<T>,
+'method' | 'namespace' | 'input' | 'timeout' | 'signal'
 >
 
 export type ServiceQuery<T> = Values<
-  {
-    [NS in keyof T]: NamespacedQuery<T[NS], NS>
-  }
+{
+  [NS in keyof T]: NamespacedQuery<T[NS], NS>
+}
 >
 
 export type NamespacedQuery<S, NS> = Values<
-  {
-    [M in keyof S]-?: S[M] extends (input: infer I) => infer O
-      ? {
-          namespace: NS
-          method: M
-          input: I & QueryOptions
-          result: R<O>
-        } & QueryOptions
-      : never
-  }
+{
+  [M in keyof S]-?: S[M] extends (input: infer I) => infer O
+    ? {
+      namespace: NS
+      method: M
+      input: I & QueryOptions
+      result: R<O>
+    } & QueryOptions
+    : never
+}
 >
 
 type R<O> = O extends Promise<infer T>
@@ -73,13 +73,13 @@ type R<O> = O extends Promise<infer T>
 type WithTransferOptions<O> = O extends Record<string, unknown> ? O & TransferOptions : O
 
 export type MultiService <T> = {
-  [NS in keyof T]: NamespacedService<NS, T[NS]>
+  [NS in keyof T]: NamespacedService<T[NS]>
 }
 
-type NamespacedService<NS, S> = {
-  [M in keyof S]: NamespacedMethod<NS, S, S[M]>
+type NamespacedService<S> = {
+  [M in keyof S]: NamespacedMethod<S[M]>
 }
 
-export type NamespacedMethod<NS, M, T> = T extends (arg: infer I) => infer O
+export type NamespacedMethod<T> = T extends (arg: infer I) => infer O
   ? (query: I & QueryOptions) => Return<O>
   : never
diff --git a/packages/ipfs-message-port-server/package.json b/packages/ipfs-message-port-server/package.json
index 760eb9a60c..d4cf2d4107 100644
--- a/packages/ipfs-message-port-server/package.json
+++ b/packages/ipfs-message-port-server/package.json
@@ -36,30 +36,22 @@
     "test:chrome": "aegir test -t browser -t webworker -- --browsers ChromeHeadless",
     "test:firefox": "aegir test -t browser -t webworker -- --browsers FirefoxHeadless",
     "lint": "aegir lint",
-    "build": "npm run build:bundle && npm run build:types",
-    "build:bundle": "aegir build",
-    "build:types": "tsc --build",
+    "prepare": "aegir build --no-bundle",
     "coverage": "npx nyc -r html npm run test:node -- --bail",
     "clean": "rimraf ./dist",
-    "dep-check": "aegir dep-check -i @types/* -i typescript -i rimraf"
+    "dep-check": "aegir dep-check -i rimraf"
   },
   "dependencies": {
     "ipfs-message-port-protocol": "^0.5.0",
     "it-all": "^1.0.4"
   },
   "devDependencies": {
-    "@types/it-all": "^1.0.0",
-    "aegir": "^29.2.2",
+    "aegir": "^30.3.0",
     "cids": "^1.1.5",
-    "ipfs-utils": "^5.0.0",
-    "rimraf": "^3.0.2",
-    "typescript": "4.0.x"
+    "rimraf": "^3.0.2"
   },
   "engines": {
     "node": ">=10.3.0",
     "npm": ">=3.0.0"
-  },
-  "contributors": [
-    "Irakli Gozalishvili <dev@gozala.io>"
-  ]
+  }
 }
diff --git a/packages/ipfs-message-port-server/src/block.js b/packages/ipfs-message-port-server/src/block.js
index 14071394ef..0e19ec581a 100644
--- a/packages/ipfs-message-port-server/src/block.js
+++ b/packages/ipfs-message-port-server/src/block.js
@@ -55,7 +55,7 @@ exports.BlockService = class BlockService {
    *
    * @typedef {Object} PutQuery
    * @property {EncodedBlock|Uint8Array} block
-   * @property {EncodedCID|void} [cid]
+   * @property {EncodedCID|undefined} [cid]
    * @property {string} [format]
    * @property {string} [mhtype]
    * @property {number} [mhlen]
@@ -71,12 +71,20 @@ exports.BlockService = class BlockService {
    */
   async put (query) {
     const input = query.block
+    let result
     /** @type {Uint8Array|Block} */
-    const block = input instanceof Uint8Array ? input : decodeBlock(input)
-    const result = await this.ipfs.block.put(block, {
-      ...query,
-      cid: query.cid ? decodeCID(query.cid) : query.cid
-    })
+    if (input instanceof Uint8Array) {
+      result = await this.ipfs.block.put(input, {
+        ...query,
+        cid: query.cid ? decodeCID(query.cid) : query.cid
+      })
+    } else {
+      const block = decodeBlock(input)
+      result = await this.ipfs.block.put(block, {
+        ...query,
+        cid: undefined
+      })
+    }
 
     /** @type {Transferable[]} */
     const transfer = []
diff --git a/packages/ipfs-message-port-server/src/ipfs.ts b/packages/ipfs-message-port-server/src/ipfs.ts
index a9d23efd5d..765a4087e5 100644
--- a/packages/ipfs-message-port-server/src/ipfs.ts
+++ b/packages/ipfs-message-port-server/src/ipfs.ts
@@ -7,7 +7,6 @@ import {
   Time,
   CIDVersion
 } from 'ipfs-message-port-protocol/src/data'
-import { EncodedCID } from './block'
 import { ReadStream } from 'fs'
 
 type Mode = string | number
@@ -18,7 +17,7 @@ export interface IPFS extends Core {
 }
 
 export interface IPFSFactory {
-  create(): Promise<IPFS>
+  create: () => Promise<IPFS>
 }
 
 export interface AbortOptions {
@@ -27,15 +26,15 @@ export interface AbortOptions {
 }
 
 export interface PutOptions extends AbortOptions {
-  format?: string | void
-  hashAlg?: string | void
-  cid?: CID | void
+  format?: string | undefined
+  hashAlg?: string | undefined
+  cid?: CID | undefined
   preload?: boolean
   pin?: boolean
 }
 
 export interface GetOptions extends AbortOptions {
-  path?: string,
+  path?: string
   localResolve?: boolean
 }
 
@@ -44,23 +43,23 @@ export interface ResolveOptions extends AbortOptions {
 }
 
 export interface TreeOptions extends AbortOptions {
-  path?: string,
+  path?: string
   recursive?: boolean
 }
 
 export interface DAG {
-  put(dagNode: DAGNode, options: PutOptions): Promise<CID>
-  get(cid: CID, options: GetOptions): Promise<{ value: DAGNode; remainderPath: string }>
-  resolve(pathOrCID: string | CID, options: ResolveOptions): Promise<{ cid: CID, remainderPath: string }>
-  tree(cid: CID, options: TreeOptions): AsyncIterable<string>
+  put: (dagNode: DAGNode, options: PutOptions) => Promise<CID>
+  get: (cid: CID, options: GetOptions) => Promise<{ value: DAGNode, remainderPath: string }>
+  resolve: (pathOrCID: string | CID, options: ResolveOptions) => Promise<{ cid: CID, remainderPath: string }>
+  tree: (cid: CID, options: TreeOptions) => AsyncIterable<string>
 }
 
 export interface Core {
-  addAll(inputs: AddAllInput, options: AddOptions): AsyncIterable<FileOutput>
-  add(input: AddInput, options: AddOptions): Promise<FileOutput>
-  cat(ipfsPath: CID | string, options: CatOptions): AsyncIterable<Uint8Array>
+  addAll: (inputs: AddAllInput, options: AddOptions) => AsyncIterable<FileOutput>
+  add: (input: AddInput, options: AddOptions) => Promise<FileOutput>
+  cat: (ipfsPath: CID | string, options: CatOptions) => AsyncIterable<Uint8Array>
 
-  ls(ipfsPath: CID | string, options: CoreLsOptions): AsyncIterable<LsEntry>
+  ls: (ipfsPath: CID | string, options: CoreLsOptions) => AsyncIterable<LsEntry>
 }
 
 export interface AddOptions extends AbortOptions {
@@ -77,18 +76,18 @@ export interface AddOptions extends AbortOptions {
   wrapWithDirectory?: boolean
 }
 
-export type FileInput = {
+export interface FileInput {
   path?: string
   content?: FileContent
-  mode?: string | number | void
+  mode?: string | number | undefined
   mtime?: Time
 }
 
-export type FileOutput = {
+export interface FileOutput {
   path: string
   cid: CID
   mode: number
-  mtime: { secs: number; nsecs: number }
+  mtime: { secs: number, nsecs: number }
   size: number
 }
 
@@ -103,17 +102,17 @@ interface CoreLsOptions extends AbortOptions {
 }
 
 export interface Files {
-  chmod(path: string | CID, mode: Mode, options?: ChmodOptions): Promise<void>
+  chmod: (path: string | CID, mode: Mode, options?: ChmodOptions) => Promise<void>
 
-  write(
+  write: (
     path: string,
     content: WriteContent,
     options?: WriteOptions
-  ): Promise<WriteResult>
+  ) => Promise<WriteResult>
 
-  ls(path?: string, opitons?: LsOptions): AsyncIterable<LsEntry>
+  ls: (path?: string, opitons?: LsOptions) => AsyncIterable<LsEntry>
 
-  stat(path: string, options?: StatOptions): Promise<Stat>
+  stat: (path: string, options?: StatOptions) => Promise<Stat>
 }
 
 export interface ChmodOptions extends AbortOptions {
@@ -127,7 +126,7 @@ interface LsOptions extends AbortOptions {
   sort?: boolean
 }
 
-export type LsEntry = {
+export interface LsEntry {
   name: string
   path: string
   type: FileType
@@ -144,7 +143,7 @@ export interface StatOptions extends AbortOptions {
   withLocal?: boolean
 }
 
-export type Stat = {
+export interface Stat {
   cid: CID
   size: number
   cumulativeSize: number
@@ -174,7 +173,7 @@ export type AddAllInput =
   | Iterable<AddInput>
   | AsyncIterable<AddInput>
 
-export type FileObject = {
+export interface FileObject {
   path?: string
   content?: FileContent
   mode?: Mode
@@ -203,7 +202,7 @@ export interface WriteOptions extends AbortOptions {
   cidVersion?: CIDVersion
 }
 
-export type WriteResult = {
+export interface WriteResult {
   cid: CID
   size: number
 }
@@ -214,17 +213,16 @@ export interface Block {
 }
 
 export interface BlockService {
-  get(cid: CID, options?: GetBlockOptions): Promise<Block>
-  put(block: Block, options?: PutBlockOptions): Promise<Block>
-  put(buffer: Uint8Array, options?: PutBufferOptions): Promise<Block>
-  rm(
+  get: (cid: CID, options?: GetBlockOptions) => Promise<Block>
+  put: ((block: Uint8Array, options?: PutBufferOptions) => Promise<Block>) & ((buffer: Uint8Array, options?: PutBufferOptions) => Promise<Block>)
+  rm: (
     cid: CID | CID[],
     options?: RmBlockOptions
-  ): AsyncIterable<{ cid: CID; error?: Error }>
-  stat(
+  ) => AsyncIterable<{ cid: CID, error?: Error }>
+  stat: (
     cid: CID,
     options?: StatBlockOptions
-  ): Promise<{ cid: CID; size: number }>
+  ) => Promise<{ cid: CID, size: number }>
 }
 
 export interface GetBlockOptions extends AbortOptions { } // eslint-disable-line @typescript-eslint/no-empty-interface
@@ -236,7 +234,7 @@ export interface PutBlockOptions extends AbortOptions {
   pin?: boolean
 }
 export interface PutBufferOptions extends PutBlockOptions {
-  cid?: EncodedCID | void
+  cid?: CID | undefined
 }
 
 export interface RmBlockOptions extends AbortOptions {
diff --git a/packages/ipfs-message-port-server/test/transfer.spec.js b/packages/ipfs-message-port-server/test/transfer.spec.js
index 4b1903c1ef..bf6092960b 100644
--- a/packages/ipfs-message-port-server/test/transfer.spec.js
+++ b/packages/ipfs-message-port-server/test/transfer.spec.js
@@ -2,7 +2,6 @@
 
 /* eslint-env mocha */
 const { encodeCID } = require('ipfs-message-port-protocol/src/cid')
-const globalThis = require('ipfs-utils/src/globalthis')
 
 const CID = require('cids')
 const { Server } = require('../src/server')
diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json
index 27ba8bbd5c..76828f751d 100644
--- a/packages/ipfs/package.json
+++ b/packages/ipfs/package.json
@@ -23,9 +23,8 @@
   },
   "scripts": {
     "lint": "aegir lint",
-    "build": "npm run build:bundle && npm run build:types",
-    "build:bundle": "aegir build",
-    "build:types": "tsc --build",
+    "prepare": "aegir build --no-bundle",
+    "build": "aegir build",
     "test": "echo 'Only interface tests live here'",
     "test:interface:core": "aegir test -f test/interface-core.js",
     "test:interface:client": "aegir test -f test/interface-client.js",
@@ -35,32 +34,31 @@
     "test:external": "aegir test-dependant",
     "coverage": "nyc --reporter=text --reporter=lcov npm run test:interface:core -- -t node",
     "clean": "rimraf ./dist",
-    "dep-check": "aegir dep-check -i cross-env -i typescript -i ipfs-interop -i electron-webrtc -i wrtc -i rimraf"
+    "dep-check": "aegir dep-check -i cross-env -i ipfs-interop -i electron-webrtc -i wrtc -i rimraf"
   },
   "dependencies": {
     "debug": "^4.1.1",
     "ipfs-cli": "^0.3.2",
     "ipfs-core": "^0.4.2",
-    "ipfs-repo": "^7.0.0",
+    "ipfs-repo": "^8.0.0",
     "semver": "^7.3.2",
     "update-notifier": "^5.0.0"
   },
   "devDependencies": {
-    "aegir": "^29.2.2",
+    "aegir": "^30.3.0",
     "cross-env": "^7.0.0",
     "electron-webrtc": "^0.3.0",
     "go-ipfs": "0.8.0-rc2",
     "interface-ipfs-core": "^0.143.1",
     "ipfs-client": "^0.2.2",
     "ipfs-http-client": "^48.2.2",
-    "ipfs-interop": "^4.0.1",
-    "ipfs-utils": "^5.0.0",
+    "ipfs-interop": "^4.0.2",
+    "ipfs-utils": "^6.0.0",
     "ipfsd-ctl": "^7.2.0",
     "iso-url": "^1.0.0",
-    "libp2p-webrtc-star": "^0.20.1",
-    "merge-options": "^2.0.0",
+    "libp2p-webrtc-star": "^0.21.0",
+    "merge-options": "^3.0.4",
     "rimraf": "^3.0.2",
-    "typescript": "4.0.x",
     "wrtc": "^0.4.6",
     "mock-ipfs-pinning-service": "^0.1.2"
   },
diff --git a/packages/ipfs/test/interface-client.js b/packages/ipfs/test/interface-client.js
index ff6ae19223..63e69d6b8c 100644
--- a/packages/ipfs/test/interface-client.js
+++ b/packages/ipfs/test/interface-client.js
@@ -39,16 +39,18 @@ describe('interface-ipfs-core ipfs-client tests', () => {
     }, {
       name: '.files.flush',
       reason: 'not implemented'
-    }].concat(isNode ? [] : [{
-      name: 'should make directory and specify mtime as hrtime',
-      reason: 'Not designed to run in the browser'
-    }, {
-      name: 'should set mtime as hrtime',
-      reason: 'Not designed to run in the browser'
-    }, {
-      name: 'should write file and specify mtime as hrtime',
-      reason: 'Not designed to run in the browser'
-    }])
+    }].concat(isNode
+      ? []
+      : [{
+          name: 'should make directory and specify mtime as hrtime',
+          reason: 'Not designed to run in the browser'
+        }, {
+          name: 'should set mtime as hrtime',
+          reason: 'Not designed to run in the browser'
+        }, {
+          name: 'should write file and specify mtime as hrtime',
+          reason: 'Not designed to run in the browser'
+        }])
   })
 
   tests.root(commonFactory, {
diff --git a/packages/ipfs/test/interface-core.js b/packages/ipfs/test/interface-core.js
index 3651c02108..6e220dcd80 100644
--- a/packages/ipfs/test/interface-core.js
+++ b/packages/ipfs/test/interface-core.js
@@ -11,10 +11,12 @@ describe('interface-ipfs-core tests', function () {
   const commonFactory = factory()
 
   tests.root(commonFactory, {
-    skip: isNode ? [] : [{
-      name: 'should add with mtime as hrtime',
-      reason: 'Not designed to run in the browser'
-    }]
+    skip: isNode
+      ? []
+      : [{
+          name: 'should add with mtime as hrtime',
+          reason: 'Not designed to run in the browser'
+        }]
   })
 
   tests.bitswap(commonFactory)
@@ -34,16 +36,18 @@ describe('interface-ipfs-core tests', function () {
   })
 
   tests.files(factory(), {
-    skip: isNode ? null : [{
-      name: 'should make directory and specify mtime as hrtime',
-      reason: 'Not designed to run in the browser'
-    }, {
-      name: 'should set mtime as hrtime',
-      reason: 'Not designed to run in the browser'
-    }, {
-      name: 'should write file and specify mtime as hrtime',
-      reason: 'Not designed to run in the browser'
-    }]
+    skip: isNode
+      ? null
+      : [{
+          name: 'should make directory and specify mtime as hrtime',
+          reason: 'Not designed to run in the browser'
+        }, {
+          name: 'should set mtime as hrtime',
+          reason: 'Not designed to run in the browser'
+        }, {
+          name: 'should write file and specify mtime as hrtime',
+          reason: 'Not designed to run in the browser'
+        }]
   })
 
   tests.key(commonFactory)
@@ -83,23 +87,25 @@ describe('interface-ipfs-core tests', function () {
     }
   }), {
     skip: [
-      ...(isNode ? [] : [
-        {
-          name: 'should receive messages from a different node',
-          reason: 'https://github.com/ipfs/js-ipfs/issues/2662'
-        },
-        {
-          name: 'should round trip a non-utf8 binary buffer',
-          reason: 'https://github.com/ipfs/js-ipfs/issues/2662'
-        },
-        {
-          name: 'should receive multiple messages',
-          reason: 'https://github.com/ipfs/js-ipfs/issues/2662'
-        },
-        {
-          name: 'should send/receive 100 messages',
-          reason: 'https://github.com/ipfs/js-ipfs/issues/2662'
-        }])
+      ...(isNode
+        ? []
+        : [
+            {
+              name: 'should receive messages from a different node',
+              reason: 'https://github.com/ipfs/js-ipfs/issues/2662'
+            },
+            {
+              name: 'should round trip a non-utf8 binary buffer',
+              reason: 'https://github.com/ipfs/js-ipfs/issues/2662'
+            },
+            {
+              name: 'should receive multiple messages',
+              reason: 'https://github.com/ipfs/js-ipfs/issues/2662'
+            },
+            {
+              name: 'should send/receive 100 messages',
+              reason: 'https://github.com/ipfs/js-ipfs/issues/2662'
+            }])
     ]
   })
 
diff --git a/packages/ipfs/test/interface-http-go.js b/packages/ipfs/test/interface-http-go.js
index e381690195..add166de8b 100644
--- a/packages/ipfs/test/interface-http-go.js
+++ b/packages/ipfs/test/interface-http-go.js
@@ -604,17 +604,16 @@ describe('interface-ipfs-core over ipfs-http-client tests against go-ipfs', () =
       args: ['--enable-pubsub-experiment']
     }
   }), {
-    skip: isWindows ? [
-      // pubsub.subscribe
-      {
-        name: 'should send/receive 100 messages',
-        reason: 'FIXME https://github.com/ipfs/interface-ipfs-core/pull/188#issuecomment-354673246 and https://github.com/ipfs/go-ipfs/issues/4778'
-      },
-      {
-        name: 'should receive multiple messages',
-        reason: 'FIXME https://github.com/ipfs/interface-ipfs-core/pull/188#issuecomment-354673246 and https://github.com/ipfs/go-ipfs/issues/4778'
-      }
-    ] : null
+    skip: isWindows
+      ? [{
+          name: 'should send/receive 100 messages',
+          reason: 'FIXME https://github.com/ipfs/interface-ipfs-core/pull/188#issuecomment-354673246 and https://github.com/ipfs/go-ipfs/issues/4778'
+        },
+        {
+          name: 'should receive multiple messages',
+          reason: 'FIXME https://github.com/ipfs/interface-ipfs-core/pull/188#issuecomment-354673246 and https://github.com/ipfs/go-ipfs/issues/4778'
+        }]
+      : null
   })
 
   tests.repo(commonFactory)
diff --git a/packages/ipfs/test/interface-http-js.js b/packages/ipfs/test/interface-http-js.js
index 8126c739f3..912d854388 100644
--- a/packages/ipfs/test/interface-http-js.js
+++ b/packages/ipfs/test/interface-http-js.js
@@ -24,16 +24,18 @@ describe('interface-ipfs-core over ipfs-http-client tests against js-ipfs', func
         name: 'should error during add-all stream',
         reason: 'Not supported by http'
       }]
-      .concat(isNode ? [{
-        name: 'should fail when passed invalid input',
-        reason: 'node-fetch cannot detect errors in streaming bodies - https://github.com/node-fetch/node-fetch/issues/753'
-      }, {
-        name: 'should not add from an invalid url',
-        reason: 'node-fetch cannot detect errors in streaming bodies - https://github.com/node-fetch/node-fetch/issues/753'
-      }] : [{
-        name: 'should add with mtime as hrtime',
-        reason: 'Not designed to run in the browser'
-      }])
+      .concat(isNode
+        ? [{
+            name: 'should fail when passed invalid input',
+            reason: 'node-fetch cannot detect errors in streaming bodies - https://github.com/node-fetch/node-fetch/issues/753'
+          }, {
+            name: 'should not add from an invalid url',
+            reason: 'node-fetch cannot detect errors in streaming bodies - https://github.com/node-fetch/node-fetch/issues/753'
+          }]
+        : [{
+            name: 'should add with mtime as hrtime',
+            reason: 'Not designed to run in the browser'
+          }])
   })
 
   tests.bitswap(commonFactory)
@@ -61,16 +63,18 @@ describe('interface-ipfs-core over ipfs-http-client tests against js-ipfs', func
   })
 
   tests.files(commonFactory, {
-    skip: isBrowser || isWebWorker ? [{
-      name: 'should make directory and specify mtime as hrtime',
-      reason: 'Not designed to run in the browser'
-    }, {
-      name: 'should write file and specify mtime as hrtime',
-      reason: 'Not designed to run in the browser'
-    }, {
-      name: 'should set mtime as hrtime',
-      reason: 'Not designed to run in the browser'
-    }] : []
+    skip: isBrowser || isWebWorker
+      ? [{
+          name: 'should make directory and specify mtime as hrtime',
+          reason: 'Not designed to run in the browser'
+        }, {
+          name: 'should write file and specify mtime as hrtime',
+          reason: 'Not designed to run in the browser'
+        }, {
+          name: 'should set mtime as hrtime',
+          reason: 'Not designed to run in the browser'
+        }]
+      : []
   })
 
   tests.key(commonFactory)
diff --git a/packages/ipfs/test/utils/factory.js b/packages/ipfs/test/utils/factory.js
index 1235fc11f8..ea792df206 100644
--- a/packages/ipfs/test/utils/factory.js
+++ b/packages/ipfs/test/utils/factory.js
@@ -21,25 +21,31 @@ const commonOptions = {
 
 const commonOverrides = {
   js: {
-    ...(isNode ? {
-      ipfsBin: require.resolve('../../src/cli.js')
-    } : {}),
-    ...(isBrowser ? {
-      remote: true
-    } : {})
+    ...(isNode
+      ? {
+          ipfsBin: require.resolve('../../src/cli.js')
+        }
+      : {}),
+    ...(isBrowser
+      ? {
+          remote: true
+        }
+      : {})
   },
   proc: {
-    ...(isBrowser ? {
-      ipfsOptions: {
-        config: {
-          Addresses: {
-            Swarm: [
-              '/ip4/127.0.0.1/tcp/14579/ws/p2p-webrtc-star'
-            ]
+    ...(isBrowser
+      ? {
+          ipfsOptions: {
+            config: {
+              Addresses: {
+                Swarm: [
+                  '/ip4/127.0.0.1/tcp/14579/ws/p2p-webrtc-star'
+                ]
+              }
+            }
           }
         }
-      }
-    } : {})
+      : {})
   },
   go: {
     ipfsBin: isNode ? require('go-ipfs').path() : undefined