chore: rebase

Author: rishabh3112

README.md

@@ -108,6 +108,8 @@ Options:
   --no-http2                       Do not use HTTP/2.
   --bonjour                        Broadcasts the server via ZeroConf networking on start.
   --no-bonjour                     Do not broadcast the server via ZeroConf networking on start.
+  --client-hot-entry               Tell devServer to inject a Hot Module Replacement entry.
+  --no-client-hot-entry            Do not tell devServer to inject a Hot Module Replacement entry.
   --client-progress                Print compilation progress in percentage in the browser.
   --no-client-progress             Do not print compilation progress in percentage in the browser.
   --client-overlay                 Show a full-screen overlay in the browser when there are compiler errors or warnings.

bin/cli-flags.js

@@ -244,6 +244,24 @@ module.exports = {
         'Do not broadcast the server via ZeroConf networking on start.',
       negative: true,
     },
+    {
+      name: 'client-hot-entry',
+      type: Boolean,
+      configs: [
+        {
+          type: 'boolean',
+        },
+      ],
+      description: 'Tell devServer to inject a Hot Module Replacement entry.',
+      negatedDescription:
+        'Do not tell devServer to inject a Hot Module Replacement entry.',
+      negative: true,
+      processor(opts) {
+        opts.client = opts.client || {};
+        opts.client.hotEntry = opts.clientHotEntry;
+        delete opts.clientHotEntry;
+      },
+    },
     {
       name: 'client-progress',
       type: Boolean,

lib/Server.js

@@ -2,36 +2,18 @@
 
 const path = require('path');
 const url = require('url');
-const http = require('http');
-const https = require('https');
 const fs = require('graceful-fs');
 const ipaddr = require('ipaddr.js');
 const internalIp = require('internal-ip');
 const killable = require('killable');
-const chokidar = require('chokidar');
 const express = require('express');
-const { createProxyMiddleware } = require('http-proxy-middleware');
-const historyApiFallback = require('connect-history-api-fallback');
-const compress = require('compression');
-const serveIndex = require('serve-index');
-const webpack = require('webpack');
-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 getCertificate = require('./utils/getCertificate');
 const colors = require('./utils/colors');
-const runOpen = require('./utils/runOpen');
-const runBonjour = require('./utils/runBonjour');
 const routes = require('./utils/routes');
 const getSocketServerImplementation = require('./utils/getSocketServerImplementation');
 const getCompilerConfigArray = require('./utils/getCompilerConfigArray');
-const getStatsOption = require('./utils/getStatsOption');
-const getColorsOption = require('./utils/getColorsOption');
 const setupExitSignals = require('./utils/setupExitSignals');
-const findPort = require('./utils/findPort');
 const schema = require('./options.json');
 
 if (!process.env.WEBPACK_SERVE) {
@@ -103,6 +85,8 @@ class Server {
   }
 
   applyDevServerPlugin() {
+    const DevServerPlugin = require('./utils/DevServerPlugin');
+
     const compilers = this.compiler.compilers || [this.compiler];
 
     // eslint-disable-next-line no-shadow
@@ -112,7 +96,9 @@ class Server {
   }
 
   setupProgressPlugin() {
-    new webpack.ProgressPlugin((percent, msg, addInfo) => {
+    const { ProgressPlugin } = require('webpack');
+
+    new ProgressPlugin((percent, msg, addInfo) => {
       percent = Math.floor(percent * 100);
 
       if (percent === 100) {
@@ -172,6 +158,8 @@ class Server {
   }
 
   setupDevMiddleware() {
+    const webpackDevMiddleware = require('webpack-dev-middleware');
+
     // middleware for serving webpack bundle
     this.middleware = webpackDevMiddleware(
       this.compiler,
@@ -180,10 +168,14 @@ class Server {
   }
 
   setupCompressFeature() {
+    const compress = require('compression');
+
     this.app.use(compress());
   }
 
   setupProxyFeature() {
+    const { createProxyMiddleware } = require('http-proxy-middleware');
+
     /**
      * Assume a proxy configuration specified as:
      * proxy: {
@@ -329,6 +321,8 @@ class Server {
   }
 
   setupHistoryApiFallbackFeature() {
+    const historyApiFallback = require('connect-history-api-fallback');
+
     const fallback =
       typeof this.options.historyApiFallback === 'object'
         ? this.options.historyApiFallback
@@ -350,6 +344,8 @@ class Server {
   }
 
   setupStaticServeIndexFeature() {
+    const serveIndex = require('serve-index');
+
     this.options.static.forEach((staticOption) => {
       staticOption.publicPath.forEach((publicPath) => {
         if (staticOption.serveIndex) {
@@ -524,6 +520,8 @@ class Server {
     }
 
     if (this.options.https) {
+      const getCertificate = require('./utils/getCertificate');
+
       for (const property of ['cacert', 'pfx', 'key', 'cert']) {
         const value = this.options.https[property];
         const isBuffer = value instanceof Buffer;
@@ -556,6 +554,9 @@ class Server {
   }
 
   createServer() {
+    const https = require('https');
+    const http = require('http');
+
     if (this.options.https) {
       if (this.options.http2) {
         // TODO: we need to replace spdy with http2 which is an internal module
@@ -590,7 +591,7 @@ class Server {
 
       if (!headers) {
         this.logger.warn(
-          'transportMode.server implementation must pass headers to the callback of onConnection(f) ' +
+          'webSocketServer implementation must pass headers to the callback of onConnection(f) ' +
             'via f(connection, headers) in order for clients to pass a headers security check'
         );
       }
@@ -638,6 +639,8 @@ class Server {
   }
 
   showStatus() {
+    const getColorsOption = require('./utils/getColorsOption');
+
     const useColor = getColorsOption(getCompilerConfigArray(this.compiler));
     const protocol = this.options.https ? 'https' : 'http';
     const { address, port } = this.server.address();
@@ -759,6 +762,8 @@ class Server {
     }
 
     if (this.options.open) {
+      const runOpen = require('./utils/runOpen');
+
       const openTarget = prettyPrintUrl(this.hostname || 'localhost');
 
       runOpen(openTarget, this.options.open, this.logger);
@@ -783,7 +788,7 @@ class Server {
     }
 
     return (
-      findPort(port || this.options.port)
+      Server.getFreePort(port || this.options.port)
         // eslint-disable-next-line no-shadow
         .then((port) => {
           this.options.port = port;
@@ -794,6 +799,8 @@ class Server {
             }
 
             if (this.options.bonjour) {
+              const runBonjour = require('./utils/runBonjour');
+
               runBonjour(this.options);
             }
 
@@ -846,7 +853,38 @@ class Server {
     };
   }
 
+  static getFreePort(port) {
+    const pRetry = require('p-retry');
+    const portfinder = require('portfinder');
+
+    if (port && port !== 'auto') {
+      return Promise.resolve(port);
+    }
+
+    function runPortFinder() {
+      return new Promise((resolve, reject) => {
+        // default port
+        portfinder.basePort = 8080;
+        portfinder.getPort((error, foundPort) => {
+          if (error) {
+            return reject(error);
+          }
+
+          return resolve(foundPort);
+        });
+      });
+    }
+
+    // Try to find unused port and listen on it for 3 times,
+    // if port is not specified in options.
+    const defaultPortRetry = parseInt(process.env.DEFAULT_PORT_RETRY, 10) || 3;
+
+    return pRetry(runPortFinder, { retries: defaultPortRetry });
+  }
+
   getStats(statsObj) {
+    const getStatsOption = require('./utils/getStatsOption');
+
     const stats = Server.DEFAULT_STATS;
 
     const configArr = getCompilerConfigArray(this.compiler);
@@ -983,6 +1021,9 @@ class Server {
   }
 
   serveMagicHtml(req, res, next) {
+    const getFilenameFromUrl =
+      require('webpack-dev-middleware/dist/utils/getFilenameFromUrl').default;
+
     const _path = req.path;
 
     try {
@@ -1059,6 +1100,8 @@ class Server {
       interval,
     };
 
+    const chokidar = require('chokidar');
+
     const watcher = chokidar.watch(watchPath, finalWatchOptions);
 
     // disabling refreshing on changing the content