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

Removing watching/watching.running check #100

Merged
merged 1 commit into from
Sep 10, 2016

Conversation

ibash
Copy link
Contributor

@ibash ibash commented May 30, 2016

Given that state should always have the correct value (if the bundle is valid
or not) then we should be able to use ready directly without checking the
watcher.

I also hit a bug where the watcher had running set to false while the bundle was
invalid, leading to a callback being executed immediately instead of waiting.

Fixes #107

@SpaceK33z
Copy link
Member

@ibash, PR seems good. Could you verify that it still is necessary (it's been a while), and if so, fix the merge conflict? Will merge after that.

Given that `state` should always have the correct value (if the bundle is valid
or not) then we should be able to use ready directly without checking the
watcher.

I also hit a bug where the watcher had running set to false while the bundle was
invalid, leading to a callback being executed immediately instead of waiting.
@ibash ibash force-pushed the remove_block_on_running branch from 9aa2abf to 6b6fbbb Compare September 8, 2016 17:07
@ibash
Copy link
Contributor Author

ibash commented Sep 8, 2016

Fixed the merge conflict. I'm not using this change myself anymore, but looking over it again I think it is still valid.

@SpaceK33z SpaceK33z merged commit 434f94b into webpack:master Sep 10, 2016
@SpaceK33z
Copy link
Member

Thank you!

@ibash ibash deleted the remove_block_on_running branch September 11, 2016 23:41
wuct added a commit to wuct/webpack-dev-middleware that referenced this pull request Sep 12, 2016
…eware

* 'master' of https://github.com/webpack/webpack-dev-middleware:
  committed too quickly...
  Add not-functional test for server side render
  More tests
  fix typos
  Start with some tests!
  Fix inconsistencies with semi colons
  Use valid license for npm
  Document `reporter` option
  Add changelog for 1.7.0
  1.7.0
  Removing watching/watching.running check (webpack#100)
  Improve eslint linting and remove js-beautify
  Support for server-side rendering  (webpack#118)
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.

2 participants