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

Pull server files from http-{mock,proxy} into their own blueprint #2610

Merged
merged 2 commits into from
Dec 3, 2014

Conversation

jgwhite
Copy link
Contributor

@jgwhite jgwhite commented Dec 1, 2014

Fixes #2356

stefanpenner added a commit that referenced this pull request Dec 3, 2014
Pull server files from http-{mock,proxy} into their own blueprint
@stefanpenner stefanpenner merged commit 4a8c741 into ember-cli:master Dec 3, 2014
@stefanpenner
Copy link
Contributor

thank you sir!

@jgwhite jgwhite deleted the separate-server-blueprint branch December 4, 2014 14:54
@indirect
Copy link

indirect commented Dec 8, 2014

This seems to have caused conflicting blueprints for server/index.js. In 0.1.4, if I run ember g server, I get a file that uses morgan, tries to include proxies, but doesn't use connect-restreamer. If I run ember g http-proxy, I get a server index file that doesn't use morgan, does use connect-restreamer, and also includes proxies. Shouldn't the http-proxy generator just use the server generator?

@rwjblue
Copy link
Member

rwjblue commented Dec 9, 2014

@indirect - Yes, I believe that it should. Can you open an issue (or PR)?

@jgwhite
Copy link
Contributor Author

jgwhite commented Dec 9, 2014

@indirect that's odd because that's exactly what the http-proxy blueprint does:

https://github.com/stefanpenner/ember-cli/blob/master/blueprints/http-proxy/index.js#L26

I'll check to see what I missed.

@indirect
Copy link

indirect commented Dec 9, 2014

I can try to get you a diff tomorrow, if that would help. The changes I noticed were whether morgan was included in server/index.js, and whether connect-restreamer was used before the proxies were used.

On Dec 8, 2014, at 9:32 PM, Jamie White notifications@github.com wrote:

@indirect https://github.com/indirect that's odd because that's exactly what the http-proxy blueprint does:

https://github.com/stefanpenner/ember-cli/blob/master/blueprints/http-proxy/index.js#L26 https://github.com/stefanpenner/ember-cli/blob/master/blueprints/http-proxy/index.js#L26
I'll check to see what I missed.


Reply to this email directly or view it on GitHub #2610 (comment).

@jgwhite
Copy link
Contributor Author

jgwhite commented Dec 9, 2014

@indirect connect-restreamer was dropped around the time of #2568. The fact you’re seeing it when running ember g http-proxy ... suggests an older version of the http-proxy blueprint is being used. Could you post the contents of node_modules/ember-cli/blueprints/http-proxy/index.js in your project?

@rwjblue
Copy link
Member

rwjblue commented Dec 9, 2014

@indirect - Are you using the built-in generators or overridden generators from another addon (like ember-cli-coffeescript)?

@indirect
Copy link

indirect commented Dec 9, 2014

Ohhhhh, wow, I feel dumb. After checking, yes, I have an overwritten generator for http-proxy and no overwritten generator for server. Thanks, and sorry about that!

@stefanpenner
Copy link
Contributor

@indirect no problem, this project moves fast. Hopefully we can figure out a way of messaging these issues.

Maybe some improved debug logging in this area?

@jgwhite
Copy link
Contributor Author

jgwhite commented Dec 9, 2014

@stefanpenner @indirect improved logging definitely. Console output along this lines of:

Installing this-cool-project/http-proxy...

would it make it much clearer what’s afoot here.

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.

ember d http-mock <name> removes files it shouldn't
5 participants