Skip to content

Commit

Permalink
Merge pull request #289 from FormidableLabs/jp-fixup-lint
Browse files Browse the repository at this point in the history
fixup lint task
  • Loading branch information
jpdriver committed Jan 18, 2022
2 parents 68fce44 + 9b65e58 commit 09074af
Show file tree
Hide file tree
Showing 4 changed files with 259 additions and 126 deletions.
9 changes: 6 additions & 3 deletions .eslintrc
@@ -1,8 +1,10 @@
{
"root": true,
"parser": "babel-eslint",
"parser": "@babel/eslint-parser",
"extends": [
"formidable/configurations/es6-react",
"eslint:recommended",
"plugin:react/recommended",
"plugin:import/recommended",
"prettier",
"prettier/react"
],
Expand All @@ -23,7 +25,8 @@
"jsx": true,
"generators": true,
"experimentalObjectRestSpread": true
}
},
"requireConfigFile": false
},
"rules": {
"comma-dangle": "off",
Expand Down
8 changes: 4 additions & 4 deletions package.json
Expand Up @@ -11,6 +11,7 @@
"storybook": "start-storybook -p 9001",
"storybook:build": "build-storybook -o .out",
"prebuild:lib": "rm -rf lib/*",
"prebuild": "yarn lint",
"build": "rollup -c",
"prepublishOnly": "npm run build",
"test": "jest",
Expand Down Expand Up @@ -50,11 +51,10 @@
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.1",
"eslint": "^5.16.0",
"eslint-config-formidable": "^3.0.0",
"eslint-config-prettier": "^2.9.0",
"eslint-plugin-filenames": "^1.2.0",
"eslint-plugin-import": "^2.9.0",
"eslint-plugin-react": "^7.7.0",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-react": "^7.28.0",
"jest": "^27.0.6",
"prettier": "^1.17.0",
"react": "^16.8.0",
Expand Down Expand Up @@ -100,4 +100,4 @@
"testURL": "http://localhost/"
},
"sideEffects": false
}
}
3 changes: 2 additions & 1 deletion src/utils/test/errorBoundary.test.js
Expand Up @@ -17,7 +17,8 @@ describe('errorBoundary', () => {
const errorCb = jest.fn();

const Component = errorBoundary(
class extends React.Component {
class Test extends React.Component {
// eslint-disable-next-line react/require-render-return
render() {
throw new Error('test');
}
Expand Down

0 comments on commit 09074af

Please sign in to comment.