1.5.2

1.5.2 - 2017-06-05
------------------------------------------------

## ESLint
* Adds React ignore for the following props:
- `dispatch`, for less Redux boilerplate
- `data`, injected by Apollo

## Apollo
* Removes redundant `kit/lib/apollo.js -> mergeData()` function

Author: leebenson

.eslintrc.js

@@ -29,6 +29,14 @@ module.exports = {
     'react/prefer-stateless-function': [2, { ignorePureComponents: true }],
     'react/no-multi-comp': 0,
     'react/jsx-closing-bracket-location': [1, 'after-props'],
+    'react/prop-types': [1, {
+      ignore: [
+        // `dispatch` is typically used by Redux `@connect`
+        'dispatch',
+        // `data` is injected by Apollo
+        'data',
+      ],
+    }],
     'linebreak-style': 0,
     'react/jsx-filename-extension': [1, { extensions: ['.js', '.jsx'] }],
     'no-restricted-syntax': [2,

CHANGELOG

@@ -1,3 +1,14 @@
+1.5.2 - 2017-06-05
+------------------------------------------------
+
+## ESLint
+* Adds React ignore for the following props:
+- `dispatch`, for less Redux boilerplate
+- `data`, injected by Apollo
+
+## Apollo
+* Removes redundant `kit/lib/apollo.js -> mergeData()` function
+
 1.5.1 - 2017-06-01
 ------------------------------------------------
 

kit/lib/apollo.js

@@ -1,9 +1,6 @@
 // ----------------------
 // IMPORTS
 
-// React propTypes
-import PropTypes from 'prop-types';
-
 // Apollo client library
 import { createNetworkInterface, ApolloClient } from 'react-apollo';
 
@@ -28,14 +25,6 @@ function createClient(opt = {}) {
   }, opt));
 }
 
-// Helper function that will merge a passed object with the expected
-// React propTypes 'shape', for use with the `react-apollo` `graphql` HOC
-export function mergeData(toMerge) {
-  return PropTypes.shape(Object.assign({
-    loading: PropTypes.bool.isRequired,
-  }, toMerge));
-}
-
 // Creates a new browser client
 export function browserClient() {
   return createClient();

src/app.js

@@ -18,9 +18,6 @@ import {
 // <Helmet> component for setting the page title
 import Helmet from 'react-helmet';
 
-// Helper to merge expected React PropTypes to Apollo-enabled component
-import { mergeData } from 'kit/lib/apollo';
-
 // NotFound 404 handler for unknown routes
 import { NotFound, Redirect } from 'kit/lib/routing';
 
@@ -98,7 +95,7 @@ const query = gql`
 @graphql(query)
 class GraphQLMessage extends React.PureComponent {
   static propTypes = {
-    data: mergeData({
+    data: PropTypes.shape({
       allMessages: PropTypes.arrayOf(
         PropTypes.shape({
           text: PropTypes.string.isRequired,