refactor: utils (#3207)

Author: anshumanv

globalSetupTest.js

@@ -5,6 +5,7 @@ const tcpPortUsed = require('tcp-port-used');
 const { version } = require('webpack');
 const ports = require('./test/ports-map');
 
+// eslint-disable-next-line no-console
 console.log(`\n Running tests for webpack @${version} \n`);
 
 async function validatePorts() {

lib/Server.js

@@ -19,8 +19,8 @@ const webpackDevMiddleware = require('webpack-dev-middleware');
 const getFilenameFromUrl = require('webpack-dev-middleware/dist/utils/getFilenameFromUrl')
   .default;
 const { validate } = require('schema-utils');
+const DevServerPlugin = require('./utils/DevServerPlugin');
 const normalizeOptions = require('./utils/normalizeOptions');
-const updateCompiler = require('./utils/updateCompiler');
 const getCertificate = require('./utils/getCertificate');
 const colors = require('./utils/colors');
 const runOpen = require('./utils/runOpen');
@@ -53,7 +53,7 @@ class Server {
     this.wsHeartbeatInterval = 30000;
 
     normalizeOptions(this.compiler, this.options);
-    updateCompiler(this.compiler, this.options);
+    this.applyDevServerPlugin();
 
     this.SocketServerImplementation = getSocketServerImplementation(
       this.options
@@ -87,6 +87,15 @@ class Server {
     }, this);
   }
 
+  applyDevServerPlugin() {
+    const compilers = this.compiler.compilers || [this.compiler];
+
+    // eslint-disable-next-line no-shadow
+    compilers.forEach((compiler) => {
+      new DevServerPlugin(this.options).apply(compiler);
+    });
+  }
+
   setupProgressPlugin() {
     new webpack.ProgressPlugin((percent, msg, addInfo) => {
       percent = Math.floor(percent * 100);

lib/utils/defaultPort.js

@@ -2,12 +2,11 @@
 
 const pRetry = require('p-retry');
 const portfinder = require('portfinder');
-const defaultPort = require('./defaultPort');
-const tryParseInt = require('./tryParseInt');
 
 function runPortFinder() {
   return new Promise((resolve, reject) => {
-    portfinder.basePort = defaultPort;
+    // default port
+    portfinder.basePort = 8080;
     portfinder.getPort((error, port) => {
       if (error) {
         return reject(error);
@@ -25,8 +24,7 @@ function findPort(port) {
 
   // Try to find unused port and listen on it for 3 times,
   // if port is not specified in options.
-  // so the tryParseInt function is introduced to handle NaN
-  const defaultPortRetry = tryParseInt(process.env.DEFAULT_PORT_RETRY) || 3;
+  const defaultPortRetry = parseInt(process.env.DEFAULT_PORT_RETRY, 10) || 3;
 
   return pRetry(runPortFinder, { retries: defaultPortRetry });
 }