Skip to content

Commit

Permalink
Merge pull request #1870 from ampproject/update-eslint
Browse files Browse the repository at this point in the history
Update ESLint configuration
  • Loading branch information
westonruter authored Feb 20, 2019
2 parents ee22bab + 8b81335 commit 8e4032b
Show file tree
Hide file tree
Showing 4 changed files with 1,048 additions and 757 deletions.
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
**/*.min.js
**/node_modules/**
**/vendor/**
**/assets/js/*-compiled.js
**/assets/js/*-compiled.js
build/*
4 changes: 3 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"eslint:recommended",
"plugin:react/recommended"
],
"parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
Expand All @@ -25,7 +26,8 @@
},
"settings": {
"react": {
"pragma": "wp"
"pragma": "wp",
"version": "16.6"
}
},
"rules": {
Expand Down
Loading

0 comments on commit 8e4032b

Please sign in to comment.