Revert "[Docs Site] Add frontmatter to index.md output (#21980)"

This reverts commit 27aa5ce.

Author: Maddy-Cloudflare

src/components/overrides/Head.astro

@@ -7,7 +7,6 @@ import { getEntry } from "astro:content";
 import { getOgImage } from "~/util/og";
 import type { CollectionEntry } from "astro:content";
 
-const DEFAULT_TITLE_DELIMITER = "|";
 const NOINDEX_PRODUCTS = ["email-security", "style-guide", "security"];
 
 const currentSection = Astro.url.pathname.split("/")[1].replaceAll(".", "");
@@ -32,9 +31,7 @@ if (currentSection) {
 			let title: string;
 
 			if (titleIdx !== -1) {
-				const existingTitle = head[titleIdx].content?.split(
-					` ${DEFAULT_TITLE_DELIMITER} `,
-				)[0];
+				const existingTitle = head[titleIdx].content;
 				title = `${existingTitle} · ${product.data.meta.title}`;
 
 				head[titleIdx] = {
@@ -83,26 +80,6 @@ if (shouldNoIndex) {
 	});
 }
 
-if (
-	frontmatter.description &&
-	head.findIndex(
-		({ tag, attrs }) => tag === "meta" && attrs?.name === "description",
-	) === -1
-) {
-	const existingOpenGraphTag = head.findIndex(
-		({ tag, attrs }) => tag === "meta" && attrs?.property === "og:description",
-	);
-
-	if (existingOpenGraphTag !== -1) {
-		head[existingOpenGraphTag].attrs!.content = frontmatter.description;
-	}
-
-	metaTags.push({
-		name: "description",
-		content: frontmatter.description as string,
-	});
-}
-
 if (frontmatter.pcx_content_type) {
 	["pcx_content_type", "algolia_content_type"].map((name) => {
 		metaTags.push({

src/content/docs/style-guide/fixtures/markdown.mdx

@@ -1,7 +1,6 @@
 ---
 title: Markdown
 noindex: true
-lastUpdated: 2025-01-01T00:00:00Z
 sidebar:
   hidden: true
 ---

src/middleware/index.ts

@@ -18,7 +18,7 @@ export const onRequest = defineMiddleware(async (context, next) => {
 			const htmlUrl = new URL(pathname.replace("index.md", ""), context.url);
 			const html = await (await fetch(htmlUrl)).text();
 
-			const markdown = await htmlToMarkdown(html, context.url.toString());
+			const markdown = await htmlToMarkdown(html);
 
 			if (!markdown) {
 				return new Response("Not Found", { status: 404 });

src/util/markdown.ts

@@ -10,10 +10,8 @@ import remarkStringify from "remark-stringify";
 
 export async function htmlToMarkdown(
 	html: string,
-	url: string,
 ): Promise<string | undefined> {
-	const dom = parse(html);
-	const content = dom.querySelector(".sl-markdown-content");
+	const content = parse(html).querySelector(".sl-markdown-content");
 
 	if (!content) {
 		return;
@@ -28,6 +26,7 @@ export async function htmlToMarkdown(
 		remarkStringify,
 	]);
 
+<<<<<<< HEAD
 	const title = dom.querySelector("title")?.textContent;
 	const description = dom.querySelector("meta[name='description']")?.attributes
 		.content;
@@ -48,4 +47,7 @@ export async function htmlToMarkdown(
 		.join("\n");
 
 	return withFrontmatter;
+=======
+	return markdown;
+>>>>>>> parent of 27aa5ce724 ([Docs Site] Add frontmatter to index.md output (#21980))
 }

worker/index.ts

@@ -23,8 +23,10 @@ export default class extends WorkerEntrypoint<Env> {
 		}
 
 		if (request.url.endsWith("/index.md")) {
-			const htmlUrl = request.url.replace("index.md", "");
-			const res = await this.env.ASSETS.fetch(htmlUrl, request);
+			const res = await this.env.ASSETS.fetch(
+				request.url.replace("index.md", ""),
+				request,
+			);
 
 			if (res.status === 404) {
 				return res;
@@ -36,7 +38,7 @@ export default class extends WorkerEntrypoint<Env> {
 			) {
 				const html = await res.text();
 
-				const markdown = await htmlToMarkdown(html, request.url);
+				const markdown = await htmlToMarkdown(html);
 
 				if (!markdown) {
 					return new Response("Not Found", { status: 404 });

worker/index.worker.test.ts

@@ -268,6 +268,7 @@ describe("Cloudflare Docs", () => {
 
 			const text = await response.text();
 			expect(text).toMatchInlineSnapshot(`
+<<<<<<< HEAD
 				"---
 				title: Markdown · Cloudflare Style Guide
 				description: The HTML generated by this file is used as a test fixture for our Markdown generation.
@@ -278,6 +279,9 @@ describe("Cloudflare Docs", () => {
 				---
 
 				The HTML generated by this file is used as a test fixture for our Markdown generation.
+=======
+				"The HTML generated by this file is used as a test fixture for our Markdown generation.
+>>>>>>> parent of 27aa5ce724 ([Docs Site] Add frontmatter to index.md output (#21980))
 
 				* mdx