Merge branch 'production' into rebecca/dns-proxy-status-review

Author: RebeccaTamachiro

astro.config.ts

@@ -8,15 +8,14 @@ import starlightLinksValidator from "starlight-links-validator";
 import icon from "astro-icon";
 import sitemap from "@astrojs/sitemap";
 import react from "@astrojs/react";
-
 import { readdir } from "fs/promises";
-import { fileURLToPath } from "url";
 
 import rehypeTitleFigure from "rehype-title-figure";
 import rehypeMermaid from "./src/plugins/rehype/mermaid.ts";
 import rehypeAutolinkHeadings from "./src/plugins/rehype/autolink-headings.ts";
 import rehypeExternalLinks from "./src/plugins/rehype/external-links.ts";
 import rehypeHeadingSlugs from "./src/plugins/rehype/heading-slugs.ts";
+import { fileURLToPath } from "url";
 
 async function autogenSections() {
 	const sections = (

package-lock.json

@@ -34,7 +34,7 @@
 		"@astrojs/starlight-docsearch": "0.5.0",
 		"@astrojs/starlight-tailwind": "3.0.0",
 		"@astrojs/tailwind": "5.1.5",
-		"@cloudflare/vitest-pool-workers": "0.6.11",
+		"@cloudflare/vitest-pool-workers": "0.6.12",
 		"@cloudflare/workers-types": "4.20250204.0",
 		"@codingheads/sticky-header": "1.0.2",
 		"@expressive-code/plugin-collapsible-sections": "0.40.1",
@@ -46,7 +46,7 @@
 		"@types/node": "22.13.1",
 		"@types/react": "19.0.7",
 		"@types/react-dom": "19.0.3",
-		"@typescript-eslint/parser": "8.23.0",
+		"@typescript-eslint/parser": "8.24.0",
 		"algoliasearch": "5.20.1",
 		"astro": "5.2.1",
 		"astro-breadcrumbs": "3.3.1",
@@ -57,7 +57,7 @@
 		"dedent": "1.5.3",
 		"dompurify": "3.2.4",
 		"dot-prop": "9.0.0",
-		"eslint": "9.18.0",
+		"eslint": "9.20.0",
 		"eslint-plugin-astro": "1.3.1",
 		"eslint-plugin-jsx-a11y": "6.10.2",
 		"eslint-plugin-react": "7.37.4",
@@ -74,7 +74,7 @@
 		"mdast-util-mdx-expression": "2.0.1",
 		"mermaid": "11.4.1",
 		"node-html-parser": "7.0.1",
-		"prettier": "3.4.2",
+		"prettier": "3.5.0",
 		"prettier-plugin-astro": "0.14.1",
 		"prettier-plugin-tailwindcss": "0.6.9",
 		"pretty-bytes": "6.1.1",

package.json

@@ -13,49 +13,29 @@ const props = z.object({
 let { file, product, params } = props.parse(Astro.props);
 
 if (!product) {
-	const fromSlug = Astro.params.slug?.split("/")[0];
-
-	if (!fromSlug) {
-		throw new Error(
-			`[Render] Unable to infer which folder ${file} is in, please provide a "product" input with your "file" input.`,
-		);
-	}
+	product = Astro.params.slug?.split("/")[0];
+}
 
-	product = fromSlug;
+if (!product) {
+	throw new Error(
+		`[Render] Unable to infer which folder ${file} is in, please provide a "product" input with your "file" input.`,
+	);
 }
 
-const id = `${product}/${file}`;
-const partial = await getEntry("partials", id);
+const partial = await getEntry("partials", `${product}/${file}`);
 
 if (!partial) {
 	throw new Error(
-		`[Render] Couldn't find "${id}" included on "${Astro.url.pathname}"`,
+		`[Render] Couldn't find partial: ${file}. Included on ${Astro.params.slug}`,
 	);
 }
 
-// We currently only enforce parameters if `params` is set in the frontmatter,
-// until we can migrate existing `inputParameters` frontmatter to `params`.
 if (partial.data.params) {
-	const expected = partial.data.params.sort();
-	const optional = expected.filter((p) => p.endsWith("?"));
-	const received = Object.keys(params ?? {}).sort();
-
-	const maximum = expected.length;
-	const minimum = maximum - optional.length;
-
-	if (
-		received.length < minimum ||
-		received.length > maximum ||
-		expected.some((p: string) => {
-			if (p.endsWith("?")) return false;
-
-			return !received.includes(p);
-		})
-	) {
+	const expected = partial.data.params;
+	if (!params)
 		throw new Error(
-			`[Render] Expected parameters ${JSON.stringify(expected)} but received parameters ${JSON.stringify(received)} for "${file}" included on "${Astro.url.pathname}"`,
+			`${file} included on ${Astro.params.slug} expected parameters: ${expected}, got none`,
 		);
-	}
 }
 
 const { Content } = await render(partial);