Merge pull request #154 from taion/update-deps

Update dependencies

Author: taion

package.json

@@ -33,52 +33,56 @@
   "homepage": "https://github.com/react-bootstrap/react-router-bootstrap",
   "peerDependencies": {
     "react": ">=0.14.0",
-    "react-router": ">=2.0.0-rc2"
+    "react-router": ">=2.0.0"
   },
   "devDependencies": {
-    "babel": "5.x",
-    "babel-core": "5.x",
-    "babel-eslint": "^4.1.6",
-    "babel-loader": "5.x",
+    "babel": "^5.8.38",
+    "babel-core": "^5.8.38",
+    "babel-eslint": "^4.1.8",
+    "babel-loader": "^5.4.0",
     "bootstrap": "^3.3.6",
+    "chai": "^3.5.0",
     "colors": "^1.1.2",
     "css-loader": "^0.23.1",
-    "es5-shim": "^4.4.1",
+    "es5-shim": "^4.5.7",
     "eslint": "^1.10.3",
     "eslint-config-airbnb": "^2.1.1",
-    "eslint-plugin-babel": "^3.0.0",
+    "eslint-plugin-babel": "^3.2.0",
     "eslint-plugin-mocha": "^1.1.0",
-    "eslint-plugin-react": "^3.13.1",
+    "eslint-plugin-react": "^3.16.1",
     "file-loader": "^0.8.5",
-    "history": "^1.17.0",
-    "html-webpack-plugin": "^1.7.0",
-    "karma": "^0.13.16",
+    "history": "^2.0.1",
+    "html-webpack-plugin": "^2.15.0",
+    "karma": "^0.13.22",
     "karma-cli": "^0.1.2",
-    "karma-mocha": "^0.2.1",
-    "karma-mocha-reporter": "^1.1.5",
-    "karma-phantomjs-launcher": "^0.2.2",
-    "karma-sinon-chai": "^1.1.0",
-    "karma-sourcemap-loader": "^0.3.6",
+    "karma-mocha": "^0.2.2",
+    "karma-mocha-reporter": "^2.0.0",
+    "karma-phantomjs-launcher": "^1.0.0",
+    "karma-sinon-chai": "^1.2.0",
+    "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.7.0",
-    "less": "^2.5.3",
-    "less-loader": "^2.2.2",
+    "less": "^2.6.1",
+    "less-loader": "^2.2.3",
     "lodash": "^3.10.1",
-    "mocha": "^2.3.4",
+    "lolex": "^1.4.0",
+    "mocha": "^2.4.5",
     "mt-changelog": "^0.6.2",
-    "node-libs-browser": "^0.5.3",
-    "phantomjs": "^1.9.19",
-    "react": "^0.14.5",
-    "react-bootstrap": "^0.28.1",
-    "react-dom": "^0.14.5",
-    "react-router": "^2.0.0-rc4",
-    "release-script": "^0.5.6",
-    "rimraf": "^2.5.0",
-    "shelljs": "^0.5.3",
-    "style-loader": "^0.13.0",
+    "node-libs-browser": "^1.0.0",
+    "phantomjs-prebuilt": "^2.1.7",
+    "react": "^15.0.0",
+    "react-bootstrap": "^0.28.5",
+    "react-dom": "^15.0.0",
+    "react-router": "^2.0.1",
+    "release-script": "^1.0.2",
+    "rimraf": "^2.5.2",
+    "shelljs": "^0.6.0",
+    "sinon": "^1.17.3",
+    "sinon-chai": "^2.8.0",
+    "style-loader": "^0.13.1",
     "url-loader": "^0.5.7",
-    "webpack": "^1.12.9",
-    "webpack-dev-server": "^1.14.0",
-    "yargs": "^3.31.0"
+    "webpack": "^1.12.14",
+    "webpack-dev-server": "^1.14.1",
+    "yargs": "^4.4.0"
   },
   "files": [
     "README",

tests/IndexLinkContainer.spec.js

@@ -1,9 +1,8 @@
-import createMemoryHistory from 'history/lib/createMemoryHistory';
 import React from 'react';
 import ReactTestUtils from 'react/lib/ReactTestUtils';
 import * as ReactBootstrap from 'react-bootstrap';
 import ReactDOM from 'react-dom';
-import { IndexRoute, Route, Router } from 'react-router';
+import { createMemoryHistory, IndexRoute, Route, Router } from 'react-router';
 
 import IndexLinkContainer from '../src/IndexLinkContainer';
 

tests/LinkContainer.spec.js

@@ -2,8 +2,7 @@ import React from 'react';
 import ReactTestUtils from 'react/lib/ReactTestUtils';
 import * as ReactBootstrap from 'react-bootstrap';
 import ReactDOM from 'react-dom';
-import { Route, Router } from 'react-router';
-import createMemoryHistory from 'react-router/lib/createMemoryHistory';
+import { createMemoryHistory, Route, Router } from 'react-router';
 
 import LinkContainer from '../src/LinkContainer';