From 306d0641fbfd3b13f9a2a6567eec49397e33068f Mon Sep 17 00:00:00 2001 From: SleepWalker Date: Sun, 31 Jan 2016 18:41:49 +0200 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20re?= =?UTF-8?q?dux-simple-router=20=D0=BD=D0=B0=20react-router-redux=20(=D0=BF?= =?UTF-8?q?=D0=B0=D0=BA=D0=B5=D1=82=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BB=D1=81=D1=8F).=20=D0=94?= =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BF=D0=B0=D0=BA=D0=B5?= =?UTF-8?q?=D1=82=D0=BE=D0=B2=20=D0=B2=20vendor.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- src/components/auth/Login.jsx | 2 +- src/index.js | 2 +- webpack.config.js | 16 +++++++++++----- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 73dbdd5..2f54da6 100644 --- a/package.json +++ b/package.json @@ -22,12 +22,12 @@ "react-dom": "^0.14.3", "react-height": "^2.0.3", "react-helmet": "^2.3.1", - "react-intl": "^2.0.0-beta-2", + "react-intl": "=2.0.0-beta-2", "react-motion": "^0.3.1", "react-redux": "^4.0.0", "react-router": "^2.0.0-rc5", + "react-router-redux": "^2.1.0", "redux": "^3.0.4", - "redux-simple-router": "^2.0.0", "redux-thunk": "^1.0.0" }, "devDependencies": { diff --git a/src/components/auth/Login.jsx b/src/components/auth/Login.jsx index c0f2b42..bd0a9ef 100644 --- a/src/components/auth/Login.jsx +++ b/src/components/auth/Login.jsx @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { connect } from 'react-redux'; -import { routeActions } from 'redux-simple-router'; +import { routeActions } from 'react-router-redux'; import { FormattedMessage as Message } from 'react-intl'; import Helmet from 'react-helmet'; diff --git a/src/index.js b/src/index.js index d97cddf..b0ff9eb 100644 --- a/src/index.js +++ b/src/index.js @@ -13,7 +13,7 @@ import { Provider as ReduxProvider } from 'react-redux'; import thunk from 'redux-thunk'; import { Router, browserHistory } from 'react-router'; -import { syncHistory, routeReducer } from 'redux-simple-router'; +import { syncHistory, routeReducer } from 'react-router-redux'; import { IntlProvider } from 'react-intl'; diff --git a/webpack.config.js b/webpack.config.js index 114c694..3654cd0 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -37,16 +37,22 @@ var webpackConfig = { entry: { app: path.join(__dirname, 'src'), vendor: [ + 'babel-polyfill', + 'classnames', 'history', + 'intl-format-cache', + 'intl-messageformat', 'react', + 'react-dom', + 'react-height', + 'react-helmet', + 'react-intl', + 'react-motion', 'react-redux', 'react-router', - 'redux-simple-router', + 'react-router-redux', 'redux', - - // I18n - 'intl-format-cache', - 'intl-messageformat' + 'redux-thunk' ] },