Fix lts #781
Merged
Fix lts #781
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
The new runtime parameter handling resulted in the LTS option no longer working. Moving lts + ampRuntimeVersion in fetchRuntimeParameters. This PR also improves logging and fixes a bug where the styles fallback did not work. Fixes #777
Fallback to cdn.ampproject.org if custom runtime host cannot be resolved
|
@mdmower would be great if you could take a look. |
mdmower
reviewed
May 16, 2020
| @@ -17,11 +17,12 @@ | |||
|
|
|||
| const {AMP_CACHE_HOST, appendRuntimeVersion} = require('./AmpConstants.js'); | |||
|
|
|||
| function calculateHost({ampUrlPrefix = AMP_CACHE_HOST, ampRuntimeVersion, lts, rtv = false}) { | |||
| if (lts && ampRuntimeVersion) { | |||
| throw new Error('lts flag is not compatible with runtime version parameter'); | |||
There was a problem hiding this comment.
I think this error is worth keeping, but if (lts && ampRuntimeVersion) should be replaced with if (lts && rtv).
There was a problem hiding this comment.
Good point. Added.
| `Could not download runtime version from ${ampUrlPrefix}. Falling back to ${AMP_CACHE_HOST}` | ||
| ); | ||
| ampRuntimeData = await fetchLatestRuntimeData_({config, AMP_CACHE_HOST, lts}, versionKey); | ||
| } else if (versionKey) { |
There was a problem hiding this comment.
Do you want to store bad results? If not:
} else if (ampRuntimeData.version && versionKey) {
sebastianbenz
commented
May 18, 2020
| @@ -17,11 +17,12 @@ | |||
|
|
|||
| const {AMP_CACHE_HOST, appendRuntimeVersion} = require('./AmpConstants.js'); | |||
|
|
|||
| function calculateHost({ampUrlPrefix = AMP_CACHE_HOST, ampRuntimeVersion, lts, rtv = false}) { | |||
| if (lts && ampRuntimeVersion) { | |||
| throw new Error('lts flag is not compatible with runtime version parameter'); | |||
There was a problem hiding this comment.
Good point. Added.
| `Could not download runtime version from ${ampUrlPrefix}. Falling back to ${AMP_CACHE_HOST}` | ||
| ); | ||
| ampRuntimeData = await fetchLatestRuntimeData_({config, AMP_CACHE_HOST, lts}, versionKey); | ||
| } else if (versionKey) { |
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.
The new runtime parameter handling resulted in the LTS option no longer
working. Moving lts + ampRuntimeVersion in fetchRuntimeParameters.
This PR also improves logging and fixes a bug where the styles fallback
did not work.