GitbookIO · conico974 · Apr 1, 2026 · Apr 2, 2026 · Apr 2, 2026 · Apr 3, 2026
diff --git a/bun.lock b/bun.lock
diff --git a/package.json b/package.json
@@ -17,8 +17,9 @@
         "@types/react-dom": "catalog:",
         "react": "catalog:",
         "react-dom": "catalog:",
-        "esbuild": "0.24.2",
-        "axios": "1.8.4"
+        "esbuild": "0.27.3",
+        "axios": "1.8.4",
+        "@radix-ui/react-slot": "1.2.4"
     },
     "private": true,
     "scripts": {

diff --git a/packages/gitbook/next.config.mjs b/packages/gitbook/next.config.mjs
@@ -1,10 +1,16 @@
 // @ts-check
 
+// We don't use the deployment ID yet on 2c, we need to remove it because of https://github.com/opennextjs/opennextjs-aws/issues/1136
+const deploymentId =
+    process.env.GITBOOK_RUNTIME === 'cloudflare'
+        ? undefined
+        : process.env.GITHUB_SHA || Date.now().toString(); // Needed because we use a custom deployment method i.e. https://vercel.com/docs/skew-protection#custom-deployment-id
+
 /**
  * @type {import('next').NextConfig}
  */
 const nextConfig = {
-    deploymentId: process.env.GITHUB_SHA || Date.now().toString(), // Needed because we use a custom deployment method i.e. https://vercel.com/docs/skew-protection#custom-deployment-id
+    deploymentId: deploymentId?.slice(0, 32), // Vercel's deployment ID has a max length of 32 characters
     experimental: {
         // This is needed to throw "forbidden" when the api token expired during revalidation
         authInterrupts: true,
@@ -18,6 +24,8 @@ const nextConfig = {
 
         // Since content is fully static, we don't want to fetch on hover again
         optimisticClientCache: false,
+        // Disable splitting the RSC in like 5 chunks
+        prefetchInlining: true,
     },
 
     env: {

diff --git a/packages/gitbook/openNext/customWorkers/defaultWrangler.jsonc b/packages/gitbook/openNext/customWorkers/defaultWrangler.jsonc
@@ -2,7 +2,7 @@
     "main": "default.js",
     "name": "gitbook-open-v2-server",
     "keep_names": false,
-    "compatibility_date": "2025-04-14",
+    "compatibility_date": "2026-04-02",
     "compatibility_flags": [
         "nodejs_compat",
         "allow_importable_env",

diff --git a/packages/gitbook/openNext/customWorkers/middlewareWrangler.jsonc b/packages/gitbook/openNext/customWorkers/middlewareWrangler.jsonc
@@ -1,7 +1,7 @@
 {
     "main": "middleware.js",
     "name": "gitbook-open-v2",
-    "compatibility_date": "2025-04-14",
+    "compatibility_date": "2026-04-02",
     "keep_names": false,
     "compatibility_flags": [
         "nodejs_compat",

diff --git a/packages/gitbook/package.json b/packages/gitbook/package.json
@@ -19,8 +19,8 @@
         "@gitbook/react-openapi": "workspace:*",
         "@mermaid-js/mermaid-zenuml": "^0.2.2",
         "@modelcontextprotocol/sdk": "1.17.5",
-        "@opennextjs/aws": "^3.8.5",
-        "@opennextjs/cloudflare": "^1.14.4",
+        "@opennextjs/aws": "3.10.1",
+        "@opennextjs/cloudflare": "1.19.0",
         "@panzoom/panzoom": "^4.6.1",
         "@radix-ui/react-checkbox": "^1.0.4",
         "@radix-ui/react-dropdown-menu": "^2.1.12",
@@ -54,16 +54,16 @@
         "micromark-extension-gfm": "^3.0.0",
         "motion": "^12.23.24",
         "leven": "^4.1.0",
-        "next": "15.4.11",
+        "next": "16.2.3",
         "next-themes": "^0.4.6",
         "nuqs": "^2.2.3",
         "object-hash": "^3.0.0",
         "object-identity": "^0.1.2",
         "openapi-types": "^12.1.3",
         "p-map": "^7.0.3",
         "quick-lru": "^7.0.1",
-        "react": "catalog:",
-        "react-dom": "catalog:",
+        "react": "19.2.4",
+        "react-dom": "19.2.4",
         "react-hotkeys-hook": "^4.4.1",
         "rehype-raw": "^7.0.0",
         "rehype-sanitize": "^6.0.0",
@@ -98,8 +98,8 @@
         "@types/node": "^20",
         "@types/object-hash": "^3.0.6",
         "@types/parse-cache-control": "^1.0.4",
-        "@types/react": "catalog:",
-        "@types/react-dom": "catalog:",
+        "@types/react": "19.2.14",
+        "@types/react-dom": "19.2.3",
         "@types/rison": "^0.0.9",
         "@types/negotiator": "^0.6.4",
         "bun-types": "catalog:",
@@ -112,17 +112,17 @@
         "ts-essentials": "^10.0.1",
         "typescript": "catalog:",
         "vercel": "50.37.3",
-        "wrangler": "^4.43.0",
+        "wrangler": "^4.79.0",
         "rss-parser": "^3.13.0"
     },
     "scripts": {
         "generate": "./scripts/generate.sh",
         "clean": "rm -rf ./.next && rm -rf ./public/~gitbook/static/icons && rm -rf ./public/~gitbook/static/math",
-        "dev": "env-cmd --silent -f ../../.env.local next",
-        "build": "next build",
-        "build:local": "GITBOOK_URL=http://localhost:3000 next build",
+        "dev": "env-cmd --silent -f ../../.env.local next --webpack",
+        "build": "next build --webpack",
+        "build:local": "GITBOOK_URL=http://localhost:3000 next build --webpack",
         "start": "GITBOOK_URL=http://localhost:3000 next start",
-        "build:cloudflare": "opennextjs-cloudflare build",
+        "build:cloudflare": "GITBOOK_RUNTIME=cloudflare opennextjs-cloudflare build",
         "dev:cloudflare": "wrangler dev --port 8771 --env preview",
         "dev:cf:middleware": "wrangler dev --port 8771 --inspector-port 9230 --env dev --config ./openNext/customWorkers/middlewareWrangler.jsonc",
         "dev:cf:server": "wrangler dev --port 8772 --env dev --config ./openNext/customWorkers/defaultWrangler.jsonc",
@@ -138,5 +138,9 @@
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org/"
+    },
+    "overrides": {
+        "@types/react": "19.2.14",
+        "@types/react-dom": "19.2.3"
     }
 }
diff --git a/packages/gitbook/src/app/~gitbook/revalidate/route.ts b/packages/gitbook/src/app/~gitbook/revalidate/route.ts
@@ -26,7 +26,7 @@ export async function POST(req: NextRequest) {
 
         body.tags.forEach((tag) => {
             logger.log(`Revalidating tag: ${tag}`);
-            revalidateTag(tag);
+            revalidateTag(tag, { expire: 0 }); // Force revalidation without waiting for the next scheduled revalidation
         });
 
         return NextResponse.json({

diff --git a/packages/gitbook/src/components/Header/HeaderLink.tsx b/packages/gitbook/src/components/Header/HeaderLink.tsx
@@ -1,29 +1,16 @@
 import { isSiteAuthLoginHref } from '@/lib/auth-login-link';
 import type { GitBookSiteContext } from '@/lib/context';
 import {
-    type ContentRef,
     type CustomizationContentLink,
     type CustomizationHeaderItem,
-    type CustomizationHeaderPreset,
     SiteInsightsLinkPosition,
 } from '@gitbook/api';
-import assertNever from 'assert-never';
-import type React from 'react';
 
 import { resolveContentRef } from '@/lib/references';
 import { getLocalizedTitle } from '@/lib/sites';
-import { tcls } from '@/lib/tailwind';
-import {
-    SiteAuthLoginButton,
-    SiteAuthLoginDropdownMenuItem,
-    SiteAuthLoginLink,
-} from '../SiteAuth/SiteAuthLoginLink';
-import { Button, Link, ToggleChevron } from '../primitives';
-import {
-    type DropdownButtonProps,
-    DropdownMenu,
-    DropdownMenuItem,
-} from '../primitives/DropdownMenu';
+import { SiteAuthLoginDropdownMenuItem } from '../SiteAuth/SiteAuthLoginLink';
+import { DropdownMenuItem } from '../primitives/DropdownMenu';
+import { HeaderLinkDropdown, HeaderLinkNavItem } from './HeaderLinkDropdown';
 
 export async function HeaderLink(props: {
     context: GitBookSiteContext;
@@ -39,29 +26,22 @@ export async function HeaderLink(props: {
 
     if (link.links && link.links.length > 0) {
         return (
-            <DropdownMenu
-                className={`shrink ${customization.styling.search === 'prominent' ? 'right-0 left-auto' : null}`}
-                button={
-                    !target || !link.to ? (
-                        <HeaderItemDropdown headerPreset={headerPreset} title={title} />
-                    ) : (
-                        <HeaderLinkNavItem
-                            linkTarget={link.to}
-                            linkStyle={linkStyle}
-                            headerPreset={headerPreset}
-                            title={title}
-                            isDropdown
-                            href={target?.href}
-                            isSiteAuthLoginHref={isSiteAuthLoginHref(context.linker, target.href)}
-                        />
-                    )
+            <HeaderLinkDropdown
+                headerPreset={headerPreset}
+                title={title}
+                hasTarget={!!target}
+                linkTarget={link.to}
+                linkStyle={linkStyle}
+                href={target?.href}
+                isSiteAuthLoginHref={
+                    target ? isSiteAuthLoginHref(context.linker, target.href) : false
                 }
-                openOnHover={true}
+                dropdownClassName={`shrink ${customization.styling.search === 'prominent' ? 'right-0 left-auto' : null}`}
             >
                 {link.links.map((subLink, index) => (
                     <SubHeaderLink key={index} {...props} link={subLink} />
                 ))}
-            </DropdownMenu>
+            </HeaderLinkDropdown>
         );
     }
 
@@ -82,148 +62,6 @@ export async function HeaderLink(props: {
     );
 }
 
-export type HeaderLinkNavItemProps = {
-    linkTarget: ContentRef;
-    linkStyle: NonNullable<CustomizationHeaderItem['style']>;
-    headerPreset: CustomizationHeaderPreset;
-    title: string;
-    href?: string;
-    isDropdown: boolean;
-    isSiteAuthLoginHref: boolean;
-} & DropdownButtonProps<HTMLElement>;
-
-function HeaderLinkNavItem(props: HeaderLinkNavItemProps) {
-    const { linkStyle, ...rest } = props;
-    switch (linkStyle) {
-        case 'button-secondary':
-        case 'button-primary':
-            return <HeaderItemButton {...rest} linkStyle={linkStyle} />;
-        case 'link':
-            return <HeaderItemLink {...rest} />;
-        default:
-            assertNever(linkStyle);
-    }
-}
-
-function HeaderItemButton(
-    props: Omit<HeaderLinkNavItemProps, 'linkStyle'> & {
-        linkStyle: 'button-secondary' | 'button-primary';
-    }
-) {
-    const {
-        linkTarget,
-        linkStyle,
-        headerPreset,
-        title,
-        href,
-        isDropdown,
-        isSiteAuthLoginHref,
-        ...rest
-    } = props;
-    const variant = (() => {
-        switch (linkStyle) {
-            case 'button-secondary':
-                return 'header';
-            case 'button-primary':
-                return 'primary';
-            default:
-                assertNever(linkStyle);
-        }
-    })();
-    const sharedProps: React.ComponentProps<typeof Button> = {
-        href,
-        variant,
-        size: 'medium' as const,
-        insights: {
-            type: 'link_click' as const,
-            link: {
-                target: linkTarget,
-                position: SiteInsightsLinkPosition.Header,
-            },
-        },
-        label: title,
-        ...rest,
-    };
-
-    return isSiteAuthLoginHref ? (
-        <SiteAuthLoginButton {...sharedProps} />
-    ) : (
-        <Button {...sharedProps} />
-    );
-}
-
-function getHeaderLinkClassName(_props: { headerPreset: CustomizationHeaderPreset }) {
-    return tcls(
-        'flex items-center gap-1',
-        'shrink',
-        'contrast-more:underline',
-        'truncate',
-
-        'text-tint',
-        'links-default:hover:text-primary',
-        'links-default:data-[state=open]:text-primary',
-        'links-default:tint:hover:text-tint-strong',
-        'links-default:tint:data-[state=open]:text-tint-strong',
-        'underline-offset-2',
-        'links-accent:hover:underline',
-        'links-accent:data-[state=open]:underline',
-        'links-accent:underline-offset-4',
-        'links-accent:decoration-primary-subtle',
-        'links-accent:decoration-[3px]',
-        'links-accent:py-0.5', // Prevent underline from being cut off at the bottom
-
-        'theme-bold:text-header-link',
-        'hover:theme-bold:text-header-link/7!'
-    );
-}
-
-function HeaderItemLink(props: Omit<HeaderLinkNavItemProps, 'linkStyle'>) {
-    const { linkTarget, headerPreset, title, isDropdown, href, isSiteAuthLoginHref, ...rest } =
-        props;
-    const sharedProps = {
-        href: href ?? '#',
-        className: getHeaderLinkClassName({ headerPreset }),
-        insights: {
-            type: 'link_click' as const,
-            link: {
-                target: linkTarget,
-                position: SiteInsightsLinkPosition.Header,
-            },
-        },
-        ...rest,
-    };
-
-    return isSiteAuthLoginHref ? (
-        <SiteAuthLoginLink {...sharedProps}>
-            {title}
-            {isDropdown ? <ToggleChevron /> : null}
-        </SiteAuthLoginLink>
-    ) : (
-        <Link {...sharedProps}>
-            {title}
-            {isDropdown ? <ToggleChevron /> : null}
-        </Link>
-    );
-}
-
-function HeaderItemDropdown(
-    props: {
-        headerPreset: CustomizationHeaderPreset;
-        title: string;
-    } & DropdownButtonProps<HTMLElement>
-) {
-    const { headerPreset, title, ...rest } = props;
-    return (
-        <span
-            className={tcls(getHeaderLinkClassName({ headerPreset }), 'cursor-default')}
-            {...rest}
-        >
-            {title}
-            <ToggleChevron />
-        </span>
-    );
-}
-
 async function SubHeaderLink(props: {
     context: GitBookSiteContext;
     link: CustomizationContentLink;