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

Add yarn resolutions #259

Merged
merged 1 commit into from
Mar 2, 2019
Merged

Conversation

ryanto
Copy link
Member

@ryanto ryanto commented Jan 11, 2019

This PR adds resolution support for ember-try configs that are using yarn.
It uses the same merging strategy that the dependencies, devDependencies, and
peerDependencies use.

@ryanto ryanto mentioned this pull request Jan 11, 2019
Copy link
Member

@rwjblue rwjblue left a comment

Choose a reason for hiding this comment

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

Thanks for working on this! This looks good to me, and I believe that the current CI failures are unrelated but we still need to get master green before landing....

@rwjblue rwjblue requested a review from kategengler January 20, 2019 16:05
This PR adds resolution support for ember-try configs that are using yarn.
It uses the same merging strategy that the dependencies, devDependencies, and
peerDependencies use.
@ryanto ryanto force-pushed the yarn-resolutions2 branch from 94710c9 to 6a08b29 Compare March 1, 2019 21:48
@codecov
Copy link

codecov bot commented Mar 1, 2019

Codecov Report

Merging #259 into master will increase coverage by 0.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #259      +/-   ##
==========================================
+ Coverage   95.36%   95.37%   +0.01%     
==========================================
  Files          17       17              
  Lines         539      541       +2     
==========================================
+ Hits          514      516       +2     
  Misses         25       25
Impacted Files Coverage Δ
lib/dependency-manager-adapters/npm.js 93.97% <100%> (+0.14%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e165e5d...6a08b29. Read the comment docs.

1 similar comment
@codecov
Copy link

codecov bot commented Mar 1, 2019

Codecov Report

Merging #259 into master will increase coverage by 0.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #259      +/-   ##
==========================================
+ Coverage   95.36%   95.37%   +0.01%     
==========================================
  Files          17       17              
  Lines         539      541       +2     
==========================================
+ Hits          514      516       +2     
  Misses         25       25
Impacted Files Coverage Δ
lib/dependency-manager-adapters/npm.js 93.97% <100%> (+0.14%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e165e5d...6a08b29. Read the comment docs.

@ryanto
Copy link
Member Author

ryanto commented Mar 1, 2019

Ok great! I just rebased off master and everything is green.

@kategengler kategengler merged commit 77e1a7c into ember-cli:master Mar 2, 2019
@kategengler
Copy link
Member

Thanks!

cyril-sf pushed a commit to Addepar/ember-table that referenced this pull request Mar 10, 2019
cyril-sf pushed a commit to Addepar/ember-table that referenced this pull request Mar 10, 2019
cyril-sf pushed a commit to Addepar/ember-table that referenced this pull request Mar 10, 2019
cyril-sf pushed a commit to Addepar/ember-table that referenced this pull request Mar 13, 2019
Needs to update ember-try to support `resolutions`
See ember-cli/ember-try#259
@kategengler
Copy link
Member

@ryanto Would you be willing to add some documentation for this to the README?

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.

3 participants