Skip to content

Commit 1c9c8c9

Browse files
committed
Resolved merge conflict
2 parents b9bddd8 + 8330bbb commit 1c9c8c9

File tree

42 files changed

+675
-672
lines changed

Some content is hidden

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

42 files changed

+675
-672
lines changed

.github/workflows/anchor-link-audit.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838

3939
- run: npm run build
4040
env:
41+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4142
NODE_OPTIONS: "--max-old-space-size=4192"
4243

4344
- name: Install dependencies

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
## TODO: content formatting checks
4848
- run: npm run build
4949
env:
50+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5051
NODE_OPTIONS: "--max-old-space-size=4192"
5152
RUN_LINK_CHECK: true
5253

.github/workflows/publish-preview.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
- run: npm run build
3333
name: Build
3434
env:
35+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3536
NODE_OPTIONS: --max-old-space-size=4096
3637
- name: Deploy to Cloudflare Workers
3738
env:

astro.config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import rehypeMermaid from "./src/plugins/rehype/mermaid.ts";
1616
import rehypeAutolinkHeadings from "./src/plugins/rehype/autolink-headings.ts";
1717
import rehypeExternalLinks from "./src/plugins/rehype/external-links.ts";
1818
import rehypeHeadingSlugs from "./src/plugins/rehype/heading-slugs.ts";
19+
import rehypeShiftHeadings from "./src/plugins/rehype/shift-headings.ts";
1920

2021
async function autogenSections() {
2122
const sections = (
@@ -67,6 +68,7 @@ export default defineConfig({
6768
rehypeAutolinkHeadings,
6869
// @ts-expect-error plugins types are outdated but functional
6970
rehypeTitleFigure,
71+
rehypeShiftHeadings,
7072
],
7173
},
7274
image: {

package-lock.json

Lines changed: 40 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@astrojs/starlight": "0.34.3",
3636
"@astrojs/starlight-docsearch": "0.6.0",
3737
"@astrojs/starlight-tailwind": "4.0.1",
38-
"@cloudflare/vitest-pool-workers": "0.8.30",
38+
"@cloudflare/vitest-pool-workers": "0.8.31",
3939
"@cloudflare/workers-types": "4.20250514.0",
4040
"@codingheads/sticky-header": "1.0.2",
4141
"@expressive-code/plugin-collapsible-sections": "0.41.2",
@@ -62,7 +62,7 @@
6262
"codeowners-utils": "1.0.2",
6363
"date-fns": "4.1.0",
6464
"dedent": "1.6.0",
65-
"dompurify": "3.2.5",
65+
"dompurify": "3.2.6",
6666
"dot-prop": "9.0.0",
6767
"eslint": "9.27.0",
6868
"eslint-plugin-astro": "1.3.1",
@@ -71,14 +71,14 @@
7171
"fast-glob": "3.3.3",
7272
"fast-xml-parser": "5.2.3",
7373
"github-slugger": "2.0.0",
74-
"globals": "16.0.0",
74+
"globals": "16.1.0",
7575
"hast-util-heading-rank": "3.0.0",
7676
"hast-util-select": "6.0.4",
7777
"hastscript": "9.0.1",
7878
"he": "1.2.0",
7979
"jsonc-parser": "3.3.1",
8080
"lz-string": "1.5.0",
81-
"marked": "15.0.11",
81+
"marked": "15.0.12",
8282
"mdast-util-from-markdown": "2.0.2",
8383
"mdast-util-mdx": "3.0.0",
8484
"mdast-util-mdx-expression": "2.0.1",

public/__redirects

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,6 +1298,8 @@
12981298
/support/account-management-billing/cloudflare-billing-policy/ /billing/billing-policy/ 301
12991299
/support/account-management-billing/billing-add-on-service/ /billing/usage-based-billing/ 301
13001300
/support/account-management-billing/understanding-cloudflare-sales-tax/ /billing/sales-tax/ 301
1301+
/support/account-management-billing/ /support/troubleshooting/general-troubleshooting/cannot-locate-dashboard-account/ 301
1302+
/support/account-management-billing/cannot-locate-dashboard-account/ /support/troubleshooting/general-troubleshooting/cannot-locate-dashboard-account/ 301
13011303

13021304
# r2
13031305
/r2/platform/s3-compatibility/api/ /r2/api/s3/api/ 301
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
import { z } from "astro:schema";
3+
import { Code } from "@astrojs/starlight/components";
4+
import Details from "~/components/Details.astro";
5+
6+
type Props = z.infer<typeof props>;
7+
8+
const props = z.object({
9+
name: z.string(),
10+
});
11+
12+
const { name } = props.parse(Astro.props);
13+
14+
const worker = `
15+
export interface Env {
16+
AI: Ai;
17+
}
18+
19+
export default {
20+
async fetch(request, env): Promise<Response> {
21+
const { audio } = await env.AI.run('${name}', {
22+
prompt: 'Hello world',
23+
lang: 'en',
24+
});
25+
// Returns the base64 encoded MP3 audio
26+
return Response.json({ audio });
27+
},
28+
} satisfies ExportedHandler<Env>;`;
29+
---
30+
31+
<Details header="Workers - TypeScript">
32+
<Code code={worker} lang="ts" />
33+
</Details>

src/content/docs/secrets-store/index.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ Encrypt and store sensitive information as secrets that are securely reusable ac
1919

2020
<Plan id="secrets_store.properties.availability.summary" />
2121

22-
Cloudflare Secrets Store is a secure, centralized location in which account-level secrets are stored and managed. The secrets are securely encrypted and stored across all Cloudflare data centers.
22+
Cloudflare Secrets Store is a secure, centralized location in which account-level secrets are stored and managed. The secrets are securely encrypted and stored across all [Cloudflare data centers](https://www.cloudflare.com/network/).
2323

2424
Secrets Store is currently [compatible with Cloudflare Workers](/secrets-store/integrations/workers/). Integrations with other products will be added in the future.
2525

2626
:::note[China availability]
2727
Secrets Store is unavailable in the [Cloudflare China Network](/china-network/), operated by Cloudflare's partner JD Cloud.
28-
:::
28+
:::

src/content/docs/ssl/edge-certificates/changing-dcv-method/methods/delegated-dcv.mdx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ If you use a `dig` command to test, you should only be able see the placed token
9393
This is because Cloudflare places the tokens when needed and then cleans them up.
9494

9595
```sh
96-
dig TXT +noadditional +noquestion +nocomments +nocmd +nostats _acme-challenge.example.com. @1.1.1.1_acme-challenge.example.com. 3600 IN CNAME example.com.<COPIED_VALIDATION_URL>
96+
dig TXT +noadditional +noquestion +nocomments +nocmd +nostats _acme-challenge.example.com. @1.1.1.1
97+
98+
_acme-challenge.example.com. 3600 IN CNAME example.com.<COPIED_VALIDATION_URL>
9799
```
98100

99101
### Renewal

0 commit comments

Comments
 (0)