chore: rebase

anshumanv · anshumanv · commit 771e72f4d0cb · 2021-05-15T22:06:02.000+05:30
diff --git a/lib/Server.js b/lib/Server.js
@@ -761,8 +761,6 @@ class Server {
   }
 
   listen(port, hostname, fn) {
-    const findPort = require('./utils/findPort');
-
     if (hostname === 'local-ip') {
       this.hostname = internalIp.v4.sync() || internalIp.v6.sync() || '0.0.0.0';
     } else if (hostname === 'local-ipv4') {
@@ -847,6 +845,9 @@ class Server {
   }
 
   static getFreePort(port) {
+    const pRetry = require('p-retry');
+    const portfinder = require('portfinder');
+
     if (port && port !== 'auto') {
       return Promise.resolve(port);
     }

Original file line number	Diff line number	Diff line change
`@@ -761,8 +761,6 @@ class Server {`
`761`	`761`	`}`
`762`	`762`
`763`	`763`	`listen(port, hostname, fn) {`
`764`		`- const findPort = require('./utils/findPort');`
`765`		`-`
`766`	`764`	`if (hostname === 'local-ip') {`
`767`	`765`	`this.hostname = internalIp.v4.sync() \|\| internalIp.v6.sync() \|\| '0.0.0.0';`
`768`	`766`	`} else if (hostname === 'local-ipv4') {`
`@@ -847,6 +845,9 @@ class Server {`
`847`	`845`	`}`
`848`	`846`
`849`	`847`	`static getFreePort(port) {`
	`848`	`+ const pRetry = require('p-retry');`
	`849`	`+ const portfinder = require('portfinder');`
	`850`	`+`
`850`	`851`	`if (port && port !== 'auto') {`
`851`	`852`	`return Promise.resolve(port);`
`852`	`853`	`}`