core(fonts): handle CORS cssRules #5592
Merged
+52
−15
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
paulirish
approved these changes
Jun 29, 2018
|
Thanks Chrome for starting to throw here when you didn't before. 💔 |
brendankenny
approved these changes
Jun 29, 2018
| @@ -124,11 +124,24 @@ function getFontFaceFromStylesheets() { | |||
| return new Promise(resolve => { | |||
| newNode.addEventListener('load', function onload() { | |||
| newNode.removeEventListener('load', onload); | |||
| resolve(getFontFaceFromStylesheets()); | |||
| try { | |||
| const stylesheet = Array.from(document.styleSheets).find(sh => sh.ownerNode === newNode); | |||
There was a problem hiding this comment.
I feel like s would be better :P
| if (cssStylesheet.cssRules === null && cssStylesheet.href && cssStylesheet.ownerNode && | ||
| // @ts-ignore - crossOrigin exists if ownerNode is an HTMLLinkElement | ||
| !cssStylesheet.ownerNode.crossOrigin) { | ||
| // cssRules can be null or this access can throw when CORS isn't enabled, throw a matching error message. |
There was a problem hiding this comment.
a little hard to parse comment. Semicolon instead of a comma?
wardpeet
previously requested changes
Jul 1, 2018
| @@ -6,14 +6,14 @@ | |||
| font-family: 'Lobster'; | |||
| font-style: normal; | |||
| font-weight: 400; | |||
| src: local('Lobster'), url('./lobster-v20-latin-regular.eot?#iefix') format('eot'), url('./lobster-v20-latin-regular.woff2') format('woff2'); | |||
| src: url('./lobster-v20-latin-regular.woff2') format('woff2'); | |||
There was a problem hiding this comment.
I added the local strings just to make sure the regex in getSheetsFontFaces works. Maybe we should keep it?
There was a problem hiding this comment.
Ah ok, thanks for the context I'll revert :)
| } | ||
| @font-face { | ||
| font-family: 'Lobster Two'; | ||
| font-style: normal; | ||
| font-weight: 700; | ||
| font-display: optional; | ||
| src: local("Lobster Two"), url("./lobster-two-v10-latin-700.woff2?delay=4000") format('woff2'); | ||
| src: url("./lobster-two-v10-latin-700.woff2?delay=4000") format('woff2'); |
paulirish
pushed a commit
that referenced
this pull request
Jul 2, 2018
This was referenced May 26, 2021
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.
After our 3.0 release a new high volume error popped up in sentry for the fonts gatherer. Turns out Chrome changed the behavior for CORS
.cssRulesproperty to throw instead of benull.This adds a smoketest for the CORS font case and fixes that behavior.