Skip to content

Merge Chad's changes from https://github.com/broccolijs/broccoli-filter/pull/28 - #8

Merged
stefanpenner merged 11 commits into
broccolijs:masterfrom
zackthehuman:merge-chad-again
Aug 22, 2015
Merged

Merge Chad's changes from https://github.com/broccolijs/broccoli-filter/pull/28#8
stefanpenner merged 11 commits into
broccolijs:masterfrom
zackthehuman:merge-chad-again

Conversation

@zackthehuman

Copy link
Copy Markdown
Contributor

This merge's Chad's changes from broccolijs/broccoli-filter#28 into this plugin.

@stefanpenner

Copy link
Copy Markdown
Collaborator

Awesome! Will review and merge if good tonight. This plus @kellyselden fix of hash for dep may let us get babel/jshint persistent out this weekend!

@zackthehuman

Copy link
Copy Markdown
Contributor Author

That's awesome! Let me know if there is anything I can do.

@stefanpenner

Copy link
Copy Markdown
Collaborator
  • Ember-cli's internal config replacer needs to stop invaliding on each rebuild
  • broccoli-jshint broccoli-jscs both also need to stop always rebuilding

Something more related to this, is getting broccoli-babel-transpiler using this pr

@stefanpenner

Copy link
Copy Markdown
Collaborator

@zackthehuman window support has landed for hash-for-dep ember-cli/hash-for-dep@335d69b

@zackthehuman

Copy link
Copy Markdown
Contributor Author

@stefanpenner Shall I bump the version in package.json in this branch?

@stefanpenner

Copy link
Copy Markdown
Collaborator

Yup and remove the windows check.

@zackthehuman

Copy link
Copy Markdown
Contributor Author

Bumping to 1.0.0 of hash-for-dep break the tests. On my mac this happens: Error: Cannot find module '/User.//package.json'.

I haven't tracked down the source of the issue yet, though.

@kellyselden

Copy link
Copy Markdown
Collaborator

@zackthehuman It looks like my change may have broke OSX. @stefanpenner We may need to add OSX testing in Travis to prevent this.

@stefanpenner stefanpenner mentioned this pull request Aug 22, 2015
Closed
@stefanpenner
stefanpenner merged commit 6f74151 into broccolijs:master Aug 22, 2015
@stefanpenner

Copy link
Copy Markdown
Collaborator

merged the two git histories (as best as possible) and merged manually.

@stefanpenner

Copy link
Copy Markdown
Collaborator

looking into the OSX issue now

@stefanpenner

Copy link
Copy Markdown
Collaborator

@zackthehuman & @kellyselden I am unable to replicate that issue on OSX

@zackthehuman can you share reproduction steps?

@zackthehuman

Copy link
Copy Markdown
Contributor Author

@stefanpenner & @kellyselden Maybe my OSX issue was a fluke. I just pulled the latest from master and that branch works fine. Previously the steps to reproduce were: npm install and then npm test. Anyway, looks good to me now.

@stefanpenner

Copy link
Copy Markdown
Collaborator

Anyway, looks good to me now.

lets assume a fluke, but keep in on our radar.

Just a headsup, im working to fix the last bugs with using this and the broccoli-babel-transpiler then i'll move on the jshint and jscs.

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.

5 participants