First attempt at chat in content instead of fixed

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

.changeset/big-gorillas-perform.md

@@ -1,9 +0,0 @@
----
-"gitbook": patch
----
-
-Fix three small visual issues
-
-- Fix sidebar showing on `no-toc` pages in the gradient theme
-- Fix variant selector truncating incorrectly in header when sections are present
-- Fix page cover alignment on `lg` screens without TOC

.changeset/big-rockets-sniff.md

@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Improve `Button` and `ButtonGroup` styling

.changeset/breezy-falcons-drop.md

@@ -1,5 +0,0 @@
----
-"gitbook": patch
----
-
-Respect fullWidth and defaultWidth for images

.changeset/breezy-toes-raise.md

@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Fix scroll of page outline

.changeset/chatty-rivers-move.md

@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Support "objectivec" as alias for Objective C syntax

.changeset/cold-buckets-divide.md

@@ -1,5 +0,0 @@
----
-"gitbook": patch
----
-
-fix nested a tag causing hydration error

.changeset/cool-jars-matter.md

@@ -1,5 +0,0 @@
----
-"gitbook": patch
----
-
-fix href being empty in TOC

.changeset/cool-seas-approve.md

@@ -1,5 +0,0 @@
----
-"gitbook": patch
----
-
-Fix navigation between sections/variants when previewing a site in v2

.changeset/curly-pears-study.md

@@ -0,0 +1,5 @@
+---
+"gitbook": minor
+---
+
+Support custom AI providers

.changeset/eleven-melons-smash.md

@@ -0,0 +1,5 @@
+---
+"@gitbook/browser-types": minor
+---
+
+First version of the public package for typing script integrations.

.changeset/fair-crews-wink.md

@@ -1,5 +0,0 @@
----
-"gitbook": minor
----
-
-Add circular corners and depth styling

.changeset/fast-trees-battle.md

@@ -1,5 +0,0 @@
----
-'@gitbook/react-openapi': patch
----
-
-Add authorization header for OAuth2

.changeset/few-bobcats-bake.md

@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Small fixes to search modal

.changeset/fifty-houses-reflect.md

@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Fixes to `PageAside`

.changeset/forty-readers-mix.md

@@ -1,5 +0,0 @@
----
-"gitbook": minor
----
-
-Support dark-mode specific page cover image

.changeset/gorgeous-cycles-cheat.md

@@ -1,5 +0,0 @@
----
-"gitbook-v2": patch
----
-
-add a force-revalidate api route to force bust the cache in case of errors

.changeset/honest-eagles-judge.md

@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Tweaks to AIChatButton and AIChatInput

.changeset/modern-laws-kick.md

@@ -0,0 +1,5 @@
+---
+"gitbook": minor
+---
+
+Allow integrations to provide tools to the Docs Assistant

.changeset/moody-badgers-teach.md

@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Improve vertical alignment of site items and fix floating page aside

.changeset/nasty-moles-visit.md

@@ -1,5 +0,0 @@
----
-"gitbook-v2": patch
----
-
-fix ISR on preview env

.changeset/nervous-students-judge.md

@@ -1,6 +0,0 @@
----
-"gitbook-v2": patch
-"gitbook": patch
----
-
-Fix concurrent execution in Vercel causing pages to not be attached to the proper tags.

.changeset/orange-buses-provide.md

@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Fix search bar layout shift caused by ToC

.changeset/orange-hounds-sparkle.md

@@ -1,5 +0,0 @@
----
-"gitbook-v2": patch
----
-
-Generate a llms-full.txt version of the docs site

.changeset/rotten-seals-rush.md

@@ -1,5 +0,0 @@
----
-'@gitbook/react-openapi': patch
----
-
-Indent JSON python code sample

.changeset/rude-tomatoes-hunt.md

@@ -0,0 +1,5 @@
+---
+"gitbook": minor
+---
+
+Emit a <link rel="alternate"> for the markdown version of a page

.changeset/serious-pumas-clap.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Support new coverDefinitionDark for cards & image type

.changeset/sharp-hats-applaud.md

@@ -1,5 +0,0 @@
----
-"gitbook": patch
----
-
-Fix missing title on button to close the announcement banner.

.changeset/slow-lizards-obey.md

@@ -1,5 +0,0 @@
----
-"gitbook": patch
----
-
-Make TOC height dynamic based on visible header and footer elements

.changeset/soft-bikes-warn.md

@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Clear AI chat properly

.changeset/spicy-baboons-buy.md

@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Fix bug in search highlight in GBO

.changeset/strong-poets-move.md

@@ -1,5 +0,0 @@
----
-"gitbook": patch
----
-
-Fix bold header links hover color

.changeset/stupid-plums-perform.md

@@ -1,6 +0,0 @@
----
-"gitbook": patch
-"gitbook-v2": patch
----
-
-cache fonts and static image used in OGImage in memory

.changeset/thick-chefs-repeat.md

@@ -1,5 +0,0 @@
----
-'@gitbook/react-openapi': patch
----
-
-Handle nested deprecated properties in generateSchemaExample

.changeset/thin-buckets-grow.md

@@ -1,5 +0,0 @@
----
-"gitbook-v2": patch
----
-
-Add `urlObject.hash` to `linker.toLinkForContent` to pass through URL fragment identifiers, used in search

.changeset/three-queens-pretend.md

@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Page outline: scroll to active item

.changeset/tough-beers-own.md

@@ -0,0 +1,6 @@
+---
+"@gitbook/openapi-parser": patch
+"gitbook": patch
+---
+
+Improve OpenAPI parsing errors

.changeset/violet-schools-care.md

@@ -1,5 +0,0 @@
----
-'@gitbook/react-openapi': patch
----
-
-Deduplicate path parameters from OpenAPI spec

.changeset/wise-gifts-smash.md

@@ -1,5 +0,0 @@
----
-"gitbook-v2": patch
----
-
-remove trailing slash from linker

.changeset/young-goats-begin.md

@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Fix Custom logo not rendering on the published site

.github/CODEOWNERS

@@ -0,0 +1,3 @@
+# Changes to the API data cache functions can invalidate all existing data cache
+# causing a massive amount of revalidation, impacting our API.
+packages/gitbook/src/lib/data/api.ts   @SamyPesse

.github/CONTRIBUTING.md

@@ -53,17 +53,40 @@ After forking this repository, you'll want to [create a branch](https://docs.git
 
 #### 3. Install dependencies and run the project locally
 
-GitBook uses [Bun](https://bun.sh/) to run the project. Make sure you're using the specified version of `node` before running any of the development commands to ensure a smooth development experience.
+##### Prerequisites:
+- Node.js (Version: >=20.6)
+  - Use `nvm` for easy Node management
+- [Bun](https://bun.sh/) (Version: >=1.2.15)
+  - We use a text-based lockfile which isn't supported below 1.2.15
 
-You can easily do this by running the command `nvm use`.
+##### Setup steps:
 
-To start your local version of GitBook, run the command `bun dev`.
+1. Ensure you are using the project's version of Node:
+```bash
+nvm use
+```
+
+2. Install dependencies using Bun:
+```bash
+bun install
+```
+
+3. Start the development server:
+```bash
+bun dev
+```
+
+Additional development commands:
+- `bun format`: Format the code using Biome
+- `bun typecheck`: Run TypeScript type checking
+- `bun unit`: Run unit tests
+- `bun e2e`: Run end-to-end tests
 
 #### 4. Preview your changes
 
-When running the development server, published GitBook sites can be rendered through your local version at `http://localhost:3000/`.
+When running the development server, published GitBook sites can be rendered through your local version at `http://localhost:3000/url`.
 
-For example, our published docs can be viewed using the local version by visiting `http://localhost:3000/gitbook.com/docs` after running the development server.
+For example, our published docs can be viewed using the local version by visiting `http://localhost:3000/url/gitbook.com/docs` after running the development server.
 
 You can visit any published GitBook site behind your development server. Please make sure your site is [published publicly](https://gitbook.com/docs/published-documentation/publish-your-content-as-a-docs-site) to ensure you can view the site correctly in your development version.
 

.github/actions/gradual-deploy-cloudflare/action.yaml

@@ -32,7 +32,7 @@ runs:
             workingDirectory: ./
             wranglerVersion: '4.10.0'
             environment: ${{ inputs.environment }}
-            command: deployments status --config ./packages/gitbook-v2/openNext/customWorkers/defaultWrangler.jsonc
+            command: deployments status --config ./packages/gitbook/openNext/customWorkers/defaultWrangler.jsonc
 
       # This step is used to get the version ID that is currently deployed to Cloudflare.
       - id: extract_current_version
@@ -51,7 +51,7 @@ runs:
             workingDirectory: ./
             wranglerVersion: '4.10.0'
             environment: ${{ inputs.environment }}
-            command: versions deploy ${{ steps.extract_current_version.outputs.version_id }}@100% ${{ inputs.serverVersionId }}@0% -y --config ./packages/gitbook-v2/openNext/customWorkers/defaultWrangler.jsonc
+            command: versions deploy ${{ steps.extract_current_version.outputs.version_id }}@100% ${{ inputs.serverVersionId }}@0% -y --config ./packages/gitbook/openNext/customWorkers/defaultWrangler.jsonc
 
       # Since we use version overrides headers, we can directly deploy the middleware to 100%.
       - id: deploy_middleware
@@ -63,7 +63,7 @@ runs:
             workingDirectory: ./
             wranglerVersion: '4.10.0'
             environment: ${{ inputs.environment }}
-            command: versions deploy ${{ inputs.middlewareVersionId }}@100% -y --config ./packages/gitbook-v2/openNext/customWorkers/middlewareWrangler.jsonc
+            command: versions deploy ${{ inputs.middlewareVersionId }}@100% -y --config ./packages/gitbook/openNext/customWorkers/middlewareWrangler.jsonc
 
       - name: Deploy server to Cloudflare at 100%
         uses: cloudflare/wrangler-action@v3.14.0
@@ -73,7 +73,7 @@ runs:
             workingDirectory: ./
             wranglerVersion: '4.10.0'
             environment: ${{ inputs.environment }}
-            command: versions deploy ${{ inputs.serverVersionId }}@100% -y --config ./packages/gitbook-v2/openNext/customWorkers/defaultWrangler.jsonc
+            command: versions deploy ${{ inputs.serverVersionId }}@100% -y --config ./packages/gitbook/openNext/customWorkers/defaultWrangler.jsonc
 
       - name: Outputs
         shell: bash

.github/composite/deploy-cloudflare/action.yaml

@@ -59,7 +59,7 @@ runs:
             GITBOOK_ASSETS_PREFIX: ${{ inputs.opItem }}/GITBOOK_ASSETS_PREFIX
             GITBOOK_FONTS_URL: ${{ inputs.opItem }}/GITBOOK_FONTS_URL
         - name: Build worker
-          run: bun run turbo build:v2:cloudflare
+          run: bun run turbo build:cloudflare
           env:
             GITBOOK_RUNTIME: cloudflare
           shell: bash
@@ -72,7 +72,7 @@ runs:
               workingDirectory: ./
               wranglerVersion: '4.10.0'
               environment: ${{ inputs.environment }}
-              command: deploy --config ./packages/gitbook-v2/openNext/customWorkers/doWrangler.jsonc
+              command: deploy --config ./packages/gitbook/openNext/customWorkers/doWrangler.jsonc
 
         - id: upload_server
           name: Upload server to Cloudflare
@@ -83,7 +83,7 @@ runs:
               workingDirectory: ./
               wranglerVersion: '4.10.0'
               environment: ${{ inputs.environment }}
-              command: ${{ format('versions upload --tag {0} --message "{1}"', inputs.commitTag, inputs.commitMessage) }} --config ./packages/gitbook-v2/openNext/customWorkers/defaultWrangler.jsonc
+              command: ${{ format('versions upload --tag {0} --message "{1}"', inputs.commitTag, inputs.commitMessage) }} --config ./packages/gitbook/openNext/customWorkers/defaultWrangler.jsonc
 
         - name: Extract server version worker ID
           shell: bash
@@ -95,7 +95,7 @@ runs:
         - name: Run updateWrangler scripts
           shell: bash
           run: |
-              bun run ./packages/gitbook-v2/openNext/customWorkers/script/updateWrangler.ts ${{ steps.extract_server_version_id.outputs.version_id }}
+              bun run ./packages/gitbook/openNext/customWorkers/script/updateWrangler.ts ${{ steps.extract_server_version_id.outputs.version_id }}
 
         - id: upload_middleware
           name: Upload middleware to Cloudflare
@@ -106,7 +106,7 @@ runs:
               workingDirectory: ./
               wranglerVersion: '4.10.0'
               environment: ${{ inputs.environment }}
-              command: ${{ format('versions upload --tag {0} --message "{1}"', inputs.commitTag, inputs.commitMessage) }} --config ./packages/gitbook-v2/openNext/customWorkers/middlewareWrangler.jsonc
+              command: ${{ format('versions upload --tag {0} --message "{1}"', inputs.commitTag, inputs.commitMessage) }} --config ./packages/gitbook/openNext/customWorkers/middlewareWrangler.jsonc
         
         - name: Extract middleware version worker ID
           shell: bash

.github/workflows/deploy-preview.yaml

@@ -7,53 +7,6 @@ on:
 env:
     NPM_TOKEN_READONLY: ${{ secrets.NPM_TOKEN_READONLY }}
 jobs:
-    deploy-v1-cloudflare:
-        name: Deploy v1 to Cloudflare Pages
-        runs-on: ubuntu-latest
-        environment:
-          name: ${{ github.ref == 'refs/heads/main' && '1c-production' || '1c-preview' }}
-          url: ${{ steps.deploy.outputs.deployment-url }}
-        permissions:
-            contents: read
-            deployments: write
-            issues: write
-            pull-requests: write
-            checks: write
-            statuses: write
-        outputs:
-            deployment-url: ${{ steps.deploy.outputs.deployment-url }}
-            deployment-alias-url: ${{ steps.deploy.outputs.deployment-alias-url }}
-        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
-              if: github.ref == 'refs/heads/main'
-              run: |
-                echo "GITBOOK_ASSETS_PREFIX=https://static.gitbook.com" >> $GITHUB_ENV
-            - name: Build Next.js with next-on-pages
-              run: bun run turbo gitbook#build:cloudflare
-              env:
-                  NEXT_SERVER_ACTIONS_ENCRYPTION_KEY: ${{ secrets.NEXT_SERVER_ACTIONS_ENCRYPTION_KEY }}
-                  GITBOOK_RUNTIME: cloudflare
-            - id: deploy
-              name: Deploy to Cloudflare
-              uses: cloudflare/wrangler-action@v3.14.0
-              with:
-                  apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-                  workingDirectory: ./
-                  wranglerVersion: '3.112.0'
-                  command: pages deploy ./packages/gitbook/.vercel/output/static --project-name=${{ vars.CLOUDFLARE_PROJECT_NAME }} --branch=${{ github.ref == 'refs/heads/main' && 'main' || format('pr{0}', github.event.pull_request.number) }}
-            - name: Outputs
-              run: |
-                  echo "URL: ${{ steps.deploy.outputs.deployment-url }}"
-                  echo "Alias URL: ${{ steps.deploy.outputs.deployment-alias-url }}"
     deploy-v2-vercel:
         name: Deploy v2 to Vercel (preview)
         runs-on: ubuntu-latest
@@ -114,7 +67,6 @@ jobs:
         name: Comment Deployments (preview)
         if: always() && !startsWith(github.ref, 'refs/heads/main')
         needs:
-            - deploy-v1-cloudflare
             - deploy-v2-vercel
             - deploy-v2-cloudflare
         steps:
@@ -134,15 +86,6 @@ jobs:
                   body: |
                       Summary of the deployments:
 
-                      ### Version 1
-
-                      | Version | URL | Status |
-                      | --- | --- | --- |
-                      | Latest commit | [${{ needs.deploy-v1-cloudflare.outputs.deployment-url }}](${{ needs.deploy-v1-cloudflare.outputs.deployment-url }}) | ${{ needs.deploy-v1-cloudflare.result == 'success' && '✅' || '❌' }} |
-                      | PR | [${{ needs.deploy-v1-cloudflare.outputs.deployment-alias-url }}](${{ needs.deploy-v1-cloudflare.outputs.deployment-alias-url }}) | ${{ needs.deploy-v1-cloudflare.result == 'success' && '✅' || '❌' }} |
-
-                      ### Version 2
-
                       | Version | URL | Status |
                       | --- | --- | --- |
                       | Vercel | [${{ needs.deploy-v2-vercel.outputs.deployment-url }}](${{ needs.deploy-v2-vercel.outputs.deployment-url }}) | ${{ needs.deploy-v2-vercel.result == 'success' && '✅' || '❌' }} |
@@ -150,35 +93,16 @@ jobs:
 
                       ### Test content
 
-                      | Site | `v1` | `2v` | `2c` |
-                      | --- | --- | --- | --- |
-                      | GitBook | [${{ needs.deploy-v1-cloudflare.outputs.deployment-url }}/gitbook.com/docs](${{ needs.deploy-v1-cloudflare.outputs.deployment-url }}/gitbook.com/docs) | [${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/gitbook.com/docs](${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/gitbook.com/docs) | [${{ needs.deploy-v2-cloudflare.outputs.deployment-url }}/url/gitbook.com/docs](${{ needs.deploy-v2-cloudflare.outputs.deployment-url }}/url/gitbook.com/docs) |
-                      | E2E | [${{ needs.deploy-v1-cloudflare.outputs.deployment-url }}/gitbook.gitbook.io/test-gitbook-open](${{ needs.deploy-v1-cloudflare.outputs.deployment-url }}/gitbook.gitbook.io/test-gitbook-open) | [${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/gitbook.gitbook.io/test-gitbook-open](${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/gitbook.gitbook.io/test-gitbook-open) | [${{ needs.deploy-v2-cloudflare.outputs.deployment-url }}/url/gitbook.gitbook.io/test-gitbook-open](${{ needs.deploy-v2-cloudflare.outputs.deployment-url }}/url/gitbook.gitbook.io/test-gitbook-open) |
+                      | Site | `2v` | `2c` |
+                      | --- | --- | --- |
+                      | GitBook | [${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/gitbook.com/docs](${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/gitbook.com/docs) | [${{ needs.deploy-v2-cloudflare.outputs.deployment-url }}/url/gitbook.com/docs](${{ needs.deploy-v2-cloudflare.outputs.deployment-url }}/url/gitbook.com/docs) |
+                      | E2E | [${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/gitbook.gitbook.io/test-gitbook-open](${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/gitbook.gitbook.io/test-gitbook-open) | [${{ needs.deploy-v2-cloudflare.outputs.deployment-url }}/url/gitbook.gitbook.io/test-gitbook-open](${{ needs.deploy-v2-cloudflare.outputs.deployment-url }}/url/gitbook.gitbook.io/test-gitbook-open) |
                   edit-mode: replace
-    visual-testing-v1:
-        runs-on: ubuntu-latest
-        name: Visual Testing v1
-        needs: deploy-v1-cloudflare
-        timeout-minutes: 8
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-            - name: Setup Bun
-              uses: ./.github/composite/setup-bun
-            - name: Install dependencies
-              run: bun install --frozen-lockfile
-            - name: Setup Playwright
-              uses: ./.github/actions/setup-playwright
-            - name: Run Playwright tests
-              run: bun e2e
-              env:
-                  BASE_URL: ${{ needs.deploy-v1-cloudflare.outputs.deployment-url }}
-                  ARGOS_TOKEN: ${{ secrets.ARGOS_TOKEN }}
     visual-testing-v2-vercel:
         runs-on: ubuntu-latest
         name: Visual Testing v2
         needs: deploy-v2-vercel
-        timeout-minutes: 10
+        timeout-minutes: 15
         steps:
             - name: Checkout
               uses: actions/checkout@v4
@@ -199,7 +123,7 @@ jobs:
         runs-on: ubuntu-latest
         name: Visual Testing v2 (Cloudflare)
         needs: deploy-v2-cloudflare
-        timeout-minutes: 10
+        timeout-minutes: 15
         steps:
             - name: Checkout
               uses: actions/checkout@v4
@@ -216,31 +140,11 @@ jobs:
                   SITE_BASE_URL: ${{ needs.deploy-v2-cloudflare.outputs.deployment-url }}/url/
                   ARGOS_TOKEN: ${{ secrets.ARGOS_TOKEN }}
                   ARGOS_BUILD_NAME: 'v2-cloudflare'
-    visual-testing-customers-v1:
-        runs-on: ubuntu-latest
-        name: Visual Testing Customers v1
-        needs: deploy-v1-cloudflare
-        timeout-minutes: 8
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-            - name: Setup Bun
-              uses: ./.github/composite/setup-bun
-            - name: Install dependencies
-              run: bun install --frozen-lockfile
-            - name: Setup Playwright
-              uses: ./.github/actions/setup-playwright
-            - name: Run Playwright tests
-              run: bun e2e-customers
-              env:
-                  BASE_URL: ${{ needs.deploy-v1-cloudflare.outputs.deployment-url }}
-                  ARGOS_TOKEN: ${{ secrets.ARGOS_TOKEN }}
-                  ARGOS_BUILD_NAME: 'customers-v1'
     visual-testing-customers-v2:
         runs-on: ubuntu-latest
         name: Visual Testing Customers v2
         needs: deploy-v2-vercel
-        timeout-minutes: 8
+        timeout-minutes: 15
         steps:
             - name: Checkout
               uses: actions/checkout@v4
@@ -261,7 +165,7 @@ jobs:
         runs-on: ubuntu-latest
         name: Visual Testing Customers v2 (Cloudflare)
         needs: deploy-v2-cloudflare
-        timeout-minutes: 8
+        timeout-minutes: 15
         steps:
             - name: Checkout
               uses: actions/checkout@v4
@@ -278,10 +182,10 @@ jobs:
                   SITE_BASE_URL: ${{ needs.deploy-v2-cloudflare.outputs.deployment-url }}/url/
                   ARGOS_TOKEN: ${{ secrets.ARGOS_TOKEN }}
                   ARGOS_BUILD_NAME: 'customers-v2'
-    pagespeed-testing-v1:
+    pagespeed-testing-v2:
         runs-on: ubuntu-latest
         name: PageSpeed Testing v1
-        needs: deploy-v1-cloudflare
+        needs: deploy-v2-vercel
         steps:
             - name: Checkout
               uses: actions/checkout@v4
@@ -294,5 +198,5 @@ jobs:
             - name: Run pagespeed tests
               run: bun ./packages/gitbook/tests/pagespeed-testing.ts
               env:
-                  BASE_URL: ${{needs.deploy-v1-cloudflare.outputs.deployment-url}}
+                  BASE_URL: ${{needs.deploy-v2-vercel.outputs.deployment-url}}
                   PAGESPEED_API_KEY: ${{ secrets.PAGESPEED_API_KEY }}

.github/workflows/publish.yaml

@@ -39,22 +39,4 @@ jobs:
                   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
                   CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
                   CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-    release-preview:
-        # For now it releases the cache-do to both preview and production
-        # Once we changed to deploy the app only on release, we should change `release:preview` in `cache-do`
-        name: Release Preview
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout Repo
-              uses: actions/checkout@v3
-            - name: Setup Bun
-              uses: ./.github/composite/setup-bun
-            - name: Install dependencies
-              run: bun install --frozen-lockfile
-              env:
-                  PUPPETEER_SKIP_DOWNLOAD: 1
-            - name: Release preview packages
-              run: bun run release:preview
-              env:
-                  CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-                  CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+

README.md

@@ -1,7 +1,7 @@
 <h1 align="center">GitBook</h1>
 
 <p align="center">
-  <a href="https://gitbook.com/docs/">Docs</a> - <a href="https://github.com/GitbookIO/community">Community</a> - <a href="https://developer.gitbook.com/">Developer Docs</a> - <a href="https://changelog.gitbook.com/">Changelog</a> - <a href="https://github.com/GitbookIO/gitbook/issues/new?assignees=&labels=bug&template=bug_report.md">Bug reports</a> 
+  <a href="https://gitbook.com/docs/">Docs</a> - <a href="https://github.com/GitbookIO/community">Community</a> - <a href="https://developer.gitbook.com/">Developer Docs</a> - <a href="https://changelog.gitbook.com/">Changelog</a> - <a href="https://github.com/GitbookIO/gitbook/issues/new?assignees=&labels=bug&template=bug_report.md">Bug reports</a> - <a href="https://github.com/orgs/GitbookIO/discussions/categories/feature-requests">Feature requests</a> 
 </p>
 
 <p align="center">
@@ -35,10 +35,10 @@ To run a local version of this project, please follow these simple steps.
 
 ### Prerequisites
 
--   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
+- Node.js (Version: >=20.6)
+    - Use nvm for easy Node management
+- [Bun](https://bun.sh/) (Version: >=1.2.15)
+  - We use a text-based lockfile which isn't supported below 1.2.15
 
 ### Set up
 
@@ -59,10 +59,10 @@ bun install
 4. Start your local development server.
 
 ```
-bun dev:v2
+bun dev
 ```
 
-5. Open a published GitBook space in your web browser, prefixing it with `http://localhost:3000/`.
+6. Open a published GitBook space in your web browser, prefixing it with `http://localhost:3000/url`.
 
 examples:
 
@@ -71,11 +71,6 @@ examples:
 
 Any published GitBook site can be accessed through your local development instance, and any updates you make to the codebase will be reflected in your browser.
 
-### Other development commands
-
--   `bun format`: format the code
--   `bun lint`: lint the code
-
 ### CI and testing
 
 All pull-requests will be tested against both visual and performances testing to prevent regressions.

biome.json

@@ -21,7 +21,8 @@
             "packages/openapi-parser/src/fixtures/**/*",
             "packages/emoji-codepoints/index.ts",
             "packages/icons/src/data/*.json",
-            "packages/cache-do/worker-configuration.d.ts"
+            "packages/gitbook/worker-configuration.d.ts",
+            "**/*.css"
         ]
     },
     "formatter": {
@@ -127,7 +128,6 @@
         {
             "include": [
                 "packages/gitbook/**/*",
-                "packages/gitbook-v2/**/*",
                 "packages/react-openapi/**/*",
                 "packages/react-math/**/*",
                 "packages/react-contentkit/**/*",

package.json

@@ -7,19 +7,17 @@
         "turbo": "^2.5.0",
         "vercel": "^39.3.0"
     },
-    "packageManager": "bun@1.2.11",
+    "packageManager": "bun@1.2.15",
     "overrides": {
         "@codemirror/state": "6.4.1",
-        "@gitbook/api": "^0.119.0",
         "react": "^19.0.0",
-        "react-dom": "^19.0.0"
+        "react-dom": "^19.0.0",
+        "esbuild": "0.24.2"
     },
     "private": true,
     "scripts": {
         "dev": "turbo run dev",
-        "dev:v2": "turbo run dev:v2",
         "build": "turbo run build",
-        "build:v2": "turbo run build:v2",
         "clean-deps": "rm -rf node_modules && rm -rf packages/*/node_modules",
         "typecheck": "turbo run typecheck",
         "format": "biome check --write ./",
@@ -30,11 +28,15 @@
         "changeset": "changeset",
         "changeset-version": "changeset version && bun run format",
         "release": "turbo run release && changeset publish",
-        "release:preview": "turbo run release:preview",
         "download:env": "op read op://gitbook-x-dev/gitbook-open/.env.local >> .env.local",
         "clean": "turbo run clean"
     },
-    "workspaces": ["packages/*"],
+    "workspaces": {
+        "packages": ["packages/*"],
+        "catalog": {
+            "@gitbook/api": "^0.136.0"
+        }
+    },
     "patchedDependencies": {
         "decode-named-character-reference@1.0.2": "patches/decode-named-character-reference@1.0.2.patch",
         "@vercel/next@4.4.2": "patches/@vercel%2Fnext@4.4.2.patch"

packages/browser-types/.gitignore

@@ -0,0 +1 @@
+dist/

packages/browser-types/README.md

@@ -0,0 +1,3 @@
+# `@gitbook/browser-types`
+
+Typescript types for the global variables available in a GitBook website. These types can be used by integrations embedding scripts.

packages/browser-types/package.json

@@ -0,0 +1,24 @@
+{
+    "name": "@gitbook/browser-types",
+    "description": "Typescript types for the global variables available in a GitBook website. These types can be used by integrations embedding scripts.",
+    "type": "module",
+    "exports": {
+        ".": {
+            "types": "./dist/index.d.ts",
+            "default": "./dist/index.js"
+        }
+    },
+    "version": "0.0.0",
+    "dependencies": {
+        "@gitbook/api": "catalog:",
+        "@gitbook/icons": "workspace:"
+    },
+    "devDependencies": {
+        "typescript": "^5.5.3"
+    },
+    "scripts": {
+        "build": "tsc",
+        "typecheck": "tsc --noEmit"
+    },
+    "files": ["dist", "README.md", "CHANGELOG.md"]
+}

packages/browser-types/src/index.ts

@@ -0,0 +1,84 @@
+import type { AIToolCallResult, AIToolDefinition } from '@gitbook/api';
+import type { IconName } from '@gitbook/icons';
+
+export type GitBookIntegrationEvent = 'load' | 'unload';
+
+export type GitBookIntegrationEventCallback = (...args: any[]) => void;
+
+export type GitBookIntegrationTool = AIToolDefinition & {
+    /**
+     * Confirmation action to be displayed to the user before executing the tool.
+     */
+    confirmation?: {
+        icon?: IconName;
+        label: string;
+    };
+
+    /**
+     * Callback when the tool is executed.
+     * The input is provided by the AI assistant following the input schema of the tool.
+     */
+    execute: (input: object) => Promise<Pick<AIToolCallResult, 'output' | 'summary'>>;
+};
+
+export type GitBookAssistant = {
+    /**
+     * Name of the assistant displayed in the UI.
+     */
+    label: string;
+
+    /**
+     * Icon of the assistant displayed in the UI.
+     * Any FontAwesome icon name is supported.
+     * @example 'sparkle'
+     */
+    icon: string;
+
+    /**
+     * Callback when the assistant is opened.
+     */
+    open: (query?: string) => void;
+
+    /**
+     * Whether to display the triggers for this assistant in the UI.
+     * @default true
+     */
+    ui?: boolean;
+};
+
+export type GitBookGlobal = {
+    /**
+     * Register an event listener.
+     */
+    addEventListener: (
+        type: GitBookIntegrationEvent,
+        func: GitBookIntegrationEventCallback
+    ) => void;
+
+    /**
+     * Remove an event listener.
+     */
+    removeEventListener: (
+        type: GitBookIntegrationEvent,
+        func: GitBookIntegrationEventCallback
+    ) => void;
+
+    /**
+     * Register a custom tool to be exposed to the AI assistant.
+     */
+    registerTool: (tool: GitBookIntegrationTool) => void;
+
+    /**
+     * Register a custom assistant to be available on the site.
+     */
+    registerAssistant: (assistant: GitBookAssistant) => () => void;
+};
+
+declare global {
+    interface Window {
+        /**
+         * Global `window.GitBook` object accessible by integrations.
+         */
+        GitBook?: GitBookGlobal;
+    }
+}

packages/browser-types/tsconfig.json

@@ -13,9 +13,12 @@
         "moduleResolution": "bundler",
         "resolveJsonModule": true,
         "isolatedModules": true,
+        "jsx": "react-jsx",
         "incremental": true,
-        "types": ["./worker-configuration.d.ts"]
+        "types": [
+            "bun-types" // add Bun global
+        ]
     },
-    "include": ["src/**/*.ts"],
+    "include": ["src/**/*.ts", "src/**/*.tsx"],
     "exclude": ["node_modules"]
 }

packages/cache-do/.gitignore

@@ -1,3 +0,0 @@
-.wrangler
-worker-configuration.d.ts
-dist/

packages/cache-do/CHANGELOG.md

@@ -1,18 +0,0 @@
-# @gitbook/cache-do
-
-## 0.1.1
-
-### Patch Changes
-
--   b7a5106: Disable cloudflare observability in production
-
-## 0.1.0
-
-### Minor Changes
-
--   9b8d519: Experiment with optimizing billable duration in Cloudflare by using multiple RPC sessions instead of one
--   636b868: First version of a new cache backend powered by Cloudflare Durable Objects
-
-### Patch Changes
-
--   56f5fa1: Enable Workers observability with a sampling of 0.1

packages/cache-do/README.md

@@ -1,22 +0,0 @@
-# `@gitbook/cache-do`
-
-Cache backend, powered by Cloudflare Durable Objects. The cache is optimized for GitBook use-cases.
-
-### Performances
-
-The cache backend is optimized for performances by being distributed and accessible close to the worker locations that are reading it.
-
-### Geo-distribution
-
-To achieve a good balance between **performances** and **consistency**, cache objects are distributed over 7 locations, representing continents.
-
-It makes it possible to purge all 7 locations in one go and achieve fast consistency.
-
-### Concepts
-
-**Cache tag**: unique tag in the cache environment. A cache tag groups multiple keys that should be purged together in one operation.
-Cache tags should not contain a large set of unique keys. Exceeding thousands could lead to performances or reliability issues.
-
-**Cache key**: unique key in the cache environment. Each key should be assigned to a `tag`.
-
-**Location**: cache is distributed over 7 unique locations, one for each continent.

packages/cache-do/package.json

@@ -1,35 +0,0 @@
-{
-    "name": "@gitbook/cache-do",
-    "type": "module",
-    "private": true,
-    "exports": {
-        ".": {
-            "types": "./dist/index.d.ts",
-            "development": "./src/index.ts",
-            "default": "./dist/index.js"
-        },
-        "./api": {
-            "types": "./dist/api.d.ts",
-            "development": "./src/api.ts",
-            "default": "./dist/api.js"
-        }
-    },
-    "version": "0.1.1",
-    "dependencies": {
-        "@msgpack/msgpack": "^3.0.0-beta2",
-        "lru_map": "^0.4.1"
-    },
-    "devDependencies": {
-        "typescript": "^5.5.3",
-        "wrangler": "^4.10.0"
-    },
-    "scripts": {
-        "generate": "wrangler types",
-        "build": "tsc",
-        "typecheck": "tsc --noEmit",
-        "dev": "tsc -w",
-        "release": "wrangler deploy",
-        "release:preview": "wrangler deploy && wrangler deploy --env preview"
-    },
-    "files": ["dist", "src", "bin", "data", "README.md", "CHANGELOG.md"]
-}

packages/cache-do/src/CacheObject.ts

@@ -1,292 +0,0 @@
-import { DurableObject } from 'cloudflare:workers';
-import { decode, encode } from '@msgpack/msgpack';
-import { LRUMap } from 'lru_map';
-
-export interface CacheObjectDescriptor {
-    get: <Value = unknown>(key: string) => Promise<Value | undefined>;
-    set: <Value = unknown>(key: string, value: Value, expiresAt: number) => Promise<void>;
-}
-
-/**
- * Value stored in a chunked binary msgpack format.
- * Stored under the key `prop.${key}.${index}`.
- */
-interface CacheObjectProp<Value = unknown> {
-    value: Value;
-    expiresAt: number;
-}
-
-/**
- * Expiration clock stored under the key `exp.${expiresAt}.${key}`.
- */
-interface CacheObjectExp {
-    /** Key of the property */
-    k: string;
-    /** Number of chunks */
-    c: number;
-}
-
-/**
- * Durable Object class being deployed as a distributed cache.
- */
-export class CacheObject extends DurableObject {
-    private lru = new LRUMap<string, { match: CacheObjectProp | undefined }>(500);
-
-    /**
-     * Open a descriptor to access the cache object.
-     * The goal is to minimize the amount of RPC sessions between the client and the cache object.
-     * One session is opened per request on the client side and used to perform multiple operations.
-     * https://developers.cloudflare.com/workers/runtime-apis/rpc/#return-functions-from-rpc-methods
-     */
-    public open(): CacheObjectDescriptor {
-        return {
-            get: async <Value = unknown>(key: string) => {
-                return this.get<Value>(key);
-            },
-            set: async <Value = unknown>(key: string, value: Value, expiresAt: number) => {
-                await this.set(key, value, expiresAt);
-            },
-        };
-    }
-
-    /**
-     * Get the value of a property.
-     */
-    public async get<Value = unknown>(key: string) {
-        return this.logOperation({ operation: 'get', key }, async (setLog) => {
-            // Try the memory state first.
-            const memoryEntry = this.lru.get(key);
-            if (memoryEntry) {
-                setLog({ memory: true });
-                setLog({ memoryMatch: !!memoryEntry.match });
-                if (!memoryEntry.match) {
-                    return;
-                }
-
-                const isExpired = memoryEntry.match.expiresAt < Date.now();
-                setLog({ memoryExpired: isExpired });
-
-                if (!isExpired) {
-                    return memoryEntry.match.value as Value;
-                }
-            }
-
-            return await this.getFromStorage<Value>(key);
-        });
-    }
-
-    /**
-     * Get the value of a property from the DO storage.
-     */
-    public async getFromStorage<Value = unknown>(key: string) {
-        return this.logOperation({ operation: 'getFromStorage', key }, async (setLog) => {
-            const entries = await this.ctx.storage.list<Uint8Array>({
-                prefix: getStoragePropKey(key),
-                noCache: true,
-            });
-            if (entries.size) {
-                const entry = decodeChunks<CacheObjectProp<Value>>(entries);
-                setLog({ chunks: entries.size, chunksSize: entry?.size ?? 0 });
-                if (entry && entry.value.expiresAt > Date.now()) {
-                    // Found
-                    this.lru.set(key, { match: entry.value });
-                    return entry.value.value;
-                }
-            }
-
-            // Not found
-            this.lru.set(key, { match: undefined });
-        });
-    }
-
-    /**
-     * Set a value in the cache object.
-     */
-    public async set<Value = unknown>(key: string, value: Value, expiresAt: number) {
-        return this.logOperation({ operation: 'set', key }, async (setLog) => {
-            const prop: CacheObjectProp<Value> = {
-                value,
-                expiresAt,
-            };
-
-            this.lru.set(key, { match: prop });
-            await this.ctx.storage.transaction(async (tx) => {
-                const entries = encodeChunks(key, prop);
-                const chunks = Object.keys(entries).length;
-                setLog({ chunks });
-
-                const clockValue: CacheObjectExp = {
-                    k: key,
-                    c: chunks,
-                };
-
-                await tx.put(getGCClockKey(key, expiresAt), clockValue);
-                await tx.put(entries);
-
-                const currentAlarm = await tx.getAlarm();
-                if (!currentAlarm) {
-                    // Set an alarm to garbage collect all entries that have expired in 12h.
-                    await tx.setAlarm(Date.now() + 12 * 60 * 60 * 1000);
-                }
-            });
-        });
-    }
-
-    /**
-     * Purge all keys in the cache object.
-     */
-    public async purge() {
-        return this.logOperation({ operation: 'purge' }, async (setLog) => {
-            const result = new Set<string>();
-
-            try {
-                // List all the keys in the cache object.
-                const entries = await this.ctx.storage.list<CacheObjectExp>({
-                    prefix: 'exp.',
-                    noCache: true,
-                });
-                setLog({ entries: entries.size });
-                entries.forEach((exp) => {
-                    result.add(exp.k);
-                });
-            } catch (_error) {}
-
-            await this.reset();
-            return Array.from(result);
-        });
-    }
-
-    /**
-     * Alarm to garbage collect all entries that have expired.
-     */
-    async alarm() {
-        return this.logOperation({ operation: 'alarm' }, async (setLog) => {
-            try {
-                const entries = await this.ctx.storage.list<CacheObjectExp>({
-                    prefix: 'exp.',
-                    noCache: true,
-                });
-                setLog({ entries: entries.size });
-                const toDeleteSet = new Set<string>();
-
-                for (const [key, exp] of entries) {
-                    const timestamp = Number.parseInt(key.split('.')[1]);
-                    if (timestamp < Date.now()) {
-                        toDeleteSet.add(key);
-                        for (let i = 0; i < exp.c; i++) {
-                            toDeleteSet.add(getStoragePropChunkKey(exp.k, i));
-                        }
-                    }
-                }
-
-                // Delete the keys by batch of 128.
-                const toDelete = Array.from(toDeleteSet);
-                setLog({ toDelete: toDelete.length });
-                for (let i = 0; i < toDelete.length; i += 128) {
-                    await this.ctx.storage.delete(toDelete.slice(i, i + 128));
-                }
-
-                // If there are still keys to delete, set an alarm to continue the deletion in 12h.
-                if (toDelete.length) {
-                    await this.ctx.storage.setAlarm(Date.now() + 12 * 60 * 60 * 1000);
-                }
-            } catch (_error) {
-                await this.reset();
-            }
-        });
-    }
-
-    /**
-     * Reset the cache object.
-     */
-    async reset() {
-        return this.logOperation({ operation: 'reset' }, async () => {
-            this.lru.clear();
-            await this.ctx.storage.deleteAll();
-        });
-    }
-
-    /**
-     * Time and log an operation.
-     */
-    async logOperation<T>(
-        log: Record<string, unknown>,
-        fn: (update: (log: Record<string, unknown>) => void) => Promise<T>
-    ): Promise<T> {
-        const objectId = this.ctx.id.name ?? this.ctx.id.toString();
-        const update: Record<string, unknown> = {};
-        const start = performance.now();
-        try {
-            return await fn((arg) => {
-                Object.assign(update, arg);
-            });
-        } finally {
-            const duration = performance.now() - start;
-            console.log({ ...log, ...update, objectId, duration });
-        }
-    }
-}
-
-function getStoragePropKey(key: string): string {
-    return `prop.${key}.`;
-}
-
-function getStoragePropChunkKey(key: string, index: number): string {
-    return `${getStoragePropKey(key)}${index}`;
-}
-
-function getGCClockRootKey(timestamp: number): string {
-    return `exp.${timestamp}.`;
-}
-
-function getGCClockKey(key: string, expiresAt: number): string {
-    return `${getGCClockRootKey(expiresAt)}${key}`;
-}
-
-function encodeChunks<T>(key: string, value: T): Record<string, Uint8Array> {
-    const buf = encode(value);
-    const entries: Record<string, Uint8Array> = {};
-    const chunks = chunkUint8Array(buf, 128 * 1024);
-
-    for (let index = 0; index < chunks.length; index++) {
-        entries[getStoragePropChunkKey(key, index)] = chunks[index];
-    }
-
-    return entries;
-}
-
-function decodeChunks<T>(entries: Map<string, Uint8Array>): { value: T; size: number } | undefined {
-    const chunks = Array.from(entries.entries())
-        .map(([key, value]) => {
-            const index = Number.parseInt(key.split('.').pop()!);
-            return [index, value] as const;
-        })
-        .sort(([a], [b]) => a - b)
-        .map(([, value]) => value);
-
-    if (chunks.length === 0) {
-        return;
-    }
-
-    const buf = mergeUint8Array(chunks);
-    return { value: decode(buf) as T, size: buf.length };
-}
-
-function chunkUint8Array(input: Uint8Array, chunkSize: number): Uint8Array[] {
-    const chunks: Uint8Array[] = [];
-    for (let i = 0; i < input.length; i += chunkSize) {
-        chunks.push(input.slice(i, i + chunkSize));
-    }
-    return chunks;
-}
-
-function mergeUint8Array(chunks: Uint8Array[]): Uint8Array {
-    const totalLength = chunks.reduce((sum, chunk) => sum + chunk.length, 0);
-    const result = new Uint8Array(totalLength);
-    let offset = 0;
-    for (const chunk of chunks) {
-        result.set(chunk, offset);
-        offset += chunk.length;
-    }
-    return result;
-}

packages/cache-do/src/CacheObjectStub.ts

@@ -1,97 +0,0 @@
-import type { CacheObject } from './CacheObject';
-
-export type CacheLocationId = ContinentCode;
-const allLocations: CacheLocationId[] = ['AF', 'AS', 'NA', 'SA', 'AN', 'EU', 'OC'];
-
-/**
- * Location hint for the CacheObject durable object.
- */
-const doLocationHints: {
-    [key in CacheLocationId]: DurableObjectLocationHint;
-} = {
-    AF: 'afr',
-    AS: 'apac',
-    NA: 'wnam',
-    SA: 'sam',
-    AN: 'oc',
-    EU: 'weur',
-    OC: 'oc',
-};
-
-/**
- * Client to access a cache tag.
- */
-export class CacheObjectStub {
-    private stub: DurableObjectStub<CacheObject>;
-
-    constructor(
-        /** Binding to the CacheObject durable object */
-        private doNamespace: DurableObjectNamespace<CacheObject>,
-        /** ID of the location to target */
-        private locationId: CacheLocationId,
-        /** Name of the tag */
-        private tag: string
-    ) {
-        const groupId = getCacheObjectIdName(this.locationId, this.tag);
-        this.stub = this.doNamespace.get(this.doNamespace.idFromName(groupId), {
-            // Initialize the object with a locaiton hint,
-            // as we might want to purge all locations before the object is created.
-            // https://developers.cloudflare.com/durable-objects/reference/data-location/
-            locationHint: doLocationHints[this.locationId],
-        });
-    }
-
-    /**
-     * Open a descriptor to the cache object.
-     * It can be used to perform multiple operations in a single RPC session.
-     * Ex:
-     * ```ts
-     * using desc = cache.open();
-     * await desc.set('key', 'value', Date.now() + 1000);
-     * await desc.get('key');
-     * ```
-     */
-    async open() {
-        return await this.stub.open();
-    }
-
-    /**
-     * Get a value from the cache.
-     */
-    async get<Value = unknown>(key: string) {
-        return (await this.stub.get(key)) as Value | undefined;
-    }
-
-    /**
-     * Set a value in the cache.
-     */
-    async set<Value = unknown>(key: string, value: Value, expiresAt: number) {
-        return await this.stub.set(key, value, expiresAt);
-    }
-
-    /**
-     * Purge all keys in the cache tag.
-     */
-    async purge() {
-        const keys = new Set<string>();
-        await Promise.all(
-            allLocations.map(async (locationId) => {
-                const groupId = getCacheObjectIdName(locationId, this.tag);
-                const cacheGroup = this.doNamespace.get(this.doNamespace.idFromName(groupId), {
-                    // Initialize the object with a locaiton hint,
-                    // as we might want to purge all locations before the object is created.
-                    // https://developers.cloudflare.com/durable-objects/reference/data-location/
-                    locationHint: doLocationHints[this.locationId],
-                });
-                const locationkeys = await cacheGroup.purge();
-                locationkeys.forEach((key) => keys.add(key));
-            })
-        );
-
-        return keys;
-    }
-}
-
-function getCacheObjectIdName(locationId: CacheLocationId, tag: string): string {
-    return `${locationId}:${tag}`;
-}

packages/cache-do/src/api.ts

@@ -1 +0,0 @@
-export * from './CacheObjectStub';

packages/cache-do/src/index.ts

@@ -1,9 +0,0 @@
-import { WorkerEntrypoint } from 'cloudflare:workers';
-
-export * from './CacheObject';
-
-export default class Worker extends WorkerEntrypoint {
-    fetch() {
-        return new Response('Hello, world!');
-    }
-}

packages/cache-do/turbo.json

@@ -1,8 +0,0 @@
-{
-    "extends": ["//"],
-    "tasks": {
-        "generate": {
-            "outputs": ["worker-configuration.d.ts"]
-        }
-    }
-}

packages/cache-do/wrangler.toml

@@ -1,27 +0,0 @@
-main = "./src/index.ts"
-name = "gitbook-open-cache"
-compatibility_date = "2024-09-02"
-
-durable_objects.bindings = [
-  {name = "CACHE", class_name = "CacheObject"}
-]
-
-migrations = [
-  {tag = "v1", new_classes = ["CacheObject"]}
-]
-
-[observability]
-enabled = false
-
-[env.preview]
-name = "gitbook-open-cache-preview"
-durable_objects.bindings = [
-  {name = "CACHE", class_name = "CacheObject"}
-]
-migrations = [
-  {tag = "v1", new_classes = ["CacheObject"]}
-]
-
-[env.preview.observability]
-enabled = true
-head_sampling_rate = 0.1

packages/cache-tags/package.json

@@ -10,7 +10,7 @@
     },
     "version": "0.3.1",
     "dependencies": {
-        "@gitbook/api": "^0.119.0",
+        "@gitbook/api": "catalog:",
         "assert-never": "^1.2.1"
     },
     "devDependencies": {

packages/cache-tags/src/index.ts

@@ -90,7 +90,7 @@ export function getCacheTag(
         | {
               tag: 'translation';
               organization: string;
-              translationSettings: string;
+              translation: string;
           }
 ): string {
     switch (spec.tag) {
@@ -115,7 +115,7 @@ export function getCacheTag(
         case 'openapi':
             return `organization:${spec.organization}:openapi:${spec.openAPISpec}`;
         case 'translation':
-            return `organization:${spec.organization}:translation:${spec.translationSettings}`;
+            return `organization:${spec.organization}:translation:${spec.translation}`;
         default:
             assertNever(spec);
     }
@@ -144,6 +144,10 @@ export function getComputedContentSourceCacheTags(
 ) {
     const tags: string[] = [];
 
+    if (!('dependencies' in source)) {
+        return tags;
+    }
+
     // We add the dependencies as tags, to ensure that the computed content is invalidated
     // when the dependencies are updated.
     const dependencies = Object.values(source.dependencies ?? {});
@@ -167,12 +171,12 @@ export function getComputedContentSourceCacheTags(
                         })
                     );
                     break;
-                case 'translation-language':
+                case 'translation':
                     tags.push(
                         getCacheTag({
                             tag: 'translation',
                             organization: inContext.organizationId,
-                            translationSettings: dependency.ref.translationSettings,
+                            translation: dependency.ref.translation,
                         })
                     );
                     break;

packages/fonts/.gitignore

@@ -0,0 +1,2 @@
+dist/
+src/data/*.json

packages/fonts/CHANGELOG.md

@@ -0,0 +1,7 @@
+# @gitbook/fonts
+
+## 0.1.0
+
+### Minor Changes
+
+- fbfcca5: Initial version of the package

packages/fonts/README.md

@@ -0,0 +1,3 @@
+# `@gitbook/fonts`
+
+Utilities to lookup default fonts supported by GitBook.

packages/fonts/bin/generate.ts

@@ -0,0 +1,91 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
+
+import { APIv2 } from 'google-font-metadata';
+
+import { CustomizationDefaultFont } from '@gitbook/api';
+
+import type { FontDefinitions } from '../src/types';
+
+const googleFontsMap: { [fontName in CustomizationDefaultFont]: string } = {
+    [CustomizationDefaultFont.Inter]: 'inter',
+    [CustomizationDefaultFont.FiraSans]: 'fira-sans-extra-condensed',
+    [CustomizationDefaultFont.IBMPlexSerif]: 'ibm-plex-serif',
+    [CustomizationDefaultFont.Lato]: 'lato',
+    [CustomizationDefaultFont.Merriweather]: 'merriweather',
+    [CustomizationDefaultFont.NotoSans]: 'noto-sans',
+    [CustomizationDefaultFont.OpenSans]: 'open-sans',
+    [CustomizationDefaultFont.Overpass]: 'overpass',
+    [CustomizationDefaultFont.Poppins]: 'poppins',
+    [CustomizationDefaultFont.Raleway]: 'raleway',
+    [CustomizationDefaultFont.Roboto]: 'roboto',
+    [CustomizationDefaultFont.RobotoSlab]: 'roboto-slab',
+    [CustomizationDefaultFont.SourceSansPro]: 'source-sans-3',
+    [CustomizationDefaultFont.Ubuntu]: 'ubuntu',
+    [CustomizationDefaultFont.ABCFavorit]: 'inter',
+};
+
+/**
+ * Scripts to generate the list of all icons.
+ */
+async function main() {
+    // @ts-expect-error - we build the object
+    const output: FontDefinitions = {};
+
+    for (const font of Object.values(CustomizationDefaultFont)) {
+        const googleFontName = googleFontsMap[font];
+        const fontMetadata = APIv2[googleFontName.toLowerCase()];
+        if (!fontMetadata) {
+            throw new Error(`Font ${googleFontName} not found`);
+        }
+
+        output[font] = {
+            font: googleFontName,
+            unicodeRange: fontMetadata.unicodeRange,
+            variants: {
+                '400': {},
+                '700': {},
+            },
+        };
+
+        Object.keys(output[font].variants).forEach((weight) => {
+            const variants = fontMetadata.variants[weight];
+            const normalVariant = variants.normal;
+            if (!normalVariant) {
+                throw new Error(`Font ${googleFontName} has no normal variant`);
+            }
+
+            output[font].variants[weight] = {};
+            Object.entries(normalVariant).forEach(([script, url]) => {
+                output[font].variants[weight][script] = url.url.woff;
+            });
+        });
+    }
+
+    await writeDataFile('fonts', JSON.stringify(output, null, 2));
+}
+
+/**
+ * We write both in dist and src as the build process might have happen already
+ * and tsc doesn't copy the files.
+ */
+async function writeDataFile(name, content) {
+    const srcData = path.resolve(__dirname, '../src/data');
+    const distData = path.resolve(__dirname, '../dist/data');
+
+    // Ensure the directories exists
+    await Promise.all([
+        fs.mkdir(srcData, { recursive: true }),
+        fs.mkdir(distData, { recursive: true }),
+    ]);
+
+    await Promise.all([
+        fs.writeFile(path.resolve(srcData, `${name}.json`), content),
+        fs.writeFile(path.resolve(distData, `${name}.json`), content),
+    ]);
+}
+
+main().catch((error) => {
+    console.error(`Error generating icons list: ${error}`);
+    process.exit(1);
+});

packages/fonts/package.json

@@ -0,0 +1,31 @@
+{
+    "name": "@gitbook/fonts",
+    "type": "module",
+    "exports": {
+        ".": {
+            "types": "./dist/index.d.ts",
+            "development": "./src/index.ts",
+            "default": "./dist/index.js"
+        }
+    },
+    "version": "0.1.0",
+    "dependencies": {
+        "@gitbook/api": "catalog:"
+    },
+    "devDependencies": {
+        "google-font-metadata": "^6.0.3",
+        "typescript": "^5.5.3"
+    },
+    "scripts": {
+        "generate": "bun ./bin/generate.js",
+        "build": "tsc --project tsconfig.build.json",
+        "typecheck": "tsc --noEmit",
+        "dev": "tsc -w",
+        "clean": "rm -rf ./dist && rm -rf ./src/data",
+        "unit": "bun test"
+    },
+    "files": ["dist", "src", "bin", "README.md", "CHANGELOG.md"],
+    "engines": {
+        "node": ">=20.0.0"
+    }
+}

packages/fonts/src/__snapshots__/getDefaultFont.test.ts.snap

@@ -0,0 +1,57 @@
+// Bun Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`getDefaultFont should return correct object for Latin text 1`] = `
+{
+  "font": "Inter",
+  "url": "https://fonts.gstatic.com/s/inter/v18/UcCO3FwrK3iLTeHuS_nVMrMxCp50SjIw2boKoduKmMEVuLyfAZ9hjp-Ek-_0ew.woff",
+}
+`;
+
+exports[`getDefaultFont should return correct object for Cyrillic text 1`] = `
+{
+  "font": "Inter",
+  "url": "https://fonts.gstatic.com/s/inter/v18/UcCO3FwrK3iLTeHuS_nVMrMxCp50SjIw2boKoduKmMEVuLyfAZthjp-Ek-_0ewmM.woff",
+}
+`;
+
+exports[`getDefaultFont should return correct object for Greek text 1`] = `
+{
+  "font": "Inter",
+  "url": "https://fonts.gstatic.com/s/inter/v18/UcCO3FwrK3iLTeHuS_nVMrMxCp50SjIw2boKoduKmMEVuLyfAZxhjp-Ek-_0ewmM.woff",
+}
+`;
+
+exports[`getDefaultFont should handle mixed script text 1`] = `
+{
+  "font": "Inter",
+  "url": "https://fonts.gstatic.com/s/inter/v18/UcCO3FwrK3iLTeHuS_nVMrMxCp50SjIw2boKoduKmMEVuLyfAZthjp-Ek-_0ewmM.woff",
+}
+`;
+
+exports[`getDefaultFont should handle different font weights: regular 1`] = `
+{
+  "font": "Inter",
+  "url": "https://fonts.gstatic.com/s/inter/v18/UcCO3FwrK3iLTeHuS_nVMrMxCp50SjIw2boKoduKmMEVuLyfAZ9hjp-Ek-_0ew.woff",
+}
+`;
+
+exports[`getDefaultFont should handle different font weights: bold 1`] = `
+{
+  "font": "Inter",
+  "url": "https://fonts.gstatic.com/s/inter/v18/UcCO3FwrK3iLTeHuS_nVMrMxCp50SjIw2boKoduKmMEVuFuYAZ9hjp-Ek-_0ew.woff",
+}
+`;
+
+exports[`getDefaultFont should handle different fonts: inter 1`] = `
+{
+  "font": "Inter",
+  "url": "https://fonts.gstatic.com/s/inter/v18/UcCO3FwrK3iLTeHuS_nVMrMxCp50SjIw2boKoduKmMEVuLyfAZ9hjp-Ek-_0ew.woff",
+}
+`;
+
+exports[`getDefaultFont should handle different fonts: roboto 1`] = `
+{
+  "font": "Roboto",
+  "url": "https://fonts.gstatic.com/s/roboto/v32/KFOmCnqEu92Fr1Mu4mxMKTU1Kg.woff",
+}
+`;

packages/fonts/src/fonts.ts

@@ -0,0 +1,5 @@
+import type { FontDefinitions } from './types';
+
+import rawFonts from './data/fonts.json' with { type: 'json' };
+
+export const fonts: FontDefinitions = rawFonts;

packages/fonts/src/getDefaultFont.test.ts

@@ -0,0 +1,119 @@
+import { describe, expect, it } from 'bun:test';
+import { CustomizationDefaultFont } from '@gitbook/api';
+import { getDefaultFont } from './getDefaultFont';
+
+describe('getDefaultFont', () => {
+    it('should return null for invalid font', () => {
+        const result = getDefaultFont({
+            font: 'invalid-font' as CustomizationDefaultFont,
+            text: 'Hello',
+            weight: 400,
+        });
+        expect(result).toBeNull();
+    });
+
+    it('should return null for invalid weight', () => {
+        const result = getDefaultFont({
+            font: CustomizationDefaultFont.Inter,
+            text: 'Hello',
+            weight: 999 as any,
+        });
+        expect(result).toBeNull();
+    });
+
+    it('should return null for text not supported by any script', () => {
+        const result = getDefaultFont({
+            font: CustomizationDefaultFont.Inter,
+            text: '😀', // Emoji not supported by Inter
+            weight: 400,
+        });
+        expect(result).toBeNull();
+    });
+
+    it('should return correct object for Latin text', () => {
+        const result = getDefaultFont({
+            font: CustomizationDefaultFont.Inter,
+            text: 'Hello World',
+            weight: 400,
+        });
+        expect(result).not.toBeNull();
+        expect(result?.font).toBe(CustomizationDefaultFont.Inter);
+        expect(result).toMatchSnapshot();
+    });
+
+    it('should return correct object for Cyrillic text', () => {
+        const result = getDefaultFont({
+            font: CustomizationDefaultFont.Inter,
+            text: 'Привет мир',
+            weight: 400,
+        });
+        expect(result).not.toBeNull();
+        expect(result?.font).toBe(CustomizationDefaultFont.Inter);
+        expect(result).toMatchSnapshot();
+    });
+
+    it('should return correct object for Greek text', () => {
+        const result = getDefaultFont({
+            font: CustomizationDefaultFont.Inter,
+            text: 'Γεια σας',
+            weight: 400,
+        });
+        expect(result).not.toBeNull();
+        expect(result?.font).toBe(CustomizationDefaultFont.Inter);
+        expect(result).toMatchSnapshot();
+    });
+
+    it('should handle mixed script text', () => {
+        const result = getDefaultFont({
+            font: CustomizationDefaultFont.Inter,
+            text: 'Hello Привет',
+            weight: 400,
+        });
+        expect(result).not.toBeNull();
+        expect(result?.font).toBe(CustomizationDefaultFont.Inter);
+        expect(result).toMatchSnapshot();
+    });
+
+    it('should handle different font weights', () => {
+        const regular = getDefaultFont({
+            font: CustomizationDefaultFont.Inter,
+            text: 'Hello',
+            weight: 400,
+        });
+        const bold = getDefaultFont({
+            font: CustomizationDefaultFont.Inter,
+            text: 'Hello',
+            weight: 700,
+        });
+        expect(regular).not.toBeNull();
+        expect(bold).not.toBeNull();
+        expect(regular).toMatchSnapshot('regular');
+        expect(bold).toMatchSnapshot('bold');
+    });
+
+    it('should handle empty string', () => {
+        const result = getDefaultFont({
+            font: CustomizationDefaultFont.Inter,
+            text: '',
+            weight: 400,
+        });
+        expect(result).toBeNull();
+    });
+
+    it('should handle different fonts', () => {
+        const inter = getDefaultFont({
+            font: CustomizationDefaultFont.Inter,
+            text: 'Hello',
+            weight: 400,
+        });
+        const roboto = getDefaultFont({
+            font: CustomizationDefaultFont.Roboto,
+            text: 'Hello',
+            weight: 400,
+        });
+        expect(inter).not.toBeNull();
+        expect(roboto).not.toBeNull();
+        expect(inter).toMatchSnapshot('inter');
+        expect(roboto).toMatchSnapshot('roboto');
+    });
+});

packages/fonts/src/getDefaultFont.ts

@@ -0,0 +1,112 @@
+import type { CustomizationDefaultFont } from '@gitbook/api';
+import { fonts } from './fonts';
+import type { FontWeight } from './types';
+
+/**
+ * Get the URL to load a font for a text.
+ */
+export function getDefaultFont(input: {
+    /**
+     * GitBook font to use.
+     */
+    font: CustomizationDefaultFont;
+
+    /**
+     * Text to display with the font.
+     */
+    text: string;
+
+    /**
+     * Font weight to use.
+     */
+    weight: FontWeight;
+}): { font: string; url: string } | null {
+    if (!input.text.trim()) {
+        return null;
+    }
+
+    const fontDefinition = fonts[input.font];
+    if (!fontDefinition) {
+        return null;
+    }
+
+    const variant = fontDefinition.variants[`${input.weight}`];
+    if (!variant) {
+        return null;
+    }
+
+    const script = getBestUnicodeRange(input.text, fontDefinition.unicodeRange);
+    if (!script) {
+        return null;
+    }
+
+    return variant[script]
+        ? {
+              font: input.font,
+              url: variant[script],
+          }
+        : null;
+}
+
+/**
+ * Determine which named @font-face unicode-range covers
+ * the greatest share of the characters in `text`.
+ *
+ * @param text   The text you want to inspect.
+ * @param ranges An object whose keys are range names and whose
+ *               values are CSS-style comma-separated unicode-range
+ *               declarations (e.g. "U+0370-03FF,U+1F00-1FFF").
+ * @returns      The key of the best-matching range, or `null`
+ *               when nothing matches at all.
+ */
+function getBestUnicodeRange(text: string, ranges: Record<string, string>): string | null {
+    // ---------- helper: parse "U+XXXX" or "U+XXXX-YYYY" ----------
+    const parseOne = (token: string): [number, number] | null => {
+        token = token.trim().toUpperCase();
+        if (!token.startsWith('U+')) return null;
+
+        const body = token.slice(2); // drop "U+"
+        const [startHex, endHex] = body.split('-');
+        const start = Number.parseInt(startHex, 16);
+        const end = endHex ? Number.parseInt(endHex, 16) : start;
+
+        if (Number.isNaN(start) || Number.isNaN(end) || end < start) return null;
+        return [start, end];
+    };
+
+    // ---------- helper: build lookup table ----------
+    const parsed: Record<string, [number, number][]> = {};
+    for (const [label, list] of Object.entries(ranges)) {
+        parsed[label] = list
+            .split(',')
+            .map(parseOne)
+            .filter((x): x is [number, number] => x !== null);
+    }
+
+    // ---------- tally code-point hits ----------
+    const hits: Record<string, number> = Object.fromEntries(Object.keys(parsed).map((k) => [k, 0]));
+
+    for (let i = 0; i < text.length; ) {
+        const cp = text.codePointAt(i)!;
+        i += cp > 0xffff ? 2 : 1; // advance by 1 UTF-16 code-unit (or 2 for surrogates)
+
+        for (const [label, rangesArr] of Object.entries(parsed)) {
+            if (rangesArr.some(([lo, hi]) => cp >= lo && cp <= hi)) {
+                hits[label]++;
+            }
+        }
+    }
+
+    // ---------- choose the "best" ----------
+    let winner: string | null = null;
+    let maxCount = 0;
+
+    for (const [label, count] of Object.entries(hits)) {
+        if (count > maxCount) {
+            maxCount = count;
+            winner = label;
+        }
+    }
+
+    return maxCount > 0 ? winner : null;
+}

packages/fonts/src/index.ts

@@ -0,0 +1,2 @@
+export * from './getDefaultFont';
+export * from './types';

packages/fonts/src/types.ts

@@ -0,0 +1,17 @@
+import type { CustomizationDefaultFont } from '@gitbook/api';
+
+export type FontWeight = 400 | 700;
+
+export type FontDefinition = {
+    font: string;
+    unicodeRange: {
+        [script: string]: string;
+    };
+    variants: {
+        [weight in string]: {
+            [script: string]: string;
+        };
+    };
+};
+
+export type FontDefinitions = { [fontName in CustomizationDefaultFont]: FontDefinition };

packages/fonts/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+    "extends": "./tsconfig.json",
+    "exclude": ["node_modules", "src/**/*.test.ts"]
+}

packages/fonts/tsconfig.json

@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "lib": ["es2023"],
+        "module": "ESNext",
+        "target": "es2022",
+        "strict": true,
+        "esModuleInterop": true,
+        "skipLibCheck": true,
+        "moduleResolution": "bundler",
+        "allowJs": true,
+        "noEmit": false,
+        "declaration": true,
+        "outDir": "dist",
+        "resolveJsonModule": true,
+        "isolatedModules": true,
+        "jsx": "react-jsx",
+        "incremental": true,
+        "types": [
+            "bun-types" // add Bun global
+        ]
+    },
+    "include": ["src/**/*.ts"],
+    "exclude": ["node_modules"]
+}

packages/fonts/turbo.json

@@ -0,0 +1,9 @@
+{
+    "extends": ["//"],
+    "tasks": {
+        "generate": {
+            "inputs": ["bin/**/*", "package.json"],
+            "outputs": ["src/data/*.json", "dist/data/*.json"]
+        }
+    }
+}

packages/gitbook-v2/.gitignore

@@ -1,12 +0,0 @@
-# next.js
-/.next/
-
-# vercel
-.vercel
-
-# cloudflare
-.open-next
-.wrangler
-
-# Symbolic links
-public

packages/gitbook-v2/CHANGELOG.md

@@ -1,81 +0,0 @@
-# gitbook-v2
-
-## 0.3.0
-
-### Minor Changes
-
-- 3119066: Add support for reusable content across spaces.
-- 7d7806d: Pass SVG images through image resizing without resizing them to serve them from optimal host.
-
-### Patch Changes
-
-- 1c8d9fe: keep data cache in OpenNext between deployment
-- 778624a: Only resize images with supported extensions.
-- e6ddc0f: Fix URL in sitemap
-- 5e975ab: Fix code highlighting for HTTP
-- e15757d: Fix crash on Cloudflare by using latest stable version of Next.js instead of canary
-- 634e0b4: Improve error messages around undefined site sections.
-- 97b7c79: Increase logging around caching behaviour causing page crashes.
-- 3f29206: Update the regex for validating site redirect
-- dd043df: Revert investigation work around URL caches.
-
-## 0.2.5
-
-### Patch Changes
-
-- Updated dependencies [77397ca]
-  - @gitbook/cache-tags@0.3.1
-
-## 0.2.4
-
-### Patch Changes
-
-- 4234289: Fix incoming URL for requests that were proxied
-- Updated dependencies [116575c]
-  - @gitbook/cache-tags@0.3.0
-
-## 0.2.3
-
-### Patch Changes
-
-- 5b2bf82: Use stable site URL data for route rewrite in the middleware
-
-## 0.2.2
-
-### Patch Changes
-
-- 54ee014: Add initial support for loading custom fonts
-- bba2e52: Fix site redirects when it includes a section/variant path
-
-## 0.2.1
-
-### Patch Changes
-
-- Updated dependencies [f32bf1f]
-  - @gitbook/cache-tags@0.2.0
-
-## 0.2.0
-
-### Minor Changes
-
-- 76c7974: Add route to revalidate cached data
-
-## 0.1.2
-
-### Patch Changes
-
-- 05ffd0e: Improving data cache management for computed content
-- Updated dependencies [05ffd0e]
-  - @gitbook/cache-tags@0.1.0
-
-## 0.1.1
-
-### Patch Changes
-
-- 3e11678: fix: lost section groups
-
-## 0.1.0
-
-### Minor Changes
-
-- cfccc44: Setup structure and deployment for new version

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

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

packages/gitbook-v2/openNext/incrementalCache.ts

@@ -1,202 +0,0 @@
-import { createHash } from 'node:crypto';
-
-import { trace } from '@/lib/tracing';
-import type {
-    CacheEntryType,
-    CacheValue,
-    IncrementalCache,
-    WithLastModified,
-} from '@opennextjs/aws/types/overrides.js';
-import { getCloudflareContext } from '@opennextjs/cloudflare';
-
-import type { DurableObjectNamespace, Rpc } from '@cloudflare/workers-types';
-
-export const BINDING_NAME = 'NEXT_INC_CACHE_R2_BUCKET';
-export const DEFAULT_PREFIX = 'incremental-cache';
-
-export type KeyOptions = {
-    cacheType?: CacheEntryType;
-};
-
-/**
- *
- * It is very similar to the `R2IncrementalCache` in the `@opennextjs/cloudflare` package, but it allow us to trace
- * the cache operations. It also integrates both R2 and Cache API in a single class.
- * Having our own, will allow us to customize it in the future if needed.
- */
-class GitbookIncrementalCache implements IncrementalCache {
-    name = 'GitbookIncrementalCache';
-
-    protected localCache: Cache | undefined;
-
-    async get<CacheType extends CacheEntryType = 'cache'>(
-        key: string,
-        cacheType?: CacheType
-    ): Promise<WithLastModified<CacheValue<CacheType>> | null> {
-        const cacheKey = this.getR2Key(key, cacheType);
-        return trace(
-            {
-                operation: 'openNextIncrementalCacheGet',
-                name: cacheKey,
-            },
-            async (span) => {
-                span.setAttribute('cacheType', cacheType ?? 'cache');
-                const r2 = getCloudflareContext().env[BINDING_NAME];
-                const localCache = await this.getCacheInstance();
-                if (!r2) throw new Error('No R2 bucket');
-                try {
-                    // Check local cache first if available
-                    const localCacheEntry = await localCache.match(this.getCacheUrlKey(cacheKey));
-                    if (localCacheEntry) {
-                        span.setAttribute('cacheHit', 'local');
-                        return localCacheEntry.json();
-                    }
-
-                    const r2Object = await r2.get(cacheKey);
-                    if (!r2Object) return null;
-
-                    span.setAttribute('cacheHit', 'r2');
-                    return {
-                        value: await r2Object.json(),
-                        lastModified: r2Object.uploaded.getTime(),
-                    };
-                } catch (e) {
-                    console.error('Failed to get from cache', e);
-                    return null;
-                }
-            }
-        );
-    }
-
-    async set<CacheType extends CacheEntryType = 'cache'>(
-        key: string,
-        value: CacheValue<CacheType>,
-        cacheType?: CacheType
-    ): Promise<void> {
-        const cacheKey = this.getR2Key(key, cacheType);
-        return trace(
-            {
-                operation: 'openNextIncrementalCacheSet',
-                name: cacheKey,
-            },
-            async (span) => {
-                span.setAttribute('cacheType', cacheType ?? 'cache');
-                const localCache = await this.getCacheInstance();
-
-                try {
-                    await this.writeToR2(cacheKey, JSON.stringify(value));
-
-                    //TODO: Check if there is any places where we don't have tags
-                    // Ideally we should always have tags, but in case we don't, we need to decide how to handle it
-                    // For now we default to a build ID tag, which allow us to invalidate the cache in case something is wrong in this deployment
-                    const tags = this.getTagsFromCacheEntry(value) ?? [
-                        `build_id/${process.env.NEXT_BUILD_ID}`,
-                    ];
-
-                    // We consider R2 as the source of truth, so we update the local cache
-                    // only after a successful R2 write
-                    await localCache.put(
-                        this.getCacheUrlKey(cacheKey),
-                        new Response(
-                            JSON.stringify({
-                                value,
-                                // Note: `Date.now()` returns the time of the last IO rather than the actual time.
-                                //       See https://developers.cloudflare.com/workers/reference/security-model/
-                                lastModified: Date.now(),
-                            }),
-                            {
-                                headers: {
-                                    // Cache-Control default to 30 minutes, will be overridden by `revalidate`
-                                    // In theory we should always get the `revalidate` value
-                                    'cache-control': `max-age=${value.revalidate ?? 60 * 30}`,
-                                    'cache-tag': tags.join(','),
-                                },
-                            }
-                        )
-                    );
-                } catch (e) {
-                    console.error('Failed to set to cache', e);
-                }
-            }
-        );
-    }
-
-    async delete(key: string): Promise<void> {
-        const cacheKey = this.getR2Key(key);
-        return trace(
-            {
-                operation: 'openNextIncrementalCacheDelete',
-                name: cacheKey,
-            },
-            async () => {
-                const r2 = getCloudflareContext().env[BINDING_NAME];
-                const localCache = await this.getCacheInstance();
-                if (!r2) throw new Error('No R2 bucket');
-
-                try {
-                    await r2.delete(cacheKey);
-
-                    // Here again R2 is the source of truth, so we delete from local cache first
-                    await localCache.delete(this.getCacheUrlKey(cacheKey));
-                } catch (e) {
-                    console.error('Failed to delete from cache', e);
-                }
-            }
-        );
-    }
-
-    async writeToR2(key: string, value: string): Promise<void> {
-        const env = getCloudflareContext().env as {
-            WRITE_BUFFER: DurableObjectNamespace<
-                Rpc.DurableObjectBranded & {
-                    write: (key: string, value: string) => Promise<void>;
-                }
-            >;
-        };
-        const id = env.WRITE_BUFFER.idFromName(key);
-
-        // A stub is a client used to invoke methods on the Durable Object
-        const stub = env.WRITE_BUFFER.get(id);
-
-        await stub.write(key, value);
-    }
-
-    async getCacheInstance(): Promise<Cache> {
-        if (this.localCache) return this.localCache;
-        this.localCache = await caches.open('incremental-cache');
-        return this.localCache;
-    }
-
-    // Utility function to generate keys for R2/Cache API
-    getR2Key(key: string, cacheType: CacheEntryType = 'cache'): string {
-        const hash = createHash('sha256').update(key).digest('hex');
-        return `${DEFAULT_PREFIX}/${cacheType === 'cache' ? process.env?.NEXT_BUILD_ID : 'dataCache'}/${hash}.${cacheType}`.replace(
-            /\/+/g,
-            '/'
-        );
-    }
-
-    getCacheUrlKey(cacheKey: string): string {
-        return `http://cache.local/${cacheKey}`;
-    }
-
-    getTagsFromCacheEntry<CacheType extends CacheEntryType>(
-        entry: CacheValue<CacheType>
-    ): string[] | undefined {
-        if ('tags' in entry && entry.tags) {
-            return entry.tags;
-        }
-
-        if ('meta' in entry && entry.meta && 'headers' in entry.meta && entry.meta.headers) {
-            const rawTags = entry.meta.headers['x-next-cache-tags'];
-            if (typeof rawTags === 'string') {
-                return rawTags.split(',');
-            }
-        }
-        if ('value' in entry) {
-            return entry.tags;
-        }
-    }
-}
-
-export default new GitbookIncrementalCache();

packages/gitbook-v2/openNext/tagCache/middleware.ts

@@ -1,81 +0,0 @@
-import { trace } from '@/lib/tracing';
-import type { NextModeTagCache } from '@opennextjs/aws/types/overrides.js';
-import doShardedTagCache from '@opennextjs/cloudflare/overrides/tag-cache/do-sharded-tag-cache';
-import { softTagFilter } from '@opennextjs/cloudflare/overrides/tag-cache/tag-cache-filter';
-
-const originalTagCache = doShardedTagCache({
-    baseShardSize: 12,
-    regionalCache: true,
-    // We can probably increase this value even further
-    regionalCacheTtlSec: 60,
-    shardReplication: {
-        numberOfSoftReplicas: 2,
-        numberOfHardReplicas: 1,
-        regionalReplication: {
-            defaultRegion: 'enam',
-        },
-    },
-});
-
-export default {
-    name: 'GitbookTagCache',
-    mode: 'nextMode',
-    getLastRevalidated: async (tags: string[]) => {
-        const tagsToCheck = tags.filter(softTagFilter);
-        if (tagsToCheck.length === 0) {
-            // If we reach here, it probably means that there is an issue that we'll need to address.
-            console.warn(
-                'getLastRevalidated - No valid tags to check for last revalidation, original tags:',
-                tags
-            );
-            return 0; // If no tags to check, return 0
-        }
-        return trace(
-            {
-                operation: 'gitbookTagCacheGetLastRevalidated',
-                name: tagsToCheck.join(', '),
-            },
-            async () => {
-                return await originalTagCache.getLastRevalidated(tagsToCheck);
-            }
-        );
-    },
-    hasBeenRevalidated: async (tags: string[], lastModified?: number) => {
-        const tagsToCheck = tags.filter(softTagFilter);
-        if (tagsToCheck.length === 0) {
-            // If we reach here, it probably means that there is an issue that we'll need to address.
-            console.warn(
-                'hasBeenRevalidated - No valid tags to check for revalidation, original tags:',
-                tags
-            );
-            return false; // If no tags to check, return false
-        }
-        return trace(
-            {
-                operation: 'gitbookTagCacheHasBeenRevalidated',
-                name: tagsToCheck.join(', '),
-            },
-            async () => {
-                const result = await originalTagCache.hasBeenRevalidated(tagsToCheck, lastModified);
-                return result;
-            }
-        );
-    },
-    writeTags: async (tags: string[]) => {
-        return trace(
-            {
-                operation: 'gitbookTagCacheWriteTags',
-                name: tags.join(', '),
-            },
-            async () => {
-                const tagsToWrite = tags.filter(softTagFilter);
-                if (tagsToWrite.length === 0) {
-                    console.warn('writeTags - No valid tags to write');
-                    return; // If no tags to write, exit early
-                }
-                // Write only the filtered tags
-                await originalTagCache.writeTags(tagsToWrite);
-            }
-        );
-    },
-} satisfies NextModeTagCache;

packages/gitbook-v2/package.json

@@ -1,38 +0,0 @@
-{
-    "name": "gitbook-v2",
-    "version": "0.3.0",
-    "private": true,
-    "dependencies": {
-        "@gitbook/api": "^0.119.0",
-        "@gitbook/cache-tags": "workspace:*",
-        "@opennextjs/cloudflare": "1.1.0",
-        "@sindresorhus/fnv1a": "^3.1.0",
-        "assert-never": "^1.2.1",
-        "jwt-decode": "^4.0.0",
-        "next": "^15.3.2",
-        "react": "^19.0.0",
-        "react-dom": "^19.0.0",
-        "rison": "^0.1.1",
-        "server-only": "^0.0.1",
-        "warn-once": "^0.1.1"
-    },
-    "devDependencies": {
-        "gitbook": "*",
-        "@types/rison": "^0.0.9",
-        "tailwindcss": "^3.4.0",
-        "postcss": "^8"
-    },
-    "scripts": {
-        "generate": "rm -rf ./public && cp -r ../gitbook/public ./public",
-        "dev:v2": "env-cmd --silent -f ../../.env.local next --turbopack",
-        "build": "next build",
-        "build:v2": "next build",
-        "start": "next start",
-        "build:v2:cloudflare": "opennextjs-cloudflare build",
-        "dev:v2:cloudflare": "wrangler dev --port 8771 --env preview",
-        "dev:v2:cf:middleware": "wrangler dev --port 8771 --inspector-port 9230 --env dev --config ./openNext/customWorkers/middlewareWrangler.jsonc",
-        "dev:v2:cf:server": "wrangler dev --port 8772 --env dev --config ./openNext/customWorkers/defaultWrangler.jsonc",
-        "unit": "bun test",
-        "typecheck": "tsc --noEmit"
-    }
-}

packages/gitbook-v2/postcss.config.js

@@ -1,6 +0,0 @@
-module.exports = {
-    plugins: {
-        tailwindcss: {},
-        autoprefixer: {},
-    },
-};

packages/gitbook-v2/src/app/~space/[spaceId]/~/changes/[changeRequestId]/~gitbook/pdf/layout.tsx

@@ -1,2 +0,0 @@
-import RootLayout from '@v2/app/~space/[spaceId]/~gitbook/pdf/layout';
-export default RootLayout;

packages/gitbook-v2/src/app/~space/[spaceId]/~/changes/[changeRequestId]/~gitbook/pdf/page.tsx

@@ -1,4 +0,0 @@
-import PDFPage, { generateMetadata } from '@v2/app/~space/[spaceId]/~gitbook/pdf/page';
-
-export default PDFPage;
-export { generateMetadata };

packages/gitbook-v2/src/app/~space/[spaceId]/~/revisions/[changeRequestId]/~gitbook/pdf/layout.tsx

@@ -1,2 +0,0 @@
-import RootLayout from '@v2/app/~space/[spaceId]/~gitbook/pdf/layout';
-export default RootLayout;

packages/gitbook-v2/src/app/~space/[spaceId]/~/revisions/[changeRequestId]/~gitbook/pdf/page.tsx

@@ -1,4 +0,0 @@
-import PDFPage, { generateMetadata } from '@v2/app/~space/[spaceId]/~gitbook/pdf/page';
-
-export default PDFPage;
-export { generateMetadata };

packages/gitbook-v2/src/lib/data/api.ts

@@ -1,755 +0,0 @@
-import { trace } from '@/lib/tracing';
-import {
-    type ComputedContentSource,
-    GitBookAPI,
-    type HttpResponse,
-    type RenderIntegrationUI,
-} from '@gitbook/api';
-import { getCacheTag, getComputedContentSourceCacheTags } from '@gitbook/cache-tags';
-import { GITBOOK_API_TOKEN, GITBOOK_API_URL, GITBOOK_USER_AGENT } from '@v2/lib/env';
-import { unstable_cacheLife as cacheLife, unstable_cacheTag as cacheTag } from 'next/cache';
-import { DataFetcherError, wrapDataFetcherError } from './errors';
-import type { GitBookDataFetcher } from './types';
-
-interface DataFetcherInput {
-    /**
-     * API token.
-     */
-    apiToken: string | null;
-}
-
-/**
- * Options to pass to the `fetch` call to disable the Next data-cache when wrapped in `use cache`.
- */
-export const noCacheFetchOptions: Partial<RequestInit> = {
-    next: {
-        revalidate: 0,
-    },
-};
-
-/**
- * Create a data fetcher using an API token.
- * The data are being cached by Next.js built-in cache.
- */
-export function createDataFetcher(
-    input: DataFetcherInput = { apiToken: null }
-): GitBookDataFetcher {
-    return {
-        async api() {
-            return apiClient(input);
-        },
-
-        withToken({ apiToken }) {
-            return createDataFetcher({
-                apiToken,
-            });
-        },
-
-        //
-        // API that are tied to the token
-        //
-        getPublishedContentSite(params) {
-            return trace('getPublishedContentSite', () =>
-                getPublishedContentSite(input, {
-                    organizationId: params.organizationId,
-                    siteId: params.siteId,
-                    siteShareKey: params.siteShareKey,
-                })
-            );
-        },
-        getSiteRedirectBySource(params) {
-            return trace('getSiteRedirectBySource', () =>
-                getSiteRedirectBySource(input, {
-                    organizationId: params.organizationId,
-                    siteId: params.siteId,
-                    siteShareKey: params.siteShareKey,
-                    source: params.source,
-                })
-            );
-        },
-        getRevision(params) {
-            return trace('getRevision', () =>
-                getRevision(input, {
-                    spaceId: params.spaceId,
-                    revisionId: params.revisionId,
-                    metadata: params.metadata,
-                })
-            );
-        },
-        getRevisionPages(params) {
-            return trace('getRevisionPages', () =>
-                getRevisionPages(input, {
-                    spaceId: params.spaceId,
-                    revisionId: params.revisionId,
-                    metadata: params.metadata,
-                })
-            );
-        },
-        getRevisionFile(params) {
-            return trace('getRevisionFile', () =>
-                getRevisionFile(input, {
-                    spaceId: params.spaceId,
-                    revisionId: params.revisionId,
-                    fileId: params.fileId,
-                })
-            );
-        },
-        getRevisionPageByPath(params) {
-            return trace('getRevisionPageByPath', () =>
-                getRevisionPageByPath(input, {
-                    spaceId: params.spaceId,
-                    revisionId: params.revisionId,
-                    path: params.path,
-                })
-            );
-        },
-        getRevisionPageMarkdown(params) {
-            return trace('getRevisionPageMarkdown', () =>
-                getRevisionPageMarkdown(input, {
-                    spaceId: params.spaceId,
-                    revisionId: params.revisionId,
-                    pageId: params.pageId,
-                })
-            );
-        },
-        getReusableContent(params) {
-            return trace('getReusableContent', () =>
-                getReusableContent(input, {
-                    spaceId: params.spaceId,
-                    revisionId: params.revisionId,
-                    reusableContentId: params.reusableContentId,
-                })
-            );
-        },
-        getLatestOpenAPISpecVersionContent(params) {
-            return trace('getLatestOpenAPISpecVersionContent', () =>
-                getLatestOpenAPISpecVersionContent(input, {
-                    organizationId: params.organizationId,
-                    slug: params.slug,
-                })
-            );
-        },
-        getSpace(params) {
-            return trace('getSpace', () =>
-                getSpace(input, {
-                    spaceId: params.spaceId,
-                    shareKey: params.shareKey,
-                })
-            );
-        },
-        getChangeRequest(params) {
-            return trace('getChangeRequest', () =>
-                getChangeRequest(input, {
-                    spaceId: params.spaceId,
-                    changeRequestId: params.changeRequestId,
-                })
-            );
-        },
-        getDocument(params) {
-            return trace('getDocument', () =>
-                getDocument(input, {
-                    spaceId: params.spaceId,
-                    documentId: params.documentId,
-                })
-            );
-        },
-        getComputedDocument(params) {
-            return trace('getComputedDocument', () =>
-                getComputedDocument(input, {
-                    organizationId: params.organizationId,
-                    spaceId: params.spaceId,
-                    source: params.source,
-                    seed: params.seed,
-                })
-            );
-        },
-        getEmbedByUrl(params) {
-            return trace('getEmbedByUrl', () =>
-                getEmbedByUrl(input, {
-                    url: params.url,
-                    spaceId: params.spaceId,
-                })
-            );
-        },
-        searchSiteContent(params) {
-            return trace('searchSiteContent', () => searchSiteContent(input, params));
-        },
-
-        renderIntegrationUi(params) {
-            return trace('renderIntegrationUi', () =>
-                renderIntegrationUi(input, {
-                    integrationName: params.integrationName,
-                    request: params.request,
-                })
-            );
-        },
-
-        getUserById(userId) {
-            return trace('getUserById', () => getUserById(input, { userId }));
-        },
-
-        streamAIResponse(params) {
-            return streamAIResponse(input, params);
-        },
-    };
-}
-
-const getUserById = async (input: DataFetcherInput, params: { userId: string }) => {
-    'use cache';
-    return trace(`getUserById(${params.userId})`, async () => {
-        return wrapDataFetcherError(async () => {
-            const api = apiClient(input);
-            const res = await api.users.getUserById(params.userId, {
-                ...noCacheFetchOptions,
-            });
-            cacheTag(...getCacheTagsFromResponse(res));
-            cacheLife('days');
-            return res.data;
-        });
-    });
-};
-
-const getSpace = async (
-    input: DataFetcherInput,
-    params: { spaceId: string; shareKey: string | undefined }
-) => {
-    'use cache';
-    cacheTag(
-        getCacheTag({
-            tag: 'space',
-            space: params.spaceId,
-        })
-    );
-
-    return trace(`getSpace(${params.spaceId}, ${params.shareKey})`, async () => {
-        return wrapDataFetcherError(async () => {
-            const api = apiClient(input);
-            const res = await api.spaces.getSpaceById(
-                params.spaceId,
-                {
-                    shareKey: params.shareKey,
-                },
-                {
-                    ...noCacheFetchOptions,
-                }
-            );
-            cacheTag(...getCacheTagsFromResponse(res));
-            cacheLife('days');
-            return res.data;
-        });
-    });
-};
-
-const getChangeRequest = async (
-    input: DataFetcherInput,
-    params: { spaceId: string; changeRequestId: string }
-) => {
-    'use cache';
-    cacheTag(
-        getCacheTag({
-            tag: 'change-request',
-            space: params.spaceId,
-            changeRequest: params.changeRequestId,
-        })
-    );
-
-    return trace(`getChangeRequest(${params.spaceId}, ${params.changeRequestId})`, async () => {
-        return wrapDataFetcherError(async () => {
-            const api = apiClient(input);
-            const res = await api.spaces.getChangeRequestById(
-                params.spaceId,
-                params.changeRequestId,
-                {
-                    ...noCacheFetchOptions,
-                }
-            );
-            cacheTag(...getCacheTagsFromResponse(res));
-            cacheLife('minutes');
-            return res.data;
-        });
-    });
-};
-
-const getRevision = async (
-    input: DataFetcherInput,
-    params: { spaceId: string; revisionId: string; metadata: boolean }
-) => {
-    'use cache';
-    return trace(`getRevision(${params.spaceId}, ${params.revisionId})`, async () => {
-        return wrapDataFetcherError(async () => {
-            const api = apiClient(input);
-            const res = await api.spaces.getRevisionById(
-                params.spaceId,
-                params.revisionId,
-                {
-                    metadata: params.metadata,
-                },
-                {
-                    ...noCacheFetchOptions,
-                }
-            );
-            cacheTag(...getCacheTagsFromResponse(res));
-            cacheLife('max');
-            return res.data;
-        });
-    });
-};
-
-const getRevisionPages = async (
-    input: DataFetcherInput,
-    params: { spaceId: string; revisionId: string; metadata: boolean }
-) => {
-    'use cache';
-    return trace(`getRevisionPages(${params.spaceId}, ${params.revisionId})`, async () => {
-        return wrapDataFetcherError(async () => {
-            const api = apiClient(input);
-            const res = await api.spaces.listPagesInRevisionById(
-                params.spaceId,
-                params.revisionId,
-                {
-                    metadata: params.metadata,
-                },
-                {
-                    ...noCacheFetchOptions,
-                }
-            );
-            cacheTag(...getCacheTagsFromResponse(res));
-            cacheLife('max');
-            return res.data.pages;
-        });
-    });
-};
-
-const getRevisionFile = async (
-    input: DataFetcherInput,
-    params: { spaceId: string; revisionId: string; fileId: string }
-) => {
-    'use cache';
-    return trace(
-        `getRevisionFile(${params.spaceId}, ${params.revisionId}, ${params.fileId})`,
-        async () => {
-            return wrapDataFetcherError(async () => {
-                const api = apiClient(input);
-                const res = await api.spaces.getFileInRevisionById(
-                    params.spaceId,
-                    params.revisionId,
-                    params.fileId,
-                    {},
-                    {
-                        ...noCacheFetchOptions,
-                    }
-                );
-                cacheTag(...getCacheTagsFromResponse(res));
-                cacheLife('max');
-                return res.data;
-            });
-        }
-    );
-};
-
-const getRevisionPageMarkdown = async (
-    input: DataFetcherInput,
-    params: { spaceId: string; revisionId: string; pageId: string }
-) => {
-    'use cache';
-    return trace(
-        `getRevisionPageMarkdown(${params.spaceId}, ${params.revisionId}, ${params.pageId})`,
-        async () => {
-            return wrapDataFetcherError(async () => {
-                const api = apiClient(input);
-                const res = await api.spaces.getPageInRevisionById(
-                    params.spaceId,
-                    params.revisionId,
-                    params.pageId,
-                    {
-                        format: 'markdown',
-                    },
-                    {
-                        ...noCacheFetchOptions,
-                    }
-                );
-
-                cacheTag(...getCacheTagsFromResponse(res));
-                cacheLife('max');
-
-                if (!('markdown' in res.data)) {
-                    throw new DataFetcherError('Page is not a document', 404);
-                }
-                return res.data.markdown;
-            });
-        }
-    );
-};
-
-const getRevisionPageByPath = async (
-    input: DataFetcherInput,
-    params: { spaceId: string; revisionId: string; path: string }
-) => {
-    'use cache';
-    return trace(
-        `getRevisionPageByPath(${params.spaceId}, ${params.revisionId}, ${params.path})`,
-        async () => {
-            const encodedPath = encodeURIComponent(params.path);
-            return wrapDataFetcherError(async () => {
-                const api = apiClient(input);
-                const res = await api.spaces.getPageInRevisionByPath(
-                    params.spaceId,
-                    params.revisionId,
-                    encodedPath,
-                    {},
-                    {
-                        ...noCacheFetchOptions,
-                    }
-                );
-                cacheTag(...getCacheTagsFromResponse(res));
-                cacheLife('max');
-                return res.data;
-            });
-        }
-    );
-};
-
-const getDocument = async (
-    input: DataFetcherInput,
-    params: { spaceId: string; documentId: string }
-) => {
-    'use cache';
-    return trace(`getDocument(${params.spaceId}, ${params.documentId})`, async () => {
-        return wrapDataFetcherError(async () => {
-            const api = apiClient(input);
-            const res = await api.spaces.getDocumentById(
-                params.spaceId,
-                params.documentId,
-                {},
-                {
-                    ...noCacheFetchOptions,
-                }
-            );
-            cacheTag(...getCacheTagsFromResponse(res));
-            cacheLife('max');
-            return res.data;
-        });
-    });
-};
-
-const getComputedDocument = async (
-    input: DataFetcherInput,
-    params: {
-        spaceId: string;
-        organizationId: string;
-        source: ComputedContentSource;
-        seed: string;
-    }
-) => {
-    'use cache';
-    cacheTag(
-        ...getComputedContentSourceCacheTags(
-            {
-                spaceId: params.spaceId,
-                organizationId: params.organizationId,
-            },
-            params.source
-        )
-    );
-
-    return trace(
-        `getComputedDocument(${params.spaceId}, ${params.organizationId}, ${params.source.type}, ${params.seed})`,
-        async () => {
-            return wrapDataFetcherError(async () => {
-                const api = apiClient(input);
-                const res = await api.spaces.getComputedDocument(
-                    params.spaceId,
-                    {
-                        source: params.source,
-                        seed: params.seed,
-                    },
-                    {},
-                    {
-                        ...noCacheFetchOptions,
-                    }
-                );
-                cacheTag(...getCacheTagsFromResponse(res));
-                cacheLife('max');
-                return res.data;
-            });
-        }
-    );
-};
-
-const getReusableContent = async (
-    input: DataFetcherInput,
-    params: { spaceId: string; revisionId: string; reusableContentId: string }
-) => {
-    'use cache';
-    return trace(
-        `getReusableContent(${params.spaceId}, ${params.revisionId}, ${params.reusableContentId})`,
-        async () => {
-            return wrapDataFetcherError(async () => {
-                const api = apiClient(input);
-                const res = await api.spaces.getReusableContentInRevisionById(
-                    params.spaceId,
-                    params.revisionId,
-                    params.reusableContentId,
-                    {},
-                    {
-                        ...noCacheFetchOptions,
-                    }
-                );
-                cacheTag(...getCacheTagsFromResponse(res));
-                cacheLife('max');
-                return res.data;
-            });
-        }
-    );
-};
-
-const getLatestOpenAPISpecVersionContent = async (
-    input: DataFetcherInput,
-    params: { organizationId: string; slug: string }
-) => {
-    'use cache';
-    cacheTag(
-        getCacheTag({
-            tag: 'openapi',
-            organization: params.organizationId,
-            openAPISpec: params.slug,
-        })
-    );
-
-    return trace(
-        `getLatestOpenAPISpecVersionContent(${params.organizationId}, ${params.slug})`,
-        async () => {
-            return wrapDataFetcherError(async () => {
-                const api = apiClient(input);
-                const res = await api.orgs.getLatestOpenApiSpecVersionContent(
-                    params.organizationId,
-                    params.slug,
-                    {
-                        ...noCacheFetchOptions,
-                    }
-                );
-                cacheTag(...getCacheTagsFromResponse(res));
-                cacheLife('max');
-                return res.data;
-            });
-        }
-    );
-};
-
-const getPublishedContentSite = async (
-    input: DataFetcherInput,
-    params: { organizationId: string; siteId: string; siteShareKey: string | undefined }
-) => {
-    'use cache';
-    cacheTag(
-        getCacheTag({
-            tag: 'site',
-            site: params.siteId,
-        })
-    );
-
-    return trace(
-        `getPublishedContentSite(${params.organizationId}, ${params.siteId}, ${params.siteShareKey})`,
-        async () => {
-            return wrapDataFetcherError(async () => {
-                const api = apiClient(input);
-                const res = await api.orgs.getPublishedContentSite(
-                    params.organizationId,
-                    params.siteId,
-                    {
-                        shareKey: params.siteShareKey,
-                    },
-                    {
-                        ...noCacheFetchOptions,
-                    }
-                );
-                cacheTag(...getCacheTagsFromResponse(res));
-                cacheLife('days');
-                return res.data;
-            });
-        }
-    );
-};
-
-const getSiteRedirectBySource = async (
-    input: DataFetcherInput,
-    params: {
-        organizationId: string;
-        siteId: string;
-        siteShareKey: string | undefined;
-        source: string;
-    }
-) => {
-    'use cache';
-    cacheTag(
-        getCacheTag({
-            tag: 'site',
-            site: params.siteId,
-        })
-    );
-
-    return trace(
-        `getSiteRedirectBySource(${params.organizationId}, ${params.siteId}, ${params.siteShareKey}, ${params.source})`,
-        async () => {
-            return wrapDataFetcherError(async () => {
-                const api = apiClient(input);
-                const res = await api.orgs.getSiteRedirectBySource(
-                    params.organizationId,
-                    params.siteId,
-                    {
-                        shareKey: params.siteShareKey,
-                        source: params.source,
-                    },
-                    {
-                        ...noCacheFetchOptions,
-                    }
-                );
-                cacheTag(...getCacheTagsFromResponse(res));
-                cacheLife('days');
-                return res.data;
-            });
-        }
-    );
-};
-
-const getEmbedByUrl = async (input: DataFetcherInput, params: { spaceId: string; url: string }) => {
-    'use cache';
-    cacheTag(
-        getCacheTag({
-            tag: 'space',
-            space: params.spaceId,
-        })
-    );
-
-    return trace(`getEmbedByUrl(${params.spaceId}, ${params.url})`, async () => {
-        return wrapDataFetcherError(async () => {
-            const api = apiClient(input);
-            const res = await api.spaces.getEmbedByUrlInSpace(
-                params.spaceId,
-                {
-                    url: params.url,
-                },
-                {
-                    ...noCacheFetchOptions,
-                }
-            );
-            cacheTag(...getCacheTagsFromResponse(res));
-            cacheLife('weeks');
-            return res.data;
-        });
-    });
-};
-
-const searchSiteContent = async (
-    input: DataFetcherInput,
-    params: Parameters<GitBookDataFetcher['searchSiteContent']>[0]
-) => {
-    'use cache';
-    cacheTag(
-        getCacheTag({
-            tag: 'site',
-            site: params.siteId,
-        })
-    );
-
-    return trace(
-        `searchSiteContent(${params.organizationId}, ${params.siteId}, ${params.query})`,
-        async () => {
-            return wrapDataFetcherError(async () => {
-                const { organizationId, siteId, query, scope } = params;
-                const api = apiClient(input);
-                const res = await api.orgs.searchSiteContent(
-                    organizationId,
-                    siteId,
-                    {
-                        query,
-                        ...scope,
-                    },
-                    {},
-                    {
-                        ...noCacheFetchOptions,
-                    }
-                );
-                cacheTag(...getCacheTagsFromResponse(res));
-                cacheLife('hours');
-                return res.data.items;
-            });
-        }
-    );
-};
-
-const renderIntegrationUi = async (
-    input: DataFetcherInput,
-    params: { integrationName: string; request: RenderIntegrationUI }
-) => {
-    'use cache';
-    cacheTag(
-        getCacheTag({
-            tag: 'integration',
-            integration: params.integrationName,
-        })
-    );
-
-    return trace(`renderIntegrationUi(${params.integrationName})`, async () => {
-        return wrapDataFetcherError(async () => {
-            const api = apiClient(input);
-            const res = await api.integrations.renderIntegrationUiWithPost(
-                params.integrationName,
-                params.request,
-                {
-                    ...noCacheFetchOptions,
-                }
-            );
-            cacheTag(...getCacheTagsFromResponse(res));
-            cacheLife('days');
-            return res.data;
-        });
-    });
-};
-
-async function* streamAIResponse(
-    input: DataFetcherInput,
-    params: Parameters<GitBookDataFetcher['streamAIResponse']>[0]
-) {
-    const api = apiClient(input);
-    const res = await api.orgs.streamAiResponseInSite(
-        params.organizationId,
-        params.siteId,
-        {
-            input: params.input,
-            output: params.output,
-            model: params.model,
-        },
-        {
-            ...noCacheFetchOptions,
-        }
-    );
-
-    for await (const event of res) {
-        yield event;
-    }
-}
-
-/**
- * Create a new API client.
- */
-export function apiClient(input: DataFetcherInput = { apiToken: null }) {
-    const { apiToken } = input;
-
-    const api = new GitBookAPI({
-        authToken: apiToken || GITBOOK_API_TOKEN || undefined,
-        endpoint: GITBOOK_API_URL,
-        userAgent: GITBOOK_USER_AGENT,
-    });
-
-    return api;
-}
-
-/**
- * Get the tags from the API responses.
- */
-function getCacheTagsFromResponse(response: HttpResponse<unknown, unknown>) {
-    const cacheTagHeader = response.headers.get('x-gitbook-cache-tag');
-    const tags = !cacheTagHeader ? [] : cacheTagHeader.split(',');
-    return tags;
-}

packages/gitbook-v2/src/lib/data/errors.ts

@@ -1,123 +0,0 @@
-import { GitBookAPIError } from '@gitbook/api';
-import type { DataFetcherErrorData, DataFetcherResponse } from './types';
-
-export class DataFetcherError extends Error {
-    constructor(
-        message: string,
-        public readonly code: number
-    ) {
-        super(message);
-    }
-}
-
-/**
- * Throw an error if the response contains an error.
- */
-export function throwIfDataError<T>(response: DataFetcherResponse<T>): T;
-export function throwIfDataError<T>(response: Promise<DataFetcherResponse<T>>): Promise<T>;
-export function throwIfDataError<T>(
-    response: DataFetcherResponse<T> | Promise<DataFetcherResponse<T>>
-): T | Promise<T> {
-    if (response instanceof Promise) {
-        return response.then((result) => throwIfDataError(result));
-    }
-
-    if (response.error) {
-        throw new DataFetcherError(response.error.message, response.error.code);
-    }
-    return response.data;
-}
-
-/**
- * Get the data from the response or null if there is an "Not found" error.
- */
-export function getDataOrNull<T>(
-    response: DataFetcherResponse<T>,
-    ignoreErrors?: number[]
-): T | null;
-export function getDataOrNull<T>(
-    response: Promise<DataFetcherResponse<T>>,
-    ignoreErrors?: number[]
-): Promise<T | null>;
-export function getDataOrNull<T>(
-    response: DataFetcherResponse<T> | Promise<DataFetcherResponse<T>>,
-    ignoreErrors: number[] = [404]
-): T | null | Promise<T | null> {
-    if (response instanceof Promise) {
-        return response.then((result) => getDataOrNull(result, ignoreErrors));
-    }
-
-    if (response.error) {
-        if (ignoreErrors.includes(response.error.code)) return null;
-        throw new DataFetcherError(response.error.message, response.error.code);
-    }
-    return response.data;
-}
-
-/**
- * Ignore error for an API or data call.
- */
-export async function ignoreDataThrownError<T>(promise: Promise<T>): Promise<T | null> {
-    try {
-        return await promise;
-    } catch (error) {
-        getExposableError(error as Error);
-        return null;
-    }
-}
-
-/**
- * Ignore all errors for an API or data call.
- */
-export async function ignoreAllThrownError<T>(promise: Promise<T>): Promise<T | null> {
-    try {
-        return await promise;
-    } catch (error) {
-        console.warn('Ignoring error', error);
-        return null;
-    }
-}
-
-/**
- * Wrap an async execution to handle errors and return a DataFetcherResponse.
- */
-export async function wrapDataFetcherError<T>(
-    fn: () => Promise<T>
-): Promise<DataFetcherResponse<T>> {
-    try {
-        return { data: await fn() };
-    } catch (error) {
-        return {
-            error: getExposableError(error as Error),
-        };
-    }
-}
-
-/**
- * Get a data fetcher exposable error from a JS error.
- */
-export function getExposableError(error: Error): DataFetcherErrorData {
-    if (error instanceof GitBookAPIError) {
-        if (error.code >= 500) {
-            throw error;
-        }
-
-        return {
-            code: error.code,
-            message: error.errorMessage,
-        };
-    }
-
-    if (error instanceof DataFetcherError) {
-        if (error.code >= 500) {
-            throw error;
-        }
-
-        return {
-            code: error.code,
-            message: error.message,
-        };
-    }
-
-    throw error;
-}

packages/gitbook-v2/src/lib/data/pages.ts

@@ -1,30 +0,0 @@
-import type { JSONDocument, RevisionPageDocument, Space } from '@gitbook/api';
-import { getDataOrNull } from './errors';
-import type { GitBookDataFetcher } from './types';
-
-/**
- * Get the document for a page.
- */
-export async function getPageDocument(
-    dataFetcher: GitBookDataFetcher,
-    space: Space,
-    page: RevisionPageDocument
-): Promise<JSONDocument | null> {
-    if (page.documentId) {
-        return getDataOrNull(
-            dataFetcher.getDocument({ spaceId: space.id, documentId: page.documentId })
-        );
-    }
-    if ('computed' in page && page.computed) {
-        return getDataOrNull(
-            dataFetcher.getComputedDocument({
-                organizationId: space.organization,
-                spaceId: space.id,
-                source: page.computed,
-                seed: page.computedSeed,
-            })
-        );
-    }
-
-    return null;
-}

packages/gitbook-v2/src/lib/links.test.ts

@@ -1,94 +0,0 @@
-import { describe, expect, it } from 'bun:test';
-import { createLinker } from './links';
-
-const root = createLinker({
-    host: 'docs.company.com',
-    spaceBasePath: '/',
-    siteBasePath: '/',
-});
-
-const variantInSection = createLinker({
-    host: 'docs.company.com',
-    spaceBasePath: '/section/variant',
-    siteBasePath: '/',
-});
-
-const siteGitBookIO = createLinker({
-    host: 'org.gitbook.io',
-    spaceBasePath: '/sitename/variant/',
-    siteBasePath: '/sitename/',
-});
-
-describe('toPathInSpace', () => {
-    it('should return the correct path', () => {
-        expect(root.toPathInSpace('some/path')).toBe('/some/path');
-        expect(variantInSection.toPathInSpace('some/path')).toBe('/section/variant/some/path');
-    });
-
-    it('should handle leading slash', () => {
-        expect(root.toPathInSpace('/some/path')).toBe('/some/path');
-        expect(variantInSection.toPathInSpace('/some/path')).toBe('/section/variant/some/path');
-    });
-
-    it('should remove the trailing slash', () => {
-        expect(root.toPathInSpace('some/path/')).toBe('/some/path');
-        expect(variantInSection.toPathInSpace('some/path/')).toBe('/section/variant/some/path');
-    });
-
-    it('should not add a trailing slash', () => {
-        expect(root.toPathInSpace('')).toBe('');
-        expect(variantInSection.toPathInSpace('')).toBe('/section/variant');
-    });
-});
-
-describe('toPathInSite', () => {
-    it('should return the correct path', () => {
-        expect(root.toPathInSite('some/path')).toBe('/some/path');
-        expect(siteGitBookIO.toPathInSite('some/path')).toBe('/sitename/some/path');
-    });
-
-    it('should remove the trailing slash', () => {
-        expect(root.toPathInSite('some/path/')).toBe('/some/path');
-        expect(siteGitBookIO.toPathInSite('some/path/')).toBe('/sitename/some/path');
-    });
-
-    it('should not add a trailing slash', () => {
-        expect(root.toPathInSite('')).toBe('');
-        expect(siteGitBookIO.toPathInSite('')).toBe('/sitename');
-    });
-});
-
-describe('toRelativePathInSite', () => {
-    it('should return the correct path', () => {
-        expect(root.toRelativePathInSite('/some/path')).toBe('some/path');
-        expect(siteGitBookIO.toRelativePathInSite('/sitename/some/path')).toBe('some/path');
-    });
-
-    it('should preserve absolute paths outside of the site', () => {
-        expect(siteGitBookIO.toRelativePathInSite('/outside/some/path')).toBe('/outside/some/path');
-    });
-});
-
-describe('toAbsoluteURL', () => {
-    it('should return the correct path', () => {
-        expect(root.toAbsoluteURL('some/path')).toBe('https://docs.company.com/some/path');
-        expect(variantInSection.toAbsoluteURL('some/path')).toBe(
-            'https://docs.company.com/some/path'
-        );
-    });
-});
-
-describe('toLinkForContent', () => {
-    it('should return the correct path', () => {
-        expect(root.toLinkForContent('https://docs.company.com/some/path')).toBe('/some/path');
-        expect(siteGitBookIO.toLinkForContent('https://org.gitbook.io/sitename/some/path')).toBe(
-            '/sitename/some/path'
-        );
-    });
-
-    it('should preserve an absolute URL if the site is not the same', () => {
-        expect(siteGitBookIO.toLinkForContent('https://org.gitbook.io/anothersite/some/path')).toBe(
-            'https://org.gitbook.io/anothersite/some/path'
-        );
-    });
-});

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

@@ -1,116 +0,0 @@
-import { CustomizationThemeMode } from '@gitbook/api';
-import { headers } from 'next/headers';
-import type { SiteURLData } from './context';
-
-export enum MiddlewareHeaders {
-    /**
-     * Type of the route (static or dynamic)
-     */
-    RouteType = 'x-gitbook-route-type',
-
-    /**
-     * The URL of the site (without the pathname)
-     */
-    SiteURL = 'x-gitbook-site-url',
-
-    /**
-     * The data associated with the URL.
-     */
-    SiteURLData = 'x-gitbook-site-url-data',
-
-    /**
-     * The mode of the URL (url or url-host)
-     */
-    URLMode = 'x-gitbook-url-mode',
-
-    /**
-     * The theme of the page (light or dark)
-     */
-    Theme = 'x-gitbook-theme',
-
-    /**
-     * The customization override to apply.
-     */
-    Customization = 'x-gitbook-customization',
-
-    /**
-     * The API token used to fetch the content.
-     * This should only be passed for non-site dynamic routes.
-     */
-    APIToken = 'x-gitbook-api-token',
-}
-
-/**
- * Get the URL mode from the middleware headers.
- * This function should only be called in a server action or a dynamic route.
- */
-export async function getURLModeFromMiddleware(): Promise<'url' | 'url-host'> {
-    const headersList = await headers();
-    const mode = headersList.get(MiddlewareHeaders.URLMode);
-    if (!mode) {
-        throw new Error('URL mode is not set by the middleware');
-    }
-
-    return mode as 'url' | 'url-host';
-}
-
-/**
- * Get the site URL data from the middleware headers.
- * This function should only be called in a server action or a dynamic route.
- */
-export async function getSiteURLDataFromMiddleware(): Promise<SiteURLData> {
-    const headersList = await headers();
-    const siteURLData = headersList.get(MiddlewareHeaders.SiteURLData);
-
-    if (!siteURLData) {
-        throw new Error(
-            'Site URL data is not set by the middleware. This should only be called in a server action or a dynamic route.'
-        );
-    }
-
-    return JSON.parse(siteURLData);
-}
-
-/**
- * Get the URL from the middleware headers.
- * This function should only be called in a server action or a dynamic route.
- */
-export async function getSiteURLFromMiddleware(): Promise<string> {
-    const headersList = await headers();
-    const siteURL = headersList.get(MiddlewareHeaders.SiteURL);
-    if (!siteURL) {
-        throw new Error('URL mode is not set by the middleware');
-    }
-
-    return siteURL;
-}
-
-/**
- * For preview, the theme can be set via query string (?theme=light).
- * This function should only be called in a dynamic route.
- */
-export async function getThemeFromMiddleware() {
-    const headersList = await headers();
-    const queryStringTheme = headersList.get(MiddlewareHeaders.Theme);
-    if (!queryStringTheme) {
-        return null;
-    }
-
-    return queryStringTheme === 'light'
-        ? CustomizationThemeMode.Light
-        : CustomizationThemeMode.Dark;
-}
-
-/**
- * Get the API token from the middleware headers.
- * This function should only be called in a dynamic route.
- */
-export async function getAPITokenFromMiddleware(): Promise<string> {
-    const headersList = await headers();
-    const apiToken = headersList.get(MiddlewareHeaders.APIToken);
-    if (!apiToken) {
-        throw new Error('API token is not set by the middleware');
-    }
-
-    return apiToken;
-}

packages/gitbook-v2/src/lib/proxy.test.ts

@@ -1,21 +0,0 @@
-import { describe, expect, it } from 'bun:test';
-import { getProxyRequestIdentifier, isProxyRequest } from './proxy';
-
-describe('isProxyRequest', () => {
-    it('should return true for proxy requests', () => {
-        const proxyRequestURL = new URL('https://proxy.gitbook.site/sites/site_foo/hello/world');
-        expect(isProxyRequest(proxyRequestURL)).toBe(true);
-    });
-
-    it('should return false for non-proxy requests', () => {
-        const nonProxyRequestURL = new URL('https://example.com/docs/foo/hello/world');
-        expect(isProxyRequest(nonProxyRequestURL)).toBe(false);
-    });
-});
-
-describe('getProxyRequestIdentifier', () => {
-    it('should return the correct identifier for proxy requests', () => {
-        const proxyRequestURL = new URL('https://proxy.gitbook.site/sites/site_foo/hello/world');
-        expect(getProxyRequestIdentifier(proxyRequestURL)).toBe('sites/site_foo');
-    });
-});

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

@@ -1,15 +0,0 @@
-/**
- * Check if the request to the site was through a proxy.
- */
-export function isProxyRequest(requestURL: URL): boolean {
-    return (
-        requestURL.host === 'proxy.gitbook.site' || requestURL.host === 'proxy.gitbook-staging.site'
-    );
-}
-
-export function getProxyRequestIdentifier(requestURL: URL): string {
-    // For proxy requests, we extract the site ID from the pathname
-    // e.g. https://proxy.gitbook.site/site/siteId/...
-    const pathname = requestURL.pathname.slice(1).split('/');
-    return pathname.slice(0, 2).join('/');
-}

packages/gitbook-v2/src/middleware.ts

@@ -1,498 +0,0 @@
-import { CustomizationThemeMode } from '@gitbook/api';
-import type { NextRequest } from 'next/server';
-import { NextResponse } from 'next/server';
-import rison from 'rison';
-
-import { getContentSecurityPolicy } from '@/lib/csp';
-import { validateSerializedCustomization } from '@/lib/customization';
-import { removeLeadingSlash, removeTrailingSlash } from '@/lib/paths';
-import {
-    type ResponseCookies,
-    getPathScopedCookieName,
-    getResponseCookiesForVisitorAuth,
-    getVisitorData,
-    normalizeVisitorAuthURL,
-} from '@/lib/visitors';
-import { serveResizedImage } from '@/routes/image';
-import {
-    DataFetcherError,
-    getPublishedContentByURL,
-    getVisitorAuthBasePath,
-    normalizeURL,
-    resolvePublishedContentByUrl,
-    throwIfDataError,
-} from '@v2/lib/data';
-import { isGitBookAssetsHostURL, isGitBookHostURL } from '@v2/lib/env';
-import { getImageResizingContextId } from '@v2/lib/images';
-import { MiddlewareHeaders } from '@v2/lib/middleware';
-import type { SiteURLData } from './lib/context';
-export const config = {
-    matcher: [
-        '/((?!_next/static|_next/image|~gitbook/static|~gitbook/revalidate|~gitbook/monitoring|~scalar/proxy).*)',
-    ],
-};
-
-type URLWithMode = { url: URL; mode: 'url' | 'url-host' };
-
-/**
- * Temporary list of hosts to test adaptive content using the new resolution API.
- */
-const ADAPTIVE_CONTENT_HOSTS = [
-    'docs.gitbook.com',
-    'adaptive-docs.gitbook-staging.com',
-    'enriched-content-playground.gitbook-staging.io',
-];
-
-export async function middleware(request: NextRequest) {
-    try {
-        const requestURL = new URL(request.url);
-
-        // Redirect to normalize the URL
-        const normalized = normalizeURL(requestURL);
-        if (normalized.toString() !== requestURL.toString()) {
-            return NextResponse.redirect(normalized.toString());
-        }
-
-        for (const handler of [serveSiteRoutes, serveSpacePDFRoutes]) {
-            const result = await handler(requestURL, request);
-            if (result) {
-                return result;
-            }
-        }
-
-        return NextResponse.next();
-    } catch (error) {
-        return serveErrorResponse(error as Error);
-    }
-}
-
-/**
- * Handle request that are targetting the site routes group.
- */
-async function serveSiteRoutes(requestURL: URL, request: NextRequest) {
-    const match = getSiteURLFromRequest(request);
-    if (!match) {
-        return null;
-    }
-
-    const { url: siteRequestURL, mode } = match;
-    const imagesContextId = getImageResizingContextId(siteRequestURL);
-
-    /**
-     * Serve image resizing requests (all requests containing `/~gitbook/image`).
-     * All URLs containing `/~gitbook/image` are rewritten to `/~gitbook/image`
-     * and serve from a single route handler.
-     *
-     * In GitBook v1: image resizing was done at the root of the hostname (docs.company.com/~gitbook/image)
-     * In GitBook v2: image resizing is done at the content level (docs.company.com/section/variant/~gitbook/image)
-     */
-    if (siteRequestURL.pathname.endsWith('/~gitbook/image')) {
-        return await serveResizedImage(request, {
-            imagesContextId: imagesContextId,
-        });
-    }
-
-    //
-    // Detect and extract the visitor authentication token from the request
-    //
-    const { visitorToken, unsignedClaims, visitorParamsCookie } = getVisitorData({
-        cookies: request.cookies.getAll(),
-        url: siteRequestURL,
-    });
-
-    const withAPIToken = async (apiToken: string | null) => {
-        const resolve = ADAPTIVE_CONTENT_HOSTS.includes(siteRequestURL.hostname)
-            ? resolvePublishedContentByUrl
-            : getPublishedContentByURL;
-        const siteURLData = await throwIfDataError(
-            resolve({
-                url: siteRequestURL.toString(),
-                visitorPayload: {
-                    jwtToken: visitorToken?.token ?? undefined,
-                    unsignedClaims,
-                },
-                // When the visitor auth token is pulled from the cookie, set redirectOnError when calling getPublishedContentByUrl to allow
-                // redirecting when the token is invalid as we could be dealing with stale token stored in the cookie.
-                // For example when the VA backend signature has changed but the token stored in the cookie is not yet expired.
-                redirectOnError: visitorToken?.source === 'visitor-auth-cookie',
-
-                // Use the API token passed in the request, if any
-                // as it could be used for .preview hostnames
-                apiToken,
-            })
-        );
-
-        const cookies: ResponseCookies = visitorParamsCookie
-            ? [
-                  // If visitor.* params were passed to the site URL, include a session cookie to persist these params across navigation.
-                  visitorParamsCookie,
-              ]
-            : [];
-
-        //
-        // Handle redirects
-        //
-        if ('redirect' in siteURLData) {
-            // biome-ignore lint/suspicious/noConsole: we want to log the redirect
-            console.log('redirect', siteURLData.redirect);
-            if (siteURLData.target === 'content') {
-                let contentRedirect = new URL(siteURLData.redirect, request.url);
-
-                // For content redirects, we redirect using the /url/:url format
-                // during development and testing in 'url' mode.
-                if (mode === 'url') {
-                    const urlObject = new URL(siteURLData.redirect);
-                    contentRedirect = new URL(
-                        `/url/${urlObject.host}${urlObject.pathname}${urlObject.search}`,
-                        request.url
-                    );
-                }
-
-                // Keep the same search params as the original request
-                // as it might contain a VA token
-                contentRedirect.search = request.nextUrl.search;
-
-                return NextResponse.redirect(contentRedirect);
-            }
-
-            return NextResponse.redirect(siteURLData.redirect);
-        }
-
-        cookies.push(
-            ...getResponseCookiesForVisitorAuth(
-                getVisitorAuthBasePath(siteRequestURL, siteURLData),
-                visitorToken
-            )
-        );
-
-        // We use the host/origin from the canonical URL to ensure the links are
-        // correctly generated when the site is proxied. e.g. https://proxy.gitbook.com/site/siteId/...
-        const siteCanonicalURL = new URL(siteURLData.canonicalUrl);
-
-        let incomingURL = requestURL;
-        // For cases where the site is proxied, we use the canonical URL
-        // as the incoming URL along with all the search params from the request.
-        if (mode !== 'url') {
-            incomingURL = siteCanonicalURL;
-            incomingURL.search = requestURL.search;
-        }
-        //
-        // Make sure the URL is clean of any va token after a successful lookup
-        // The token is stored in a cookie that is set on the redirect response
-        //
-        const incomingURLWithoutToken = normalizeVisitorAuthURL(incomingURL);
-        if (incomingURLWithoutToken.toString() !== incomingURL.toString()) {
-            return writeResponseCookies(
-                NextResponse.redirect(incomingURLWithoutToken.toString()),
-                cookies
-            );
-        }
-
-        //
-        // Render and serve the content
-        //
-
-        // The route is static, except when using dynamic parameters from query params
-        // (customization override, theme, etc)
-        let routeType: 'dynamic' | 'static' = 'static';
-
-        // We pick only stable data from the siteURL data to prevent re-rendering of
-        // the root layout when changing pages..
-        const stableSiteURLData: SiteURLData = {
-            site: siteURLData.site,
-            siteSection: siteURLData.siteSection,
-            siteSpace: siteURLData.siteSpace,
-            siteBasePath: siteURLData.siteBasePath,
-            basePath: siteURLData.basePath,
-            space: siteURLData.space,
-            organization: siteURLData.organization,
-            changeRequest: siteURLData.changeRequest,
-            revision: siteURLData.revision,
-            shareKey: siteURLData.shareKey,
-            apiToken: siteURLData.apiToken,
-            imagesContextId: imagesContextId,
-        };
-
-        const requestHeaders = new Headers(request.headers);
-        requestHeaders.set(MiddlewareHeaders.RouteType, routeType);
-        requestHeaders.set(MiddlewareHeaders.URLMode, mode);
-        requestHeaders.set(
-            MiddlewareHeaders.SiteURL,
-            `${siteCanonicalURL.origin}${siteURLData.basePath}`
-        );
-        requestHeaders.set(MiddlewareHeaders.SiteURLData, JSON.stringify(stableSiteURLData));
-
-        // Preview of customization/theme
-        const customization = siteRequestURL.searchParams.get('customization');
-        if (customization && validateSerializedCustomization(customization)) {
-            routeType = 'dynamic';
-            requestHeaders.set(MiddlewareHeaders.Customization, customization);
-        }
-        const theme = siteRequestURL.searchParams.get('theme');
-        if (theme === CustomizationThemeMode.Dark || theme === CustomizationThemeMode.Light) {
-            routeType = 'dynamic';
-            requestHeaders.set(MiddlewareHeaders.Theme, theme);
-        }
-
-        // We support forcing dynamic routes by setting a `gitbook-dynamic-route` cookie
-        // This is useful for testing dynamic routes.
-        if (request.cookies.has('gitbook-dynamic-route')) {
-            routeType = 'dynamic';
-        }
-
-        // Pass a x-forwarded-host and origin that are equal to ensure Next doesn't block server actions when proxied
-        requestHeaders.set('x-forwarded-host', request.nextUrl.host);
-        requestHeaders.set('origin', request.nextUrl.origin);
-
-        const siteURLWithoutProtocol = `${siteCanonicalURL.host}${siteURLData.basePath}`;
-        const { pathname, routeType: routeTypeFromPathname } = encodePathInSiteContent(
-            siteURLData.pathname
-        );
-        routeType = routeTypeFromPathname ?? routeType;
-
-        const route = [
-            'sites',
-            routeType,
-            mode,
-            encodeURIComponent(siteURLWithoutProtocol),
-            encodeURIComponent(
-                rison.encode(
-                    // rison can't encode undefined values
-                    Object.fromEntries(
-                        Object.entries(stableSiteURLData).filter(
-                            ([_, v]) => typeof v !== 'undefined'
-                        )
-                    )
-                )
-            ),
-            pathname,
-        ].join('/');
-
-        console.log(`rewriting ${request.nextUrl.toString()} to ${route}`);
-
-        const rewrittenURL = new URL(`/${route}`, request.nextUrl.toString());
-        const response = NextResponse.rewrite(rewrittenURL, {
-            request: {
-                headers: requestHeaders,
-            },
-        });
-
-        // Add Content Security Policy header
-        response.headers.set('content-security-policy', getContentSecurityPolicy());
-        // Basic security headers
-        response.headers.set('strict-transport-security', 'max-age=31536000');
-        response.headers.set('referrer-policy', 'no-referrer-when-downgrade');
-        response.headers.set('x-content-type-options', 'nosniff');
-        // Debug header
-        response.headers.set('x-gitbook-route-type', routeType);
-        response.headers.set('x-gitbook-route-site', siteURLWithoutProtocol);
-
-        return writeResponseCookies(response, cookies);
-    };
-
-    // For https://preview/<siteURL> requests,
-    if (siteRequestURL.hostname === 'preview') {
-        return serveWithQueryAPIToken(
-            // We scope the API token to the site ID.
-            `${siteRequestURL.hostname}/${requestURL.pathname.slice(1).split('/')[0]}`,
-            request,
-            withAPIToken
-        );
-    }
-
-    return withAPIToken(null);
-}
-
-/**
- * Serve routes for PDF export for a space: /~space/:spaceId/~gitbook/pdf
- */
-async function serveSpacePDFRoutes(requestURL: URL, request: NextRequest) {
-    const pathnameParts = requestURL.pathname.slice(1).split('/');
-    if (pathnameParts[0] !== '~space' && pathnameParts[0] !== '~site') {
-        return null;
-    }
-
-    return serveWithQueryAPIToken(
-        pathnameParts.slice(0, 2).join('/'),
-        request,
-        async (apiToken) => {
-            // Handle the rest with the router default logic
-            return NextResponse.next({
-                headers: {
-                    [MiddlewareHeaders.APIToken]: apiToken,
-                },
-            });
-        }
-    );
-}
-
-/**
- * Serve an error response.
- */
-function serveErrorResponse(error: Error) {
-    if (error instanceof DataFetcherError) {
-        return new Response(error.message, {
-            status: error.code,
-            headers: { 'content-type': 'text/plain' },
-        });
-    }
-
-    throw error;
-}
-
-/**
- * Server a response with an API token obtained from the query params.
- */
-async function serveWithQueryAPIToken(
-    scopePath: string,
-    request: NextRequest,
-    serve: (apiToken: string) => Promise<NextResponse>
-) {
-    // We store the API token in a cookie that is scoped to the specific route
-    // to avoid errors when multiple previews are opened in different tabs.
-    const cookieName = getPathScopedCookieName('gitbook-api-token', scopePath);
-
-    // Extract a potential GitBook API token passed in the request
-    // If found, we redirect to the same URL but with the token in the cookie
-    const queryAPIToken = request.nextUrl.searchParams.get('token');
-    if (queryAPIToken) {
-        request.nextUrl.searchParams.delete('token');
-        return writeResponseCookies(NextResponse.redirect(request.nextUrl.toString()), [
-            {
-                name: cookieName,
-                value: queryAPIToken,
-                options: {
-                    httpOnly: true,
-                    sameSite: process.env.NODE_ENV === 'production' ? 'none' : undefined,
-                    secure: process.env.NODE_ENV === 'production',
-                    maxAge: 60 * 60, // 1 hour
-                },
-            },
-        ]);
-    }
-
-    const apiToken = request.cookies.get(cookieName)?.value;
-    if (!apiToken) {
-        throw new DataFetcherError('Missing API token', 400);
-    }
-
-    return serve(apiToken);
-}
-
-/**
- * The URL of the GitBook content can be passed in 3 different ways (in order of priority):
- * - The request has a `X-GitBook-URL` header:
- *      URL is taken from the header.
- * - The request has a `X-Forwarded-Host` header:
- *      Host is taken from the header, pathname is taken from the request URL.
- * - The request URL is matching `/url/:url`:
- *      URL is taken from the pathname.
- */
-function getSiteURLFromRequest(request: NextRequest): URLWithMode | null {
-    const xGitbookUrl = request.headers.get('x-gitbook-url');
-    if (xGitbookUrl) {
-        return {
-            url: appendQueryParams(new URL(xGitbookUrl), request.nextUrl.searchParams),
-            mode: 'url-host',
-        };
-    }
-
-    const isMainHost = isGitBookHostURL(request.url);
-    const isAssetsHost = isGitBookAssetsHostURL(request.url);
-
-    // /url/:url requests on the main host
-    const prefix = '/url/';
-    if (isMainHost && request.nextUrl.pathname.startsWith(prefix)) {
-        return {
-            url: appendQueryParams(
-                new URL(`https://${request.nextUrl.pathname.slice(prefix.length)}`),
-                request.nextUrl.searchParams
-            ),
-            mode: 'url',
-        };
-    }
-
-    // Skip other requests to main hosts
-    if (isMainHost || isAssetsHost) {
-        return null;
-    }
-
-    const xForwardedHost = request.headers.get('x-forwarded-host');
-    // The x-forwarded-host is set by Vercel for all requests
-    // so we ignore it if the hostname is the same as the instance one.
-    if (xForwardedHost) {
-        return {
-            url: appendQueryParams(
-                new URL(`https://${xForwardedHost}${request.nextUrl.pathname}`),
-                request.nextUrl.searchParams
-            ),
-            mode: 'url-host',
-        };
-    }
-
-    return null;
-}
-
-/**
- * Encode path in a site content.
- * Special paths are not encoded and passed to be handled by the route handlers.
- */
-function encodePathInSiteContent(rawPathname: string): {
-    pathname: string;
-    routeType?: 'static' | 'dynamic';
-} {
-    const pathname = removeLeadingSlash(removeTrailingSlash(rawPathname));
-
-    if (pathname.match(/^~gitbook\/ogimage\/\S+$/)) {
-        return { pathname };
-    }
-
-    // If the pathname is a markdown file, we rewrite it to ~gitbook/markdown/:pathname
-    if (pathname.match(/\.md$/)) {
-        const pagePathWithoutMD = pathname.slice(0, -3);
-        return {
-            pathname: `~gitbook/markdown/${encodeURIComponent(pagePathWithoutMD)}`,
-            // The markdown content is always static and doesn't depend on the dynamic parameter (customization, theme, etc)
-            routeType: 'static',
-        };
-    }
-
-    switch (pathname) {
-        case '~gitbook/icon':
-            return { pathname };
-        case 'llms.txt':
-        case 'sitemap.xml':
-        case 'sitemap-pages.xml':
-        case 'robots.txt':
-            // LLMs.txt, sitemap, sitemap-pages and robots.txt are always static
-            // as they only depend on the site structure / pages.
-            return { pathname, routeType: 'static' };
-        case '~gitbook/pdf':
-            // PDF routes are always dynamic as they depend on the search params.
-            return { pathname, routeType: 'dynamic' };
-        default:
-            return { pathname: encodeURIComponent(pathname || '/') };
-    }
-}
-
-/**
- * Append all the query params from a URL to another URL.
- */
-function appendQueryParams(url: URL, from: URLSearchParams) {
-    for (const [key, value] of from.entries()) {
-        url.searchParams.set(key, value);
-    }
-
-    return url;
-}
-
-/**
- * Write the cookies to a response.
- */
-function writeResponseCookies<R extends NextResponse>(response: R, cookies: ResponseCookies): R {
-    cookies.forEach((cookie) => {
-        response.cookies.set(cookie.name, cookie.value, cookie.options);
-    });
-
-    return response;
-}

packages/gitbook-v2/tailwind.config.ts

@@ -1,10 +0,0 @@
-import config from '../gitbook/tailwind.config';
-
-export default {
-    ...config,
-    content: [
-        '../gitbook/src/pages/**/*.{js,ts,jsx,tsx,mdx}',
-        '../gitbook/src/components/**/*.{js,ts,jsx,tsx,mdx}',
-        '../gitbook/src/app/**/*.{js,ts,jsx,tsx,mdx}',
-    ],
-};