Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Temporarily fork detect-port #2147

Merged
merged 4 commits into from
May 14, 2017
Merged

Temporarily fork detect-port #2147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4266122
Temporarily fork detect-port
Timer May 14, 2017
573fb68
Fix get process id
Timer May 14, 2017
4be3159
Use different package
Timer May 14, 2017
b11a93e
Unnecessary var
Timer May 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions packages/react-dev-utils/getProcessForPort.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,9 @@ function isProcessAReactApp(processCommand) {
}

function getProcessIdOnPort(port) {
return execSync(
'lsof -i:' + port + ' -P -t -sTCP:LISTEN',
execOptions
).trim();
return execSync('lsof -i:' + port + ' -P -t -sTCP:LISTEN', execOptions)
.split('\n')[0]
.trim();
}

function getPackageNameInDirectory(directory) {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-scripts/package.json
View file
Open in desktop
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 packages/react-scripts/scripts/start.js
View file
Open in desktop
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