feat: update src to React 15.5.0, update deps to green

CHANGELOG.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <a name="1.3.3"></a>
 ## 1.3.3 (2017-07-05)
 
@@ -19,6 +20,12 @@
 
 * build(yarn): add yarn.lock file ([827ff8f](https://github.com/auru/redux-unity-router/commit/827ff8f))
 * fix(routeToLocation): disable extended uri escaping ([62c9fc3](https://github.com/auru/redux-unity-router/commit/62c9fc3))
+=======
+<a name="1.4.0"></a>
+# 1.4.0 (2017-04-11)
+
+* feat: update src to React 15.5.0, update deps to green ([d6155d3](https://github.com/auru/redux-unity-router/commit/d6155d3))
+>>>>>>> docs: update changelog
 * chore(package): update ava to version 0.18.1 ([4940f76](https://github.com/auru/redux-unity-router/commit/4940f76))
 * chore(package): update ava to version 0.19.0 ([182863e](https://github.com/auru/redux-unity-router/commit/182863e))
 * chore(package): update eslint-plugin-react to version 6.10.0 ([86f3650](https://github.com/auru/redux-unity-router/commit/86f3650))

package.json

@@ -45,7 +45,6 @@
     "path-to-regexp": "^1.6.0",
     "prop-types": "^15.5.10",
     "query-string": "^4.2.3",
-    "react-addons-shallow-compare": "^15.3.2",
     "url": "^0.11.0"
   },
   "devDependencies": {
@@ -62,15 +61,16 @@
     "commitizen": "^2.8.6",
     "conventional-changelog-cli": "^1.2.0",
     "coveralls": "^2.11.14",
-    "cz-conventional-changelog": "^1.2.0",
+    "cz-conventional-changelog": "^2.0.0",
     "eslint": "^3.7.1",
     "eslint-plugin-ava": "^4.0.0",
-    "eslint-plugin-react": "6.10.0",
-    "husky": "^0.12.0",
+    "eslint-plugin-react": "6.10.3",
+    "husky": "^0.13.3",
     "immutable": "^3.8.1",
     "jsdom": "^9.6.0",
     "nyc": "^10.0.0",
-    "react": "^15.3.2",
+    "prop-types": "^15.5.6",
+    "react": "^15.5.0",
     "rimraf": "^2.5.4",
     "validate-commit-msg": "^2.8.2"
   },

src/components/Base.js

@@ -1,7 +1,7 @@
-import { Component } from 'react';
+import { PureComponent } from 'react';
 import { DEFAULT_SLICE } from '../constants';
 
-class BaseRouterComponent extends Component {
+class BaseRouterComponent extends PureComponent {
 
     constructor(props, context) {
         super(props, context);

src/components/Link.js

@@ -2,8 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import BaseRouterComponent from './Base';
 
-import shallowCompare from 'react-addons-shallow-compare';
-
 import { parse, format } from 'url';
 import qs from 'query-string';
 import * as actions from '../actions';
@@ -63,11 +61,6 @@ class Link extends BaseRouterComponent {
         }
     }
 
-    shouldComponentUpdate(props, state) {
-
-        return shallowCompare(this, props, state);
-    }
-
     initiateLocationChange(e) {
         const { target } = this.props;
 

yarn.lock

@@ -4082,13 +4082,6 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-addons-shallow-compare@^15.3.2:
-  version "15.5.2"
-  resolved "https://registry.yarnpkg.com/react-addons-shallow-compare/-/react-addons-shallow-compare-15.5.2.tgz#7cb0ee7acc8d7c93fcc202df0bf47ba916a7bdad"
-  dependencies:
-    fbjs "^0.8.4"
-    object-assign "^4.1.0"
-
 react@^15.3.2:
   version "15.5.4"
   resolved "https://registry.yarnpkg.com/react/-/react-15.5.4.tgz#fa83eb01506ab237cdc1c8c3b1cea8de012bf047"