fix: Prep for esm (#2205)

* prep for esm

* update min req node vers

* revert node prefix

8 files changed, 34 insertions, 27 deletions

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()