fix: settings requiring service to be set when settings domains or re…

…motePatterns (#8266)
withastro · Aug 29, 2023 · 8450379 · 8450379
1 parent a78175c
commit 8450379
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/.changeset/many-impalas-sit.md b/.changeset/many-impalas-sit.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix `image.service` requiring to be set manually when `image.domains` or `image.remotePatterns` was assigned a value
diff --git a/packages/astro/src/core/config/schema.ts b/packages/astro/src/core/config/schema.ts
@@ -29,6 +29,9 @@ const ASTRO_CONFIG_DEFAULTS = {
 		split: false,
 		excludeMiddleware: false,
 	},
+	image: {
+		service: { entrypoint: 'astro/assets/services/sharp', config: {} },
+	},
 	compressHTML: true,
 	server: {
 		host: false,
@@ -180,14 +183,18 @@ export const AstroConfigSchema = z.object({
 		.default(ASTRO_CONFIG_DEFAULTS.redirects),
 	image: z
 		.object({
-			service: z.object({
-				entrypoint: z.union([
-					z.literal('astro/assets/services/sharp'),
-					z.literal('astro/assets/services/squoosh'),
-					z.string(),
-				]),
-				config: z.record(z.any()).default({}),
-			}),
+			service: z
+				.object({
+					entrypoint: z
+						.union([
+							z.literal('astro/assets/services/sharp'),
+							z.literal('astro/assets/services/squoosh'),
+							z.string(),
+						])
+						.default(ASTRO_CONFIG_DEFAULTS.image.service.entrypoint),
+					config: z.record(z.any()).default({}),
+				})
+				.default(ASTRO_CONFIG_DEFAULTS.image.service),
 			domains: z.array(z.string()).default([]),
 			remotePatterns: z
 				.array(
@@ -213,9 +220,7 @@ export const AstroConfigSchema = z.object({
 				)
 				.default([]),
 		})
-		.default({
-			service: { entrypoint: 'astro/assets/services/sharp', config: {} },
-		}),
+		.default(ASTRO_CONFIG_DEFAULTS.image),
 	markdown: z
 		.object({
 			drafts: z.boolean().default(false),