Update ESLint config and fix errors

mjackson · mjackson · commit 5c1e93977b35 · 2015-09-25T08:35:46.000-07:00
diff --git a/.eslintrc b/.eslintrc
@@ -11,9 +11,18 @@
   },
   "parser": "babel-eslint",
   "rules": {
+    "array-bracket-spacing": [2, "always"],
+    "comma-dangle": [2, "never"],
+    "object-curly-spacing": [2, "always"],
+    "quotes": [2, "single", "avoid-escape"],
+    "semi": [2, "never"],
     "strict": 0,
-    "react/prop-types": 2,
-    "react/jsx-uses-react": 1
+    "space-before-blocks": [2, "always"],
+    "space-before-function-paren": [2, {"anonymous":"always","named":"never"}],
+    "react/jsx-uses-react": 1,
+    "react/jsx-quotes": 2,
+    "react/jsx-no-undef": 2,
+    "react/wrap-multilines": 2
   },
   "plugins": [
     "react"
diff --git a/modules/History.js b/modules/History.js
@@ -4,7 +4,7 @@ const History = {
 
   contextTypes: { history },
 
-  componentWillMount () {
+  componentWillMount() {
     this.history = this.context.history
   }
 
diff --git a/modules/PatternUtils.js b/modules/PatternUtils.js
@@ -1,7 +1,7 @@
 import invariant from 'invariant'
 
 function escapeRegExp(string) {
-  return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
+  return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
 }
 
 function escapeSource(string) {
diff --git a/modules/Router.js b/modules/Router.js
@@ -66,7 +66,7 @@ const Router = React.createClass({
   componentWillReceiveProps(nextProps) {
     warning(
       nextProps.history === this.props.history,
-      "The `history` provided to <Router/> has changed, it will be ignored."
+      'You cannot change <Router history>; it will be ignored'
     )
   },
 
diff --git a/modules/__tests__/History-test.js b/modules/__tests__/History-test.js
@@ -27,7 +27,7 @@ describe('History Mixin', function () {
     let Component = React.createClass({
       mixins: [ History ],
       componentWillMount: assertHistory,
-      render () { return null }
+      render() { return null }
     })
 
     React.render((
diff --git a/modules/__tests__/IndexRoute-test.js b/modules/__tests__/IndexRoute-test.js
@@ -9,27 +9,27 @@ import Route from '../Route'
 
 describe('an <IndexRoute/>', function () {
 
-  var node
-  beforeEach(function () {
-    node = document.createElement('div')
-  })
-
-  afterEach(function () {
-    React.unmountComponentAtNode(node)
-  })
-
-  var Parent = React.createClass({
-    render () {
+  const Parent = React.createClass({
+    render() {
       return <div>parent {this.props.children}</div>
     }
   })
 
-  var Child = React.createClass({
-    render () {
+  const Child = React.createClass({
+    render() {
       return <div>child </div>
     }
   })
 
+  let node
+  beforeEach(function () {
+    node = document.createElement('div')
+  })
+
+  afterEach(function () {
+    React.unmountComponentAtNode(node)
+  })
+
   it('renders when its parent’s url matches exactly', function (done) {
     React.render((
       <Router history={createHistory('/')}>
@@ -60,4 +60,5 @@ describe('an <IndexRoute/>', function () {
       })
     })
   })
+
 })
diff --git a/modules/__tests__/Link-test.js b/modules/__tests__/Link-test.js
@@ -13,11 +13,6 @@ const { click } = React.addons.TestUtils.Simulate
 
 describe('A <Link>', function () {
 
-  let node
-  beforeEach(function () {
-    node = document.createElement('div')
-  })
-
   const Hello = React.createClass({
     render() {
       return <div>Hello {this.props.params.name}!</div>
@@ -30,10 +25,15 @@ describe('A <Link>', function () {
     }
   })
 
+  let node
+  beforeEach(function () {
+    node = document.createElement('div')
+  })
+
   it('knows how to make its href', function () {
     const LinkWrapper = React.createClass({
       render() {
-        return <Link to="/hello/michael" query={{the: 'query'}}>Link</Link>
+        return <Link to="/hello/michael" query={{ the: 'query' }}>Link</Link>
       }
     })
 
@@ -209,7 +209,7 @@ describe('A <Link>', function () {
       const execNextStep = execSteps(steps, done)
 
       React.render((
-        <Router history={createHistory("/goodbye")} onUpdate={execNextStep}>
+        <Router history={createHistory('/goodbye')} onUpdate={execNextStep}>
           <Route path="/" component={LinkWrapper}>
             <Route path="hello" component={Hello} />
             <Route path="goodbye" component={Goodbye} />
@@ -219,8 +219,8 @@ describe('A <Link>', function () {
     })
   })
 
-  describe('when route changes', function() {
-    it.skip('changes active state', function(done) {
+  describe('when route changes', function () {
+    it.skip('changes active state', function (done) {
       const LinkWrapper = React.createClass({
         shouldComponentUpdate() {
           return false
diff --git a/modules/__tests__/RouteComponent-test.js b/modules/__tests__/RouteComponent-test.js
@@ -32,7 +32,7 @@ describe('a Route Component', function () {
 
     function assertProps(props) {
       expect(props.route).toEqual(parent)
-      expect(props.routes).toEqual([parent, child])
+      expect(props.routes).toEqual([ parent, child ])
     }
 
     React.render((
diff --git a/modules/__tests__/Router-test.js b/modules/__tests__/Router-test.js
@@ -82,7 +82,7 @@ describe('Router', function () {
     })
   })
 
-  it('renders with a custom `createElement` prop', function(done) {
+  it('renders with a custom `createElement` prop', function (done) {
     const Wrapper = React.createClass({
       render() {
         const { Component } = this.props
@@ -106,8 +106,8 @@ describe('Router', function () {
     })
   })
 
-  describe('with named components', function() {
-    it('renders the named components', function(done) {
+  describe('with named components', function () {
+    it('renders the named components', function (done) {
       const Parent = React.createClass({
         render() {
           return (
@@ -133,7 +133,7 @@ describe('Router', function () {
       React.render((
         <Router history={createHistory('/')}>
           <Route component={Parent}>
-            <Route path="/" components={{sidebar: Sidebar, content: Content}} />
+            <Route path="/" components={{ sidebar: Sidebar, content: Content }} />
           </Route>
         </Router>
       ), node, function () {
@@ -144,10 +144,10 @@ describe('Router', function () {
   })
 
   describe('at a route with special characters', function () {
-    it('does not double escape', function(done) {
+    it('does not double escape', function (done) {
       // https://github.com/rackt/react-router/issues/1574
       let MyComponent = React.createClass({
-        render () { return <div>{this.props.params.some_token}</div> }
+        render() { return <div>{this.props.params.some_token}</div> }
       })
 
       React.render((
@@ -160,13 +160,13 @@ describe('Router', function () {
       })
     })
 
-    it('does not double escape when nested', function(done) {
+    it('does not double escape when nested', function (done) {
       // https://github.com/rackt/react-router/issues/1574
       let MyWrapperComponent = React.createClass({
-        render () { return this.props.children }
+        render() { return this.props.children }
       })
       let MyComponent = React.createClass({
-        render () { return <div>{this.props.params.some_token}</div> }
+        render() { return <div>{this.props.params.some_token}</div> }
       })
 
       React.render((
@@ -181,10 +181,10 @@ describe('Router', function () {
       })
     })
 
-    it('is happy to have colons in parameter values', function(done) {
+    it('is happy to have colons in parameter values', function (done) {
       // https://github.com/rackt/react-router/issues/1759
       let MyComponent = React.createClass({
-        render () { return <div>{this.props.params.foo}</div> }
+        render() { return <div>{this.props.params.foo}</div> }
       })
 
       React.render((
@@ -197,10 +197,10 @@ describe('Router', function () {
       })
     })
 
-    it('handles % in parameters', function(done) {
+    it('handles % in parameters', function (done) {
       // https://github.com/rackt/react-router/issues/1766
       let MyComponent = React.createClass({
-        render () { return <div>{this.props.params.name}</div> }
+        render() { return <div>{this.props.params.name}</div> }
       })
 
       React.render((
@@ -213,7 +213,7 @@ describe('Router', function () {
       })
     })
 
-    it('handles forward slashes', function(done) {
+    it('handles forward slashes', function (done) {
       // https://github.com/rackt/react-router/issues/1865
       class Parent extends React.Component {
         render() {
@@ -223,7 +223,7 @@ describe('Router', function () {
 
       class Child extends React.Component {
         render() {
-          const {params} = this.props
+          const { params } = this.props
           return <h1>{params.name}</h1>
         }
       }
diff --git a/modules/__tests__/matchRoutes-test.js b/modules/__tests__/matchRoutes-test.js
@@ -233,7 +233,7 @@ describe('matchRoutes', function () {
       ])
     })
 
-    it('when getChildRoutes callback returns reactElements', function(done) {
+    it('when getChildRoutes callback returns reactElements', function (done) {
       matchRoutes(jsxRoutes, createLocation('/users/5'), function (error, match) {
          assert(match)
          expect(match.routes.map(r => r.path)).toEqual([ 'users', ':userID' ])
@@ -242,7 +242,7 @@ describe('matchRoutes', function () {
       })
     })
 
-    it('when getIndexRoute callback returns reactElements', function(done) {
+    it('when getIndexRoute callback returns reactElements', function (done) {
       matchRoutes(jsxRoutes, createLocation('/users'), function (error, match) {
          assert(match)
          expect(match.routes.map(r => r.name)).toEqual([ 'users', 'jsx' ])
diff --git a/modules/__tests__/serverRendering-test.js b/modules/__tests__/serverRendering-test.js
@@ -58,7 +58,7 @@ describe('server rendering', function () {
 
     RedirectRoute = {
       path: '/company',
-      onEnter (nextState, replaceState) {
+      onEnter(nextState, replaceState) {
         replaceState(null, '/about')
       }
     }
diff --git a/modules/match.js b/modules/match.js
@@ -2,7 +2,7 @@ import createMemoryHistory from 'history/lib/createMemoryHistory'
 import useRoutes from './useRoutes'
 import { createRoutes } from './RouteUtils'
 
-export default function match({
+function match({
   routes,
   history,
   location,
@@ -18,8 +18,9 @@ export default function match({
   })
 
   staticHistory.match(location, function (error, nextLocation, nextState) {
-    let renderProps = nextState ? {...nextState, history: staticHistory} : null
+    let renderProps = nextState ? { ...nextState, history: staticHistory } : null
     cb(error, nextLocation, renderProps)
   })
 }
 
+export default match
diff --git a/modules/matchRoutes.js b/modules/matchRoutes.js
@@ -6,8 +6,8 @@ function getChildRoutes(route, location, callback) {
   if (route.childRoutes) {
     callback(null, route.childRoutes)
   } else if (route.getChildRoutes) {
-    route.getChildRoutes(location, function(error, childRoutes) {
-        callback(error, !error && createRoutes(childRoutes))
+    route.getChildRoutes(location, function (error, childRoutes) {
+      callback(error, !error && createRoutes(childRoutes))
     })
   } else {
     callback()
@@ -18,8 +18,8 @@ function getIndexRoute(route, location, callback) {
   if (route.indexRoute) {
     callback(null, route.indexRoute)
   } else if (route.getIndexRoute) {
-    route.getIndexRoute(location, function(error, indexRoute) {
-        callback(error, !error && createRoutes(indexRoute)[0])
+    route.getIndexRoute(location, function (error, indexRoute) {
+      callback(error, !error && createRoutes(indexRoute)[0])
     })
   } else {
     callback()
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,4 +1,4 @@
-var webpack = require('webpack');
+var webpack = require('webpack')
 
 module.exports = {
 
@@ -9,11 +9,11 @@ module.exports = {
 
   externals: [
     {
-      "react": {
-        root: "React",
-        commonjs2: "react",
-        commonjs: "react",
-        amd: "react"
+      react: {
+        root: 'React',
+        commonjs2: 'react',
+        commonjs: 'react',
+        amd: 'react'
       }
     }
   ],
@@ -35,4 +35,4 @@ module.exports = {
     })
   ]
 
-};
+}

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ const History = {`
`4`	`4`
`5`	`5`	`contextTypes: { history },`
`6`	`6`
`7`		`- componentWillMount () {`
	`7`	`+ componentWillMount() {`
`8`	`8`	`this.history = this.context.history`
`9`	`9`	`}`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import invariant from 'invariant'`
`2`	`2`
`3`	`3`	`function escapeRegExp(string) {`
`4`		`- return string.replace(/[.*+?^${}()\|[\]\\]/g, "\\$&")`
	`4`	`+ return string.replace(/[.*+?^${}()\|[\]\\]/g, '\\$&')`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`function escapeSource(string) {`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ const Router = React.createClass({`
`66`	`66`	`componentWillReceiveProps(nextProps) {`
`67`	`67`	`warning(`
`68`	`68`	`nextProps.history === this.props.history,`
`69`		- "The `history` provided to <Router/> has changed, it will be ignored."
	`69`	`+ 'You cannot change <Router history>; it will be ignored'`
`70`	`70`	`)`
`71`	`71`	`},`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ describe('a Route Component', function () {`
`32`	`32`
`33`	`33`	`function assertProps(props) {`
`34`	`34`	`expect(props.route).toEqual(parent)`
`35`		`- expect(props.routes).toEqual([parent, child])`
	`35`	`+ expect(props.routes).toEqual([ parent, child ])`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`React.render((`