From c791ceee492a895bab51278303510b79b6b0f703 Mon Sep 17 00:00:00 2001 From: Keven van Zuijlen Date: Wed, 12 Apr 2017 21:00:15 +0200 Subject: [PATCH] Updatged package.json and webpack vendor config --- templates/ReactReduxSpa/package.json | 11 ++++++----- templates/ReactReduxSpa/webpack.config.vendor.js | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/templates/ReactReduxSpa/package.json b/templates/ReactReduxSpa/package.json index b02c513..1929cbb 100644 --- a/templates/ReactReduxSpa/package.json +++ b/templates/ReactReduxSpa/package.json @@ -2,12 +2,12 @@ "name": "WebApplicationBasic", "version": "0.0.0", "dependencies": { - "@types/history": "^2.0.0", + "@types/history": "^4.5.0", "@types/react": "^0.14.29", "@types/react-dom": "^0.14.14", "@types/react-redux": "^4.4.29", - "@types/react-router": "^2.0.30", - "@types/react-router-redux": "4.0.30", + "@types/react-router": "^4.0.4", + "@types/react-router-redux": "^5.0.0", "@types/redux": "3.5.27", "@types/webpack": "^2.2.0", "@types/webpack-env": "^1.13.0", @@ -25,14 +25,15 @@ "event-source-polyfill": "^0.0.7", "extract-text-webpack-plugin": "^2.0.0-rc", "file-loader": "^0.8.5", + "history": "^4.6.1", "jquery": "^2.2.1", "json-loader": "^0.5.4", "node-noop": "^1.0.0", "react": "~15.4.0", "react-dom": "~15.4.0", "react-redux": "^4.4.5", - "react-router": "^2.8.1", - "react-router-redux": "^4.0.6", + "react-router-dom": "^4.1.0", + "react-router-redux": "^5.0.0-alpha.5", "redux": "^3.6.0", "redux-thunk": "^2.2.0", "style-loader": "^0.13.0", diff --git a/templates/ReactReduxSpa/webpack.config.vendor.js b/templates/ReactReduxSpa/webpack.config.vendor.js index bd18082..dbc0303 100644 --- a/templates/ReactReduxSpa/webpack.config.vendor.js +++ b/templates/ReactReduxSpa/webpack.config.vendor.js @@ -21,9 +21,10 @@ module.exports = (env) => { 'bootstrap/dist/css/bootstrap.css', 'domain-task', 'event-source-polyfill', + 'history', 'react', 'react-dom', - 'react-router', + 'react-router-dom', 'react-redux', 'redux', 'redux-thunk',