Skip to content

Commit

Permalink
Merge pull request #7 from SeabassNg/master
Browse files Browse the repository at this point in the history
Update repository for newer eslint versions
  • Loading branch information
reyawn authored Oct 24, 2017
2 parents 28ed1f8 + db30768 commit 7b5c172
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
7 changes: 4 additions & 3 deletions eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"ecmaFeatures": {
"modules": false
"parserOptions": {
"ecmaFeatures": {
"modules": false
}
},

"env": {
Expand Down Expand Up @@ -102,7 +104,6 @@
"no-unneeded-ternary": 2,
"no-unreachable": 2,
"no-unused-expressions": 2,
"no-unused-vars": [2, { "vars": "all", "args": "none" }],
"no-useless-call": 2,
"no-var": 2,
"no-with": 2,
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "eslint-config-pebble",
"description": "ESLint Shareable Config for Pebble",
"version": "4.0.0",
"version": "5.0.0",
"bugs": {
"url": "https://github.com/pebble/eslint-config-pebble/issues"
},
"peerDependencies": {
"eslint": "^3.0.0",
"eslint-plugin-standard": "^2.0.0"
"eslint": "^4.0.0",
"eslint-plugin-standard": "^3.0.0"
},
"devDependencies": {
"tape": "^4.0.0"
"tape": "^4.8.0"
},
"homepage": "https://github.com/pebble/eslint-config-pebble",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion test/basic.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var config = require('../')
var test = require('tape')

test('test basic properties of config', function (t) {
t.ok(isObject(config.ecmaFeatures))
t.ok(isObject(config.parserOptions.ecmaFeatures))
t.ok(isObject(config.env))
t.ok(isObject(config.globals))
t.ok(isObject(config.rules))
Expand Down

0 comments on commit 7b5c172

Please sign in to comment.