Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
neocotic committed Nov 8, 2018
2 parents b4205ad + fcf6286 commit 4df0efb
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 3 deletions.
1 change: 0 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
AUTHORS.md
CHANGES.md
CONTRIBUTING.md
README.md
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## Version 0.4.0, 2018.11.08

* Enable `semi`, `semi-spacing`, and `semi-style` rules at ERROR level (**breaking change**)

## Version 0.3.0, 2018.05.03

* Reset all rules and start fresh by extending the `eslint:recommended` configuration (**breaking change**)
Expand Down
15 changes: 15 additions & 0 deletions es5.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,20 @@ module.exports = {
},
rules: {
// ECMAScript 5 rules for !ninja can be found below
"semi": [
"error",
"always"
],
"semi-spacing": [
"error",
{
"before": false,
"after": true
}
],
"semi-style": [
"error",
"last"
]
}
};
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint-config-notninja",
"version": "0.3.0",
"version": "0.4.0",
"description": "Standard ESLint configurations for !ninja packages",
"homepage": "https://github.com/NotNinja/eslint-config-notninja",
"bugs": {
Expand Down

0 comments on commit 4df0efb

Please sign in to comment.