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

Use broccoli-funnel instead of broccoli-static-compiler #3672

Merged
merged 1 commit into from Mar 27, 2015

Conversation

joliss
Copy link
Contributor

@joliss joliss commented Mar 27, 2015

broccoli-funnel has the allowEmpty option that we needed CustomStaticCompiler for.

I didn't get any failing tests, so I'm not 100% sure that the code in lib/models/addon.js works properly, but it definitely looks correct. :)

@stefanpenner
Copy link
Contributor

awesome, by sure though that: npm run test-all was run, this includes the rather slow acceptance tests.

@stefanpenner
Copy link
Contributor

tests failures look race related. I suspect we recently regressed on something related... in all likely-hood one of or deps has a race again...

@stefanpenner
Copy link
Contributor

this appears to be a duplicate of: #3621

@joliss
Copy link
Contributor Author

joliss commented Mar 27, 2015

npm run test-all

Ah, yes, now I'm getting the tests to cover my code. So things are OK then. Travis is green too.

Re dup, I caught a few extra lines I think, so you should prefer my PR :)

@stefanpenner
Copy link
Contributor

Ya. Done :)

stefanpenner added a commit that referenced this pull request Mar 27, 2015
Use broccoli-funnel instead of broccoli-static-compiler
@stefanpenner stefanpenner merged commit 7b52033 into ember-cli:master Mar 27, 2015
@stefanpenner
Copy link
Contributor

Gotta figure out those races. These brittle tests have been getting worse this week

@stefanpenner
Copy link
Contributor

ah, I forgot add-ons depend on having access to this.pickFiles, we will likely need to add backwards compat

@@ -364,7 +363,7 @@ Addon.prototype.treeForPublic = function(tree) {
return tree;
}

return this.pickFiles(tree, {
Copy link
Contributor

Choose a reason for hiding this comment

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

specifically this case.

stefanpenner added a commit that referenced this pull request Mar 27, 2015
@stefanpenner
Copy link
Contributor

#3675

DanielOchoa pushed a commit to DanielOchoa/ember-cli that referenced this pull request Mar 27, 2015
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.

None yet

2 participants