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

base/run async conflicter resolved. #270

Merged
merged 1 commit into from
Jun 4, 2013

Conversation

stephenplusplus
Copy link

Fixes #269

self.conflicter.resolve(function (err) {
  if (err) {
    return self.emit('error', err);
  }
});

That block was called from base.js/run before giving the files a chance to be added to the conflicter. Thus, callbacks bound to the resolved:___ event weren't firing, and everything was locking up.

@passy
Copy link
Member

passy commented Jun 4, 2013

You're mindblowingly fast.

@stephenplusplus
Copy link
Author

Anything for yo, man!

@sindresorhus
Copy link
Member

Use fixes #<issuenumber> in the commit or pr to have it autoclosed when it's merged ;)

@passy
Copy link
Member

passy commented Jun 4, 2013

I rebased this on top of v0.11.2 but there's still nothing happening after the prompt. I'll recheck if I did something wrong ...

@passy
Copy link
Member

passy commented Jun 4, 2013

Problem persists for me. Might just be the lack of sleep, but would be good if someone else could check that this fixes the pure generator if you just cherry-pick this patch on top of the latest release.

@passy
Copy link
Member

passy commented Jun 4, 2013

False alarm! Everything is running as it should now. @stephenplusplus You rock! 🤘

passy added a commit that referenced this pull request Jun 4, 2013
base/run async conflicter resolved.
@passy passy merged commit 61bb176 into yeoman:master Jun 4, 2013
@passy
Copy link
Member

passy commented Jun 4, 2013

To conclude my monologue here ...

@sindresorhus Shall I release a v0.11.3 with this fix?

@sindresorhus
Copy link
Member

@passy yes please :)

as you know, it needs to be cherrypicked as we don't want the prompt changes breaking everything.

@sindresorhus
Copy link
Member

Thanks for the quick resolution @stephenplusplus :)

@SBoudrias
Copy link
Member

Maybe it'll be best to create a branch rather than a tag to hold more in depth changes for the next major bump?

@passy
Copy link
Member

passy commented Jun 4, 2013

Yup, we should do that the next time.

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.

Async broken
4 participants