Skip to content

Commit 1aa581d

Browse files
committed
Merge branch 'main' into zeno/rnd-6419-add-trademark-to-landing-pages
2 parents ba78db4 + e5f0cc8 commit 1aa581d

File tree

108 files changed

+1853
-1342
lines changed

Some content is hidden

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

108 files changed

+1853
-1342
lines changed

.changeset/giant-starfishes-sin.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'gitbook': patch
3+
---
4+
5+
Transparent background for OpenAPI path block

.changeset/kind-baboons-sort.md renamed to .changeset/gold-olives-build.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
'@gitbook/react-openapi': patch
33
---
44

5-
Fix OpenAPI example display error
5+
Handle read-only in OpenAPISchemaName

.changeset/rich-terms-smoke.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'gitbook': patch
3+
---
4+
5+
Info hint background and link color fixes

.changeset/silly-kings-look.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@gitbook/react-openapi': patch
3+
---
4+
5+
Remove read-only properties from codesample

.changeset/sour-spiders-bow.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@gitbook/cache-tags': minor
3+
---
4+
5+
Export function `getCacheTagForURL` to easily get the cache tag for a URL.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ runs:
4444
GITBOOK_SECRET: ${{ inputs.opItem }}/GITBOOK_SECRET
4545
GITBOOK_APP_URL: ${{ inputs.opItem }}/GITBOOK_APP_URL
4646
GITBOOK_API_URL: ${{ inputs.opItem }}/GITBOOK_API_URL
47+
GITBOOK_API_PUBLIC_URL: ${{ inputs.opItem }}/GITBOOK_API_PUBLIC_URL
4748
GITBOOK_API_TOKEN: ${{ inputs.opItem }}/GITBOOK_API_TOKEN
4849
GITBOOK_INTEGRATIONS_HOST: ${{ inputs.opItem }}/GITBOOK_INTEGRATIONS_HOST
4950
GITBOOK_IMAGE_RESIZE_SIGNING_KEY: ${{ inputs.opItem }}/GITBOOK_IMAGE_RESIZE_SIGNING_KEY

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ runs:
4949
GITBOOK_SECRET: ${{ inputs.opItem }}/GITBOOK_SECRET
5050
GITBOOK_APP_URL: ${{ inputs.opItem }}/GITBOOK_APP_URL
5151
GITBOOK_API_URL: ${{ inputs.opItem }}/GITBOOK_API_URL
52+
GITBOOK_API_PUBLIC_URL: ${{ inputs.opItem }}/GITBOOK_API_PUBLIC_URL
5253
GITBOOK_API_TOKEN: ${{ inputs.opItem }}/GITBOOK_API_TOKEN
5354
GITBOOK_INTEGRATIONS_HOST: ${{ inputs.opItem }}/GITBOOK_INTEGRATIONS_HOST
5455
GITBOOK_IMAGE_RESIZE_SIGNING_KEY: ${{ inputs.opItem }}/GITBOOK_IMAGE_RESIZE_SIGNING_KEY

.github/workflows/deploy-preview.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,8 @@ jobs:
190190
- name: Run Playwright tests
191191
run: bun e2e
192192
env:
193-
BASE_URL: ${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/
193+
BASE_URL: ${{ needs.deploy-v2-vercel.outputs.deployment-url }}
194+
SITE_BASE_URL: ${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/
194195
ARGOS_TOKEN: ${{ secrets.ARGOS_TOKEN }}
195196
ARGOS_BUILD_NAME: 'v2-vercel'
196197
visual-testing-customers-v1:
@@ -230,7 +231,8 @@ jobs:
230231
- name: Run Playwright tests
231232
run: bun e2e-customers
232233
env:
233-
BASE_URL: ${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/
234+
BASE_URL: ${{ needs.deploy-v2-vercel.outputs.deployment-url }}
235+
SITE_BASE_URL: ${{ needs.deploy-v2-vercel.outputs.deployment-url }}/url/
234236
ARGOS_TOKEN: ${{ secrets.ARGOS_TOKEN }}
235237
ARGOS_BUILD_NAME: 'customers-v2'
236238
pagespeed-testing-v1:
@@ -247,7 +249,7 @@ jobs:
247249
env:
248250
PUPPETEER_SKIP_DOWNLOAD: 1
249251
- name: Run pagespeed tests
250-
run: bun ./packages/gitbook/tests/pagespeed-testing.ts $DEPLOYMENT_URL
252+
run: bun ./packages/gitbook/tests/pagespeed-testing.ts
251253
env:
252-
DEPLOYMENT_URL: ${{needs.deploy-v1-cloudflare.outputs.deployment-url}}
254+
BASE_URL: ${{needs.deploy-v1-cloudflare.outputs.deployment-url}}
253255
PAGESPEED_API_KEY: ${{ secrets.PAGESPEED_API_KEY }}

.prettierignore

Lines changed: 0 additions & 17 deletions
This file was deleted.

.prettierrc.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)