Skip to content

Commit

Permalink
Update ESLint
Browse files Browse the repository at this point in the history
Also bump side dependencies
  • Loading branch information
ooflorent committed Jun 7, 2016
1 parent 751cb41 commit 23f3abd
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
9 changes: 4 additions & 5 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
{
"extends": "eslint-config-rackt",
"parser": "babel-eslint",
"env": {
"browser": true,
"mocha": true,
"node": true
},
"rules": {
"react/jsx-uses-react": 1,
"react/jsx-uses-react": 2,
"react/jsx-uses-vars": 2,
"react/jsx-no-undef": 2,
"react/wrap-multilines": 2
},
"plugins": [
"react"
],
"globals": {
"REDUX_FORM_VERSION": true
}
]
}
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"homepage": "https://redux-form.com/",
"dependencies": {
"deep-equal": "^1.0.1",
"es6-error": "^2.1.0",
"es6-error": "^3.0.0",
"hoist-non-react-statics": "^1.0.5",
"invariant": "^2.2.1",
"is-promise": "^2.1.0",
Expand All @@ -52,7 +52,7 @@
"devDependencies": {
"babel-cli": "^6.3.17",
"babel-core": "^6.3.26",
"babel-eslint": "^5.0.0-beta9",
"babel-eslint": "^6.0.4",
"babel-loader": "^6.2.0",
"babel-plugin-lodash": "^3.1.2",
"babel-plugin-syntax-async-functions": "^6.5.0",
Expand All @@ -65,17 +65,17 @@
"babel-preset-stage-2": "^6.1.18",
"babel-register": "^6.3.13",
"cross-env": "^1.0.7",
"eslint": "^1.7.1",
"eslint": "^2.11.1",
"eslint-config-rackt": "^1.1.1",
"eslint-plugin-react": "^3.6.3",
"eslint-plugin-react": "^5.1.1",
"expect": "^1.14.0",
"expect-element": "^1.1.1",
"expect-immutable": "0.0.3",
"expect-predicate": "^1.0.0",
"flux-standard-action": "^0.6.1",
"isparta": "4.0.0",
"jsdom": "^9.1.0",
"lodash-webpack-plugin": "^0.7.0",
"lodash-webpack-plugin": "^0.9.0",
"mocha": "^2.4.5",
"react": "^15.0.0",
"react-addons-test-utils": "^15.0.0",
Expand Down
6 changes: 4 additions & 2 deletions src/reduxForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const propsToNotUpdateFor = [

const checkSubmit = submit => {
if (!submit || typeof submit !== 'function') {
throw new Error(`You must either pass handleSubmit() an onSubmit function or pass onSubmit as a prop`)
throw new Error('You must either pass handleSubmit() an onSubmit function or pass onSubmit as a prop')
}
return submit
}
Expand Down Expand Up @@ -255,6 +255,7 @@ const createReduxForm =

render() {
// remove some redux-form config-only props
/* eslint-disable no-unused-vars */
const {
arrayInsert,
arrayPop,
Expand All @@ -275,7 +276,8 @@ const createReduxForm =
registerField,
unregisterField,
...passableProps
} = this.props // eslint-disable-line no-redeclare
} = this.props
/* eslint-enable no-unused-vars */
if (isClassComponent(WrappedComponent)) {
passableProps.ref = 'wrapped'
}
Expand Down

0 comments on commit 23f3abd

Please sign in to comment.