Move ZoomImage to v2

Co-authored-by: Samy Pessé <samypesse@gmail.com>

.bun-version

@@ -1 +1 @@
-1.1.40
+1.2.1

.changeset/angry-dots-happen.md

@@ -0,0 +1,5 @@
+---
+'gitbook-v2': minor
+---
+
+Setup structure and deployment for new version

.changeset/angry-lemons-greet.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix UI search without ask AI enabled and fix error with questions not returned from API

.changeset/beige-trains-sort.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Support llms.txt

.changeset/brave-glasses-do.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Add support for keyboard marks

.changeset/breezy-days-pull.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix search no results error showing while there are results

.changeset/chilled-kids-draw.md

@@ -0,0 +1,5 @@
+---
+'gitbook': minor
+---
+
+Reintroduce a safety check around search whilst we continue investigating caching.

.changeset/chilled-mirrors-watch.md

@@ -0,0 +1,5 @@
+---
+'gitbook': minor
+---
+
+Track new events for site insights when ads are being clicked

.changeset/chilly-readers-tap.md

@@ -0,0 +1,5 @@
+---
+'@gitbook/react-openapi': patch
+---
+
+Support response examples

.changeset/clever-mangos-explode.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Apply antialiasing on any text that are not code inline/blocks to avoid contrast issues

.changeset/clever-pumas-pump.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Handle security issue with cookies on Safari

.changeset/cold-wombats-chew.md

@@ -0,0 +1,5 @@
+---
+'@gitbook/react-openapi': minor
+---
+
+Add in HTTP example code blocks

.changeset/curly-apricots-happen.md

@@ -0,0 +1,5 @@
+---
+'gitbook': minor
+---
+
+Investigate an issue causing caches to return empty objects instead of null/undefined.

.changeset/dirty-ties-brush.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix vertical section overflow color

.changeset/dull-chefs-talk.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Reduce gap between subsequent header buttons

.changeset/dull-melons-beam.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix shrinking page icons

.changeset/early-spiders-guess.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Start using tint in more places, TOC and PageAside

.changeset/eighty-poems-reflect.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Remove KV cache backend and only rely on DO as an external cache backend

.changeset/eleven-eggs-ring.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix default outline list styling

.changeset/few-rocks-film.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Simplify search results logic to investigate a bug

.changeset/five-students-rescue.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Cache API spec for 24 hours, revalidated every 2 hours

.changeset/fluffy-panthers-unite.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Try to fix error on og image generation

.changeset/fresh-lemons-pull.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Downgrade to Next.js v14 to fix incompatibilities with next-on-pages causing multiple bugs.

.changeset/giant-wolves-study.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix zoom image view transition on Safari

.changeset/gorgeous-horses-grow.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Position the variant picker in the ToC

.changeset/gorgeous-kids-dream.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Update footer styling and allow for more than 4 footer groups

.changeset/grumpy-zoos-rush.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix Image blocks zoomable behaviour

.changeset/happy-emus-invite.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Handle Firefox security error on localStorage

.changeset/hip-comics-cross.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix errors from customization not found

.changeset/khaki-zebras-deliver.md

@@ -0,0 +1,6 @@
+---
+'@gitbook/react-openapi': patch
+'gitbook': patch
+---
+
+Do not dereference before caching OpenAPI spec.

.changeset/large-ligers-nail.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix regression issue with page icons for multi-line titles

.changeset/late-pots-remain.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix OG image generation for non-latin characters

.changeset/lazy-beans-call.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Ignore cache invalidation error from local backend

.changeset/loud-dodos-rhyme.md

@@ -0,0 +1,5 @@
+---
+'@gitbook/react-openapi': patch
+---
+
+Fix an issue where a response object using a special ref would crash the page.

.changeset/loud-files-tap.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Allow only good values for theme query parameter. Avoid having a 500 error when we pass an invalid value.

.changeset/nasty-parents-sell.md

@@ -0,0 +1,5 @@
+---
+'gitbook': minor
+---
+
+Restyle PageAside to use sidebar list styles

.changeset/nervous-flowers-happen.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Generate sitemap for all sections and spaces

.changeset/nice-spoons-double.md

@@ -0,0 +1,5 @@
+---
+'gitbook': minor
+---
+
+Fix an issue where search and Ask AI triggers unnecessary renders when in a Visitor Authenticated site.

.changeset/old-dots-beam.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Add feedback form to page rating control

.changeset/olive-pillows-kick.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Update the routes for changes/revisions in multi-id mode to match the normal mode

.changeset/perfect-laws-pay.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix server actions stability leading to no results found sometimes on search

.changeset/polite-spies-beg.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Lazy load iframely script to make page more responsive

.changeset/poor-carrots-taste.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Cards stand out slighly more on tinted and dark mode sites, and have better support for headings inside them

.changeset/poor-mugs-glow.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+New highlight colors

.changeset/pretty-elephants-glow.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix search UI behaviour

.changeset/pretty-flies-jump.md

@@ -0,0 +1,5 @@
+---
+'gitbook': minor
+---
+
+Improve the display of recommended questions by streaming them.

.changeset/rich-impalas-applaud.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix error when accessing a change request not found

.changeset/selfish-badgers-smile.md

@@ -0,0 +1,5 @@
+---
+'@gitbook/react-openapi': patch
+---
+
+Improve performances by loading Scalar API Client only when the button is clicked

.changeset/seven-hounds-grow.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix issue leading to increase the storage write and the stability of the platform

.changeset/shiny-cheetahs-grow.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Force route handler to be dynamic to avoid errors

.changeset/silver-dancers-heal.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Disable C/C++ highlight temporarily

.changeset/soft-trees-perform.md

@@ -0,0 +1,6 @@
+---
+'@gitbook/react-openapi': minor
+'gitbook': minor
+---
+
+Fix internal properties appearing in OpenAPI docs.

.changeset/sweet-tools-fly.md

@@ -0,0 +1,5 @@
+---
+'gitbook': minor
+---
+
+Add antialiasing for text rendering

.changeset/tasty-cooks-kneel.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Improve styling of header buttons with shadows and high-contrast styles

.changeset/tasty-rocks-matter.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix viewing PDF from space

.changeset/tender-ties-check.md

@@ -0,0 +1,8 @@
+---
+'@gitbook/react-openapi': major
+---
+
+Use `@scalar/openapi-parser` to be more resilient and perf on OpenAPI spec parsing:
+
+-   `fetcher.fetch` must now returns a valid OpenAPI document
+-   `parseOpenAPIV3` has been replaced by `parseOpenAPI`

.changeset/thick-items-sneeze.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Vertical orientation for sections list on sites without header

.changeset/thin-camels-boil.md

@@ -0,0 +1,6 @@
+---
+'@gitbook/react-openapi': patch
+'gitbook': patch
+---
+
+Improve OpenAPI rendering performances by caching markdown parsing

.changeset/thin-files-flow.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Improve performances by highlighting code client-side if the code block is offscreen

.changeset/thirty-berries-bow.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix error when accessing some not found pages.

.changeset/two-beans-smell.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix breadcrumbs emoji display + add contrast styles

.changeset/two-mirrors-move.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix server actions cache compromised. Leading to some bugs on frontend.

.changeset/wicked-apricots-drop.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix variant dropdown styling in header

.changeset/wild-chicken-matter.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix view transition error on Safari

.changeset/wild-lemons-camp.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Bump `heading-3` font size to offset it from paragraphs

.changeset/yellow-singers-walk.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Remove animation on section tabs. Page is reloaded (for technical reasons), so the animation is not accurate here.

.github/workflows/ci.yaml

@@ -18,7 +18,8 @@ jobs:
             checks: write
             statuses: write
         outputs:
-            deployment_url: ${{ steps.deploy.outputs.deployment-url }}
+            deployment-url: ${{ steps.deploy.outputs.deployment-url }}
+            deployment-alias-url: ${{ steps.deploy.outputs.deployment-alias-url }}
         steps:
             - name: Checkout
               uses: actions/checkout@v4
@@ -38,9 +39,10 @@ jobs:
                   echo "SENTRY_ENVIRONMENT=preview" >> $GITHUB_ENV
               if: 1 && !startsWith(github.ref, 'refs/heads/main')
             - name: Build Next.js with next-on-pages
-              run: bun run build:cloudflare
+              run: bun run turbo build:cloudflare
               env:
                   SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+                  NEXT_SERVER_ACTIONS_ENCRYPTION_KEY: ${{ secrets.NEXT_SERVER_ACTIONS_ENCRYPTION_KEY }}
                   SENTRY_ORG: ${{ vars.SENTRY_ORG }}
                   SENTRY_PROJECT: ${{ vars.SENTRY_PROJECT }}
                   SENTRY_DSN: ${{ vars.SENTRY_DSN }}
@@ -73,26 +75,159 @@ jobs:
                     -H "Accept: application/vnd.github.v3+json" \
                     -d '{"state": "success", "target_url": "${{ steps.deploy.outputs.deployment-url }}", "description": "Deployed Preview URL for commit", "context": "cloudflare/preview"}' \
                     https://api.github.com/repos/${{ github.repository }}/statuses/${{ github.sha }}
-
+    deploy-v2-vercel:
+        name: Deploy v2 to Vercel
+        runs-on: ubuntu-latest
+        permissions:
+            contents: read
+            deployments: write
+            issues: write
+            pull-requests: write
+            checks: write
+            statuses: write
+        outputs:
+            deployment-url: ${{ steps.deploy.outputs.deployment-url }}
+        env:
+            VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
+            VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+            - name: Setup Bun
+              uses: ./.github/composite/setup-bun
+            - name: Install dependencies
+              run: bun install --frozen-lockfile
+              env:
+                  PUPPETEER_SKIP_DOWNLOAD: 1
+            - name: Sets env vars for production
+              run: |
+                  echo "VERCEL_ENVIRONMENT=production" >> $GITHUB_ENV
+                  echo "SENTRY_ENVIRONMENT=production" >> $GITHUB_ENV
+                  echo "GITBOOK_ASSETS_PREFIX=https://static.gitbook.com" >> $GITHUB_ENV
+              if: startsWith(github.ref, 'refs/heads/main')
+            - name: Sets env vars for preview
+              run: |
+                  echo "VERCEL_ENVIRONMENT=preview" >> $GITHUB_ENV
+                  echo "SENTRY_ENVIRONMENT=preview" >> $GITHUB_ENV
+              if: 1 && !startsWith(github.ref, 'refs/heads/main')
+            - name: Pull Vercel Environment Information
+              run: bun run vercel pull --yes --environment=$VERCEL_ENVIRONMENT --token=${{ secrets.VERCEL_TOKEN }}
+            - name: Build Project Artifacts
+              run: bun run vercel build --token=${{ secrets.VERCEL_TOKEN }}
+              env:
+                  SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+                  NEXT_SERVER_ACTIONS_ENCRYPTION_KEY: ${{ secrets.NEXT_SERVER_ACTIONS_ENCRYPTION_KEY }}
+                  SENTRY_ORG: ${{ vars.SENTRY_ORG }}
+                  SENTRY_PROJECT: ${{ vars.SENTRY_PROJECT }}
+                  SENTRY_DSN: ${{ vars.SENTRY_DSN }}
+                  SENTRY_RELEASE: ${{ github.sha }}
+            - name: Deploy Project Artifacts to Vercel
+              id: deploy
+              run: |
+                  DEPLOYMENT_URL=$(bun run vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }})
+                  echo "deployment-url=$DEPLOYMENT_URL" >> "$GITHUB_OUTPUT"
+            - name: Outputs
+              run: |
+                  echo "URL: ${{ steps.deploy.outputs.deployment-url }}"
+    deploy-v2-cloudflare:
+        name: Deploy v2 to Cloudflare Worker
+        runs-on: ubuntu-latest
+        permissions:
+            contents: read
+            deployments: write
+            issues: write
+            pull-requests: write
+            checks: write
+            statuses: write
+        outputs:
+            deployment-url: ${{ steps.deploy.outputs.deployment-url }}
+        env:
+            VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
+            VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+            - name: Setup Bun
+              uses: ./.github/composite/setup-bun
+            - name: Install dependencies
+              run: bun install --frozen-lockfile
+              env:
+                  PUPPETEER_SKIP_DOWNLOAD: 1
+            - name: Sets env vars for production
+              run: |
+                  echo "SENTRY_ENVIRONMENT=production" >> $GITHUB_ENV
+                  echo "GITBOOK_ASSETS_PREFIX=https://static.gitbook.com" >> $GITHUB_ENV
+              if: startsWith(github.ref, 'refs/heads/main')
+            - name: Sets env vars for preview
+              run: |
+                  echo "SENTRY_ENVIRONMENT=preview" >> $GITHUB_ENV
+              if: 1 && !startsWith(github.ref, 'refs/heads/main')
+            - name: Build worker
+              run: bun run turbo build:v2:cloudflare
+              env:
+                  SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+                  NEXT_SERVER_ACTIONS_ENCRYPTION_KEY: ${{ secrets.NEXT_SERVER_ACTIONS_ENCRYPTION_KEY }}
+                  SENTRY_ORG: ${{ vars.SENTRY_ORG }}
+                  SENTRY_PROJECT: ${{ vars.SENTRY_PROJECT }}
+                  SENTRY_DSN: ${{ vars.SENTRY_DSN }}
+                  SENTRY_RELEASE: ${{ github.sha }}
+            - id: deploy
+              name: Deploy to Cloudflare
+              uses: cloudflare/wrangler-action@v3.11.0
+              with:
+                  apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+                  workingDirectory: ./
+                  wranglerVersion: '3.82.0'
+                  command: versions upload --config ./packages/gitbook-v2/wrangler.toml
+            - name: Outputs
+              run: |
+                  echo "URL: ${{ steps.deploy.outputs.deployment-url }}"
+    comment-deployments:
+        runs-on: ubuntu-latest
+        name: Comment Deployments
+        if: always() && !startsWith(github.ref, 'refs/heads/main')
+        needs:
+            - deploy
+            - deploy-v2-vercel
+            - deploy-v2-cloudflare
+        steps:
             - name: Find GitHub Comment
               uses: peter-evans/find-comment@v3
               id: fc
-              if: 1 && !startsWith(github.ref, 'refs/heads/main')
               with:
                   issue-number: ${{ github.event.pull_request.number }}
                   comment-author: 'github-actions[bot]'
-                  body-includes: GitBook Preview
+                  body-includes: 'Summary of the deployments'
 
             - name: Create or update GitHub comment
               uses: peter-evans/create-or-update-comment@v4
-              if: 1 && !startsWith(github.ref, 'refs/heads/main')
               with:
                   comment-id: ${{ steps.fc.outputs.comment-id }}
                   issue-number: ${{ github.event.pull_request.number }}
                   body: |
-                      **GitBook Preview**
-                      Latest commit: [${{ steps.deploy.outputs.deployment-url }}](${{ steps.deploy.outputs.deployment-url }})
-                      PR: [${{ steps.deploy.outputs.deployment-alias-url }}](${{ steps.deploy.outputs.deployment-alias-url }})
+                      Summary of the deployments:
+
+                      ### Version 1 (production)
+
+                      | Version | URL | Status |
+                      | --- | --- | --- |
+                      | Latest commit | [${{ needs.deploy.outputs.deployment-url }}](${{ needs.deploy.outputs.deployment-url }}) | ${{ needs.deploy.result == 'success' && '✅' || '❌' }} |
+                      | PR | [${{ needs.deploy.outputs.deployment-alias-url }}](${{ needs.deploy.outputs.deployment-alias-url }}) | ${{ needs.deploy.result == 'success' && '✅' || '❌' }} |
+
+                      ### Version 2 (experimental)
+
+                      | Version | URL | Status |
+                      | --- | --- | --- |
+                      | Vercel | [${{ needs.deploy-v2-vercel.outputs.deployment-url }}](${{ needs.deploy-v2-vercel.outputs.deployment-url }}) | ${{ needs.deploy-v2-vercel.result == 'success' && '✅' || '❌' }} |
+                      | Cloudflare | [${{ needs.deploy-v2-cloudflare.outputs.deployment-url }}](${{ needs.deploy-v2-cloudflare.outputs.deployment-url }}) | ${{ needs.deploy-v2-cloudflare.result == 'success' && '✅' || '❌' }} |
+
+                      ### Test content
+
+                      | Site | v1 | v2 |
+                      | --- | --- | --- |
+                      | GitBook | [${{ needs.deploy.outputs.deployment-url }}/docs.gitbook.com](${{ needs.deploy.outputs.deployment-url }}/docs.gitbook.com) | [${{ needs.deploy-v2-vercel.outputs.deployment-url }}/static/url/docs.gitbook.com](${{ needs.deploy-v2-vercel.outputs.deployment-url }}/static/url/docs.gitbook.com) |
+                      | E2E | [${{ needs.deploy.outputs.deployment-url }}/gitbook.gitbook.io/test-gitbook-open](${{ needs.deploy.outputs.deployment-url }}/gitbook.gitbook.io/test-gitbook-open) | [${{ needs.deploy-v2-vercel.outputs.deployment-url }}/static/url/gitbook.gitbook.io/test-gitbook-open](${{ needs.deploy-v2-vercel.outputs.deployment-url }}/static/url/gitbook.gitbook.io/test-gitbook-open) |
                   edit-mode: replace
     visual-testing:
         runs-on: ubuntu-latest
@@ -110,7 +245,7 @@ jobs:
             - name: Run Playwright tests
               run: bun e2e
               env:
-                  BASE_URL: ${{needs.deploy.outputs.deployment_url}}
+                  BASE_URL: ${{needs.deploy.outputs.deployment-url}}
                   ARGOS_TOKEN: ${{ secrets.ARGOS_TOKEN }}
             - uses: actions/upload-artifact@v4
               if: ${{ !cancelled() }}
@@ -134,7 +269,7 @@ jobs:
             - name: Run pagespeed tests
               run: bun ./packages/gitbook/tests/pagespeed-testing.ts $DEPLOYMENT_URL
               env:
-                  DEPLOYMENT_URL: ${{needs.deploy.outputs.deployment_url}}
+                  DEPLOYMENT_URL: ${{needs.deploy.outputs.deployment-url}}
                   PAGESPEED_API_KEY: ${{ secrets.PAGESPEED_API_KEY }}
     format:
         runs-on: ubuntu-latest

.prettierignore

@@ -1,5 +1,6 @@
 .next
 .vercel
+.open-next
 
 # Generated
 packages/emoji-codepoints/index.ts
@@ -8,3 +9,6 @@ packages/icons/src/data/*.json
 
 # Build files
 dist/
+
+README.md
+CHANGELOG.md

README.md

@@ -35,8 +35,10 @@ To run a local version of this project, please follow these simple steps.
 
 ### Prerequisites
 
--   Node.js (Version: >=18.x)
--   Bun
+-   Node.js (Version: >=20.6)
+  - Use nvm for easy Node management
+-   Bun (Version: >=1.2.1)
+  - We use a text-based lockfile which isn't supported below 1.2.1
 
 ### Set up
 

package.json

@@ -2,19 +2,24 @@
     "name": "gitbook",
     "version": "0.1.0",
     "devDependencies": {
-        "@changesets/cli": "^2.27.7",
+        "@changesets/cli": "^2.27.12",
         "prettier": "^3.0.3",
-        "turbo": "^2.1.2"
+        "turbo": "^2.3.4",
+        "vercel": "^39.3.0"
     },
     "packageManager": "bun@1.1.18",
     "overrides": {
-        "@codemirror/state": "6.4.1"
+        "@codemirror/state": "6.4.1",
+        "react": "18.3.1",
+        "react-dom": "18.3.1"
     },
     "private": true,
     "scripts": {
         "dev": "turbo run dev --ui=stream",
+        "dev:v2": "turbo run dev:v2 --ui=stream",
         "build": "turbo run build",
-        "build:cloudflare": "turbo run build:cloudflare",
+        "build:v2": "turbo run build:v2",
+        "clean-deps": "rm -rf node_modules && rm -rf packages/*/node_modules",
         "lint": "turbo run lint",
         "lint:fix": "turbo run lint -- --fix",
         "typecheck": "turbo run typecheck",
@@ -33,6 +38,6 @@
     ],
     "patchedDependencies": {
         "decode-named-character-reference@1.0.2": "patches/decode-named-character-reference@1.0.2.patch",
-        "@vercel/next@4.3.15": "patches/@vercel%2Fnext@4.3.15.patch"
+        "@vercel/next@4.4.2": "patches/@vercel%2Fnext@4.4.2.patch"
     }
 }

packages/gitbook-v2/.gitignore

@@ -0,0 +1,8 @@
+# next.js
+/.next/
+
+# vercel
+.vercel
+
+# cloudflare
+.open-next

packages/gitbook-v2/README.md

@@ -0,0 +1,104 @@
+# GitBook V2
+
+This package contains the code for an experiment new version of the GitBook renderer.
+
+The goals of this new version are:
+
+- Optimize rendering to leverage Next.js ISR and static rendering
+- Leverage Node.js runtime and bigger instances to render bigger content
+- Evaluate Vercel and Cloudflare deployment options
+
+## Deployment
+
+#### Vercel
+
+The new version is deployed automatically to Vercel using a Github Action on every push.
+
+#### Cloudflare with Opennext-js
+
+The new version is deployed automatically to Cloudflare using a Github Action on every push.
+
+## Potential issues
+
+- [ ] We can't use `dynamicIO` because our root layout needs to fetch the params (https://github.com/vercel/next.js/discussions/71927)
+- [ ] How to do `nonce` for static resources when we can't use `headers()` (dynamic API) (https://nextjs.org/docs/app/building-your-application/configuring/content-security-policy)
+
+## Structure
+
+#### Middleware:
+
+Goals:
+- Route between dynamic and static routes
+  - If a token is in the cookies => dynamic route
+  - If a token is in the url => dynamic route
+  - Else => static route
+- High performances:
+  - It should not rely on data fetching
+
+#### URLs to support:
+
+Content URLs:
+
+- `docs.company.com/page`
+  - Middleware: rewrite to `/static/url/docs.company.com/page`
+  - Page component renders the page
+- `docs.company2.com/section/page`
+  - Middleware: rewrite to `/static/url/docs.company2.com/section/page`
+  - Page component renders the page
+- `docs.company3.com/section/sitespace/page`
+  - Middleware: rewrite to `/static/url/docs.company3.com/section/sitespace/page`
+  - Page component renders the page
+
+Content URLs (adaptive content or visitor authentication):
+
+- `docs.company.com/page`
+  - Middleware:
+    - If a token is in the cookies or url => dynamic route
+    - Else => rewrite to `/dynamic/url/docs.company.com/page`
+  - Page component renders the page
+    - Read the token from the url query params or cookies
+
+
+PDF export URLs:
+
+- `docs.company.com/page/~gitbook/pdf`
+  - Middleware: rewrite to `/dynamic/pdf/docs.company.com/page`
+  - Page component renders the page
+
+Images resizing:
+
+- `docs.company.com/~gitbook/image`
+  - Middleware: rewrite to `/dynamic/image/docs.company.com`
+  - Route handlers process the request
+
+Preview URLs:
+
+- `open.gitbook.com/sites/site_abc/page` (or `open.gitbook.com/~site/site_abc/page` to stay compatible?)
+  - Middleware: no rewrite
+  - Page component renders the page (dynamic?)
+     - Read the token from the url query params
+     - Read customizations override from the url query params
+
+
+Space PDF URLs:
+
+- `open.gitbook.com/spaces/space_abc/pdf`
+  - Middleware: no rewrite
+  - Page component renders the page (dynamic?)
+     - Read the token from the url query params
+     - Read customizations override from the url query params
+
+Development:
+
+- `localhost:3000/sites/site_abc/page`
+
+#### Routes:
+
+- Content
+    - [ ] `/static/url/[[...url]]/page.tsx`
+    - [ ] `/dynamic/url/[[...url]]/page.tsx`
+- Images resizing
+    - [ ] `/dynamic/image/[hostname]/route.ts`
+- PDF export
+    - [ ] `/dynamic/pdf/[[...url]]/page.tsx`
+    - [ ] `/spaces/[space]/pdf/page.tsx`

packages/gitbook-v2/next-env.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="next" />
+/// <reference types="next/image-types/global" />
+
+// NOTE: This file should not be edited
+// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

packages/gitbook-v2/next.config.mjs

@@ -0,0 +1,15 @@
+// @ts-check
+
+/**
+ * @type {import('next').NextConfig}
+ */
+const nextConfig = {
+    experimental: {
+        useCache: true,
+
+        // We can't use dynamicIO because it doesn't accept reading params in the root layout
+        // dynamicIO: true,
+    },
+};
+
+export default nextConfig;

packages/gitbook-v2/open-next.config.ts

@@ -0,0 +1,30 @@
+// default open-next.config.ts file created by @opennextjs/cloudflare
+
+import cache from '@opennextjs/cloudflare/kvCache';
+
+const config = {
+    default: {
+        override: {
+            wrapper: 'cloudflare-node',
+            converter: 'edge',
+            incrementalCache: async () => cache,
+            tagCache: 'dummy',
+            queue: 'dummy',
+        },
+    },
+
+    middleware: {
+        external: true,
+        override: {
+            wrapper: 'cloudflare-edge',
+            converter: 'edge',
+            proxyExternalRequest: 'fetch',
+        },
+    },
+
+    dangerous: {
+        enableCacheInterception: false,
+    },
+};
+
+export default config;

packages/gitbook-v2/package.json

@@ -0,0 +1,23 @@
+{
+    "name": "gitbook-v2",
+    "version": "0.0.0",
+    "dependencies": {
+        "next": "canary",
+        "react": "^19.0.0",
+        "react-dom": "^19.0.0",
+        "@gitbook/api": "^0.90.0",
+        "@gitbook/icons": "workspace:*",
+        "clsx": "^2.1.1"
+    },
+    "devDependencies": {
+        "@opennextjs/cloudflare": "^0.4.3"
+    },
+    "scripts": {
+        "dev:v2": "next",
+        "build": "next build",
+        "build:v2": "next build",
+        "start": "next start",
+        "build:v2:cloudflare": "opennextjs-cloudflare",
+        "dev:v2:cloudflare": "wrangler dev --port 8771"
+    }
+}

packages/gitbook-v2/src/app/dynamic/url/[...url]/layout.tsx

@@ -0,0 +1,15 @@
+import { SiteContentLayout } from '@v2/components/routes/SiteContentLayout';
+import { createDynamicSiteContext } from '@v2/lib/context';
+
+export default async function RootLayout({
+    params,
+    children,
+}: {
+    params: Promise<{ url: string[] }>;
+    children: React.ReactNode;
+}) {
+    const { url } = await params;
+    const context = await createDynamicSiteContext(url);
+
+    return <SiteContentLayout context={context}>{children}</SiteContentLayout>;
+}

packages/gitbook-v2/src/app/dynamic/url/[...url]/page.tsx

@@ -0,0 +1,9 @@
+import { SiteContentPage } from '@v2/components/routes/SiteContentPage';
+import { createDynamicSiteContext } from '@v2/lib/context';
+
+export default async function Page({ params }: { params: Promise<{ url: string[] }> }) {
+    const { url } = await params;
+    const context = await createDynamicSiteContext(url);
+
+    return <SiteContentPage context={context} />;
+}

packages/gitbook-v2/src/app/static/url/[...url]/layout.tsx

@@ -0,0 +1,21 @@
+import { unstable_cacheTag as cacheTag } from 'next/cache';
+import { SiteContentLayout } from '@v2/components/routes/SiteContentLayout';
+import { getSiteCacheTag } from '@v2/lib/cache';
+import { createStaticSiteContext } from '@v2/lib/context';
+
+export default async function RootLayout({
+    params,
+    children,
+}: {
+    params: Promise<{ url: string[] }>;
+    children: React.ReactNode;
+}) {
+    'use cache';
+
+    const { url } = await params;
+    const context = await createStaticSiteContext(url);
+
+    cacheTag(getSiteCacheTag(context.siteId));
+
+    return <SiteContentLayout context={context}>{children}</SiteContentLayout>;
+}

packages/gitbook-v2/src/app/static/url/[...url]/page.tsx

@@ -0,0 +1,15 @@
+import { unstable_cacheTag as cacheTag } from 'next/cache';
+import { createStaticSiteContext } from '@v2/lib/context';
+import { getSiteCacheTag } from '@v2/lib/cache';
+import { SiteContentPage } from '@v2/components/routes/SiteContentPage';
+
+export default async function Page({ params }: { params: Promise<{ url: string[] }> }) {
+    'use cache';
+
+    const { url } = await params;
+    const context = await createStaticSiteContext(url);
+
+    cacheTag(getSiteCacheTag(context.siteId));
+
+    return <SiteContentPage context={context} />;
+}

packages/gitbook-v2/src/components/images/ZoomImage.tsx

@@ -1,12 +1,11 @@
 'use client';
 
+import clsx from 'clsx';
+
 import { Icon } from '@gitbook/icons';
-import classNames from 'classnames';
 import React from 'react';
 import ReactDOM from 'react-dom';
 
-import { tcls } from '@/lib/tailwind';
-
 import styles from './ZoomImage.module.css';
 
 /**
@@ -142,6 +141,7 @@ export function ZoomImage(
             ) : (
                 // When zooming, remove the image from the DOM to let the browser animates it with View Transition.
                 <img
+                    data-testid="zoom-image"
                     ref={imgRef}
                     {...props}
                     alt={alt ?? ''}
@@ -165,7 +165,7 @@ export function ZoomImage(
                             startViewTransition(change);
                         });
                     }}
-                    className={classNames(
+                    className={clsx(
                         props.className,
                         zoomable ? styles.zoomImg : null,
                         active ? styles.zoomImageActive : null,
@@ -206,19 +206,10 @@ function ZoomImageModal(props: {
 
     return (
         <div
-            className={classNames(
+            data-testid="zoom-image-modal"
+            className={clsx(
                 styles.zoomModal,
-                tcls(
-                    'fixed',
-                    'inset-0',
-                    'z-50',
-                    'flex',
-                    'items-center',
-                    'justify-center',
-                    'bg-light',
-                    'dark:bg-dark',
-                    'p-8',
-                ),
+                'fixed inset-0 z-50 flex items-center justify-center bg-light dark:bg-dark p-8',
             )}
             onClick={onClose}
         >
@@ -226,60 +217,43 @@ function ZoomImageModal(props: {
                 src={src}
                 alt={alt}
                 crossOrigin={crossOrigin}
-                className={tcls(
-                    'max-w-full',
-                    'max-h-full',
-                    'object-contain',
-                    'bg-light',
-                    'dark:bg-dark',
-                )}
+                className="max-w-full max-h-full object-contain bg-light dark:bg-dark"
             />
 
             <button
                 ref={buttonRef}
-                className={tcls(
-                    'absolute',
-                    'top-5',
-                    'right-5',
-                    'flex',
-                    'flex-row',
-                    'items-center',
-                    'justify-center',
-                    'text-sm',
-                    'text-dark/6',
-                    'dark:text-light/5',
-                    'hover:text-primary',
-                    'p-4',
-                    'dark:text-light/5',
-                    'rounded-full',
-                    'bg-white',
-                    'dark:bg-dark/3',
-                    'shadow-sm',
-                    'hover:shadow-md',
-                    'border-slate-300',
-                    'dark:border-dark/2',
-                    'border',
-                )}
+                className="absolute top-5 right-5 flex flex-row items-center justify-center text-sm text-dark/6 dark:text-light/5 hover:text-primary p-4 dark:text-light/5 rounded-full bg-white dark:bg-dark/3 shadow-sm hover:shadow-md border-slate-300 dark:border-dark/2 border dark:text-light/5 hover:text-primary p-4 dark:text-light/5 rounded-full bg-white dark:bg-dark/3 shadow-sm hover:shadow-md border-slate-300 dark:border-dark/2 border"
                 onClick={onClose}
             >
-                <Icon icon="compress-wide" className={tcls('size-5')} />
+                <Icon icon="compress-wide" className="size-5" />
             </button>
         </div>
     );
 }
 
 function startViewTransition(callback: () => void, onEnd?: () => void) {
-    // @ts-ignore
     if (document.startViewTransition) {
-        // @ts-ignore
-        const transition = document.startViewTransition(() => {
-            ReactDOM.flushSync(() => callback());
-        });
-        transition.finished.then(() => {
-            if (onEnd) {
-                onEnd();
+        try {
+            const transition = document.startViewTransition(() => {
+                ReactDOM.flushSync(() => callback());
+            });
+            transition.finished.then(() => {
+                if (onEnd) {
+                    onEnd();
+                }
+            });
+        } catch (error) {
+            // Safari can throw an error if another transition is already in progress
+            if (
+                error instanceof Error &&
+                (error.name === 'AbortError' || error.name === 'InvalidStateError')
+            ) {
+                callback();
+                onEnd?.();
+                return;
             }
-        });
+            throw error;
+        }
     } else {
         callback();
         onEnd?.();

packages/gitbook-v2/src/components/routes/SiteContentLayout.tsx

@@ -0,0 +1,37 @@
+import { GitBookSiteSpaceContext } from '@v2/lib/context';
+import { Footer } from '@/components/Footer';
+
+/**
+ * Layout component to render the site content.
+ */
+export async function SiteContentLayout({
+    context,
+    children,
+}: {
+    context: GitBookSiteSpaceContext;
+    children: React.ReactNode;
+}) {
+    const [publishedSite, space] = await Promise.all([
+        context.getPublishedContentSite(
+            context.organizationId,
+            context.siteId,
+        ),
+        context.getSpaceById(context.spaceId, context.siteShareKey),
+    ]);
+
+    return (
+        <html lang="en">
+            <body>
+                <h1>{publishedSite.site.title}</h1>
+                {children}
+                <Footer
+                    space={space}
+                    customization={
+                        publishedSite.customizations.siteSpaces[context.siteSpaceId] ??
+                        publishedSite.customizations.site
+                    }
+                />
+            </body>
+        </html>
+    );
+}

packages/gitbook-v2/src/components/routes/SiteContentPage.tsx

@@ -0,0 +1,12 @@
+import { GitBookSiteContext } from '@v2/lib/context';
+
+export async function SiteContentPage({ context }: { context: GitBookSiteContext }) {
+    const { api } = context;
+    const { data } = await api.orgs.getPublishedContentSite(context.organizationId, context.siteId);
+
+    return (
+        <div>
+            <p>Found site {data.site.id}</p>
+        </div>
+    );
+}

packages/gitbook-v2/src/lib/cache.ts

@@ -0,0 +1,3 @@
+export function getSiteCacheTag(siteId: string) {
+    return `sites/${siteId}`;
+}

packages/gitbook-v2/src/lib/context.ts

@@ -0,0 +1,157 @@
+import { headers } from 'next/headers';
+import { redirect } from 'next/navigation';
+import { GitBookAPI } from '@gitbook/api';
+import { GITBOOK_API_TOKEN, GITBOOK_API_URL, GITBOOK_USER_AGENT } from '@v2/lib/env';
+import { GitBookContext } from '@/lib/v2/context';
+
+/**
+ * Context when rendering a site.
+ */
+export interface GitBookSiteContext extends GitBookContext {
+    /**
+     * ID of the organization.
+     */
+    organizationId: string;
+
+    /**
+     * Site ID.
+     */
+    siteId: string;
+}
+
+/**
+ * Context when rendering a space in a site.
+ */
+export interface GitBookSiteSpaceContext extends GitBookSiteContext {
+    /**
+     * ID of the space.
+     */
+    spaceId: string;
+
+    /**
+     * ID of the site section.
+     */
+    siteSectionId: string | undefined;
+
+    /**
+     * ID of the site space.
+     */
+    siteSpaceId: string;
+
+    /**
+     * Share key of the site.
+     */
+    siteShareKey: string | undefined;
+}
+
+/**
+ * Create a site context, when rendering a static page.
+ */
+export async function createStaticSiteContext(url: string[]): Promise<GitBookSiteSpaceContext> {
+    const context = createStaticContext();
+    return fetchSiteContext(url, context);
+}
+
+/**
+ * Create a site context, when rendering a dynamic page.
+ */
+export async function createDynamicSiteContext(url: string[]): Promise<GitBookSiteSpaceContext> {
+    const context = await createDynamicContext();
+    return fetchSiteContext(url, context);
+}
+
+/**
+ * Fetch the context of a site for a given URL and a base context.
+ */
+async function fetchSiteContext(
+    urlParts: string[],
+    baseContext: GitBookContext,
+): Promise<GitBookSiteSpaceContext> {
+    const { api } = baseContext;
+    const url = getURLFromParams(urlParts);
+    const { data } = await api.urls.getPublishedContentByUrl({
+        url,
+    });
+
+    if ('redirect' in data) {
+        redirect(data.redirect);
+    }
+
+    return {
+        ...baseContext,
+        api: new GitBookAPI({
+            endpoint: api.endpoint,
+            authToken: data.apiToken,
+            userAgent: api.userAgent,
+        }),
+        siteId: data.site,
+        organizationId: data.organization,
+        siteSectionId: data.siteSection,
+        siteSpaceId: data.siteSpace,
+        spaceId: data.space,
+    };
+}
+
+/**
+ * Create the base context when rendering statically.
+ */
+function createStaticContext(): GitBookContext {
+    const api = new GitBookAPI({
+        authToken: GITBOOK_API_TOKEN,
+        endpoint: GITBOOK_API_URL,
+        userAgent: GITBOOK_USER_AGENT,
+    });
+
+    return createContextFromClient(api);
+}
+
+/**
+ * Create the base context when rendering dynamically.
+ * The context will depend on the request.
+ */
+async function createDynamicContext(): Promise<GitBookContext> {
+    const headersSet = await headers();
+
+    const api = new GitBookAPI({
+        authToken: headersSet.get('x-gitbook-token') ?? GITBOOK_API_TOKEN,
+        endpoint: headersSet.get('x-gitbook-api') ?? GITBOOK_API_URL,
+        userAgent: GITBOOK_USER_AGENT,
+    });
+
+    return createContextFromClient(api);
+}
+
+function createContextFromClient(api: GitBookAPI): GitBookContext {
+    return {
+        api,
+        getLink: (pathname: string) => pathname,
+        getPublishedContentSite: async (organizationId: string, siteId: string) => {
+            const { data } = await api.orgs.getPublishedContentSite(organizationId, siteId);
+            return data;
+        },
+        getRevisionFile: async (spaceId: string, revisionId: string, file: string) => {
+            throw new Error('Not implemented');
+        },
+        getUserById: async (userId: string) => {
+            const { data } = await api.users.getUserById(userId);
+            return data;
+        },
+        getSpaceById: async (spaceId: string, shareKey: string | undefined) => {
+            const { data } = await api.spaces.getSpaceById(spaceId, { shareKey });
+            return data;
+        },
+        getCollection: async (collectionId: string) => {
+            const { data } = await api.collections.getCollectionById(collectionId);
+            return data;
+        },
+        getReusableContent: async (spaceId: string, revisionId: string, reusableContentId: string) => {
+            const { data } = await api.spaces.getReusableContentInRevisionById(spaceId, revisionId, reusableContentId);
+            return data;
+        },
+    };
+}
+
+function getURLFromParams(input: string[]) {
+    const url = new URL('https://' + input.join('/'));
+    return url.toString();
+}

packages/gitbook-v2/src/lib/env.ts

@@ -0,0 +1,15 @@
+/**
+ * Default GitBook API URL endpoint.
+ */
+export const GITBOOK_API_URL = process.env.GITBOOK_API_URL ?? 'https://api.gitbook.com';
+
+/**
+ * Default GitBook API token.
+ * It can be use to avoid rate-limiting.
+ */
+export const GITBOOK_API_TOKEN = process.env.GITBOOK_API_TOKEN ?? null;
+
+/**
+ * User agent to use for API requests.
+ */
+export const GITBOOK_USER_AGENT = process.env.GITBOOK_USER_AGENT ?? 'GitBook-Open/2.0.0';

packages/gitbook-v2/src/middleware.ts

@@ -0,0 +1,11 @@
+import { NextResponse } from 'next/server';
+import type { NextRequest } from 'next/server';
+
+export const config = {
+    matcher: ['/((?!_next/|_static/|_vercel|[\\w-]+\\.\\w+).*)'],
+};
+
+export function middleware(request: NextRequest) {
+    // No rewrite
+    return NextResponse.next();
+}

packages/gitbook-v2/tsconfig.json

@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "target": "esnext",
+        "lib": ["dom", "dom.iterable", "esnext"],
+        "allowJs": true,
+        "skipLibCheck": true,
+        "strict": false,
+        "noEmit": true,
+        "incremental": true,
+        "module": "esnext",
+        "esModuleInterop": true,
+        "moduleResolution": "bundler",
+        "resolveJsonModule": true,
+        "isolatedModules": true,
+        "jsx": "preserve",
+        "plugins": [
+            {
+                "name": "next"
+            }
+        ],
+        "paths": {
+            "@v2/*": ["./src/*"],
+            "@/*": ["../gitbook/src/*"]
+        }
+    },
+    "include": ["next-env.d.ts", ".next/types/**/*.ts", "**/*.ts", "**/*.tsx"],
+    "exclude": ["node_modules"]
+}

packages/gitbook-v2/wrangler.toml

@@ -0,0 +1,5 @@
+main = ".open-next/worker.js"
+name = "gitbook-v2"
+compatibility_date = "2024-09-23"
+compatibility_flags = ["nodejs_compat"]
+assets = { directory = ".open-next/assets", binding = "ASSETS" }

packages/gitbook/e2e/pages.spec.ts

@@ -27,12 +27,40 @@ import { getContentTestURL } from '../tests/utils';
 
 interface Test {
     name: string;
-    url: string; // URL to visit for testing
+    /**
+     * URL to visit for testing.
+     */
+    url: string;
     cookies?: Parameters<BrowserContext['addCookies']>[0];
-    run?: (page: Page) => Promise<unknown>; // The test to run
-    fullPage?: boolean; // Whether the test should be fullscreened during testing
-    screenshot?: false; // Should a screenshot be stored
-    only?: boolean; // Only run this test
+    /**
+     * Test to run
+     */
+    run?: (page: Page) => Promise<unknown>;
+    /**
+     * Whether the test should be fullscreened during testing.
+     */
+    fullPage?: boolean;
+    /**
+     * Whether to take a screenshot of the test or set a threshold for the screenshot.
+     */
+    screenshot?:
+        | false
+        | {
+              /**
+               * Screenshot threshold.
+               * From 0 to 1, where 0 is the most strict and 1 is the most permissive.
+               * @default 0.5
+               */
+              threshold?: number;
+              /**
+               * Whether to wait for the table of contents to finish scrolling before taking the screenshot.
+               */
+              waitForTOCScrolling?: boolean;
+          };
+    /**
+     * Whether to only run this test.
+     */
+    only?: boolean;
 }
 
 interface TestsCase {
@@ -95,19 +123,28 @@ const testCases: TestsCase[] = [
             {
                 name: 'Search',
                 url: '?q=',
+                screenshot: false,
+                run: async (page) => {
+                    await expect(page.getByTestId('search-results')).toBeVisible();
+                    const allItems = await page.getByTestId('search-result-item').all();
+                    // Expect at least 3 questions
+                    await expect(allItems.length).toBeGreaterThan(2);
+                },
             },
             {
                 name: 'Search Results',
                 url: '?q=gitbook',
                 run: async (page) => {
-                    await page.waitForSelector('[data-test="search-results"]');
+                    await expect(page.getByTestId('search-results')).toBeVisible();
                 },
             },
             {
                 name: 'AI Search',
                 url: '?q=What+is+GitBook%3F&ask=true',
                 run: async (page) => {
-                    await page.waitForSelector('[data-test="search-ask-answer"]');
+                    await expect(page.getByTestId('search-ask-answer')).toBeVisible({
+                        timeout: 15_000,
+                    });
                 },
                 screenshot: false,
             },
@@ -268,19 +305,28 @@ const testCases: TestsCase[] = [
             {
                 name: 'Search',
                 url: '?q=',
+                screenshot: false,
+                run: async (page) => {
+                    await expect(page.getByTestId('search-results')).toBeVisible();
+                    const allItems = await page.getByTestId('search-result-item').all();
+                    // Expect at least 3 questions
+                    await expect(allItems.length).toBeGreaterThan(2);
+                },
             },
             {
                 name: 'Search Results',
                 url: '?q=gitbook',
                 run: async (page) => {
-                    await page.waitForSelector('[data-test="search-results"]');
+                    await expect(page.getByTestId('search-results')).toBeVisible();
                 },
             },
             {
                 name: 'AI Search',
                 url: '?q=What+is+GitBook%3F&ask=true',
                 run: async (page) => {
-                    await page.waitForSelector('[data-test="search-ask-answer"]');
+                    await expect(page.getByTestId('search-ask-answer')).toBeVisible({
+                        timeout: 15_000,
+                    });
                 },
                 screenshot: false,
             },
@@ -309,6 +355,9 @@ const testCases: TestsCase[] = [
             {
                 name: 'PDF',
                 url: '~gitbook/pdf?limit=10',
+                screenshot: {
+                    waitForTOCScrolling: false,
+                },
             },
         ],
     },
@@ -331,11 +380,38 @@ const testCases: TestsCase[] = [
                 url: 'blocks/block-images',
                 run: waitForCookiesDialog,
                 fullPage: true,
+                screenshot: { threshold: 0.8 },
+            },
+            {
+                name: 'Images (with zoom)',
+                url: 'blocks/block-images',
+                run: async (page) => {
+                    await waitForCookiesDialog(page);
+                    const zoomImage = page.getByTestId('zoom-image');
+                    await zoomImage.first().click();
+                    await expect(page.getByTestId('zoom-image-modal')).toBeVisible();
+                },
+                fullPage: true,
+                screenshot: { threshold: 0.8 },
             },
             {
                 name: 'Inline Images',
                 url: 'blocks/inline-images',
-                run: waitForCookiesDialog,
+                run: async (page) => {
+                    await waitForCookiesDialog(page);
+                    // Make the text invisible to fix flakiness due to the text position.
+                    await page.evaluate(() => {
+                        for (const p of document.querySelectorAll('p')) {
+                            if (
+                                p.textContent?.includes(
+                                    'This image has intrinsic 400px width, but renders as 300px:',
+                                )
+                            ) {
+                                p.style.color = 'transparent';
+                            }
+                        }
+                    });
+                },
             },
             {
                 name: 'Tabs',
@@ -406,6 +482,18 @@ const testCases: TestsCase[] = [
             {
                 name: 'Math',
                 url: 'blocks/math',
+                run: async (page) => {
+                    await page.waitForFunction(() => {
+                        const fonts = Array.from(document.fonts.values());
+                        const mjxFonts = fonts.filter(
+                            (font) => font.family === 'MJXZERO' || font.family === 'MJXTEX',
+                        );
+                        return (
+                            mjxFonts.length === 2 &&
+                            mjxFonts.every((font) => font.status === 'loaded')
+                        );
+                    });
+                },
             },
             {
                 name: 'Files',
@@ -459,6 +547,9 @@ const testCases: TestsCase[] = [
                 name: 'With cover and no TOC',
                 url: 'page-options/page-with-cover-and-no-toc',
                 run: waitForCookiesDialog,
+                screenshot: {
+                    waitForTOCScrolling: false,
+                },
             },
             {
                 name: 'With icon',
@@ -642,11 +733,14 @@ const testCases: TestsCase[] = [
                 run: async (page) => {
                     const sharedSpaceLink = page.locator('a.underline');
                     await sharedSpaceLink.click();
-                    expect(page.locator('h1')).toHaveText('shared');
+                    await expect(
+                        page.getByRole('heading', { level: 1, name: 'shared' }),
+                    ).toBeVisible();
                     const url = page.url();
                     expect(url.includes('shared-space-uno')).toBeTruthy(); // same uno site
                     expect(url.endsWith('/shared')).toBeTruthy(); // correct page
                 },
+                screenshot: false,
             },
         ],
     },
@@ -658,13 +752,15 @@ const testCases: TestsCase[] = [
                 name: 'Navigation to shared space',
                 url: '',
                 run: async (page) => {
-                    const sharedSpaceLink = page.locator('a.underline');
-                    await sharedSpaceLink.click();
-                    expect(page.locator('h1')).toHaveText('shared');
+                    await page.locator('a.underline').click();
+                    await expect(
+                        page.getByRole('heading', { level: 1, name: 'shared' }),
+                    ).toBeVisible();
                     const url = page.url();
                     expect(url.includes('shared-space-dos')).toBeTruthy(); // same dos site
                     expect(url.endsWith('/shared')).toBeTruthy(); // correct page
                 },
+                screenshot: false,
             },
         ],
     },
@@ -678,6 +774,7 @@ const testCases: TestsCase[] = [
                 run: async (page) => {
                     await expect(page.locator('h1')).toHaveText('SSO');
                 },
+                screenshot: false,
             },
         ],
     },
@@ -697,6 +794,7 @@ const testCases: TestsCase[] = [
                         page.getByText('Authentication missing to access this content'),
                     ).toBeVisible();
                 },
+                screenshot: false,
             },
         ],
     },
@@ -719,7 +817,12 @@ const testCases: TestsCase[] = [
                     );
                     return `first?jwt_token=${token}`;
                 })(),
-                run: waitForCookiesDialog,
+                run: async (page) => {
+                    await expect(
+                        page.getByRole('heading', { level: 1, name: 'first' }),
+                    ).toBeVisible();
+                },
+                screenshot: false,
             },
             {
                 name: 'Second',
@@ -736,7 +839,12 @@ const testCases: TestsCase[] = [
                     );
                     return `second?jwt_token=${token}`;
                 })(),
-                run: waitForCookiesDialog,
+                run: async (page) => {
+                    await expect(
+                        page.getByRole('heading', { level: 1, name: 'second' }),
+                    ).toBeVisible();
+                },
+                screenshot: false,
             },
         ],
     },
@@ -850,7 +958,12 @@ const testCases: TestsCase[] = [
                     );
                     return `first?jwt_token=${token}`;
                 })(),
-                run: waitForCookiesDialog,
+                run: async (page) => {
+                    await expect(
+                        page.getByRole('heading', { level: 1, name: 'first' }),
+                    ).toBeVisible();
+                },
+                screenshot: false,
             },
             {
                 name: 'Custom page',
@@ -1346,16 +1459,24 @@ for (const testCase of testCases) {
                 if (testEntry.run) {
                     await testEntry.run(page);
                 }
-                if (testEntry.screenshot !== false) {
+                const screenshotOptions = testEntry.screenshot;
+                if (screenshotOptions !== false) {
                     await argosScreenshot(page, `${testCase.name} - ${testEntry.name}`, {
-                        viewports: ['macbook-16', 'macbook-13', 'iphone-x', 'ipad-2'],
+                        viewports: ['macbook-16', 'macbook-13', 'ipad-2', 'iphone-x'],
                         argosCSS: `
                         /* Hide Intercom */
                         .intercom-lightweight-app {
                             display: none !important;
-                        }
-                    `,
+                            }
+                            `,
+                        threshold: screenshotOptions?.threshold ?? undefined,
                         fullPage: testEntry.fullPage ?? false,
+                        beforeScreenshot: async () => {
+                            await waitForIcons(page);
+                            if (screenshotOptions?.waitForTOCScrolling !== false) {
+                                await waitForTOCScrolling(page);
+                            }
+                        },
                     });
                 }
             });
@@ -1433,3 +1554,53 @@ function getCustomizationURL(partial: DeepPartial<SiteCustomizationSettings>): s
 
     return `?${searchParams.toString()}`;
 }
+
+/**
+ * Wait for all icons present on the page to be loaded.
+ */
+async function waitForIcons(page: Page) {
+    await page.waitForFunction(async () => {
+        function loadImage(src: string) {
+            return new Promise((resolve, reject) => {
+                const img = new Image();
+                img.onload = () => resolve(img);
+                img.onerror = (error) => reject(new Error(`Failed to load image: ${src}`));
+                img.src = src;
+            });
+        }
+
+        const icons = Array.from(document.querySelectorAll('svg.gb-icon'));
+        await Promise.all(
+            icons.map(async (icon) => {
+                // url("https://ka-p.fontawesome.com/releases/v6.6.0/svgs/light/moon.svg?v=2&token=a463935e93")
+                const maskImage = window.getComputedStyle(icon).getPropertyValue('mask-image');
+                const urlMatch = maskImage.match(/url\("([^"]+)"\)/);
+                const url = urlMatch ? urlMatch[1] : null;
+                if (!url) {
+                    throw new Error('No mask-image');
+                }
+                await loadImage(url);
+            }),
+        );
+    });
+}
+
+/**
+ * Wait for TOC to be correctly scrolled into view.
+ */
+async function waitForTOCScrolling(page: Page) {
+    const viewport = await page.viewportSize();
+    if (viewport && viewport.width >= 1024) {
+        const toc = page.getByTestId('table-of-contents');
+        await expect(toc).toBeVisible();
+        await page.evaluate(() => {
+            const tocScrollContainer = document.querySelector(
+                '[data-testid="table-of-contents"] [data-testid="toc-scroll-container"]',
+            );
+            if (!tocScrollContainer) {
+                throw new Error('TOC scroll container not found');
+            }
+            tocScrollContainer.scrollTo(0, 0);
+        });
+    }
+}

packages/gitbook/next.config.js

@@ -10,6 +10,7 @@ module.exports = withSentryConfig(
             GITBOOK_ASSETS_PREFIX: process.env.GITBOOK_ASSETS_PREFIX,
             GITBOOK_ICONS_URL: process.env.GITBOOK_ICONS_URL,
             GITBOOK_ICONS_TOKEN: process.env.GITBOOK_ICONS_TOKEN,
+            NEXT_SERVER_ACTIONS_ENCRYPTION_KEY: process.env.NEXT_SERVER_ACTIONS_ENCRYPTION_KEY,
         },
 
         webpack(config, { dev, webpack }) {

packages/gitbook/package.json

@@ -16,7 +16,7 @@
         "clean": "rm -rf ./.next && rm -rf ./public/~gitbook/static"
     },
     "dependencies": {
-        "@gitbook/api": "^0.85.0",
+        "@gitbook/api": "^0.90.0",
         "@gitbook/cache-do": "workspace:*",
         "@gitbook/emoji-codepoints": "workspace:*",
         "@gitbook/icons": "workspace:*",
@@ -40,8 +40,9 @@
         "jsontoxml": "^1.0.1",
         "katex": "^0.16.9",
         "mathjax": "^3.2.2",
+        "mdast-util-to-markdown": "^2.1.2",
         "memoizee": "^0.4.15",
-        "next": "15.1.3",
+        "next": "14.2.23",
         "next-themes": "^0.2.1",
         "nuqs": "^2.2.3",
         "object-hash": "^3.0.0",
@@ -49,8 +50,8 @@
         "p-map": "^7.0.0",
         "parse-cache-control": "^1.0.1",
         "postcss-color-contrast": "^1.1.0",
-        "react": "19.0.0",
-        "react-dom": "19.0.0",
+        "react": "18.3.1",
+        "react-dom": "18.3.1",
         "react-hotkeys-hook": "^4.4.1",
         "rehype-sanitize": "^6.0.0",
         "rehype-stringify": "^10.0.0",
@@ -59,7 +60,7 @@
         "remark-rehype": "^11.1.0",
         "rison": "^0.1.1",
         "server-only": "^0.0.1",
-        "shiki": "^1.26.1",
+        "shiki": "^1.27.2",
         "tailwind-merge": "^2.2.0",
         "tailwind-shades": "^1.1.2",
         "unified": "^11.0.4",
@@ -67,13 +68,15 @@
         "usehooks-ts": "^3.1.0"
     },
     "devDependencies": {
-        "@argos-ci/playwright": "^2.0.0",
+        "@argos-ci/playwright": "^3.10.0",
         "@cloudflare/next-on-pages": "1.13.7",
+        "vercel": "^39.3.0",
         "@cloudflare/workers-types": "^4.20241230.0",
-        "@playwright/test": "^1.42.1",
+        "@playwright/test": "^1.49.1",
         "@types/js-cookie": "^3.0.6",
         "@types/jsontoxml": "^1.0.5",
         "@types/jsonwebtoken": "^9.0.6",
+        "@types/mdast": "^4.0.4",
         "@types/node": "^20",
         "@types/object-hash": "^3.0.6",
         "@types/parse-cache-control": "^1.0.4",

packages/gitbook/sentry.server.config.ts

@@ -1,18 +0,0 @@
-import { init } from '@sentry/nextjs';
-
-const dsn = process.env.SENTRY_DSN;
-if (dsn) {
-    init({
-        dsn,
-        release: process.env.SENTRY_RELEASE,
-
-        // Disable tracing as it creates additional requests in an env where subrequests are limited.
-        tracesSampleRate: 0,
-
-        // Disable transactions  as it creates additional requests in an env where subrequests are limited.
-        // https://docs.sentry.io/platforms/node/configuration/filtering/#using--3
-        beforeSendTransaction: () => {
-            return null;
-        },
-    });
-}

packages/gitbook/src/app/(site)/(core)/sitemap.xml/route.ts

@@ -1,97 +0,0 @@
-import { RevisionPage, RevisionPageDocument, RevisionPageGroup } from '@gitbook/api';
-import jsontoxml from 'jsontoxml';
-import { NextRequest } from 'next/server';
-
-import { getSpaceContentData } from '@/lib/api';
-import { getAbsoluteHref } from '@/lib/links';
-import { getPagePath } from '@/lib/pages';
-import { getSiteContentPointer } from '@/lib/pointer';
-import { isPageIndexable } from '@/lib/seo';
-
-export const runtime = 'edge';
-
-/**
- * Generate a sitemap.xml for the current space.
- */
-export async function GET(req: NextRequest) {
-    const pointer = await getSiteContentPointer();
-    const { pages: rootPages } = await getSpaceContentData(pointer, pointer.siteShareKey);
-
-    const pages = flattenPages(rootPages, (page) => !page.hidden && isPageIndexable([], page));
-    const urls = await Promise.all(
-        pages.map(async ({ page, depth }) => {
-            // Decay priority with depth
-            const priority = Math.pow(2, -0.25 * depth);
-            // Normalize to keep 2 decimals
-            const normalizedPriority = Math.floor(100 * priority) / 100;
-
-            const lastModified = page.updatedAt || page.createdAt;
-
-            return {
-                url: {
-                    loc: await getAbsoluteHref(getPagePath(rootPages, page), true),
-                    priority: normalizedPriority,
-                    ...(lastModified
-                        ? {
-                              // lastmod format is YYYY-MM-DD
-                              lastmod: new Date(lastModified).toISOString().split('T')[0],
-                          }
-                        : {}),
-                },
-            };
-        }),
-    );
-
-    const xml = jsontoxml(
-        [
-            {
-                name: 'urlset',
-                children: urls,
-                attrs: {
-                    'xmlns:xsi': 'http://www.w3.org/2001/XMLSchema-instance',
-                    xmlns: 'http://www.sitemaps.org/schemas/sitemap/0.9',
-                    'xsi:schemaLocation':
-                        'http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd',
-                },
-            },
-        ],
-        {
-            xmlHeader: true,
-            prettyPrint: true,
-        },
-    );
-
-    return new Response(xml, {
-        headers: {
-            'Content-Type': 'application/xml',
-        },
-    });
-}
-
-type FlatPageEntry = { page: RevisionPageDocument; depth: number };
-
-function flattenPages(
-    rootPags: RevisionPage[],
-    filter: (page: RevisionPageDocument | RevisionPageGroup) => boolean,
-): FlatPageEntry[] {
-    const flattenPage = (
-        page: RevisionPageDocument | RevisionPageGroup,
-        depth: number,
-    ): FlatPageEntry[] => {
-        const allowed = filter(page);
-        if (!allowed) {
-            return [];
-        }
-
-        return [
-            ...(page.type === 'document' ? [{ page, depth }] : []),
-            ...page.pages.flatMap((child) =>
-                child.type === 'document' ? flattenPage(child, depth + 1) : [],
-            ),
-        ];
-    };
-
-    return rootPags.flatMap((page) =>
-        page.type === 'group' || page.type === 'document' ? flattenPage(page, 0) : [],
-    );
-}