From bca1de5e1fd0e65655c3a1c3c07f960adbf2e789 Mon Sep 17 00:00:00 2001 From: Chris Cates Date: Wed, 21 Sep 2016 07:58:09 -0400 Subject: [PATCH 1/2] Fixed breaking changes with redux-async-connect by rolling back to rc3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f3fb6791c..a59cfafd3 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "react-router-bootstrap": "^0.20.1", "react-router-redux": "^4.0.0", "redux": "^3.0.4", - "redux-async-connect": "^1.0.0-rc2", + "redux-async-connect": "1.0.0-rc3", "redux-form": "^3.0.12", "scroll-behavior": "^0.3.2", "serialize-javascript": "^1.1.2", From 26f3a37d47af030a682737d55b5a932ce53b3d2c Mon Sep 17 00:00:00 2001 From: Chris Cates Date: Thu, 20 Oct 2016 12:48:54 -0600 Subject: [PATCH 2/2] Fixed isomorphic tools bug --- bin/server.js | 1 - webpack/dev.config.js | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/server.js b/bin/server.js index d4792622e..6eb0b7b75 100644 --- a/bin/server.js +++ b/bin/server.js @@ -22,7 +22,6 @@ if (__DEVELOPMENT__) { // https://github.com/halt-hammerzeit/webpack-isomorphic-tools var WebpackIsomorphicTools = require('webpack-isomorphic-tools'); global.webpackIsomorphicTools = new WebpackIsomorphicTools(require('../webpack/webpack-isomorphic-tools')) - .development(__DEVELOPMENT__) .server(rootDir, function() { require('../src/server'); }); diff --git a/webpack/dev.config.js b/webpack/dev.config.js index 2af61cc27..23db306c0 100644 --- a/webpack/dev.config.js +++ b/webpack/dev.config.js @@ -108,8 +108,10 @@ module.exports = { __CLIENT__: true, __SERVER__: false, __DEVELOPMENT__: true, - __DEVTOOLS__: true // <-------- DISABLE redux-devtools HERE - }), - webpackIsomorphicToolsPlugin.development() + __DEVTOOLS__: true, // <-------- DISABLE redux-devtools HERE + env: { + NODE_ENV: 'development' + } + }); ] };