chore: update dependencies and remove Suspense on ISR requests

package.json

@@ -49,8 +49,8 @@
             "bidc": "^0.0.2",
             "bun-types": "^1.1.20",
             "classnames": "^2.5.1",
-            "react": "^19.0.0",
-            "react-dom": "^19.0.0",
+            "react": "^19.0.1",
+            "react-dom": "^19.0.1",
             "tsdown": "^0.15.6",
             "typescript": "^5.5.3",
             "usehooks-ts": "^3.1.1"

packages/gitbook/package.json

@@ -19,7 +19,7 @@
         "@gitbook/react-openapi": "workspace:*",
         "@modelcontextprotocol/sdk": "1.17.5",
         "@opennextjs/aws": "^3.8.5",
-        "@opennextjs/cloudflare": "^1.11.0",
+        "@opennextjs/cloudflare": "^1.14.4",
         "@radix-ui/react-checkbox": "^1.0.4",
         "@radix-ui/react-dropdown-menu": "^2.1.12",
         "@radix-ui/react-hover-card": "^1.1.15",
@@ -50,7 +50,7 @@
         "micromark-extension-frontmatter": "^2.0.0",
         "micromark-extension-gfm": "^3.0.0",
         "motion": "^12.23.24",
-        "next": "15.4.0",
+        "next": "15.4.8",
         "next-themes": "^0.4.6",
         "nuqs": "^2.2.3",
         "object-hash": "^3.0.0",

packages/gitbook/src/app/sites/dynamic/[mode]/[siteURL]/[siteData]/(content)/[pagePath]/page.tsx

@@ -16,7 +16,7 @@ export default async function Page(props: PageProps) {
     const { context } = await getDynamicSiteContext(params);
     const pathname = getPagePathFromParams(params);
 
-    return <SitePage context={context} pageParams={{ pathname }} />;
+    return <SitePage context={context} pageParams={{ pathname }} staticRoute={false} />;
 }
 
 export async function generateViewport(props: PageProps): Promise<Viewport> {

packages/gitbook/src/app/sites/dynamic/[mode]/[siteURL]/[siteData]/~gitbook/embed/page/[pagePath]/page.tsx

@@ -12,7 +12,7 @@ export default async function Page(props: PageProps) {
     const { context } = await getEmbeddableDynamicContext(params);
     const pathname = getPagePathFromParams(params);
 
-    return <EmbeddableDocsPage context={context} pageParams={{ pathname }} />;
+    return <EmbeddableDocsPage context={context} pageParams={{ pathname }} staticRoute={false} />;
 }
 
 export async function generateMetadata(props: PageProps): Promise<Metadata> {

packages/gitbook/src/app/sites/static/[mode]/[siteURL]/[siteData]/(content)/[pagePath]/page.tsx

@@ -18,7 +18,7 @@ export default async function Page(props: PageProps) {
     const { context } = await getStaticSiteContext(params);
     const pathname = getPagePathFromParams(params);
 
-    return <SitePage context={context} pageParams={{ pathname }} />;
+    return <SitePage context={context} pageParams={{ pathname }} staticRoute />;
 }
 
 export async function generateViewport(props: PageProps): Promise<Viewport> {

packages/gitbook/src/app/sites/static/[mode]/[siteURL]/[siteData]/~gitbook/embed/page/[pagePath]/page.tsx

@@ -14,7 +14,7 @@ export default async function Page(props: PageProps) {
     const { context } = await getEmbeddableStaticContext(params);
     const pathname = getPagePathFromParams(params);
 
-    return <EmbeddableDocsPage context={context} pageParams={{ pathname }} />;
+    return <EmbeddableDocsPage context={context} pageParams={{ pathname }} staticRoute />;
 }
 
 export async function generateMetadata(props: PageProps): Promise<Metadata> {

packages/gitbook/src/components/Embeddable/EmbeddableDocsPage.tsx

@@ -30,7 +30,9 @@ type EmbeddableDocsPageProps = {
 /**
  * Page component for the embed docs page.
  */
-export async function EmbeddableDocsPage(props: EmbeddableDocsPageProps) {
+export async function EmbeddableDocsPage(
+    props: EmbeddableDocsPageProps & { staticRoute: boolean }
+) {
     const { context, pageParams } = props;
     const { page, document, ancestors, withPageFeedback } = await getSitePageData({
         context,
@@ -87,6 +89,7 @@ export async function EmbeddableDocsPage(props: EmbeddableDocsPageProps) {
                             document={document}
                             withPageFeedback={withPageFeedback}
                             insightsDisplayContext={SiteInsightsDisplayContext.Embed}
+                            staticRoute={props.staticRoute}
                         />
                     </ScrollContainer>
                 </EmbeddableFrameBody>

packages/gitbook/src/components/PageBody/OptionalSuspense.tsx

@@ -0,0 +1,20 @@
+import React from 'react';
+
+/**
+ * Conditionally wrap children in a Suspense component based on SSR status.
+ * We need to do that because otherwise ISR pages will trigger the suspense boundary on every request,
+ * causing flickering and bad UX.
+ */
+export default function OptionalSuspense(props: {
+    staticRoute: boolean;
+    fallback: React.ReactNode;
+    children: React.ReactNode;
+}) {
+    const { staticRoute, fallback, children } = props;
+
+    if (staticRoute) {
+        return <>{children}</>;
+    }
+
+    return <React.Suspense fallback={fallback}>{children}</React.Suspense>;
+}

packages/gitbook/src/components/PageBody/PageBody.tsx

@@ -1,6 +1,5 @@
 import type { GitBookSiteContext } from '@/lib/context';
 import type { JSONDocument, RevisionPageDocument, SiteInsightsDisplayContext } from '@gitbook/api';
-import React from 'react';
 
 import { getSpaceLanguage } from '@/intl/server';
 import { t } from '@/intl/translate';
@@ -12,6 +11,7 @@ import { TrackPageViewEvent } from '../Insights';
 import { PageFeedbackForm } from '../PageFeedback';
 import { CurrentPageProvider } from '../hooks/useCurrentPage';
 import { DateRelative, SuspenseLoadedHint } from '../primitives';
+import OptionalSuspense from './OptionalSuspense';
 import { PageBodyBlankslate } from './PageBodyBlankslate';
 import { PageCover } from './PageCover';
 import { PageFooterNavigation } from './PageFooterNavigation';
@@ -27,8 +27,17 @@ export function PageBody(props: {
     document: JSONDocument | null;
     withPageFeedback: boolean;
     insightsDisplayContext: SiteInsightsDisplayContext;
+    staticRoute: boolean;
 }) {
-    const { page, context, ancestors, document, withPageFeedback, insightsDisplayContext } = props;
+    const {
+        page,
+        context,
+        ancestors,
+        document,
+        withPageFeedback,
+        insightsDisplayContext,
+        staticRoute,
+    } = props;
     const { customization } = context;
 
     const contentFullWidth = document ? hasFullWidthBlock(document) : false;
@@ -84,7 +93,8 @@ export function PageBody(props: {
                     withRSSFeed={contentHasUpdates}
                 />
                 {document && !isNodeEmpty(document) ? (
-                    <React.Suspense
+                    <OptionalSuspense
+                        staticRoute={staticRoute}
                         fallback={
                             <DocumentViewSkeleton
                                 document={document}
@@ -106,7 +116,7 @@ export function PageBody(props: {
                                 withLinkPreviews,
                             }}
                         />
-                    </React.Suspense>
+                    </OptionalSuspense>
                 ) : (
                     <PageBodyBlankslate page={page} context={context} />
                 )}

packages/gitbook/src/components/SitePage/SitePage.tsx

@@ -53,7 +53,7 @@ export type PageMetaLinks = {
 /**
  * Fetch and render a page.
  */
-export async function SitePage(props: SitePageProps) {
+export async function SitePage(props: SitePageProps & { staticRoute: boolean }) {
     const {
         context,
         page,
@@ -99,6 +99,7 @@ export async function SitePage(props: SitePageProps) {
                         document={document}
                         withPageFeedback={withPageFeedback}
                         insightsDisplayContext={SiteInsightsDisplayContext.Site}
+                        staticRoute={props.staticRoute}
                     />
                 </div>
                 <PageClientLayout pageMetaLinks={pageMetaLinks} />