From dd2de74df605ef8b53aafd24b317e3980773e005 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Tue, 11 Aug 2015 21:23:58 -0400 Subject: [PATCH 1/3] remove spread from api middleware --- examples/real-world/middleware/api.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/real-world/middleware/api.js b/examples/real-world/middleware/api.js index 1b898d45e8..7e6ec43af4 100644 --- a/examples/real-world/middleware/api.js +++ b/examples/real-world/middleware/api.js @@ -1,6 +1,7 @@ import { Schema, arrayOf, normalize } from 'normalizr'; import { camelizeKeys } from 'humps'; import 'isomorphic-fetch'; +import merge from 'lodash/object/merge'; /** * Extracts the next page URL from Github API response. @@ -42,7 +43,7 @@ function callApi(endpoint, schema) { const nextPageUrl = getNextPageUrl(response) || undefined; return { - ...normalize(camelizedJson, schema), + merge({}, normalize(camelizedJson, schema)), nextPageUrl }; }); From 2ea278e457e45f6f0cd91f483a7c972ca3723b7c Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Tue, 11 Aug 2015 21:29:47 -0400 Subject: [PATCH 2/3] prefer Object.assign --- examples/real-world/middleware/api.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/real-world/middleware/api.js b/examples/real-world/middleware/api.js index 7e6ec43af4..fd3a9f24f6 100644 --- a/examples/real-world/middleware/api.js +++ b/examples/real-world/middleware/api.js @@ -1,7 +1,6 @@ import { Schema, arrayOf, normalize } from 'normalizr'; import { camelizeKeys } from 'humps'; import 'isomorphic-fetch'; -import merge from 'lodash/object/merge'; /** * Extracts the next page URL from Github API response. @@ -42,10 +41,11 @@ function callApi(endpoint, schema) { const camelizedJson = camelizeKeys(json); const nextPageUrl = getNextPageUrl(response) || undefined; - return { - merge({}, normalize(camelizedJson, schema)), + return Object.assign({ + {}, + normalize(camelizedJson, schema), nextPageUrl - }; + }); }); } From 8b5298c4e9be35f3eb8e391ab1523a0260dc8f7f Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Tue, 11 Aug 2015 21:41:00 -0400 Subject: [PATCH 3/3] remove usage of `static` and extend from React.Component --- examples/real-world/components/Repo.js | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/examples/real-world/components/Repo.js b/examples/real-world/components/Repo.js index b9bb4fa8b0..06e0605e38 100644 --- a/examples/real-world/components/Repo.js +++ b/examples/real-world/components/Repo.js @@ -1,16 +1,7 @@ -import React, { PropTypes } from 'react'; +import React, { Component, PropTypes } from 'react'; import { Link } from 'react-router'; -export default class Repo { - static propTypes = { - repo: PropTypes.shape({ - name: PropTypes.string.isRequired, - description: PropTypes.string - }).isRequired, - owner: PropTypes.shape({ - login: PropTypes.string.isRequired - }).isRequired - } +export default class Repo extends Component { render() { const { repo, owner } = this.props; @@ -35,3 +26,13 @@ export default class Repo { ); } } + +Repo.propTypes = { + repo: PropTypes.shape({ + name: PropTypes.string.isRequired, + description: PropTypes.string + }).isRequired, + owner: PropTypes.shape({ + login: PropTypes.string.isRequired + }).isRequired +};