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

Split bower_components into it's own directory #1436

Merged
merged 1 commit into from
Aug 4, 2014

Conversation

jakecraige
Copy link
Member

refs #757

@jakecraige jakecraige changed the title Split bower_components into it's own folder Split bower_components into it's own directory Jul 22, 2014
@stefanpenner
Copy link
Contributor

This will need doc updates and a breaking changelog entry but I think it's a good idea

@jakecraige jakecraige changed the title Split bower_components into it's own directory WIP: Split bower_components into it's own directory Jul 22, 2014
@jakecraige
Copy link
Member Author

Should we remove vendor/* from the gitignore on new apps? Since it won't be managed by a package manager anymore

@johnnyshields
Copy link
Contributor

👍 +1 for removing vendor/* from .gitignore

@jakecraige jakecraige changed the title WIP: Split bower_components into it's own directory Split bower_components into it's own directory Jul 24, 2014
@rwjblue
Copy link
Member

rwjblue commented Jul 24, 2014

I'm generally 👍, but I'd like to wait until we ship 0.0.40 before merging, then we can have some time to track any issues down while working from master.

@stefanpenner
Copy link
Contributor

@rwjblue agreed, lets slate it for after 0.0.40

@jakecraige
Copy link
Member Author

sounds good

@jayeff
Copy link
Contributor

jayeff commented Jul 24, 2014

refs also #1020

@bcardarella
Copy link
Contributor

@jakecraige can you rebase?

@stefanpenner anything else holding this up now that 0.0.40 is out? It would be nice to have this in there for the addon stuff I'm working on

@stefanpenner
Copy link
Contributor

@bcardarella this a rebase + changelog entry + doc updates

@rwjblue
Copy link
Member

rwjblue commented Aug 4, 2014

@jakecraige - Can you rebase and add a changelog entry? We will also need a gh-pages PR (to be merged when the release is published).

@jakecraige
Copy link
Member Author

@rjackson I should be able to tomorrow morning. Been moving all weekend and
don't have internet yet, ahhhh

On Sunday, August 3, 2014, Robert Jackson notifications@github.com wrote:

@jakecraige https://github.com/jakecraige - Can you rebase and add a
changelog entry? We will also need a gh-pages PR (to be merged when the
release is published).


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

Thanks,

Jake Craige
Poetic Systems
675 Bering Dr. Suite 725
Houston, TX 77057
(281) 531-4060 - Office

@stefanpenner
Copy link
Contributor

@jakecraige best of luck moving i hope it went well :)

@jakecraige
Copy link
Member Author

@stefanpenner Today is put together the new IKEA furniture day!

@rwjblue Rebased and changelog updated. gh-pages PR still merges cleanly so I think that should be fine still

@@ -389,7 +389,7 @@ EmberApp.prototype.javascript = memoize(function() {
var legacyFilesToAppend = this.legacyFilesToAppend;

if (this.tests) {
this.import('vendor/ember-qunit/dist/named-amd/main.js', {
this.import('bower_components/ember-qunit/dist/named-amd/main.js', {
Copy link
Member

Choose a reason for hiding this comment

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

We are merging bower_components and vendor into the vendor tree (in our constructor), then moving the vendor tree into a vendor/ destDir (in _processedVendorTree). So at this point shouldn't this still be vendor?

Copy link
Member Author

Choose a reason for hiding this comment

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

@rwjblue It's kind of personal preference. Either one actually works fine. Though semantically I figured bower_components makes more sense as that's the actual location of the file on disk.

rwjblue added a commit that referenced this pull request Aug 4, 2014
Split bower_components into it's own directory
@rwjblue rwjblue merged commit c249c52 into ember-cli:master Aug 4, 2014
@jakecraige jakecraige deleted the patch-3 branch August 4, 2014 17:55
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.

6 participants