Skip to content

Commit 09074af

Browse files
authored
Merge pull request #289 from FormidableLabs/jp-fixup-lint
fixup lint task
2 parents 68fce44 + 9b65e58 commit 09074af

File tree

4 files changed

+259
-126
lines changed

4 files changed

+259
-126
lines changed

.eslintrc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
22
"root": true,
3-
"parser": "babel-eslint",
3+
"parser": "@babel/eslint-parser",
44
"extends": [
5-
"formidable/configurations/es6-react",
5+
"eslint:recommended",
6+
"plugin:react/recommended",
7+
"plugin:import/recommended",
68
"prettier",
79
"prettier/react"
810
],
@@ -23,7 +25,8 @@
2325
"jsx": true,
2426
"generators": true,
2527
"experimentalObjectRestSpread": true
26-
}
28+
},
29+
"requireConfigFile": false
2730
},
2831
"rules": {
2932
"comma-dangle": "off",

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"storybook": "start-storybook -p 9001",
1212
"storybook:build": "build-storybook -o .out",
1313
"prebuild:lib": "rm -rf lib/*",
14+
"prebuild": "yarn lint",
1415
"build": "rollup -c",
1516
"prepublishOnly": "npm run build",
1617
"test": "jest",
@@ -50,11 +51,10 @@
5051
"enzyme": "^3.3.0",
5152
"enzyme-adapter-react-16": "^1.1.1",
5253
"eslint": "^5.16.0",
53-
"eslint-config-formidable": "^3.0.0",
5454
"eslint-config-prettier": "^2.9.0",
5555
"eslint-plugin-filenames": "^1.2.0",
56-
"eslint-plugin-import": "^2.9.0",
57-
"eslint-plugin-react": "^7.7.0",
56+
"eslint-plugin-import": "^2.25.4",
57+
"eslint-plugin-react": "^7.28.0",
5858
"jest": "^27.0.6",
5959
"prettier": "^1.17.0",
6060
"react": "^16.8.0",
@@ -100,4 +100,4 @@
100100
"testURL": "http://localhost/"
101101
},
102102
"sideEffects": false
103-
}
103+
}

src/utils/test/errorBoundary.test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ describe('errorBoundary', () => {
1717
const errorCb = jest.fn();
1818

1919
const Component = errorBoundary(
20-
class extends React.Component {
20+
class Test extends React.Component {
21+
// eslint-disable-next-line react/require-render-return
2122
render() {
2223
throw new Error('test');
2324
}

0 commit comments

Comments
 (0)