Merge branch 'production' into rebecca/internal-dns-initial-docs

Author: RebeccaTamachiro

.gitattributes

@@ -4,13 +4,15 @@
 *.html text eol=lf
 *.ini text eol=lf
 *.js text eol=lf
+*.jsx text eol=lf
 *.json text eol=lf
 *.md text eol=lf
 *.mdx text eol=lf
 *.mjs text eol=lf
 *.svg text eol=lf
 *.toml text eol=lf
 *.ts text eol=lf
+*.tsx text eol=lf
 *.txt text eol=lf
 *.vue text eol=lf
 *.xml text eol=lf

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

@@ -5,8 +5,6 @@ name: Anchor link audit
 # **Who does it impact**: PCX team
 
 on:
-  schedule:
-    - cron: "0 0 * * 0" # Run at 00:00 UTC every Sunday
   workflow_dispatch:
 
 jobs:

.github/workflows/pr.yml

@@ -18,3 +18,27 @@ jobs:
       - uses: ./.github/actions/assign-pr
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  review_comment:
+    name: Add review comment
+    runs-on: ubuntu-latest
+    steps:
+      - id: check_if_contributor_is_external
+        name: Check if contributor is external
+        run: 'curl --write-out ''%{http_code}'' --silent --output /dev/null -L -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ env.GH_TOKEN }}" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/orgs/cloudflare/members/${{ github.event.pull_request.user.login }} | grep -q ''204'' && echo "is_external=false" >> $GITHUB_OUTPUT || echo "is_external=true" >> $GITHUB_OUTPUT'
+        env:
+          GH_TOKEN: ${{ secrets.HOLOPIN_LABELER }}
+      - name: External comment
+        run: gh pr comment "$NUMBER" --body "Howdy and thanks for contributing to our repo. We review new, external PRs within **2 weeks**. If it's been longer than then without any movement, tag the PR **Assignees** in a comment."
+        if: steps.check_if_contributor_is_external.outputs.is_external == 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.pull_request.number }}
+      - name: Internal comment
+        run: gh pr comment "$NUMBER" --body "Howdy and thanks for contributing to our repo. We review internal PRs with **1 week**. If it's something urgent or has been sitting without a comment, start a thread in the *Developer Docs* space internally."
+        if: steps.check_if_contributor_is_external.outputs.is_external == 'false'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.pull_request.number }}

.github/workflows/publish-preview.yml

@@ -45,6 +45,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: npx tsx bin/post-preview-url-comment/index.ts
+        continue-on-error: true
       - uses: actions/cache/save@v4
         if: always()
         with:

bin/post-preview-url-comment/index.node.test.ts

@@ -63,13 +63,13 @@ describe("filenameToPath", () => {
 
 	test("changelog", () => {
 		expect(
-			filenameToPath("src/content/changelogs-next/2025-02-05-title.mdx"),
+			filenameToPath("src/content/changelog/workers/2025-02-05-title.mdx"),
 		).toEqual("changelog/2025-02-05-title/");
 	});
 
 	test("changelog base", () => {
 		expect(
-			`${DOCS_BASE_URL}/${filenameToPath("src/content/changelogs-next/2025-02-05-title.mdx")}`,
+			`${DOCS_BASE_URL}/${filenameToPath("src/content/changelog/workers/2025-02-05-title.mdx")}`,
 		).toEqual("https://developers.cloudflare.com/changelog/2025-02-05-title/");
 	});
 });

bin/post-preview-url-comment/index.ts

@@ -77,7 +77,7 @@ async function run(): Promise<void> {
 				(file) =>
 					file.filename.endsWith(".mdx") &&
 					(file.filename.startsWith(`${CONTENT_BASE_PATH}/docs/`) ||
-						file.filename.startsWith(`${CONTENT_BASE_PATH}/changelogs-next/`)),
+						file.filename.startsWith(`${CONTENT_BASE_PATH}/changelog/`)),
 			)
 			.sort((a, b) => b.changes - a.changes)
 			.slice(0, 15) // Limit to 15 entries

bin/post-preview-url-comment/util.ts

@@ -3,20 +3,24 @@ import { execSync } from "node:child_process";
 import { CONTENT_BASE_PATH } from "./constants";
 
 export const filenameToPath = (filename: string) => {
-	return filename
+	const segments = filename
 		.replace(CONTENT_BASE_PATH, "")
 		.replace(".mdx", "")
 		.split("/")
-		.filter(Boolean)
+		.filter(Boolean);
+
+	const changelogIdx = segments.findIndex((s) => s === "changelog");
+
+	if (changelogIdx !== -1) {
+		segments.splice(changelogIdx + 1, 1);
+	}
+
+	return segments
 		.flatMap((segment) => {
 			if (segment === "docs") {
 				return [];
 			}
 
-			if (segment === "changelogs-next") {
-				segment = "changelog";
-			}
-
 			const slugified = slug(segment);
 
 			if (slugified === "1111") {

package-lock.json

@@ -10,9 +10,10 @@
 		"check:astro": "npx astro check",
 		"check:worker": "npx tsc --noEmit -p ./worker/tsconfig.json",
 		"dev": "npx astro dev",
-		"format": "npm run format:core && npm run format:data",
-		"format:core": "npx prettier --write \"**/*.{js,jsx,ts,tsx,mjs,css}\"",
+		"format": "npm run format:core:fix && npm run format:data",
+		"format:core": "npx prettier \"**/*.{js,jsx,ts,tsx,mjs,css}\"",
 		"format:core:check": "npm run format:core -- --check",
+		"format:core:fix": "npm run format:core -- --write",
 		"format:content": "npx prettier --write \"**/*.{md,mdx,astro}\"",
 		"format:data": "npx prettier --write \"**/*.{json,yaml,yml}\"",
 		"postinstall": "npm run sync",
@@ -46,7 +47,7 @@
 		"@types/node": "22.13.2",
 		"@types/react": "19.0.7",
 		"@types/react-dom": "19.0.3",
-		"@typescript-eslint/parser": "8.24.0",
+		"@typescript-eslint/parser": "8.24.1",
 		"algoliasearch": "5.20.2",
 		"astro": "5.2.1",
 		"astro-breadcrumbs": "3.3.1",
@@ -74,7 +75,7 @@
 		"mdast-util-mdx-expression": "2.0.1",
 		"mermaid": "11.4.1",
 		"node-html-parser": "7.0.1",
-		"prettier": "3.5.0",
+		"prettier": "3.5.1",
 		"prettier-plugin-astro": "0.14.1",
 		"prettier-plugin-tailwindcss": "0.6.9",
 		"pretty-bytes": "6.1.1",
@@ -91,7 +92,7 @@
 		"rehype-title-figure": "0.1.2",
 		"remark": "15.0.1",
 		"sharp": "0.33.5",
-		"solarflare-theme": "0.0.2",
+		"solarflare-theme": "0.0.4",
 		"starlight-image-zoom": "0.10.1",
 		"starlight-links-validator": "0.14.2",
 		"starlight-package-managers": "0.10.0",

package.json

@@ -1761,6 +1761,7 @@
 /cloudflare-one/identity/devices/require-warp/ /cloudflare-one/identity/devices/warp-client-checks/require-warp/ 301
 /cloudflare-one/identity/devices/sentinel-one/ /cloudflare-one/identity/devices/warp-client-checks/sentinel-one/ 301
 /cloudflare-one/identity/idp-integration/azuread/ /cloudflare-one/identity/entra-id/ 301
+/cloudflare-one/identity/entra-id/ /cloudflare-one/identity/idp-integration/entra-id/ 301
 /cloudflare-one/identity/idp-integration/one-time-pin/ /cloudflare-one/identity/one-time-pin/ 301
 /cloudflare-one/identity/idp-integration/saml-centrify/ /cloudflare-one/identity/idp-integration/centrify-saml/ 301
 /cloudflare-one/identity/idp-integration/ping-saml/ /cloudflare-one/identity/idp-integration/pingfederate-saml/ 301