Add loading indicator

2026-09-16 07:35:16 +00:00 · 2025-03-26 21:48:33 +01:00
333 changed files with 4008 additions and 11653 deletions
@@ -1,5 +0,0 @@
---
-"gitbook": minor
---
-
-Fix images in reusable content across spaces.
@@ -1,5 +0,0 @@
---
-'gitbook': patch
---
-
-Fix openapi-select hover in responses
@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix OpenAPI tabs indicator overflow
@@ -2,4 +2,4 @@
 '@gitbook/react-openapi': patch
 ---

-Handle invalid OpenAPI Responses
+Fix XML in code sample
@@ -1,5 +0,0 @@
---
-"@gitbook/colors": patch
---
-
-Update chroma ratio per step
@@ -1,5 +0,0 @@
---
-"gitbook-v2": patch
---
-
-Only resize images with supported extensions.
@@ -1,5 +0,0 @@
---
-"gitbook": patch
---
-
-Decrease rounding of header logo
@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Fix favicon not being displayed in Google because `robots.txt` was preventing the indexation of the image route
@@ -1,6 +0,0 @@
---
-"gitbook-v2": patch
-"gitbook": patch
---
-
-Fix URL in sitemap
@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Disallow crawling by web-robots of search/ask URLs
@@ -1,6 +0,0 @@
---
-"@gitbook/react-openapi": minor
-"gitbook": minor
---
-
-Design tweaks to code blocks and OpenAPI pages
@@ -1,8 +0,0 @@
---
-"@gitbook/react-openapi": patch
-"gitbook-v2": patch
-"gitbook": patch
-"@gitbook/colors": patch
---
-
-Fix code highlighting for HTTP
@@ -0,0 +1,5 @@
+---
+'@gitbook/react-openapi': patch
+---
+
+Safe parse OpenAPI JSON schema
@@ -3,4 +3,4 @@
 'gitbook': patch
 ---

-Fix openapi CR preview
+Fix multiple request examples selector not showing
@@ -1,5 +0,0 @@
---
-"gitbook-v2": patch
---
-
-Fix crash on Cloudflare by using latest stable version of Next.js instead of canary
@@ -1,5 +0,0 @@
---
-"gitbook": patch
---
-
-Fix resolution of links in reusable contents
@@ -0,0 +1,5 @@
+---
+"gitbook": minor
+---
+
+Support site announcement banner
@@ -1,6 +0,0 @@
---
-"gitbook-v2": minor
-"gitbook": minor
---
-
-Add support for reusable content across spaces.
@@ -1,5 +0,0 @@
---
-"gitbook": patch
---
-
-Better print layouts: wrap code blocks & force table column auto-sizing
@@ -1,5 +0,0 @@
---
-"gitbook": patch
---
-
-Fix invalid sitemap.xml generated with relative URLs instead of absolute ones
@@ -1,5 +0,0 @@
---
-"gitbook": patch
---
-
-Change OpenAPI schema-optional from `info` to `tint` color
@@ -1,5 +0,0 @@
---
-"@gitbook/colors": patch
---
-
-Change lightness check for color step 9 to allow input colors with a higher-than-needed contrast
@@ -1,6 +0,0 @@
---
-'@gitbook/react-openapi': patch
-'gitbook': patch
---
-
-Fix schemas disclosure label causing client error
@@ -1,5 +0,0 @@
---
-'@gitbook/react-openapi': patch
---
-
-Missing top-level required OpenAPI alternatives
@@ -1,5 +0,0 @@
---
-'@gitbook/react-openapi': patch
---
-
-Handle OpenAPI alternatives from schema.items
@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Fix a crash when a page contains a block of an integration that is no longer installed
@@ -1,5 +0,0 @@
---
-"gitbook-v2": patch
---
-
-Improve error messages around undefined site sections.
@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Fix flash when loading sites with dark mode as default theme
@@ -0,0 +1,6 @@
+---
+"@gitbook/react-openapi": patch
+"gitbook": patch
+---
+
+Fix spec properties rendering and missing keys
@@ -1,6 +0,0 @@
---
-"gitbook-v2": patch
-"gitbook": patch
---
-
-Increase logging around caching behaviour causing page crashes.
@@ -1,5 +0,0 @@
---
-'@gitbook/react-openapi': patch
---
-
-Use default value if string number or boolean in generateSchemaExample
@@ -1,5 +0,0 @@
---
-"gitbook": patch
---
-
-Prevent section group popovers from opening on click
@@ -1,6 +0,0 @@
---
-"gitbook": patch
-"gitbook-v2": patch
---
-
-Update the regex for validating site redirect
@@ -1,5 +0,0 @@
---
-"gitbook": patch
---
-
-Always link main logo to the root of the site
@@ -1,5 +0,0 @@
---
-"gitbook": patch
---
-
-Change `Dropdown`s to use Radix's `DropdownMenu`
@@ -1,5 +0,0 @@
---
-"@gitbook/react-openapi": patch
---
-
-Fix Python code sample "null vs None"
@@ -1,5 +0,0 @@
---
-"gitbook": patch
---
-
-Add border to filled sidebar on gradient theme
@@ -1,6 +0,0 @@
---
-"gitbook-v2": minor
-"gitbook": minor
---
-
-Pass SVG images through image resizing without resizing them to serve them from optimal host.
@@ -0,0 +1,5 @@
+---
+'@gitbook/react-openapi': patch
+---
+
+Replace $ref with $reference in json-decycle
@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Trim the search query to avoid showing a loading state when typing
@@ -1,6 +0,0 @@
---
-"gitbook": patch
-"gitbook-v2": patch
---
-
-Revert investigation work around URL caches.
@@ -1,5 +0,0 @@
---
-"gitbook": patch
---
-
-Fix OpenAPI disclosure label ("Show properties") misalignment on mobile
@@ -63,9 +63,9 @@ To start your local version of GitBook, run the command `bun dev`.

 When running the development server, published GitBook sites can be rendered through your local version at `http://localhost:3000/`.

-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/docs.gitbook.com` 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.
+You can visit any published GitBook site behind your development server. Please make sure your site is [published publicly](https://docs.gitbook.com/published-documentation/publish-your-content-as-a-docs-site) to ensure you can view the site correctly in your development version.

 ### Commit your update

@@ -19,12 +19,6 @@ inputs:
  deploy:
    description: 'Deploy as main version for all traffic instead of uploading versions'
    required: true
-  commitTag:
-    description: 'Commit branch to associate with the deployment'
-    required: true
-  commitMessage:
-    description: 'Commit message to associate with the deployment'
-    required: true
 outputs:
    deployment-url: 
      description: "Deployment URL"
@@ -55,13 +49,10 @@ runs:
            GITBOOK_INTEGRATIONS_HOST: ${{ inputs.opItem }}/GITBOOK_INTEGRATIONS_HOST
            GITBOOK_IMAGE_RESIZE_SIGNING_KEY: ${{ inputs.opItem }}/GITBOOK_IMAGE_RESIZE_SIGNING_KEY
            GITBOOK_IMAGE_RESIZE_URL: ${{ inputs.opItem }}/GITBOOK_IMAGE_RESIZE_URL
-            GITBOOK_IMAGE_RESIZE_MODE: ${{ inputs.opItem }}/GITBOOK_IMAGE_RESIZE_MODE
            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
-          env:
-            GITBOOK_RUNTIME: cloudflare
          shell: bash
        - id: deploy
          name: Deploy to Cloudflare
@@ -70,9 +61,9 @@ runs:
              apiToken: ${{ inputs.apiToken }}
              accountId: ${{ inputs.accountId }}
              workingDirectory: ./
-              wranglerVersion: '4.10.0'
+              wranglerVersion: '3.112.0'
              environment: ${{ inputs.environment }}
-              command: ${{ inputs.deploy == 'true' && 'deploy' || format('versions upload --tag {0} --message "{1}"', inputs.commitTag, inputs.commitMessage) }} --config ./packages/gitbook-v2/wrangler.jsonc
+              command: ${{ fromJSON(inputs.deploy) == true && 'deploy' || 'versions upload' }} --config ./packages/gitbook-v2/wrangler.toml
        - name: Outputs
          shell: bash
          env:
@@ -54,7 +54,6 @@ runs:
            GITBOOK_INTEGRATIONS_HOST: ${{ inputs.opItem }}/GITBOOK_INTEGRATIONS_HOST
            GITBOOK_IMAGE_RESIZE_SIGNING_KEY: ${{ inputs.opItem }}/GITBOOK_IMAGE_RESIZE_SIGNING_KEY
            GITBOOK_IMAGE_RESIZE_URL: ${{ inputs.opItem }}/GITBOOK_IMAGE_RESIZE_URL
-            GITBOOK_IMAGE_RESIZE_MODE: ${{ inputs.opItem }}/GITBOOK_IMAGE_RESIZE_MODE
            GITBOOK_ASSETS_PREFIX: ${{ inputs.opItem }}/GITBOOK_ASSETS_PREFIX
            GITBOOK_FONTS_URL: ${{ inputs.opItem }}/GITBOOK_FONTS_URL
        - name: Build Project Artifacts
@@ -63,7 +62,6 @@ runs:
          env:
            VERCEL_ORG_ID: ${{ inputs.vercelOrg }}
            VERCEL_PROJECT_ID: ${{ inputs.vercelProject }}
-            GITBOOK_RUNTIME: vercel
        - name: Deploy Project Artifacts to Vercel
          id: deploy
          shell: bash
@@ -10,7 +10,7 @@ jobs:
    deploy-v1-cloudflare:
        name: Deploy v1 to Cloudflare Pages
        runs-on: ubuntu-latest
-        environment:
+        environment: 
          name: ${{ github.ref == 'refs/heads/main' && '1c-production' || '1c-preview' }}
          url: ${{ steps.deploy.outputs.deployment-url }}
        permissions:
@@ -40,7 +40,6 @@ jobs:
              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
@@ -57,7 +56,7 @@ jobs:
    deploy-v2-vercel:
        name: Deploy v2 to Vercel (preview)
        runs-on: ubuntu-latest
-        environment:
+        environment: 
          name: 2v-preview
          url: ${{ steps.deploy.outputs.deployment-url }}
        outputs:
@@ -78,11 +77,11 @@ jobs:
    deploy-v2-cloudflare:
        name: Deploy v2 to Cloudflare Worker (preview)
        runs-on: ubuntu-latest
-        environment:
+        environment: 
          name: 2c-preview
          url: ${{ steps.deploy.outputs.deployment-url }}
        outputs:
-            deployment-url: ${{ steps.deploy.outputs.deployment-url || steps.extract-worker-id.outputs.worker-url }}
+            deployment-url: ${{ steps.deploy.outputs.deployment-url }}
        steps:
            - name: Checkout
              uses: actions/checkout@v4
@@ -96,19 +95,9 @@ jobs:
                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
                  opItem: op://gitbook-open/2c-preview
                  opServiceAccount: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
-                  commitTag: ${{ github.ref == 'refs/heads/main' && 'main' || format('pr{0}', github.event.pull_request.number) }}
-                  commitMessage: ${{ github.sha }}
-            - name: Extract Worker ID
-              id: extract-worker-id
-              if: ${{ !steps.deploy.outputs.deployment-url }}
-              run: |
-                if [[ "${{ steps.deploy.outputs.command-output }}" =~ Worker\ Version\ ID:\ ([0-9a-f]{8})-([0-9a-f-]+) ]]; then
-                  WORKER_ID_FIRST_PART="${BASH_REMATCH[1]}"
-                  echo "worker-url=https://${WORKER_ID_FIRST_PART}-gitbook-open-v2-preview.gitbook.workers.dev/" >> $GITHUB_OUTPUT
-                fi
            - name: Outputs
              run: |
-                  echo "URL: ${{ steps.deploy.outputs.deployment-url || steps.extract-worker-id.outputs.worker-url }}"
+                  echo "URL: ${{ steps.deploy.outputs.deployment-url }}"
    comment-deployments:
        runs-on: ubuntu-latest
        name: Comment Deployments (preview)
@@ -134,14 +123,14 @@ jobs:
                  body: |
                      Summary of the deployments:

-                      ### Version 1
+                      ### Version 1 (production)

                      | 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 2 (experimental)

                      | Version | URL | Status |
                      | --- | --- | --- |
@@ -150,10 +139,10 @@ 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 | v1 | v2 |
+                      | --- | --- | --- |
+                      | GitBook | [${{ needs.deploy-v1-cloudflare.outputs.deployment-url }}/docs.gitbook.com](${{ needs.deploy-v1-cloudflare.outputs.deployment-url }}/docs.gitbook.com) | [${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/docs.gitbook.com](${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/docs.gitbook.com) |
+                      | 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) |
                  edit-mode: replace
    visual-testing-v1:
        runs-on: ubuntu-latest
@@ -195,32 +184,11 @@ jobs:
                  SITE_BASE_URL: ${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/
                  ARGOS_TOKEN: ${{ secrets.ARGOS_TOKEN }}
                  ARGOS_BUILD_NAME: 'v2-vercel'
-    visual-testing-v2-cloudflare:
-        runs-on: ubuntu-latest
-        name: Visual Testing v2 (Cloudflare)
-        needs: deploy-v2-cloudflare
-        timeout-minutes: 10
-        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-v2-cloudflare.outputs.deployment-url }}
-                  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
+        timeout-minutes: 6
        steps:
            - name: Checkout
              uses: actions/checkout@v4
@@ -240,7 +208,7 @@ jobs:
        runs-on: ubuntu-latest
        name: Visual Testing Customers v2
        needs: deploy-v2-vercel
-        timeout-minutes: 8
+        timeout-minutes: 6
        steps:
            - name: Checkout
              uses: actions/checkout@v4
@@ -257,27 +225,6 @@ jobs:
                  SITE_BASE_URL: ${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/
                  ARGOS_TOKEN: ${{ secrets.ARGOS_TOKEN }}
                  ARGOS_BUILD_NAME: 'customers-v2'
-    visual-testing-customers-v2-cloudflare:
-        runs-on: ubuntu-latest
-        name: Visual Testing Customers v2 (Cloudflare)
-        needs: deploy-v2-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-v2-cloudflare.outputs.deployment-url }}
-                  SITE_BASE_URL: ${{ needs.deploy-v2-cloudflare.outputs.deployment-url }}/url/
-                  ARGOS_TOKEN: ${{ secrets.ARGOS_TOKEN }}
-                  ARGOS_BUILD_NAME: 'customers-v2'
    pagespeed-testing-v1:
        runs-on: ubuntu-latest
        name: PageSpeed Testing v1
@@ -17,7 +17,7 @@ jobs:
        steps:
            - name: Checkout
              uses: actions/checkout@v4
-            - name: Deploy
+            - name: Deploy staging
              id: deploy
              uses: ./.github/composite/deploy-vercel
              with:
@@ -48,8 +48,6 @@ jobs:
                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
                  opItem: op://gitbook-open/2c-production
                  opServiceAccount: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
-                  commitTag: main
-                  commitMessage: ${{ github.sha }}
            - name: Outputs
              run: |
                  echo "URL: ${{ steps.deploy.outputs.deployment-url }}"
@@ -17,7 +17,7 @@ jobs:
        steps:
            - name: Checkout
              uses: actions/checkout@v4
-            - name: Deploy
+            - name: Deploy staging
              id: deploy
              uses: ./.github/composite/deploy-vercel
              with:
@@ -48,8 +48,6 @@ jobs:
                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
                  opItem: op://gitbook-open/2c-staging
                  opServiceAccount: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
-                  commitTag: main
-                  commitMessage: ${{ github.sha }}
            - name: Outputs
              run: |
                  echo "URL: ${{ steps.deploy.outputs.deployment-url }}"
@@ -9,7 +9,6 @@
    ],
    "tailwindCSS.classAttributes": ["class", "className", "style", ".*Style"],
    "prettier.enable": false,
-    "editor.formatOnSave": true,
    "editor.defaultFormatter": "biomejs.biome",
    "editor.codeActionsOnSave": {
        "source.organizeImports.biome": "explicit",
@@ -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://gitbook.com/docs/developers">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://docs.gitbook.com/">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> 
 </p>

 <p align="center">
@@ -59,15 +59,15 @@ 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/`.

 examples:

-   http://localhost:3000/url/gitbook.com/docs
-   http://localhost:3000/url/open-source.gitbook.io/midjourney
+-   http://localhost:3000/docs.gitbook.com
+-   http://localhost:3000/open-source.gitbook.io/midjourney

 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.

@@ -118,7 +118,7 @@ Encounter a bug or find an issue you'd like to fix? Helping us fix issues relate

 ## Deployment

-> [!WARNING]
+> [!WARNING]  
 > While it is possible to self-host this project, we do not recommend this unless you are certain this option fits your need.
 >
 > _Looking to add a specific feature in GitBook? Head to our [contributing guide](https://github.com/GitbookIO/gitbook/blob/main/.github/CONTRIBUTING.md) to get started._
@@ -20,8 +20,7 @@
            "**/.wrangler/**/*",
            "packages/openapi-parser/src/fixtures/**/*",
            "packages/emoji-codepoints/index.ts",
-            "packages/icons/src/data/*.json",
-            "packages/cache-do/worker-configuration.d.ts"
+            "packages/icons/src/data/*.json"
        ]
    },
    "formatter": {
@@ -4,15 +4,15 @@
    "devDependencies": {
        "@biomejs/biome": "^1.9.4",
        "@changesets/cli": "^2.27.12",
-        "turbo": "^2.5.0",
+        "turbo": "^2.4.4",
        "vercel": "^39.3.0"
    },
-    "packageManager": "bun@1.2.8",
+    "packageManager": "bun@1.2.5",
    "overrides": {
        "@codemirror/state": "6.4.1",
-        "@gitbook/api": "^0.115.0",
-        "react": "^19.0.0",
-        "react-dom": "^19.0.0"
+        "react": "18.3.1",
+        "react-dom": "18.3.1",
+        "@gitbook/api": "0.102.0"
    },
    "private": true,
    "scripts": {
@@ -21,10 +21,10 @@
    },
    "devDependencies": {
        "typescript": "^5.5.3",
-        "wrangler": "^4.10.0"
+        "wrangler": "^3.112.0"
    },
    "scripts": {
-        "generate": "wrangler types",
+        "generate": "wrangler types --experimental-include-runtime",
        "build": "tsc",
        "typecheck": "tsc --noEmit",
        "dev": "tsc -w",
@@ -14,7 +14,7 @@
        "resolveJsonModule": true,
        "isolatedModules": true,
        "incremental": true,
-        "types": ["./worker-configuration.d.ts"]
+        "types": ["./.wrangler/types/runtime.d.ts"]
    },
    "include": ["src/**/*.ts"],
    "exclude": ["node_modules"]
@@ -1,8 +0,0 @@
-{
-    "extends": ["//"],
-    "tasks": {
-        "generate": {
-            "outputs": ["worker-configuration.d.ts"]
-        }
-    }
-}
@@ -1,17 +1,5 @@
 # @gitbook/cache-tags

-## 0.3.1
-
-### Patch Changes
-
- 77397ca: Fix version of @gitbook/api referenced in package.json
-
-## 0.3.0
-
-### Minor Changes
-
- 116575c: Improve typing of getComputedContentSourceCacheTags to match latest API specification
-
 ## 0.2.0

 ### Minor Changes
@@ -8,9 +8,9 @@
            "default": "./dist/index.js"
        }
    },
-    "version": "0.3.1",
+    "version": "0.2.0",
    "dependencies": {
-        "@gitbook/api": "^0.115.0",
+        "@gitbook/api": "*",
        "assert-never": "^1.2.1"
    },
    "devDependencies": {
@@ -60,7 +60,7 @@ export function getCacheTag(
        | {
              tag: 'computed-document';
              space: string;
-              sourceType: string;
+              integration: string;
          }
        /**
         * All data related to the URL of a content
@@ -84,14 +84,6 @@ export function getCacheTag(
              organization: string;
              openAPISpec: string;
          }
-        /**
-         * All data related to a translation
-         */
-        | {
-              tag: 'translation';
-              organization: string;
-              translationSettings: string;
-          }
 ): string {
    switch (spec.tag) {
        case 'user':
@@ -107,15 +99,13 @@ export function getCacheTag(
        case 'document':
            return `space:${spec.space}:document:${spec.document}`;
        case 'computed-document':
-            return `space:${spec.space}:computed-document:${spec.sourceType}`;
+            return `space:${spec.space}:computed-document:${spec.integration}`;
        case 'site':
            return `site:${spec.site}`;
        case 'integration':
            return `integration:${spec.integration}`;
        case 'openapi':
            return `organization:${spec.organization}:openapi:${spec.openAPISpec}`;
-        case 'translation':
-            return `organization:${spec.organization}:translation:${spec.translationSettings}`;
        default:
            assertNever(spec);
    }
@@ -167,15 +157,6 @@ export function getComputedContentSourceCacheTags(
                        })
                    );
                    break;
-                case 'translation-language':
-                    tags.push(
-                        getCacheTag({
-                            tag: 'translation',
-                            organization: inContext.organizationId,
-                            translationSettings: dependency.ref.translationSettings,
-                        })
-                    );
-                    break;
                default:
                    // Do not throw for unknown dependency types
                    // as it might mean we are lacking behind the API version
@@ -188,22 +169,18 @@ export function getComputedContentSourceCacheTags(
            getCacheTag({
                tag: 'computed-document',
                space: inContext.spaceId,
-                sourceType: source.type,
+                integration: source.integration,
            })
        );
    }

    // We invalidate the computed content when a new version of the integration is deployed.
-
-    if (source.type.startsWith('integration:')) {
-        const integration = source.type.split(':')[1];
-        tags.push(
-            getCacheTag({
-                tag: 'integration',
-                integration,
-            })
-        );
-    }
+    tags.push(
+        getCacheTag({
+            tag: 'integration',
+            integration: source.integration,
+        })
+    );

    return tags;
 }
@@ -1,17 +1,5 @@
 # @gitbook/colors

-## 0.3.2
-
-### Patch Changes
-
- cdffd7c: Desaturate text colors by decreasing chroma for the last steps of the color scale
-
-## 0.3.1
-
-### Patch Changes
-
- fb90eb0: Reduce chroma of first color scale step
-
 ## 0.3.0

 ### Minor Changes
@@ -8,7 +8,7 @@
            "default": "./dist/index.js"
        }
    },
-    "version": "0.3.2",
+    "version": "0.3.0",
    "devDependencies": {
        "typescript": "^5.5.3"
    },
@@ -214,31 +214,13 @@ export function colorScale(
        const targetL =
            foregroundColor.L * mapping[index] + backgroundColor.L * (1 - mapping[index]);

-        if (
-            index === 8 &&
-            !mix &&
-            (darkMode ? targetL - baseColor.L < 0.2 : baseColor.L - targetL < 0.2)
-        ) {
+        if (index === 8 && !mix && Math.abs(baseColor.L - targetL) < 0.2) {
            // Original colour is close enough to target, so let's use the original colour as step 9.
            result.push(hex);
            continue;
        }

-        const chromaRatio = (() => {
-            switch (index) {
-                // Step 9 and 10 have max chroma, meaning they are fully saturated.
-                case 8:
-                case 9:
-                    return 1;
-                // Step 11 and 12 have a reduced chroma
-                case 10:
-                    return 0.4;
-                case 11:
-                    return 0.1;
-                default:
-                    return index * 0.05;
-            }
-        })();
+        const chromaRatio = index < 8 ? (index + 1) * 0.05 : 1;

        const shade = {
            L: targetL, // Blend lightness
@@ -1,26 +1,5 @@
 # gitbook-v2

-## 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
@@ -7,6 +7,8 @@ const nextConfig = {
    experimental: {
        // This is needed to throw "forbidden" when the api token expired during revalidation
        authInterrupts: true,
+
+        // This is needed to use 'use cache'
        useCache: true,

        // Content is fully static, we can cache it in the session memory cache for a long time
@@ -31,9 +33,7 @@ const nextConfig = {
        GITBOOK_ASSETS_PREFIX: process.env.GITBOOK_ASSETS_PREFIX,
        GITBOOK_SECRET: process.env.GITBOOK_SECRET,
        GITBOOK_IMAGE_RESIZE_SIGNING_KEY: process.env.GITBOOK_IMAGE_RESIZE_SIGNING_KEY,
-        GITBOOK_IMAGE_RESIZE_MODE: process.env.GITBOOK_IMAGE_RESIZE_MODE,
        GITBOOK_FONTS_URL: process.env.GITBOOK_FONTS_URL,
-        GITBOOK_RUNTIME: process.env.GITBOOK_RUNTIME,

        // Next.js envs
        NEXT_SERVER_ACTIONS_ENCRYPTION_KEY: process.env.NEXT_SERVER_ACTIONS_ENCRYPTION_KEY,
@@ -53,24 +53,6 @@ const nextConfig = {
            },
        ],
    },
-
-    async headers() {
-        return [
-            {
-                source: '/~gitbook/static/:path*',
-                headers: [
-                    {
-                        key: 'Cache-Control',
-                        value: 'public, max-age=31536000, immutable',
-                    },
-                    {
-                        key: 'Access-Control-Allow-Origin',
-                        value: '*',
-                    },
-                ],
-            },
-        ];
-    },
 };

 export default nextConfig;
@@ -1,18 +1,10 @@
 import { defineCloudflareConfig } from '@opennextjs/cloudflare';
-import r2IncrementalCache from '@opennextjs/cloudflare/overrides/incremental-cache/r2-incremental-cache';
-import { withRegionalCache } from '@opennextjs/cloudflare/overrides/incremental-cache/regional-cache';
-import doQueue from '@opennextjs/cloudflare/overrides/queue/do-queue';
-import doShardedTagCache from '@opennextjs/cloudflare/overrides/tag-cache/do-sharded-tag-cache';
+import d1TagCache from '@opennextjs/cloudflare/d1-tag-cache';
+import kvIncrementalCache from '@opennextjs/cloudflare/kv-cache';
+import memoryQueue from '@opennextjs/cloudflare/memory-queue';

 export default defineCloudflareConfig({
-    incrementalCache: withRegionalCache(r2IncrementalCache, { mode: 'long-lived' }),
-    tagCache: doShardedTagCache({
-        baseShardSize: 12,
-        regionalCache: true,
-        shardReplication: {
-            numberOfSoftReplicas: 2,
-            numberOfHardReplicas: 1,
-        },
-    }),
-    queue: doQueue,
+    incrementalCache: kvIncrementalCache,
+    queue: memoryQueue,
+    tagCache: d1TagCache,
 });
@@ -1,23 +1,23 @@
 {
    "name": "gitbook-v2",
-    "version": "0.2.5",
+    "version": "0.2.2",
    "private": true,
    "dependencies": {
-        "@gitbook/api": "^0.115.0",
-        "@gitbook/cache-tags": "workspace:*",
-        "@sindresorhus/fnv1a": "^3.1.0",
-        "assert-never": "^1.2.1",
-        "jwt-decode": "^4.0.0",
-        "next": "^15.3.2",
+        "next": "^15.2.3",
        "react": "^19.0.0",
        "react-dom": "^19.0.0",
-        "rison": "^0.1.1",
+        "@gitbook/api": "*",
+        "@gitbook/cache-tags": "workspace:*",
+        "@sindresorhus/fnv1a": "^3.1.0",
        "server-only": "^0.0.1",
-        "warn-once": "^0.1.1"
+        "warn-once": "^0.1.1",
+        "rison": "^0.1.1",
+        "jwt-decode": "^4.0.0",
+        "p-memoize": "^7.1.1"
    },
    "devDependencies": {
        "gitbook": "*",
-        "@opennextjs/cloudflare": "^1.0.0-beta.3",
+        "@opennextjs/cloudflare": "^0.5.10",
        "@types/rison": "^0.0.9",
        "tailwindcss": "^3.4.0",
        "postcss": "^8"
@@ -28,7 +28,7 @@
        "build": "next build",
        "build:v2": "next build",
        "start": "next start",
-        "build:v2:cloudflare": "opennextjs-cloudflare build",
+        "build:v2:cloudflare": "opennextjs-cloudflare",
        "dev:v2:cloudflare": "wrangler dev --port 8771",
        "unit": "bun test",
        "typecheck": "tsc --noEmit"
@@ -0,0 +1,12 @@
+import type { NextRequest } from 'next/server';
+
+import { serveLLMsTxt } from '@/routes/llms';
+import { type RouteLayoutParams, getDynamicSiteContext } from '@v2/app/utils';
+
+export async function GET(
+    _request: NextRequest,
+    { params }: { params: Promise<RouteLayoutParams> }
+) {
+    const { context } = await getDynamicSiteContext(await params);
+    return serveLLMsTxt(context);
+}
@@ -0,0 +1,12 @@
+import type { NextRequest } from 'next/server';
+
+import { serveRobotsTxt } from '@/routes/robots';
+import { type RouteLayoutParams, getDynamicSiteContext } from '@v2/app/utils';
+
+export async function GET(
+    _request: NextRequest,
+    { params }: { params: Promise<RouteLayoutParams> }
+) {
+    const { context } = await getDynamicSiteContext(await params);
+    return serveRobotsTxt(context);
+}
@@ -0,0 +1,12 @@
+import type { NextRequest } from 'next/server';
+
+import { servePagesSitemap } from '@/routes/sitemap';
+import { type RouteLayoutParams, getDynamicSiteContext } from '@v2/app/utils';
+
+export async function GET(
+    _request: NextRequest,
+    { params }: { params: Promise<RouteLayoutParams> }
+) {
+    const { context } = await getDynamicSiteContext(await params);
+    return servePagesSitemap(context);
+}
@@ -0,0 +1,12 @@
+import type { NextRequest } from 'next/server';
+
+import { serveRootSitemap } from '@/routes/sitemap';
+import { type RouteLayoutParams, getDynamicSiteContext } from '@v2/app/utils';
+
+export async function GET(
+    _request: NextRequest,
+    { params }: { params: Promise<RouteLayoutParams> }
+) {
+    const { context } = await getDynamicSiteContext(await params);
+    return serveRootSitemap(context);
+}
@@ -3,9 +3,10 @@ import {
    generateSitePageMetadata,
    generateSitePageViewport,
 } from '@/components/SitePage';
+import { getCacheTag } from '@gitbook/cache-tags';
 import { type RouteParams, getPagePathFromParams, getStaticSiteContext } from '@v2/app/utils';
-
 import type { Metadata, Viewport } from 'next';
+import { unstable_cacheTag as cacheTag } from 'next/cache';

 export const dynamic = 'force-static';

@@ -14,10 +15,19 @@ type PageProps = {
 };

 export default async function Page(props: PageProps) {
+    'use cache';
+
    const params = await props.params;
    const { context } = await getStaticSiteContext(params);
    const pathname = getPagePathFromParams(params);

+    cacheTag(
+        getCacheTag({
+            tag: 'site',
+            site: context.site.id,
+        })
+    );
+
    return <SitePage context={context} pageParams={{ pathname }} />;
 }

@@ -4,8 +4,10 @@ import {
    generateSiteLayoutMetadata,
    generateSiteLayoutViewport,
 } from '@/components/SiteLayout';
+import { getCacheTag } from '@gitbook/cache-tags';
 import { type RouteLayoutParams, getStaticSiteContext } from '@v2/app/utils';
 import { GITBOOK_DISABLE_TRACKING } from '@v2/lib/env';
+import { unstable_cacheTag as cacheTag } from 'next/cache';

 interface SiteStaticLayoutProps {
    params: Promise<RouteLayoutParams>;
@@ -15,8 +17,17 @@ export default async function SiteStaticLayout({
    params,
    children,
 }: React.PropsWithChildren<SiteStaticLayoutProps>) {
+    'use cache';
+
    const { context, visitorAuthClaims } = await getStaticSiteContext(await params);

+    cacheTag(
+        getCacheTag({
+            tag: 'site',
+            site: context.site.id,
+        })
+    );
+
    return (
        <CustomizationRootLayout customization={context.customization}>
            <SiteLayout
@@ -10,5 +10,5 @@ export async function GET(
    { params }: { params: Promise<RouteLayoutParams> }
 ) {
    const { context } = await getStaticSiteContext(await params);
-    return serveLLMsTxt(context, { withMarkdownPages: true });
+    return serveLLMsTxt(context);
 }
@@ -1,11 +0,0 @@
-import { servePageMarkdown } from '@/routes/markdownPage';
-import { type RouteParams, getPagePathFromParams, getStaticSiteContext } from '@v2/app/utils';
-import type { NextRequest } from 'next/server';
-
-export const dynamic = 'force-static';
-
-export async function GET(_request: NextRequest, { params }: { params: Promise<RouteParams> }) {
-    const { context } = await getStaticSiteContext(await params);
-    const pathname = getPagePathFromParams(await params);
-    return servePageMarkdown(context, pathname);
-}
@@ -1,6 +1,6 @@
 import { getVisitorAuthClaims, getVisitorAuthClaimsFromToken } from '@/lib/adaptive';
-import type { SiteAPIToken } from '@gitbook/api';
-import { type SiteURLData, fetchSiteContextByURLLookup, getBaseContext } from '@v2/lib/context';
+import type { PublishedSiteContent, SiteAPIToken } from '@gitbook/api';
+import { fetchSiteContextByURLLookup, getBaseContext } from '@v2/lib/context';
 import { jwtDecode } from 'jwt-decode';
 import { forbidden } from 'next/navigation';
 import rison from 'rison';
@@ -98,7 +98,7 @@ function getModeFromParams(mode: string): RouteParamMode {
 /**
 * Get the decoded site data from the params.
 */
-function getSiteURLDataFromParams(params: RouteLayoutParams): SiteURLData {
+function getSiteURLDataFromParams(params: RouteLayoutParams): PublishedSiteContent {
    const decoded = decodeURIComponent(params.siteData);
    return rison.decode(decoded);
 }
@@ -13,43 +13,12 @@ import type {
    SiteStructure,
    Space,
 } from '@gitbook/api';
-import {
-    type GitBookDataFetcher,
-    createDataFetcher,
-    getDataOrNull,
-    throwIfDataError,
-} from '@v2/lib/data';
-import assertNever from 'assert-never';
-import { notFound } from 'next/navigation';
+import { type GitBookDataFetcher, createDataFetcher, throwIfDataError } from '@v2/lib/data';
 import { assert } from 'ts-essentials';
 import { GITBOOK_URL } from './env';
 import { type ImageResizer, createImageResizer } from './images';
 import { type GitBookLinker, createLinker } from './links';

-/**
- * Data about the site URL. Provided by the middleware.
- * These data are stable between pages in the same site space.
- */
-export type SiteURLData = Pick<
-    PublishedSiteContent,
-    | 'organization'
-    | 'apiToken'
-    | 'site'
-    | 'siteSpace'
-    | 'space'
-    | 'revision'
-    | 'changeRequest'
-    | 'shareKey'
-    | 'siteSection'
-    | 'siteBasePath'
-    | 'basePath'
-> & {
-    /**
-     * Identifier used for image resizing.
-     */
-    imagesContextId: string;
-};
-
 /**
 * Generic context when rendering content.
 */
@@ -136,7 +105,7 @@ export type GitBookPageContext = (GitBookSpaceContext | GitBookSiteContext) & {
 */
 export function getBaseContext(input: {
    siteURL: URL | string;
-    siteURLData: SiteURLData;
+    siteURLData: PublishedSiteContent;
    urlMode: 'url' | 'url-host';
 }) {
    const { urlMode, siteURLData } = input;
@@ -170,7 +139,7 @@ export function getBaseContext(input: {
    }

    const imageResizer = createImageResizer({
-        imagesContextId: siteURLData.imagesContextId,
+        host: siteURL.host,
        // To ensure image resizing work for proxied sites,
        // we serve images from the root of the site.
        linker: linker,
@@ -188,7 +157,7 @@ export function getBaseContext(input: {
 */
 export async function fetchSiteContextByURLLookup(
    baseContext: GitBookBaseContext,
-    data: SiteURLData
+    data: PublishedSiteContent
 ): Promise<GitBookSiteContext> {
    return await fetchSiteContextByIds(baseContext, {
        organization: data.organization,
@@ -243,45 +212,19 @@ export async function fetchSiteContextByIds(
        ? parseSiteSectionsAndGroups(siteStructure, ids.siteSection)
        : null;

-    // Parse the current siteSpace and siteSpaces based on the site structure type.
-    const { siteSpaces, siteSpace }: { siteSpaces: SiteSpace[]; siteSpace: SiteSpace } = (() => {
-        if (siteStructure.type === 'siteSpaces') {
-            const siteSpaces = siteStructure.structure;
-            const siteSpace = siteSpaces.find((siteSpace) => siteSpace.id === ids.siteSpace);
+    const siteSpace = (
+        siteStructure.type === 'siteSpaces' && siteStructure.structure
+            ? siteStructure.structure
+            : sections?.current.siteSpaces
+    )?.find((siteSpace) => siteSpace.id === ids.siteSpace);
+    if (!siteSpace) {
+        throw new Error('Site space not found');
+    }

-            if (!siteSpace) {
-                throw new Error(
-                    `Site space "${ids.siteSpace}" not found in structure type="siteSpaces"`
-                );
-            }
-
-            return { siteSpaces, siteSpace };
-        }
-
-        if (siteStructure.type === 'sections') {
-            assert(
-                sections,
-                `cannot find site space "${ids.siteSpace}" because parsed sections are missing siteStructure.type="sections" siteSection="${ids.siteSection}"`
-            );
-
-            const currentSection = sections.current;
-            const siteSpaces = currentSection.siteSpaces;
-            const siteSpace = currentSection.siteSpaces.find(
-                (siteSpace) => siteSpace.id === ids.siteSpace
-            );
-
-            if (!siteSpace) {
-                throw new Error(
-                    `Site space "${ids.siteSpace}" not found in structure type="sections" currentSection="${currentSection.id}"`
-                );
-            }
-
-            return { siteSpaces, siteSpace };
-        }
-
-        // @ts-expect-error
-        assertNever(siteStructure, `cannot handle site structure of type ${siteStructure.type}`);
-    })();
+    const siteSpaces =
+        siteStructure.type === 'siteSpaces'
+            ? siteStructure.structure
+            : (sections?.current.siteSpaces ?? []);

    const customization = (() => {
        if (ids.siteSpace) {
@@ -334,7 +277,7 @@ export async function fetchSpaceContextByIds(
            })
        ),
        ids.changeRequest
-            ? getDataOrNull(
+            ? throwIfDataError(
                  dataFetcher.getChangeRequest({
                      spaceId: ids.space,
                      changeRequestId: ids.changeRequest,
@@ -343,30 +286,17 @@ export async function fetchSpaceContextByIds(
            : null,
    ]);

-    if (ids.changeRequest && !changeRequest) {
-        // When trying to render a change request with an invalid / non-existing ID,
-        // we should return a 404.
-        notFound();
-    }
+    const revisionId = changeRequest?.revision ?? ids.revision ?? space.revision;

-    const revisionId = ids.revision ?? changeRequest?.revision ?? space.revision;
-
-    const pages = await getDataOrNull(
+    const pages = await throwIfDataError(
        dataFetcher.getRevisionPages({
            spaceId: ids.space,
            revisionId,
            // We only care about the Git metadata when the Git sync is enabled,
            // otherwise we can optimize performance by not fetching it
            metadata: !!space.gitSync,
-        }),
-
-        // When trying to render a revision with an invalid / non-existing ID,
-        // we should handle gracefully the 404 and throw notFound.
-        ids.revision ? [404] : undefined
+        })
    );
-    if (!pages) {
-        notFound();
-    }

    return {
        ...baseContext,
@@ -407,7 +337,7 @@ export function checkIsRootSiteContext(context: GitBookSiteContext): boolean {
 function parseSiteSectionsAndGroups(structure: SiteStructure, siteSectionId: string) {
    const sectionsAndGroups = getSiteStructureSections(structure, { ignoreGroups: false });
    const section = parseCurrentSection(structure, siteSectionId);
-    assert(section, `couldn't find section "${siteSectionId}" in site structure`);
+    assert(section, 'A section must be defined when there are multiple sections');
    return { list: sectionsAndGroups, current: section } satisfies SiteSections;
 }

@@ -1,25 +0,0 @@
-import { getCloudflareContext as getCloudflareContextOpenNext } from '@opennextjs/cloudflare';
-import { GITBOOK_RUNTIME } from '../env';
-
-/**
- * Return the Cloudflare context or null when not running in Cloudflare.
- */
-export function getCloudflareContext() {
-    if (GITBOOK_RUNTIME !== 'cloudflare') {
-        return null;
-    }
-
-    return getCloudflareContextOpenNext();
-}
-
-/**
- * Return an object representing the current request.
- */
-export function getCloudflareRequestGlobal() {
-    const context = getCloudflareContext();
-    if (!context) {
-        return null;
-    }
-
-    return context.cf;
-}
@@ -98,10 +98,6 @@ export async function wrapDataFetcherError<T>(
 */
 export function getExposableError(error: Error): DataFetcherErrorData {
    if (error instanceof GitBookAPIError) {
-        if (error.code >= 500) {
-            throw error;
-        }
-
        return {
            code: error.code,
            message: error.errorMessage,
@@ -109,10 +105,6 @@ export function getExposableError(error: Error): DataFetcherErrorData {
    }

    if (error instanceof DataFetcherError) {
-        if (error.code >= 500) {
-            throw error;
-        }
-
        return {
            code: error.code,
            message: error.message,
@@ -4,5 +4,3 @@ export * from './pages';
 export * from './urls';
 export * from './errors';
 export * from './lookup';
-export * from './proxy';
-export * from './visitor';
@@ -1,102 +1,48 @@
 import { race, tryCatch } from '@/lib/async';
-import { joinPath, joinPathWithBaseURL } from '@/lib/paths';
+import { joinPath } from '@/lib/paths';
 import { trace } from '@/lib/tracing';
-import type { GitBookAPI, PublishedSiteContentLookup, SiteVisitorPayload } from '@gitbook/api';
+import type { PublishedSiteContentLookup } from '@gitbook/api';
 import { apiClient } from './api';
 import { getExposableError } from './errors';
 import type { DataFetcherResponse } from './types';
 import { getURLLookupAlternatives, stripURLSearch } from './urls';

-interface LookupPublishedContentByUrlInput {
+/**
+ * Lookup a content by its URL using the GitBook API.
+ * To optimize caching, we try multiple lookup alternatives and return the first one that matches.
+ */
+export async function getPublishedContentByURL(input: {
    url: string;
+    visitorAuthToken: string | null;
    redirectOnError: boolean;
    apiToken: string | null;
-    visitorPayload: SiteVisitorPayload;
-}
-
-/**
- * Lookup a content by its URL using the GitBook resolvePublishedContentByUrl API endpoint.
- * To optimize caching, we try multiple lookup alternatives and return the first one that matches.
- */
-export async function resolvePublishedContentByUrl(input: LookupPublishedContentByUrlInput) {
-    return lookupPublishedContentByUrl({
-        url: input.url,
-        fetchLookupAPIResult: ({ url, signal }) => {
-            const api = apiClient({ apiToken: input.apiToken });
-            return trace(
-                {
-                    operation: 'resolvePublishedContentByUrl',
-                    name: url,
-                },
-                () =>
-                    tryCatch(
-                        api.urls.resolvePublishedContentByUrl(
-                            {
-                                url,
-                                ...(input.visitorPayload ? { visitor: input.visitorPayload } : {}),
-                                redirectOnError: input.redirectOnError,
-                            },
-                            { signal }
-                        )
-                    )
-            );
-        },
-    });
-}
-
-/**
- * Lookup a content by its URL using the GitBook getPublishedContentByUrl API endpoint.
- * To optimize caching, we try multiple lookup alternatives and return the first one that matches.
- *
- * @deprecated use resolvePublishedContentByUrl.
- *
- */
-export async function getPublishedContentByURL(input: LookupPublishedContentByUrlInput) {
-    return lookupPublishedContentByUrl({
-        url: input.url,
-        fetchLookupAPIResult: ({ url, signal }) => {
-            const api = apiClient({ apiToken: input.apiToken });
-            return trace(
-                {
-                    operation: 'getPublishedContentByURL',
-                    name: url,
-                },
-                () =>
-                    tryCatch(
-                        api.urls.getPublishedContentByUrl(
-                            {
-                                url,
-                                visitorAuthToken: input.visitorPayload.jwtToken ?? undefined,
-                                redirectOnError: input.redirectOnError,
-                                // @ts-expect-error - cacheVersion is not a real query param
-                                cacheVersion: 'v2',
-                            },
-                            { signal }
-                        )
-                    )
-            );
-        },
-    });
-}
-
-type TryCatch<T> = ReturnType<typeof tryCatch<T>>;
-
-async function lookupPublishedContentByUrl(input: {
-    url: string;
-    fetchLookupAPIResult: (args: {
-        url: string;
-        signal: AbortSignal;
-    }) => TryCatch<Awaited<ReturnType<GitBookAPI['urls']['resolvePublishedContentByUrl']>>>;
 }): Promise<DataFetcherResponse<PublishedSiteContentLookup>> {
    const lookupURL = new URL(input.url);
    const url = stripURLSearch(lookupURL);
    const lookup = getURLLookupAlternatives(url);

    const result = await race(lookup.urls, async (alternative, { signal }) => {
-        const callResult = await input.fetchLookupAPIResult({
-            url: alternative.url,
-            signal,
-        });
+        const api = await apiClient({ apiToken: input.apiToken });
+
+        const callResult = await trace(
+            {
+                operation: 'getPublishedContentByURL',
+                name: alternative.url,
+            },
+            () =>
+                tryCatch(
+                    api.urls.getPublishedContentByUrl(
+                        {
+                            url: alternative.url,
+                            visitorAuthToken: input.visitorAuthToken ?? undefined,
+                            redirectOnError: input.redirectOnError,
+                        },
+                        {
+                            signal,
+                        }
+                    )
+                )
+        );

        if (callResult.error) {
            if (alternative.primary) {
@@ -154,7 +100,6 @@ async function lookupPublishedContentByUrl(input: {

            const siteResult: PublishedSiteContentLookup = {
                ...data,
-                canonicalUrl: joinPathWithBaseURL(data.canonicalUrl, alternative.extraPath),
                basePath: joinPath(data.basePath, lookup.basePath ?? ''),
                pathname: joinPath(data.pathname, alternative.extraPath),
                ...(changeRequest ? { changeRequest } : {}),
@@ -1,52 +1,39 @@
 import { describe, expect, it, mock } from 'bun:test';
-import { AsyncLocalStorage } from 'node:async_hooks';
-import { withCacheKey, withoutConcurrentExecution } from './memoize';
+import { memoize } from './memoize';

-describe('withoutConcurrentExecution', () => {
-    it('should memoize the function based on the cache key', async () => {
-        const fn = mock(async (_cacheKey: string, a: number, b: number) => a + b);
-        const memoized = withoutConcurrentExecution(() => null, fn);
-
-        const p1 = memoized('c1', 1, 2);
-        const p2 = memoized('c1', 1, 2);
-        const p3 = memoized('c3', 2, 3);
-
-        expect(await p1).toBe(await p2);
-        expect(await p1).not.toBe(await p3);
-        expect(fn.mock.calls.length).toBe(2);
-    });
-
-    it('should support caching per request', async () => {
+describe('memoize', () => {
+    it('should memoize the function', async () => {
        const fn = mock(async () => Math.random());
+        const memoized = memoize(fn);
+        expect(await memoized()).toBe(await memoized());
+    });

-        const request1 = { id: 'request1' };
-        const request2 = { id: 'request2' };
-
-        const requestContext = new AsyncLocalStorage<{ id: string }>();
-
-        const memoized = withoutConcurrentExecution(() => requestContext.getStore(), fn);
-
-        // Both in the same request
-        const promise1 = requestContext.run(request1, () => memoized('c1'));
-        const promise2 = requestContext.run(request1, () => memoized('c1'));
-
-        // In a different request
-        const promise3 = requestContext.run(request2, () => memoized('c1'));
-
-        expect(await promise1).toBe(await promise2);
-        expect(await promise1).not.toBe(await promise3);
+    it('should memoize the function with different arguments', async () => {
+        const fn = mock(async (a: number, b: number) => a + b);
+        const memoized = memoize(fn);
+        expect(await memoized(1, 2)).toBe(await memoized(1, 2));
+        expect(fn.mock.calls.length).toBe(1);
+        expect(await memoized(1, 2)).not.toBe(await memoized(2, 3));
        expect(fn.mock.calls.length).toBe(2);
    });
-});

-describe('withCacheKey', () => {
-    it('should wrap the function by passing the cache key', async () => {
-        const fn = mock(
-            async (cacheKey: string, arg: { a: number; b: number }, c: number) =>
-                `${cacheKey}, result=${arg.a + arg.b + c}`
+    it('should memoize a function complex object', async () => {
+        const fn = mock(async (a: { foo: string; bar: number }) => a.foo + a.bar);
+        const memoized = memoize(fn);
+        expect(await memoized({ foo: 'foo', bar: 1 })).toBe(await memoized({ foo: 'foo', bar: 1 }));
+        expect(fn.mock.calls.length).toBe(1);
+        expect(await memoized({ foo: 'foo', bar: 1 })).not.toBe(
+            await memoized({ foo: 'foo', bar: 2 })
        );
-        const memoized = withCacheKey(fn);
-        expect(await memoized({ a: 1, b: 2 }, 4)).toBe('[[["a",1],["b",2]],4], result=7');
+        expect(fn.mock.calls.length).toBe(2);
+    });
+
+    it('should wrap concurrent async calls', async () => {
+        const fn = mock(async () => Math.random());
+        const memoized = memoize(fn);
+        const promise1 = memoized();
+        const promise2 = memoized();
+        expect(await promise1).toBe(await promise2);
        expect(fn.mock.calls.length).toBe(1);
    });
 });
@@ -1,61 +1,17 @@
-/**
- * Wrap a function by preventing concurrent executions of the same function.
- * With a logic to work per-request in Cloudflare Workers.
- */
-export function withoutConcurrentExecution<ArgsType extends any[], ReturnType>(
-    getGlobalContext: () => object | null | undefined,
-    wrapped: (key: string, ...args: ArgsType) => Promise<ReturnType>
-): (cacheKey: string, ...args: ArgsType) => Promise<ReturnType> {
-    const globalPromiseCache = new WeakMap<object, Map<string, Promise<ReturnType>>>();
-
-    return (key: string, ...args: ArgsType) => {
-        const globalContext = getGlobalContext() ?? globalThis;
-
-        /**
-         * Cache storage that is scoped to the current request when executed in Cloudflare Workers,
-         * to avoid "Cannot perform I/O on behalf of a different request" errors.
-         */
-        const promiseCache =
-            globalPromiseCache.get(globalContext) ?? new Map<string, Promise<ReturnType>>();
-        globalPromiseCache.set(globalContext, promiseCache);
-
-        const concurrent = promiseCache.get(key);
-        if (concurrent) {
-            return concurrent;
-        }
-
-        const promise = (async () => {
-            try {
-                const result = await wrapped(key, ...args);
-                return result;
-            } finally {
-                promiseCache.delete(key);
-            }
-        })();
-
-        promiseCache.set(key, promise);
-
-        return promise;
-    };
-}
+import pMemoize from 'p-memoize';

 /**
- * Wrap a function by passing it a cache key that is computed from the function arguments.
+ * We wrap 'use cache' calls in a p-memoize function to avoid
+ * executing the function multiple times when doing concurrent calls.
+ *
+ * Hopefully one day this can be done directly by 'use cache'.
 */
-export function withCacheKey<ArgsType extends any[], ReturnType>(
-    wrapped: (cacheKey: string, ...args: ArgsType) => Promise<ReturnType>
-): (...args: ArgsType) => Promise<ReturnType> {
-    return (...args: ArgsType) => {
-        const cacheKey = getCacheKey(args);
-        return wrapped(cacheKey, ...args);
-    };
-}
-
-/**
- * Compute a cache key from the function arguments.
- */
-function getCacheKey(args: any[]) {
-    return JSON.stringify(deepSortValue(args));
+export function memoize<F extends (...args: any[]) => any>(f: F): F {
+    return pMemoize(f, {
+        cacheKey: (args) => {
+            return JSON.stringify(deepSortValue(args));
+        },
+    });
 }

 function deepSortValue(value: unknown): unknown {
@@ -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');
-    });
-});
@@ -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('/');
-}
@@ -97,15 +97,6 @@ export interface GitBookDataFetcher {
        path: string;
    }): Promise<DataFetcherResponse<api.RevisionPageDocument | api.RevisionPageGroup>>;

-    /**
-     * Get the markdown content of a page by its path.
-     */
-    getRevisionPageMarkdown(params: {
-        spaceId: string;
-        revisionId: string;
-        pageId: string;
-    }): Promise<DataFetcherResponse<string>>;
-
    /**
     * Get a document by its space ID and document ID.
     */
@@ -179,15 +170,4 @@ export interface GitBookDataFetcher {
        integrationName: string;
        request: api.RenderIntegrationUI;
    }): Promise<DataFetcherResponse<api.ContentKitRenderOutput>>;
-
-    /**
-     * Stream an AI response.
-     */
-    streamAIResponse(params: {
-        organizationId: string;
-        siteId: string;
-        input: api.AIMessageInput[];
-        output: api.AIOutputFormat;
-        model: api.AIModel;
-    }): AsyncGenerator<api.AIStreamResponse, void, unknown>;
 }
@@ -1,41 +0,0 @@
-import { describe, expect, it } from 'bun:test';
-import { getVisitorAuthBasePath } from './visitor';
-
-describe('getVisitorAuthBasePath', () => {
-    it('should return the correct base path for proxy requests', () => {
-        expect(
-            getVisitorAuthBasePath(
-                new URL('https://proxy.gitbook.site/sites/site_foo/hello/world'),
-                {
-                    site: 'site_foo',
-                    siteSpace: 'sitesp_foo',
-                    basePath: '/foo',
-                    siteBasePath: '/foo',
-                    organization: 'org_foo',
-                    space: 'space_foo',
-                    pathname: '/hello/world',
-                    complete: false,
-                    apiToken: 'api_token_foo',
-                    canonicalUrl: 'https://example.com/docs/foo/hello/world',
-                }
-            )
-        ).toBe('/sites/site_foo/');
-    });
-
-    it('should return the correct base path for non-proxy requests', () => {
-        expect(
-            getVisitorAuthBasePath(new URL('https://example.com/docs/foo/hello/world'), {
-                site: 'site_foo',
-                siteSpace: 'sitesp_foo',
-                basePath: '/foo/',
-                siteBasePath: '/foo/',
-                organization: 'org_foo',
-                space: 'space_foo',
-                pathname: '/hello/world',
-                complete: false,
-                apiToken: 'api_token_foo',
-                canonicalUrl: 'https://example.com/docs/foo/hello/world',
-            })
-        ).toBe('/foo/');
-    });
-});
@@ -1,19 +0,0 @@
-import { withLeadingSlash, withTrailingSlash } from '@/lib/paths';
-import type { PublishedSiteContent } from '@gitbook/api';
-import { getProxyRequestIdentifier, isProxyRequest } from './proxy';
-
-/**
- * Get the appropriate base path for the visitor authentication cookie.
- */
-export function getVisitorAuthBasePath(
-    siteRequestURL: URL,
-    siteURLData: PublishedSiteContent
-): string {
-    // The siteRequestURL for proxy requests is of the form `https://proxy.gitbook.com/site/siteId/...`
-    // In such cases, we should not use the resolved siteBasePath for the cookie because for subsequent requests
-    // we will not have the siteBasePath in the request URL in order to retrieve the cookie. So we use the
-    // proxy identifier instead.
-    return isProxyRequest(siteRequestURL)
-        ? withLeadingSlash(withTrailingSlash(getProxyRequestIdentifier(siteRequestURL)))
-        : siteURLData.siteBasePath;
-}
@@ -6,14 +6,6 @@ import 'server-only';
 * and not from the `process.env` object.
 */

-/**
- * Runtime environment.
- */
-export const GITBOOK_RUNTIME = (process.env.GITBOOK_RUNTIME ?? 'unknown') as
-    | 'vercel'
-    | 'cloudflare'
-    | 'unknown';
-
 /**
 * Main host on which GitBook is running.
 */
@@ -85,15 +77,6 @@ export const GITBOOK_IMAGE_RESIZE_URL = process.env.GITBOOK_IMAGE_RESIZE_URL ??
 export const GITBOOK_IMAGE_RESIZE_SIGNING_KEY =
    process.env.GITBOOK_IMAGE_RESIZE_SIGNING_KEY ?? null;

-/**
- * Mode used for resizing images.
- */
-export const GITBOOK_IMAGE_RESIZE_MODE = enforceEnum(
-    'GITBOOK_IMAGE_RESIZE_MODE',
-    process.env.GITBOOK_IMAGE_RESIZE_MODE || 'cdn-cgi',
-    ['cdn-cgi', 'cf-fetch']
-);
-
 /**
 * Endpoint where icons are served.
 */
@@ -109,12 +92,3 @@ export const GITBOOK_ICONS_TOKEN = process.env.GITBOOK_ICONS_TOKEN;
 * Secret used to validate requests from the GitBook app.
 */
 export const GITBOOK_SECRET = process.env.GITBOOK_SECRET ?? null;
-
-function enforceEnum<T extends string>(key: string, value: string, enumValues: T[]): T {
-    if (!enumValues.includes(value as T)) {
-        throw new Error(
-            `Invalid value for ${key}: "${value}", expected one of: ${enumValues.join(', ')}`
-        );
-    }
-    return value as T;
-}
@@ -1,81 +0,0 @@
-import { describe, expect, it } from 'bun:test';
-import { SizableImageAction, checkIsSizableImageURL } from './checkIsSizableImageURL';
-
-describe('checkIsSizableImageURL', () => {
-    it('should return Skip for non-parsable URLs', () => {
-        expect(checkIsSizableImageURL('not a url')).toBe(SizableImageAction.Skip);
-    });
-
-    it('should return Skip for non-http(s) URLs', () => {
-        expect(checkIsSizableImageURL('data:image/png;base64,abc')).toBe(SizableImageAction.Skip);
-        expect(checkIsSizableImageURL('file:///path/to/image.jpg')).toBe(SizableImageAction.Skip);
-    });
-
-    it('should return Skip for localhost URLs', () => {
-        expect(checkIsSizableImageURL('http://localhost:3000/image.jpg')).toBe(
-            SizableImageAction.Skip
-        );
-        expect(checkIsSizableImageURL('https://localhost/image.png')).toBe(SizableImageAction.Skip);
-    });
-
-    it('should return Skip for GitBook image URLs', () => {
-        expect(checkIsSizableImageURL('https://example.com/~gitbook/image/test.jpg')).toBe(
-            SizableImageAction.Skip
-        );
-    });
-
-    it('should return Resize for supported image extensions', () => {
-        expect(checkIsSizableImageURL('https://example.com/image.jpg')).toBe(
-            SizableImageAction.Resize
-        );
-        expect(checkIsSizableImageURL('https://example.com/image.jpeg')).toBe(
-            SizableImageAction.Resize
-        );
-        expect(checkIsSizableImageURL('https://example.com/image.png')).toBe(
-            SizableImageAction.Resize
-        );
-        expect(checkIsSizableImageURL('https://example.com/image.gif')).toBe(
-            SizableImageAction.Resize
-        );
-        expect(checkIsSizableImageURL('https://example.com/image.webp')).toBe(
-            SizableImageAction.Resize
-        );
-    });
-
-    it('should return Resize for URLs without extensions', () => {
-        expect(checkIsSizableImageURL('https://example.com/image')).toBe(SizableImageAction.Resize);
-    });
-
-    it('should return Passthrough for unsupported image extensions', () => {
-        expect(checkIsSizableImageURL('https://example.com/image.svg')).toBe(
-            SizableImageAction.Passthrough
-        );
-        expect(checkIsSizableImageURL('https://example.com/image.bmp')).toBe(
-            SizableImageAction.Passthrough
-        );
-        expect(checkIsSizableImageURL('https://example.com/image.tiff')).toBe(
-            SizableImageAction.Passthrough
-        );
-        expect(checkIsSizableImageURL('https://example.com/image.ico')).toBe(
-            SizableImageAction.Passthrough
-        );
-    });
-
-    it('should handle URLs with query parameters correctly', () => {
-        expect(checkIsSizableImageURL('https://example.com/image.jpg?width=100')).toBe(
-            SizableImageAction.Resize
-        );
-        expect(checkIsSizableImageURL('https://example.com/image.svg?height=200')).toBe(
-            SizableImageAction.Passthrough
-        );
-    });
-
-    it('should be case-insensitive for extensions', () => {
-        expect(checkIsSizableImageURL('https://example.com/image.JPG')).toBe(
-            SizableImageAction.Resize
-        );
-        expect(checkIsSizableImageURL('https://example.com/image.PNG')).toBe(
-            SizableImageAction.Resize
-        );
-    });
-});
@@ -1,43 +0,0 @@
-import { getExtension } from '@/lib/paths';
-
-export enum SizableImageAction {
-    Resize = 'resize',
-    Skip = 'skip',
-    Passthrough = 'passthrough',
-}
-
-/**
- * https://developers.cloudflare.com/images/transform-images/#supported-input-formats
- */
-const SUPPORTED_IMAGE_EXTENSIONS = ['.jpg', '.jpeg', '.png', '.gif', '.webp'];
-
-/**
- * Check if an image URL is resizable.
- * Skip it for non-http(s) URLs (data, etc).
- * Skip it for SVGs.
- * Skip it for GitBook images (to avoid recursion).
- */
-export function checkIsSizableImageURL(input: string): SizableImageAction {
-    if (!URL.canParse(input)) {
-        return SizableImageAction.Skip;
-    }
-
-    const parsed = new URL(input);
-    if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
-        return SizableImageAction.Skip;
-    }
-    if (parsed.hostname === 'localhost') {
-        return SizableImageAction.Skip;
-    }
-    if (parsed.pathname.includes('/~gitbook/image')) {
-        return SizableImageAction.Skip;
-    }
-
-    const extension = getExtension(parsed.pathname).toLowerCase();
-    if (!extension || SUPPORTED_IMAGE_EXTENSIONS.includes(extension)) {
-        // If no extension, we consider it resizable.
-        return SizableImageAction.Resize;
-    }
-
-    return SizableImageAction.Passthrough;
-}
@@ -1,22 +1,45 @@
 import 'server-only';
+
 import { GITBOOK_IMAGE_RESIZE_SIGNING_KEY, GITBOOK_IMAGE_RESIZE_URL } from '../env';
 import type { GitBookLinker } from '../links';
-import { SizableImageAction, checkIsSizableImageURL } from './checkIsSizableImageURL';
-import { getImageSize } from './resizer';
 import { type SignatureVersion, generateImageSignature } from './signatures';
 import type { ImageResizer } from './types';

+interface CloudflareImageJsonFormat {
+    width: number;
+    height: number;
+    original: {
+        file_size: number;
+        width: number;
+        height: number;
+        format: string;
+    };
+}
+
+/**
+ * https://developers.cloudflare.com/images/image-resizing/resize-with-workers/
+ */
+export interface CloudflareImageOptions {
+    format?: 'webp' | 'avif' | 'json' | 'jpeg';
+    fit?: 'scale-down' | 'contain' | 'cover' | 'crop' | 'pad';
+    width?: number;
+    height?: number;
+    dpr?: number;
+    anim?: boolean;
+    quality?: number;
+}
+
 /**
 * Create an image resizer for a rendering context.
 */
 export function createImageResizer({
-    imagesContextId,
+    host,
    linker,
 }: {
    /** The linker to use to create URLs. */
    linker: GitBookLinker;
-    /** The site identifier to use for verifying the image signature. */
-    imagesContextId: string;
+    /** The host name of the current site. */
+    host: string;
 }): ImageResizer {
    if (!GITBOOK_IMAGE_RESIZE_URL || !GITBOOK_IMAGE_RESIZE_SIGNING_KEY) {
        return createNoopImageResizer();
@@ -24,7 +47,7 @@ export function createImageResizer({

    return {
        getResizedImageURL: (urlInput) => {
-            if (checkIsSizableImageURL(urlInput) === SizableImageAction.Skip) {
+            if (!checkIsSizableImageURL(urlInput)) {
                return null;
            }

@@ -35,7 +58,7 @@ export function createImageResizer({

            return async (options) => {
                cachedSignature ??= await generateImageSignature({
-                    imagesContextId,
+                    host,
                    url: urlInput,
                });

@@ -64,7 +87,7 @@ export function createImageResizer({
        },

        getImageSize: async (input, options) => {
-            if (checkIsSizableImageURL(input) !== SizableImageAction.Resize) {
+            if (!checkIsSizableImageURL(input)) {
                return null;
            }

@@ -83,6 +106,124 @@ export function createNoopImageResizer(): ImageResizer {
    };
 }

+/**
+ * Check if a URL is an HTTP URL.
+ */
+export function checkIsHttpURL(input: string | URL): boolean {
+    if (!URL.canParse(input)) {
+        return false;
+    }
+    const parsed = new URL(input);
+    return parsed.protocol === 'http:' || parsed.protocol === 'https:';
+}
+
+/**
+ * Check if an image URL is resizable.
+ * Skip it for non-http(s) URLs (data, etc).
+ * Skip it for SVGs.
+ * Skip it for GitBook images (to avoid recursion).
+ */
+export function checkIsSizableImageURL(input: string): boolean {
+    if (!URL.canParse(input)) {
+        return false;
+    }
+
+    if (input.includes('/~gitbook/image')) {
+        return false;
+    }
+
+    const parsed = new URL(input);
+    if (parsed.pathname.endsWith('.svg') || parsed.pathname.endsWith('.avif')) {
+        return false;
+    }
+    if (!checkIsHttpURL(parsed)) {
+        return false;
+    }
+
+    return true;
+}
+
+/**
+ * Get the size of an image.
+ */
+export async function getImageSize(
+    input: string,
+    defaultSize: Partial<CloudflareImageOptions> = {}
+): Promise<{ width: number; height: number } | null> {
+    if (!checkIsSizableImageURL(input)) {
+        return null;
+    }
+
+    try {
+        const response = await resizeImage(input, {
+            // Abort the request after 2 seconds to avoid blocking rendering for too long
+            signal: AbortSignal.timeout(2000),
+            // Measure size and resize it to the most common size
+            // to optimize caching
+            ...defaultSize,
+            format: 'json',
+            anim: false,
+        });
+
+        const json = (await response.json()) as CloudflareImageJsonFormat;
+        return {
+            width: json.original.width,
+            height: json.original.height,
+        };
+    } catch (_error) {
+        return null;
+    }
+}
+
+/**
+ * Execute a Cloudflare Image Resize operation on an image.
+ */
+export async function resizeImage(
+    input: string,
+    options: CloudflareImageOptions & {
+        signal?: AbortSignal;
+    }
+): Promise<Response> {
+    const { signal, ...resizeOptions } = options;
+
+    const parsed = new URL(input);
+    if (parsed.protocol === 'data:') {
+        throw new Error('Cannot resize data: URLs');
+    }
+
+    if (parsed.hostname === 'localhost') {
+        throw new Error('Cannot resize localhost URLs');
+    }
+
+    // Since Cloudflare Images options on fetch are not supported on Cloudflare Pages,
+    // we need to use the Cloudflare Image Resize API directly.
+    if (!GITBOOK_IMAGE_RESIZE_URL) {
+        throw new Error('GITBOOK_IMAGE_RESIZE_URL is not set');
+    }
+
+    return await fetch(
+        `${GITBOOK_IMAGE_RESIZE_URL}${stringifyOptions(
+            resizeOptions
+        )}/${encodeURIComponent(input)}`,
+        {
+            headers: {
+                // Pass the `Accept` header, as Cloudflare uses this to validate the format.
+                Accept:
+                    resizeOptions.format === 'json'
+                        ? 'application/json'
+                        : `image/${resizeOptions.format || 'jpeg'}`,
+            },
+            signal,
+        }
+    );
+}
+
+function stringifyOptions(options: CloudflareImageOptions): string {
+    return Object.entries({ ...options }).reduce((rest, [key, value]) => {
+        return `${rest}${rest ? ',' : ''}${key}=${value}`;
+    }, '');
+}
+
 /**
 * Because of a bug in Cloudflare, 127.0.0.1 is replaced by localhost.
 * We protect against it by converting to a special token, and then parsing
@@ -1,13 +0,0 @@
-import { getProxyRequestIdentifier, isProxyRequest } from '../data';
-
-/**
- * Get the site identifier to use for image resizing for an incoming request.
- * This identifier can be obtained before resolving the request URL.
- */
-export function getImageResizingContextId(url: URL): string {
-    if (isProxyRequest(url)) {
-        return getProxyRequestIdentifier(url);
-    }
-
-    return url.host;
-}
@@ -2,6 +2,3 @@ export * from './types';
 export * from './createImageResizer';
 export * from './signatures';
 export * from './utils';
-export * from './getImageResizingContextId';
-export * from './resizer';
-export * from './checkIsSizableImageURL';
@@ -1,48 +0,0 @@
-import { GITBOOK_IMAGE_RESIZE_URL } from '@v2/lib/env';
-import type { CloudflareImageOptions } from './types';
-import { copyImageResponse } from './utils';
-
-/**
- * Resize an image by doing a request to a /cdn/cgi/ endpoint.
- * https://developers.cloudflare.com/images/transform-images/transform-via-url/
- */
-export async function resizeImageWithCDNCgi(
-    input: string,
-    options: CloudflareImageOptions & {
-        signal?: AbortSignal;
-    }
-): Promise<Response> {
-    const { signal, ...resizeOptions } = options;
-
-    // Since Cloudflare Images options on fetch are not supported on Cloudflare Pages,
-    // we need to use the Cloudflare Image Resize API directly.
-    if (!GITBOOK_IMAGE_RESIZE_URL) {
-        throw new Error('GITBOOK_IMAGE_RESIZE_URL is not set for cdn-cgi image resize mode');
-    }
-
-    const resizeURL = `${GITBOOK_IMAGE_RESIZE_URL}${stringifyOptions(
-        resizeOptions
-    )}/${encodeURIComponent(input)}`;
-
-    // biome-ignore lint/suspicious/noConsole: this log is useful for debugging
-    console.log(`resize image using cdn-cgi: ${resizeURL}`);
-
-    return copyImageResponse(
-        await fetch(resizeURL, {
-            headers: {
-                // Pass the `Accept` header, as Cloudflare uses this to validate the format.
-                Accept:
-                    resizeOptions.format === 'json'
-                        ? 'application/json'
-                        : `image/${resizeOptions.format || 'jpeg'}`,
-            },
-            signal,
-        })
-    );
-}
-
-function stringifyOptions(options: CloudflareImageOptions): string {
-    return Object.entries({ ...options }).reduce((rest, [key, value]) => {
-        return `${rest}${rest ? ',' : ''}${key}=${value}`;
-    }, '');
-}
@@ -1,34 +0,0 @@
-import type { CloudflareImageOptions } from './types';
-import { copyImageResponse } from './utils';
-
-/**
- * Resize an image by doing a request to the image itself using the Cloudflare fetch.
- * https://developers.cloudflare.com/images/transform-images/transform-via-workers/
- *
- * This method doesn't work in Cloudflare Pages and is only supported in workers.
- */
-export async function resizeImageWithCFFetch(
-    input: string,
-    options: CloudflareImageOptions & {
-        signal?: AbortSignal;
-    }
-): Promise<Response> {
-    const { signal, ...resizeOptions } = options;
-
-    // biome-ignore lint/suspicious/noConsole: this log is useful for debugging
-    console.log(`resize image using cf-fetch: ${input}`);
-
-    return copyImageResponse(
-        await fetch(input, {
-            headers: {
-                // Pass the `Accept` header, as Cloudflare uses this to validate the format.
-                Accept:
-                    resizeOptions.format === 'json'
-                        ? 'application/json'
-                        : `image/${resizeOptions.format || 'jpeg'}`,
-            },
-            signal,
-            cf: { image: resizeOptions },
-        })
-    );
-}
@@ -1,2 +0,0 @@
-export * from './types';
-export * from './resizeImage';
@@ -1,72 +0,0 @@
-import 'server-only';
-import assertNever from 'assert-never';
-import { GITBOOK_IMAGE_RESIZE_MODE } from '../../env';
-import { SizableImageAction, checkIsSizableImageURL } from '../checkIsSizableImageURL';
-import { resizeImageWithCDNCgi } from './cdn-cgi';
-import { resizeImageWithCFFetch } from './cf-fetch';
-import type { CloudflareImageJsonFormat, CloudflareImageOptions } from './types';
-
-/**
- * Get the size of an image.
- */
-export async function getImageSize(
-    input: string,
-    defaultSize: Partial<CloudflareImageOptions> = {}
-): Promise<{ width: number; height: number } | null> {
-    if (checkIsSizableImageURL(input) !== SizableImageAction.Resize) {
-        return null;
-    }
-
-    try {
-        const response = await resizeImage(input, {
-            // Abort the request after 2 seconds to avoid blocking rendering for too long
-            signal: AbortSignal.timeout(2000),
-            // Measure size and resize it to the most common size
-            // to optimize caching
-            ...defaultSize,
-            format: 'json',
-            anim: false,
-        });
-
-        const json = (await response.json()) as CloudflareImageJsonFormat;
-        return {
-            width: json.original.width,
-            height: json.original.height,
-        };
-    } catch (error) {
-        console.warn(`Error getting image size for ${input}:`, error);
-        return null;
-    }
-}
-
-/**
- * Execute a Cloudflare Image Resize operation on an image.
- */
-export async function resizeImage(
-    input: string,
-    options: CloudflareImageOptions & {
-        signal?: AbortSignal;
-    }
-): Promise<Response> {
-    const action = checkIsSizableImageURL(input);
-    if (action === SizableImageAction.Skip) {
-        throw new Error(
-            'Cannot resize this image, this function should have never been called on this url'
-        );
-    }
-
-    if (action === SizableImageAction.Passthrough) {
-        return fetch(input, {
-            signal: options.signal,
-        });
-    }
-
-    switch (GITBOOK_IMAGE_RESIZE_MODE) {
-        case 'cdn-cgi':
-            return resizeImageWithCDNCgi(input, options);
-        case 'cf-fetch':
-            return resizeImageWithCFFetch(input, options);
-        default:
-            assertNever(GITBOOK_IMAGE_RESIZE_MODE);
-    }
-}
@@ -1,23 +0,0 @@
-export interface CloudflareImageJsonFormat {
-    width: number;
-    height: number;
-    original: {
-        file_size: number;
-        width: number;
-        height: number;
-        format: string;
-    };
-}
-
-/**
- * https://developers.cloudflare.com/images/image-resizing/resize-with-workers/
- */
-export interface CloudflareImageOptions {
-    format?: 'webp' | 'avif' | 'json' | 'jpeg';
-    fit?: 'scale-down' | 'contain' | 'cover' | 'crop' | 'pad';
-    width?: number;
-    height?: number;
-    dpr?: number;
-    anim?: boolean;
-    quality?: number;
-}
@@ -1,7 +0,0 @@
-/**
- * Copy a response to make sure it can be mutated by the rest of the middleware.
- * To avoid errors "Can't modify immutable headers".
- */
-export function copyImageResponse(response: Response) {
-    return new Response(response.body, response);
-}
--- a/Show More
+++ b/Show More