Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: remy/nodemon
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.0.5
Choose a base ref
...
head repository: remy/nodemon
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.0.6
Choose a head ref
  • 3 commits
  • 8 files changed
  • 2 contributors

Commits on Oct 19, 2020

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

    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).
    remy authored Oct 19, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    03c4ed3 View commit details
  2. chore: Switch from JSCS to ESLint

    Antrikshy authored and remy committed Oct 19, 2020
    Copy the full SHA
    66ec7cd View commit details
  3. chore: change test targets (#1788)

    No longer testing in node@8 as of [email protected]
    
    Adding node@14 and dropping non-LTS targets (odd versions).
    remy authored Oct 19, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f74f4a2 View commit details
Showing with 726 additions and 1,005 deletions.
  1. +19 −0 .eslintrc.json
  2. +1 −1 .github/CONTRIBUTING.md
  3. +0 −13 .jscsrc
  4. +1 −2 .travis.yml
  5. +8 −1 lib/monitor/match.js
  6. +651 −986 package-lock.json
  7. +2 −2 package.json
  8. +44 −0 test/monitor/match.test.js
19 changes: 19 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"env": {
"browser": true,
"commonjs": true,
"es2021": true
},
"parserOptions": {
"ecmaVersion": 12
},
"rules": {
"space-before-function-paren": [
2,
{
"anonymous": "ignore",
"named": "never"
}
]
}
}
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ This will allow for the automatic changelog to generate correctly.

## Code standards

Ensure that your code adheres to the included `.jshintrc` and `.jscsrc` configs.
Ensure that your code adheres to the included `.jshintrc` and `.eslintrc.json` configs.

## Sending pull requests

13 changes: 0 additions & 13 deletions .jscsrc

This file was deleted.

3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -5,10 +5,9 @@ cache:
notifications:
email: false
node_js:
- '14'
- '12'
- '11'
- '10'
- '8'
before_install:
- if [ "$TRAVIS_PULL_REQUEST_BRANCH" == "" ]; then echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" >> .npmrc; fi
after_success:
9 changes: 8 additions & 1 deletion lib/monitor/match.js
Original file line number Diff line number Diff line change
@@ -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++;

Loading