Merge pull request #15 from redradix/jt-react15

Integration of react v15

package.json

@@ -32,30 +32,30 @@
     "i18next-browser-languagedetector": "0.0.14",
     "i18next-xhr-backend": "^0.3.0",
     "isomorphic-fetch": "^2.2.1",
-    "react": "^0.14.7",
-    "react-dom": "^0.14.7",
-    "react-i18next": "^1.0.1",
-    "react-redux": "^4.1.2",
-    "react-router": "^2.0.0-rc5",
-    "react-router-redux": "^2.1.0i",
-    "redux": "^3.1.6",
+    "react": "^15.0.0",
+    "react-dom": "^15.0.0",
+    "react-i18next": "^1.3.0",
+    "react-redux": "^4.4.1",
+    "react-router": "^2.0.1",
+    "react-router-redux": "^4.0.2",
+    "redux": "^3.3.1",
     "redux-form": "^4.1.6",
     "redux-thunk": "^1.0.3",
     "reselect": "^2.0.2"
   },
   "devDependencies": {
     "babel-core": "^6.4.5",
-    "babel-eslint": "^5.0.0",
+    "babel-eslint": "^6.0.2",
     "babel-loader": "^6.2.1",
-    "babel-plugin-react-transform": "^2.0.0",
+    "babel-plugin-react-transform": "^2.0.2",
     "babel-preset-es2015": "^6.3.13",
     "babel-preset-react": "^6.3.13",
     "babel-preset-stage-2": "^6.3.13",
     "css-loader": "^0.23.1",
-    "eslint": "^2.0.0",
-    "eslint-plugin-babel": "^3.1.0",
+    "eslint": "^2.7.0",
+    "eslint-plugin-babel": "^3.2.0",
     "eslint-plugin-mocha": "^2.0.0",
-    "eslint-plugin-react": "^4.0.0",
+    "eslint-plugin-react": "^4.3.0",
     "expect": "^1.6.0",
     "express": "^4.13.3",
     "html-webpack-plugin": "^2.7.1",
@@ -64,11 +64,11 @@
     "nock": "^7.0.2",
     "node-libs-browser": "^0.5.2",
     "nodemon": "^1.8.1",
-    "react-addons-test-utils": "^0.14.0",
+    "react-addons-test-utils": "^15.0.0",
     "react-transform-hmr": "^1.0.0",
-    "redux-devtools": "^3.0.2",
-    "redux-devtools-dock-monitor": "^1.0.1",
-    "redux-devtools-log-monitor": "^1.0.1",
+    "redux-devtools": "^3.2.0",
+    "redux-devtools-dock-monitor": "^1.1.1",
+    "redux-devtools-log-monitor": "^1.0.9",
     "style-loader": "^0.13.0",
     "webpack": "^1.12.13",
     "webpack-dev-middleware": "^1.5.1",

src/components/auth/login.js

@@ -2,7 +2,7 @@ import { createValidator, required } from '../../utils/validation'
 import { Link } from 'react-router'
 import { reduxForm } from 'redux-form'
 import React, { PropTypes, Component } from 'react'
-import { translate } from 'react-i18next/lib'
+import { translate } from 'react-i18next'
 
 
 const validate = createValidator({

src/components/auth/register.js

@@ -2,7 +2,7 @@ import React, { PropTypes, Component } from 'react'
 import { Link } from 'react-router'
 import { reduxForm } from 'redux-form'
 import { createValidator, required, maxLength, minLength } from '../../utils/validation'
-import { translate } from 'react-i18next/lib'
+import { translate } from 'react-i18next'
 
 const validate = createValidator({
   username: [required, minLength(2), maxLength(10)],

src/components/common/header.js

@@ -1,5 +1,5 @@
 import React, { PropTypes, Component } from 'react'
-import { translate } from 'react-i18next/lib'
+import { translate } from 'react-i18next'
 import { Link } from 'react-router'
 
 export class Header extends Component {

src/index.js

@@ -5,7 +5,7 @@ import { render } from 'react-dom'
 import { Provider } from 'react-redux'
 import { Router, createRoutes, browserHistory } from 'react-router'
 import configureStore from './store/configureStore'
-import { I18nextProvider } from 'react-i18next/lib' // as we build ourself via webpack
+import { I18nextProvider } from 'react-i18next' // as we build ourself via webpack
 import i18n from './utils/i18n'
 import rawRoutes from './routes'
 

src/store/configureStore.dev.js

@@ -31,10 +31,10 @@ import thunk from 'redux-thunk'
 import reducer from '../modules/reducer'
 import api from '../middleware/api'
 import {browserHistory} from 'react-router'
-import {syncHistory} from 'react-router-redux'
+import {routerMiddleware} from 'react-router-redux'
 import DevTools from '../components/common/dev-tools'
 
-const reduxRouter = syncHistory(browserHistory)
+const reduxRouter = routerMiddleware(browserHistory)
 
 export default function configureStore(initialState) {
   const store = createStore(

src/utils/i18n.js

@@ -1,4 +1,4 @@
-import i18n from 'i18next/lib'
+import i18n from 'i18next'
 import XHR from 'i18next-xhr-backend/lib'
 import LanguageDetector from 'i18next-browser-languagedetector/lib'