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

Allow the dev server to watch for changes in src/node_modules #3230

Merged
merged 4 commits into from
Oct 3, 2017
Merged

Allow the dev server to watch for changes in src/node_modules #3230

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
80de217
Allow the dev server to watch for changes in src/node_modules
xjlim Oct 2, 2017
b0ef885
fix eslint error
xjlim Oct 2, 2017
eca7cf0
fix broken regex
xjlim Oct 3, 2017
2d6875f
handle trailing slash edge case for file paths
xjlim Oct 3, 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
10 changes: 7 additions & 3 deletions packages/react-dev-utils/getProcessForPort.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function getProcessCommand(processId, processDirectory) {
execOptions
);

command = command.replace(/\n$/, '')
command = command.replace(/\n$/, '');

if (isProcessAReactApp(command)) {
const packageName = getPackageNameInDirectory(processDirectory);
Expand All @@ -68,8 +68,12 @@ function getProcessForPort(port) {
var processId = getProcessIdOnPort(port);
var directory = getDirectoryOfProcessById(processId);
var command = getProcessCommand(processId, directory);
return chalk.cyan(command) + chalk.grey(' (pid ' + processId + ')\n') +
chalk.blue(' in ') + chalk.cyan(directory);
return (
chalk.cyan(command) +
chalk.grey(' (pid ' + processId + ')\n') +
chalk.blue(' in ') +
chalk.cyan(directory)
);
} catch (e) {
return null;
}
Expand Down
8 changes: 7 additions & 1 deletion packages/react-scripts/config/webpackDevServer.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

const errorOverlayMiddleware = require('react-dev-utils/errorOverlayMiddleware');
const noopServiceWorkerMiddleware = require('react-dev-utils/noopServiceWorkerMiddleware');
const path = require('path');
const config = require('./webpack.config.dev');
const paths = require('./paths');

Expand Down Expand Up @@ -72,8 +73,13 @@ module.exports = function(proxy, allowedHost) {
quiet: true,
// Reportedly, this avoids CPU overload on some systems.
// https://github.com/facebookincubator/create-react-app/issues/293
// src/node_modules is not ignored to support absolute imports
// https://github.com/facebookincubator/create-react-app/issues/1065
watchOptions: {
ignored: /node_modules/,
ignored: new RegExp(
`^(?!${path.normalize(paths.appSrc + '/')}).+[\\/]node_modules[\\/]`,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that technically this stays in ejected projects forever. It looks extremely cryptic.
Can we extract this somewhere to react-dev-utils?

'g'
),
},
// Enable HTTPS if the HTTPS environment variable is set to 'true'
https: protocol === 'https',
Expand Down