Merge branch 'production' into marcio/pcx15594-mconn-self-serve

Author: marciocloudflare

package-lock.json

@@ -27,7 +27,7 @@
 	"devDependencies": {
 		"@actions/core": "1.11.1",
 		"@actions/github": "6.0.1",
-		"@apidevtools/swagger-parser": "11.0.1",
+		"@apidevtools/swagger-parser": "12.0.0",
 		"@astrojs/check": "0.9.4",
 		"@astrojs/react": "4.2.5",
 		"@astrojs/rss": "4.0.11",
@@ -55,7 +55,7 @@
 		"@types/react-dom": "19.0.4",
 		"@typescript-eslint/parser": "8.34.1",
 		"algoliasearch": "5.27.0",
-		"astro": "5.9.3",
+		"astro": "5.10.1",
 		"astro-breadcrumbs": "3.3.1",
 		"astro-icon": "1.1.5",
 		"astro-live-code": "0.0.6",
@@ -98,7 +98,7 @@
 		"react": "19.0.0",
 		"react-dom": "19.0.0",
 		"react-icons": "5.5.0",
-		"react-instantsearch": "7.15.8",
+		"react-instantsearch": "7.16.0",
 		"react-markdown": "10.1.0",
 		"react-select": "5.10.1",
 		"redirects-in-workers": "0.0.7",
@@ -127,7 +127,7 @@
 		"ts-blank-space": "0.6.1",
 		"tsx": "4.20.3",
 		"typescript": "5.8.3",
-		"typescript-eslint": "8.34.0",
+		"typescript-eslint": "8.35.0",
 		"unified": "11.0.5",
 		"unist-util-visit": "5.0.0",
 		"vite-tsconfig-paths": "5.1.4",

package.json

@@ -246,9 +246,13 @@
 /bots/additional-configurations/javascript-detections/ /cloudflare-challenges/challenge-types/javascript-detections/ 301
 
 #browser-rendering
-/browser-rendering/get-started/browser-rendering-with-do/ /browser-rendering/workers-binding-api/browser-rendering-with-do/ 301
-/browser-rendering/get-started/reuse-sessions/ /browser-rendering/workers-binding-api/reuse-sessions/ 301
-/browser-rendering/get-started/screenshots/ /browser-rendering/workers-binding-api/screenshots/ 301
+/browser-rendering/get-started/browser-rendering-with-DO/ /browser-rendering/workers-bindings/browser-rendering-with-do/ 301
+/browser-rendering/get-started/reuse-sessions/ /browser-rendering/workers-bindings/reuse-sessions/ 301
+/browser-rendering/get-started/screenshots/ /browser-rendering/workers-bindings/screenshots/ 301
+/browser-rendering/workers-binding-api/ /browser-rendering/workers-bindings/ 301
+/browser-rendering/workers-binding-api/screenshots/ /browser-rendering/workers-bindings/screenshots/ 301
+/browser-rendering/workers-binding-api/browser-rendering-with-do/ /browser-rendering/workers-bindings/browser-rendering-with-do/ 301
+/browser-rendering/workers-binding-api/reuse-sessions/ /browser-rendering/workers-bindings/reuse-sessions/ 301
 
 # byoip
 /byoip/about/dynamic-advertisement/ /byoip/concepts/dynamic-advertisement/ 301
@@ -496,6 +500,9 @@
 /cloudflare-one/email-security/directories/manage-ms-directories/manage-groups-directory/ /cloudflare-one/email-security/directories/manage-integrated-directories/manage-groups-directory/ 301
 /cloudflare-one/email-security/directories/manage-ms-directories/manage-users-directory/ /cloudflare-one/email-security/directories/manage-integrated-directories/manage-users-directory/ 301
 /cloudflare-one/email-security/setup/partner-domain-tls/ /cloudflare-one/email-security/setup/pre-delivery-deployment/partner-domain-tls/ 301
+/cloudflare-one/email-security/setup/pre-delivery-deployment/prerequisites/office365-email-security-mx/ /cloudflare-one/email-security/setup/pre-delivery-deployment/prerequisites/microsoft365-email-security-mx/ 301
+/cloudflare-one/email-security/setup/post-delivery-deployment/api/office365-api/ /cloudflare-one/email-security/setup/post-delivery-deployment/api/m365-api/ 301
+/cloudflare-one/email-security/setup/post-delivery-deployment/bcc-journaling/journaling-setup/office365-journaling/ /cloudflare-one/email-security/setup/post-delivery-deployment/bcc-journaling/journaling-setup/m365-journaling/ 301
 
 # firewall
 /firewall/api/cf-lists/ /waf/tools/lists/lists-api/ 301
@@ -2001,7 +2008,7 @@
 /cloudflare-one/connections/connect-networks/deploy-tunnels/tunnel-with-firewall/ /cloudflare-one/connections/connect-networks/configure-tunnels/tunnel-with-firewall/ 301
 /cloudflare-one/connections/connect-networks/deploy-tunnels/ /cloudflare-one/connections/connect-networks/get-started/ 301
 /cloudflare-one/connections/connect-networks/monitor-tunnels/grafana/ /cloudflare-one/tutorials/grafana/ 301
-/cloudflare-one/connections/connect-networks/use-cases/kubectl/ /cloudflare-one/tutorials/many-cfd-one-tunnel/ 301
+/cloudflare-one/connections/connect-networks/use-cases/kubectl/ /cloudflare-one/connections/connect-networks/deployment-guides/kubernetes/ 301
 /cloudflare-one/examples/ /cloudflare-one/api-terraform/ 301
 /cloudflare-one/faq/tunnel/ /cloudflare-one/faq/cloudflare-tunnels-faq/ 301
 /cloudflare-one/identity/devices/azure-ad/ /cloudflare-one/tutorials/azuread-conditional-access/ 301
@@ -2065,6 +2072,7 @@
 /cloudflare-one/tutorials/credentials-only/ /cloudflare-one/connections/connect-networks/get-started/ 301
 /cloudflare-one/tutorials/do-not-decrypt/ /cloudflare-one/policies/gateway/http-policies/common-policies/#skip-inspection-for-groups-of-applications 301
 /cloudflare-one/tutorials/identity-dns/ /cloudflare-one/policies/gateway/dns-policies/common-policies/#restrict-access-to-specific-groups 301
+/cloudflare-one/tutorials/many-cfd-one-tunnel/ /cloudflare-one/connections/connect-networks/deployment-guides/kubernetes/ 301
 /cloudflare-one/tutorials/multi-origin/ /cloudflare-one/connections/connect-networks/get-started/ 301
 /cloudflare-one/tutorials/review-gateway-block/ /cloudflare-one/analytics/logs/gateway-logs/ 301
 /cloudflare-one/tutorials/require-swg/ /cloudflare-one/identity/devices/ 301

public/__redirects

@@ -2,20 +2,19 @@ import { useEffect, useState, type ChangeEvent } from "react";
 import FieldBadges from "./fields/FieldBadges";
 import Markdown from "react-markdown";
 import type { CollectionEntry } from "astro:content";
+import { setSearchParams } from "~/util/url";
 
 type Fields = CollectionEntry<"fields">["data"]["entries"];
 
 type Filters = {
 	search: string;
 	categories: string[];
-	keywords: string[];
 };
 
 const FieldCatalog = ({ fields }: { fields: Fields }) => {
 	const [filters, setFilters] = useState<Filters>({
 		search: "",
 		categories: [],
-		keywords: [],
 	});
 
 	const mapped = fields.sort((f1, f2) => {
@@ -58,7 +57,6 @@ const FieldCatalog = ({ fields }: { fields: Fields }) => {
 	});
 
 	useEffect(() => {
-		// On component load, check for deep-links to categories in the query param
 		const params = new URLSearchParams(window.location.search);
 		const categories = params.getAll("field-category");
 		const searchTerm = params.get("search-term") ?? "";
@@ -72,6 +70,22 @@ const FieldCatalog = ({ fields }: { fields: Fields }) => {
 		});
 	}, []);
 
+	useEffect(() => {
+		const params = new URLSearchParams();
+
+		if (filters.search) {
+			params.set("search-term", filters.search);
+		}
+
+		if (filters.categories.length > 0) {
+			filters.categories.forEach((category) =>
+				params.append("field-category", category),
+			);
+		}
+
+		setSearchParams(params);
+	}, [filters]);
+
 	return (
 		<div className="md:flex">
 			<div className="mr-8 w-full md:w-1/4">

src/assets/images/cloudflare-one/connections/connect-apps/kubernetes-tunnel.png

@@ -1,7 +1,8 @@
-import { useState, type ChangeEvent } from "react";
+import { useEffect, useState, type ChangeEvent } from "react";
 import Markdown from "react-markdown";
 import type { CollectionEntry } from "astro:content";
 import type { IconifyIconBuildResult } from "@iconify/utils";
+import { setSearchParams } from "~/util/url";
 
 type LearningPaths = CollectionEntry<"learning-paths">["data"][];
 type Icons = Record<string, IconifyIconBuildResult>;
@@ -23,6 +24,34 @@ const LearningPathCatalog = ({
 		groups: [],
 	});
 
+	useEffect(() => {
+		const params = new URLSearchParams(window.location.search);
+		const products = params.getAll("products");
+		const groups = params.getAll("groups");
+
+		if (!products && !groups) return;
+
+		setFilters({
+			...filters,
+			products,
+			groups,
+		});
+	}, []);
+
+	useEffect(() => {
+		const params = new URLSearchParams();
+
+		if (filters.products.length > 0) {
+			filters.products.forEach((product) => params.append("products", product));
+		}
+
+		if (filters.groups.length > 0) {
+			filters.groups.forEach((group) => params.append("groups", group));
+		}
+
+		setSearchParams(params);
+	}, [filters]);
+
 	const sorted = paths.sort((lp1, lp2) => {
 		return lp1.priority < lp2.priority ? -1 : 1;
 	});

src/assets/images/cloudflare-one/identity/linkedin/lin5.png

@@ -3,6 +3,7 @@ import ModelInfo from "./models/ModelInfo";
 import ModelBadges from "./models/ModelBadges";
 import { authorData } from "./models/data";
 import type { WorkersAIModelsSchema } from "~/schemas";
+import { setSearchParams } from "~/util/url";
 
 type Filters = {
 	search: string;
@@ -67,6 +68,30 @@ const ModelCatalog = ({ models }: { models: WorkersAIModelsSchema[] }) => {
 		});
 	}, []);
 
+	useEffect(() => {
+		const params = new URLSearchParams();
+
+		if (filters.search) {
+			params.set("search", filters.search);
+		}
+
+		if (filters.authors.length > 0) {
+			filters.authors.forEach((author) => params.append("authors", author));
+		}
+
+		if (filters.tasks.length > 0) {
+			filters.tasks.forEach((task) => params.append("tasks", task));
+		}
+
+		if (filters.capabilities.length > 0) {
+			filters.capabilities.forEach((capability) =>
+				params.append("capabilities", capability),
+			);
+		}
+
+		setSearchParams(params);
+	}, [filters]);
+
 	const mapped = sortedModels.map((model) => ({
 		model: {
 			...model,