Merge branch 'production' into ranbel/ssh-logpush

Author: ranbel

astro.config.ts

@@ -11,6 +11,8 @@ import react from "@astrojs/react";
 import { readdir } from "fs/promises";
 import { fileURLToPath } from "url";
 
+import remarkValidateImages from "./src/plugins/remark/validate-images";
+
 import rehypeTitleFigure from "rehype-title-figure";
 import rehypeMermaid from "./src/plugins/rehype/mermaid.ts";
 import rehypeAutolinkHeadings from "./src/plugins/rehype/autolink-headings.ts";
@@ -61,6 +63,7 @@ export default defineConfig({
 	site: "https://developers.cloudflare.com",
 	markdown: {
 		smartypants: false,
+		remarkPlugins: [remarkValidateImages],
 		rehypePlugins: [
 			rehypeMermaid,
 			rehypeExternalLinks,

package-lock.json

@@ -36,7 +36,7 @@
 		"@astrojs/starlight-docsearch": "0.6.0",
 		"@astrojs/starlight-tailwind": "4.0.1",
 		"@cloudflare/vitest-pool-workers": "0.8.32",
-		"@cloudflare/workers-types": "4.20250522.0",
+		"@cloudflare/workers-types": "4.20250529.0",
 		"@codingheads/sticky-header": "1.0.2",
 		"@expressive-code/plugin-collapsible-sections": "0.41.2",
 		"@floating-ui/react": "0.27.8",
@@ -49,7 +49,7 @@
 		"@tailwindcss/postcss": "4.1.4",
 		"@types/hast": "3.0.4",
 		"@types/he": "1.2.3",
-		"@types/node": "22.15.19",
+		"@types/node": "22.15.29",
 		"@types/react": "19.0.7",
 		"@types/react-dom": "19.0.4",
 		"@typescript-eslint/parser": "8.32.1",
@@ -71,7 +71,7 @@
 		"fast-glob": "3.3.3",
 		"fast-xml-parser": "5.2.3",
 		"github-slugger": "2.0.0",
-		"globals": "16.1.0",
+		"globals": "16.2.0",
 		"hast-util-heading-rank": "3.0.0",
 		"hast-util-select": "6.0.4",
 		"hastscript": "9.0.1",

package.json

@@ -37,7 +37,7 @@
 /ssl/changelog/index.xml /changelog/rss/ssl.xml 301
 
 ## legacy
-/changelog/index.xml /release-notes/index.xml 301
+/release-notes/index.xml /changelog/rss/index.xml 301
 /release-notes/ /changelog/ 301
 
 # 1dot1_redirect
@@ -711,6 +711,7 @@
 /fundamentals/setup/account/customize-account/appearance/ /fundamentals/account/customize-account/ 301
 /fundamentals/setup/account/customize-account/communication-preference/ /fundamentals/account/customize-account/ 301
 /fundamentals/setup/account/customize-account/language-preference/ /fundamentals/account/customize-account/ 301
+/fundamentals/setup/ /fundamentals/account/ 301
 /fundamentals/setup/account/* /fundamentals/account/:splat 301
 /fundamentals/setup/manage-domains/* /fundamentals//manage-domains/:splat 301
 /fundamentals/setup/manage-members/* /fundamentals/manage-members/:splat 301
@@ -1317,7 +1318,7 @@
 /support/account-management-billing/cloudflare-billing-policy/ /billing/billing-policy/ 301
 /support/account-management-billing/billing-add-on-service/ /billing/usage-based-billing/ 301
 /support/account-management-billing/understanding-cloudflare-sales-tax/ /billing/sales-tax/ 301
-/support/account-management-billing/ /support/troubleshooting/general-troubleshooting/cannot-locate-dashboard-account/ 301 
+/support/account-management-billing/ /support/troubleshooting/general-troubleshooting/cannot-locate-dashboard-account/ 301
 /support/account-management-billing/cannot-locate-dashboard-account/ /support/troubleshooting/general-troubleshooting/cannot-locate-dashboard-account/ 301
 
 # r2

public/__redirects

@@ -1,4 +1,7 @@
 ---
+import { Image } from "astro:assets";
+import PrivacyChoicesImage from "~/assets/privacyoptions.svg";
+
 const isProduction = import.meta.env.PROD;
 
 const uuid = isProduction
@@ -17,7 +20,10 @@ const uuid = isProduction
 	function OptanonWrapper() {}
 </script>
 <!-- OneTrust Cookies Settings button start -->
-<button id="ot-sdk-btn" class="ot-sdk-show-settings">Cookie Settings</button>
+<div class="inline-flex items-center gap-2">
+	<Image src={PrivacyChoicesImage} alt="privacy options" height="12" />
+	<button id="ot-sdk-btn" class="ot-sdk-show-settings">Cookie Settings</button>
+</div>
 <!-- OneTrust Cookies Settings button end -->
 
 <style>

src/assets/images/changelog/cloudflare-one/gateway-analytics.png

@@ -90,7 +90,7 @@ if (
 }
 {!splash && <Default />}
 <div class="w-full">
-	<div class="grid grid-cols-2 gap-8 pb-10 pt-6 lg:grid-cols-5">
+	<div class="grid grid-cols-2 gap-8 pt-6 pb-10 lg:grid-cols-5">
 		{
 			groups.map(([title, items]) => (
 				<ul class="flex w-full list-none flex-col gap-3 pl-0">
@@ -114,15 +114,15 @@ if (
 	</div>
 	<div>
 		<ul
-			class="flex list-inside flex-wrap items-center justify-center gap-3 gap-y-4 pl-0 text-xs text-cl1-gray-4! dark:text-cl1-gray-7!"
+			class="text-cl1-gray-4! dark:text-cl1-gray-7! flex list-inside flex-wrap items-center justify-center gap-3 gap-y-4 pl-0 text-xs"
 		>
 			<li class="list-none">2025 Cloudflare, Inc.</li>
 			{
 				links.map(([text, href]) => (
 					<li>
 						<a
 							href={href}
-							class="text-cl1-gray-4! no-underline dark:text-cl1-gray-7!"
+							class="text-cl1-gray-4! dark:text-cl1-gray-7! no-underline"
 						>
 							{text}
 						</a>

src/assets/images/changelog/fundamentals/2025-06-02-permissions-policy-ux.png

@@ -9,6 +9,7 @@ import type { CollectionEntry } from "astro:content";
 
 const DEFAULT_TITLE_DELIMITER = "|";
 const NOINDEX_PRODUCTS = ["email-security", "style-guide", "security"];
+const CHATBOT_DEPRIORITIZE_PRODUCTS = ["firewall"];
 
 const currentSection = Astro.url.pathname.split("/")[1].replaceAll(".", "");
 
@@ -22,6 +23,10 @@ const shouldNoIndex =
 	frontmatter.noindex ||
 	frontmatter.external_link;
 
+const shouldChatbotDeprioritize =
+	CHATBOT_DEPRIORITIZE_PRODUCTS.includes(currentSection) ||
+	frontmatter.chatbot_deprioritize;
+
 if (currentSection) {
 	const product = await getEntry("products", currentSection);
 
@@ -83,6 +88,16 @@ if (shouldNoIndex) {
 	});
 }
 
+if (shouldChatbotDeprioritize) {
+	head.push({
+		tag: "meta",
+		attrs: {
+			name: "pcx_chatbot_deprioritize",
+			content: true,
+		},
+	});
+}
+
 if (
 	frontmatter.description &&
 	head.findIndex(