Skip to content

Commit

Permalink
Merge pull request #1193 from terrestris/greenkeeper/eslint-6.0.0
Browse files Browse the repository at this point in the history
Update eslint to the latest version 馃殌
  • Loading branch information
dnlkoch committed Jun 24, 2019
2 parents 8e8bb5f + ca83821 commit 595c0ec
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .eslint-common.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ module.exports = {
"plugin:react/recommended"
],
"plugins": [
"html",
"react",
"markdown"
],
Expand All @@ -17,6 +16,7 @@ module.exports = {
"Promise": false
},
"rules": {
"no-console": "error",
"indent": ["error", 2, { "SwitchCase": 1 }],
"linebreak-style": ["error", "unix"],
"quotes": ["error", "single", { "allowTemplateLiterals": true }],
Expand Down
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"coveralls": "cat coverage/lcov.info | coveralls",
"prepublishOnly": "npm run build",
"lint:styleguide": "eslint -c .eslint-styleguide.js --ext md src/",
"lint:src": "eslint -c .eslint-src.js --ext js,jsx,html src/",
"lint:src": "eslint -c .eslint-src.js --ext js,jsx src/",
"lint": "npm run lint:styleguide && npm run lint:src",
"lint:fix": "npm run lint:styleguide -- --fix && npm run lint:src -- --fix",
"start:styleguide": "styleguidist server",
Expand Down Expand Up @@ -113,10 +113,9 @@
"css-loader": "3.0.0",
"enzyme": "3.10.0",
"enzyme-adapter-react-16": "1.14.0",
"eslint": "5.16.0",
"eslint-plugin-html": "5.0.5",
"eslint": "6.0.0",
"eslint-plugin-markdown": "1.0.0",
"eslint-plugin-react": "7.14.0",
"eslint-plugin-react": "7.14.1",
"file-loader": "4.0.0",
"jest": "24.8.0",
"jest-canvas-mock": "2.1.0",
Expand Down

0 comments on commit 595c0ec

Please sign in to comment.