-
Notifications
You must be signed in to change notification settings - Fork 4k
Fix code block with PowerShell crashing published pages in Safari #3483
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
Closed
clairechabas
wants to merge
2
commits into
main
from
claire/RND-7657-fix-code-block-crashing-page-in-safari
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
"gitbook": patch | ||
--- | ||
|
||
Fix code block with PowerShell crashing page in Safari |
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,6 +34,9 @@ export type RenderedInline = { | |
body: React.ReactNode; | ||
}; | ||
|
||
const isSafari = | ||
typeof navigator !== 'undefined' && /^((?!chrome|android).)*safari/i.test(navigator.userAgent); | ||
|
||
const theme = createCssVariablesTheme(); | ||
|
||
const { getSingletonHighlighter } = createSingletonShorthands( | ||
|
@@ -65,8 +68,12 @@ export async function highlight( | |
inlines: RenderedInline[] | ||
): Promise<HighlightLine[]> { | ||
const langName = getBlockLang(block); | ||
if (!langName) { | ||
// Language not found, fallback to plain highlighting | ||
if (!langName || (isSafari && langName === 'powershell')) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Instead of hard-coding such condition; should we be more safe and wrap the whole thing in a try...catch and fallback to plainHighlight if it fails? This looks like too much hard-coded to me and if it fails for this, it could fail for others. |
||
// Fallback to plain highlighting if | ||
// - language is not found | ||
// - language is `powershell` and browser is Safari: | ||
// PowerShell commands can trigger complex regex that Safari | ||
// JS engine doesn't support, causing the highlighter to crash. | ||
return plainHighlight(block, inlines); | ||
} | ||
|
||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If powershell doesn't work, it's a bug in shiki. I saw our shiki is a few versions behind, did you try updating it and seeing if it's been fixed?