Skip to content

Commit

Permalink
choe: merge master
Browse files Browse the repository at this point in the history
* refs/remotes/origin/master:
  fix: to avoid confusion like in #1528, always report used extension
  fix: langauge around "watching" (#1591)
  docs: README Grammar (#1601)
  • Loading branch information
remy committed Nov 20, 2019
2 parents 3d90879 + eead311 commit 3a2eaf7
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -347,9 +347,9 @@ The answer is simple, but possibly frustrating. I'm not saying (how I pronounce

## Design principles

- Less flags is better
- Fewer flags is better
- Works across all platforms
- Less features
- Fewer features
- Let individuals build on top of nodemon
- Offer all CLI functionality as an API
- Contributions must have and pass tests
Expand Down
14 changes: 11 additions & 3 deletions lib/nodemon.js
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,19 @@ function nodemon(settings) {
}).filter(Boolean).join(' ');
if (ignoring) utils.log.detail('ignoring: ' + ignoring);

utils.log.info('watching: ' + config.options.monitor.map(function (rule) {
return rule.slice(0, 1) !== '!' ? rule : false;
utils.log.info('watching dir(s): ' + config.options.monitor.map(function (rule) {
if (rule.slice(0, 1) !== '!') {
try {
rule = path.relative(process.cwd(), rule);
} catch (e) {}

return rule;
}

return false;
}).filter(Boolean).join(' '));

utils.log.detail('watching extensions: ' + (config.options.execOptions.ext || '(all)'));
utils.log.info('watching extensions: ' + (config.options.execOptions.ext || '(all)'));

if (config.options.dump) {
utils.log._log('log', '--------------');
Expand Down

0 comments on commit 3a2eaf7

Please sign in to comment.