Fix: support protocol-relative registry URLs #4347
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
**Summary** Fixes matching protocol-relative registry URLs from config. Reported here: #3987 (comment) **Test plan** Added one new test.
arcanis
reviewed
Sep 8, 2017
src/registries/npm-registry.js
Outdated
| @@ -314,8 +314,8 @@ export default class NpmRegistry extends Registry { | |||
| // 3nd attempt, remove the 'registry/?' suffix of the registry URL | |||
| return ( | |||
| this.getScopedOption(reg, option) || | |||
| (reg.match(pre) && this.getRegistryOption(reg.replace(pre, ''), option)) || | |||
| (reg.match(suf) && this.getRegistryOption(reg.replace(suf, ''), option)) | |||
| (pre.test(reg) && !reg.startsWith('//') && this.getRegistryOption(reg.replace(pre, '//'), option)) || | |||
There was a problem hiding this comment.
Why this reg.startsWith('//') check? If it starts with // the subsequent replace will simply be a noop. This change makes getRegistryOption not being applied to protocol-relative url, is it intentional?
There was a problem hiding this comment.
This was due to the regex now matching the whole https:// part instead of just the protocol. We want the // kept intact but then we need the additional .startsWith() check to prevent this method from recursing infinitely on the same registry value.
That said I did this to share the same regex with others. I tried adding a comment but it took three lines so instead, I created another regex 😆
arcanis
approved these changes
Sep 8, 2017
This was referenced Sep 12, 2017
joaolucasl
pushed a commit
to joaolucasl/yarn
that referenced
this pull request
Oct 27, 2017
**Summary** Fixes matching protocol-relative registry URLs from config. Reported here: yarnpkg#3987 (comment) **Test plan** Added one new test.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Fixes matching protocol-relative registry URLs from config.
Reported here: #3987 (comment)
Test plan
Added one new test.