Use a newer prettier

Author: Ryan Ashcraft

package.json

@@ -77,7 +77,7 @@
     "gh-pages": "^0.12.0",
     "mocha": "^2.4.5",
     "nyc": "^10.0.0",
-    "prettier": "^0.21.0",
+    "prettier": "^1.3.1",
     "react": "^15.0.1",
     "rimraf": "^2.4.3",
     "superagent-mock": "^3.3.0",

src/actions/index.js

@@ -1,14 +1,6 @@
 import * as actionTypes from '../constants/action-types';
 
-export const requestStart = (
-    {
-        body,
-        meta,
-        networkHandler,
-        queryKey,
-        url,
-    }
-) => {
+export const requestStart = ({ body, meta, networkHandler, queryKey, url }) => {
     return {
         type: actionTypes.REQUEST_START,
         url,
@@ -19,19 +11,17 @@ export const requestStart = (
     };
 };
 
-export const requestSuccess = (
-    {
-        body,
-        entities,
-        meta,
-        queryKey,
-        responseBody,
-        responseHeaders,
-        responseText,
-        status,
-        url,
-    }
-) => {
+export const requestSuccess = ({
+    body,
+    entities,
+    meta,
+    queryKey,
+    responseBody,
+    responseHeaders,
+    responseText,
+    status,
+    url,
+}) => {
     return {
         type: actionTypes.REQUEST_SUCCESS,
         url,
@@ -47,18 +37,7 @@ export const requestSuccess = (
     };
 };
 
-export const requestFailure = (
-    {
-        body,
-        meta,
-        queryKey,
-        responseBody,
-        responseHeaders,
-        responseText,
-        status,
-        url,
-    }
-) => {
+export const requestFailure = ({ body, meta, queryKey, responseBody, responseHeaders, responseText, status, url }) => {
     return {
         type: actionTypes.REQUEST_FAILURE,
         url,
@@ -73,16 +52,7 @@ export const requestFailure = (
     };
 };
 
-export const mutateStart = (
-    {
-        body,
-        meta,
-        networkHandler,
-        optimisticEntities,
-        queryKey,
-        url,
-    }
-) => {
+export const mutateStart = ({ body, meta, networkHandler, optimisticEntities, queryKey, url }) => {
     return {
         type: actionTypes.MUTATE_START,
         url,
@@ -94,19 +64,17 @@ export const mutateStart = (
     };
 };
 
-export const mutateSuccess = (
-    {
-        body,
-        entities,
-        meta,
-        queryKey,
-        responseBody,
-        responseHeaders,
-        responseText,
-        status,
-        url,
-    }
-) => {
+export const mutateSuccess = ({
+    body,
+    entities,
+    meta,
+    queryKey,
+    responseBody,
+    responseHeaders,
+    responseText,
+    status,
+    url,
+}) => {
     return {
         type: actionTypes.MUTATE_SUCCESS,
         url,
@@ -122,19 +90,17 @@ export const mutateSuccess = (
     };
 };
 
-export const mutateFailure = (
-    {
-        body,
-        meta,
-        queryKey,
-        responseBody,
-        responseHeaders,
-        responseText,
-        rolledBackEntities,
-        status,
-        url,
-    }
-) => {
+export const mutateFailure = ({
+    body,
+    meta,
+    queryKey,
+    responseBody,
+    responseHeaders,
+    responseText,
+    rolledBackEntities,
+    status,
+    url,
+}) => {
     return {
         type: actionTypes.MUTATE_FAILURE,
         url,
@@ -150,20 +116,18 @@ export const mutateFailure = (
     };
 };
 
-export const requestAsync = (
-    {
-        body,
-        force,
-        meta,
-        options,
-        queryKey,
-        retry,
-        transform,
-        update,
-        url,
-        unstable_preDispatchCallback,
-    }
-) => {
+export const requestAsync = ({
+    body,
+    force,
+    meta,
+    options,
+    queryKey,
+    retry,
+    transform,
+    update,
+    url,
+    unstable_preDispatchCallback,
+}) => {
     return {
         type: actionTypes.REQUEST_ASYNC,
         body,
@@ -179,19 +143,7 @@ export const requestAsync = (
     };
 };
 
-export const mutateAsync = (
-    {
-        body,
-        meta,
-        optimisticUpdate,
-        options,
-        queryKey,
-        rollback,
-        transform,
-        update,
-        url,
-    }
-) => {
+export const mutateAsync = ({ body, meta, optimisticUpdate, options, queryKey, rollback, transform, update, url }) => {
     return {
         type: actionTypes.MUTATE_ASYNC,
         body,

src/lib/update.js

@@ -1,40 +1,31 @@
 export const updateEntities = (update, entities, transformed) => {
     // If update is not supplied, then no change to entities will be made
 
-    return Object.keys(update || {}).reduce(
-        (accum, key) => {
-            accum[key] = update[key]((entities || {})[key], (transformed || {})[key]);
+    return Object.keys(update || {}).reduce((accum, key) => {
+        accum[key] = update[key]((entities || {})[key], (transformed || {})[key]);
 
-            return accum;
-        },
-        {}
-    );
+        return accum;
+    }, {});
 };
 
 export const optimisticUpdateEntities = (optimisticUpdate, entities) => {
-    return Object.keys(optimisticUpdate).reduce(
-        (accum, key) => {
-            accum[key] = optimisticUpdate[key](entities[key]);
+    return Object.keys(optimisticUpdate).reduce((accum, key) => {
+        accum[key] = optimisticUpdate[key](entities[key]);
 
-            return accum;
-        },
-        {}
-    );
+        return accum;
+    }, {});
 };
 
 export const rollbackEntities = (rollback = {}, initialEntities, entities) => {
-    return Object.keys(initialEntities).reduce(
-        (accum, key) => {
-            if (rollback[key]) {
-                accum[key] = rollback[key](initialEntities[key], entities[key]);
-            } else {
-                // Default to just reverting to the initial state for that
-                // entity (before the optimistic update)
-                accum[key] = initialEntities[key];
-            }
+    return Object.keys(initialEntities).reduce((accum, key) => {
+        if (rollback[key]) {
+            accum[key] = rollback[key](initialEntities[key], entities[key]);
+        } else {
+            // Default to just reverting to the initial state for that
+            // entity (before the optimistic update)
+            accum[key] = initialEntities[key];
+        }
 
-            return accum;
-        },
-        {}
-    );
+        return accum;
+    }, {});
 };

src/middleware/query-advanced.js

@@ -40,16 +40,7 @@ const queryMiddlewareAdvanced = networkInterface => (queriesSelector, entitiesSe
 
         switch (action.type) {
             case actionTypes.REQUEST_ASYNC: {
-                const {
-                    url,
-                    body,
-                    force,
-                    retry,
-                    transform = identity,
-                    update,
-                    options = {},
-                    meta,
-                } = action;
+                const { url, body, force, retry, transform = identity, update, options = {}, meta } = action;
 
                 invariant(!!url, 'Missing required `url` field in action handler');
                 invariant(!!update, 'Missing required `update` field in action handler');

src/network-interfaces/superagent.js

@@ -31,14 +31,15 @@ const superagentNetworkInterface = (url, method, { body, headers, credentials }
         request.withCredentials();
     }
 
-    const execute = cb => request.end((err, response) => {
-        const resStatus = (response && response.status) || 0;
-        const resBody = (response && response.body) || undefined;
-        const resText = (response && response.text) || undefined;
-        const resHeaders = (response && response.header) || undefined;
-
-        cb(err, resStatus, resBody, resText, resHeaders);
-    });
+    const execute = cb =>
+        request.end((err, response) => {
+            const resStatus = (response && response.status) || 0;
+            const resBody = (response && response.body) || undefined;
+            const resText = (response && response.text) || undefined;
+            const resHeaders = (response && response.header) || undefined;
+
+            cb(err, resStatus, resBody, resText, resHeaders);
+        });
 
     const abort = () => request.abort();