Skip to content

Commit 24fcf4f

Browse files
committed
Merge branch 'main' into cache-page-ai-page-link-summary
2 parents 66597b5 + f23023d commit 24fcf4f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1177
-728
lines changed

Diff for: .changeset/cold-crews-drive.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"gitbook": patch
3+
---
4+
5+
Tweak footer design (and refactor)

Diff for: .changeset/fair-actors-remain.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"gitbook": patch
3+
---
4+
5+
Fix security issue with injection of "javacript:` url in the back button of PDFs

Diff for: .changeset/hungry-candles-sing.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"gitbook": patch
3+
---
4+
5+
Add superscript and subscript text rendering

Diff for: .changeset/lazy-oranges-play.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'gitbook': patch
3+
---
4+
5+
Fix OpenAPISchemas description padding

Diff for: .changeset/lucky-elephants-hang.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"gitbook": patch
3+
---
4+
5+
Add support for buttons to GitBook.

Diff for: .changeset/pink-students-grow.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@gitbook/react-openapi': patch
3+
'gitbook': patch
4+
---
5+
6+
Improve OpenAPI codesample (add OpenAPISelect component)

Diff for: .changeset/quick-countries-allow.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"gitbook": patch
3+
---
4+
5+
Fix ogimage generation crashing when site is using a custom WOFF2 font

Diff for: .changeset/tame-camels-sparkle.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'gitbook': patch
3+
---
4+
5+
Override Scalar's overscroll-behavior

Diff for: .github/composite/deploy-cloudflare/action.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ inputs:
1919
deploy:
2020
description: 'Deploy as main version for all traffic instead of uploading versions'
2121
required: true
22+
commitTag:
23+
description: 'Commit branch to associate with the deployment'
24+
required: true
25+
commitMessage:
26+
description: 'Commit message to associate with the deployment'
27+
required: true
2228
outputs:
2329
deployment-url:
2430
description: "Deployment URL"
@@ -65,7 +71,7 @@ runs:
6571
workingDirectory: ./
6672
wranglerVersion: '3.112.0'
6773
environment: ${{ inputs.environment }}
68-
command: ${{ fromJSON(inputs.deploy) == true && 'deploy' || 'versions upload' }} --config ./packages/gitbook-v2/wrangler.jsonc
74+
command: ${{ inputs.deploy == 'true' && 'deploy' || format('versions upload --tag {0} --message "{1}"', inputs.commitTag, inputs.commitMessage) }} --config ./packages/gitbook-v2/wrangler.jsonc
6975
- name: Outputs
7076
shell: bash
7177
env:

Diff for: .github/workflows/deploy-preview.yaml

+6-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
deploy-v1-cloudflare:
1111
name: Deploy v1 to Cloudflare Pages
1212
runs-on: ubuntu-latest
13-
environment:
13+
environment:
1414
name: ${{ github.ref == 'refs/heads/main' && '1c-production' || '1c-preview' }}
1515
url: ${{ steps.deploy.outputs.deployment-url }}
1616
permissions:
@@ -40,6 +40,7 @@ jobs:
4040
run: bun run turbo gitbook#build:cloudflare
4141
env:
4242
NEXT_SERVER_ACTIONS_ENCRYPTION_KEY: ${{ secrets.NEXT_SERVER_ACTIONS_ENCRYPTION_KEY }}
43+
GITBOOK_RUNTIME: cloudflare
4344
- id: deploy
4445
name: Deploy to Cloudflare
4546
uses: cloudflare/[email protected]
@@ -56,7 +57,7 @@ jobs:
5657
deploy-v2-vercel:
5758
name: Deploy v2 to Vercel (preview)
5859
runs-on: ubuntu-latest
59-
environment:
60+
environment:
6061
name: 2v-preview
6162
url: ${{ steps.deploy.outputs.deployment-url }}
6263
outputs:
@@ -77,7 +78,7 @@ jobs:
7778
deploy-v2-cloudflare:
7879
name: Deploy v2 to Cloudflare Worker (preview)
7980
runs-on: ubuntu-latest
80-
environment:
81+
environment:
8182
name: 2c-preview
8283
url: ${{ steps.deploy.outputs.deployment-url }}
8384
outputs:
@@ -95,6 +96,8 @@ jobs:
9596
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
9697
opItem: op://gitbook-open/2c-preview
9798
opServiceAccount: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
99+
commitTag: ${{ github.ref == 'refs/heads/main' && 'main' || format('pr{0}', github.event.pull_request.number) }}
100+
commitMessage: ${{ github.sha }}
98101
- name: Outputs
99102
run: |
100103
echo "URL: ${{ steps.deploy.outputs.deployment-url }}"

Diff for: .github/workflows/deploy-production.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ jobs:
4848
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
4949
opItem: op://gitbook-open/2c-production
5050
opServiceAccount: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
51+
commitTag: main
52+
commitMessage: ${{ github.sha }}
5153
- name: Outputs
5254
run: |
5355
echo "URL: ${{ steps.deploy.outputs.deployment-url }}"

Diff for: .github/workflows/deploy-staging.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ jobs:
4848
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
4949
opItem: op://gitbook-open/2c-staging
5050
opServiceAccount: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
51+
commitTag: main
52+
commitMessage: ${{ github.sha }}
5153
- name: Outputs
5254
run: |
5355
echo "URL: ${{ steps.deploy.outputs.deployment-url }}"

0 commit comments

Comments
 (0)