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.

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

Fix multiconfig watch #3737

Merged
merged 5 commits into from
Jan 5, 2017
Merged

Fix multiconfig watch #3737

merged 5 commits into from
Jan 5, 2017

Conversation

yuriyostapenko
Copy link
Contributor

What kind of change does this PR introduce?
bugfix

Did you add tests for your changes?
yes

If relevant, link to documentation update:

Summary
Multi configuration watch is reporting stale stats for configurations that were not changed

Does this PR introduce a breaking change?
no

Other information
There is some quirk about running watch tests on Windows/Linux. Change event doesn't fire. It is only observable when MultiCompilation is in use (probably because it uses parallel watchpacks). It is mitigated by adding small delay before changing the files, which is also part of this PR.

Previously, stats would contain stale configuration child stats. This is very confusing, since it looks as if some things are emitted when they shouldn't be.

Add support for making assertions to stats in watch tests.
@yuriyostapenko
Copy link
Contributor Author

@TheLarkInn, are you sure the label is correct or did it just get mass labeled by mistake?

@TheLarkInn
Copy link
Member

Ah yes I did sorry I'll remove that. Was doing batch updates and forgot to skip one!

sokra
sokra previously requested changes Jan 4, 2017
Copy link
Member

@sokra sokra left a comment

Choose a reason for hiding this comment

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

Great PR 👍 This will not only fix a bug, but it also adds a MultiCompiler test case which will increase coverage a huge step.

Also take a look at the CI output (linting) and OSX builds.

if(compilerStatus.every(Boolean)) {
var multiStats = new MultiStats(allStats);
var freshStats = allStats.filter(function(s) {
Copy link
Member

Choose a reason for hiding this comment

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

allStats.filter(function(s, idx) {
  return compilerStatus[idx] === "new";
}

Copy link
Member

@sokra sokra Jan 4, 2017

Choose a reason for hiding this comment

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

the hash is not really needed. Could you simplify it? See my code examples.

@@ -143,10 +143,14 @@ MultiCompiler.prototype.watch = function(watchOptions, handler) {
handler(err);
if(stats) {
allStats[compilerIdx] = stats;
compilerStatus[compilerIdx] = true;
compilerStatus[compilerIdx] = stats.hash;
Copy link
Member

Choose a reason for hiding this comment

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

compilerStatus[compilerIdx] = "new"

handler(null, multiStats)
compilerStatus.fill(true);
Copy link
Member

Choose a reason for hiding this comment

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

Could you move this line two line up? If someone doing weird stuff in the handler.

output: {
filename: "./static.js"
}
}];
Copy link
Member

Choose a reason for hiding this comment

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

Could you add another config. And a watch step in which two configuration change at once.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That wouldn't work.
I mean that currently (including before my changes), only the first MultiStats is really batched, after that, if(compilerStatus.every(Boolean)) is always satisfied and each of the stats is forwarded to handler independently.
Here https://github.com/uncleyo/webpack/commit/d4a7aac61c5cd43d9e80782ffaab1044e546536d is what I tried and it doesn't work.
Compilations do not share watchers, so I guess you'd need to aggregate them somehow.
But I think it's fine if these stats are sent to handler one by one in watch mode, don't you?

Parallel watchpack's (happens when MultiCompiler is in use) do not emit events in watch tests, unless some timeout is added.
This does not seem to be an issue on macOS.
This fixes macOS build, where changes keep being triggered with parallel watchers
@TheLarkInn TheLarkInn dismissed sokra’s stale review January 5, 2017 05:45

Linting now passes and I will merge.

@TheLarkInn TheLarkInn merged commit 9f6a601 into webpack:master Jan 5, 2017
@TheLarkInn
Copy link
Member

Nice work. Thank you so much!! 👏

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants