From 4cef29dd464123a48716f36a0012b657cb07795d Mon Sep 17 00:00:00 2001
From: Kevin Zuniga Cuellar <kzunigac@uvm.edu>
Date: Fri, 12 Jan 2024 11:28:13 -0500
Subject: [PATCH 01/16] extend config options to pagefind

---
 packages/starlight/components/Search.astro    | 21 +++++++++++++++++--
 .../starlight/utils/createPathFormatter.ts    |  5 +++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/packages/starlight/components/Search.astro b/packages/starlight/components/Search.astro
index 2b5f3ac495e..250f8c00588 100644
--- a/packages/starlight/components/Search.astro
+++ b/packages/starlight/components/Search.astro
@@ -2,6 +2,7 @@
 import '@pagefind/default-ui/css/ui.css';
 import Icon from '../user-components/Icon.astro';
 import type { Props } from '../props';
+import project from 'virtual:starlight/project-context';
 
 const { labels } = Astro.props;
 
@@ -13,9 +14,18 @@ const pagefindTranslations = {
 			.map(([key, value]) => [key.replace('pagefind.', ''), value])
 	),
 };
+
+const configOptions = {
+	format: project.build.format,
+	trailingSlash: project.trailingSlash,
+	addBase: false,
+};
 ---
 
-<site-search data-translations={JSON.stringify(pagefindTranslations)}>
+<site-search
+	data-translations={JSON.stringify(pagefindTranslations)}
+	data-config={JSON.stringify(configOptions)}
+>
 	<button data-open-modal disabled>
 		{
 			/* The span is `aria-hidden` because it is not shown on small screens. Instead, the icon label is used for accessibility purposes. */
@@ -53,6 +63,7 @@ const pagefindTranslations = {
 </site-search>
 
 <script>
+	import { createPathFormatter } from '../utils/createPathFormatter';
 	class SiteSearch extends HTMLElement {
 		constructor() {
 			super();
@@ -108,10 +119,12 @@ const pagefindTranslations = {
 			});
 
 			let translations = {};
+			let config = {};
 			try {
 				translations = JSON.parse(this.dataset.translations || '{}');
+				config = JSON.parse(this.dataset.config || '{}');
 			} catch {}
-
+			const formatPath = createPathFormatter(config);
 			window.addEventListener('DOMContentLoaded', () => {
 				if (import.meta.env.DEV) return;
 				const onIdle = window.requestIdleCallback || ((cb) => setTimeout(cb, 1));
@@ -124,6 +137,10 @@ const pagefindTranslations = {
 						showImages: false,
 						translations,
 						showSubResults: true,
+						processResult: (result: any) => {
+							result.url = formatPath(result.url);
+							return result;
+						},
 					});
 				});
 			});
diff --git a/packages/starlight/utils/createPathFormatter.ts b/packages/starlight/utils/createPathFormatter.ts
index af363186016..61128465acd 100644
--- a/packages/starlight/utils/createPathFormatter.ts
+++ b/packages/starlight/utils/createPathFormatter.ts
@@ -10,6 +10,7 @@ import {
 interface FormatPathOptions {
 	format?: AstroConfig['build']['format'];
 	trailingSlash?: AstroConfig['trailingSlash'];
+	addBase?: boolean;
 }
 
 const formatStrategies = {
@@ -32,13 +33,13 @@ const trailingSlashStrategies = {
 /** Format a path based on the project config. */
 function formatPath(
 	href: string,
-	{ format = 'directory', trailingSlash = 'ignore' }: FormatPathOptions
+	{ format = 'directory', trailingSlash = 'ignore', addBase = true }: FormatPathOptions
 ) {
 	const formatStrategy = formatStrategies[format];
 	const trailingSlashStrategy = trailingSlashStrategies[trailingSlash];
 
 	// Add base
-	href = formatStrategy.addBase(href);
+	href = addBase ? formatStrategy.addBase(href) : href;
 
 	// Handle extension
 	href = formatStrategy.handleExtension(href);

From eaeb94993208de43375a08eb319fb7d1e18a7340 Mon Sep 17 00:00:00 2001
From: Kevin Zuniga Cuellar <kzunigac@uvm.edu>
Date: Fri, 12 Jan 2024 11:40:43 -0500
Subject: [PATCH 02/16] add changeset

---
 .changeset/silver-dots-guess.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/silver-dots-guess.md

diff --git a/.changeset/silver-dots-guess.md b/.changeset/silver-dots-guess.md
new file mode 100644
index 00000000000..ed4d46fc20e
--- /dev/null
+++ b/.changeset/silver-dots-guess.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/starlight': patch
+---
+
+Exposes project config to pagefind UI to correctly format search result links

From 411f082c0e8500f3ff597c6bc08751fd2af7524c Mon Sep 17 00:00:00 2001
From: Kevin Zuniga Cuellar <kzunigac@uvm.edu>
Date: Fri, 12 Jan 2024 12:15:27 -0500
Subject: [PATCH 03/16] move logic format-path

---
 packages/starlight/components/Search.astro | 20 ++++----------------
 packages/starlight/utils/format-path.ts    |  6 ++++++
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/packages/starlight/components/Search.astro b/packages/starlight/components/Search.astro
index 250f8c00588..76dfe0397ad 100644
--- a/packages/starlight/components/Search.astro
+++ b/packages/starlight/components/Search.astro
@@ -2,7 +2,6 @@
 import '@pagefind/default-ui/css/ui.css';
 import Icon from '../user-components/Icon.astro';
 import type { Props } from '../props';
-import project from 'virtual:starlight/project-context';
 
 const { labels } = Astro.props;
 
@@ -14,18 +13,9 @@ const pagefindTranslations = {
 			.map(([key, value]) => [key.replace('pagefind.', ''), value])
 	),
 };
-
-const configOptions = {
-	format: project.build.format,
-	trailingSlash: project.trailingSlash,
-	addBase: false,
-};
 ---
 
-<site-search
-	data-translations={JSON.stringify(pagefindTranslations)}
-	data-config={JSON.stringify(configOptions)}
->
+<site-search data-translations={JSON.stringify(pagefindTranslations)}>
 	<button data-open-modal disabled>
 		{
 			/* The span is `aria-hidden` because it is not shown on small screens. Instead, the icon label is used for accessibility purposes. */
@@ -63,7 +53,8 @@ const configOptions = {
 </site-search>
 
 <script>
-	import { createPathFormatter } from '../utils/createPathFormatter';
+	import { formatPathNoBase } from '../utils/format-path';
+	
 	class SiteSearch extends HTMLElement {
 		constructor() {
 			super();
@@ -119,12 +110,9 @@ const configOptions = {
 			});
 
 			let translations = {};
-			let config = {};
 			try {
 				translations = JSON.parse(this.dataset.translations || '{}');
-				config = JSON.parse(this.dataset.config || '{}');
 			} catch {}
-			const formatPath = createPathFormatter(config);
 			window.addEventListener('DOMContentLoaded', () => {
 				if (import.meta.env.DEV) return;
 				const onIdle = window.requestIdleCallback || ((cb) => setTimeout(cb, 1));
@@ -138,7 +126,7 @@ const configOptions = {
 						translations,
 						showSubResults: true,
 						processResult: (result: any) => {
-							result.url = formatPath(result.url);
+							result.url = formatPathNoBase(result.url);
 							return result;
 						},
 					});
diff --git a/packages/starlight/utils/format-path.ts b/packages/starlight/utils/format-path.ts
index 147045a4baf..f1d6b126f71 100644
--- a/packages/starlight/utils/format-path.ts
+++ b/packages/starlight/utils/format-path.ts
@@ -5,3 +5,9 @@ export const formatPath = createPathFormatter({
 	format: project.build.format,
 	trailingSlash: project.trailingSlash,
 });
+
+export const formatPathNoBase = createPathFormatter({
+	format: project.build.format,
+	trailingSlash: project.trailingSlash,
+	addBase: false,
+});

From fb0a2c36ebbcea4a4fd5eb4c2f2472a9d6b1cc48 Mon Sep 17 00:00:00 2001
From: Kevin Zuniga Cuellar <kzunigac@uvm.edu>
Date: Fri, 12 Jan 2024 15:22:48 -0500
Subject: [PATCH 04/16] increase js size limit by 1kb

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 18de4e46b99..fd9e2cf038f 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     {
       "name": "/_astro/*.js",
       "path": "examples/basics/dist/_astro/*.js",
-      "limit": "22 kB"
+      "limit": "23 kB"
     },
     {
       "name": "/_astro/*.css",

From a6d8db76aa5f13ca0a13dd647678e22dad72a635 Mon Sep 17 00:00:00 2001
From: Kevin Zuniga Cuellar <kzunigac@uvm.edu>
Date: Wed, 17 Jan 2024 17:27:29 -0500
Subject: [PATCH 05/16] revert format path changes

---
 packages/starlight/utils/createPathFormatter.ts | 5 ++---
 packages/starlight/utils/format-path.ts         | 6 ------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/starlight/utils/createPathFormatter.ts b/packages/starlight/utils/createPathFormatter.ts
index 61128465acd..af363186016 100644
--- a/packages/starlight/utils/createPathFormatter.ts
+++ b/packages/starlight/utils/createPathFormatter.ts
@@ -10,7 +10,6 @@ import {
 interface FormatPathOptions {
 	format?: AstroConfig['build']['format'];
 	trailingSlash?: AstroConfig['trailingSlash'];
-	addBase?: boolean;
 }
 
 const formatStrategies = {
@@ -33,13 +32,13 @@ const trailingSlashStrategies = {
 /** Format a path based on the project config. */
 function formatPath(
 	href: string,
-	{ format = 'directory', trailingSlash = 'ignore', addBase = true }: FormatPathOptions
+	{ format = 'directory', trailingSlash = 'ignore' }: FormatPathOptions
 ) {
 	const formatStrategy = formatStrategies[format];
 	const trailingSlashStrategy = trailingSlashStrategies[trailingSlash];
 
 	// Add base
-	href = addBase ? formatStrategy.addBase(href) : href;
+	href = formatStrategy.addBase(href);
 
 	// Handle extension
 	href = formatStrategy.handleExtension(href);
diff --git a/packages/starlight/utils/format-path.ts b/packages/starlight/utils/format-path.ts
index f1d6b126f71..147045a4baf 100644
--- a/packages/starlight/utils/format-path.ts
+++ b/packages/starlight/utils/format-path.ts
@@ -5,9 +5,3 @@ export const formatPath = createPathFormatter({
 	format: project.build.format,
 	trailingSlash: project.trailingSlash,
 });
-
-export const formatPathNoBase = createPathFormatter({
-	format: project.build.format,
-	trailingSlash: project.trailingSlash,
-	addBase: false,
-});

From 57a66caa9c5242ab72e4bf2bfb54b77f7fe4a725 Mon Sep 17 00:00:00 2001
From: Kevin Zuniga Cuellar <kzunigac@uvm.edu>
Date: Wed, 17 Jan 2024 17:29:00 -0500
Subject: [PATCH 06/16] copy-pasta

---
 packages/starlight/components/Search.astro | 87 +++++++++++++++++++++-
 1 file changed, 83 insertions(+), 4 deletions(-)

diff --git a/packages/starlight/components/Search.astro b/packages/starlight/components/Search.astro
index 76dfe0397ad..a250ee8cc70 100644
--- a/packages/starlight/components/Search.astro
+++ b/packages/starlight/components/Search.astro
@@ -1,6 +1,7 @@
 ---
 import '@pagefind/default-ui/css/ui.css';
 import Icon from '../user-components/Icon.astro';
+import project from 'virtual:starlight/project-context';
 import type { Props } from '../props';
 
 const { labels } = Astro.props;
@@ -13,9 +14,17 @@ const pagefindTranslations = {
 			.map(([key, value]) => [key.replace('pagefind.', ''), value])
 	),
 };
+
+const projectConfig = {
+	format: project.build.format,
+	trailingSlash: project.trailingSlash,
+};
 ---
 
-<site-search data-translations={JSON.stringify(pagefindTranslations)}>
+<site-search
+	data-translations={JSON.stringify(pagefindTranslations)}
+	data-config={JSON.stringify(projectConfig)}
+>
 	<button data-open-modal disabled>
 		{
 			/* The span is `aria-hidden` because it is not shown on small screens. Instead, the icon label is used for accessibility purposes. */
@@ -53,8 +62,11 @@ const pagefindTranslations = {
 </site-search>
 
 <script>
-	import { formatPathNoBase } from '../utils/format-path';
-	
+	interface FormatPathOptions {
+		format?: 'file' | 'directory';
+		trailingSlash?: 'ignore' | 'always' | 'never';
+	}
+
 	class SiteSearch extends HTMLElement {
 		constructor() {
 			super();
@@ -75,6 +87,71 @@ const pagefindTranslations = {
 				}
 			};
 
+			const formatPath = (
+				path: string,
+				{ format = 'directory', trailingSlash = 'ignore' }: FormatPathOptions = {}
+			) => {
+				const stripTrailingSlash = (href: string): string => {
+					if (href[href.length - 1] === '/') href = href.slice(0, -1);
+					return href;
+				};
+
+				const stripLeadingSlash = (href: string): string => {
+					if (href[0] === '/') href = href.slice(1);
+					return href;
+				};
+
+				const stripLeadingAndTrailingSlashes = (href: string): string => {
+					href = stripLeadingSlash(href);
+					href = stripTrailingSlash(href);
+					return href;
+				};
+
+				const ensureLeadingSlash = (href: string): string => {
+					if (href[0] !== '/') href = '/' + href;
+					return href;
+				};
+
+				const ensureTrailingSlash = (href: string): string => {
+					if (href[href.length - 1] !== '/') href += '/';
+					return href;
+				};
+
+				const ensureHtmlExtension = (path: string) => {
+					path = stripLeadingAndTrailingSlashes(path);
+					if (!path.endsWith('.html')) {
+						path = path ? path + '.html' : '/index.html';
+					}
+					return ensureLeadingSlash(path);
+				};
+
+				const stripHtmlExtension = (path: string) => {
+					const pathWithoutTrailingSlash = stripTrailingSlash(path);
+					return pathWithoutTrailingSlash.endsWith('.html')
+						? pathWithoutTrailingSlash.slice(0, -5)
+						: path;
+				};
+
+				const trailingSlashStrategies = {
+					always: ensureTrailingSlash,
+					never: stripTrailingSlash,
+					ignore: (href: string) => href,
+				};
+
+				const trailingSlashStrategy = trailingSlashStrategies[trailingSlash];
+
+				// Handle `build.format:`
+				path = format === 'file' ? ensureHtmlExtension(path) : stripHtmlExtension(path);
+
+				// Skip trailing slash handling for `build.format: 'file'`
+				if (format === 'file') return path;
+
+				// Handle `build.trailingSlash:`
+				path = path === '/' ? path : trailingSlashStrategy(path);
+
+				return path;
+			};
+
 			const openModal = (event?: MouseEvent) => {
 				dialog.showModal();
 				document.body.toggleAttribute('data-search-modal-open', true);
@@ -110,8 +187,10 @@ const pagefindTranslations = {
 			});
 
 			let translations = {};
+			let projectConfig = {};
 			try {
 				translations = JSON.parse(this.dataset.translations || '{}');
+				projectConfig = JSON.parse(this.dataset.config || '{}');
 			} catch {}
 			window.addEventListener('DOMContentLoaded', () => {
 				if (import.meta.env.DEV) return;
@@ -126,7 +205,7 @@ const pagefindTranslations = {
 						translations,
 						showSubResults: true,
 						processResult: (result: any) => {
-							result.url = formatPathNoBase(result.url);
+							result.url = formatPath(result.url, projectConfig);
 							return result;
 						},
 					});

From b15b8bb9b42df857dbccf58334f142a99cc971ac Mon Sep 17 00:00:00 2001
From: Kevin Zuniga Cuellar <kzunigac@uvm.edu>
Date: Wed, 17 Jan 2024 17:32:16 -0500
Subject: [PATCH 07/16] revert size limit increase

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fd9e2cf038f..18de4e46b99 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     {
       "name": "/_astro/*.js",
       "path": "examples/basics/dist/_astro/*.js",
-      "limit": "23 kB"
+      "limit": "22 kB"
     },
     {
       "name": "/_astro/*.css",

From 470f40b1fb26fd7acd6da16302fe8831b2fab144 Mon Sep 17 00:00:00 2001
From: Kevin Zuniga Cuellar <kzunigac@uvm.edu>
Date: Wed, 17 Jan 2024 17:35:32 -0500
Subject: [PATCH 08/16] revert size limit^2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 18de4e46b99..fd9e2cf038f 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     {
       "name": "/_astro/*.js",
       "path": "examples/basics/dist/_astro/*.js",
-      "limit": "22 kB"
+      "limit": "23 kB"
     },
     {
       "name": "/_astro/*.css",

From 918cdaa8ceeb64f5a5d73ff798995abb5bae08ea Mon Sep 17 00:00:00 2001
From: Kevin Zuniga Cuellar <kzunigac@uvm.edu>
Date: Sat, 27 Jan 2024 22:32:51 -0500
Subject: [PATCH 09/16] Refactor projectConfig and formatPath in Search
 component

---
 packages/starlight/components/Search.astro | 97 ++++++----------------
 1 file changed, 25 insertions(+), 72 deletions(-)

diff --git a/packages/starlight/components/Search.astro b/packages/starlight/components/Search.astro
index a250ee8cc70..ad09cd2e393 100644
--- a/packages/starlight/components/Search.astro
+++ b/packages/starlight/components/Search.astro
@@ -16,7 +16,6 @@ const pagefindTranslations = {
 };
 
 const projectConfig = {
-	format: project.build.format,
 	trailingSlash: project.trailingSlash,
 };
 ---
@@ -62,8 +61,7 @@ const projectConfig = {
 </site-search>
 
 <script>
-	interface FormatPathOptions {
-		format?: 'file' | 'directory';
+	interface ConfigOptions {
 		trailingSlash?: 'ignore' | 'always' | 'never';
 	}
 
@@ -75,6 +73,22 @@ const projectConfig = {
 			const dialog = this.querySelector('dialog')!;
 			const dialogFrame = this.querySelector('.dialog-frame')!;
 
+			const stripTrailingSlash = (path: string) => {
+				return path.replace(/\/(#.*)?$/, '$1');
+			};
+
+			const pagefindFormatURL = (
+				path: string,
+				{ trailingSlash = 'ignore' }: ConfigOptions = {}
+			) => {
+				if (trailingSlash !== 'never') return path;
+				return stripTrailingSlash(path);
+			};
+
+			const createURLFormatter = (opts: ConfigOptions) => {
+				return (href: string) => pagefindFormatURL(href, opts);
+			};
+
 			/** Close the modal if a user clicks on a link or outside of the modal. */
 			const onClick = (event: MouseEvent) => {
 				const isLink = 'href' in (event.target || {});
@@ -87,71 +101,6 @@ const projectConfig = {
 				}
 			};
 
-			const formatPath = (
-				path: string,
-				{ format = 'directory', trailingSlash = 'ignore' }: FormatPathOptions = {}
-			) => {
-				const stripTrailingSlash = (href: string): string => {
-					if (href[href.length - 1] === '/') href = href.slice(0, -1);
-					return href;
-				};
-
-				const stripLeadingSlash = (href: string): string => {
-					if (href[0] === '/') href = href.slice(1);
-					return href;
-				};
-
-				const stripLeadingAndTrailingSlashes = (href: string): string => {
-					href = stripLeadingSlash(href);
-					href = stripTrailingSlash(href);
-					return href;
-				};
-
-				const ensureLeadingSlash = (href: string): string => {
-					if (href[0] !== '/') href = '/' + href;
-					return href;
-				};
-
-				const ensureTrailingSlash = (href: string): string => {
-					if (href[href.length - 1] !== '/') href += '/';
-					return href;
-				};
-
-				const ensureHtmlExtension = (path: string) => {
-					path = stripLeadingAndTrailingSlashes(path);
-					if (!path.endsWith('.html')) {
-						path = path ? path + '.html' : '/index.html';
-					}
-					return ensureLeadingSlash(path);
-				};
-
-				const stripHtmlExtension = (path: string) => {
-					const pathWithoutTrailingSlash = stripTrailingSlash(path);
-					return pathWithoutTrailingSlash.endsWith('.html')
-						? pathWithoutTrailingSlash.slice(0, -5)
-						: path;
-				};
-
-				const trailingSlashStrategies = {
-					always: ensureTrailingSlash,
-					never: stripTrailingSlash,
-					ignore: (href: string) => href,
-				};
-
-				const trailingSlashStrategy = trailingSlashStrategies[trailingSlash];
-
-				// Handle `build.format:`
-				path = format === 'file' ? ensureHtmlExtension(path) : stripHtmlExtension(path);
-
-				// Skip trailing slash handling for `build.format: 'file'`
-				if (format === 'file') return path;
-
-				// Handle `build.trailingSlash:`
-				path = path === '/' ? path : trailingSlashStrategy(path);
-
-				return path;
-			};
-
 			const openModal = (event?: MouseEvent) => {
 				dialog.showModal();
 				document.body.toggleAttribute('data-search-modal-open', true);
@@ -187,11 +136,12 @@ const projectConfig = {
 			});
 
 			let translations = {};
-			let projectConfig = {};
+			let config = {};
 			try {
 				translations = JSON.parse(this.dataset.translations || '{}');
-				projectConfig = JSON.parse(this.dataset.config || '{}');
+				config = JSON.parse(this.dataset.config || '{}');
 			} catch {}
+			const formatURL = createURLFormatter(config);
 			window.addEventListener('DOMContentLoaded', () => {
 				if (import.meta.env.DEV) return;
 				const onIdle = window.requestIdleCallback || ((cb) => setTimeout(cb, 1));
@@ -205,8 +155,11 @@ const projectConfig = {
 						translations,
 						showSubResults: true,
 						processResult: (result: any) => {
-							result.url = formatPath(result.url, projectConfig);
-							return result;
+							result.url = formatURL(result.url);
+							result.sub_results = result.sub_results.map((result: any) => {
+								result.url = formatURL(result.url);
+								return result;
+							});
 						},
 					});
 				});

From 51f8abd27b7b1b05cbf254a6dedd787047f8b715 Mon Sep 17 00:00:00 2001
From: Kevin Zuniga Cuellar
 <46791833+kevinzunigacuellar@users.noreply.github.com>
Date: Sun, 28 Jan 2024 15:33:05 -0500
Subject: [PATCH 10/16] Apply `chris.js` suggestions from code review

Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
---
 packages/starlight/components/Search.astro | 27 +++-------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/packages/starlight/components/Search.astro b/packages/starlight/components/Search.astro
index ad09cd2e393..8c38fa844d0 100644
--- a/packages/starlight/components/Search.astro
+++ b/packages/starlight/components/Search.astro
@@ -14,15 +14,11 @@ const pagefindTranslations = {
 			.map(([key, value]) => [key.replace('pagefind.', ''), value])
 	),
 };
-
-const projectConfig = {
-	trailingSlash: project.trailingSlash,
-};
 ---
 
 <site-search
 	data-translations={JSON.stringify(pagefindTranslations)}
-	data-config={JSON.stringify(projectConfig)}
+	data-strip-trailing-slash={project.trailingSlash === 'never'}
 >
 	<button data-open-modal disabled>
 		{
@@ -61,10 +57,6 @@ const projectConfig = {
 </site-search>
 
 <script>
-	interface ConfigOptions {
-		trailingSlash?: 'ignore' | 'always' | 'never';
-	}
-
 	class SiteSearch extends HTMLElement {
 		constructor() {
 			super();
@@ -77,18 +69,6 @@ const projectConfig = {
 				return path.replace(/\/(#.*)?$/, '$1');
 			};
 
-			const pagefindFormatURL = (
-				path: string,
-				{ trailingSlash = 'ignore' }: ConfigOptions = {}
-			) => {
-				if (trailingSlash !== 'never') return path;
-				return stripTrailingSlash(path);
-			};
-
-			const createURLFormatter = (opts: ConfigOptions) => {
-				return (href: string) => pagefindFormatURL(href, opts);
-			};
-
 			/** Close the modal if a user clicks on a link or outside of the modal. */
 			const onClick = (event: MouseEvent) => {
 				const isLink = 'href' in (event.target || {});
@@ -136,12 +116,11 @@ const projectConfig = {
 			});
 
 			let translations = {};
-			let config = {};
+			const shouldStrip = this.dataset.stripTrailingSlash !== undefined;
 			try {
 				translations = JSON.parse(this.dataset.translations || '{}');
-				config = JSON.parse(this.dataset.config || '{}');
 			} catch {}
-			const formatURL = createURLFormatter(config);
+			const formatURL = (href: string) => shouldStrip ? stripTrailingSlash(href) : href;
 			window.addEventListener('DOMContentLoaded', () => {
 				if (import.meta.env.DEV) return;
 				const onIdle = window.requestIdleCallback || ((cb) => setTimeout(cb, 1));

From b5768e1fbee760625d87b236906beb467f45360a Mon Sep 17 00:00:00 2001
From: Kevin Zuniga Cuellar <kzunigac@uvm.edu>
Date: Sun, 28 Jan 2024 15:42:05 -0500
Subject: [PATCH 11/16] format code

---
 packages/starlight/components/Search.astro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/starlight/components/Search.astro b/packages/starlight/components/Search.astro
index 8c38fa844d0..5977a925c48 100644
--- a/packages/starlight/components/Search.astro
+++ b/packages/starlight/components/Search.astro
@@ -120,7 +120,7 @@ const pagefindTranslations = {
 			try {
 				translations = JSON.parse(this.dataset.translations || '{}');
 			} catch {}
-			const formatURL = (href: string) => shouldStrip ? stripTrailingSlash(href) : href;
+			const formatURL = (href: string) => (shouldStrip ? stripTrailingSlash(href) : href);
 			window.addEventListener('DOMContentLoaded', () => {
 				if (import.meta.env.DEV) return;
 				const onIdle = window.requestIdleCallback || ((cb) => setTimeout(cb, 1));

From 22606eb4be3eeab7742337d23dd72cd5f17640d4 Mon Sep 17 00:00:00 2001
From: Chris Swithinbank <swithinbank@gmail.com>
Date: Mon, 29 Jan 2024 11:42:15 +0100
Subject: [PATCH 12/16] Revert size limit change

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fd9e2cf038f..18de4e46b99 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     {
       "name": "/_astro/*.js",
       "path": "examples/basics/dist/_astro/*.js",
-      "limit": "23 kB"
+      "limit": "22 kB"
     },
     {
       "name": "/_astro/*.css",

From cb0ffa896a645a27657ddf46d918f5141308dedf Mon Sep 17 00:00:00 2001
From: Chris Swithinbank <swithinbank@gmail.com>
Date: Mon, 29 Jan 2024 11:42:22 +0100
Subject: [PATCH 13/16] Update changeset

---
 .changeset/silver-dots-guess.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/silver-dots-guess.md b/.changeset/silver-dots-guess.md
index ed4d46fc20e..f5ea3506687 100644
--- a/.changeset/silver-dots-guess.md
+++ b/.changeset/silver-dots-guess.md
@@ -2,4 +2,4 @@
 '@astrojs/starlight': patch
 ---
 
-Exposes project config to pagefind UI to correctly format search result links
+Correctly format Pagefind search result links when `trailingSlash: 'never'` is used

From d07c404dc42ffccb6439d770a6261b82cf6a27ed Mon Sep 17 00:00:00 2001
From: Chris Swithinbank <swithinbank@gmail.com>
Date: Mon, 29 Jan 2024 11:43:14 +0100
Subject: [PATCH 14/16] Reorganise changes and fix types

---
 packages/starlight/components/Search.astro | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/starlight/components/Search.astro b/packages/starlight/components/Search.astro
index 5977a925c48..875b6c604de 100644
--- a/packages/starlight/components/Search.astro
+++ b/packages/starlight/components/Search.astro
@@ -65,10 +65,6 @@ const pagefindTranslations = {
 			const dialog = this.querySelector('dialog')!;
 			const dialogFrame = this.querySelector('.dialog-frame')!;
 
-			const stripTrailingSlash = (path: string) => {
-				return path.replace(/\/(#.*)?$/, '$1');
-			};
-
 			/** Close the modal if a user clicks on a link or outside of the modal. */
 			const onClick = (event: MouseEvent) => {
 				const isLink = 'href' in (event.target || {});
@@ -116,15 +112,19 @@ const pagefindTranslations = {
 			});
 
 			let translations = {};
-			const shouldStrip = this.dataset.stripTrailingSlash !== undefined;
 			try {
 				translations = JSON.parse(this.dataset.translations || '{}');
 			} catch {}
-			const formatURL = (href: string) => (shouldStrip ? stripTrailingSlash(href) : href);
+
+			const shouldStrip = this.dataset.stripTrailingSlash !== undefined;
+			const stripTrailingSlash = (path: string) => path.replace(/\/(#.*)?$/, '$1');
+			const formatURL = shouldStrip ? stripTrailingSlash : (path: string) => path;
+
 			window.addEventListener('DOMContentLoaded', () => {
 				if (import.meta.env.DEV) return;
 				const onIdle = window.requestIdleCallback || ((cb) => setTimeout(cb, 1));
 				onIdle(async () => {
+					// @ts-expect-error — Missing types for @pagefind/default-ui package.
 					const { PagefindUI } = await import('@pagefind/default-ui');
 					new PagefindUI({
 						element: '#starlight__search',
@@ -133,11 +133,11 @@ const pagefindTranslations = {
 						showImages: false,
 						translations,
 						showSubResults: true,
-						processResult: (result: any) => {
+						processResult: (result: { url: string; sub_results: Array<{ url: string }> }) => {
 							result.url = formatURL(result.url);
-							result.sub_results = result.sub_results.map((result: any) => {
-								result.url = formatURL(result.url);
-								return result;
+							result.sub_results = result.sub_results.map((sub_result) => {
+								sub_result.url = formatURL(sub_result.url);
+								return sub_result;
 							});
 						},
 					});

From c3f1bbd56542ae16fe47a11e7fbee5164590d6ee Mon Sep 17 00:00:00 2001
From: Chris Swithinbank <swithinbank@gmail.com>
Date: Mon, 29 Jan 2024 11:51:26 +0100
Subject: [PATCH 15/16] =?UTF-8?q?Don=E2=80=99t=20strip=20initial=20slash?=
 =?UTF-8?q?=20on=20home=20URL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/starlight/components/Search.astro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/starlight/components/Search.astro b/packages/starlight/components/Search.astro
index 875b6c604de..ec53fc3e8b8 100644
--- a/packages/starlight/components/Search.astro
+++ b/packages/starlight/components/Search.astro
@@ -117,7 +117,7 @@ const pagefindTranslations = {
 			} catch {}
 
 			const shouldStrip = this.dataset.stripTrailingSlash !== undefined;
-			const stripTrailingSlash = (path: string) => path.replace(/\/(#.*)?$/, '$1');
+			const stripTrailingSlash = (path: string) => path.replace(/(.)\/(#.*)?$/, '$1$2');
 			const formatURL = shouldStrip ? stripTrailingSlash : (path: string) => path;
 
 			window.addEventListener('DOMContentLoaded', () => {

From eac4542af99b1341cc49096ffda90b37e51e9e95 Mon Sep 17 00:00:00 2001
From: Chris Swithinbank <swithinbank@gmail.com>
Date: Mon, 29 Jan 2024 12:02:34 +0100
Subject: [PATCH 16/16] =?UTF-8?q?Bump=20size=20limit=20again=20(passed=20l?=
 =?UTF-8?q?ocally=20but=20not=20in=20CI=20=F0=9F=A4=B7)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1d7e1870b86..40eee078c13 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     {
       "name": "/_astro/*.js",
       "path": "examples/basics/dist/_astro/*.js",
-      "limit": "22 kB"
+      "limit": "22.5 kB"
     },
     {
       "name": "/_astro/*.css",