fix: Prep for esm (#2205)

* prep for esm

* update min req node vers

* revert node prefix

43 files changed, 92 insertions, 85 deletions

diff --git a/index.js b/index.js
index 9f3f242..3e07d04 100644
--- a/index.js
+++ b/index.js
@@ -2,25 +2,26 @@
 /* global FileList, ServiceWorker */
 /* eslint-env browser */
 
-const { EventEmitter } = require('events')
+const EventEmitter = require('events')
+const path = require('path')
 const concat = require('simple-concat')
 const createTorrent = require('create-torrent')
-const debug = require('debug')('webtorrent')
+const debugFactory = require('debug')
 const DHT = require('bittorrent-dht/client') // browser exclude
 const loadIPSet = require('load-ip-set') // browser exclude
 const parallel = require('run-parallel')
 const parseTorrent = require('parse-torrent')
-const path = require('path')
 const Peer = require('simple-peer')
 const queueMicrotask = require('queue-microtask')
 const randombytes = require('randombytes')
 const sha1 = require('simple-sha1')
 const speedometer = require('speedometer')
 const { ThrottleGroup } = require('speed-limiter')
+const ConnPool = require('./lib/conn-pool.js') // browser exclude
+const Torrent = require('./lib/torrent.js')
+const { version: VERSION } = require('./package.json')
 
-const ConnPool = require('./lib/conn-pool') // browser exclude
-const Torrent = require('./lib/torrent')
-const VERSION = require('./package.json').version
+const debug = debugFactory('webtorrent')
 
 /**
  * Version number in Azureus-style. Generated from major and minor semver version.
diff --git a/lib/conn-pool.js b/lib/conn-pool.js
index 52fb9b5..1c6ac79 100644
--- a/lib/conn-pool.js
+++ b/lib/conn-pool.js
@@ -1,9 +1,11 @@
-const debug = require('debug')('webtorrent:conn-pool')
 const net = require('net') // browser exclude
+const debugFactory = require('debug')
 const queueMicrotask = require('queue-microtask')
 
-const Peer = require('./peer')
-const utp = require('./utp') // browser exclude
+const Peer = require('./peer.js')
+const utp = require('./utp.js') // browser exclude
+
+const debug = debugFactory('webtorrent:conn-pool')
 
 /**
  * Connection Pool
diff --git a/lib/file-stream.js b/lib/file-stream.js
index e7dee68..a3682b1 100644
--- a/lib/file-stream.js
+++ b/lib/file-stream.js
@@ -1,7 +1,9 @@
-const debug = require('debug')('webtorrent:file-stream')
-const stream = require('readable-stream')
+const stream = require('stream')
+const debugFactory = require('debug')
 const eos = require('end-of-stream')
 
+const debug = debugFactory('webtorrent:file-stream')
+
 /**
  * Readable stream of a torrent file
  *
diff --git a/lib/file.js b/lib/file.js
index f3de744..cbbc484 100644
--- a/lib/file.js
+++ b/lib/file.js
@@ -1,15 +1,15 @@
-const { EventEmitter } = require('events')
-const { PassThrough } = require('readable-stream')
+const EventEmitter = require('events')
+const { PassThrough } = require('stream')
 const path = require('path')
 const render = require('render-media')
 const streamToBlob = require('stream-to-blob')
 const streamToBlobURL = require('stream-to-blob-url')
 const streamToBuffer = require('stream-with-known-length-to-buffer')
-const FileStream = require('./file-stream')
 const queueMicrotask = require('queue-microtask')
 const rangeParser = require('range-parser')
 const mime = require('mime')
 const eos = require('end-of-stream')
+const FileStream = require('./file-stream.js')
 
 class File extends EventEmitter {
   constructor (torrent, file) {
diff --git a/lib/peer.js b/lib/peer.js
index 1116f32..19cb5ff 100644
--- a/lib/peer.js
+++ b/lib/peer.js
@@ -1,13 +1,14 @@
-const { EventEmitter } = require('events')
+const EventEmitter = require('events')
 const { Transform } = require('stream')
 const arrayRemove = require('unordered-array-remove')
-const debug = require('debug')('webtorrent:peer')
+const debugFactory = require('debug')
 const Wire = require('bittorrent-protocol')
 
 const CONNECT_TIMEOUT_TCP = 5000
 const CONNECT_TIMEOUT_UTP = 5000
 const CONNECT_TIMEOUT_WEBRTC = 25000
 const HANDSHAKE_TIMEOUT = 25000
+const debug = debugFactory('webtorrent:peer')
 
 let secure = false
 
diff --git a/lib/server.js b/lib/server.js
index 755f700..7e08906 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -1,5 +1,5 @@
-const escapeHtml = require('escape-html')
 const http = require('http')
+const escapeHtml = require('escape-html')
 const mime = require('mime')
 const pump = require('pump')
 const rangeParser = require('range-parser')
diff --git a/lib/torrent.js b/lib/torrent.js
index 78695c0..ac7cb97 100644
--- a/lib/torrent.js
+++ b/lib/torrent.js
@@ -1,26 +1,26 @@
 /* global Blob */
 
+const EventEmitter = require('events')
+const fs = require('fs')
+const net = require('net') // browser exclude
+const os = require('os') // browser exclude
+const path = require('path')
 const addrToIPPort = require('addr-to-ip-port')
-const BitField = require('bitfield').default
+const { default: BitField } = require('bitfield')
 const CacheChunkStore = require('cache-chunk-store')
 const ChunkStoreWriteStream = require('chunk-store-stream/write')
 const cpus = require('cpus')
-const debug = require('debug')('webtorrent:torrent')
+const debugFactory = require('debug')
 const Discovery = require('torrent-discovery')
-const EventEmitter = require('events').EventEmitter
-const fs = require('fs')
 const FSChunkStore = require('fs-chunk-store') // browser: `memory-chunk-store`
 const get = require('simple-get')
 const ImmediateChunkStore = require('immediate-chunk-store')
 const ltDontHave = require('lt_donthave')
 const MemoryChunkStore = require('memory-chunk-store')
 const MultiStream = require('multistream')
-const net = require('net') // browser exclude
-const os = require('os') // browser exclude
 const parallel = require('run-parallel')
 const parallelLimit = require('run-parallel-limit')
 const parseTorrent = require('parse-torrent')
-const path = require('path')
 const Piece = require('torrent-piece')
 const pump = require('pump')
 const queueMicrotask = require('queue-microtask')
@@ -30,13 +30,14 @@ const speedometer = require('speedometer')
 const utMetadata = require('ut_metadata')
 const utPex = require('ut_pex') // browser exclude
 
-const File = require('./file')
-const Peer = require('./peer')
-const RarityMap = require('./rarity-map')
-const Server = require('./server') // browser exclude
-const utp = require('./utp') // browser exclude
-const WebConn = require('./webconn')
+const File = require('./file.js')
+const Peer = require('./peer.js')
+const RarityMap = require('./rarity-map.js')
+const Server = require('./server.js') // browser exclude
+const utp = require('./utp.js') // browser exclude
+const WebConn = require('./webconn.js')
 
+const debug = debugFactory('webtorrent:torrent')
 const MAX_BLOCK_LENGTH = 128 * 1024
 const PIECE_TIMEOUT = 30000
 const CHOKE_TIMEOUT = 5000
diff --git a/lib/webconn.js b/lib/webconn.js
index 22298b3..bd306f6 100644
--- a/lib/webconn.js
+++ b/lib/webconn.js
@@ -1,10 +1,11 @@
-const BitField = require('bitfield').default
-const debug = require('debug')('webtorrent:webconn')
+const { default: BitField } = require('bitfield')
+const debugFactory = require('debug')
 const get = require('simple-get')
 const ltDontHave = require('lt_donthave')
 const sha1 = require('simple-sha1')
 const Wire = require('bittorrent-protocol')
 
+const debug = debugFactory('webtorrent:webconn')
 const VERSION = require('../package.json').version
 
 const SOCKET_TIMEOUT = 60000
diff --git a/lib/worker.js b/lib/worker.js
index 47c1127..8913cf0 100644
--- a/lib/worker.js
+++ b/lib/worker.js
@@ -1,6 +1,6 @@
 /* eslint-env serviceworker */
 
-const fileResponse = require('./worker-server')
+const fileResponse = require('./worker-server.js')
 
 self.addEventListener('install', () => {
   self.skipWaiting()
diff --git a/package.json b/package.json
index da78a8b..9c3b028 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,6 @@
     "random-iterate": "^1.0.1",
     "randombytes": "^2.1.0",
     "range-parser": "^1.2.1",
-    "readable-stream": "^3.6.0",
     "render-media": "^4.1.0",
     "run-parallel": "^1.2.0",
     "run-parallel-limit": "^1.1.0",
diff --git a/test/browser/basic.js b/test/browser/basic.js
index 7b93761..9373a54 100644
--- a/test/browser/basic.js
+++ b/test/browser/basic.js
@@ -1,5 +1,5 @@
 const test = require('tape')
-const WebTorrent = require('../../')
+const WebTorrent = require('../../index.js')
 
 const img = Buffer.from('R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7', 'base64')
 img.name = 'img.png'
diff --git a/test/client-add-duplicate-trackers.js b/test/client-add-duplicate-trackers.js
index 90eda00..655bac1 100644
--- a/test/client-add-duplicate-trackers.js
+++ b/test/client-add-duplicate-trackers.js
@@ -1,6 +1,6 @@
 const fixtures = require('webtorrent-fixtures')
 const test = require('tape')
-const WebTorrent = require('../')
+const WebTorrent = require('../index.js')
 
 test('client.add: duplicate trackers', t => {
   t.plan(3)
diff --git a/test/client-add.js b/test/client-add.js
index 84c8fd6..0452709 100644
--- a/test/client-add.js
+++ b/test/client-add.js
@@ -1,6 +1,6 @@
 const fixtures = require('webtorrent-fixtures')
 const test = require('tape')
-const WebTorrent = require('../')
+const WebTorrent = require('../index.js')
 
 test('client.add: magnet uri, utf-8 string', t => {
   t.plan(6)
diff --git a/test/client-destroy.js b/test/client-destroy.js
index 9117b8f..9de0a1c 100644
--- a/test/client-destroy.js
+++ b/test/client-destroy.js
@@ -1,6 +1,6 @@
 const fixtures = require('webtorrent-fixtures')
 const test = require('tape')
-const WebTorrent = require('../')
+const WebTorrent = require('../index.js')
 
 test('after client.destroy(), throw on client.add() or client.seed()', t => {
   t.plan(3)
diff --git a/test/client-remove.js b/test/client-remove.js
index 659523d..6ea47de 100644
--- a/test/client-remove.js
+++ b/test/client-remove.js
@@ -1,6 +1,6 @@
 const fixtures = require('webtorrent-fixtures')
 const test = require('tape')
-const WebTorrent = require('../')
+const WebTorrent = require('../index.js')
 
 test('client.remove: remove by Torrent object', t => {
   t.plan(5)
diff --git a/test/client-seed.js b/test/client-seed.js
index d7cf90c..edf399a 100644
--- a/test/client-seed.js
+++ b/test/client-seed.js
@@ -2,7 +2,7 @@
 
 const fixtures = require('webtorrent-fixtures')
 const test = require('tape')
-const WebTorrent = require('../')
+const WebTorrent = require('../index.js')
 
 test('client.seed: torrent file (Buffer)', t => {
   t.plan(6)
diff --git a/test/duplicate.js b/test/duplicate.js
index c39102a..6b170e1 100644
--- a/test/duplicate.js
+++ b/test/duplicate.js
@@ -1,6 +1,6 @@
 const fixtures = require('webtorrent-fixtures')
 const test = require('tape')
-const WebTorrent = require('../')
+const WebTorrent = require('../index.js')
 
 test('client.seed followed by duplicate client.add (sync)', t => {
   t.plan(6)
diff --git a/test/node/basic.js b/test/node/basic.js
index 0dd08ad..55ba32f 100644
--- a/test/node/basic.js
+++ b/test/node/basic.js
@@ -1,9 +1,9 @@
-const fixtures = require('webtorrent-fixtures')
 const fs = require('fs')
 const path = require('path')
 const http = require('http')
+const fixtures = require('webtorrent-fixtures')
 const test = require('tape')
-const WebTorrent = require('../../')
+const WebTorrent = require('../../index.js')
 
 test('WebTorrent.WEBRTC_SUPPORT', t => {
   t.plan(2)
diff --git a/test/node/blocklist-dht.js b/test/node/blocklist-dht.js
index 0324b1c..24bed1c 100644
--- a/test/node/blocklist-dht.js
+++ b/test/node/blocklist-dht.js
@@ -2,8 +2,8 @@ const DHT = require('bittorrent-dht/server')
 const fixtures = require('webtorrent-fixtures')
 const series = require('run-series')
 const test = require('tape')
-const WebTorrent = require('../../')
-const common = require('../common')
+const WebTorrent = require('../../index.js')
+const common = require('../common.js')
 
 test('blocklist blocks peers discovered via DHT', t => {
   t.plan(8)
diff --git a/test/node/blocklist-tracker.js b/test/node/blocklist-tracker.js
index ee93d94..080f362 100644
--- a/test/node/blocklist-tracker.js
+++ b/test/node/blocklist-tracker.js
@@ -2,8 +2,8 @@ const fixtures = require('webtorrent-fixtures')
 const series = require('run-series')
 const test = require('tape')
 const TrackerServer = require('bittorrent-tracker/server')
-const WebTorrent = require('../../')
-const common = require('../common')
+const WebTorrent = require('../../index.js')
+const common = require('../common.js')
 
 test('blocklist blocks peers discovered via tracker', t => {
   t.plan(9)
diff --git a/test/node/blocklist.js b/test/node/blocklist.js
index 8b3ebb0..2b11a92 100644
--- a/test/node/blocklist.js
+++ b/test/node/blocklist.js
@@ -1,9 +1,9 @@
-const fixtures = require('webtorrent-fixtures')
 const fs = require('fs')
 const http = require('http')
-const test = require('tape')
-const WebTorrent = require('../../')
 const zlib = require('zlib')
+const fixtures = require('webtorrent-fixtures')
+const test = require('tape')
+const WebTorrent = require('../../index.js')
 
 function assertBlocked (t, torrent, addr) {
   torrent.once('blockedPeer', _addr => {
diff --git a/test/node/conn-pool.js b/test/node/conn-pool.js
index 1127501..a7c6e51 100644
--- a/test/node/conn-pool.js
+++ b/test/node/conn-pool.js
@@ -1,8 +1,8 @@
 const test = require('tape')
 const fixtures = require('webtorrent-fixtures')
-const WebTorrent = require('../../')
 const MemoryChunkStore = require('memory-chunk-store')
 const dgram = require('dgram')
+const WebTorrent = require('../../index.js')
 
 test('client.conn-pool: use TCP when uTP disabled', t => {
   t.plan(6)
diff --git a/test/node/download-dht-magnet.js b/test/node/download-dht-magnet.js
index 874b68a..b8ca9d6 100644
--- a/test/node/download-dht-magnet.js
+++ b/test/node/download-dht-magnet.js
@@ -1,11 +1,11 @@
+const fs = require('fs')
 const DHT = require('bittorrent-dht/server')
 const fixtures = require('webtorrent-fixtures')
-const fs = require('fs')
 const MemoryChunkStore = require('memory-chunk-store')
 const networkAddress = require('network-address')
 const series = require('run-series')
 const test = require('tape')
-const WebTorrent = require('../../')
+const WebTorrent = require('../../index.js')
 
 test('Download using DHT (via magnet uri)', t => {
   t.plan(12)
diff --git a/test/node/download-dht-torrent.js b/test/node/download-dht-torrent.js
index 9392f52..38e4a0e 100644
--- a/test/node/download-dht-torrent.js
+++ b/test/node/download-dht-torrent.js
@@ -1,10 +1,10 @@
+const fs = require('fs')
 const DHT = require('bittorrent-dht/server')
 const fixtures = require('webtorrent-fixtures')
-const fs = require('fs')
 const MemoryChunkStore = require('memory-chunk-store')
 const series = require('run-series')
 const test = require('tape')
-const WebTorrent = require('../../')
+const WebTorrent = require('../../index.js')
 
 test('Download using DHT (via .torrent file)', t => {
   t.plan(10)
diff --git a/test/node/download-from-ip.js b/test/node/download-from-ip.js
index 84669a9..e870918 100644
--- a/test/node/download-from-ip.js
+++ b/test/node/download-from-ip.js
@@ -1,8 +1,8 @@
-const fixtures = require('webtorrent-fixtures')
 const fs = require('fs')
+const fixtures = require('webtorrent-fixtures')
 const MemoryChunkStore = require('memory-chunk-store')
 const test = require('tape')
-const WebTorrent = require('../../')
+const WebTorrent = require('../../index.js')
 
 test('Download via torrent.addPeer()', (t) => {
   t.plan(7)
diff --git a/test/node/download-lsd-magnet.js b/test/node/download-lsd-magnet.js
index f7dac6b..3e56883 100644
--- a/test/node/download-lsd-magnet.js
+++ b/test/node/download-lsd-magnet.js
@@ -1,7 +1,7 @@
 const fixtures = require('webtorrent-fixtures')
 const MemoryChunkStore = require('memory-chunk-store')
 const test = require('tape')
-const WebTorrent = require('../../')
+const WebTorrent = require('../../index.js')
 
 test('Download using LSD (via magnet uri)', t => {
   t.plan(3)
diff --git a/test/node/download-lsd-torrent.js b/test/node/download-lsd-torrent.js
index 8837140..553ea0b 100644
--- a/test/node/download-lsd-torrent.js
+++ b/test/node/download-lsd-torrent.js
@@ -1,7 +1,7 @@
 const fixtures = require('webtorrent-fixtures')
 const MemoryChunkStore = require('memory-chunk-store')
 const test = require('tape')
-const WebTorrent = require('../../')
+const WebTorrent = require('../../index.js')
 
 test('Download using LSD (via .torrent file)', t => {
   t.plan(3)
diff --git a/test/node/download-metadata.js b/test/node/download-metadata.js
index 4d7e698..40a785c 100644
--- a/test/node/download-metadata.js
+++ b/test/node/download-metadata.js
@@ -1,8 +1,8 @@
-const fixtures = require('webtorrent-fixtures')
 const http = require('http')
+const fixtures = require('webtorrent-fixtures')
 const MemoryChunkStore = require('memory-chunk-store')
 const test = require('tape')
-const WebTorrent = require('../../')
+const WebTorrent = require('../../index.js')
 
 function createServer (data, cb) {
   const server = http.createServer((req, res) => {
diff --git a/test/node/download-private-dht.js b/test/node/download-private-dht.js
index 04a2c7d..829171c 100644
--- a/test/node/download-private-dht.js
+++ b/test/node/download-private-dht.js
@@ -3,7 +3,7 @@ const fixtures = require('webtorrent-fixtures')
 const MemoryChunkStore = require('memory-chunk-store')
 const series = require('run-series')
 const test = require('tape')
-const WebTorrent = require('../../')
+const WebTorrent = require('../../index.js')
 
 test('private torrent should not use DHT', t => {
   t.plan(4)
diff --git a/test/node/download-tracker-magnet.js b/test/node/download-tracker-magnet.js
index f4d750a..89ca1aa 100644
--- a/test/node/download-tracker-magnet.js
+++ b/test/node/download-tracker-magnet.js
@@ -1,10 +1,10 @@
-const fixtures = require('webtorrent-fixtures')
 const fs = require('fs')
+const fixtures = require('webtorrent-fixtures')
 const MemoryChunkStore = require('memory-chunk-store')
 const series = require('run-series')
 const test = require('tape')
 const TrackerServer = require('bittorrent-tracker/server')
-const WebTorrent = require('../../')
+const WebTorrent = require('../../index.js')
 
 test('Download using UDP tracker (via magnet uri)', t => {
   magnetDownloadTest(t, 'udp')
diff --git a/test/node/download-tracker-torrent.js b/test/node/download-tracker-torrent.js
index 9ba0760..a8910ec 100644
--- a/test/node/download-tracker-torrent.js
+++ b/test/node/download-tracker-torrent.js
@@ -1,10 +1,10 @@
-const fixtures = require('webtorrent-fixtures')
 const fs = require('fs')
+const fixtures = require('webtorrent-fixtures')
 const MemoryChunkStore = require('memory-chunk-store')
 const series = require('run-series')
 const test = require('tape')
 const TrackerServer = require('bittorrent-tracker/server')
-const WebTorrent = require('../../')
+const WebTorrent = require('../../index.js')
 
 test('Download using UDP tracker (via .torrent file)', t => {
   torrentDownloadTest(t, 'udp')
diff --git a/test/node/download-webseed-magnet.js b/test/node/download-webseed-magnet.js
index 8e7503b..502c2af 100644
--- a/test/node/download-webseed-magnet.js
+++ b/test/node/download-webseed-magnet.js
@@ -1,12 +1,12 @@
-const finalhandler = require('finalhandler')
-const fixtures = require('webtorrent-fixtures')
 const http = require('http')
 const path = require('path')
+const finalhandler = require('finalhandler')
+const fixtures = require('webtorrent-fixtures')
 const MemoryChunkStore = require('memory-chunk-store')
 const series = require('run-series')
 const serveStatic = require('serve-static')
 const test = require('tape')
-const WebTorrent = require('../../')
+const WebTorrent = require('../../index.js')
 
 test('Download using webseed (via magnet uri)', t => {
   t.plan(9)
diff --git a/test/node/download-webseed-torrent.js b/test/node/download-webseed-torrent.js
index 43bff79..92f586a 100644
--- a/test/node/download-webseed-torrent.js
+++ b/test/node/download-webseed-torrent.js
@@ -1,12 +1,12 @@
+const http = require('http')
+const path = require('path')
 const finalhandler = require('finalhandler')
 const fixtures = require('webtorrent-fixtures')
-const http = require('http')
 const MemoryChunkStore = require('memory-chunk-store')
-const path = require('path')
 const series = require('run-series')
 const serveStatic = require('serve-static')
 const test = require('tape')
-const WebTorrent = require('../../')
+const WebTorrent = require('../../index.js')
 
 // it should be fast to download a small torrent over local HTTP
 const WEB_SEED_TIMEOUT_MS = 500
diff --git a/test/node/extensions.js b/test/node/extensions.js
index 48b1dfd..460441b 100644
--- a/test/node/extensions.js
+++ b/test/node/extensions.js
@@ -1,6 +1,6 @@
 const fixtures = require('webtorrent-fixtures')
 const test = require('tape')
-const WebTorrent = require('../../')
+const WebTorrent = require('../../index.js')
 
 test('extension support', t => {
   t.plan(6)
diff --git a/test/node/limit-download-upload.js b/test/node/limit-download-upload.js
index 0f595ba..ea046ec 100644
--- a/test/node/limit-download-upload.js
+++ b/test/node/limit-download-upload.js
@@ -1,7 +1,7 @@
 const fixtures = require('webtorrent-fixtures')
 const test = require('tape')
-const WebTorrent = require('../../')
 const MemoryChunkStore = require('memory-chunk-store')
+const WebTorrent = require('../../index.js')
 
 const DOWNLOAD_SPEED_LIMIT = 200 * 1000 // 200 KB/s
 const UPLOAD_SPEED_LIMIT = 200 * 1000 // 200 KB/s
diff --git a/test/node/limit-methods.js b/test/node/limit-methods.js
index 58ad573..fccaaf1 100644
--- a/test/node/limit-methods.js
+++ b/test/node/limit-methods.js
@@ -1,7 +1,7 @@
 const fixtures = require('webtorrent-fixtures')
 const test = require('tape')
-const WebTorrent = require('../../')
 const MemoryChunkStore = require('memory-chunk-store')
+const WebTorrent = require('../../index.js')
 
 const DOWNLOAD_SPEED_LIMIT = 200 * 1000 // 200 KB/s
 const UPLOAD_SPEED_LIMIT = 200 * 1000 // 200 KB/s
diff --git a/test/node/metadata.js b/test/node/metadata.js
index 3048f8b..fb4d438 100644
--- a/test/node/metadata.js
+++ b/test/node/metadata.js
@@ -1,6 +1,6 @@
 const fixtures = require('webtorrent-fixtures')
 const test = require('tape')
-const WebTorrent = require('../../')
+const WebTorrent = require('../../index.js')
 
 test('ut_metadata transfer', t => {
   t.plan(6)
diff --git a/test/node/seed-stream.js b/test/node/seed-stream.js
index 0e0db73..a18cc4a 100644
--- a/test/node/seed-stream.js
+++ b/test/node/seed-stream.js
@@ -1,8 +1,8 @@
-const Readable = require('readable-stream').Readable
+const { Readable } = require('stream')
 const series = require('run-series')
 const test = require('tape')
 const Tracker = require('bittorrent-tracker/server')
-const WebTorrent = require('../../')
+const WebTorrent = require('../../index.js')
 
 test('client.seed: stream', t => {
   t.plan(9)
diff --git a/test/node/seed-while-download.js b/test/node/seed-while-download.js
index 3606805..0b710d9 100644
--- a/test/node/seed-while-download.js
+++ b/test/node/seed-while-download.js
@@ -1,10 +1,10 @@
+const fs = require('fs')
 const DHT = require('bittorrent-dht/server')
 const fixtures = require('webtorrent-fixtures')
-const fs = require('fs')
 const MemoryChunkStore = require('memory-chunk-store')
 const series = require('run-series')
 const test = require('tape')
-const WebTorrent = require('../../')
+const WebTorrent = require('../../index.js')
 
 test('Seed and download a file at the same time', t => {
   t.plan(14)
diff --git a/test/node/server.js b/test/node/server.js
index 7902056..786a7cf 100644
--- a/test/node/server.js
+++ b/test/node/server.js
@@ -1,8 +1,8 @@
-const fixtures = require('webtorrent-fixtures')
 const fs = require('fs')
+const fixtures = require('webtorrent-fixtures')
 const get = require('simple-get')
 const test = require('tape')
-const WebTorrent = require('../../')
+const WebTorrent = require('../../index.js')
 
 test('torrent.createServer: programmatic http server', t => {
   t.plan(9)
diff --git a/test/node/torrent-events.js b/test/node/torrent-events.js
index 46136a4..532db29 100644
--- a/test/node/torrent-events.js
+++ b/test/node/torrent-events.js
@@ -1,8 +1,8 @@
 const fixtures = require('webtorrent-fixtures')
 const test = require('tape')
-const WebTorrent = require('../../')
 const MemoryChunkStore = require('memory-chunk-store')
 const randombytes = require('randombytes')
+const WebTorrent = require('../../index.js')
 
 test('client.add: emit torrent events in order', t => {
   t.plan(6)
diff --git a/test/rarity-map.js b/test/rarity-map.js
index 77773c4..0cbef33 100644
--- a/test/rarity-map.js
+++ b/test/rarity-map.js
@@ -1,8 +1,8 @@
 const fixtures = require('webtorrent-fixtures')
 const randombytes = require('randombytes')
 const test = require('tape')
-const Torrent = require('../lib/torrent')
 const Wire = require('bittorrent-protocol')
+const Torrent = require('../lib/torrent.js')
 
 test('Rarity map usage', t => {
   t.plan(16)
diff --git a/test/torrent-destroy.js b/test/torrent-destroy.js
index f220cf2..a2e97a1 100644
--- a/test/torrent-destroy.js
+++ b/test/torrent-destroy.js
@@ -1,6 +1,6 @@
 const fixtures = require('webtorrent-fixtures')
 const test = require('tape')
-const WebTorrent = require('../')
+const WebTorrent = require('../index.js')
 
 test('torrent.destroy: destroy and remove torrent', t => {
   t.plan(5)