Fix rewritten package cache encapsulation #1560
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1514
A v2 addon with a v1 addon dependency was not resolving its dependencies correctly, in two places.
The fix to both is adjusting the meaning of RewrittenPackageCache so that it always provides packages that see moved dependencies, even when a given package itself has not moved (because it's a v2 addon).
Along with that I took the opportunity to make
packageCache.original()
more likemaybeMoved()
in that returns its argument if no change was needed, which simplified things for the majority of callers.