Temporarily fork detect-port

packages/react-dev-utils/detectPort.js

@@ -0,0 +1,66 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+'use strict';
+
+const debug = require('debug')('detect-port');
+const net = require('net');
+
+module.exports = (port, host, callback) => {
+  if (typeof port === 'function') {
+    callback = port;
+    port = null;
+  }
+  port = parseInt(port) || 0;
+  let maxPort = port + 10;
+  if (maxPort > 65535) {
+    maxPort = 65535;
+  }
+  debug('detect free port between [%s, %s)', port, maxPort);
+  if (typeof callback === 'function') {
+    return tryListen(host, port, maxPort, callback);
+  }
+  // promise
+  return new Promise(resolve => {
+    tryListen(host, port, maxPort, (_, realPort) => {
+      resolve(realPort);
+    });
+  });
+};
+
+function tryListen(host, port, maxPort, callback) {
+  const server = new net.Server();
+
+  server.on('error', err => {
+    debug('listen %s error: %s', port, err);
+    if (port === 0) {
+      return callback(err);
+    }
+
+    port++;
+    if (port >= maxPort) {
+      debug(
+        'port: %s >= maxPort: %s, give up and use random port',
+        port,
+        maxPort
+      );
+      port = 0;
+      maxPort = 0;
+    }
+    server.close();
+    return tryListen(host, port, maxPort, callback);
+  });
+
+  server.listen({ port, host }, () => {
+    port = server.address().port;
+    server.close();
+    debug('get free port: %s', port);
+    callback(null, port);
+  });
+}

packages/react-scripts/package.json

@@ -33,7 +33,6 @@
     "connect-history-api-fallback": "1.3.0",
     "cross-spawn": "4.0.2",
     "css-loader": "0.28.0",
-    "detect-port": "1.1.1",
     "dotenv": "2.0.0",
     "eslint": "3.16.1",
     "eslint-config-react-app": "^0.6.1",

packages/react-scripts/scripts/start.js

@@ -24,7 +24,7 @@ require('../config/env');
 
 const fs = require('fs');
 const chalk = require('chalk');
-const detect = require('detect-port');
+const detect = require('react-dev-utils/detectPort');
 const WebpackDevServer = require('webpack-dev-server');
 const clearConsole = require('react-dev-utils/clearConsole');
 const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
@@ -48,10 +48,10 @@ if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
 
 // Tools like Cloud9 rely on this.
 const DEFAULT_PORT = parseInt(process.env.PORT, 10) || 3000;
+const HOST = process.env.HOST || '0.0.0.0';
 
 function run(port) {
   const protocol = process.env.HTTPS === 'true' ? 'https' : 'http';
-  const host = process.env.HOST || '0.0.0.0';
 
   // Create a webpack compiler that is configured with custom messages.
   const compiler = createWebpackCompiler(
@@ -63,7 +63,7 @@ function run(port) {
       console.log();
       console.log('The app is running at:');
       console.log();
-      console.log(`  ${chalk.cyan(`${protocol}://${host}:${port}/`)}`);
+      console.log(`  ${chalk.cyan(`${protocol}://${HOST}:${port}/`)}`);
       console.log();
       console.log('Note that the development build is not optimized.');
       console.log(
@@ -80,7 +80,7 @@ function run(port) {
   addWebpackMiddleware(devServer)
     .then(() => {
       // Launch WebpackDevServer.
-      devServer.listen(port, host, err => {
+      devServer.listen(port, HOST, err => {
         if (err) {
           return console.log(err);
         }
@@ -91,7 +91,7 @@ function run(port) {
         console.log(chalk.cyan('Starting the development server...'));
         console.log();
 
-        openBrowser(`${protocol}://${host}:${port}/`);
+        openBrowser(`${protocol}://${HOST}:${port}/`);
       });
     })
     .catch(e => {
@@ -105,7 +105,7 @@ function run(port) {
 
 // We attempt to use the default port but if it is busy, we offer the user to
 // run on a different port. `detect()` Promise resolves to the next free port.
-detect(DEFAULT_PORT).then(port => {
+detect(DEFAULT_PORT, HOST).then(port => {
   if (port === DEFAULT_PORT) {
     run(port);
     return;