Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
{
"extends": "eslint-config-rackt",
"parser": "babel-eslint",
"extends": [
"eslint:recommended",
"plugin:import/errors",
"plugin:react/recommended"
],
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true,
"experimentalObjectRestSpread": true
},
},
"env": {
"browser": true,
"mocha": true,
Expand All @@ -9,9 +22,10 @@
"valid-jsdoc": 2,
"react/jsx-uses-react": 1,
"react/jsx-no-undef": 2,
"react/wrap-multilines": 2
"react/jsx-wrap-multilines": 2
},
"plugins": [
"import",
"react"
]
}
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"devDependencies": {
"babel-cli": "^6.3.17",
"babel-core": "^6.3.26",
"babel-eslint": "^5.0.0-beta9",
"babel-eslint": "^6.1.2",
"babel-loader": "^6.2.0",
"babel-plugin-check-es2015-constants": "^6.3.13",
"babel-plugin-syntax-jsx": "^6.3.13",
Expand Down Expand Up @@ -72,9 +72,9 @@
"babel-register": "^6.3.13",
"cross-env": "^1.0.7",
"es3ify": "^0.2.0",
"eslint": "^1.7.1",
"eslint-config-rackt": "1.1.0",
"eslint-plugin-react": "^3.6.3",
"eslint": "^3.3.1",
"eslint-plugin-import": "^1.13.0",
"eslint-plugin-react": "^6.1.1",
"expect": "^1.8.0",
"glob": "^6.0.4",
"isparta": "4.0.0",
Expand Down
2 changes: 2 additions & 0 deletions test/components/Provider.spec.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/*eslint-disable react/prop-types*/

import expect from 'expect'
import React, { PropTypes, Component } from 'react'
import TestUtils from 'react-addons-test-utils'
Expand Down
9 changes: 6 additions & 3 deletions test/components/connect.spec.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/*eslint-disable react/prop-types*/

import expect from 'expect'
import React, { createClass, Children, PropTypes, Component } from 'react'
import ReactDOM from 'react-dom'
Expand Down Expand Up @@ -351,9 +353,10 @@ describe('React', () => {

componentDidMount() {
// Simulate deep object mutation
this.state.bar.baz = 'through'
const bar = this.state.bar
bar.baz = 'through'
this.setState({
bar: this.state.bar
bar
})
}

Expand Down Expand Up @@ -1022,7 +1025,7 @@ describe('React', () => {
/You must pass a component to the function/
)
})

it('should throw an error if mapState, mapDispatch, or mergeProps returns anything but a plain object', () => {
const store = createStore(() => ({}))

Expand Down