srizan/archived-nodemon
1
0
Fork 0
mirror of https://github.com/SrIzan10/nodemon.git synced 2026-05-01 10:55:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: ignore ./<path> on cwd (#1787)

Browse Source 
Fixes: #1784

This fixes the watch/ignore rules where the config is ignoring
the relative local path of ./ - this fix was in place for the
positive (watch) test but not patched for the negative (ignore).
This commit is contained in:
Remy Sharp
2020-10-19 19:19:11 +01:00
committed by GitHub
parent 7e00a30d31
commit 03c4ed3b76
2 changed files with 52 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/monitor/match.js
View File

@@ -157,6 +157,12 @@ function match(files, monitor, ext) {
if (s.indexOf('!' + cwd) === 0) {
return s;
}
// if it starts with a period, then let's get the relative path
if (s.indexOf('!.') === 0) {
return '!' + path.resolve(cwd, s.substring(1));
}
return '!**' + (prefix !== path.sep ? path.sep : '') + s.slice(1);
}
@@ -195,12 +201,13 @@ function match(files, monitor, ext) {
for (var i = 0; i < rules.length; i++) {
if (rules[i].slice(0, 1) === '!') {
if (!minimatch(file, rules[i], minimatchOpts)) {
debug('ignored', file, 'rule:', rules[i]);
ignored++;
matched = true;
break;
}
} else {
debug('match', file, minimatch(file, rules[i], minimatchOpts));
debug('matched', file, 'rule:', rules[i]);
if (minimatch(file, rules[i], minimatchOpts)) {
watched++;

44
test/monitor/match.test.js
View File

@@ -22,6 +22,50 @@ describe('match', function() {
'!*.coffee',
];
it('should resolve ./ in positive match', () => {
const cwd = process.cwd();
const res = match(
[cwd + '/app.nodemon'],
[
'./*.nodemon',
'!**/dir/*.nodemon',
],
'js,mjs,json,nodemon'
);
assert.equal(res.result.length, 1, JSON.stringify(res));
});
it('should resolve ./ in positive match (miss test)', () => {
const cwd = process.cwd();
const res = match(
[cwd + '/dir/app.nodemon'],
[
'./*.nodemon',
'!**/dir/*.nodemon',
],
'js,mjs,json,nodemon'
);
assert.equal(res.result.length, 0, JSON.stringify(res));
assert.equal(res.ignored, 1, JSON.stringify(res));
});
it('should resolve ./ in negative match (hit test)', () => {
const cwd = process.cwd();
const res = match(
[cwd + '/app.nodemon'],
[
'!./*.nodemon',
'**/dir/*.nodemon',
],
'js,mjs,json,nodemon'
);
assert.equal(res.result.length, 0, JSON.stringify(res));
assert.equal(res.ignored, 1, JSON.stringify(res));
});
it('should handle lots of **s!', () => {
const res = match(
['test/fixtures/app.js'],