Skip to content
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

Make webpackHotDevClient support webpack 2 too #840

Merged
merged 2 commits into from
Oct 4, 2016
Merged

Make webpackHotDevClient support webpack 2 too #840

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89252d4
Support webpack 2
michalkvasnicak Oct 4, 2016
fbfc031
Code style
michalkvasnicak Oct 4, 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
18 changes: 15 additions & 3 deletions packages/react-dev-utils/webpackHotDevClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,7 @@ function tryApplyUpdates(onHotUpdateSuccess) {
return;
}

// https://webpack.github.io/docs/hot-module-replacement.html#check
module.hot.check(/* autoApply */true, function(err, updatedModules) {
var checkCallback = function(err, updatedModules) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Let’s call this handleApplyUpdates.

Copy link
Contributor

Choose a reason for hiding this comment

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

Minor nit: let’s also make this a regular function declaration, i.e. function handleApplyUpdates(...)

if (err || !updatedModules) {
window.location.reload();
return;
Expand All @@ -288,5 +287,18 @@ function tryApplyUpdates(onHotUpdateSuccess) {
// While we were updating, there was a new update! Do it again.
tryApplyUpdates();
}
});
}

// https://webpack.github.io/docs/hot-module-replacement.html#check
var result = module.hot.check(/* autoApply */true, checkCallback);

// webpack 2 support
Copy link
Contributor

Choose a reason for hiding this comment

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

// Webpack 2 returns a Promise instead of invoking a callback

if (result && result.then) {
result.then(
function(updatedModules) {
checkCallback(null, updatedModules);
},
checkCallback
Copy link
Contributor

Choose a reason for hiding this comment

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

For explicitness let’s also write this as a function that passes error as the first argument and null as a second one.

);
}
};