Skip to content

Isomorphic bug #1308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Isomorphic bug #1308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bca1de5
Fixed breaking changes with redux-async-connect by rolling back to rc3
Sep 21, 2016
26f3a37
Fixed isomorphic tools bug
Oct 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion bin/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
});
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 5 additions & 3 deletions webpack/dev.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
});
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the semicolon is not needed here ;)

]
};