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

Ignore paths from .gitignore #147

Merged
merged 17 commits into from
Oct 11, 2016
Merged

Ignore paths from .gitignore #147

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
81cb471
Add --use-gitignore feature
juanj Sep 30, 2016
4d703a5
Ignore the .gitignore files by default
juanj Sep 30, 2016
b9e5313
Inlcude description in readme
juanj Sep 30, 2016
c0eccb1
Order alphabetically.
juanj Oct 1, 2016
4dfe33e
Move code to a new function
juanj Oct 1, 2016
13d92cb
Add test
juanj Oct 1, 2016
5703434
Change ignored directory to foo
juanj Oct 1, 2016
012c30a
Requested changes.
juanj Oct 4, 2016
57040c8
Remove trailing space
juanj Oct 4, 2016
3566cf8
Add integration test
juanj Oct 4, 2016
1009113
Use indexOf
juanj Oct 5, 2016
2aa2776
Use map and reduce instead of forEach. Use path module.
juanj Oct 5, 2016
9757062
Use path.join to generate the path to check.
juanj Oct 6, 2016
bf7d913
Ignore already ignored locations when searching for .gitignore
juanj Oct 10, 2016
6e0e4af
Take in account XO cwd option
juanj Oct 10, 2016
2f172b0
Change variable names
juanj Oct 10, 2016
ce27572
Resolve merge conflict
juanj Oct 10, 2016
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
5 changes: 5 additions & 0 deletions options-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const deepAssign = require('deep-assign');
const multimatch = require('multimatch');
const resolveFrom = require('resolve-from');
const pathExists = require('path-exists');
const parseGitignore = require('parse-gitignore');

const DEFAULT_IGNORE = [
'**/node_modules/**',
Expand Down Expand Up @@ -195,6 +196,10 @@ function preprocess(opts) {
opts = mergeWithPkgConf(opts);
opts = normalizeOpts(opts);
opts.ignores = DEFAULT_IGNORE.concat(opts.ignores || []);

const gitignore = parseGitignore('.gitignore');
opts.ignores = opts.ignores.concat(gitignore || []);
Copy link
Contributor

@kevva kevva Oct 1, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

Create a function instead, getIgnores or something, that we then can export like we've done with the other ones.

opts.ignores = getIgnores(opts.ignores);


return opts;
}

Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@
"resolve-cwd": "^1.0.0",
"resolve-from": "^2.0.0",
"update-notifier": "^1.0.0",
"xo-init": "^0.3.0"
"xo-init": "^0.3.0",
"parse-gitignore": "^0.3.1"
Copy link
Contributor

Choose a reason for hiding this comment

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

These should be listed alphabetically.

},
"devDependencies": {
"ava": "*",
Expand Down
2 changes: 1 addition & 1 deletion readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ Additional global variables your code accesses during execution.

Type: `Array`

Some [paths](https://github.com/sindresorhus/xo/blob/master/options-manager.js) are ignored by default. Additional ignores can be added here.
Some [paths](https://github.com/sindresorhus/xo/blob/master/options-manager.js) are ignored by default, including paths in .gitignore. Additional ignores can be added here.

### space

Expand Down