Skip to content

Commit c7d1b08

Browse files
committed
Resolving merge conflict
2 parents bd6d2c8 + ada5104 commit c7d1b08

File tree

3,263 files changed

+60882
-54667
lines changed

Some content is hidden

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

3,263 files changed

+60882
-54667
lines changed

.github/CODEOWNERS

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
# AI
2222

2323
/src/content/docs/agents/ @irvinebroque @rita3ko @elithrar @thomasgauvin @threepointone @cloudflare/pcx-technical-writing
24-
/src/content/docs/ai-gateway/ @kathayl @mchenco @daisyfaithauma @cloudflare/pcx-technical-writing
25-
/src/content/docs/workers-ai/ @rita3ko @craigsdennis @markdembo @mchenco @daisyfaithauma @cloudflare/pcx-technical-writing
24+
/src/content/docs/ai-gateway/ @kathayl @mchenco @kodster28 @cloudflare/pcx-technical-writing
25+
/src/content/docs/workers-ai/ @rita3ko @craigsdennis @markdembo @mchenco @kodster28 @cloudflare/pcx-technical-writing
2626
/src/content/docs/vectorize/ @elithrar @vy-ton @sejoker @mchenco @cloudflare/pcx-technical-writing
2727
/src/content/partials/vectorize/ @elithrar @mchenco @sejoker @cloudflare/pcx-technical-writing
28-
/src/content/release-notes/workers-ai.yaml @kathayl @mchenco @daisyfaithauma @cloudflare/pcx-technical-writing
29-
/src/content/release-notes/ai-gateway.yaml @kathayl @mchenco @daisyfaithauma @cloudflare/pcx-technical-writing
28+
/src/content/release-notes/workers-ai.yaml @kathayl @mchenco @kodster28 @cloudflare/pcx-technical-writing
29+
/src/content/release-notes/ai-gateway.yaml @kathayl @mchenco @kodster28 @cloudflare/pcx-technical-writing
3030
/src/content/release-notes/vectorize.yaml @elithrar @mchenco @sejoker @cloudflare/pcx-technical-writing
31-
/src/content/docs/autorag/ @rita3ko @irvinebroque @aninibread @ToriLindsay @cloudflare/pcx-technical-writing
31+
/src/content/docs/autorag/ @rita3ko @irvinebroque @aninibread @cloudflare/pcx-technical-writing
3232

3333
# Analytics & Logs
3434

@@ -38,19 +38,20 @@
3838

3939
# API & Zones
4040

41-
/src/content/docs/pulumi/ @cloudflare/pcx-technical-writing
41+
/src/content/docs/pulumi/ @dcpena @cloudflare/pcx-technical-writing
4242
/src/content/docs/tenant/ @dcpena @cloudflare/pcx-technical-writing
43-
/src/content/docs/terraform/ @ranbel @cloudflare/pcx-technical-writing
43+
/src/content/docs/terraform/ @dcpena @cloudflare/pcx-technical-writing
4444
/src/content/docs/version-management/ @dcpena @cloudflare/pcx-technical-writing
4545

4646
# Browser Rendering API
4747

48-
/src/content/docs/browser-rendering/ @mchenco @cloudflare/pcx-technical-writing @celso @danielgek @kathayl
48+
/src/content/docs/browser-rendering/ @mchenco @cloudflare/pcx-technical-writing @celso @danielgek @kathayl @ToriLindsay
4949

5050
# Changelogs
5151

52-
/src/content/changelog/ @cloudflare/pm-changelogs @cloudflare/pcx-cloudflare-one
53-
/src/assets/images/changelog/ @cloudflare/pm-changelogs @cloudflare/pcx-cloudflare-one
52+
/src/content/changelog/ @cloudflare/pm-changelogs @cloudflare/pcx-technical-writing
53+
/src/content/changelog/waf/ @cloudflare/firewall @vs-mg @cloudflare/pm-changelogs @cloudflare/pcx-technical-writing
54+
/src/assets/images/changelog/ @cloudflare/pm-changelogs @cloudflare/pcx-technical-writing
5455
/src/assets/images/ @cloudflare/pm-changelogs @cloudflare/pcx-technical-writing
5556

5657
# Cloudflare One
@@ -87,62 +88,59 @@
8788
/src/content/docs/network-error-logging/ @dcpena @cloudflare/pcx-technical-writing
8889
/src/content/docs/network-interconnect/ @marciocloudflare @cloudflare/pcx-technical-writing
8990
/src/content/docs/notifications/ @dcpena @cloudflare/pcx-technical-writing
90-
/src/content/docs/registrar/ @jason-cf @cloudflare/pcx-technical-writing
91+
/src/content/docs/registrar/ @dcpena @cloudflare/pcx-technical-writing
9192
/src/content/docs/rules/ @pedrosousa @cloudflare/pcx-technical-writing
9293
/src/content/docs/ruleset-engine/ @pedrosousa @cloudflare/pcx-technical-writing
94+
/src/content/docs/log-explorer/ @angelampcosta @cloudflare/pcx-technical-writing
9395

9496
# Developer Platform
9597

96-
/src/content/docs/realtime/ @cloudflare/pcx-technical-writing @cloudflare/calls
97-
/src/assets/images/realtime/ @cloudflare/pcx-technical-writing @cloudflare/calls
98-
/public/realtime/ @cloudflare/pcx-technical-writing @cloudflare/calls
98+
/src/content/docs/containers/ @mikenomitch @th0m @cloudflare/pcx-technical-writing @cloudflare/cloudchamber
99+
/src/content/release-notes/containers.yaml @mikenomitch @th0m @cloudflare/pcx-technical-writing
99100
/src/content/docs/d1/ @elithrar @rozenmd @vy-ton @joshthoward @oxyjun @harshil1712 @cloudflare/pcx-technical-writing
100101
/src/content/release-notes/d1.yaml @elithrar @rozenmd @vy-ton @joshthoward @oxyjun @cloudflare/pcx-technical-writing
101102
/src/content/partials/d1/ @elithrar @rozenmd @vy-ton @joshthoward @oxyjun @harshil1712 @cloudflare/pcx-technical-writing
102-
/src/content/docs/durable-objects/ @elithrar @vy-ton @joshthoward @oxyjun @harshil1712 @cloudflare/pcx-technical-writing
103+
/src/content/docs/ai-audit/ @oxyjun @kodster28 @cloudflare/pcx-technical-writing
104+
/src/content/docs/durable-objects/ @elithrar @vy-ton @joshthoward @oxyjun @harshil1712 @mikenomitch @cloudflare/pcx-technical-writing @cloudflare/workers-runtime-1
103105
/src/content/release-notes/durable-objects.yaml @elithrar @rozenmd @vy-ton @joshthoward @oxyjun @cloudflare/pcx-technical-writing
104106
/src/content/docs/email-routing/ @cloudflare/pcx-technical-writing
105107
/src/content/docs/hyperdrive/ @elithrar @thomasgauvin @sejoker @oxyjun @cloudflare/pcx-technical-writing
106108
/src/content/release-notes/hyperdrive.yaml @elithrar @thomasgauvin @sejoker @oxyjun @cloudflare/pcx-technical-writing
107109
/src/content/partials/hyperdrive/ @elithrar @thomasgauvin @sejoker @oxyjun @cloudflare/pcx-technical-writing
108110
/src/content/release-notes/durable-objects.yaml @elithrar @vy-ton @joshthoward @oxyjun @cloudflare/pcx-technical-writing
109-
/src/content/docs/images/ @dcpena @cloudflare/pcx-technical-writing @renandincer @third774
110-
/src/content/docs/pages/ @cloudflare/workers-docs @GregBrimble @WalshyDev @aninibread @irvinebroque @cloudflare/pcx-technical-writing @ToriLindsay
111-
/src/assets/images/pages/ @cloudflare/workers-docs @GregBrimble @WalshyDev @aninibread @cloudflare/pcx-technical-writing @ToriLindsay
111+
/src/content/docs/images/ @ToriLindsay @cloudflare/pcx-technical-writing @renandincer @third774
112+
/src/content/docs/pages/ @cloudflare/workers-docs @GregBrimble @WalshyDev @aninibread @irvinebroque @cloudflare/pcx-technical-writing @kodster28
113+
/src/assets/images/pages/ @cloudflare/workers-docs @GregBrimble @WalshyDev @aninibread @cloudflare/pcx-technical-writing @kodster28
112114
/src/content/release-notes/pages.yaml @cloudflare/workers-docs @GregBrimble @WalshyDev @aninibread @cloudflare/pcx-technical-writing
113115
/src/content/docs/kv/ @elithrar @thomasgauvin @rts-rob @oxyjun @cloudflare/pcx-technical-writing
114116
/src/content/release-notes/kv.yaml @elithrar @thomasgauvin @rts-rob @oxyjun @cloudflare/pcx-technical-writing
115117
/src/content/partials/kv/ @elithrar @thomasgauvin @rts-rob @oxyjun @cloudflare/pcx-technical-writing
116118
/src/content/docs/pub-sub/ @elithrar @dcpena @cloudflare/pcx-technical-writing
117-
/src/content/docs/queues/ @elithrar @maheshwarip @harshil1712 @cloudflare/pcx-technical-writing
118-
/src/content/release-notes/queues.yaml @elithrar @maheshwarip @cloudflare/pcx-technical-writing
119+
/src/content/docs/queues/ @elithrar @jonesphillip @harshil1712 @cloudflare/pcx-technical-writing
120+
/src/content/release-notes/queues.yaml @elithrar @jonesphillip @cloudflare/pcx-technical-writing
119121
/src/content/docs/r2/ @oxyjun @elithrar @jonesphillip @aninibread @harshil1712 @cloudflare/workers-docs @cloudflare/pcx-technical-writing
120122
/src/content/release-notes/r2.yaml @oxyjun @elithrar @aninibread @cloudflare/workers-docs @cloudflare/pcx-technical-writing
121-
/src/content/docs/stream/ @tsmith512 @dcpena @cloudflare/pcx-technical-writing @renandincer @third774
122-
/src/content/release-notes/stream.yaml @tsmith512 @dcpena @cloudflare/pcx-technical-writing
123-
/src/content/docs/workers/ @cloudflare/workers-docs @GregBrimble @irvinebroque @mikenomitch @WalshyDev @cloudflare/deploy-config @cloudflare/pcx-technical-writing @ToriLindsay @cloudflare/wrangler
124-
/src/content/partials/workers/ @cloudflare/workers-docs @GregBrimble @irvinebroque @mikenomitch @WalshyDev @cloudflare/deploy-config @cloudflare/pcx-technical-writing @ToriLindsay @cloudflare/wrangler
125-
/src/assets/images/workers/ @cloudflare/workers-docs @GregBrimble @irvinebroque @WalshyDev @cloudflare/deploy-config @cloudflare/pcx-technical-writing @ToriLindsay @cloudflare/wrangler
123+
/src/content/docs/realtime/ @cloudflare/pcx-technical-writing @cloudflare/calls
124+
/src/assets/images/realtime/ @cloudflare/pcx-technical-writing @cloudflare/calls
125+
/public/realtime/ @cloudflare/pcx-technical-writing @cloudflare/calls
126+
/src/content/docs/stream/ @tsmith512 @ToriLindsay @cloudflare/pcx-technical-writing @renandincer @third774
127+
/src/content/release-notes/stream.yaml @tsmith512 @ToriLindsay @cloudflare/pcx-technical-writing
128+
/src/content/docs/workers/ @cloudflare/workers-docs @GregBrimble @irvinebroque @mikenomitch @korinne @WalshyDev @cloudflare/deploy-config @cloudflare/pcx-technical-writing @kodster28 @cloudflare/wrangler @cloudflare/workers-runtime-1 @cloudflare/wrangler
129+
/src/content/partials/workers/ @cloudflare/workers-docs @GregBrimble @irvinebroque @mikenomitch @WalshyDev @cloudflare/deploy-config @cloudflare/pcx-technical-writing @kodster28 @cloudflare/wrangler @cloudflare/workers-runtime-1 @cloudflare/wrangler
130+
/src/assets/images/workers/ @cloudflare/workers-docs @GregBrimble @irvinebroque @WalshyDev @cloudflare/deploy-config @cloudflare/pcx-technical-writing @kodster28 @cloudflare/wrangler @cloudflare/workers-runtime-1 @cloudflare/wrangler
126131
/src/content/release-notes/workers.yaml @cloudflare/workers-docs @GregBrimble @WalshyDev @aninibread @cloudflare/deploy-config @cloudflare/pcx-technical-writing @irvinebroque @mikenomitch
127132
/src/content/docs/zaraz/ @bjesus @jonnyparris @simonabadoiu @cloudflare/pcx-technical-writing
128133
/src/content/release-notes/zaraz.yaml @bjesus @jonnyparris @simonabadoiu @cloudflare/pcx-technical-writing
129-
/src/content/docs/workers/ci-cd/ @irvinebroque @aninibread @GregBrimble @ToriLindsay @cloudflare/pcx-technical-writing
130-
/src/content/docs/workers/runtime-apis/ @irvinebroque @jasnell @mikenomitch @GregBrimble @ToriLindsay @cloudflare/pcx-technical-writing
131-
/src/content/docs/workers/runtime-apis/bindings/ @irvinebroque @mikenomitch @GregBrimble @ToriLindsay @cloudflare/pcx-technical-writing
132-
/src/content/docs/workers/platform/ @irvinebroque @GregBrimble @cloudflare/deploy-config @cloudflare/pcx-technical-writing
133-
/src/content/docs/workers/configuration/compatibility-dates.mdx @irvinebroque @mikenomitch @GregBrimble @ToriLindsay @cloudflare/deploy-config @cloudflare/pcx-technical-writing
134-
/src/content/docs/workers/configuration/compatibility-flags.mdx @irvinebroque @mikenomitch @GregBrimble @ToriLindsay @cloudflare/deploy-config @cloudflare/pcx-technical-writing
135-
136-
/src/content/docs/workers/reference/migrate-to-module-workers.mdx @irvinebroque @GregBrimble @ToriLindsay @cloudflare/deploy-config @cloudflare/pcx-technical-writing
137-
/src/content/docs/workers/reference/security-model.mdx @irvinebroque @GregBrimble @ToriLindsay @cloudflare/pcx-technical-writing
134+
/src/content/docs/workers/ci-cd/ @irvinebroque @aninibread @GregBrimble @kodster28 @cloudflare/pcx-technical-writing
138135
/src/content/compatibility-flags/ @irvinebroque @mikenomitch @GregBrimble @cloudflare/pcx-technical-writing
139-
/src/content/docs/workers/wrangler/ @cloudflare/wrangler @irvinebroque @ToriLindsay @cloudflare/pcx-technical-writing
140-
/src/content/docs/workers/frameworks/ @igorminar @cloudflare/wrangler @aninibread @GregBrimble @ToriLindsay @cloudflare/pcx-technical-writing
141-
/src/content/docs/pages/framework-guides/ @igorminar @cloudflare/wrangler @aninibread @GregBrimble @ToriLindsay @cloudflare/pcx-technical-writing
136+
/src/content/docs/workers/wrangler/ @cloudflare/wrangler @irvinebroque @kodster28 @cloudflare/pcx-technical-writing @cloudflare/workers-runtime-1
137+
/src/content/docs/workers/frameworks/ @igorminar @cloudflare/wrangler @aninibread @GregBrimble @kodster28 @cloudflare/pcx-technical-writing
138+
/src/content/docs/pages/framework-guides/ @igorminar @cloudflare/wrangler @aninibread @GregBrimble @kodster28 @cloudflare/pcx-technical-writing
142139
/src/content/docs/analytics/analytics-engine/ @irvinebroque @elithrar @cloudflare/pcx-technical-writing
143-
/src/content/docs/cloudflare-for-platforms/workers-for-platforms/ @irvinebroque @angelampcosta @GregBrimble @cloudflare/deploy-config @cloudflare/pcx-technical-writing
144-
/src/content/docs/workers/observability/ @irvinebroque @mikenomitch @rohinlohe @ToriLindsay @cloudflare/pcx-technical-writing
145-
/src/content/docs/workers/static-assets @irvinebroque @GregBrimble @WalshyDev @ToriLindsay @cloudflare/deploy-config @cloudflare/pcx-technical-writing
140+
/src/content/docs/cloudflare-for-platforms/ @irvinebroque @dinasaur404 @cloudflare/pcx-technical-writing
141+
/src/content/docs/cloudflare-for-platforms/workers-for-platforms/ @irvinebroque @dinasaur404 @cloudflare/deploy-config @cloudflare/pcx-technical-writing
142+
/src/content/docs/workers/observability/ @irvinebroque @mikenomitch @rohinlohe @kodster28 @cloudflare/pcx-technical-writing
143+
/src/content/docs/workers/static-assets @irvinebroque @GregBrimble @WalshyDev @kodster28 @cloudflare/deploy-config @cloudflare/pcx-technical-writing
146144
/src/content/docs/workflows/ @elithrar @celso @cloudflare/pcx-technical-writing
147145

148146
# DDoS Protection
@@ -154,7 +152,6 @@
154152

155153
# Docs team areas
156154

157-
/src/content/docs/docs-guide/ @dcpena @cloudflare/pcx-technical-writing
158155
/src/content/docs/style-guide/ @dcpena @cloudflare/pcx-technical-writing
159156

160157
# Google tag gateway
@@ -231,3 +228,6 @@
231228
# Web Analytics
232229

233230
/src/content/docs/web-analytics/ @angelampcosta @cloudflare/pcx-technical-writing
231+
232+
# AI Prompts for Cloudflare Workers development
233+
/public/workers/prompts/ @jahands @Maximo-Guk @jbwcloudflare @cloudflare/pcx-technical-writing

.github/actions/assign-issue/index.ts renamed to .github/actions/issue-label-assign/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ import * as codeOwnersUtils from "codeowners-utils";
8484

8585
console.log("Assignees added (if present)");
8686

87-
// Add labels for future reporting
87+
// Add "product" labels
8888

8989
const labelPrefix = "product:";
9090
const newLabels = new Set<string>();

.github/actions/assign-issue/package-lock.json renamed to .github/actions/issue-label-assign/package-lock.json

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

.github/actions/assign-issue/package.json renamed to .github/actions/issue-label-assign/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"version": "0.0.0",
4-
"name": "assign-issue",
4+
"name": "issue-label-assign",
55
"scripts": {
66
"build": "esbuild index.ts --bundle --format=cjs --platform=node --minify --outfile=index.js"
77
},
File renamed without changes.

.github/pull_request_template.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
<!-- Remove items that do not apply -->
1212

13+
- [ ] Is there a [changelog](https://developers.cloudflare.com/changelog/) entry ([guidelines](https://developers.cloudflare.com/style-guide/documentation-content-strategy/content-types/changelog/))? If you don't add one for something awesome and new (however small) — how will our customers find out? Changelogs are automatically posted to [RSS feeds](https://developers.cloudflare.com/fundamentals/new-features/available-rss-feeds/), the [Discord](https://discord.com/channels/595317990191398933/1040420029080018945), and [X](https://x.com/CFchangelog).
1314
- [ ] The [documentation style guide](https://developers.cloudflare.com/style-guide/) has been adhered to.
1415
- [ ] If a larger change - such as adding a new page- an issue has been opened in relation to any incorrect or out of date information that this PR fixes.
1516
- [ ] Files which have changed name or location have been allocated [redirects](https://developers.cloudflare.com/pages/configuration/redirects/#per-file).

.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

0 commit comments

Comments
 (0)