Skip to content

Commit

Permalink
Merge pull request #48 from editorconfig-checker/greenkeeper/xo-0.24.0
Browse files Browse the repository at this point in the history
Update xo to the latest version 🚀
  • Loading branch information
mstruebing authored Feb 16, 2019
2 parents c1a266c + 85a4344 commit b399830
Show file tree
Hide file tree
Showing 6 changed files with 419 additions and 229 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ git clone [email protected]:editorconfig-checker/editorconfig-checker.javascript.gi

## Usage

There is an alias from `editorconfig-checker` to `ec` so you can exchange every occurrence of `editorconfig-checker` with `ec`.

If you installed it via npm you have a binary in your `node_modules/.bin` folder called `editorconfig-checker`.
Then you could create a script in your `package.json` like this:

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@
"babel-preset-es2015": "^6.24.0",
"coveralls": "^3.0.0",
"jest": "^23.0.0",
"xo": "^0.23.0"
"xo": "^0.24.0"
}
}
1 change: 1 addition & 0 deletions src/editorconfig/editorconfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const getEditorconfigForFile = filePath => {
if (fileExists(editorconfigPath)) {
editorconfig = mergeDeep({}, iniparser.parseSync(editorconfigPath), editorconfig);
}

currentPath = path.dirname(currentPath);
} while (currentPath.includes(rootDir) && !editorconfig.root);

Expand Down
1 change: 1 addition & 0 deletions src/utils/merge-deep.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const mergeDeep = (target, ...sources) => {
if (!target[key]) {
Object.assign(target, {[key]: {}});
}

mergeDeep(target[key], source[key]);
} else {
Object.assign(target, {[key]: source[key]});
Expand Down
2 changes: 1 addition & 1 deletion src/validation/validation-process.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import validateFile from './validation-processor'; // eslint-disable-line no-unused-vars
import validateFile from './validation-processor';

console.error = jest.fn();

Expand Down
Loading

0 comments on commit b399830

Please sign in to comment.