Merge branch 'production' into ranbel/tunnel-onoma

merge in latest changes

Author: ranbel

package-lock.json

@@ -42,7 +42,7 @@
 		"@expressive-code/plugin-line-numbers": "0.41.3",
 		"@floating-ui/react": "0.27.16",
 		"@iarna/toml": "2.2.5",
-		"@lottiefiles/dotlottie-react": "0.16.0",
+		"@lottiefiles/dotlottie-react": "0.16.1",
 		"@marsidev/react-turnstile": "1.3.0",
 		"@microsoft/fetch-event-source": "2.0.1",
 		"@nanostores/react": "1.0.0",

package.json

@@ -0,0 +1,93 @@
+diff --git a/node_modules/@astrojs/starlight-docsearch/DocSearch.astro b/node_modules/@astrojs/starlight-docsearch/DocSearch.astro
+index f50c208..5309557 100644
+--- a/node_modules/@astrojs/starlight-docsearch/DocSearch.astro
++++ b/node_modules/@astrojs/starlight-docsearch/DocSearch.astro
+@@ -109,15 +109,20 @@ const docsearchTranslations: DocSearchTranslationProps = {
+ 		.DocSearch-Button-Keys {
+ 			margin-inline-start: auto;
+ 		}
+-		.DocSearch-Button-Keys::before {
+-			content: '';
+-			width: 1em;
+-			height: 1em;
+-			-webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E%3Cpath d='M17 2H7a5 5 0 0 0-5 5v10a5 5 0 0 0 5 5h10a5 5 0 0 0 5-5V7a5 5 0 0 0-5-5Zm3 15a3 3 0 0 1-3 3H7a3 3 0 0 1-3-3V7a3 3 0 0 1 3-3h10a3 3 0 0 1 3 3v10Z'%3E%3C/path%3E%3Cpath d='M15.293 6.707a1 1 0 1 1 1.414 1.414l-8.485 8.486a1 1 0 0 1-1.414-1.415l8.485-8.485Z'%3E%3C/path%3E%3C/svg%3E");
+-			mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E%3Cpath d='M17 2H7a5 5 0 0 0-5 5v10a5 5 0 0 0 5 5h10a5 5 0 0 0 5-5V7a5 5 0 0 0-5-5Zm3 15a3 3 0 0 1-3 3H7a3 3 0 0 1-3-3V7a3 3 0 0 1 3-3h10a3 3 0 0 1 3 3v10Z'%3E%3C/path%3E%3Cpath d='M15.293 6.707a1 1 0 1 1 1.414 1.414l-8.485 8.486a1 1 0 0 1-1.414-1.415l8.485-8.485Z'%3E%3C/path%3E%3C/svg%3E");
+-			-webkit-mask-size: 100%;
+-			mask-size: 100%;
+-			background-color: currentColor;
++		.DocSearch-Button-Key:first-child {
++			margin-right: 0.4em;
++		}
++		.DocSearch-Button-Key {
++			display: inline-block;
++			font-size: 0.75em;
++			font-weight: 600;
++			opacity: 0.8;
++			border: 1px solid var(--sl-color-gray-4);
++			border-radius: 0.25rem;
++			padding: 0.125rem 0.375rem;
++			background-color: var(--sl-color-gray-6);
++			color: var(--sl-color-gray-1);
++			line-height: 1;
+ 		}
+ 	}
+ </style>
+@@ -128,6 +133,7 @@ const docsearchTranslations: DocSearchTranslationProps = {
+ 	class StarlightDocSearch extends HTMLElement {
+ 		constructor() {
+ 			super();
++
+ 			window.addEventListener('DOMContentLoaded', async () => {
+ 				const { default: docsearch } = await import('@docsearch/js');
+ 				const options = { ...config, container: 'sl-doc-search' };
+@@ -136,6 +142,27 @@ const docsearchTranslations: DocSearchTranslationProps = {
+ 					Object.assign(options, translations);
+ 				} catch {}
+ 				docsearch(options);
++
++				const keyboardShortcuts = options.keyboardShortcuts ?? {};
++				const slashEnabled = keyboardShortcuts?.['/'] !== false;
++				const ctrlCmdKEnabled = keyboardShortcuts?.['Ctrl/Cmd+K'] !== false;
++
++				if (slashEnabled && !ctrlCmdKEnabled) {
++					const styleContainer = document.createElement('style');
++					styleContainer.innerHTML = `
++						.DocSearch-Button-Keys::before {
++							content: '';
++							width: 1em;
++							height: 1em;
++							-webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E%3Cpath d='M17 2H7a5 5 0 0 0-5 5v10a5 5 0 0 0 5 5h10a5 5 0 0 0 5-5V7a5 5 0 0 0-5-5Zm3 15a3 3 0 0 1-3 3H7a3 3 0 0 1-3-3V7a3 3 0 0 1 3-3h10a3 3 0 0 1 3 3v10Z'%3E%3C/path%3E%3Cpath d='M15.293 6.707a1 1 0 1 1 1.414 1.414l-8.485 8.486a1 1 0 0 1-1.414-1.415l8.485-8.485Z'%3E%3C/path%3E%3C/svg%3E");
++							mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E%3Cpath d='M17 2H7a5 5 0 0 0-5 5v10a5 5 0 0 0 5 5h10a5 5 0 0 0 5-5V7a5 5 0 0 0-5-5Zm3 15a3 3 0 0 1-3 3H7a3 3 0 0 1-3-3V7a3 3 0 0 1 3-3h10a3 3 0 0 1 3 3v10Z'%3E%3C/path%3E%3Cpath d='M15.293 6.707a1 1 0 1 1 1.414 1.414l-8.485 8.486a1 1 0 0 1-1.414-1.415l8.485-8.485Z'%3E%3C/path%3E%3C/svg%3E");
++							-webkit-mask-size: 100%;
++							mask-size: 100%;
++							background-color: currentColor;
++						}
++					`;
++					document.head.appendChild(styleContainer);
++				}
+ 			});
+ 		}
+ 	}
+diff --git a/node_modules/@astrojs/starlight-docsearch/index.ts b/node_modules/@astrojs/starlight-docsearch/index.ts
+index e8cc7e5..6c88e07 100644
+--- a/node_modules/@astrojs/starlight-docsearch/index.ts
++++ b/node_modules/@astrojs/starlight-docsearch/index.ts
+@@ -43,6 +43,18 @@ const DocSearchConfigSchema = z
+ 		 * @see https://www.algolia.com/doc/api-reference/search-api-parameters/
+ 		 */
+ 		searchParameters: z.custom<SearchOptions>(),
++		/**
++		 * Configuration for keyboard shortcuts that trigger the DocSearch modal.
++		 * @see https://docsearch.algolia.com/docs/api/#keyboardshortcuts
++		 */
++		keyboardShortcuts: z
++			.object({
++				/** Enable/disable Ctrl/Cmd+K shortcut. @default true */
++				'Ctrl/Cmd+K': z.boolean().optional(),
++				/** Enable/disable / shortcut. @default true */
++				'/': z.boolean().optional(),
++			})
++			.optional(),
+ 	})
+ 	.strict()
+ 	.or(

patches/@astrojs+starlight-docsearch+0.6.0.patch

@@ -10,17 +10,37 @@
 
 <script>
 	import { track } from "~/util/zaraz";
+	import { openGlobalSearch } from "~/util/search";
 
 	const { pathname } = window.location;
 
 	const anchor = document.getElementById("404-search-link");
+	const pretty = decodeURIComponent(
+		pathname.replaceAll("/", " ").replaceAll("-", " ").trim(),
+	);
 
 	if (anchor) {
-		const pretty = pathname.replaceAll("/", " ").replaceAll("-", " ").trim();
-
 		anchor.setAttribute("href", `/search/?q=${encodeURIComponent(pretty)}`);
 		anchor.addEventListener("click", () => {
 			track("serp from location", { value: "404", query: pretty });
 		});
 	}
+
+	document.addEventListener(
+		"keydown",
+		(keyboardEvent) => {
+			if (
+				(keyboardEvent.metaKey || keyboardEvent.ctrlKey) &&
+				keyboardEvent.key === "k"
+			) {
+				keyboardEvent.preventDefault();
+				keyboardEvent.stopPropagation();
+
+				openGlobalSearch(pretty);
+			}
+		},
+		{
+			capture: true,
+		},
+	);
 </script>

patches/@docsearch+js+3.8.2.patch

@@ -0,0 +1,105 @@
+---
+import { z } from "astro:schema";
+import { PackageManagers } from "starlight-package-managers";
+import { commands, getCommand } from "~/util/wrangler";
+import WranglerArg from "./WranglerArg.astro";
+import Details from "./Details.astro";
+
+function validateArg(value: any, expected: string): boolean {
+	if (Array.isArray(expected)) {
+		for (const choice of expected) {
+			if (value === choice) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	return typeof value === expected;
+}
+
+type Props = z.input<typeof props>;
+
+const props = z.object({
+	command: z.string(),
+	positionals: z.array(z.string()).optional(),
+	flags: z.record(z.string(), z.any()).optional(),
+	showArgs: z.boolean().default(false),
+});
+
+const { command, positionals, flags, showArgs } = props.parse(Astro.props);
+
+const definition = getCommand(command);
+
+const { globalFlags } = commands;
+
+let args = [];
+
+if (flags) {
+	for (const [key, value] of Object.entries(flags)) {
+		const flagDef = definition.args?.[key];
+
+		if (!flagDef) {
+			throw new Error(
+				`[WranglerCLI] Received "${key}" for "${command}" but no such arg exists`,
+			);
+		}
+
+		const type = flagDef.type ?? flagDef.choices;
+		const valid = validateArg(value, type);
+
+		if (!valid) {
+			throw new Error(
+				`[WranglerCLI] Expected "${type}" for "${key}" but got "${typeof value}"`,
+			);
+		}
+
+		args.push(...[`--${key}`, value]);
+	}
+}
+
+if (positionals) {
+	const positionalsDef = definition.positionalArgs ?? [];
+
+	if (positionalsDef.length === 0) {
+		throw new Error(
+			`[WranglerCLI] Expected 0 positional arguments for "${command}" but received ${positionals.length}`,
+		);
+	}
+
+	args.push(...positionals);
+}
+---
+
+<PackageManagers
+	pkg="wrangler"
+	type="exec"
+	args={`${command} ${args.join(" ")}`}
+/>
+
+{
+	showArgs && definition.args && (
+		<Details header="Arguments">
+			<p>
+				<strong>Command flags</strong>
+			</p>
+			<ul>
+				{Object.entries(definition.args)
+					.filter(([_, value]) => !value.hidden)
+					.map(([key, value]) => {
+						return <WranglerArg key={key} definition={value} />;
+					})}
+			</ul>
+
+			<p>
+				<strong>Global flags</strong>
+			</p>
+			<ul>
+				{Object.entries(globalFlags).map(([key, value]) => {
+					return <WranglerArg key={key} definition={value} />;
+				})}
+			</ul>
+		</Details>
+	)
+}

src/components/404.astro

@@ -0,0 +1,82 @@
+import { experimental_AstroContainer as AstroContainer } from "astro/container";
+import { expect, test, describe } from "vitest";
+import WranglerCLI from "./WranglerCLI.astro";
+
+type Options = Parameters<(typeof container)["renderToString"]>[1];
+
+const container = await AstroContainer.create();
+
+const renderWithOptions = (options?: Options) => {
+	return container.renderToString(WranglerCLI, options);
+};
+
+describe("WranglerCLI", () => {
+	test("succeeds with valid input", async () => {
+		await expect(
+			renderWithOptions({
+				props: {
+					command: "deploy",
+				},
+			}),
+		).resolves.toContain("pnpm wrangler deploy");
+	});
+
+	test("errors with no props", async () => {
+		await expect(renderWithOptions()).rejects
+			.toThrowErrorMatchingInlineSnapshot(`
+			[ZodError: [
+			  {
+			    "code": "invalid_type",
+			    "expected": "string",
+			    "received": "undefined",
+			    "path": [
+			      "command"
+			    ],
+			    "message": "Required"
+			  }
+			]]
+		`);
+	});
+
+	test("errors with non-existent command", async () => {
+		await expect(
+			renderWithOptions({
+				props: {
+					command: "not-a-valid-command",
+				},
+			}),
+		).rejects.toThrowErrorMatchingInlineSnapshot(
+			`[Error: [wrangler.ts] Command "not-a-valid-command" not found]`,
+		);
+	});
+
+	test("errors with bad flags for 'deploy'", async () => {
+		await expect(
+			renderWithOptions({
+				props: {
+					command: "deploy",
+					flags: {
+						foo: "bar",
+					},
+				},
+			}),
+		).rejects.toThrowErrorMatchingInlineSnapshot(
+			`[Error: [WranglerCLI] Received "foo" for "deploy" but no such arg exists]`,
+		);
+	});
+
+	test("errors with bad value for 'container-rollout' flag", async () => {
+		await expect(
+			renderWithOptions({
+				props: {
+					command: "deploy",
+					flags: {
+						"containers-rollout": "not-a-valid-option",
+					},
+				},
+			}),
+		).rejects.toThrowErrorMatchingInlineSnapshot(
+			`[Error: [WranglerCLI] Expected "immediate,gradual" for "containers-rollout" but got "string"]`,
+		);
+	});
+});