Fix pagefind default

withastro · Feb 28, 2024 · 624f620 · 624f620
1 parent d9677b0
commit 624f620
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/packages/starlight/__tests__/basics/config-errors.test.ts b/packages/starlight/__tests__/basics/config-errors.test.ts
@@ -62,6 +62,7 @@ test('parses valid config successfully', () => {
 		  "locales": undefined,
 		  "pagefind": true,
 		  "pagination": true,
+		  "prerender": true,
 		  "tableOfContents": {
 		    "maxHeadingLevel": 3,
 		    "minHeadingLevel": 2,

diff --git a/packages/starlight/utils/user-config.ts b/packages/starlight/utils/user-config.ts
@@ -218,8 +218,13 @@ const UserConfigSchema = z.object({
 	prerender: z.boolean().default(true),
 });
 
-export const StarlightConfigSchema = UserConfigSchema.strict().transform(
-	({ locales, defaultLocale, ...config }, ctx) => {
+export const StarlightConfigSchema = UserConfigSchema.strict()
+	.transform((config) => ({
+		...config,
+		// Pagefind only defaults to true if prerender is also true.
+		pagefind: config.pagefind ?? config.prerender,
+	}))
+	.transform(({ locales, defaultLocale, ...config }, ctx) => {
 		if (locales !== undefined && Object.keys(locales).length > 1) {
 			// This is a multilingual site (more than one locale configured).
 			// Make sure we can find the default locale and if not, help the user set it.
@@ -242,8 +247,6 @@ export const StarlightConfigSchema = UserConfigSchema.strict().transform(
 
 			return {
 				...config,
-				// Pagefind only defaults to true if prerender is also true.
-				pagefind: config.pagefind ?? config.prerender,
 				/** Flag indicating if this site has multiple locales set up. */
 				isMultilingual: true,
 				/** Full locale object for this site’s default language. */
@@ -267,8 +270,7 @@ export const StarlightConfigSchema = UserConfigSchema.strict().transform(
 			},
 			locales: undefined,
 		} as const;
-	}
-);
+	});
 
 export type StarlightConfig = z.infer<typeof StarlightConfigSchema>;
 export type StarlightUserConfig = z.input<typeof StarlightConfigSchema>;