Merge pull request reduxjs#618 from mikekidder/fix.eslint.updates

updates for eslint cleanup

Author: gaearon

.eslintignore

@@ -1,8 +1,5 @@
-lib
-node_modules
-examples/todomvc/node_modules
-examples/todomvc/server.js
-examples/todomvc/webpack.config.js
-examples/counter/node_modules
-examples/counter/server.js
-examples/counter/webpack.config.js
+lib/*
+**/dist/*
+**/node_modules/*
+**/server.js
+**/webpack.config*.js

.travis.yml

@@ -2,6 +2,7 @@ language: node_js
 node_js:
   - "iojs-2"
 script:
+  - npm run lint
   - npm test
   - npm run build:examples
   - npm run test:examples

examples/async/actions/index.js

@@ -41,18 +41,18 @@ function fetchPosts(reddit) {
     return fetch(`http://www.reddit.com/r/${reddit}.json`)
       .then(response => response.json())
       .then(json => dispatch(receivePosts(reddit, json)));
-  }
+  };
 }
 
 function shouldFetchPosts(state, reddit) {
   const posts = state.postsByReddit[reddit];
   if (!posts) {
     return true;
-  } else if (posts.isFetching) {
+  }
+  if (posts.isFetching) {
     return false;
-  } else {
-    return posts.didInvalidate;
   }
+  return posts.didInvalidate;
 }
 
 export function fetchPostsIfNeeded(reddit) {

examples/async/components/Picker.js

@@ -1,7 +1,7 @@
 import React, { Component, PropTypes } from 'react';
 
 export default class Picker extends Component {
-  render () {
+  render() {
     const { value, onChange, options } = this.props;
 
     return (
@@ -26,4 +26,4 @@ Picker.propTypes = {
   ).isRequired,
   value: PropTypes.string.isRequired,
   onChange: PropTypes.func.isRequired
-};
+};

examples/async/components/Posts.js

@@ -1,7 +1,7 @@
 import React, { PropTypes, Component } from 'react';
 
 export default class Posts extends Component {
-  render () {
+  render() {
     return (
       <ul>
         {this.props.posts.map((post, i) =>

examples/async/containers/AsyncApp.js

@@ -35,7 +35,7 @@ class AsyncApp extends Component {
     dispatch(fetchPostsIfNeeded(selectedReddit));
   }
 
-  render () {
+  render() {
     const { selectedReddit, posts, isFetching, lastUpdated } = this.props;
     return (
       <div>

examples/async/reducers/index.js

@@ -58,4 +58,4 @@ const rootReducer = combineReducers({
   selectedReddit
 });
 
-export default rootReducer;
+export default rootReducer;

examples/counter/containers/CounterApp.js

@@ -6,7 +6,7 @@ import * as CounterActions from '../actions/counter';
 function mapStateToProps(state) {
   return {
     counter: state.counter
-  }
+  };
 }
 
 function mapDispatchToProps(dispatch) {

examples/counter/reducers/index.js

@@ -5,4 +5,4 @@ const rootReducer = combineReducers({
   counter
 });
 
-export default rootReducer;
+export default rootReducer;

examples/real-world/actions/index.js

@@ -3,10 +3,9 @@ import { CALL_API, Schemas } from '../middleware/api';
 export const USER_REQUEST = 'USER_REQUEST';
 export const USER_SUCCESS = 'USER_SUCCESS';
 export const USER_FAILURE = 'USER_FAILURE';
-/**
- * Fetches a single user from Github API.
- * Relies on the custom API middleware defined in ../middleware/api.js.
- */
+
+// Fetches a single user from Github API.
+// Relies on the custom API middleware defined in ../middleware/api.js.
 function fetchUser(login) {
   return {
     [CALL_API]: {
@@ -16,10 +15,9 @@ function fetchUser(login) {
     }
   };
 }
-/**
- * Fetches a single user from Github API unless it is cached.
- * Relies on Redux Thunk middleware.
- */
+
+// Fetches a single user from Github API unless it is cached.
+// Relies on Redux Thunk middleware.
 export function loadUser(login, requiredFields = []) {
   return (dispatch, getState) => {
     const user = getState().entities.users[login];
@@ -34,10 +32,9 @@ export function loadUser(login, requiredFields = []) {
 export const REPO_REQUEST = 'REPO_REQUEST';
 export const REPO_SUCCESS = 'REPO_SUCCESS';
 export const REPO_FAILURE = 'REPO_FAILURE';
-/**
- * Fetches a single repository from Github API.
- * Relies on the custom API middleware defined in ../middleware/api.js.
- */
+
+// Fetches a single repository from Github API.
+// Relies on the custom API middleware defined in ../middleware/api.js.
 function fetchRepo(fullName) {
   return {
     [CALL_API]: {
@@ -47,10 +44,9 @@ function fetchRepo(fullName) {
     }
   };
 }
-/**
- * Fetches a single repository from Github API unless it is cached.
- * Relies on Redux Thunk middleware.
- */
+
+// Fetches a single repository from Github API unless it is cached.
+// Relies on Redux Thunk middleware.
 export function loadRepo(fullName, requiredFields = []) {
   return (dispatch, getState) => {
     const repo = getState().entities.repos[fullName];
@@ -65,10 +61,9 @@ export function loadRepo(fullName, requiredFields = []) {
 export const STARRED_REQUEST = 'STARRED_REQUEST';
 export const STARRED_SUCCESS = 'STARRED_SUCCESS';
 export const STARRED_FAILURE = 'STARRED_FAILURE';
-/**
- * Fetches a page of starred repos by a particular user.
- * Relies on the custom API middleware defined in ../middleware/api.js.
- */
+
+// Fetches a page of starred repos by a particular user.
+// Relies on the custom API middleware defined in ../middleware/api.js.
 function fetchStarred(login, nextPageUrl) {
   return {
     login,
@@ -79,11 +74,10 @@ function fetchStarred(login, nextPageUrl) {
     }
   };
 }
-/**
- * Fetches a page of starred repos by a particular user.
- * Bails out if page is cached and user didn’t specifically request next page.
- * Relies on Redux Thunk middleware.
- */
+
+// Fetches a page of starred repos by a particular user.
+// Bails out if page is cached and user didn’t specifically request next page.
+// Relies on Redux Thunk middleware.
 export function loadStarred(login, nextPage) {
   return (dispatch, getState) => {
     const {
@@ -99,14 +93,12 @@ export function loadStarred(login, nextPage) {
   };
 }
 
-
 export const STARGAZERS_REQUEST = 'STARGAZERS_REQUEST';
 export const STARGAZERS_SUCCESS = 'STARGAZERS_SUCCESS';
 export const STARGAZERS_FAILURE = 'STARGAZERS_FAILURE';
-/**
- * Fetches a page of stargazers for a particular repo.
- * Relies on the custom API middleware defined in ../middleware/api.js.
- */
+
+// Fetches a page of stargazers for a particular repo.
+// Relies on the custom API middleware defined in ../middleware/api.js.
 function fetchStargazers(fullName, nextPageUrl) {
   return {
     fullName,
@@ -117,11 +109,10 @@ function fetchStargazers(fullName, nextPageUrl) {
     }
   };
 }
-/**
- * Fetches a page of stargazers for a particular repo.
- * Bails out if page is cached and user didn’t specifically request next page.
- * Relies on Redux Thunk middleware.
- */
+
+// Fetches a page of stargazers for a particular repo.
+// Bails out if page is cached and user didn’t specifically request next page.
+// Relies on Redux Thunk middleware.
 export function loadStargazers(fullName, nextPage) {
   return (dispatch, getState) => {
     const {
@@ -138,9 +129,8 @@ export function loadStargazers(fullName, nextPage) {
 }
 
 export const RESET_ERROR_MESSAGE = 'RESET_ERROR_MESSAGE';
-/**
- * Resets the currently visible error message.
- */
+
+// Resets the currently visible error message.
 export function resetErrorMessage() {
   return {
     type: RESET_ERROR_MESSAGE

examples/real-world/components/Explore.js

@@ -51,7 +51,7 @@ export default class Explore extends Component {
   }
 
   handleGoClick() {
-    this.props.onChange(this.getInputValue())
+    this.props.onChange(this.getInputValue());
   }
 }
 

examples/real-world/middleware/api.js

@@ -2,9 +2,7 @@ import { Schema, arrayOf, normalize } from 'normalizr';
 import { camelizeKeys } from 'humps';
 import 'isomorphic-fetch';
 
-/**
- * Extracts the next page URL from Github API response.
- */
+// Extracts the next page URL from Github API response.
 function getNextPageUrl(response) {
   const link = response.headers.get('link');
   if (!link) {
@@ -21,16 +19,12 @@ function getNextPageUrl(response) {
 
 const API_ROOT = 'https://api.github.com/';
 
-/**
- * Fetches an API response and normalizes the result JSON according to schema.
- * This makes every API response have the same shape, regardless of how nested it was.
- */
+// Fetches an API response and normalizes the result JSON according to schema.
+// This makes every API response have the same shape, regardless of how nested it was.
 function callApi(endpoint, schema) {
-  if (endpoint.indexOf(API_ROOT) === -1) {
-    endpoint = API_ROOT + endpoint;
-  }
+  const fullUrl = (endpoint.indexOf(API_ROOT) === -1) ? API_ROOT + endpoint : endpoint;
 
-  return fetch(endpoint)
+  return fetch(fullUrl)
     .then(response =>
       response.json().then(json => ({ json, response }))
     ).then(({ json, response }) => {
@@ -68,25 +62,19 @@ repoSchema.define({
   owner: userSchema
 });
 
-/**
- * Schemas for Github API responses.
- */
+// Schemas for Github API responses.
 export const Schemas = {
   USER: userSchema,
   USER_ARRAY: arrayOf(userSchema),
   REPO: repoSchema,
   REPO_ARRAY: arrayOf(repoSchema)
 };
 
-/**
- * Action key that carries API call info interpreted by this Redux middleware.
- */
+// Action key that carries API call info interpreted by this Redux middleware.
 export const CALL_API = Symbol('Call API');
 
-/**
- * A Redux middleware that interprets actions with CALL_API info specified.
- * Performs the call and promises when such actions are dispatched.
- */
+// A Redux middleware that interprets actions with CALL_API info specified.
+// Performs the call and promises when such actions are dispatched.
 export default store => next => action => {
   const callAPI = action[CALL_API];
   if (typeof callAPI === 'undefined') {

examples/real-world/reducers/index.js

@@ -3,9 +3,7 @@ import merge from 'lodash/object/merge';
 import paginate from './paginate';
 import { combineReducers } from 'redux';
 
-/**
- * Updates an entity cache in response to any action with response.entities.
- */
+// Updates an entity cache in response to any action with response.entities.
 export function entities(state = { users: {}, repos: {} }, action) {
   if (action.response && action.response.entities) {
     return merge({}, state, action.response.entities);
@@ -14,9 +12,7 @@ export function entities(state = { users: {}, repos: {} }, action) {
   return state;
 }
 
-/**
- * Updates error message to notify about the failed fetches.
- */
+// Updates error message to notify about the failed fetches.
 export function errorMessage(state = null, action) {
   const { type, error } = action;
 
@@ -29,9 +25,7 @@ export function errorMessage(state = null, action) {
   return state;
 }
 
-/**
- * Updates the pagination data for different actions.
- */
+// Updates the pagination data for different actions.
 export const pagination = combineReducers({
   starredByUser: paginate({
     mapActionToKey: action => action.login,

examples/real-world/reducers/paginate.js

@@ -1,10 +1,8 @@
 import merge from 'lodash/object/merge';
 import union from 'lodash/array/union';
 
-/**
- * Creates a reducer managing pagination, given the action types to handle,
- * and a function telling how to extract the key from an action.
- */
+// Creates a reducer managing pagination, given the action types to handle,
+// and a function telling how to extract the key from an action.
 export default function paginate({ types, mapActionToKey }) {
   if (!Array.isArray(types) || types.length !== 3) {
     throw new Error('Expected types to be an array of three elements.');

examples/real-world/store/configureStore.js

@@ -11,9 +11,7 @@ const createStoreWithMiddleware = applyMiddleware(
   loggerMiddleware
 )(createStore);
 
-/**
- * Creates a preconfigured store for this example.
- */
+// Creates a preconfigured store for this example.
 export default function configureStore(initialState) {
   return createStoreWithMiddleware(reducer, initialState);
 }

examples/todomvc/containers/Root.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import TodoApp from './TodoApp';
-import { createStore, combineReducers } from 'redux';
+import { createStore } from 'redux';
 import { Provider } from 'react-redux';
 import rootReducer from '../reducers';
 

src/utils/bindActionCreators.js

@@ -30,7 +30,7 @@ export default function bindActionCreators(actionCreators, dispatch) {
     return bindActionCreator(actionCreators, dispatch);
   }
 
-  if (typeof actionCreators !== 'object' || actionCreators == null) {
+  if (typeof actionCreators !== 'object' || actionCreators == null) {  // eslint-disable-line no-eq-null
     throw new Error(
       `bindActionCreators expected an object or a function, instead received ${typeof actionCreators}. ` +
       `Did you write "import ActionCreators from" instead of "import * as ActionCreators from"?`
@@ -41,4 +41,3 @@ export default function bindActionCreators(actionCreators, dispatch) {
     bindActionCreator(actionCreator, dispatch)
   );
 }
-