Skip to content

Commit

Permalink
Temporarily fork detect-port (facebook#2147)
Browse files Browse the repository at this point in the history
* Temporarily fork detect-port

* Fix get process id

* Use different package

* Unnecessary var
  • Loading branch information
Timer authored and gaearon committed May 14, 2017
1 parent 81196d1 commit 8af1c13
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"connect-history-api-fallback": "1.3.0",
"cross-spawn": "4.0.2",
"css-loader": "0.28.0",
"detect-port": "1.1.1",
"@timer/detect-port": "1.1.2",
"dotenv": "2.0.0",
"eslint": "3.16.1",
"eslint-config-react-app": "^0.6.1",
Expand Down
12 changes: 6 additions & 6 deletions scripts/start.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ require('../config/env');

const fs = require('fs');
const chalk = require('chalk');
const detect = require('detect-port');
const detect = require('@timer/detect-port');
const WebpackDevServer = require('webpack-dev-server');
const clearConsole = require('react-dev-utils/clearConsole');
const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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);
}
Expand All @@ -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 => {
Expand All @@ -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;
Expand Down

0 comments on commit 8af1c13

Please sign in to comment.