Merge pull request #81 from KleoPetroff/dependecies-update

Dependency updates and component cleanup

Author: KleoPetroff

README.md

@@ -4,10 +4,10 @@
 
 Simple and optimized React boilerplate. It includes: 
 
-- [x] React 15.4.2
+- [x] React 15.5.4
 - [x] ECMAScript 6 and JSX support
 - [x] React Router
-- [x] Latest Webpack (v.2.2) and Webpack Dev Server (v.2.2)
+- [x] Latest Webpack (v.2.4.1) and Webpack Dev Server (v.2.4.2)
 - [x] Hot Module Replacement using [react-hot-loader](https://github.com/gaearon/react-hot-loader)
 - [x] SASS support
 - [x] Separate CSS stylesheets generation

app/config/Root.js

@@ -1,17 +1,11 @@
 import React, { Component } from 'react';
-import { Router, Route, useRouterHistory } from 'react-router';
-import { createHashHistory } from 'history';
-import shortid from 'shortid';
-
+import { BrowserRouter as Router, Route } from 'react-router-dom';
 import App from '../components/App';
 
-
-const history = useRouterHistory(createHashHistory)({ queryKey: false });
-
 export default class Root extends Component {
   render() {
     return (
-      <Router history={history} key={shortid.generate()}>
+      <Router>
         <Route path="/" component={App} />
       </Router>
     );

package.json

@@ -16,48 +16,46 @@
   "author": "Kliment Petrov <[email protected]>",
   "license": "MIT",
   "dependencies": {
-    "cross-env": "^4.0.0",
-    "history": "^2.0.1",
-    "react": "^15.4.2",
-    "react-dom": "^15.4.2",
-    "react-hot-loader": "^3.0.0-beta.6",
-    "react-router": "^2.5.2",
-    "shortid": "^2.2.6"
+    "cross-env": "4.0.0",
+    "react": "15.5.4",
+    "react-dom": "15.5.4",
+    "react-hot-loader": "3.0.0-beta.6",
+    "react-router-dom": "4.1.1"
   },
   "devDependencies": {
-    "babel-cli": "^6.23.0",
-    "babel-core": "^6.23.1",
-    "babel-eslint": "^7.1.1",
-    "babel-loader": "^7.0.0",
-    "babel-preset-es2015": "^6.22.0",
-    "babel-preset-react": "^6.23.0",
-    "babel-preset-react-boilerplate": "^1.1.1",
-    "babel-preset-react-hmre": "^1.1.1",
-    "babel-preset-stage-2": "^6.22.0",
-    "chai": "^3.5.0",
-    "chai-enzyme": "^0.6.1",
-    "copy-webpack-plugin": "^4.0.0",
-    "css-loader": "^0.28.0",
-    "enzyme": "^2.3.0",
-    "eslint": "^3.16.1",
-    "eslint-config-airbnb": "^14.1.0",
-    "eslint-plugin-import": "^2.2.0",
-    "eslint-plugin-jsx-a11y": "^4.0.0",
-    "eslint-plugin-react": "^6.10.0",
-    "extract-text-webpack-plugin": "^2.0.0-beta.5",
-    "file-loader": "^0.11.0",
-    "html-webpack-plugin": "^2.28.0",
-    "husky": "^0.13.1",
-    "mocha": "^3.2.0",
-    "node-sass": "^4.0.0",
+    "babel-cli": "6.24.1",
+    "babel-core": "6.24.1",
+    "babel-eslint": "7.2.3",
+    "babel-loader": "7.0.0",
+    "babel-preset-es2015": "6.24.1",
+    "babel-preset-react": "6.24.1",
+    "babel-preset-react-boilerplate": "1.1.1",
+    "babel-preset-react-hmre": "1.1.1",
+    "babel-preset-stage-2": "6.24.1",
+    "chai": "3.5.0",
+    "chai-enzyme": "0.6.1",
+    "copy-webpack-plugin": "4.0.1",
+    "css-loader": "0.28.0",
+    "enzyme": "2.8.2",
+    "eslint": "3.19.0",
+    "eslint-config-airbnb": "14.1.0",
+    "eslint-plugin-import": "2.2.0",
+    "eslint-plugin-jsx-a11y": "4.0.0",
+    "eslint-plugin-react": "6.10.3",
+    "extract-text-webpack-plugin": "2.1.0",
+    "file-loader": "0.11.1",
+    "html-webpack-plugin": "2.28.0",
+    "husky": "0.13.3",
+    "mocha": "3.2.0",
+    "node-sass": "4.5.2",
     "open-browser-webpack-plugin": "0.0.5",
-    "postcss-loader": "^1.2.2",
-    "react-addons-test-utils": "^15.4.2",
-    "rimraf": "^2.5.4",
-    "sass-loader": "^6.0.1",
-    "style-loader": "^0.16.0",
-    "url-loader": "^0.5.7",
-    "webpack": "^2.2.0",
-    "webpack-dev-server": "^2.2.0"
+    "postcss-loader": "1.3.3",
+    "react-addons-test-utils": "15.5.1",
+    "rimraf": "2.6.1",
+    "sass-loader": "6.0.3",
+    "style-loader": "0.16.1",
+    "url-loader": "0.5.8",
+    "webpack": "2.4.1",
+    "webpack-dev-server": "2.4.2"
   }
 }