Skip to content

fix(docs): wrap adjacent JSX elements in fragments for Prettier compat #42389

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.

Sign up for GitHub

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
pierluigilenoci wants to merge 3 commits into from
+45 −44
Closed

fix(docs): wrap adjacent JSX elements in fragments for Prettier compat #42389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1909141
fix(docs): wrap adjacent JSX elements in fragments for Prettier compat
pierluigilenoci May 2, 2026
7748939
Merge branch 'main' into fix/astro-jsx-fragments
pierluigilenoci May 2, 2026
8adefa1
Merge branch 'main' into fix/astro-jsx-fragments
pierluigilenoci May 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions site/src/components/head/Head.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,16 @@ const ScssProd = import.meta.env.PROD ? await import('@components/head/ScssProd.

<script is:inline src={getVersionedDocsPath('assets/js/color-modes.js')}></script>

{import.meta.env.PROD && ScssProd && (
<Stylesheet direction={direction} layout={layout} />
<ScssProd.default />
)}

{!import.meta.env.PROD && Scss && (
<Scss.default />
)}
{
import.meta.env.PROD && ScssProd && (
<>
<Stylesheet direction={direction} layout={layout} />
<ScssProd.default />
</>
)
}

{!import.meta.env.PROD && Scss && <Scss.default />}

<Favicons />
<Social description={description} layout={layout} thumbnail={thumbnail} title={title} />
Expand Down
26 changes: 11 additions & 15 deletions site/src/components/shortcodes/Code.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,21 +137,17 @@ if (filePath && fileMatch && codeToDisplay) {

<div class:list={[{ 'bd-code-snippet': !nestedInExample }, containerClass]}>
{
nestedInExample
? (<></>)
: Astro.slots.has('pre')
? (
<slot name="pre" />
)
: (
<div class="bd-clipboard">
<button type="button" class="btn-clipboard">
<svg class="bi" role="img" aria-label="Copy">
<use xlink:href="#clipboard" />
</svg>
</button>
</div>
)
nestedInExample ? null : Astro.slots.has('pre') ? (
<slot name="pre" />
) : (
<div class="bd-clipboard">
<button type="button" class="btn-clipboard">
<svg class="bi" role="img" aria-label="Copy">
<use xlink:href="#clipboard" />
</svg>
</button>
</div>
)
}
<div class="highlight">
{
Expand Down
45 changes: 24 additions & 21 deletions site/src/layouts/DocsLayout.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,30 +80,33 @@ if (frontmatter.toc) {
</div>
</div>


<div class="bd-toc mt-3 mb-5 my-lg-0 mb-lg-5 px-sm-1 text-body-secondary">
{
frontmatter.toc && headings && (
<button
class="btn btn-link p-md-0 mb-2 mb-md-0 text-decoration-none bd-toc-toggle d-md-none"
type="button"
data-bs-toggle="collapse"
data-bs-target="#tocContents"
aria-expanded="false"
aria-controls="tocContents"
>
On this page
<svg class="bi d-md-none ms-2" aria-hidden="true">
<use xlink:href="#chevron-expand" />
</svg>
</button>
<strong class="d-none d-md-block h6 my-2 ms-3" id="docs-tocs">On this page</strong>
<hr class="d-none d-md-block my-2 ms-3" />
<div class="collapse bd-toc-collapse" id="tocContents">
<nav id="TableOfContents" aria-labelledby="docs-tocs">
<TableOfContents headings={headings} />
</nav>
</div>
<>
<button
class="btn btn-link p-md-0 mb-2 mb-md-0 text-decoration-none bd-toc-toggle d-md-none"
type="button"
data-bs-toggle="collapse"
data-bs-target="#tocContents"
aria-expanded="false"
aria-controls="tocContents"
>
On this page
<svg class="bi d-md-none ms-2" aria-hidden="true">
<use xlink:href="#chevron-expand" />
</svg>
</button>
<strong class="d-none d-md-block h6 my-2 ms-3" id="docs-tocs">
On this page
</strong>
<hr class="d-none d-md-block my-2 ms-3" />
<div class="collapse bd-toc-collapse" id="tocContents">
<nav id="TableOfContents" aria-labelledby="docs-tocs">
<TableOfContents headings={headings} />
</nav>
</div>
</>
)
}
<Ads />
Expand Down
Loading