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

Fix: respect patterns with "||" in the range during optimizeResolutions #4562

Merged
merged 1 commit into from
Sep 27, 2017
Merged

Fix: respect patterns with "||" in the range during optimizeResolutions #4562

merged 1 commit into from
Sep 27, 2017

Conversation

mxmul
Copy link
Contributor

@mxmul mxmul commented Sep 27, 2017

Summary

Fixes #4547 by testing each version against all ranges individually, rather than munging the patterns together to get a single range.

Test plan

Existing tests, plus a regression test to repro #4547: "manifest optimization respects versions with alternation"

@mxmul
Copy link
Contributor Author

mxmul commented Sep 27, 2017

cc @BYK @arcanis
This is an alternative to #4559 that won't regress #3780.

@buildsize
Copy link

buildsize bot commented Sep 27, 2017

This change will increase the build size from 9.83 MB to 9.83 MB, an increase of 439 bytes (0%)

File name Previous Size New Size Change
yarn-[version].noarch.rpm 848.08 KB 848.1 KB 20 bytes (0%)
yarn-[version].js 3.74 MB 3.74 MB 235 bytes (0%)
yarn-legacy-[version].js 3.79 MB 3.79 MB 235 bytes (0%)
yarn-v[version].tar.gz 853.73 KB 853.77 KB 43 bytes (0%)
yarn_[version]all.deb 645.13 KB 645.04 KB -94 bytes (0%)

Copy link
Member

@BYK BYK left a comment

Choose a reason for hiding this comment

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

Makes sense to me.

@BYK BYK merged commit 391eade into yarnpkg:master Sep 27, 2017
joaolucasl pushed a commit to joaolucasl/yarn that referenced this pull request Oct 27, 2017
…ns (yarnpkg#4562)

**Summary**

Fixes yarnpkg#4547 by testing each version against all ranges individually, rather than munging the patterns together to get a single range.

**Test plan**

Existing tests, plus a regression test to repro yarnpkg#4547: "manifest optimization respects versions with alternation"
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.

2 participants