Skip to content

Commit b58cf7d

Browse files
committed
chore: Merge branch 'master'
[skip ci] * 'master' of github.com:remy/nodemon: fix: Replace `jade` references by `pug` chore: test funding.yml change chore: update funding test: ensure ignore relative paths
2 parents 95a4c09 + 7d6c1a8 commit b58cf7d

File tree

15 files changed

+1155
-784
lines changed

15 files changed

+1155
-784
lines changed

.github/FUNDING.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
1+
github: [remy]
22
open_collective: nodemon

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,10 @@ Don't use unix globbing to pass multiple directories, e.g `--watch ./lib/*`, it
178178
By default, nodemon looks for files with the `.js`, `.mjs`, `.coffee`, `.litcoffee`, and `.json` extensions. If you use the `--exec` option and monitor `app.py` nodemon will monitor files with the extension of `.py`. However, you can specify your own list with the `-e` (or `--ext`) switch like so:
179179

180180
```bash
181-
nodemon -e js,jade
181+
nodemon -e js,pug
182182
```
183183

184-
Now nodemon will restart on any changes to files in the directory (or subdirectories) with the extensions `.js`, `.jade`.
184+
Now nodemon will restart on any changes to files in the directory (or subdirectories) with the extensions `.js`, `.pug`.
185185

186186
## Ignoring files
187187

doc/cli/help.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Options:
44

55
--config file ............ alternate nodemon.json config file to use
6-
-e, --ext ................ extensions to look for, ie. js,jade,hbs.
6+
-e, --ext ................ extensions to look for, ie. js,pug,hbs.
77
-x, --exec app ........... execute script with "app", ie. -x "python -v".
88
-w, --watch path.......... watch directory "path" or files. use once for
99
each directory or file to watch.

doc/cli/options.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Configuration
1212
Execution
1313
-C, --on-change-only ..... execute script on change only, not startup
1414
--cwd <dir> .............. change into <dir> before running the script
15-
-e, --ext ................ extensions to look for, ie. "js,jade,hbs"
15+
-e, --ext ................ extensions to look for, ie. "js,pug,hbs"
1616
-I, --no-stdin ........... nodemon passes stdin directly to child process
1717
--spawn .................. force nodemon to use spawn (over fork) [node only]
1818
-x, --exec app ........... execute script with "app", ie. -x "python -v"

lib/config/exec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ function exec(nodemonOptions, execMap) {
198198
}
199199

200200
// allow users to make a mistake on the extension to monitor
201-
// converts .js, jade => js,jade
201+
// converts .js, pug => js,pug
202202
// BIG NOTE: user can't do this: nodemon -e *.js
203203
// because the terminal will automatically expand the glob against
204204
// the file system :(

lib/monitor/watch.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ function watch() {
5858
persistent: true,
5959
usePolling: config.options.legacyWatch || false,
6060
interval: config.options.pollingInterval,
61+
// note to future developer: I've gone back and forth on adding `cwd`
62+
// to the props and in some cases it fixes bugs but typically it causes
63+
// bugs elsewhere (since nodemon is used is so many ways). the final
64+
// decision is to *not* use it at all and work around it
65+
// cwd: ...
6166
};
6267

6368
if (utils.isWindows) {
@@ -85,7 +90,7 @@ function watch() {
8590

8691
watchedFiles.push(file);
8792
bus.emit('watching', file);
88-
debug('watching dir: %s', file);
93+
debug('chokidar watching: %s', file);
8994
});
9095
watcher.on('ready', function () {
9196
watchedFiles = Array.from(new Set(watchedFiles)); // ensure no dupes

0 commit comments

Comments
 (0)