Skip to content

fix(core): wrap the app in a root Suspense boundary (AI-assisted) #12811

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

Draft
slorber wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −14
Draft

fix(core): wrap the app in a root Suspense boundary (AI-assisted) #12811

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 18 additions & 14 deletions packages/docusaurus/src/client/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* LICENSE file in the root directory of this source tree.
*/

import type {ReactNode} from 'react';
import {Suspense, type ReactNode} from 'react';
import '@generated/client-modules';

import routes from '@generated/routes';
Expand Down Expand Up @@ -38,19 +38,23 @@ function AppNavigation() {
}

export default function App(): ReactNode {
// React keeps leftover server nodes at the root, but not inside a Suspense
// boundary: https://github.com/facebook/docusaurus/pull/10059
return (
<ErrorBoundary>
<DocusaurusContextProvider>
<Root>
<ThemeProvider>
<SiteMetadataDefaults />
<SiteMetadata />
<BaseUrlIssueBanner />
<AppNavigation />
</ThemeProvider>
</Root>
<HasHydratedDataAttribute />
</DocusaurusContextProvider>
</ErrorBoundary>
<Suspense>
<ErrorBoundary>
<DocusaurusContextProvider>
<Root>
<ThemeProvider>
<SiteMetadataDefaults />
<SiteMetadata />
<BaseUrlIssueBanner />
<AppNavigation />
</ThemeProvider>
</Root>
<HasHydratedDataAttribute />
</DocusaurusContextProvider>
</ErrorBoundary>
</Suspense>
);
}
Loading