fix(gatsby-plugin-sharp): Pass format-specific options in image-data (#…

…28826)
gatsbyjs · Jan 4, 2021 · 7378fcf · 7378fcf
1 parent b72b5bc
commit 7378fcf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/packages/gatsby-plugin-image/src/babel-helpers.ts b/packages/gatsby-plugin-image/src/babel-helpers.ts
@@ -12,7 +12,7 @@ export const SHARP_ATTRIBUTES = new Set([
   `maxHeight`,
   `quality`,
   `avifOptions`,
-  `jpegOptions`,
+  `jpgOptions`,
   `pngOptions`,
   `webpOptions`,
   `blurredOptions`,

diff --git a/packages/gatsby-plugin-sharp/src/image-data.ts b/packages/gatsby-plugin-sharp/src/image-data.ts
@@ -148,26 +148,30 @@ export async function generateImageData({
   }
 
   let primaryFormat: ImageFormat | undefined
-  let options: Record<string, unknown> | undefined
   if (useAuto) {
     primaryFormat = normalizeFormat(metadata.format || file.extension)
   } else if (formats.has(`png`)) {
     primaryFormat = `png`
-    options = args.pngOptions
   } else if (formats.has(`jpg`)) {
     primaryFormat = `jpg`
-    options = args.jpgOptions
   } else if (formats.has(`webp`)) {
     primaryFormat = `webp`
-    options = args.webpOptions
   } else if (formats.has(`avif`)) {
     reporter.warn(
       `Image ${file.relativePath} specified only AVIF format, with no fallback format. This will mean your site cannot be viewed in all browsers.`
     )
     primaryFormat = `avif`
-    options = args.webpOptions
   }
 
+  const optionsMap = {
+    jpg: args.jpgOptions,
+    png: args.pngOptions,
+    webp: args.webpOptions,
+    avif: args.avifOptions,
+  }
+
+  const options = primaryFormat ? optionsMap[primaryFormat] : undefined
+
   const imageSizes: {
     sizes: Array<number>
     presentationWidth: number