Skip to content

Commit

Permalink
Merge pull request #1796 from roots/use-stock-eslint
Browse files Browse the repository at this point in the history
Use stock eslint
  • Loading branch information
swalkinshaw authored Jan 11, 2017
2 parents e7366d4 + 23d283c commit 6240a83
Show file tree
Hide file tree
Showing 4 changed files with 5,643 additions and 5,718 deletions.
27 changes: 24 additions & 3 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,14 +1,35 @@
{
"root": true,
"extends": "airbnb",
"extends": "eslint:recommended",
"globals": {
"wp": true
},
"env": {
"node": true,
"es6": true,
"amd": true,
"browser": true,
"jquery": true,
"node": true
"jquery": true
},
"parserOptions": {
"ecmaFeatures": {
"globalReturn": true,
"generators": false,
"objectLiteralDuplicateProperties": false,
"experimentalObjectRestSpread": true
},
"ecmaVersion": 2017,
"sourceType": "module"
},
"plugins": [
"import",
],
"settings": {
"import/core-modules": [],
"import/ignore": [
"node_modules",
"\\.(coffee|scss|css|less|hbs|svg|json)$"
]
},
"rules": {
"comma-dangle": ["error", {
Expand Down
1 change: 0 additions & 1 deletion assets/build/.eslintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"root": false,
"extends": "airbnb",
"rules": {
"import/no-extraneous-dependencies": 0,
"prefer-rest-params": 0,
Expand Down
3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,8 @@
"css-loader": "^0.26.1",
"cssnano": "^3.10.0",
"eslint": "^3.13.1",
"eslint-config-airbnb": "^14.0.0",
"eslint-loader": "^1.6.1",
"eslint-plugin-import": "^2.0.1",
"eslint-plugin-jsx-a11y": "^3.0.2",
"eslint-plugin-react": "^6.9.0",
"extract-text-webpack-plugin": "^2.0.0-beta.4",
"file-loader": "^0.9.0",
"glob": "^7.1.1",
Expand Down
Loading

0 comments on commit 6240a83

Please sign in to comment.